Commit 9636350b authored by Andy Wilkinson's avatar Andy Wilkinson

Enable rawtypes compilation warnings

See gh-21271
parent 056d5f31
...@@ -157,7 +157,7 @@ class JavaConventions { ...@@ -157,7 +157,7 @@ class JavaConventions {
args.add("-parameters"); args.add("-parameters");
} }
if (JavaVersion.current() == JavaVersion.VERSION_1_8) { 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"));
} }
}); });
} }
......
...@@ -38,7 +38,6 @@ import org.springframework.boot.actuate.autoconfigure.info.InfoContributorAutoCo ...@@ -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.info.InfoEndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
import org.springframework.boot.actuate.endpoint.EndpointId; 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.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType; import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType;
...@@ -208,7 +207,7 @@ class ReactiveCloudFoundryActuatorAutoConfigurationTests { ...@@ -208,7 +207,7 @@ class ReactiveCloudFoundryActuatorAutoConfigurationTests {
.run((context) -> { .run((context) -> {
CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(context); CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(context);
Collection<ExposableWebEndpoint> endpoints = handlerMapping.getEndpoints(); Collection<ExposableWebEndpoint> endpoints = handlerMapping.getEndpoints();
List<EndpointId> endpointIds = endpoints.stream().map(ExposableEndpoint::getEndpointId) List<EndpointId> endpointIds = endpoints.stream().map(ExposableWebEndpoint::getEndpointId)
.collect(Collectors.toList()); .collect(Collectors.toList());
assertThat(endpointIds).contains(EndpointId.of("test")); assertThat(endpointIds).contains(EndpointId.of("test"));
}); });
......
...@@ -47,12 +47,12 @@ class JerseyEndpointIntegrationTests { ...@@ -47,12 +47,12 @@ class JerseyEndpointIntegrationTests {
@Test @Test
void linksAreProvidedToAllEndpointTypes() { void linksAreProvidedToAllEndpointTypes() {
testJerseyEndpoints(new Class[] { EndpointsConfiguration.class, ResourceConfigConfiguration.class }); testJerseyEndpoints(new Class<?>[] { EndpointsConfiguration.class, ResourceConfigConfiguration.class });
} }
@Test @Test
void actuatorEndpointsWhenUserProvidedResourceConfigBeanNotAvailable() { void actuatorEndpointsWhenUserProvidedResourceConfigBeanNotAvailable() {
testJerseyEndpoints(new Class[] { EndpointsConfiguration.class }); testJerseyEndpoints(new Class<?>[] { EndpointsConfiguration.class });
} }
protected void testJerseyEndpoints(Class<?>[] userConfigurations) { protected void testJerseyEndpoints(Class<?>[] userConfigurations) {
......
...@@ -25,7 +25,6 @@ import java.util.stream.Collectors; ...@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.endpoint.EndpointId; 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.DiscoveredEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
...@@ -114,7 +113,7 @@ class ControllerEndpointDiscovererTests { ...@@ -114,7 +113,7 @@ class ControllerEndpointDiscovererTests {
this.contextRunner.withUserConfiguration(WithRegularEndpointConfiguration.class) this.contextRunner.withUserConfiguration(WithRegularEndpointConfiguration.class)
.run(assertDiscoverer((discoverer) -> { .run(assertDiscoverer((discoverer) -> {
Collection<ExposableControllerEndpoint> endpoints = discoverer.getEndpoints(); Collection<ExposableControllerEndpoint> endpoints = discoverer.getEndpoints();
List<EndpointId> ids = endpoints.stream().map(ExposableEndpoint::getEndpointId) List<EndpointId> ids = endpoints.stream().map(ExposableControllerEndpoint::getEndpointId)
.collect(Collectors.toList()); .collect(Collectors.toList());
assertThat(ids).containsOnly(EndpointId.of("testcontroller"), EndpointId.of("testrestcontroller")); assertThat(ids).containsOnly(EndpointId.of("testcontroller"), EndpointId.of("testrestcontroller"));
})); }));
......
...@@ -32,7 +32,6 @@ import javax.servlet.ServletResponse; ...@@ -32,7 +32,6 @@ import javax.servlet.ServletResponse;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.endpoint.EndpointId; 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.DiscoveredEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
...@@ -97,7 +96,7 @@ class ServletEndpointDiscovererTests { ...@@ -97,7 +96,7 @@ class ServletEndpointDiscovererTests {
this.contextRunner.withUserConfiguration(WithRegularEndpointConfiguration.class) this.contextRunner.withUserConfiguration(WithRegularEndpointConfiguration.class)
.run(assertDiscoverer((discoverer) -> { .run(assertDiscoverer((discoverer) -> {
Collection<ExposableServletEndpoint> endpoints = discoverer.getEndpoints(); Collection<ExposableServletEndpoint> endpoints = discoverer.getEndpoints();
List<EndpointId> ids = endpoints.stream().map(ExposableEndpoint::getEndpointId) List<EndpointId> ids = endpoints.stream().map(ExposableServletEndpoint::getEndpointId)
.collect(Collectors.toList()); .collect(Collectors.toList());
assertThat(ids).containsOnly(EndpointId.of("testservlet")); assertThat(ids).containsOnly(EndpointId.of("testservlet"));
})); }));
......
...@@ -46,13 +46,13 @@ class ConfigurationPropertiesAutoConfigurationTests { ...@@ -46,13 +46,13 @@ class ConfigurationPropertiesAutoConfigurationTests {
@Test @Test
void processAnnotatedBean() { 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"); assertThat(this.context.getBean(SampleBean.class).getName()).isEqualTo("test");
} }
@Test @Test
void processAnnotatedBeanNoAutoConfig() { 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"); assertThat(this.context.getBean(SampleBean.class).getName()).isEqualTo("default");
} }
......
...@@ -136,6 +136,7 @@ class BasicErrorControllerIntegrationTests { ...@@ -136,6 +136,7 @@ class BasicErrorControllerIntegrationTests {
} }
@Test @Test
@SuppressWarnings("rawtypes")
void testErrorForMachineClientAlwaysParamsWithoutMessage() { void testErrorForMachineClientAlwaysParamsWithoutMessage() {
load("--server.error.include-exception=true", "--server.error.include-message=always"); load("--server.error.include-exception=true", "--server.error.include-message=always");
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/noMessage"), Map.class); ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(createUrl("/noMessage"), Map.class);
......
...@@ -159,7 +159,7 @@ public class DependencyManagementBomTransformation extends AnnotatedNodeASTTrans ...@@ -159,7 +159,7 @@ public class DependencyManagementBomTransformation extends AnnotatedNodeASTTrans
} }
private void updateDependencyResolutionContext(List<Map<String, String>> bomDependencies) { private void updateDependencyResolutionContext(List<Map<String, String>> 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(); DefaultModelBuilder modelBuilder = new DefaultModelBuilderFactory().newInstance();
for (URI uri : uris) { for (URI uri : uris) {
try { try {
......
...@@ -109,7 +109,7 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi ...@@ -109,7 +109,7 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi
private void addFilters(ConfigurableMockMvcBuilder<?> builder) { private void addFilters(ConfigurableMockMvcBuilder<?> builder) {
FilterRegistrationBeans registrations = new FilterRegistrationBeans(this.context); FilterRegistrationBeans registrations = new FilterRegistrationBeans(this.context);
registrations.stream().map(AbstractFilterRegistrationBean.class::cast) registrations.stream().map(AbstractFilterRegistrationBean.class::cast)
.filter(AbstractFilterRegistrationBean::isEnabled) .filter(AbstractFilterRegistrationBean<?>::isEnabled)
.forEach((registration) -> addFilter(builder, registration)); .forEach((registration) -> addFilter(builder, registration));
} }
......
...@@ -36,7 +36,7 @@ public final class WebServiceClientExcludeFilter ...@@ -36,7 +36,7 @@ public final class WebServiceClientExcludeFilter
protected WebServiceClientExcludeFilter(Class<?> testClass) { protected WebServiceClientExcludeFilter(Class<?> testClass) {
super(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 @Override
......
...@@ -310,7 +310,7 @@ public class SpringApplication { ...@@ -310,7 +310,7 @@ public class SpringApplication {
Banner printedBanner = printBanner(environment); Banner printedBanner = printBanner(environment);
context = createApplicationContext(); context = createApplicationContext();
exceptionReporters = getSpringFactoriesInstances(SpringBootExceptionReporter.class, exceptionReporters = getSpringFactoriesInstances(SpringBootExceptionReporter.class,
new Class[] { ConfigurableApplicationContext.class }, context); new Class<?>[] { ConfigurableApplicationContext.class }, context);
prepareContext(context, environment, listeners, applicationArguments, printedBanner); prepareContext(context, environment, listeners, applicationArguments, printedBanner);
refreshContext(context); refreshContext(context);
afterRefresh(context, applicationArguments); afterRefresh(context, applicationArguments);
......
...@@ -257,7 +257,7 @@ class ConfigurationPropertiesTests { ...@@ -257,7 +257,7 @@ class ConfigurationPropertiesTests {
AnnotationConfigApplicationContext parent = load(BasicConfiguration.class, "name=parent"); AnnotationConfigApplicationContext parent = load(BasicConfiguration.class, "name=parent");
this.context = new AnnotationConfigApplicationContext(); this.context = new AnnotationConfigApplicationContext();
this.context.setParent(parent); 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(this.context.getBean(BasicProperties.class)).isNotNull();
assertThat(parent.getBean(BasicProperties.class)).isNotNull(); assertThat(parent.getBean(BasicProperties.class)).isNotNull();
assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("parent"); assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("parent");
......
...@@ -97,7 +97,7 @@ class AtomikosPropertiesTests { ...@@ -97,7 +97,7 @@ class AtomikosPropertiesTests {
} }
private MapEntry<?, ?>[] defaultOf(Properties defaultSettings, String... keys) { 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++) { for (int i = 0; i < keys.length; i++) {
String key = keys[i]; String key = keys[i];
entries[i] = entry(key, defaultSettings.get(key)); entries[i] = entry(key, defaultSettings.get(key));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment