diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 89b16589b7..ebce6a5877 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -229,7 +229,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, throw ex; } } - }; + } /** * Add an alias for 'local.management.port' that actually resolves using @@ -298,7 +298,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, DISABLE, SAME, DIFFERENT; public static ManagementServerPort get(BeanFactory beanFactory) { - ServerProperties serverProperties; try { serverProperties = beanFactory.getBean(ServerProperties.class); @@ -306,7 +305,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, catch (NoSuchBeanDefinitionException ex) { serverProperties = new ServerProperties(); } - ManagementServerProperties managementServerProperties; try { managementServerProperties = beanFactory @@ -315,7 +313,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, catch (NoSuchBeanDefinitionException ex) { managementServerProperties = new ManagementServerProperties(); } - Integer port = managementServerProperties.getPort(); if (port != null && port < 0) { return DISABLE; @@ -329,5 +326,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, || (port != 0 && port.equals(serverProperties.getPort())) ? SAME : DIFFERENT); } - }; + + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java index ded2e09b60..4d833b548c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java @@ -197,7 +197,7 @@ public class MessageSourceAutoConfiguration { if (classLoader != ROOT_CLASSLOADER) { super.addAllClassLoaderJarRoots(classLoader, result); } - }; + } @Override protected Set doFindAllClassPathResources(String path) 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 2bc98a2b72..e4afa7a866 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 @@ -65,7 +65,7 @@ public @interface ConditionalOnJava { /** * Older than the specified {@link JavaVersion}. */ - OLDER_THAN; + OLDER_THAN } @@ -138,5 +138,7 @@ public @interface ConditionalOnJava { } return SIX; } + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java index a2dc6e9e55..c1659c1af4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java @@ -126,6 +126,6 @@ class OnClassCondition extends SpringBootCondition { public abstract boolean matches(String className, ConditionContext context); - }; + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java index e73cc92554..71dfdfcebe 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java @@ -36,6 +36,6 @@ public enum SearchStrategy { /** * Search the entire hierarchy */ - ALL; + ALL } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java index dc1baa7cef..416cdbf5a2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java @@ -67,7 +67,7 @@ public class JerseyProperties { } public enum Type { - SERVLET, FILTER; + SERVLET, FILTER } public static class Filter { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java index 68c84f97b7..6c1456689c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java @@ -154,7 +154,7 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom } return ConditionOutcome.match("No error template view detected"); - }; + } } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java index 7f5e5b5614..932017ba0d 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java @@ -227,7 +227,7 @@ public class RepackageTask extends DefaultTask { + "'springBoot.mainClass'"); } } - }; + } } void setOutputFile(File file) { 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 103d649f0a..edd86d9c5a 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 @@ -29,40 +29,48 @@ public interface LibraryScope { * The library is used at compile time and runtime. */ public static final LibraryScope COMPILE = new LibraryScope() { + @Override public String toString() { return "compile"; - }; + } + }; /** * The library is used at runtime but not needed for compile. */ public static final LibraryScope RUNTIME = new LibraryScope() { + @Override public String toString() { return "runtime"; - }; + } + }; /** * The library is needed for compile but is usually provided when running. */ public static final LibraryScope PROVIDED = new LibraryScope() { + @Override public String toString() { return "provided"; - }; + } + }; /** * Marker for custom scope when custom configuration is used. */ public static final LibraryScope CUSTOM = new LibraryScope() { + @Override public String toString() { return "custom"; - }; + } + }; } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java index e286ec14e5..98f00ef387 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java @@ -128,6 +128,7 @@ public class RunProcess { final BufferedReader reader = new BufferedReader(new InputStreamReader( process.getInputStream())); new Thread() { + @Override public void run() { try { @@ -141,7 +142,8 @@ public class RunProcess { } catch (Exception ex) { } - }; + } + }.start(); } diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java index 10a9579abc..b83cec2d7e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java +++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java @@ -147,6 +147,6 @@ public abstract class AnsiOutput { */ NEVER - }; + } } diff --git a/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java index 9645065440..6cb31dab47 100644 --- a/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java @@ -97,7 +97,7 @@ public class VcapApplicationListener implements private static final String VCAP_SERVICES = "VCAP_SERVICES"; // Before ConfigFileApplicationListener so values there can use these ones - private int order = ConfigFileApplicationListener.DEFAULT_ORDER - 1;; + private int order = ConfigFileApplicationListener.DEFAULT_ORDER - 1; private final JsonParser parser = JsonParserFactory.getJsonParser(); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java index 037eabd5f8..1f35462b56 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java @@ -76,4 +76,4 @@ public class FileEncodingApplicationListener implements } } -}; +} diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java index 99ae1e5745..9e3838c7dc 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java @@ -128,7 +128,7 @@ public class ConfigFileApplicationListener implements if (event instanceof ApplicationPreparedEvent) { onApplicationPreparedEvent((ApplicationPreparedEvent) event); } - }; + } private void onApplicationEnvironmentPreparedEvent( ApplicationEnvironmentPreparedEvent event) { diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java index 313043e379..cf9d51ef40 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java @@ -196,7 +196,7 @@ public class Ssl { } public enum ClientAuth { - WANT, NEED; + WANT, NEED } } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java index 624695bcc2..99cd14dda6 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java @@ -133,10 +133,12 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer private void startDaemonAwaitThread() { Thread awaitThread = new Thread("container-" + (containerCounter.get())) { + @Override public void run() { TomcatEmbeddedServletContainer.this.tomcat.getServer().await(); - }; + } + }; awaitThread.setDaemon(false); awaitThread.start(); diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index 218533fe6e..67119fbfae 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -67,25 +67,25 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem { @Override public Result filter(LogEvent event) { return Result.DENY; - }; + } @Override public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { return Result.DENY; - }; + } @Override public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return Result.DENY; - }; + } @Override public Result filter(Logger logger, Level level, Marker marker, String msg, Object... params) { return Result.DENY; - }; + } };