diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/HttpSender.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/HttpSender.java index 9e4f6ece4a3c..b40a9cfa38eb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/HttpSender.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/HttpSender.java @@ -41,7 +41,7 @@ */ abstract class HttpSender extends Sender { - private static final DataSize MESSAGE_MAX_BYTES = DataSize.ofKilobytes(512); + private static final DataSize MESSAGE_MAX_SIZE = DataSize.ofKilobytes(512); private volatile boolean closed; @@ -52,7 +52,7 @@ public Encoding encoding() { @Override public int messageMaxBytes() { - return (int) MESSAGE_MAX_BYTES.toBytes(); + return (int) MESSAGE_MAX_SIZE.toBytes(); } @Override diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSender.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSender.java index 19bde21b3c1b..0ea45e305246 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSender.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSender.java @@ -69,7 +69,7 @@ protected Void doExecute() { @Override protected void doEnqueue(Callback callback) { - sendRequest().subscribe((__) -> callback.onSuccess(null), callback::onError); + sendRequest().subscribe((entity) -> callback.onSuccess(null), callback::onError); } private Mono> sendRequest() { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java index e3b634b97f6a..7bf43da2f9bb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java @@ -58,11 +58,11 @@ void sendSpansShouldThrowIfCloseWasCalled() throws IOException { protected void makeRequest(List encodedSpans, boolean async) throws IOException { if (async) { - CallbackResult callbackResult = this.makeAsyncRequest(encodedSpans); + CallbackResult callbackResult = makeAsyncRequest(encodedSpans); assertThat(callbackResult.success()).isTrue(); } else { - this.makeSyncRequest(encodedSpans); + makeSyncRequest(encodedSpans); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSenderTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSenderTests.java index 47f2736a51eb..2ba07f75a31b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSenderTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinRestTemplateSenderTests.java @@ -86,7 +86,7 @@ void sendSpansShouldSendSpansToZipkin(boolean async) throws IOException { this.mockServer.expect(requestTo(ZIPKIN_URL)).andExpect(method(HttpMethod.POST)) .andExpect(content().contentType("application/json")).andExpect(content().string("[span1,span2]")) .andRespond(withStatus(HttpStatus.ACCEPTED)); - this.makeRequest(List.of(toByteArray("span1"), toByteArray("span2")), async); + makeRequest(List.of(toByteArray("span1"), toByteArray("span2")), async); } @ParameterizedTest @@ -95,12 +95,12 @@ void sendSpansShouldHandleHttpFailures(boolean async) { this.mockServer.expect(requestTo(ZIPKIN_URL)).andExpect(method(HttpMethod.POST)) .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); if (async) { - CallbackResult callbackResult = this.makeAsyncRequest(List.of()); + CallbackResult callbackResult = makeAsyncRequest(List.of()); assertThat(callbackResult.success()).isFalse(); assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error"); } else { - assertThatThrownBy(() -> this.makeSyncRequest(List.of())).hasMessageContaining("500 Internal Server Error"); + assertThatThrownBy(() -> makeSyncRequest(List.of())).hasMessageContaining("500 Internal Server Error"); } } @@ -114,7 +114,7 @@ void sendSpansShouldCompressData(boolean async) throws IOException { this.mockServer.expect(requestTo(ZIPKIN_URL)).andExpect(method(HttpMethod.POST)) .andExpect(header("Content-Encoding", "gzip")).andExpect(content().contentType("application/json")) .andExpect(content().bytes(compressed)).andRespond(withStatus(HttpStatus.ACCEPTED)); - this.makeRequest(List.of(toByteArray(uncompressed)), async); + makeRequest(List.of(toByteArray(uncompressed)), async); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java index 7231abba5cfb..65f411428a64 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java @@ -46,7 +46,7 @@ class ZipkinWebClientSenderTests extends ZipkinHttpSenderTests { private static MockWebServer mockBackEnd; - public static String ZIPKIN_URL; + private static String ZIPKIN_URL; @BeforeAll static void beforeAll() throws IOException { @@ -92,7 +92,7 @@ void checkShouldNotRaiseException() throws InterruptedException { void sendSpansShouldSendSpansToZipkin(boolean async) throws IOException, InterruptedException { mockBackEnd.enqueue(new MockResponse()); List encodedSpans = List.of(toByteArray("span1"), toByteArray("span2")); - this.makeRequest(encodedSpans, async); + makeRequest(encodedSpans, async); requestAssertions((request) -> { assertThat(request.getMethod()).isEqualTo("POST"); @@ -106,12 +106,12 @@ void sendSpansShouldSendSpansToZipkin(boolean async) throws IOException, Interru void sendSpansShouldHandleHttpFailures(boolean async) throws InterruptedException { mockBackEnd.enqueue(new MockResponse().setResponseCode(500)); if (async) { - CallbackResult callbackResult = this.makeAsyncRequest(List.of()); + CallbackResult callbackResult = makeAsyncRequest(List.of()); assertThat(callbackResult.success()).isFalse(); assertThat(callbackResult.error()).isNotNull().hasMessageContaining("500 Internal Server Error"); } else { - assertThatThrownBy(() -> this.makeSyncRequest(List.of())).hasMessageContaining("500 Internal Server Error"); + assertThatThrownBy(() -> makeSyncRequest(List.of())).hasMessageContaining("500 Internal Server Error"); } requestAssertions((request) -> assertThat(request.getMethod()).isEqualTo("POST")); @@ -127,7 +127,7 @@ void sendSpansShouldCompressData(boolean async) throws IOException, InterruptedE mockBackEnd.enqueue(new MockResponse()); - this.makeRequest(List.of(toByteArray(uncompressed)), async); + makeRequest(List.of(toByteArray(uncompressed)), async); requestAssertions((request) -> { assertThat(request.getMethod()).isEqualTo("POST"); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java index 654520d220da..cbbdd7240c8e 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java @@ -315,7 +315,6 @@ void recordHistogram() throws Exception { @Test void trailingSlashShouldNotRecordDuplicateMetrics() throws Exception { - this.mvc.perform(get("/api/c1/simple/10")).andExpect(status().isOk()); this.mvc.perform(get("/api/c1/simple/10/")).andExpect(status().isOk()); assertThat(this.registry.get("http.server.requests").tags("status", "200", "uri", "/api/c1/simple/{id}").timer() diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java index 2f4c76036409..e10d12091a97 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java @@ -56,7 +56,7 @@ void registerHintsWithNoLocation() { assertThat(hints.resources().resourcePatterns()).isEmpty(); } - RuntimeHints register(ClassLoader classLoader) { + private RuntimeHints register(ClassLoader classLoader) { RuntimeHints hints = new RuntimeHints(); WebResourcesRuntimeHints registrar = new WebResourcesRuntimeHints(); registrar.registerHints(hints, classLoader); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java index f4c111692e7e..c8f96b4f0b08 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java @@ -86,7 +86,7 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable { private JarEntryCertification[] certifications; private final Map entriesCache = Collections - .synchronizedMap(new LinkedHashMap(16, 0.75f, true) { + .synchronizedMap(new LinkedHashMap<>(16, 0.75f, true) { @Override protected boolean removeEldestEntry(Map.Entry eldest) { @@ -338,7 +338,7 @@ JarEntryCertification getCertification(JarEntry entry) throws IOException { // We fall back to use JarInputStream to obtain the certs. This isn't that // fast, but hopefully doesn't happen too often. try (JarInputStream certifiedJarStream = new JarInputStream(this.jarFile.getData().getInputStream())) { - java.util.jar.JarEntry certifiedEntry = null; + java.util.jar.JarEntry certifiedEntry; while ((certifiedEntry = certifiedJarStream.getNextJarEntry()) != null) { // Entry must be closed to trigger a read and set entry certificates certifiedJarStream.closeEntry(); diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementDifferentPortSampleActuatorApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementDifferentPortSampleActuatorApplicationTests.java index b1c10e88a432..4b944a0aa1be 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementDifferentPortSampleActuatorApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementDifferentPortSampleActuatorApplicationTests.java @@ -33,8 +33,7 @@ * @author HaiTao Zhang */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - properties = { "management.endpoints.web.base-path=/", "management.server.port=0", - "logging.level.org.springframework.web=trace" }) + properties = { "management.endpoints.web.base-path=/", "management.server.port=0" }) class ManagementDifferentPortSampleActuatorApplicationTests { @LocalManagementPort