From 9636350b0bbcebcaa5e81c3688ed87906693a4be Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 4 Jun 2020 13:18:03 +0100 Subject: [PATCH] Enable rawtypes compilation warnings See gh-21271 --- .../java/org/springframework/boot/build/JavaConventions.java | 2 +- .../ReactiveCloudFoundryActuatorAutoConfigurationTests.java | 3 +-- .../integrationtest/JerseyEndpointIntegrationTests.java | 4 ++-- .../web/annotation/ControllerEndpointDiscovererTests.java | 3 +-- .../web/annotation/ServletEndpointDiscovererTests.java | 3 +-- .../ConfigurationPropertiesAutoConfigurationTests.java | 4 ++-- .../servlet/error/BasicErrorControllerIntegrationTests.java | 1 + .../cli/compiler/DependencyManagementBomTransformation.java | 2 +- .../web/servlet/SpringBootMockMvcBuilderCustomizer.java | 2 +- .../webservices/client/WebServiceClientExcludeFilter.java | 2 +- .../main/java/org/springframework/boot/SpringApplication.java | 2 +- .../boot/context/properties/ConfigurationPropertiesTests.java | 2 +- .../boot/jta/atomikos/AtomikosPropertiesTests.java | 2 +- 13 files changed, 15 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java index 776afeb831..74b6961d69 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java @@ -157,7 +157,7 @@ class JavaConventions { args.add("-parameters"); } if (JavaVersion.current() == JavaVersion.VERSION_1_8) { - args.addAll(Arrays.asList("-Werror", "-Xlint:unchecked", "-Xlint:deprecation")); + args.addAll(Arrays.asList("-Werror", "-Xlint:unchecked", "-Xlint:deprecation", "-Xlint:rawtypes")); } }); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java index 93836b307c..40de0c2449 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java @@ -38,7 +38,6 @@ import org.springframework.boot.actuate.autoconfigure.info.InfoContributorAutoCo import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration; import org.springframework.boot.actuate.endpoint.EndpointId; -import org.springframework.boot.actuate.endpoint.ExposableEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType; @@ -208,7 +207,7 @@ class ReactiveCloudFoundryActuatorAutoConfigurationTests { .run((context) -> { CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(context); Collection endpoints = handlerMapping.getEndpoints(); - List endpointIds = endpoints.stream().map(ExposableEndpoint::getEndpointId) + List endpointIds = endpoints.stream().map(ExposableWebEndpoint::getEndpointId) .collect(Collectors.toList()); assertThat(endpointIds).contains(EndpointId.of("test")); }); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java index d04bb5a283..5c2527bf7a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java @@ -47,12 +47,12 @@ class JerseyEndpointIntegrationTests { @Test void linksAreProvidedToAllEndpointTypes() { - testJerseyEndpoints(new Class[] { EndpointsConfiguration.class, ResourceConfigConfiguration.class }); + testJerseyEndpoints(new Class[] { EndpointsConfiguration.class, ResourceConfigConfiguration.class }); } @Test void actuatorEndpointsWhenUserProvidedResourceConfigBeanNotAvailable() { - testJerseyEndpoints(new Class[] { EndpointsConfiguration.class }); + testJerseyEndpoints(new Class[] { EndpointsConfiguration.class }); } protected void testJerseyEndpoints(Class[] userConfigurations) { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java index cf62b73c65..49c7b1509b 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java @@ -25,7 +25,6 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.endpoint.EndpointId; -import org.springframework.boot.actuate.endpoint.ExposableEndpoint; import org.springframework.boot.actuate.endpoint.annotation.DiscoveredEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; @@ -114,7 +113,7 @@ class ControllerEndpointDiscovererTests { this.contextRunner.withUserConfiguration(WithRegularEndpointConfiguration.class) .run(assertDiscoverer((discoverer) -> { Collection endpoints = discoverer.getEndpoints(); - List ids = endpoints.stream().map(ExposableEndpoint::getEndpointId) + List ids = endpoints.stream().map(ExposableControllerEndpoint::getEndpointId) .collect(Collectors.toList()); assertThat(ids).containsOnly(EndpointId.of("testcontroller"), EndpointId.of("testrestcontroller")); })); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java index 7bb6ff9aec..3ed067221a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java @@ -32,7 +32,6 @@ import javax.servlet.ServletResponse; import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.endpoint.EndpointId; -import org.springframework.boot.actuate.endpoint.ExposableEndpoint; import org.springframework.boot.actuate.endpoint.annotation.DiscoveredEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; @@ -97,7 +96,7 @@ class ServletEndpointDiscovererTests { this.contextRunner.withUserConfiguration(WithRegularEndpointConfiguration.class) .run(assertDiscoverer((discoverer) -> { Collection endpoints = discoverer.getEndpoints(); - List ids = endpoints.stream().map(ExposableEndpoint::getEndpointId) + List ids = endpoints.stream().map(ExposableServletEndpoint::getEndpointId) .collect(Collectors.toList()); assertThat(ids).containsOnly(EndpointId.of("testservlet")); })); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java index 1ba583cdac..498a6d2558 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java @@ -46,13 +46,13 @@ class ConfigurationPropertiesAutoConfigurationTests { @Test void processAnnotatedBean() { - load(new Class[] { AutoConfig.class, SampleBean.class }, "foo.name:test"); + load(new Class[] { AutoConfig.class, SampleBean.class }, "foo.name:test"); assertThat(this.context.getBean(SampleBean.class).getName()).isEqualTo("test"); } @Test void processAnnotatedBeanNoAutoConfig() { - load(new Class[] { SampleBean.class }, "foo.name:test"); + load(new Class[] { SampleBean.class }, "foo.name:test"); assertThat(this.context.getBean(SampleBean.class).getName()).isEqualTo("default"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java index 61d6abda8c..bc3bb180a2 100755 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java @@ -136,6 +136,7 @@ class BasicErrorControllerIntegrationTests { } @Test + @SuppressWarnings("rawtypes") void testErrorForMachineClientAlwaysParamsWithoutMessage() { load("--server.error.include-exception=true", "--server.error.include-message=always"); ResponseEntity entity = new TestRestTemplate().getForEntity(createUrl("/noMessage"), Map.class); diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java index 1b581a1f7c..f613953666 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java @@ -159,7 +159,7 @@ public class DependencyManagementBomTransformation extends AnnotatedNodeASTTrans } private void updateDependencyResolutionContext(List> bomDependencies) { - URI[] uris = Grape.getInstance().resolve(null, bomDependencies.toArray(new Map[0])); + URI[] uris = Grape.getInstance().resolve(null, bomDependencies.toArray(new Map[0])); DefaultModelBuilder modelBuilder = new DefaultModelBuilderFactory().newInstance(); for (URI uri : uris) { try { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java index 9d2e30223d..bb27b575d1 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java @@ -109,7 +109,7 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi private void addFilters(ConfigurableMockMvcBuilder builder) { FilterRegistrationBeans registrations = new FilterRegistrationBeans(this.context); registrations.stream().map(AbstractFilterRegistrationBean.class::cast) - .filter(AbstractFilterRegistrationBean::isEnabled) + .filter(AbstractFilterRegistrationBean::isEnabled) .forEach((registration) -> addFilter(builder, registration)); } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientExcludeFilter.java index 684dfd34c8..91b31daf18 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientExcludeFilter.java @@ -36,7 +36,7 @@ public final class WebServiceClientExcludeFilter protected WebServiceClientExcludeFilter(Class testClass) { super(testClass); - this.components = getAnnotation().getValue("components", Class[].class).orElse(new Class[0]); + this.components = getAnnotation().getValue("components", Class[].class).orElse(new Class[0]); } @Override diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index b35cccb6c4..4a2d698aff 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -310,7 +310,7 @@ public class SpringApplication { Banner printedBanner = printBanner(environment); context = createApplicationContext(); exceptionReporters = getSpringFactoriesInstances(SpringBootExceptionReporter.class, - new Class[] { ConfigurableApplicationContext.class }, context); + new Class[] { ConfigurableApplicationContext.class }, context); prepareContext(context, environment, listeners, applicationArguments, printedBanner); refreshContext(context); afterRefresh(context, applicationArguments); 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 54da50ac43..3ebdac2118 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 @@ -257,7 +257,7 @@ class ConfigurationPropertiesTests { AnnotationConfigApplicationContext parent = load(BasicConfiguration.class, "name=parent"); this.context = new AnnotationConfigApplicationContext(); this.context.setParent(parent); - load(new Class[] { BasicConfiguration.class, BasicPropertiesConsumer.class }, "name=child"); + load(new Class[] { BasicConfiguration.class, BasicPropertiesConsumer.class }, "name=child"); assertThat(this.context.getBean(BasicProperties.class)).isNotNull(); assertThat(parent.getBean(BasicProperties.class)).isNotNull(); assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("parent"); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java index 18af471585..267a9d4d66 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java @@ -97,7 +97,7 @@ class AtomikosPropertiesTests { } private MapEntry[] defaultOf(Properties defaultSettings, String... keys) { - MapEntry[] entries = new MapEntry[keys.length]; + MapEntry[] entries = new MapEntry[keys.length]; for (int i = 0; i < keys.length; i++) { String key = keys[i]; entries[i] = entry(key, defaultSettings.get(key));