Remove redundant modifiers

This commit is contained in:
Phillip Webb
2015-09-08 15:06:44 -07:00
parent 460ca75fce
commit e07df7e4c6
210 changed files with 325 additions and 325 deletions

View File

@@ -142,7 +142,7 @@ public abstract class AutoConfigurationPackages {
private boolean loggedBasePackageInfo;
public BasePackages(String... names) {
BasePackages(String... names) {
List<String> packages = new ArrayList<String>();
for (String name : names) {
if (StringUtils.hasText(name)) {

View File

@@ -46,7 +46,7 @@ class AutoConfigurationSorter {
private final CachingMetadataReaderFactory metadataReaderFactory;
public AutoConfigurationSorter(ResourceLoader resourceLoader) {
AutoConfigurationSorter(ResourceLoader resourceLoader) {
Assert.notNull(resourceLoader, "ResourceLoader must not be null");
this.metadataReaderFactory = new CachingMetadataReaderFactory(resourceLoader);
}
@@ -105,7 +105,7 @@ class AutoConfigurationSorter {
private final Map<String, AutoConfigurationClass> classes = new HashMap<String, AutoConfigurationClass>();
public AutoConfigurationClasses(MetadataReaderFactory metadataReaderFactory,
AutoConfigurationClasses(MetadataReaderFactory metadataReaderFactory,
Collection<String> classNames) throws IOException {
for (String className : classNames) {
MetadataReader metadataReader = metadataReaderFactory
@@ -135,7 +135,7 @@ class AutoConfigurationSorter {
private final AnnotationMetadata metadata;
public AutoConfigurationClass(MetadataReader metadataReader) {
AutoConfigurationClass(MetadataReader metadataReader) {
this.metadata = metadataReader.getAnnotationMetadata();
}

View File

@@ -207,7 +207,7 @@ public class MessageSourceAutoConfiguration {
"hibernate-entitymanager-", "hibernate-validator-", "logback-classic-",
"logback-core-", "thymeleaf-" };
public SkipPatternPathMatchingResourcePatternResolver(ClassLoader classLoader) {
SkipPatternPathMatchingResourcePatternResolver(ClassLoader classLoader) {
super(classLoader);
}

View File

@@ -65,7 +65,7 @@ class BasicBatchConfigurer implements BatchConfigurer {
* @param properties the batch properties
* @param dataSource the underlying data source
*/
public BasicBatchConfigurer(BatchProperties properties, DataSource dataSource) {
BasicBatchConfigurer(BatchProperties properties, DataSource dataSource) {
this(properties, dataSource, null);
}
@@ -75,7 +75,7 @@ class BasicBatchConfigurer implements BatchConfigurer {
* @param dataSource the underlying data source
* @param entityManagerFactory the entity manager factory (or {@code null})
*/
public BasicBatchConfigurer(BatchProperties properties, DataSource dataSource,
BasicBatchConfigurer(BatchProperties properties, DataSource dataSource,
EntityManagerFactory entityManagerFactory) {
this.properties = properties;
this.entityManagerFactory = entityManagerFactory;

View File

@@ -71,7 +71,7 @@ class EhCacheCacheConfiguration {
*/
static class ConfigAvailableCondition extends ResourceCondition {
public ConfigAvailableCondition() {
ConfigAvailableCondition() {
super("EhCache", "spring.cache.ehcache", "config", "classpath:/ehcache.xml");
}

View File

@@ -108,7 +108,7 @@ class HazelcastCacheConfiguration {
*/
static class ConfigAvailableCondition extends HazelcastConfigResourceCondition {
public ConfigAvailableCondition() {
ConfigAvailableCondition() {
super("spring.cache.hazelcast", "config");
}
@@ -119,7 +119,7 @@ class HazelcastCacheConfiguration {
private final HazelcastInstance hazelcastInstance;
public CloseableHazelcastCacheManager(HazelcastInstance hazelcastInstance) {
CloseableHazelcastCacheManager(HazelcastInstance hazelcastInstance) {
super(hazelcastInstance);
this.hazelcastInstance = hazelcastInstance;
}

View File

@@ -141,7 +141,7 @@ class JCacheCacheConfiguration {
@Order(Ordered.LOWEST_PRECEDENCE)
static class JCacheAvailableCondition extends AnyNestedCondition {
public JCacheAvailableCondition() {
JCacheAvailableCondition() {
super(ConfigurationPhase.REGISTER_BEAN);
}

View File

@@ -45,7 +45,7 @@ abstract class AbstractNestedCondition extends SpringBootCondition implements
private final ConfigurationPhase configurationPhase;
public AbstractNestedCondition(ConfigurationPhase configurationPhase) {
AbstractNestedCondition(ConfigurationPhase configurationPhase) {
Assert.notNull(configurationPhase, "ConfigurationPhase must not be null");
this.configurationPhase = configurationPhase;
}
@@ -108,7 +108,7 @@ abstract class AbstractNestedCondition extends SpringBootCondition implements
private final Map<AnnotationMetadata, List<Condition>> memberConditions;
public MemberConditions(ConditionContext context, String className) {
MemberConditions(ConditionContext context, String className) {
this.context = context;
this.readerFactory = new SimpleMetadataReaderFactory(
context.getResourceLoader());

View File

@@ -188,7 +188,7 @@ abstract class BeanTypeRegistry {
private final ListableBeanFactory beanFactory;
public DefaultBeanTypeRegistry(ListableBeanFactory beanFactory) {
DefaultBeanTypeRegistry(ListableBeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@@ -236,7 +236,7 @@ abstract class BeanTypeRegistry {
private int lastBeanDefinitionCount = 0;
public OptimizedBeanTypeRegistry(DefaultListableBeanFactory beanFactory) {
OptimizedBeanTypeRegistry(DefaultListableBeanFactory beanFactory) {
this.beanFactory = beanFactory;
}

View File

@@ -101,7 +101,7 @@ public @interface ConditionalOnJava {
private final String name;
private JavaVersion(int value, String name) {
JavaVersion(int value, String name) {
this.value = value;
this.name = name;
}

View File

@@ -252,7 +252,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
private final SearchStrategy strategy;
public BeanSearchSpec(ConditionContext context, AnnotatedTypeMetadata metadata,
BeanSearchSpec(ConditionContext context, AnnotatedTypeMetadata metadata,
Class<?> annotationType) {
this.annotationType = annotationType;
MultiValueMap<String, Object> attributes = metadata
@@ -388,7 +388,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
private static class SingleCandidateBeanSearchSpec extends BeanSearchSpec {
public SingleCandidateBeanSearchSpec(ConditionContext context,
SingleCandidateBeanSearchSpec(ConditionContext context,
AnnotatedTypeMetadata metadata, Class<?> annotationType) {
super(context, metadata, annotationType);
}

View File

@@ -153,7 +153,7 @@ public class FlywayAutoConfiguration {
private final FlywayMigrationStrategy migrationStrategy;
public FlywayMigrationInitializer(Flyway flyway,
FlywayMigrationInitializer(Flyway flyway,
FlywayMigrationStrategy migrationStrategy) {
this.flyway = flyway;
this.migrationStrategy = migrationStrategy;

View File

@@ -86,7 +86,7 @@ public class HazelcastAutoConfiguration {
*/
static class ConfigAvailableCondition extends HazelcastConfigResourceCondition {
public ConfigAvailableCondition() {
ConfigAvailableCondition() {
super("spring.hazelcast", "config");
}

View File

@@ -93,11 +93,11 @@ enum DatabaseDriver {
private final String xaDataSourceClassName;
private DatabaseDriver(String driverClassName) {
DatabaseDriver(String driverClassName) {
this(driverClassName, null);
}
private DatabaseDriver(String driverClassName, String xaDataSourceClassName) {
DatabaseDriver(String driverClassName, String xaDataSourceClassName) {
this.driverClassName = driverClassName;
this.xaDataSourceClassName = xaDataSourceClassName;
}

View File

@@ -64,8 +64,7 @@ public enum EmbeddedDatabaseConnection {
private final String url;
private EmbeddedDatabaseConnection(EmbeddedDatabaseType type, String driverClass,
String url) {
EmbeddedDatabaseConnection(EmbeddedDatabaseType type, String driverClass, String url) {
this.type = type;
this.driverClass = driverClass;
this.url = url;

View File

@@ -86,7 +86,7 @@ public class JndiConnectionFactoryAutoConfiguration {
*/
static class JndiOrPropertyCondition extends AnyNestedCondition {
public JndiOrPropertyCondition() {
JndiOrPropertyCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
}

View File

@@ -35,7 +35,7 @@ class ActiveMQConnectionFactoryFactory {
private final ActiveMQProperties properties;
public ActiveMQConnectionFactoryFactory(ActiveMQProperties properties) {
ActiveMQConnectionFactoryFactory(ActiveMQProperties properties) {
Assert.notNull(properties, "Properties must not be null");
this.properties = properties;
}

View File

@@ -47,7 +47,7 @@ class ArtemisConnectionFactoryFactory {
private final ListableBeanFactory beanFactory;
public ArtemisConnectionFactoryFactory(ListableBeanFactory beanFactory,
ArtemisConnectionFactoryFactory(ListableBeanFactory beanFactory,
ArtemisProperties properties) {
Assert.notNull(beanFactory, "BeanFactory must not be null");
Assert.notNull(properties, "Properties must not be null");

View File

@@ -39,7 +39,7 @@ class ArtemisEmbeddedConfigurationFactory {
private final ArtemisProperties.Embedded properties;
public ArtemisEmbeddedConfigurationFactory(ArtemisProperties properties) {
ArtemisEmbeddedConfigurationFactory(ArtemisProperties properties) {
this.properties = properties.getEmbedded();
}

View File

@@ -47,7 +47,7 @@ class HornetQConnectionFactoryFactory {
private final ListableBeanFactory beanFactory;
public HornetQConnectionFactoryFactory(ListableBeanFactory beanFactory,
HornetQConnectionFactoryFactory(ListableBeanFactory beanFactory,
HornetQProperties properties) {
Assert.notNull(beanFactory, "BeanFactory must not be null");
Assert.notNull(properties, "Properties must not be null");

View File

@@ -40,7 +40,7 @@ class HornetQEmbeddedConfigurationFactory {
private final Embedded properties;
public HornetQEmbeddedConfigurationFactory(HornetQProperties properties) {
HornetQEmbeddedConfigurationFactory(HornetQProperties properties) {
this.properties = properties.getEmbedded();
}

View File

@@ -32,7 +32,7 @@ class SpringTransaction implements Transaction {
private final TransactionStatus transactionStatus;
public SpringTransaction(TransactionStatus transactionStatus) {
SpringTransaction(TransactionStatus transactionStatus) {
this.transactionStatus = transactionStatus;
}

View File

@@ -100,7 +100,7 @@ public class MailSenderAutoConfiguration {
*/
static class MailSenderCondition extends AnyNestedCondition {
public MailSenderCondition() {
MailSenderCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
}

View File

@@ -195,8 +195,7 @@ public class MongoDataAutoConfiguration implements BeanClassLoaderAware {
private final MongoProperties properties;
public GridFsMongoDbFactory(MongoDbFactory mongoDbFactory,
MongoProperties properties) {
GridFsMongoDbFactory(MongoDbFactory mongoDbFactory, MongoProperties properties) {
Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null");
Assert.notNull(properties, "Properties must not be null");
this.mongoDbFactory = mongoDbFactory;

View File

@@ -41,4 +41,4 @@ public class MongoClientDependsOnBeanFactoryPostProcessor extends
super(MongoClient.class, MongoClientFactoryBean.class, dependsOn);
}
}
}

View File

@@ -69,7 +69,7 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration {
/**
* {@code NoJtaPlatform} implementations for various Hibernate versions.
*/
private static final String NO_JTA_PLATFORM_CLASSES[] = {
private static final String[] NO_JTA_PLATFORM_CLASSES = {
"org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform",
"org.hibernate.service.jta.platform.internal.NoJtaPlatform" };
@@ -77,7 +77,7 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration {
* {@code WebSphereExtendedJtaPlatform} implementations for various Hibernate
* versions.
*/
private static final String WEBSHERE_JTA_PLATFORM_CLASSES[] = {
private static final String[] WEBSHERE_JTA_PLATFORM_CLASSES = {
"org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform",
"org.hibernate.service.jta.platform.internal.WebSphereExtendedJtaPlatform", };

View File

@@ -112,8 +112,7 @@ public class AuthenticationManagerConfiguration {
private final SecurityProperties securityProperties;
@Autowired
public SpringBootAuthenticationConfigurerAdapter(
SecurityProperties securityProperties) {
SpringBootAuthenticationConfigurerAdapter(SecurityProperties securityProperties) {
this.securityProperties = securityProperties;
}
@@ -151,8 +150,7 @@ public class AuthenticationManagerConfiguration {
private final SecurityProperties securityProperties;
public DefaultInMemoryUserDetailsManagerConfigurer(
SecurityProperties securityProperties) {
DefaultInMemoryUserDetailsManagerConfigurer(SecurityProperties securityProperties) {
this.securityProperties = securityProperties;
}

View File

@@ -64,7 +64,7 @@ public class BootGlobalAuthenticationConfiguration {
private final ApplicationContext context;
public BootGlobalAuthenticationConfigurationAdapter(ApplicationContext context) {
BootGlobalAuthenticationConfigurationAdapter(ApplicationContext context) {
this.context = context;
}

View File

@@ -91,7 +91,7 @@ public class OAuth2SsoCustomConfiguration implements ImportAware, BeanPostProces
private SsoSecurityConfigurer configurer;
public SsoSecurityAdapter(BeanFactory beanFactory) {
SsoSecurityAdapter(BeanFactory beanFactory) {
this.configurer = new SsoSecurityConfigurer(beanFactory);
}

View File

@@ -31,7 +31,7 @@ class SsoSecurityConfigurer {
private BeanFactory beanFactory;
public SsoSecurityConfigurer(BeanFactory beanFactory) {
SsoSecurityConfigurer(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
}
@@ -62,7 +62,7 @@ class SsoSecurityConfigurer {
private OAuth2ClientAuthenticationProcessingFilter filter;
public OAuth2ClientAuthenticationConfigurer(
OAuth2ClientAuthenticationConfigurer(
OAuth2ClientAuthenticationProcessingFilter filter) {
this.filter = filter;
}

View File

@@ -68,7 +68,7 @@ public class OAuth2MethodSecurityConfiguration implements BeanFactoryPostProcess
private ApplicationContext applicationContext;
public OAuth2ExpressionHandlerInjectionPostProcessor(
OAuth2ExpressionHandlerInjectionPostProcessor(
ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}

View File

@@ -171,7 +171,7 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom
private PlaceholderResolver resolver;
public SpelView(String template) {
SpelView(String template) {
this.template = template;
this.context.addPropertyAccessor(new MapAccessor());
this.helper = new PropertyPlaceholderHelper("${", "}");
@@ -207,7 +207,7 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom
private final StandardEvaluationContext context;
public SpelPlaceholderResolver(StandardEvaluationContext context) {
SpelPlaceholderResolver(StandardEvaluationContext context) {
this.context = context;
}

View File

@@ -56,7 +56,7 @@ class GsonHttpMessageConvertersConfiguration {
private static class PreferGsonOrMissingJacksonCondition extends AnyNestedCondition {
public PreferGsonOrMissingJacksonCondition() {
PreferGsonOrMissingJacksonCondition() {
super(ConfigurationPhase.REGISTER_BEAN);
}

View File

@@ -1019,7 +1019,7 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord
private final Session session;
public SessionConfiguringInitializer(Session session) {
SessionConfiguringInitializer(Session session) {
this.session = session;
}

View File

@@ -80,7 +80,7 @@ public class AllNestedConditionsTests {
static class OnPropertyAAndBCondition extends AllNestedConditions {
public OnPropertyAAndBCondition() {
OnPropertyAAndBCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
}

View File

@@ -82,7 +82,7 @@ public class AnyNestedConditionTests {
static class OnPropertyAorBCondition extends AnyNestedCondition {
public OnPropertyAorBCondition() {
OnPropertyAorBCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
}

View File

@@ -291,9 +291,10 @@ public class ConditionEvaluationReportTests {
ConfigurationCondition {
private final ConfigurationPhase phase;
private final boolean match;
public TestMatchCondition(ConfigurationPhase phase, boolean match) {
TestMatchCondition(ConfigurationPhase phase, boolean match) {
this.phase = phase;
this.match = match;
}
@@ -313,7 +314,7 @@ public class ConditionEvaluationReportTests {
static class MatchParseCondition extends TestMatchCondition {
public MatchParseCondition() {
MatchParseCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION, true);
}
@@ -321,7 +322,7 @@ public class ConditionEvaluationReportTests {
static class MatchBeanCondition extends TestMatchCondition {
public MatchBeanCondition() {
MatchBeanCondition() {
super(ConfigurationPhase.REGISTER_BEAN, true);
}
@@ -329,7 +330,7 @@ public class ConditionEvaluationReportTests {
static class NoMatchParseCondition extends TestMatchCondition {
public NoMatchParseCondition() {
NoMatchParseCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION, false);
}
@@ -337,7 +338,7 @@ public class ConditionEvaluationReportTests {
static class NoMatchBeanCondition extends TestMatchCondition {
public NoMatchBeanCondition() {
NoMatchBeanCondition() {
super(ConfigurationPhase.REGISTER_BEAN, false);
}

View File

@@ -80,7 +80,7 @@ public class NoneNestedConditionsTests {
static class NeitherPropertyANorPropertyBCondition extends NoneNestedConditions {
public NeitherPropertyANorPropertyBCondition() {
NeitherPropertyANorPropertyBCondition() {
super(ConfigurationPhase.PARSE_CONFIGURATION);
}

View File

@@ -93,14 +93,15 @@ public class ResourceConditionTests {
private static class DefaultLocationResourceCondition extends ResourceCondition {
public DefaultLocationResourceCondition() {
DefaultLocationResourceCondition() {
super("test", "spring.foo.test.", "config", "classpath:/logging.properties");
}
}
private static class UnknownDefaultLocationResourceCondition extends
ResourceCondition {
public UnknownDefaultLocationResourceCondition() {
UnknownDefaultLocationResourceCondition() {
super("test", "spring.foo.test", "config",
"classpath:/this-file-does-not-exist.xml");
}

View File

@@ -108,7 +108,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests {
private final EntityManager entityManger;
public TestRepository(EntityManager entityManager) {
TestRepository(EntityManager entityManager) {
this.entityManger = entityManager;
}

View File

@@ -185,7 +185,7 @@ public class JooqAutoConfigurationTests {
private final Matcher<? super String> matcher;
public AssertFetch(DSLContext dsl, String sql, Matcher<? super String> matcher) {
AssertFetch(DSLContext dsl, String sql, Matcher<? super String> matcher) {
this.dsl = dsl;
this.sql = sql;
this.matcher = matcher;
@@ -204,7 +204,7 @@ public class JooqAutoConfigurationTests {
private final String[] sql;
public ExecuteSql(DSLContext dsl, String... sql) {
ExecuteSql(DSLContext dsl, String... sql) {
this.dsl = dsl;
this.sql = sql;
}

View File

@@ -178,7 +178,7 @@ public class BasicErrorControllerIntegrationTests {
@SuppressWarnings("serial")
private static class NoReasonExpectedException extends RuntimeException {
public NoReasonExpectedException(String message) {
NoReasonExpectedException(String message) {
super(message);
}

View File

@@ -189,7 +189,7 @@ public class BasicErrorControllerMockMvcTests {
@ResponseStatus(HttpStatus.NOT_FOUND)
private static class NotFoundException extends RuntimeException {
public NotFoundException(String string) {
NotFoundException(String string) {
super(string);
}
@@ -198,9 +198,10 @@ public class BasicErrorControllerMockMvcTests {
private class ErrorDispatcher implements RequestBuilder {
private MvcResult result;
private String path;
public ErrorDispatcher(MvcResult result, String path) {
ErrorDispatcher(MvcResult result, String path) {
this.result = result;
this.path = path;
}