From 59122358d3e78f03f60e85b137b4f9892eb96078 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 16 Jun 2017 08:58:14 +0100 Subject: [PATCH] Clean up and format code --- ...lassLoaderFilesResourcePatternResolver.java | 12 ++++++------ ...oaderFilesResourcePatternResolverTests.java | 3 +-- .../main/java/sample/jooq/domain/Author.java | 1 + .../main/java/sample/jooq/domain/Book.java | 1 + .../java/sample/jooq/domain/BookStore.java | 1 + .../sample/jooq/domain/BookToBookStore.java | 1 + .../main/java/sample/jooq/domain/Language.java | 1 + .../SampleWebSocketsApplicationTests.java | 1 - .../jetty93/snake/SnakeTimerTests.java | 4 +--- .../TestDatabaseAutoConfigurationTests.java | 3 ++- .../TypeElementMembers.java | 4 ++-- .../metadata/ItemDeprecation.java | 4 ++-- ...rationMetadataAnnotationProcessorTests.java | 18 ++++++++---------- .../boot/gradle/SpringBootPluginExtension.java | 3 +-- .../boot/jackson/JsonComponentModule.java | 4 ++-- .../boot/jackson/JsonComponentModuleTests.java | 3 ++- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java index df3fafe0c1..119a4159fd 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java @@ -216,8 +216,8 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe ApplicationContext applicationContext) { DefaultResourceLoader resourceLoader = new DefaultResourceLoader(); if (applicationContext instanceof DefaultResourceLoader) { - Collection protocolResolvers = - ((DefaultResourceLoader) applicationContext).getProtocolResolvers(); + Collection protocolResolvers = ((DefaultResourceLoader) applicationContext) + .getProtocolResolvers(); for (ProtocolResolver protocolResolver : protocolResolvers) { resourceLoader.addProtocolResolver(protocolResolver); } @@ -247,11 +247,11 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe private ResourceLoader createResourceLoader( WebApplicationContext applicationContext) { - WebApplicationContextResourceLoader resourceLoader = - new WebApplicationContextResourceLoader(applicationContext); + WebApplicationContextResourceLoader resourceLoader = new WebApplicationContextResourceLoader( + applicationContext); if (applicationContext instanceof DefaultResourceLoader) { - Collection protocolResolvers = - ((DefaultResourceLoader) applicationContext).getProtocolResolvers(); + Collection protocolResolvers = ((DefaultResourceLoader) applicationContext) + .getProtocolResolvers(); for (ProtocolResolver protocolResolver : protocolResolvers) { resourceLoader.addProtocolResolver(protocolResolver); } diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java index 7a3254b8c8..770aebab86 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java @@ -168,8 +168,7 @@ public class ClassLoaderFilesResourcePatternResolverTests { private ProtocolResolver mockProtocolResolver(String path, Resource resource) { ProtocolResolver resolver = mock(ProtocolResolver.class); - given(resolver.resolve(eq(path), any(ResourceLoader.class))) - .willReturn(resource); + given(resolver.resolve(eq(path), any(ResourceLoader.class))).willReturn(resource); return resolver; } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java index 0052e031c3..70f5bae490 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java @@ -133,6 +133,7 @@ public class Author extends TableImpl { /** * Rename this table */ + @Override public Author rename(String name) { return new Author(name, null); } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java index b987e2f5b6..8b90b902c4 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java @@ -136,6 +136,7 @@ public class Book extends TableImpl { /** * Rename this table */ + @Override public Book rename(String name) { return new Book(name, null); } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java index a4025863c5..6bb06ff4a4 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java @@ -94,6 +94,7 @@ public class BookStore extends TableImpl { /** * Rename this table */ + @Override public BookStore rename(String name) { return new BookStore(name, null); } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java index fa5ea67190..87dcc42d62 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java @@ -124,6 +124,7 @@ public class BookToBookStore extends TableImpl { /** * Rename this table */ + @Override public BookToBookStore rename(String name) { return new BookToBookStore(name, null); } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java index a8f9d51578..6c90114549 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java @@ -114,6 +114,7 @@ public class Language extends TableImpl { /** * Rename this table */ + @Override public Language rename(String name) { return new Language(name, null); } diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/SampleWebSocketsApplicationTests.java index da4364c7d7..6e2cac26e7 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/SampleWebSocketsApplicationTests.java @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.junit.runner.RunWith; -import samples.websocket.jetty93.SampleJetty93WebSocketsApplication; import samples.websocket.jetty93.client.GreetingService; import samples.websocket.jetty93.client.SimpleClientWebSocketHandler; import samples.websocket.jetty93.client.SimpleGreetingService; diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/snake/SnakeTimerTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/snake/SnakeTimerTests.java index c9407cdb7c..5661ffe835 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/snake/SnakeTimerTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/snake/SnakeTimerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 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. @@ -19,8 +19,6 @@ package samples.websocket.jetty93.snake; import java.io.IOException; import org.junit.Test; -import samples.websocket.jetty93.snake.Snake; -import samples.websocket.jetty93.snake.SnakeTimer; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.willThrow; diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java index 658cf7b04f..f5ad54e4a5 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java @@ -76,7 +76,8 @@ public class TestDatabaseAutoConfigurationTests { this.context = doLoad(config, environment); } - private ConfigurableApplicationContext doLoad(Class config, String... environment) { + private ConfigurableApplicationContext doLoad(Class config, + String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); if (config != null) { ctx.register(config); diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java index 0abe73fa6e..4e6171a7c7 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java @@ -179,8 +179,8 @@ class TypeElementMembers { return candidate; } TypeMirror alternative = this.typeUtils.getWrapperOrPrimitiveFor(type); - if (alternative != null && - this.env.getTypeUtils().isSameType(returnType, alternative)) { + if (alternative != null + && this.env.getTypeUtils().isSameType(returnType, alternative)) { return candidate; } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemDeprecation.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemDeprecation.java index 99038aef90..7b1636c221 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemDeprecation.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemDeprecation.java @@ -71,8 +71,8 @@ public class ItemDeprecation { @Override public String toString() { return "ItemDeprecation{" + "reason='" + this.reason + '\'' + ", " - + "replacement='" + this.replacement + '\'' + ", " - + "level='" + this.level + '\'' + '}'; + + "replacement='" + this.replacement + '\'' + ", " + "level='" + + this.level + '\'' + '}'; } @Override diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index 119eb80ec4..4d5a9e24e3 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -490,8 +490,8 @@ public class ConfigurationMetadataAnnotationProcessorTests { @Test public void lombokInnerClassWithGetterProperties() throws IOException { - ConfigurationMetadata metadata = - compile(LombokInnerClassWithGetterProperties.class); + ConfigurationMetadata metadata = compile( + LombokInnerClassWithGetterProperties.class); assertThat(metadata).has(Metadata.withGroup("config") .fromSource(LombokInnerClassWithGetterProperties.class)); assertThat(metadata).has(Metadata.withGroup("config.first") @@ -541,16 +541,14 @@ public class ConfigurationMetadataAnnotationProcessorTests { @Test public void mergeExistingPropertyDeprecation() throws Exception { ItemMetadata property = ItemMetadata.newProperty("simple", "comparator", null, - null, null, null, null, - new ItemDeprecation("Don't use this.", "simple.complex-comparator", - "error")); + null, null, null, null, new ItemDeprecation("Don't use this.", + "simple.complex-comparator", "error")); writeAdditionalMetadata(property); ConfigurationMetadata metadata = compile(SimpleProperties.class); assertThat(metadata) .has(Metadata.withProperty("simple.comparator", "java.util.Comparator") - .fromSource(SimpleProperties.class) - .withDeprecation("Don't use this.", "simple.complex-comparator", - "error")); + .fromSource(SimpleProperties.class).withDeprecation( + "Don't use this.", "simple.complex-comparator", "error")); assertThat(metadata.getItems()).hasSize(4); } @@ -576,8 +574,8 @@ public class ConfigurationMetadataAnnotationProcessorTests { ConfigurationMetadata metadata = compile(DeprecatedSingleProperty.class); assertThat(metadata).has( Metadata.withProperty("singledeprecated.name", String.class.getName()) - .fromSource(DeprecatedSingleProperty.class) - .withDeprecation("renamed", "singledeprecated.new-name", "error")); + .fromSource(DeprecatedSingleProperty.class).withDeprecation( + "renamed", "singledeprecated.new-name", "error")); assertThat(metadata.getItems()).hasSize(3); } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java index c2eb3792f6..490b046e61 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java @@ -320,8 +320,7 @@ public class SpringBootPluginExtension { * Module Layout. * @deprecated as of 1.5 in favor of a custom {@link LayoutFactory} */ - @Deprecated - MODULE(new Layouts.Module()), + @Deprecated MODULE(new Layouts.Module()), /** * No layout. diff --git a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java index aa2708b9d5..e35641de20 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java +++ b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java @@ -79,8 +79,8 @@ public class JsonComponentModule extends SimpleModule implements BeanFactoryAwar addDeserializerWithDeducedType((JsonDeserializer) bean); } for (Class innerClass : bean.getClass().getDeclaredClasses()) { - if (!Modifier.isAbstract(innerClass.getModifiers()) && - (JsonSerializer.class.isAssignableFrom(innerClass) + if (!Modifier.isAbstract(innerClass.getModifiers()) + && (JsonSerializer.class.isAssignableFrom(innerClass) || JsonDeserializer.class.isAssignableFrom(innerClass))) { try { addJsonBean(innerClass.newInstance()); diff --git a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java index 3f65dd9a20..ee42dec511 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java @@ -109,7 +109,8 @@ public class JsonComponentModuleTests { @JsonComponent static class ComponentWithInnerAbstractClass { - private static abstract class AbstractSerializer extends NameAndAgeJsonComponent.Serializer { + private static abstract class AbstractSerializer + extends NameAndAgeJsonComponent.Serializer { }