From 3d203d0215081dd4ce48466457cd264a801c5960 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 26 May 2022 16:26:09 +0100 Subject: [PATCH] Polish --- .../boot/build/DeployedPlugin.java | 1 + .../boot/build/ExtractResources.java | 1 + .../boot/build/bom/bomr/UpgradeBom.java | 3 +- .../expose/IncludeExcludeEndpointFilter.java | 4 -- .../web/servlet/CompositeHandlerAdapter.java | 3 +- .../MvcWebEndpointIntegrationTests.java | 41 ++++++++++--------- .../ClientResourcesBuilderCustomizer.java | 9 ++-- .../RestClientBuilderCustomizer.java | 7 ++-- .../DownloadConfigBuilderCustomizer.java | 12 +++--- .../ConnectionFactoryOptionsInitializer.java | 8 ++-- .../kafka/KafkaAutoConfigurationTests.java | 1 + ...2ResourceServerAutoConfigurationTests.java | 8 ++-- ...2ResourceServerAutoConfigurationTests.java | 8 ++-- ...ml2RelyingPartyAutoConfigurationTests.java | 10 +++-- ...activeMultipartAutoConfigurationTests.java | 7 +--- .../servlet/WebMvcAutoConfigurationTests.java | 3 +- .../applicationcontext/MyDemoBean.java | 1 + .../AbstractMockBeanOnGenericTests.java | 5 ++- .../platform/io/InspectedContent.java | 5 ++- .../boot/loader/tools/Repackager.java | 4 +- .../validation/ValidationBindHandler.java | 5 +-- .../boot/context/config/ConfigDataTests.java | 3 +- .../ConfigurationPropertiesTests.java | 1 - .../log4j2/Log4J2LoggingSystemTests.java | 1 + .../boot/image/paketo/PaketoBuilderTests.java | 40 ++++++++---------- .../SampleHazelcast4ApplicationTests.java | 5 +-- ...ampleSessionHazelcastApplicationTests.java | 8 ++-- .../SampleSessionJdbcApplicationTests.java | 8 ++-- .../SampleSessionMongoApplicationTests.java | 8 ++-- .../SampleSessionRedisApplicationTests.java | 8 ++-- .../src/main/webapp/WEB-INF/web.xml | 6 --- 31 files changed, 116 insertions(+), 118 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java index 583e0dd21be..e3afc9f2e9d 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java @@ -38,6 +38,7 @@ public class DeployedPlugin implements Plugin { public static final String GENERATE_POM_TASK_NAME = "generatePomFileForMavenPublication"; @Override + @SuppressWarnings("deprecation") public void apply(Project project) { project.getPlugins().apply(MavenPublishPlugin.class); project.getPlugins().apply(MavenRepositoryPlugin.class); diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ExtractResources.java b/buildSrc/src/main/java/org/springframework/boot/build/ExtractResources.java index 09cae37037b..78473cec471 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/ExtractResources.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/ExtractResources.java @@ -28,6 +28,7 @@ import java.util.Map; import org.gradle.api.DefaultTask; import org.gradle.api.GradleException; +import org.gradle.api.Task; import org.gradle.api.file.DirectoryProperty; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.OutputDirectory; diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java index cc8f01f765d..4c56ae74a76 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,6 +84,7 @@ public class UpgradeBom extends DefaultTask { } @TaskAction + @SuppressWarnings("deprecation") void upgradeDependencies() { GitHubRepository repository = createGitHub().getRepository(this.bom.getUpgrade().getGitHub().getOrganization(), this.bom.getUpgrade().getGitHub().getRepository()); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java index fe92d835710..a1979ac1d35 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java @@ -241,10 +241,6 @@ public class IncludeExcludeEndpointFilter> implem return this.matchesAll || this.endpointIds.contains(endpointId); } - static EndpointPatterns forExposure(EndpointExposure exposure) { - return (exposure != null) ? new EndpointPatterns(exposure.getDefaultIncludes()) : null; - } - } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java index 019fdbc3879..059bedda4aa 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,6 +62,7 @@ class CompositeHandlerAdapter implements HandlerAdapter { @Override @Deprecated + @SuppressWarnings("deprecation") public long getLastModified(HttpServletRequest request, Object handler) { Optional adapter = getAdapter(handler); return adapter.map((handlerAdapter) -> handlerAdapter.getLastModified(request, handler)).orElse(0L); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java index 4086a519b21..ce85bb61f01 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -125,26 +125,27 @@ class MvcWebEndpointIntegrationTests private RequestMatchResult getMatchResult(String servletPath, boolean isPatternParser) { MockHttpServletRequest request = new MockHttpServletRequest(); request.setServletPath(servletPath); - AnnotationConfigServletWebServerApplicationContext context = new AnnotationConfigServletWebServerApplicationContext(); - if (isPatternParser) { - context.register(WebMvcConfiguration.class); + try (AnnotationConfigServletWebServerApplicationContext context = new AnnotationConfigServletWebServerApplicationContext()) { + if (isPatternParser) { + context.register(WebMvcConfiguration.class); + } + else { + context.register(PathMatcherWebMvcConfiguration.class); + } + context.register(TestEndpointConfiguration.class); + context.refresh(); + WebMvcEndpointHandlerMapping bean = context.getBean(WebMvcEndpointHandlerMapping.class); + try { + // Setup request attributes + ServletRequestPathUtils.parseAndCache(request); + // Trigger initLookupPath + bean.getHandler(request); + } + catch (Exception ex) { + throw new RuntimeException(ex); + } + return bean.match(request, "/spring"); } - else { - context.register(PathMatcherWebMvcConfiguration.class); - } - context.register(TestEndpointConfiguration.class); - context.refresh(); - WebMvcEndpointHandlerMapping bean = context.getBean(WebMvcEndpointHandlerMapping.class); - try { - // Setup request attributes - ServletRequestPathUtils.parseAndCache(request); - // Trigger initLookupPath - bean.getHandler(request); - } - catch (Exception ex) { - throw new RuntimeException(ex); - } - return bean.match(request, "/spring"); } @Override diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java index 1a9fde48bc8..d81b3eceb0c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,11 @@ package org.springframework.boot.autoconfigure.data.redis; import io.lettuce.core.resource.ClientResources; +import io.lettuce.core.resource.ClientResources.Builder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link ClientResources} via a {@link ClientResources.Builder} whilst retaining default + * {@link ClientResources} via a {@link Builder} whilst retaining default * auto-configuration. * * @author Stephane Nicoll @@ -29,9 +30,9 @@ import io.lettuce.core.resource.ClientResources; public interface ClientResourcesBuilderCustomizer { /** - * Customize the {@link ClientResources.Builder}. + * Customize the {@link Builder}. * @param clientResourcesBuilder the builder to customize */ - void customize(ClientResources.Builder clientResourcesBuilder); + void customize(Builder clientResourcesBuilder); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java index 685929d908c..712166f2f2c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.elasticsearch; import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.config.RequestConfig.Builder; import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.elasticsearch.client.RestClientBuilder; @@ -52,11 +53,11 @@ public interface RestClientBuilderCustomizer { } /** - * Customize the {@link RequestConfig.Builder}. + * Customize the {@link Builder}. * @param builder the builder * @since 2.3.0 */ - default void customize(RequestConfig.Builder builder) { + default void customize(Builder builder) { } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java index 1689d0bbab3..bb2fb2e83e3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,12 @@ package org.springframework.boot.autoconfigure.mongo.embedded; import de.flapdoodle.embed.process.config.store.DownloadConfig; import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig; +import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig.Builder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link DownloadConfig} via an {@link ImmutableDownloadConfig.Builder} whilst retaining - * default auto-configuration. + * {@link DownloadConfig} via a {@link Builder} whilst retaining default + * auto-configuration. * * @author Michael Gmeiner * @since 2.2.0 @@ -31,9 +32,8 @@ import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig; public interface DownloadConfigBuilderCustomizer { /** - * Customize the {@link ImmutableDownloadConfig.Builder}. - * @param downloadConfigBuilder the {@link ImmutableDownloadConfig.Builder} to - * customize + * Customize the {@link Builder}. + * @param downloadConfigBuilder the {@link Builder} to customize */ void customize(ImmutableDownloadConfig.Builder downloadConfigBuilder); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsInitializer.java index f5e10f4c734..6a17dfde1c2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsInitializer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,15 +28,15 @@ import org.springframework.boot.r2dbc.EmbeddedDatabaseConnection; import org.springframework.util.StringUtils; /** - * Initialize a {@link ConnectionFactoryOptions.Builder} based on {@link R2dbcProperties}. + * Initialize a {@link Builder} based on {@link R2dbcProperties}. * * @author Stephane Nicoll */ class ConnectionFactoryOptionsInitializer { /** - * Initialize a {@link io.r2dbc.spi.ConnectionFactoryOptions.Builder - * ConnectionFactoryOptions.Builder} using the specified properties. + * Initialize a {@link Builder ConnectionFactoryOptions.Builder} using the specified + * properties. * @param properties the properties to use to initialize the builder * @param embeddedDatabaseConnection the embedded connection to use as a fallback * @return an initialized builder diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index 405fe04c36e..24b78b2849b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -432,6 +432,7 @@ class KafkaAutoConfigurationTests { @Test @Deprecated + @SuppressWarnings("deprecation") void logOnlyRecordMetadataProperty() { this.contextRunner.withPropertyValues("spring.kafka.listener.only-log-record-metadata=true").run((context) -> { AbstractKafkaListenerContainerFactory kafkaListenerContainerFactory = (AbstractKafkaListenerContainerFactory) context diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java index fb4f3880cf6..4f9edf6cb83 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -148,7 +148,7 @@ class ReactiveOAuth2ResourceServerAutoConfigurationTests { .getBean(SupplierReactiveJwtDecoder.class); Mono reactiveJwtDecoderSupplier = (Mono) ReflectionTestUtils .getField(supplierReactiveJwtDecoder, "jwtDecoderMono"); - ReactiveJwtDecoder reactiveJwtDecoder = reactiveJwtDecoderSupplier.block(); + reactiveJwtDecoderSupplier.block(); }); // The last request is to the JWK Set endpoint to look up the algorithm assertThat(this.server.getRequestCount()).isEqualTo(1); @@ -171,7 +171,7 @@ class ReactiveOAuth2ResourceServerAutoConfigurationTests { .getBean(SupplierReactiveJwtDecoder.class); Mono reactiveJwtDecoderSupplier = (Mono) ReflectionTestUtils .getField(supplierReactiveJwtDecoder, "jwtDecoderMono"); - ReactiveJwtDecoder reactiveJwtDecoder = reactiveJwtDecoderSupplier.block(); + reactiveJwtDecoderSupplier.block(); }); // The last request is to the JWK Set endpoint to look up the algorithm assertThat(this.server.getRequestCount()).isEqualTo(2); @@ -194,7 +194,7 @@ class ReactiveOAuth2ResourceServerAutoConfigurationTests { .getBean(SupplierReactiveJwtDecoder.class); Mono reactiveJwtDecoderSupplier = (Mono) ReflectionTestUtils .getField(supplierReactiveJwtDecoder, "jwtDecoderMono"); - ReactiveJwtDecoder reactiveJwtDecoder = reactiveJwtDecoderSupplier.block(); + reactiveJwtDecoderSupplier.block(); }); // The last request is to the JWK Set endpoint to look up the algorithm assertThat(this.server.getRequestCount()).isEqualTo(3); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java index e0a2beb5032..2f90444def0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,7 +144,7 @@ class OAuth2ResourceServerAutoConfigurationTests { SupplierJwtDecoder supplierJwtDecoderBean = context.getBean(SupplierJwtDecoder.class); Supplier jwtDecoderSupplier = (Supplier) ReflectionTestUtils .getField(supplierJwtDecoderBean, "jwtDecoderSupplier"); - JwtDecoder jwtDecoder = jwtDecoderSupplier.get(); + jwtDecoderSupplier.get(); }); // The last request is to the JWK Set endpoint to look up the algorithm assertThat(this.server.getRequestCount()).isEqualTo(2); @@ -166,7 +166,7 @@ class OAuth2ResourceServerAutoConfigurationTests { SupplierJwtDecoder supplierJwtDecoderBean = context.getBean(SupplierJwtDecoder.class); Supplier jwtDecoderSupplier = (Supplier) ReflectionTestUtils .getField(supplierJwtDecoderBean, "jwtDecoderSupplier"); - JwtDecoder jwtDecoder = jwtDecoderSupplier.get(); + jwtDecoderSupplier.get(); }); // The last request is to the JWK Set endpoint to look up the algorithm assertThat(this.server.getRequestCount()).isEqualTo(3); @@ -189,7 +189,7 @@ class OAuth2ResourceServerAutoConfigurationTests { SupplierJwtDecoder supplierJwtDecoderBean = context.getBean(SupplierJwtDecoder.class); Supplier jwtDecoderSupplier = (Supplier) ReflectionTestUtils .getField(supplierJwtDecoderBean, "jwtDecoderSupplier"); - JwtDecoder jwtDecoder = jwtDecoderSupplier.get(); + jwtDecoderSupplier.get(); }); // The last request is to the JWK Set endpoint to look up the algorithm assertThat(this.server.getRequestCount()).isEqualTo(4); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java index da95d630825..1eb9498c92c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -257,9 +257,11 @@ class Saml2RelyingPartyAutoConfigurationTests { private void setupMockResponse(MockWebServer server, Resource resourceBody) throws Exception { try (InputStream metadataSource = resourceBody.getInputStream()) { - Buffer metadataBuffer = new Buffer().readFrom(metadataSource); - MockResponse metadataResponse = new MockResponse().setBody(metadataBuffer); - server.enqueue(metadataResponse); + try (Buffer metadataBuffer = new Buffer()) { + metadataBuffer.readFrom(metadataSource); + MockResponse metadataResponse = new MockResponse().setBody(metadataBuffer); + server.enqueue(metadataResponse); + } } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartAutoConfigurationTests.java index 27c68bcf80d..82b3093582f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,6 @@ package org.springframework.boot.autoconfigure.web.reactive; import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; import org.junit.jupiter.api.Test; @@ -44,9 +42,6 @@ class ReactiveMultipartAutoConfigurationTests { private final ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ReactiveMultipartAutoConfiguration.class)); - private static final Path DEFAULT_FILE_STORAGE_DIRECTORY = Paths.get(System.getProperty("java.io.tmpdir"), - "spring-multipart"); - @Test void shouldNotProvideCustomizerForNonReactiveApp() { new WebApplicationContextRunner() diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index 2e50b5ce392..d75d235df2c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -836,6 +836,7 @@ class WebMvcAutoConfigurationTests { @Test @Deprecated + @SuppressWarnings("deprecation") void useSuffixPatternMatch() { this.contextRunner.withPropertyValues("spring.mvc.pathmatch.matching-strategy=ant-path-matcher", "spring.mvc.pathmatch.use-suffix-pattern:true", diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/applicationcontext/MyDemoBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/applicationcontext/MyDemoBean.java index cd421c8aab3..ba17c220997 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/applicationcontext/MyDemoBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/applicationcontext/MyDemoBean.java @@ -25,6 +25,7 @@ import org.springframework.web.context.WebApplicationContext; public class MyDemoBean implements ApplicationListener { + @SuppressWarnings("unused") private ServletContext servletContext; @Override diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java index 76ae636c574..ab7d34ba659 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/AbstractMockBeanOnGenericTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,12 +28,15 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link MockBean} with abstract class and generics. * + * @param type of thing + * @param type of something * @author Madhura Bhave */ @SpringBootTest(classes = AbstractMockBeanOnGenericTests.TestConfiguration.class) abstract class AbstractMockBeanOnGenericTests, U extends AbstractMockBeanOnGenericTests.Something> { @Autowired + @SuppressWarnings("unused") private T thing; @MockBean diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/InspectedContent.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/InspectedContent.java index 66aab11e7bf..51b7dd01812 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/InspectedContent.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/io/InspectedContent.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +59,8 @@ public class InspectedContent implements Content { FileCopyUtils.copy((byte[]) this.content, outputStream); } else if (this.content instanceof File) { - FileCopyUtils.copy(new FileInputStream((File) this.content), outputStream); + InputStream inputStream = new FileInputStream((File) this.content); + FileCopyUtils.copy(inputStream, outputStream); } else { throw new IllegalStateException("Unknown content type"); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index 329b7ce90c3..218c83b281a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -113,7 +113,7 @@ public class Repackager extends Packager { public void repackage(File destination, Libraries libraries, LaunchScript launchScript, FileTime lastModifiedTime) throws IOException { Assert.isTrue(destination != null && !destination.isDirectory(), "Invalid destination"); - Layout layout = getLayout(); // get layout early + getLayout(); // get layout early destination = destination.getAbsoluteFile(); File source = getSource(); if (isAlreadyPackaged() && source.equals(destination)) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java index df33378fe51..4789e9434ad 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -149,12 +149,9 @@ public class ValidationBindHandler extends AbstractBindHandler { private final ConfigurationPropertyName name; - private final Object target; - protected ValidationResult(ConfigurationPropertyName name, Object target) { super(target, null); this.name = name; - this.target = target; } @Override diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataTests.java index 8575438ad1a..fb5d507fd69 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,6 +75,7 @@ class ConfigDataTests { @Test @Deprecated + @SuppressWarnings("deprecation") void getDeprecatedOptionsWhenUsingPropertySourceOptionsThrowsException() { MapPropertySource source = new MapPropertySource("test", Collections.emptyMap()); PropertySourceOptions propertySourceOptions = (propertySource) -> Options.NONE; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java index c9d208a842a..79cd1b67772 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java @@ -477,7 +477,6 @@ class ConfigurationPropertiesTests { } @Test - @SuppressWarnings("unchecked") void loadWhenEnvironmentPrefixSetShouldBind() { MutablePropertySources sources = this.context.getEnvironment().getPropertySources(); sources.replace(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index 96e719c7af4..1da829f8296 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -439,6 +439,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { */ static class Nested { + @SuppressWarnings("unused") private static final Log logger = LogFactory.getLog(Nested.class); } diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java index 1900405f17a..44e330ebd24 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java @@ -80,7 +80,8 @@ class PaketoBuilderTests { ImageReference imageReference = ImageReference.of(ImageName.of(imageName)); BuildResult result = buildImage(imageName); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withExposedPorts(8080)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withExposedPorts(8080); container.waitingFor(Wait.forHttp("/test")).start(); ContainerConfig config = container.getContainerInfo().getConfig(); assertLabelsMatchManifestAttributes(config); @@ -106,8 +107,9 @@ class PaketoBuilderTests { ImageReference imageReference = ImageReference.of(ImageName.of(imageName)); BuildResult result = buildImage(imageName); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withCommand("--server.port=9090") - .withExposedPorts(9090)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withCommand("--server.port=9090"); + container.withExposedPorts(9090); container.waitingFor(Wait.forHttp("/test")).start(); } finally { @@ -122,14 +124,16 @@ class PaketoBuilderTests { ImageReference imageReference = ImageReference.of(ImageName.of(imageName)); BuildResult result = buildImage(imageName); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withExposedPorts(8080)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withExposedPorts(8080); container.waitingFor(Wait.forHttp("/test")).start(); container.stop(); } this.gradleBuild.expectDeprecationMessages("BOM table is deprecated"); result = buildImage(imageName); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withExposedPorts(8080)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withExposedPorts(8080); container.waitingFor(Wait.forHttp("/test")).start(); } finally { @@ -145,7 +149,8 @@ class PaketoBuilderTests { ImageReference imageReference = ImageReference.of(ImageName.of(imageName)); BuildResult result = buildImage(imageName, "assemble", "bootDistZip"); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withExposedPorts(8080)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withExposedPorts(8080); container.waitingFor(Wait.forHttp("/test")).start(); ContainerConfig config = container.getContainerInfo().getConfig(); ImageAssertions.assertThat(config).buildMetadata().buildpacks().contains( @@ -173,7 +178,8 @@ class PaketoBuilderTests { ImageReference imageReference = ImageReference.of(ImageName.of(imageName)); BuildResult result = buildImage(imageName, "assemble", "bootDistZip"); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withExposedPorts(8080)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withExposedPorts(8080); container.waitingFor(Wait.forHttp("/test")).start(); ContainerConfig config = container.getContainerInfo().getConfig(); ImageAssertions.assertThat(config).buildMetadata().buildpacks().contains( @@ -204,7 +210,8 @@ class PaketoBuilderTests { ImageReference imageReference = ImageReference.of(ImageName.of(imageName)); BuildResult result = buildImage(imageName); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withExposedPorts(8080)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withExposedPorts(8080); container.waitingFor(Wait.forHttp("/test")).start(); ContainerConfig config = container.getContainerInfo().getConfig(); assertLabelsMatchManifestAttributes(config); @@ -231,7 +238,8 @@ class PaketoBuilderTests { ImageReference imageReference = ImageReference.of(ImageName.of(imageName)); BuildResult result = buildImage(imageName); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); - try (GenericContainer container = new GenericContainer<>(imageName).withExposedPorts(8080)) { + try (GenericContainer container = new GenericContainer<>(imageName)) { + container.withExposedPorts(8080); container.waitingFor(Wait.forHttp("/test")).start(); ContainerConfig config = container.getContainerInfo().getConfig(); ImageAssertions.assertThat(config).buildMetadata().buildpacks().contains( @@ -352,20 +360,6 @@ class PaketoBuilderTests { return new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0]; } - private String javaMajorVersion() { - String javaVersion = System.getProperty("java.version"); - if (javaVersion.startsWith("1.")) { - return javaVersion.substring(2, 3); - } - else { - int firstDotIndex = javaVersion.indexOf("."); - if (firstDotIndex != -1) { - return javaVersion.substring(0, firstDotIndex); - } - } - return javaVersion; - } - private boolean startsWithOneOf(String actual, List expectedPrefixes) { for (String prefix : expectedPrefixes) { if (actual.startsWith(prefix)) { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java index 55120772124..9f1817c5452 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hazelcast3/src/test/java/smoketest/hazelcast3/SampleHazelcast4ApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,9 +38,6 @@ class SampleHazelcast4ApplicationTests { @Autowired private CacheManager cacheManager; - @Autowired - private CountryRepository countryRepository; - @Test void cacheManagerIsUsingHazelcast() { assertThat(this.cacheManager).isInstanceOf(HazelcastCacheManager.class); diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java index a48093d441e..ff84a1e6805 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/test/java/smoketest/session/hazelcast/SampleSessionHazelcastApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -81,12 +82,13 @@ class SampleSessionHazelcastApplicationTests { return "Basic " + Base64.getEncoder().encodeToString("user:password".getBytes()); } - @SuppressWarnings("unchecked") private ResponseEntity> getSessions() { HttpHeaders headers = getHeaders(null); RequestEntity request = new RequestEntity<>(headers, HttpMethod.GET, URI.create("/actuator/sessions?username=user")); - return (ResponseEntity>) (ResponseEntity) this.restTemplate.exchange(request, Map.class); + ParameterizedTypeReference> stringObjectMap = new ParameterizedTypeReference>() { + }; + return this.restTemplate.exchange(request, stringObjectMap); } } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/test/java/smoketest/session/SampleSessionJdbcApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/test/java/smoketest/session/SampleSessionJdbcApplicationTests.java index 035bc528360..c989d223e50 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/test/java/smoketest/session/SampleSessionJdbcApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/src/test/java/smoketest/session/SampleSessionJdbcApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -94,12 +95,13 @@ class SampleSessionJdbcApplicationTests { return "Basic " + Base64.getEncoder().encodeToString("user:password".getBytes()); } - @SuppressWarnings("unchecked") private ResponseEntity> getSessions() { HttpHeaders headers = getHeaders(null); RequestEntity request = new RequestEntity<>(headers, HttpMethod.GET, URI.create("/actuator/sessions?username=user")); - return (ResponseEntity>) (ResponseEntity) this.restTemplate.exchange(request, Map.class); + ParameterizedTypeReference> stringObjectMap = new ParameterizedTypeReference>() { + }; + return this.restTemplate.exchange(request, stringObjectMap); } } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/test/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/test/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java index a99500bd5bd..ae6ffc25551 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/test/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/test/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.testsupport.testcontainers.DockerImageNames; +import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -83,10 +84,11 @@ public class SampleSessionMongoApplicationTests { return new RequestEntity<>(headers, HttpMethod.GET, uri); } - @SuppressWarnings("unchecked") private ResponseEntity> getSessions() { RequestEntity request = getRequestEntity(URI.create("/actuator/sessions?username=user")); - return (ResponseEntity>) (ResponseEntity) this.restTemplate.exchange(request, Map.class); + ParameterizedTypeReference> stringObjectMap = new ParameterizedTypeReference>() { + }; + return this.restTemplate.exchange(request, stringObjectMap); } } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java index 8863197968b..f65481b146e 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.testsupport.testcontainers.RedisContainer; +import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -81,10 +82,11 @@ public class SampleSessionRedisApplicationTests { return new RequestEntity<>(headers, HttpMethod.GET, uri); } - @SuppressWarnings("unchecked") private ResponseEntity> getSessions() { RequestEntity request = getRequestEntity(URI.create("/actuator/sessions?username=user")); - return (ResponseEntity>) (ResponseEntity) this.restTemplate.exchange(request, Map.class); + ParameterizedTypeReference> stringObjectMap = new ParameterizedTypeReference>() { + }; + return this.restTemplate.exchange(request, stringObjectMap); } } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml index f36e80423ec..4edd3072260 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-traditional/src/main/webapp/WEB-INF/web.xml @@ -22,10 +22,4 @@ / - - - - -