From d9ff26dd15d888b3c08e56106a41f4a915f465a4 Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Sun, 21 Jan 2018 13:47:20 +0300 Subject: [PATCH] fix generic type constraint issues and try to avoid "Generic wildcard types should not be used in return parameters" SonarQube squid:S1452 rule --- .../condition/ConditionMessage.java | 2 +- .../jdbc/DataSourceProperties.java | 2 +- .../SessionRepositoryFilterConfiguration.java | 3 ++- .../springframework/boot/SpringApplication.java | 17 +++++++++-------- .../boot/builder/SpringApplicationBuilder.java | 5 +++-- .../boot/jdbc/DataSourceBuilder.java | 4 ++-- .../servlet/AbstractFilterRegistrationBean.java | 3 ++- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java index e9919e4f53c2..c6f1c8fe5d25 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java @@ -420,7 +420,7 @@ protected String applyToItem(Object item) { } }; - public Collection applyTo(Collection items) { + public Collection applyTo(Collection items) { List result = new ArrayList<>(); for (Object item : items) { result.add(applyToItem(item)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 98ec7b74acdb..695bad726227 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -182,7 +182,7 @@ public void afterPropertiesSet() throws Exception { * @return a {@link DataSourceBuilder} initialized with the customizations defined on * this instance */ - public DataSourceBuilder initializeDataSourceBuilder() { + public DataSourceBuilder initializeDataSourceBuilder() { return DataSourceBuilder.create(getClassLoader()).type(getType()) .driverClassName(determineDriverClassName()).url(determineUrl()) .username(determineUsername()).password(determinePassword()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java index 23c188dfaa24..50129395cc82 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java @@ -26,6 +26,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.session.Session; import org.springframework.session.web.http.SessionRepositoryFilter; /** @@ -39,7 +40,7 @@ class SessionRepositoryFilterConfiguration { @Bean - public FilterRegistrationBean> sessionRepositoryFilterRegistration( + public FilterRegistrationBean> sessionRepositoryFilterRegistration( SessionProperties sessionProperties, SessionRepositoryFilter filter) { FilterRegistrationBean> registration = new FilterRegistrationBean<>( filter); 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 7766e454a3dc..8eedd2c9636c 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 @@ -45,6 +45,7 @@ import org.springframework.boot.context.properties.source.ConfigurationPropertySources; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotatedBeanDefinitionReader; @@ -225,9 +226,9 @@ public class SpringApplication { private boolean registerShutdownHook = true; - private List> initializers; + private List> initializers; - private List> listeners; + private List> listeners; private Map defaultProperties; @@ -1170,7 +1171,7 @@ private boolean isWebApplicationContext(Class applicationContextClass) { * @param initializers the initializers to set */ public void setInitializers( - Collection> initializers) { + Collection> initializers) { this.initializers = new ArrayList<>(); this.initializers.addAll(initializers); } @@ -1180,7 +1181,7 @@ public void setInitializers( * {@link ApplicationContext}. * @param initializers the initializers to add */ - public void addInitializers(ApplicationContextInitializer... initializers) { + public void addInitializers(ApplicationContextInitializer... initializers) { this.initializers.addAll(Arrays.asList(initializers)); } @@ -1189,7 +1190,7 @@ public void addInitializers(ApplicationContextInitializer... initializers) { * will be applied to the Spring {@link ApplicationContext}. * @return the initializers */ - public Set> getInitializers() { + public Set> getInitializers() { return asUnmodifiableOrderedSet(this.initializers); } @@ -1198,7 +1199,7 @@ public Set> getInitializers() { * and registered with the {@link ApplicationContext}. * @param listeners the listeners to set */ - public void setListeners(Collection> listeners) { + public void setListeners(Collection> listeners) { this.listeners = new ArrayList<>(); this.listeners.addAll(listeners); } @@ -1208,7 +1209,7 @@ public void setListeners(Collection> listeners) * registered with the {@link ApplicationContext}. * @param listeners the listeners to add */ - public void addListeners(ApplicationListener... listeners) { + public void addListeners(ApplicationListener... listeners) { this.listeners.addAll(Arrays.asList(listeners)); } @@ -1218,7 +1219,7 @@ public void addListeners(ApplicationListener... listeners) { * . * @return the listeners */ - public Set> getListeners() { + public Set> getListeners() { return asUnmodifiableOrderedSet(this.listeners); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java index cbc4cb323181..12f53511e406 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java @@ -33,6 +33,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; @@ -509,7 +510,7 @@ public SpringApplicationBuilder resourceLoader(ResourceLoader resourceLoader) { * @return the current builder */ public SpringApplicationBuilder initializers( - ApplicationContextInitializer... initializers) { + ApplicationContextInitializer... initializers) { this.application.addInitializers(initializers); return this; } @@ -522,7 +523,7 @@ public SpringApplicationBuilder initializers( * @param listeners some listeners to add * @return the current builder */ - public SpringApplicationBuilder listeners(ApplicationListener... listeners) { + public SpringApplicationBuilder listeners(ApplicationListener... listeners) { this.application.addListeners(listeners); return this; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java index f20da6cba833..52b469a0ecb6 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java @@ -57,11 +57,11 @@ public final class DataSourceBuilder { private Map properties = new HashMap<>(); - public static DataSourceBuilder create() { + public static DataSourceBuilder create() { return new DataSourceBuilder<>(null); } - public static DataSourceBuilder create(ClassLoader classLoader) { + public static DataSourceBuilder create(ClassLoader classLoader) { return new DataSourceBuilder<>(classLoader); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java index 9d5b130a7e93..1e0fbef4e87c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java @@ -27,6 +27,7 @@ import javax.servlet.Filter; import javax.servlet.FilterRegistration; import javax.servlet.FilterRegistration.Dynamic; +import javax.servlet.Servlet; import javax.servlet.ServletContext; import org.apache.commons.logging.Log; @@ -93,7 +94,7 @@ public void setServletRegistrationBeans( * @see #setServletNames * @see #setUrlPatterns */ - public Collection> getServletRegistrationBeans() { + public Collection> getServletRegistrationBeans() { return this.servletRegistrationBeans; }