From b6da50838adeec90ee18df9b58c4753626b70127 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Mon, 25 Sep 2017 23:46:30 +0200 Subject: [PATCH] Remove redundant semicolons --- .../boot/actuate/autoconfigure/cloudfoundry/Token.java | 2 +- .../web/server/ManagementContextAutoConfiguration.java | 2 +- .../springframework/boot/autoconfigure/cache/CacheType.java | 2 +- .../boot/autoconfigure/kafka/KafkaProperties.java | 2 +- .../springframework/boot/autoconfigure/session/StoreType.java | 2 +- .../boot/autoconfigure/http/HttpMessageConvertersTests.java | 4 ++-- .../servlet/error/BasicErrorControllerDirectMockMvcTests.java | 2 +- .../springframework/boot/cli/command/CommandRunnerTests.java | 2 +- .../boot/devtools/filewatch/FileSystemWatcher.java | 2 +- .../boot/test/autoconfigure/json/JsonExcludeFilter.java | 2 +- .../autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java | 2 +- .../springframework/boot/test/util/TestPropertyValues.java | 2 +- .../boot/test/mock/web/SpringBootMockServletContextTests.java | 2 +- .../boot/gradle/plugin/ApplicationPluginAction.java | 2 +- .../boot/gradle/tasks/bundling/ZipCompression.java | 2 +- .../org/springframework/boot/SpringBootExceptionHandler.java | 2 +- .../java/org/springframework/boot/WebApplicationType.java | 2 +- .../java/org/springframework/boot/json/JacksonJsonParser.java | 4 ++-- .../java/org/springframework/boot/SpringApplicationTests.java | 2 +- .../source/MapConfigurationPropertySourceTests.java | 2 +- .../analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java | 2 +- .../boot/jta/bitronix/PoolingConnectionFactoryBeanTests.java | 2 +- .../servlet/server/AbstractServletWebServerFactoryTests.java | 2 +- .../servlet/support/SpringBootServletInitializerTests.java | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java index 7a4a84bc095b..cc6b52961c96 100644 --- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java +++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java @@ -120,6 +120,6 @@ private T getRequired(Map map, String key, Class type) { @Override public String toString() { return this.encoded; - }; + } } diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java index 462f227080e8..8b608edd50fa 100644 --- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java +++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java @@ -184,7 +184,7 @@ public void onApplicationEvent(ApplicationEvent event) { if (event instanceof ApplicationFailedEvent) { onApplicationFailedEvent((ApplicationFailedEvent) event); } - }; + } private void onContextClosedEvent(ContextClosedEvent event) { propagateCloseIfNecessary(event.getApplicationContext()); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java index 6d29877e678b..e3a8c143d4c1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java @@ -74,6 +74,6 @@ public enum CacheType { /** * No caching. */ - NONE; + NONE } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index fd68596ead4e..08dd348531fd 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -766,7 +766,7 @@ public enum Type { /** * Invokes the endpoint with a batch of ConsumerRecords. */ - BATCH; + BATCH } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/StoreType.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/StoreType.java index 2b8023c705b1..8140658efbeb 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/StoreType.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/StoreType.java @@ -49,6 +49,6 @@ public enum StoreType { /** * No session data-store. */ - NONE; + NONE } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java index 5c28b052824b..3f1e119871f0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java @@ -122,7 +122,7 @@ protected List> postProcessConverters( } } return converters; - }; + } }; List> converterClasses = new ArrayList<>(); for (HttpMessageConverter converter : converters) { @@ -152,7 +152,7 @@ protected List> postProcessPartConverters( } } return converters; - }; + } }; List> converterClasses = new ArrayList<>(); for (HttpMessageConverter converter : extractFormPartConverters( diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java index 255d07e773ed..dd348473a2e3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java @@ -185,7 +185,7 @@ protected static class WithAopConfiguration { @Pointcut("within(@org.springframework.stereotype.Controller *)") private void controllerPointCut() { - }; + } @Around("controllerPointCut()") public Object mvcAdvice(ProceedingJoinPoint pjp) throws Throwable { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java index d8027cf011d9..e199620f685c 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java @@ -77,7 +77,7 @@ public void setup() { protected void showUsage() { CommandRunnerTests.this.calls.add(Call.SHOW_USAGE); super.showUsage(); - }; + } @Override protected boolean errorMessage(String message) { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java index 0aab793d534c..b2d586a36377 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java @@ -242,7 +242,7 @@ public void run() { } remainingScans = this.remainingScans.get(); } - }; + } private void scan() throws InterruptedException { Thread.sleep(this.pollInterval - this.quietPeriod); diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java index b64e78de4aaf..d5ecb0555d94 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java @@ -42,7 +42,7 @@ class JsonExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { includes.add(Module.class); includes.add(JsonComponent.class); DEFAULT_INCLUDES = Collections.unmodifiableSet(includes); - }; + } private final JsonTest annotation; diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java index 0c1eaaa70368..037ac1bf6373 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java @@ -57,7 +57,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { includes.add(HttpMessageConverter.class); includes.add(ErrorAttributes.class); DEFAULT_INCLUDES = Collections.unmodifiableSet(includes); - }; + } private static final Set> DEFAULT_INCLUDES_AND_CONTROLLER; diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java b/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java index 2921de95e19d..86ecdb9be216 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java @@ -299,7 +299,7 @@ private Map apply(Map properties) { @Override public void close() { this.previous.forEach(this::setOrClear); - }; + } private String setOrClear(String name, String value) { Assert.notNull(name, "Name must not be null"); diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java index 180447f35934..af8cbf42849e 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java @@ -80,7 +80,7 @@ public void getRootUrlExistsAndIsEmpty() throws Exception { protected String getResourceLocation(String path) { // Don't include the Spring Boot defaults for this test return getResourceBasePathLocation(path); - }; + } }; URL resource = context.getResource("/"); assertThat(resource).isNotEqualTo(nullValue()); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java index 1d6b6220b83a..592d2acc8c30 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java @@ -84,7 +84,7 @@ public Class> getPluginClass() { private String loadResource(String name) { try (InputStreamReader reader = new InputStreamReader( - getClass().getResourceAsStream(name));) { + getClass().getResourceAsStream(name))) { char[] buffer = new char[4096]; int read = 0; StringWriter writer = new StringWriter(); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/ZipCompression.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/ZipCompression.java index 782cddedd4c4..4e972fd8eb0e 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/ZipCompression.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/ZipCompression.java @@ -34,6 +34,6 @@ public enum ZipCompression { /** * The entry should be {@link ZipEntry#DEFLATED} in the archive. */ - DEFLATED; + DEFLATED } diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java b/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java index c0172547a478..e1a585cc0fec 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java @@ -123,7 +123,7 @@ protected SpringBootExceptionHandler initialValue() { Thread.currentThread().getUncaughtExceptionHandler()); Thread.currentThread().setUncaughtExceptionHandler(handler); return handler; - }; + } } diff --git a/spring-boot/src/main/java/org/springframework/boot/WebApplicationType.java b/spring-boot/src/main/java/org/springframework/boot/WebApplicationType.java index 63e55d01fc75..7ca7aebd4762 100644 --- a/spring-boot/src/main/java/org/springframework/boot/WebApplicationType.java +++ b/spring-boot/src/main/java/org/springframework/boot/WebApplicationType.java @@ -41,6 +41,6 @@ public enum WebApplicationType { * The application should run as a reactive web application and should start an * embedded reactive web server. */ - REACTIVE; + REACTIVE } diff --git a/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java index 107f725d9796..1d830c834d52 100644 --- a/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java @@ -65,10 +65,10 @@ private ObjectMapper getObjectMapper() { private static class MapTypeReference extends TypeReference> { - }; + } private static class ListTypeReference extends TypeReference> { - }; + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index 16f9b3d5f9f2..fa493d81f5e4 100644 --- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -957,7 +957,7 @@ public void run() { FailingConfig.class); application.setWebApplicationType(WebApplicationType.NONE); application.run(); - }; + } }; thread.start(); thread.join(6000); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/MapConfigurationPropertySourceTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/MapConfigurationPropertySourceTests.java index b5552dac413b..cad2161631fc 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/source/MapConfigurationPropertySourceTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/source/MapConfigurationPropertySourceTests.java @@ -113,6 +113,6 @@ private Object getValue(ConfigurationPropertySource source, String name) { ConfigurationProperty property = source .getConfigurationProperty(ConfigurationPropertyName.of(name)); return (property == null ? null : property.getValue()); - }; + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java index acaf6c3cfc70..fe6496ffebfb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java @@ -144,7 +144,7 @@ private FailureAnalysis performAnalysis(Class configuration) { private Exception createFailure(Class configuration) { try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext( - configuration);) { + configuration)) { fail("Expected failure did not occur"); return null; } diff --git a/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBeanTests.java index c466ff9de6d8..429af5443487 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBeanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBeanTests.java @@ -36,7 +36,7 @@ public class PoolingConnectionFactoryBeanTests { @Override public synchronized void init() { // Stub out for the tests - }; + } }; @Test diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 2ef32b04ba5b..ca779a44c49d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -1227,7 +1227,7 @@ public int getInitCount() { return this.initCount; } - }; + } public interface BlockedPortAction { diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java index ba8473488a7e..4e956be2c0e6 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java @@ -132,7 +132,7 @@ private class MockSpringBootServletInitializer extends SpringBootServletInitiali protected WebApplicationContext run(SpringApplication application) { SpringBootServletInitializerTests.this.application = application; return null; - }; + } }