Skip to content

Commit 5d95924

Browse files
Add .editorconfig
1 parent b1f3940 commit 5d95924

File tree

9 files changed

+42
-27
lines changed

9 files changed

+42
-27
lines changed

.editorconfig

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 4
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
11+
[*.java]
12+
max_line_length = 120

sd-app/src/main/java/com/generoso/sd/config/FiltersConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public FilterRegistrationBean<RequestLoggingFilter> incomingRequestLogFilter() {
1919

2020
@Bean
2121
public FilterRegistrationBean<ApplicationResponsesMetricsFilter> responseMetricFilter(
22-
MetricsService metricsService) {
22+
MetricsService metricsService) {
2323
var filter = new FilterRegistrationBean<>(new ApplicationResponsesMetricsFilter(metricsService));
2424
filter.setOrder(1);
2525
return filter;

sd-app/src/main/java/com/generoso/sd/filter/ApplicationResponsesMetricsFilter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ public class ApplicationResponsesMetricsFilter implements Filter {
1414
private final MetricsService metricsService;
1515

1616
@Override
17-
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws ServletException, IOException {
17+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
18+
throws ServletException, IOException {
19+
1820
chain.doFilter(request, response);
1921

2022
var httpServletRequest = (HttpServletRequest) request;

sd-app/src/main/java/com/generoso/sd/filter/RequestLoggingFilter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
public class RequestLoggingFilter implements Filter {
1212

1313
@Override
14-
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
14+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
15+
throws IOException, ServletException {
16+
1517
var httpServletRequest = (HttpServletRequest) request;
1618
var httpServletResponse = (HttpServletResponse) response;
1719
var path = httpServletRequest.getRequestURI();

sd-app/src/main/java/com/generoso/sd/metrics/MetricsService.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ public class MetricsService {
1515

1616
public void applicationResponseTotal(String method, String path, String status) {
1717
var tags = Tags.of(
18-
Tag.of("method", method),
19-
Tag.of("path", path),
20-
Tag.of("status", status)
18+
Tag.of("method", method),
19+
Tag.of("path", path),
20+
Tag.of("status", status)
2121
);
2222

2323
Counter.builder("application.responses.total")
24-
.description("Metrics for application responses per endpoint, method and http response code.")
25-
.tags(tags)
26-
.register(meterRegistry)
27-
.increment();
24+
.description("Metrics for application responses per endpoint, method and http response code.")
25+
.tags(tags)
26+
.register(meterRegistry)
27+
.increment();
2828
}
2929
}

sd-ft/src/test/java/com/generoso/ft/sd/client/GetAppsRequestTemplate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class GetAppsRequestTemplate extends RequestTemplate {
1212

1313
@Autowired
1414
public GetAppsRequestTemplate(@Value("${service.host}") String host,
15-
@Value("${service.context-path:}") String contextPath) {
15+
@Value("${service.context-path:}") String contextPath) {
1616
super(host, contextPath);
1717
}
1818

sd-ft/src/test/java/com/generoso/ft/sd/client/model/Application.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import java.util.List;
66

7-
public record Application(@JsonProperty("versions__delta") String version,
8-
@JsonProperty("apps__hashcode") String appHashCode,
9-
List<ApplicationDetail> application) {
7+
public record Application(
8+
@JsonProperty("versions__delta") String version,
9+
@JsonProperty("apps__hashcode") String appHashCode,
10+
List<ApplicationDetail> application) {
1011
}

sd-ft/src/test/java/com/generoso/ft/sd/steps/MetricsStepDefinitions.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public void theMetricForEndpointWithParameterAndStatusResponseHasIncrementedBy(S
4848
int increment) {
4949
var path = String.format("%s/%s", endpoint.getPath(), pathParameter);
5050
var initialCount = getResourceAndStatusCounterValue(metricsState.getInitialMetrics(), metricName,
51-
endpoint.getMethod(), path, statusCode);
51+
endpoint.getMethod(), path, statusCode);
5252
var newCount = getResourceAndStatusCounterValue(metricsState.getNewMetrics(), metricName,
53-
endpoint.getMethod(), path, statusCode);
53+
endpoint.getMethod(), path, statusCode);
5454
assertThat(newCount).isEqualTo(initialCount + increment);
5555
}
5656

@@ -61,9 +61,9 @@ private double getResourceAndStatusCounterValue(List<MetricFamily> metrics, Stri
6161
private double getResourceAndStatusCounterValue(List<MetricFamily> metrics, String metricName, String method,
6262
String path, String status) {
6363
return sumCounterMetric(metrics, metricName, List.of(
64-
metric -> metric.getLabels().get("method").equals(method),
65-
metric -> metric.getLabels().get("path").equals(path),
66-
metric -> metric.getLabels().get("status").equals(status)));
64+
metric -> metric.getLabels().get("method").equals(method),
65+
metric -> metric.getLabels().get("path").equals(path),
66+
metric -> metric.getLabels().get("status").equals(status)));
6767
}
6868

6969
private double sumCounterMetric(List<MetricFamily> metricFamilies, String metricName, List<Predicate<Metric>> filters) {
@@ -73,15 +73,15 @@ private double sumCounterMetric(List<MetricFamily> metricFamilies, String metric
7373
private double sumMetric(List<MetricFamily> metricFamilies, String metricName, MetricType metricType, List<Predicate<Metric>> filters) {
7474
var metricsStream = getMetricsStreamWithNameAndType(metricFamilies, metricName, metricType);
7575
return applyFilters(metricsStream, filters)
76-
.map(MetricWrapper::new)
77-
.mapToDouble(MetricWrapper::getValue)
78-
.sum();
76+
.map(MetricWrapper::new)
77+
.mapToDouble(MetricWrapper::getValue)
78+
.sum();
7979
}
8080

8181
private Stream<Metric> getMetricsStreamWithNameAndType(List<MetricFamily> metricFamilies, String metricName, MetricType metricType) {
8282
return metricFamilies.stream()
83-
.filter(mf -> mf.getName().equals(metricName) && mf.getType().equals(metricType))
84-
.flatMap(mf -> mf.getMetrics().stream());
83+
.filter(mf -> mf.getName().equals(metricName) && mf.getType().equals(metricType))
84+
.flatMap(mf -> mf.getMetrics().stream());
8585
}
8686

8787
private Stream<Metric> applyFilters(Stream<Metric> metricsStream, List<Predicate<Metric>> filters) {

sd-ft/src/test/java/com/generoso/ft/sd/steps/ResponseStepDefinitions.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import lombok.RequiredArgsConstructor;
99
import org.springframework.beans.factory.annotation.Autowired;
1010

11-
import static org.junit.jupiter.api.Assertions.assertEquals;
12-
import static org.junit.jupiter.api.Assertions.assertFalse;
13-
import static org.junit.jupiter.api.Assertions.assertTrue;
11+
import static org.junit.jupiter.api.Assertions.*;
1412

1513
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
1614
public class ResponseStepDefinitions {

0 commit comments

Comments
 (0)