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

@ -353,7 +353,7 @@ public class CrshAutoConfiguration {
private final String[] disabledPlugins; private final String[] disabledPlugins;
public BeanFactoryFilteringPluginDiscovery(ClassLoader classLoader, BeanFactoryFilteringPluginDiscovery(ClassLoader classLoader,
ListableBeanFactory beanFactory, String[] disabledPlugins) ListableBeanFactory beanFactory, String[] disabledPlugins)
throws NullPointerException { throws NullPointerException {
super(classLoader); super(classLoader);
@ -420,7 +420,7 @@ public class CrshAutoConfiguration {
private final ResourceHandle root; private final ResourceHandle root;
public SimpleFileSystemDriver(ResourceHandle handle) { SimpleFileSystemDriver(ResourceHandle handle) {
this.root = handle; this.root = handle;
} }
@ -474,7 +474,7 @@ public class CrshAutoConfiguration {
private final String name; private final String name;
public ResourceHandle(String name) { ResourceHandle(String name) {
this.name = name; this.name = name;
} }
@ -495,7 +495,7 @@ public class CrshAutoConfiguration {
private final AntPathMatcher matcher = new AntPathMatcher(); private final AntPathMatcher matcher = new AntPathMatcher();
public DirectoryHandle(String name, ResourcePatternResolver resourceLoader, DirectoryHandle(String name, ResourcePatternResolver resourceLoader,
String[] filterPatterns) { String[] filterPatterns) {
super(name); super(name);
this.resourceLoader = resourceLoader; this.resourceLoader = resourceLoader;
@ -530,7 +530,7 @@ public class CrshAutoConfiguration {
private final Resource resource; private final Resource resource;
public FileHandle(String name, Resource resource) { FileHandle(String name, Resource resource) {
super(name); super(name);
this.resource = resource; this.resource = resource;
} }

View File

@ -230,7 +230,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
private ManagementServerProperties properties; private ManagementServerProperties properties;
public ApplicationContextHeaderFilter(ApplicationContext applicationContext) { ApplicationContextHeaderFilter(ApplicationContext applicationContext) {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
} }
@ -262,7 +262,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
private final ConfigurableApplicationContext childContext; private final ConfigurableApplicationContext childContext;
public CloseEventPropagationListener(ApplicationContext parentContext, CloseEventPropagationListener(ApplicationContext parentContext,
ConfigurableApplicationContext childContext) { ConfigurableApplicationContext childContext) {
this.parentContext = parentContext; this.parentContext = parentContext;
this.childContext = childContext; this.childContext = childContext;

View File

@ -309,7 +309,7 @@ public class EndpointWebMvcHypermediaManagementContextConfiguration {
private Map<String, Object> embedded; private Map<String, Object> embedded;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public EndpointResource(Object content, String path) { EndpointResource(Object content, String path) {
this.content = content instanceof Map ? null : content; this.content = content instanceof Map ? null : content;
this.embedded = (Map<String, Object>) (this.content == null ? content : null); this.embedded = (Map<String, Object>) (this.content == null ? content : null);
add(linkTo(Object.class).slash(path).withSelfRel()); add(linkTo(Object.class).slash(path).withSelfRel());

View File

@ -37,7 +37,7 @@ class LinksEnhancer {
private final MvcEndpoints endpoints; private final MvcEndpoints endpoints;
public LinksEnhancer(String rootPath, MvcEndpoints endpoints) { LinksEnhancer(String rootPath, MvcEndpoints endpoints) {
this.rootPath = rootPath; this.rootPath = rootPath;
this.endpoints = endpoints; this.endpoints = endpoints;
} }

View File

@ -302,12 +302,12 @@ public class ManagementWebSecurityAutoConfiguration {
private RequestMatcher delegate; private RequestMatcher delegate;
public EndpointPathRequestMatcher(boolean sensitive) { EndpointPathRequestMatcher() {
this.sensitive = sensitive; this(true);
} }
public EndpointPathRequestMatcher() { EndpointPathRequestMatcher(boolean sensitive) {
this(true); this.sensitive = sensitive;
} }
@Override @Override

View File

@ -52,7 +52,7 @@ final class MetricsFilter extends OncePerRequestFilter {
private final GaugeService gaugeService; private final GaugeService gaugeService;
public MetricsFilter(CounterService counterService, GaugeService gaugeService) { MetricsFilter(CounterService counterService, GaugeService gaugeService) {
this.counterService = counterService; this.counterService = counterService;
this.gaugeService = gaugeService; this.gaugeService = gaugeService;
} }

View File

@ -125,7 +125,7 @@ public abstract class AbstractJmxCacheStatisticsProvider<C extends Cache> implem
private final ObjectName objectName; private final ObjectName objectName;
public ObjectNameWrapper(ObjectName objectName) { ObjectNameWrapper(ObjectName objectName) {
this.objectName = objectName; this.objectName = objectName;
} }

View File

@ -108,7 +108,7 @@ public class CachePublicMetrics implements PublicMetrics {
private final CacheManager cacheManager; private final CacheManager cacheManager;
public CacheManagerBean(String beanName, CacheManager cacheManager) { CacheManagerBean(String beanName, CacheManager cacheManager) {
this.beanName = beanName; this.beanName = beanName;
this.cacheManager = cacheManager; this.cacheManager = cacheManager;
} }

View File

@ -34,7 +34,7 @@ class Sanitizer {
private Pattern[] keysToSanitize; private Pattern[] keysToSanitize;
public Sanitizer() { Sanitizer() {
setKeysToSanitize("password", "secret", "key", ".*credentials.*", "vcap_services"); setKeysToSanitize("password", "secret", "key", ".*credentials.*", "vcap_services");
} }

View File

@ -68,7 +68,7 @@ public class EnvironmentMvcEndpoint extends EndpointMvcAdapter implements
*/ */
private class NamePatternEnvironmentFilter extends NamePatternFilter<Environment> { private class NamePatternEnvironmentFilter extends NamePatternFilter<Environment> {
public NamePatternEnvironmentFilter(Environment source) { NamePatternEnvironmentFilter(Environment source) {
super(source); super(source);
} }

View File

@ -138,7 +138,7 @@ public class JolokiaMvcEndpoint implements MvcEndpoint, InitializingBean,
private final UrlPathHelper urlPathHelper; private final UrlPathHelper urlPathHelper;
public PathStripper(HttpServletRequest request, String path) { PathStripper(HttpServletRequest request, String path) {
super(request); super(request);
this.path = path; this.path = path;
this.urlPathHelper = new UrlPathHelper(); this.urlPathHelper = new UrlPathHelper();

View File

@ -59,7 +59,7 @@ public class MetricsMvcEndpoint extends EndpointMvcAdapter {
*/ */
private class NamePatternMapFilter extends NamePatternFilter<Map<String, ?>> { private class NamePatternMapFilter extends NamePatternFilter<Map<String, ?>> {
public NamePatternMapFilter(Map<String, ?> source) { NamePatternMapFilter(Map<String, ?> source) {
super(source); super(source);
} }

View File

@ -37,7 +37,7 @@ abstract class NamePatternFilter<T> {
private final T source; private final T source;
public NamePatternFilter(T source) { NamePatternFilter(T source) {
this.source = source; this.source = source;
} }
@ -78,7 +78,7 @@ abstract class NamePatternFilter<T> {
private final Map<String, Object> results = new LinkedHashMap<String, Object>(); private final Map<String, Object> results = new LinkedHashMap<String, Object>();
public ResultCollectingNameCallback(Pattern pattern) { ResultCollectingNameCallback(Pattern pattern) {
this.pattern = pattern; this.pattern = pattern;
} }

View File

@ -91,7 +91,7 @@ public class OrderedHealthAggregator extends AbstractHealthAggregator {
private final List<String> statusOrder; private final List<String> statusOrder;
public StatusComparator(List<String> statusOrder) { StatusComparator(List<String> statusOrder) {
this.statusOrder = statusOrder; this.statusOrder = statusOrder;
} }

View File

@ -27,7 +27,7 @@ abstract class Buffer<T extends Number> {
private volatile long timestamp; private volatile long timestamp;
public Buffer(long timestamp) { Buffer(long timestamp) {
this.timestamp = timestamp; this.timestamp = timestamp;
} }

View File

@ -140,7 +140,7 @@ public class MetricCopyExporter extends AbstractMetricExporter {
private final MetricReader reader; private final MetricReader reader;
public PatternMatchingIterable(MetricReader reader) { PatternMatchingIterable(MetricReader reader) {
this.reader = reader; this.reader = reader;
} }
@ -157,7 +157,7 @@ public class MetricCopyExporter extends AbstractMetricExporter {
private Iterator<Metric<?>> iterator; private Iterator<Metric<?>> iterator;
public PatternMatchingIterator(Iterator<Metric<?>> iterator) { PatternMatchingIterator(Iterator<Metric<?>> iterator) {
this.iterator = iterator; this.iterator = iterator;
} }

View File

@ -102,7 +102,7 @@ public class MetricExporters implements SchedulingConfigurer {
private final Exporter exporter; private final Exporter exporter;
public ExportRunner(Exporter exporter) { ExportRunner(Exporter exporter) {
this.exporter = exporter; this.exporter = exporter;
} }

View File

@ -33,7 +33,7 @@ class MetricMessage {
private final Message<?> message; private final Message<?> message;
public MetricMessage(Message<?> message) { MetricMessage(Message<?> message) {
this.message = message; this.message = message;
} }

View File

@ -204,7 +204,7 @@ public class ApplicationPidFileWriter implements
private final String key; private final String key;
public SpringProperty(String prefix, String key) { SpringProperty(String prefix, String key) {
this.prefix = prefix; this.prefix = prefix;
this.key = key; this.key = key;
} }
@ -239,7 +239,7 @@ public class ApplicationPidFileWriter implements
private final String[] properties; private final String[] properties;
public SystemProperty(String name) { SystemProperty(String name) {
this.properties = new String[] { name.toUpperCase(), name.toLowerCase() }; this.properties = new String[] { name.toUpperCase(), name.toLowerCase() };
} }

View File

@ -220,7 +220,7 @@ public class EndpointMBeanExportAutoConfigurationTests {
class Nested extends AbstractEndpoint<Boolean> { class Nested extends AbstractEndpoint<Boolean> {
public Nested() { Nested() {
super("managed", true); super("managed", true);
} }

View File

@ -589,7 +589,7 @@ public class EndpointWebMvcAutoConfigurationTests {
private EmbeddedServletContainer servletContainer; private EmbeddedServletContainer servletContainer;
public GrabManagementPort(ApplicationContext rootContext) { GrabManagementPort(ApplicationContext rootContext) {
this.rootContext = rootContext; this.rootContext = rootContext;
} }

View File

@ -79,7 +79,7 @@ public class MetricsEndpointTests extends AbstractEndpointTests<MetricsEndpoint>
private final List<Metric<?>> metrics; private final List<Metric<?>> metrics;
public TestPublicMetrics(int order, Metric<?>... metrics) { TestPublicMetrics(int order, Metric<?>... metrics) {
this.order = order; this.order = order;
this.metrics = Arrays.asList(metrics); this.metrics = Arrays.asList(metrics);
} }

View File

@ -150,7 +150,7 @@ public class EndpointHandlerMappingTests {
private static class TestEndpoint extends AbstractEndpoint<Object> { private static class TestEndpoint extends AbstractEndpoint<Object> {
public TestEndpoint(String path) { TestEndpoint(String path) {
super(path); super(path);
} }
@ -163,7 +163,7 @@ public class EndpointHandlerMappingTests {
private static class TestMvcEndpoint extends EndpointMvcAdapter { private static class TestMvcEndpoint extends EndpointMvcAdapter {
public TestMvcEndpoint(TestEndpoint delegate) { TestMvcEndpoint(TestEndpoint delegate) {
super(delegate); super(delegate);
} }
@ -171,7 +171,7 @@ public class EndpointHandlerMappingTests {
private static class TestActionEndpoint extends EndpointMvcAdapter { private static class TestActionEndpoint extends EndpointMvcAdapter {
public TestActionEndpoint(TestEndpoint delegate) { TestActionEndpoint(TestEndpoint delegate) {
super(delegate); super(delegate);
} }

View File

@ -50,7 +50,7 @@ public class NamePatternFilterTests {
private static class MockNamePatternFilter extends NamePatternFilter<Object> { private static class MockNamePatternFilter extends NamePatternFilter<Object> {
public MockNamePatternFilter() { MockNamePatternFilter() {
super(null); super(null);
} }

View File

@ -102,7 +102,7 @@ public class StatsdMetricWriterTests {
private final DatagramSocket server; private final DatagramSocket server;
public DummyStatsDServer(int port) { DummyStatsDServer(int port) {
try { try {
this.server = new DatagramSocket(port); this.server = new DatagramSocket(port);
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -47,7 +47,7 @@ class ArtemisConnectionFactoryFactory {
private final ListableBeanFactory beanFactory; private final ListableBeanFactory beanFactory;
public ArtemisConnectionFactoryFactory(ListableBeanFactory beanFactory, ArtemisConnectionFactoryFactory(ListableBeanFactory beanFactory,
ArtemisProperties properties) { ArtemisProperties properties) {
Assert.notNull(beanFactory, "BeanFactory must not be null"); Assert.notNull(beanFactory, "BeanFactory must not be null");
Assert.notNull(properties, "Properties 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; private final ArtemisProperties.Embedded properties;
public ArtemisEmbeddedConfigurationFactory(ArtemisProperties properties) { ArtemisEmbeddedConfigurationFactory(ArtemisProperties properties) {
this.properties = properties.getEmbedded(); this.properties = properties.getEmbedded();
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -69,7 +69,7 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration {
/** /**
* {@code NoJtaPlatform} implementations for various Hibernate versions. * {@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.engine.transaction.jta.platform.internal.NoJtaPlatform",
"org.hibernate.service.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 * {@code WebSphereExtendedJtaPlatform} implementations for various Hibernate
* versions. * 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.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform",
"org.hibernate.service.jta.platform.internal.WebSphereExtendedJtaPlatform", }; "org.hibernate.service.jta.platform.internal.WebSphereExtendedJtaPlatform", };

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -30,7 +30,7 @@ final class Dependency {
private final String description; private final String description;
public Dependency(String id, String name, String description) { Dependency(String id, String name, String description) {
this.id = id; this.id = id;
this.name = name; this.name = name;
this.description = description; this.description = description;

View File

@ -66,7 +66,7 @@ class InitializrService {
*/ */
private CloseableHttpClient http; private CloseableHttpClient http;
public InitializrService() { InitializrService() {
} }
InitializrService(CloseableHttpClient http) { InitializrService(CloseableHttpClient http) {

View File

@ -59,13 +59,13 @@ class InitializrServiceMetadata {
* Creates a new instance using the specified root {@link JSONObject}. * Creates a new instance using the specified root {@link JSONObject}.
* @param root the root JSONObject * @param root the root JSONObject
*/ */
public InitializrServiceMetadata(JSONObject root) { InitializrServiceMetadata(JSONObject root) {
this.dependencies = parseDependencies(root); this.dependencies = parseDependencies(root);
this.projectTypes = parseProjectTypes(root); this.projectTypes = parseProjectTypes(root);
this.defaults = Collections.unmodifiableMap(parseDefaults(root)); this.defaults = Collections.unmodifiableMap(parseDefaults(root));
} }
public InitializrServiceMetadata(ProjectType defaultProjectType) { InitializrServiceMetadata(ProjectType defaultProjectType) {
this.dependencies = new HashMap<String, Dependency>(); this.dependencies = new HashMap<String, Dependency>();
this.projectTypes = new MetadataHolder<String, ProjectType>(); this.projectTypes = new MetadataHolder<String, ProjectType>();
this.projectTypes.getContent() this.projectTypes.getContent()

View File

@ -32,7 +32,7 @@ class ProjectGenerationResponse {
private String fileName; private String fileName;
public ProjectGenerationResponse(ContentType contentType) { ProjectGenerationResponse(ContentType contentType) {
this.contentType = contentType; this.contentType = contentType;
} }

View File

@ -39,7 +39,7 @@ class ProjectGenerator {
private final InitializrService initializrService; private final InitializrService initializrService;
public ProjectGenerator(InitializrService initializrService) { ProjectGenerator(InitializrService initializrService) {
this.initializrService = initializrService; this.initializrService = initializrService;
} }

View File

@ -38,7 +38,7 @@ class ProjectType {
private final Map<String, String> tags = new HashMap<String, String>(); private final Map<String, String> tags = new HashMap<String, String>();
public ProjectType(String id, String name, String action, boolean defaultType, ProjectType(String id, String name, String action, boolean defaultType,
Map<String, String> tags) { Map<String, String> tags) {
this.id = id; this.id = id;
this.name = name; this.name = name;

View File

@ -41,7 +41,7 @@ class GroovyGrabDependencyResolver implements DependencyResolver {
private final GroovyCompilerConfiguration configuration; private final GroovyCompilerConfiguration configuration;
public GroovyGrabDependencyResolver(GroovyCompilerConfiguration configuration) { GroovyGrabDependencyResolver(GroovyCompilerConfiguration configuration) {
this.configuration = configuration; this.configuration = configuration;
} }

View File

@ -46,13 +46,13 @@ class Installer {
private final Properties installCounts; private final Properties installCounts;
public Installer(OptionSet options, CompilerOptionHandler compilerOptionHandler) Installer(OptionSet options, CompilerOptionHandler compilerOptionHandler)
throws IOException { throws IOException {
this(new GroovyGrabDependencyResolver(createCompilerConfiguration(options, this(new GroovyGrabDependencyResolver(createCompilerConfiguration(options,
compilerOptionHandler))); compilerOptionHandler)));
} }
public Installer(DependencyResolver resolver) throws IOException { Installer(DependencyResolver resolver) throws IOException {
this.dependencyResolver = resolver; this.dependencyResolver = resolver;
this.installCounts = loadInstallCounts(); this.installCounts = loadInstallCounts();
} }

View File

@ -136,7 +136,7 @@ class ResourceMatcher {
private final File rootFolder; private final File rootFolder;
public FolderResourceLoader(File root) throws MalformedURLException { FolderResourceLoader(File root) throws MalformedURLException {
super(new FolderClassLoader(root)); super(new FolderClassLoader(root));
this.rootFolder = root; this.rootFolder = root;
} }
@ -153,7 +153,7 @@ class ResourceMatcher {
*/ */
private static class FolderClassLoader extends URLClassLoader { private static class FolderClassLoader extends URLClassLoader {
public FolderClassLoader(File rootFolder) throws MalformedURLException { FolderClassLoader(File rootFolder) throws MalformedURLException {
super(new URL[] { rootFolder.toURI().toURL() }); super(new URL[] { rootFolder.toURI().toURL() });
} }

View File

@ -180,7 +180,7 @@ public class OptionHandler {
private final String description; private final String description;
public OptionHelpAdapter(OptionDescriptor descriptor) { OptionHelpAdapter(OptionDescriptor descriptor) {
this.options = new LinkedHashSet<String>(); this.options = new LinkedHashSet<String>();
for (String option : descriptor.options()) { for (String option : descriptor.options()) {
this.options.add((option.length() == 1 ? "-" : "--") + option); this.options.add((option.length() == 1 ? "-" : "--") + option);

View File

@ -117,7 +117,7 @@ public class RunCommand extends OptionParsingCommand {
OptionSetGroovyCompilerConfiguration implements OptionSetGroovyCompilerConfiguration implements
SpringApplicationRunnerConfiguration { SpringApplicationRunnerConfiguration {
public SpringApplicationRunnerConfigurationAdapter(OptionSet options, SpringApplicationRunnerConfigurationAdapter(OptionSet options,
CompilerOptionHandler optionHandler, CompilerOptionHandler optionHandler,
List<RepositoryConfiguration> repositoryConfiguration) { List<RepositoryConfiguration> repositoryConfiguration) {
super(options, optionHandler, repositoryConfiguration); super(options, optionHandler, repositoryConfiguration);

View File

@ -62,9 +62,8 @@ public class SpringApplicationRunner {
* @param sources the files to compile/watch * @param sources the files to compile/watch
* @param args input arguments * @param args input arguments
*/ */
public SpringApplicationRunner( SpringApplicationRunner(final SpringApplicationRunnerConfiguration configuration,
final SpringApplicationRunnerConfiguration configuration, String[] sources, String[] sources, String... args) {
String... args) {
this.configuration = configuration; this.configuration = configuration;
this.sources = sources.clone(); this.sources = sources.clone();
this.args = args.clone(); this.args = args.clone();
@ -143,7 +142,7 @@ public class SpringApplicationRunner {
* Create a new {@link RunThread} instance. * Create a new {@link RunThread} instance.
* @param compiledSources the sources to launch * @param compiledSources the sources to launch
*/ */
public RunThread(Object... compiledSources) { RunThread(Object... compiledSources) {
super("runner-" + (runnerCounter++)); super("runner-" + (runnerCounter++));
this.compiledSources = compiledSources; this.compiledSources = compiledSources;
if (compiledSources.length != 0 && compiledSources[0] instanceof Class) { if (compiledSources.length != 0 && compiledSources[0] instanceof Class) {
@ -195,7 +194,7 @@ public class SpringApplicationRunner {
private List<File> sources; private List<File> sources;
public FileWatchThread() { FileWatchThread() {
super("filewatcher-" + (watcherCounter++)); super("filewatcher-" + (watcherCounter++));
this.previous = 0; this.previous = 0;
this.sources = getSourceFiles(); this.sources = getSourceFiles();

View File

@ -31,7 +31,7 @@ class ClearCommand extends AbstractCommand {
private final ConsoleReader consoleReader; private final ConsoleReader consoleReader;
public ClearCommand(ConsoleReader consoleReader) { ClearCommand(ConsoleReader consoleReader) {
super("clear", "Clear the screen"); super("clear", "Clear the screen");
this.consoleReader = consoleReader; this.consoleReader = consoleReader;
} }

View File

@ -126,7 +126,7 @@ public class CommandCompleter extends StringsCompleter {
private final String usage; private final String usage;
public OptionHelpLine(OptionHelp optionHelp) { OptionHelpLine(OptionHelp optionHelp) {
StringBuffer options = new StringBuffer(); StringBuffer options = new StringBuffer();
for (String option : optionHelp.getOptions()) { for (String option : optionHelp.getOptions()) {
options.append(options.length() == 0 ? "" : ", "); options.append(options.length() == 0 ? "" : ", ");

View File

@ -27,7 +27,7 @@ import org.springframework.boot.cli.command.status.ExitStatus;
*/ */
class ExitCommand extends AbstractCommand { class ExitCommand extends AbstractCommand {
public ExitCommand() { ExitCommand() {
super("exit", "Quit the embedded shell"); super("exit", "Quit the embedded shell");
} }

View File

@ -37,7 +37,7 @@ class ForkProcessCommand extends RunProcessCommand {
private final Command command; private final Command command;
public ForkProcessCommand(Command command) { ForkProcessCommand(Command command) {
super(new JavaExecutable().toString()); super(new JavaExecutable().toString());
this.command = command; this.command = command;
} }

View File

@ -37,7 +37,7 @@ class RunProcessCommand extends AbstractCommand {
private volatile RunProcess process; private volatile RunProcess process;
public RunProcessCommand(String... command) { RunProcessCommand(String... command) {
super(null, null); super(null, null);
this.command = command; this.command = command;
} }

View File

@ -67,7 +67,7 @@ public class Shell {
* Create a new {@link Shell} instance. * Create a new {@link Shell} instance.
* @throws IOException * @throws IOException
*/ */
public Shell() throws IOException { Shell() throws IOException {
attachSignalHandler(); attachSignalHandler();
this.consoleReader = new ConsoleReader(); this.consoleReader = new ConsoleReader();
this.commandRunner = createCommandRunner(); this.commandRunner = createCommandRunner();
@ -194,7 +194,7 @@ public class Shell {
private final Map<String, String> aliases = new HashMap<String, String>(); private final Map<String, String> aliases = new HashMap<String, String>();
public ShellCommandRunner() { ShellCommandRunner() {
super(null); super(null);
} }

View File

@ -64,7 +64,7 @@ public class TestCommand extends OptionParsingCommand {
private class TestRunnerConfigurationAdapter extends private class TestRunnerConfigurationAdapter extends
OptionSetGroovyCompilerConfiguration implements TestRunnerConfiguration { OptionSetGroovyCompilerConfiguration implements TestRunnerConfiguration {
public TestRunnerConfigurationAdapter(OptionSet options, TestRunnerConfigurationAdapter(OptionSet options,
CompilerOptionHandler optionHandler) { CompilerOptionHandler optionHandler) {
super(options, optionHandler); super(options, optionHandler);
} }

View File

@ -47,8 +47,7 @@ public class TestRunner {
* @param sources * @param sources
* @param args * @param args
*/ */
public TestRunner(TestRunnerConfiguration configuration, String[] sources, TestRunner(TestRunnerConfiguration configuration, String[] sources, String[] args) {
String[] args) {
this.sources = sources.clone(); this.sources = sources.clone();
this.compiler = new GroovyCompiler(configuration); this.compiler = new GroovyCompiler(configuration);
} }
@ -90,7 +89,7 @@ public class TestRunner {
* Create a new {@link RunThread} instance. * Create a new {@link RunThread} instance.
* @param sources the sources to launch * @param sources the sources to launch
*/ */
public RunThread(Object... sources) { RunThread(Object... sources) {
super("testrunner"); super("testrunner");
setDaemon(true); setDaemon(true);
if (sources.length != 0 && sources[0] instanceof Class) { if (sources.length != 0 && sources[0] instanceof Class) {

View File

@ -118,7 +118,7 @@ public abstract class AnnotatedNodeASTTransformation implements ASTTransformatio
private final SourceUnit source; private final SourceUnit source;
public ClassVisitor(SourceUnit source) { ClassVisitor(SourceUnit source) {
this.source = source; this.source = source;
} }

View File

@ -176,7 +176,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
private final URLClassLoader groovyOnlyClassLoader; private final URLClassLoader groovyOnlyClassLoader;
public DefaultScopeParentClassLoader(ClassLoader parent) { DefaultScopeParentClassLoader(ClassLoader parent) {
super(parent); super(parent);
this.groovyOnlyClassLoader = new URLClassLoader(getGroovyJars(parent), null); this.groovyOnlyClassLoader = new URLClassLoader(getGroovyJars(parent), null);
} }

View File

@ -61,12 +61,16 @@ public class GroovyBeansTransformation implements ASTTransformation {
private class ClassVisitor extends ClassCodeVisitorSupport { private class ClassVisitor extends ClassCodeVisitorSupport {
private static final String SOURCE_INTERFACE = "org.springframework.boot.BeanDefinitionLoader.GroovyBeanDefinitionSource"; private static final String SOURCE_INTERFACE = "org.springframework.boot.BeanDefinitionLoader.GroovyBeanDefinitionSource";
private static final String BEANS = "beans"; private static final String BEANS = "beans";
private final SourceUnit source; private final SourceUnit source;
private final ClassNode classNode; private final ClassNode classNode;
private boolean xformed = false; private boolean xformed = false;
public ClassVisitor(SourceUnit source, ClassNode classNode) { ClassVisitor(SourceUnit source, ClassNode classNode) {
this.source = source; this.source = source;
this.classNode = classNode; this.classNode = classNode;
} }
@ -105,5 +109,7 @@ public class GroovyBeansTransformation implements ASTTransformation {
private ClosureExpression beans(BlockStatement block) { private ClosureExpression beans(BlockStatement block) {
return AstUtils.getClosure(block, BEANS, true); return AstUtils.getClosure(block, BEANS, true);
} }
} }
} }

View File

@ -265,7 +265,7 @@ public class GroovyCompiler {
*/ */
private class CompilerAutoConfigureCustomizer extends CompilationCustomizer { private class CompilerAutoConfigureCustomizer extends CompilationCustomizer {
public CompilerAutoConfigureCustomizer() { CompilerAutoConfigureCustomizer() {
super(CompilePhase.CONVERSION); super(CompilePhase.CONVERSION);
} }

View File

@ -106,9 +106,11 @@ public class MavenSettingsReader {
private class SpringBootSecDispatcher extends DefaultSecDispatcher { private class SpringBootSecDispatcher extends DefaultSecDispatcher {
public SpringBootSecDispatcher() { private static final String SECURITY_XML = ".m2/settings-security.xml";
this._configurationFile = new File(MavenSettingsReader.this.homeDir,
".m2/settings-security.xml").getAbsolutePath(); SpringBootSecDispatcher() {
File file = new File(MavenSettingsReader.this.homeDir, SECURITY_XML);
this._configurationFile = file.getAbsolutePath();
try { try {
this._cipher = new DefaultPlexusCipher(); this._cipher = new DefaultPlexusCipher();
} }

View File

@ -33,8 +33,7 @@ class SmartImportCustomizer extends ImportCustomizer {
private SourceUnit source; private SourceUnit source;
public SmartImportCustomizer(SourceUnit source, GeneratorContext context, SmartImportCustomizer(SourceUnit source, GeneratorContext context, ClassNode classNode) {
ClassNode classNode) {
this.source = source; this.source = source;
} }

View File

@ -48,10 +48,10 @@ final class SummaryProgressReporter implements ProgressReporter {
private boolean finished; private boolean finished;
public SummaryProgressReporter(DefaultRepositorySystemSession session, PrintStream out) { SummaryProgressReporter(DefaultRepositorySystemSession session, PrintStream out) {
this.out = out; this.out = out;
session.setTransferListener(new AbstractTransferListener() { session.setTransferListener(new AbstractTransferListener() {
@Override @Override
public void transferStarted(TransferEvent event) public void transferStarted(TransferEvent event)
throws TransferCancelledException { throws TransferCancelledException {
@ -63,13 +63,15 @@ final class SummaryProgressReporter implements ProgressReporter {
throws TransferCancelledException { throws TransferCancelledException {
reportProgress(); reportProgress();
} }
});
});
session.setRepositoryListener(new AbstractRepositoryListener() { session.setRepositoryListener(new AbstractRepositoryListener() {
@Override @Override
public void artifactResolved(RepositoryEvent event) { public void artifactResolved(RepositoryEvent event) {
reportProgress(); reportProgress();
} }
}); });
} }

View File

@ -151,7 +151,7 @@ public abstract class ResourceUtils {
private final FileSystemResourceLoader files; private final FileSystemResourceLoader files;
public FileSearchResourceLoader(ClassLoader classLoader) { FileSearchResourceLoader(ClassLoader classLoader) {
super(classLoader); super(classLoader);
this.files = new FileSystemResourceLoader(); this.files = new FileSystemResourceLoader();
} }

View File

@ -76,7 +76,6 @@ public class SpringApplicationLauncherTests {
public void sourcesDefaultPropertiesAndArgsAreUsedToLaunch() throws Exception { public void sourcesDefaultPropertiesAndArgsAreUsedToLaunch() throws Exception {
System.setProperty("spring.application.class.name", System.setProperty("spring.application.class.name",
TestSpringApplication.class.getName()); TestSpringApplication.class.getName());
Object[] sources = new Object[0]; Object[] sources = new Object[0];
String[] args = new String[0]; String[] args = new String[0];
new SpringApplicationLauncher(getClass().getClassLoader()).launch(sources, args); new SpringApplicationLauncher(getClass().getClassLoader()).launch(sources, args);
@ -108,7 +107,7 @@ public class SpringApplicationLauncherTests {
private List<String> classes = new ArrayList<String>(); private List<String> classes = new ArrayList<String>();
public TestClassLoader(ClassLoader parent) { TestClassLoader(ClassLoader parent) {
super(parent); super(parent);
} }
@ -120,8 +119,7 @@ public class SpringApplicationLauncherTests {
} }
@SuppressWarnings("unused") public static class TestSpringApplication {
private static class TestSpringApplication {
private static Object[] sources; private static Object[] sources;
@ -144,7 +142,7 @@ public class SpringApplicationLauncherTests {
private class TestSpringApplicationLauncher extends SpringApplicationLauncher { private class TestSpringApplicationLauncher extends SpringApplicationLauncher {
public TestSpringApplicationLauncher(ClassLoader classLoader) { TestSpringApplicationLauncher(ClassLoader classLoader) {
super(classLoader); super(classLoader);
} }

View File

@ -191,7 +191,7 @@ public abstract class AbstractHttpClientMockTests {
private final boolean shouldMatch; private final boolean shouldMatch;
public HasAcceptHeader(String value, boolean shouldMatch) { HasAcceptHeader(String value, boolean shouldMatch) {
this.value = value; this.value = value;
this.shouldMatch = shouldMatch; this.shouldMatch = shouldMatch;
} }

View File

@ -386,7 +386,7 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
private ProjectGenerationRequest lastRequest; private ProjectGenerationRequest lastRequest;
public TestableInitCommandOptionHandler(InitializrService initializrService) { TestableInitCommandOptionHandler(InitializrService initializrService) {
super(initializrService); super(initializrService);
} }

View File

@ -90,7 +90,7 @@ public class OutputCapture implements TestRule {
private final OutputStream copy; private final OutputStream copy;
public CaptureOutputStream(PrintStream original, OutputStream copy) { CaptureOutputStream(PrintStream original, OutputStream copy) {
this.original = original; this.original = original;
this.copy = copy; this.copy = copy;
} }

Some files were not shown because too many files have changed in this diff Show More