From 42e230192fd994facc0dbe3c8ef283f791e1f5ae Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 24 Jul 2015 07:19:53 +0200 Subject: [PATCH] Polish --- .../ConditionalOnEnabledEndpoint.java | 4 +-- .../endpoint/jmx/EndpointMBeanExporter.java | 5 ++- .../endpoint/mvc/EndpointHandlerMapping.java | 4 +-- .../endpoint/mvc/NamePatternFilter.java | 2 +- .../repository/InMemoryMetricRepository.java | 6 ++-- .../util/SimpleInMemoryRepository.java | 2 +- .../system/ApplicationPidFileWriter.java | 4 +-- .../EndpointMvcIntegrationTests.java | 2 +- ...ionPropertiesReportEndpointProxyTests.java | 6 ++-- .../condition/ConditionalOnClass.java | 4 +-- .../condition/ConditionalOnJava.java | 5 +-- .../condition/ConditionalOnMissingClass.java | 4 +-- .../condition/ConditionalOnResource.java | 4 +-- .../orm/jpa/EntityManagerFactoryBuilder.java | 2 +- .../autoconfigure/web/ErrorAttributes.java | 6 ++-- .../autoconfigure/web/ErrorController.java | 2 +- .../aop/AopAutoConfigurationTests.java | 4 +-- .../DataSourceJsonSerializationTests.java | 2 +- ...igurationCustomFilterContextPathTests.java | 4 +-- ...utoConfigurationCustomFilterPathTests.java | 4 +-- ...gurationCustomServletContextPathTests.java | 4 +-- ...toConfigurationCustomServletPathTests.java | 4 +-- ...toConfigurationDefaultFilterPathTests.java | 4 +-- ...oConfigurationDefaultServletPathTests.java | 4 +-- ...acheAutoConfigurationIntegrationTests.java | 2 +- .../web/MustacheWebIntegrationTests.java | 2 +- ...ringBootWebSecurityConfigurationTests.java | 2 +- .../security/user/UserRepository.java | 4 +-- ...asicErrorControllerDirectMockMvcTests.java | 4 +-- .../web/BasicErrorControllerMockMvcTests.java | 4 +-- .../web/DefaultErrorViewIntegrationTests.java | 4 +-- .../web/WelcomePageMockMvcTests.java | 2 +- .../compiler/GroovyCompilerConfiguration.java | 2 +- .../devtools/remote/server/AccessManager.java | 2 +- .../boot/devtools/restart/FailureHandler.java | 2 +- .../devtools/restart/RestartInitializer.java | 2 +- .../ClassLoaderFileRepository.java | 2 +- .../fieldvalues/FieldValuesParser.java | 4 +-- .../boot/gradle/PluginFeatures.java | 2 +- .../boot/loader/tools/JarWriter.java | 2 +- .../boot/loader/tools/Libraries.java | 2 +- .../boot/loader/tools/LibraryScope.java | 10 +++--- .../boot/loader/tools/MainClassFinder.java | 2 +- .../boot/loader/JavaAgentDetector.java | 2 +- .../boot/loader/archive/Archive.java | 6 ++-- .../boot/ansi/AnsiElement.java | 34 +++++++++---------- .../boot/bind/InetAddressEditor.java | 4 +-- ...WarningsApplicationContextInitializer.java | 4 +-- .../ServletContextInitializerBeans.java | 2 +- .../JettyEmbeddedServletContainerFactory.java | 4 +-- 50 files changed, 100 insertions(+), 104 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/condition/ConditionalOnEnabledEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/condition/ConditionalOnEnabledEndpoint.java index 2c2aa1da1a..44c18ca637 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/condition/ConditionalOnEnabledEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/condition/ConditionalOnEnabledEndpoint.java @@ -42,12 +42,12 @@ public @interface ConditionalOnEnabledEndpoint { * The name of the endpoint. * @return The name of the endpoint */ - public String value(); + String value(); /** * Returns whether or not the endpoint is enabled by default. * @return {@code true} if the endpoint is enabled by default, otherwise {@code false} */ - public boolean enabledByDefault() default true; + boolean enabledByDefault() default true; } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java index 9b1a059480..83a1f356c7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.boot.actuate.endpoint.ShutdownEndpoint; @@ -60,7 +59,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Andy Wilkinson */ public class EndpointMBeanExporter extends MBeanExporter implements SmartLifecycle, - BeanFactoryAware, ApplicationContextAware { + ApplicationContextAware { public static final String DEFAULT_DOMAIN = "org.springframework.boot"; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java index 1d1e84197b..4cd33b350f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java @@ -25,7 +25,6 @@ import java.util.Set; import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.web.cors.CorsConfiguration; @@ -49,8 +48,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl * @author Christian Dupuis * @author Dave Syer */ -public class EndpointHandlerMapping extends RequestMappingHandlerMapping implements - ApplicationContextAware { +public class EndpointHandlerMapping extends RequestMappingHandlerMapping { private final Set endpoints; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java index 684a1e4637..44d9685df4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java @@ -66,7 +66,7 @@ abstract class NamePatternFilter { protected abstract Object getValue(T source, String name); - protected static interface NameCallback { + protected interface NameCallback { void addName(String name); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java index f296bf8f55..a123bf1a21 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.concurrent.ConcurrentNavigableMap; import org.springframework.boot.actuate.metrics.Metric; -import org.springframework.boot.actuate.metrics.reader.PrefixMetricReader; import org.springframework.boot.actuate.metrics.util.SimpleInMemoryRepository; import org.springframework.boot.actuate.metrics.util.SimpleInMemoryRepository.Callback; import org.springframework.boot.actuate.metrics.writer.Delta; @@ -34,8 +33,7 @@ import org.springframework.boot.actuate.metrics.writer.Delta; * * @author Dave Syer */ -public class InMemoryMetricRepository implements MetricRepository, MultiMetricRepository, - PrefixMetricReader { +public class InMemoryMetricRepository implements MetricRepository, MultiMetricRepository { private final SimpleInMemoryRepository> metrics = new SimpleInMemoryRepository>(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java index 117bbf0120..f8a8eaa4ab 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java @@ -36,7 +36,7 @@ public class SimpleInMemoryRepository { private final ConcurrentMap locks = new ConcurrentReferenceHashMap(); - public static interface Callback { + public interface Callback { T modify(T current); } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java index d47fba9e10..547dec36d6 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -189,7 +189,7 @@ public class ApplicationPidFileWriter implements /** * Provides access to a property value. */ - private static interface Property { + private interface Property { String getValue(SpringApplicationEvent event); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java index 89be029c67..eb3c1dff86 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java @@ -110,7 +110,7 @@ public class EndpointMvcIntegrationTests { DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, JacksonAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java index 1c2b9c14e6..b8f255ecc3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointProxyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -94,9 +94,9 @@ public class ConfigurationPropertiesReportEndpointProxyTests { } - public static interface Executor { + public interface Executor { - public void execute(); + void execute(); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java index 92d6c45723..ebc959dbd3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java @@ -41,12 +41,12 @@ public @interface ConditionalOnClass { * classpath. * @return the classes that must be present */ - public Class[] value() default {}; + Class[] value() default {}; /** * The classes names that must be present. * @return the class names that must be present. */ - public String[] name() default {}; + String[] name() default {}; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJava.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJava.java index e5918dea33..1c12b6611b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJava.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJava.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.boot.autoconfigure.condition; import java.lang.annotation.Documented; @@ -57,7 +58,7 @@ public @interface ConditionalOnJava { /** * Range options. */ - public enum Range { + enum Range { /** * Equal to, or newer than the specified {@link JavaVersion}. @@ -74,7 +75,7 @@ public @interface ConditionalOnJava { /** * Java versions. */ - public enum JavaVersion { + enum JavaVersion { /** * Java 1.6. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java index 9f7e894959..c29712397a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java @@ -40,7 +40,7 @@ public @interface ConditionalOnMissingClass { * The names of the classes that must not be present. * @return the names of the classes that must not be present */ - public String[] value() default {}; + String[] value() default {}; /** * An alias for {@link #value} specifying the names of the classes that must not be @@ -48,6 +48,6 @@ public @interface ConditionalOnMissingClass { * @return the class names that must not be present. * @deprecated since 1.3.0 in favor of {@link #value}. */ - public String[] name() default {}; + String[] name() default {}; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java index c2eb3bc483..984a51c0f3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,6 @@ public @interface ConditionalOnResource { * The resources that must be present. * @return the resource paths that must be present. */ - public String[] resources() default {}; + String[] resources() default {}; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java index 760d37273d..cc70868a23 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/EntityManagerFactoryBuilder.java @@ -194,7 +194,7 @@ public class EntityManagerFactoryBuilder { /** * A callback for new entity manager factory beans created by a Builder. */ - public static interface EntityManagerFactoryBeanCallback { + public interface EntityManagerFactoryBeanCallback { void execute(LocalContainerEntityManagerFactoryBean factory); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorAttributes.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorAttributes.java index b9fd0a2268..e8820129f6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorAttributes.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ public interface ErrorAttributes { * @param includeStackTrace if stack trace elements should be included * @return a map of error attributes */ - public Map getErrorAttributes(RequestAttributes requestAttributes, + Map getErrorAttributes(RequestAttributes requestAttributes, boolean includeStackTrace); /** @@ -47,6 +47,6 @@ public interface ErrorAttributes { * @param requestAttributes the source request attributes * @return the {@link Exception} that caused the error or {@code null} */ - public Throwable getError(RequestAttributes requestAttributes); + Throwable getError(RequestAttributes requestAttributes); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorController.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorController.java index 55ecee7ea0..7d605e8622 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorController.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorController.java @@ -30,6 +30,6 @@ public interface ErrorController { * Returns the path of the error page. * @return the error path */ - public String getErrorPath(); + String getErrorPath(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java index e862ffef9e..2e9b87eb52 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,7 +116,7 @@ public class AopAutoConfigurationTests { public interface TestInterface { - public abstract void foo(); + void foo(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java index f32fef938a..a36b1d1a61 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java @@ -76,7 +76,7 @@ public class DataSourceJsonSerializationTests { } @JsonSerialize(using = TomcatDataSourceSerializer.class) - protected static interface DataSourceJson { + protected interface DataSourceJson { } protected static class TomcatDataSourceSerializer extends JsonSerializer { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java index 8de302806b..c5494ef3aa 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,7 +100,7 @@ public class JerseyAutoConfigurationCustomFilterContextPathTests { @Import({ EmbeddedServletContainerAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java index 560a8026b1..224700430c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ public class JerseyAutoConfigurationCustomFilterPathTests { @Import({ EmbeddedServletContainerAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java index af82873d9b..0fe58547f2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ public class JerseyAutoConfigurationCustomServletContextPathTests { @Import({ EmbeddedServletContainerAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java index ba900509fd..3816be662d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ public class JerseyAutoConfigurationCustomServletPathTests { @Import({ EmbeddedServletContainerAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java index bbe052c63c..5fa023f3cf 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ public class JerseyAutoConfigurationDefaultFilterPathTests { @Import({ EmbeddedServletContainerAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java index 1a78baac97..e3160fa4e7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ public class JerseyAutoConfigurationDefaultServletPathTests { @Import({ EmbeddedServletContainerAutoConfiguration.class, ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java index e524960209..49f06aeec2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java @@ -90,7 +90,7 @@ public class MustacheAutoConfigurationIntegrationTests { ServerPropertiesAutoConfiguration.class, DispatcherServletAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java index 121f91bff1..e63b6e31d1 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java @@ -108,7 +108,7 @@ public class MustacheWebIntegrationTests { ServerPropertiesAutoConfiguration.class, DispatcherServletAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java index 9dda84a0f6..e79304b6d2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java @@ -215,7 +215,7 @@ public class SpringBootWebSecurityConfigurationTests { DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java index 0c3086087e..9938f432a5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/user/UserRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,6 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { - public User findByEmail(String email); + User findByEmail(String email); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java index f0a0d33aba..517ee3037d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -113,7 +113,7 @@ public class BasicErrorControllerDirectMockMvcTests { DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java index 8041898bc6..14ff75ea3f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,7 +134,7 @@ public class BasicErrorControllerMockMvcTests { DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java index 94af87dc49..a798db2d72 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,7 +98,7 @@ public class DefaultErrorViewIntegrationTests { DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java index c635b348e4..b5f72c314b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java @@ -90,7 +90,7 @@ public class WelcomePageMockMvcTests { DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) - protected static @interface MinimalWebConfiguration { + protected @interface MinimalWebConfiguration { } @Configuration diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java index eec2ad8ad0..0122b68895 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java @@ -31,7 +31,7 @@ public interface GroovyCompilerConfiguration { /** * Constant to be used when there is no {@link #getClasspath() classpath}. */ - public static final String[] DEFAULT_CLASSPATH = { "." }; + String[] DEFAULT_CLASSPATH = { "." }; /** * Returns the scope in which the compiler operates. diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java index f7015f2cf8..c196516500 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java @@ -29,7 +29,7 @@ public interface AccessManager { /** * {@link AccessManager} that permits all requests. */ - public static final AccessManager PERMIT_ALL = new AccessManager() { + AccessManager PERMIT_ALL = new AccessManager() { @Override public boolean isAllowed(ServerHttpRequest request) { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java index 650c50ee81..851b337b2b 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/FailureHandler.java @@ -27,7 +27,7 @@ public interface FailureHandler { /** * {@link FailureHandler} that always aborts. */ - public static final FailureHandler NONE = new FailureHandler() { + FailureHandler NONE = new FailureHandler() { @Override public Outcome handle(Throwable failure) { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java index 49efdf4158..d029bc5d73 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java @@ -30,7 +30,7 @@ public interface RestartInitializer { /** * {@link RestartInitializer} that doesn't return any URLs. */ - public static final RestartInitializer NONE = new RestartInitializer() { + RestartInitializer NONE = new RestartInitializer() { @Override public URL[] getInitialUrls(Thread thread) { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java index 662877f007..4f8c8a8559 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java @@ -30,7 +30,7 @@ public interface ClassLoaderFileRepository { /** * Empty {@link ClassLoaderFileRepository} implementation. */ - public static final ClassLoaderFileRepository NONE = new ClassLoaderFileRepository() { + ClassLoaderFileRepository NONE = new ClassLoaderFileRepository() { @Override public ClassLoaderFile getFile(String name) { diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java index e2e73d3a7f..aea2394384 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public interface FieldValuesParser { * Implementation of {@link FieldValuesParser} that always returns an empty * result. */ - public static final FieldValuesParser NONE = new FieldValuesParser() { + FieldValuesParser NONE = new FieldValuesParser() { @Override public Map getFieldValues(TypeElement element) { diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/PluginFeatures.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/PluginFeatures.java index d115e7f078..6566ac1c0a 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/PluginFeatures.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/PluginFeatures.java @@ -30,6 +30,6 @@ public interface PluginFeatures { * Apply the features to the specified project. * @param project the project to apply features to */ - public void apply(Project project); + void apply(Project project); } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index 0210e4339e..1340ae9964 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -248,7 +248,7 @@ public class JarWriter { /** * Interface used to write jar entry date. */ - private static interface EntryWriter { + private interface EntryWriter { /** * Write entry data to the specified output stream diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java index 74231dd76e..41af72d18c 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java @@ -28,7 +28,7 @@ public interface Libraries { /** * Represents no libraries. */ - public static Libraries NONE = new Libraries() { + Libraries NONE = new Libraries() { @Override public void doWithLibraries(LibraryCallback callback) throws IOException { } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java index edd86d9c5a..f997e6863d 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ public interface LibraryScope { /** * The library is used at compile time and runtime. */ - public static final LibraryScope COMPILE = new LibraryScope() { + LibraryScope COMPILE = new LibraryScope() { @Override public String toString() { @@ -40,7 +40,7 @@ public interface LibraryScope { /** * The library is used at runtime but not needed for compile. */ - public static final LibraryScope RUNTIME = new LibraryScope() { + LibraryScope RUNTIME = new LibraryScope() { @Override public String toString() { @@ -52,7 +52,7 @@ public interface LibraryScope { /** * The library is needed for compile but is usually provided when running. */ - public static final LibraryScope PROVIDED = new LibraryScope() { + LibraryScope PROVIDED = new LibraryScope() { @Override public String toString() { @@ -64,7 +64,7 @@ public interface LibraryScope { /** * Marker for custom scope when custom configuration is used. */ - public static final LibraryScope CUSTOM = new LibraryScope() { + LibraryScope CUSTOM = new LibraryScope() { @Override public String toString() { diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index f46d7c14e9..6d946a2fb1 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -313,7 +313,7 @@ public abstract class MainClassFinder { * Callback interface used to receive class names. * @param the result type */ - public static interface ClassNameCallback { + public interface ClassNameCallback { /** * Handle the specified class name diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JavaAgentDetector.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JavaAgentDetector.java index a770eaa67a..703a7838f7 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JavaAgentDetector.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/JavaAgentDetector.java @@ -32,6 +32,6 @@ public interface JavaAgentDetector { * @param url The url to examine * @return if the URL points to a Java agent */ - public boolean isJavaAgentJar(URL url); + boolean isJavaAgentJar(URL url); } diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java index 807e36f140..45fc4fb921 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java @@ -104,7 +104,7 @@ public abstract class Archive { /** * Represents a single entry in the archive. */ - public static interface Entry { + public interface Entry { /** * Returns {@code true} if the entry represents a directory. @@ -123,7 +123,7 @@ public abstract class Archive { /** * Strategy interface to filter {@link Entry Entries}. */ - public static interface EntryFilter { + public interface EntryFilter { /** * Apply the jar entry filter. @@ -137,7 +137,7 @@ public abstract class Archive { /** * Strategy interface to filter or rename {@link Entry Entries}. */ - public static interface EntryRenameFilter { + public interface EntryRenameFilter { /** * Apply the jar entry filter. diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java index 249400dd33..9fdaa5dd10 100644 --- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java +++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,96 +27,96 @@ public interface AnsiElement { * @deprecated in 1.3.0 in favor of {@link AnsiStyle#NORMAL} */ @Deprecated - public static final AnsiElement NORMAL = new DefaultAnsiElement("0"); + AnsiElement NORMAL = new DefaultAnsiElement("0"); /** * @deprecated in 1.3.0 in favor of {@link AnsiStyle#BOLD} */ @Deprecated - public static final AnsiElement BOLD = new DefaultAnsiElement("1"); + AnsiElement BOLD = new DefaultAnsiElement("1"); /** * @deprecated in 1.3.0 in favor of {@link AnsiStyle#FAINT} */ @Deprecated - public static final AnsiElement FAINT = new DefaultAnsiElement("2"); + AnsiElement FAINT = new DefaultAnsiElement("2"); /** * @deprecated in 1.3.0 in favor of {@link AnsiStyle#ITALIC} */ @Deprecated - public static final AnsiElement ITALIC = new DefaultAnsiElement("3"); + AnsiElement ITALIC = new DefaultAnsiElement("3"); /** * @deprecated in 1.3.0 in favor of {@link AnsiStyle#UNDERLINE} */ @Deprecated - public static final AnsiElement UNDERLINE = new DefaultAnsiElement("4"); + AnsiElement UNDERLINE = new DefaultAnsiElement("4"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#BLACK} */ @Deprecated - public static final AnsiElement BLACK = new DefaultAnsiElement("30"); + AnsiElement BLACK = new DefaultAnsiElement("30"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#RED} */ @Deprecated - public static final AnsiElement RED = new DefaultAnsiElement("31"); + AnsiElement RED = new DefaultAnsiElement("31"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#GREEN} */ @Deprecated - public static final AnsiElement GREEN = new DefaultAnsiElement("32"); + AnsiElement GREEN = new DefaultAnsiElement("32"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#YELLOW} */ @Deprecated - public static final AnsiElement YELLOW = new DefaultAnsiElement("33"); + AnsiElement YELLOW = new DefaultAnsiElement("33"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#BLUE} */ @Deprecated - public static final AnsiElement BLUE = new DefaultAnsiElement("34"); + AnsiElement BLUE = new DefaultAnsiElement("34"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#MAGENTA} */ @Deprecated - public static final AnsiElement MAGENTA = new DefaultAnsiElement("35"); + AnsiElement MAGENTA = new DefaultAnsiElement("35"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#CYAN} */ @Deprecated - public static final AnsiElement CYAN = new DefaultAnsiElement("36"); + AnsiElement CYAN = new DefaultAnsiElement("36"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#WHITE} */ @Deprecated - public static final AnsiElement WHITE = new DefaultAnsiElement("37"); + AnsiElement WHITE = new DefaultAnsiElement("37"); /** * @deprecated in 1.3.0 in favor of {@link AnsiColor#DEFAULT} */ @Deprecated - public static final AnsiElement DEFAULT = new DefaultAnsiElement("39"); + AnsiElement DEFAULT = new DefaultAnsiElement("39"); /** * @return the ANSI escape code */ @Override - public String toString(); + String toString(); /** * Internal default {@link AnsiElement} implementation. */ - static class DefaultAnsiElement implements AnsiElement { + class DefaultAnsiElement implements AnsiElement { private final String code; diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java b/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java index 72338b4e8a..2e48d81557 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/InetAddressEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import java.net.UnknownHostException; * * @author Dave Syer */ -public class InetAddressEditor extends PropertyEditorSupport implements PropertyEditor { +public class InetAddressEditor extends PropertyEditorSupport { @Override public String getAsText() { diff --git a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java index cf121ca72c..e7faadd1ce 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -107,7 +107,7 @@ public class ConfigurationWarningsApplicationContextInitializer implements /** * A single check that can be applied. */ - protected static interface Check { + protected interface Check { /** * Returns a warning if the check fails or {@code null} if there are no problems. diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializerBeans.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializerBeans.java index a9e1ffe785..23af76f944 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializerBeans.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializerBeans.java @@ -227,7 +227,7 @@ class ServletContextInitializerBeans extends * Adapter to convert a given Bean type into a {@link RegistrationBean} (and hence a * {@link ServletContextInitializer}. */ - private static interface RegistrationBeanAdapter { + private interface RegistrationBeanAdapter { RegistrationBean createRegistrationBean(String name, T source, int totalNumberOfSourceBeans); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 64e576a9f8..ad8b6d47d5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -535,7 +535,7 @@ public class JettyEmbeddedServletContainerFactory extends /** * Factory to create the SSL {@link ServerConnector}. */ - private static interface SslServerConnectorFactory { + private interface SslServerConnectorFactory { AbstractConnector getConnector(Server server, SslContextFactory sslContextFactory, int port);