From 2c429ba77dd884f15a4de740ba65938502a7d27b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 13 Dec 2017 11:27:17 -0800 Subject: [PATCH] Restore static final formatting Restore static final constants to upper case formatting. See gh-10457 --- .../boot/cli/DefaultCommandFactory.java | 24 ++++++++++++++----- ...DevToolsPropertyDefaultsPostProcessor.java | 6 ++--- .../context/ImportsContextCustomizer.java | 6 ++--- .../javac/JavaCompilerFieldValuesParser.java | 12 +++++----- .../boot/loader/tools/Layouts.java | 6 ++--- .../boot/maven/ArtifactsLibraries.java | 6 ++--- .../boot/logging/log4j2/ColorConverter.java | 12 +++++----- .../boot/logging/logback/ColorConverter.java | 12 +++++----- .../boot/system/ApplicationPidFileWriter.java | 12 +++++----- ...vletComponentRegisteringPostProcessor.java | 8 +++---- 10 files changed, 58 insertions(+), 46 deletions(-) diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java index a64a7b5bd0..c5390a869c 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java @@ -16,8 +16,9 @@ package org.springframework.boot.cli; -import java.util.Arrays; +import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.springframework.boot.cli.command.Command; @@ -39,14 +40,25 @@ import org.springframework.boot.cli.command.test.TestCommand; */ public class DefaultCommandFactory implements CommandFactory { - private static final List defaultCommands = Arrays.asList( - new VersionCommand(), new RunCommand(), new TestCommand(), new GrabCommand(), - new JarCommand(), new WarCommand(), new InstallCommand(), - new UninstallCommand(), new InitCommand()); + private static final List DEFAULT_COMMANDS; + + static { + ArrayList defaultCommands = new ArrayList(); + defaultCommands.add(new VersionCommand()); + defaultCommands.add(new RunCommand()); + defaultCommands.add(new TestCommand()); + defaultCommands.add(new GrabCommand()); + defaultCommands.add(new JarCommand()); + defaultCommands.add(new WarCommand()); + defaultCommands.add(new InstallCommand()); + defaultCommands.add(new UninstallCommand()); + defaultCommands.add(new InitCommand()); + DEFAULT_COMMANDS = Collections.unmodifiableList(defaultCommands); + } @Override public Collection getCommands() { - return defaultCommands; + return DEFAULT_COMMANDS; } } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java index 584b88fe7a..553c95013a 100755 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java @@ -42,7 +42,7 @@ import org.springframework.core.env.PropertySource; @Order(Ordered.LOWEST_PRECEDENCE) public class DevToolsPropertyDefaultsPostProcessor implements EnvironmentPostProcessor { - private static final Map properties; + private static final Map PROPERTIES; static { Map devToolsProperties = new HashMap(); @@ -58,7 +58,7 @@ public class DevToolsPropertyDefaultsPostProcessor implements EnvironmentPostPro devToolsProperties.put("spring.mvc.log-resolved-exception", "true"); devToolsProperties.put("server.jsp-servlet.init-parameters.development", "true"); devToolsProperties.put("spring.reactor.stacktrace-mode.enabled", "true"); - properties = Collections.unmodifiableMap(devToolsProperties); + PROPERTIES = Collections.unmodifiableMap(devToolsProperties); } @Override @@ -66,7 +66,7 @@ public class DevToolsPropertyDefaultsPostProcessor implements EnvironmentPostPro SpringApplication application) { if (isLocalApplication(environment) && canAddProperties(environment)) { PropertySource propertySource = new MapPropertySource("refresh", - properties); + PROPERTIES); environment.getPropertySources().addLast(propertySource); } } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java index a00c18c19e..b77a7dffb9 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java @@ -228,14 +228,14 @@ class ImportsContextCustomizer implements ContextCustomizer { private static final Class[] NO_IMPORTS = {}; - private static final Set annotationFilters; + private static final Set ANNOTATION_FILTERS; static { Set filters = new HashSet(); filters.add(new JavaLangAnnotationFilter()); filters.add(new KotlinAnnotationFilter()); filters.add(new SpockAnnotationFilter()); - annotationFilters = Collections.unmodifiableSet(filters); + ANNOTATION_FILTERS = Collections.unmodifiableSet(filters); } private final Set key; @@ -274,7 +274,7 @@ class ImportsContextCustomizer implements ContextCustomizer { } private boolean isIgnoredAnnotation(Annotation annotation) { - for (AnnotationFilter annotationFilter : annotationFilters) { + for (AnnotationFilter annotationFilter : ANNOTATION_FILTERS) { if (annotationFilter.isIgnored(annotation)) { return true; } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java index 54e2e30b9f..6c9e80e293 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java @@ -76,7 +76,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser { WRAPPER_TYPES = Collections.unmodifiableMap(types); } - private static final Map, Object> defaultTypeValues; + private static final Map, Object> DEFAULT_TYPE_VALUES; static { Map, Object> values = new HashMap, Object>(); @@ -85,16 +85,16 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser { values.put(Short.class, (short) 0); values.put(Integer.class, 0); values.put(Long.class, (long) 0); - defaultTypeValues = Collections.unmodifiableMap(values); + DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values); } - private static final Map wellKnownStaticFinals; + private static final Map WELL_KNOWN_STATIC_FINALS; static { Map values = new HashMap(); values.put("Boolean.TRUE", true); values.put("Boolean.FALSE", false); - wellKnownStaticFinals = Collections.unmodifiableMap(values); + WELL_KNOWN_STATIC_FINALS = Collections.unmodifiableMap(values); } private final Map fieldValues = new HashMap(); @@ -115,7 +115,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser { private Object getValue(VariableTree variable) throws Exception { ExpressionTree initializer = variable.getInitializer(); Class wrapperType = WRAPPER_TYPES.get(variable.getType()); - Object defaultValue = defaultTypeValues.get(wrapperType); + Object defaultValue = DEFAULT_TYPE_VALUES.get(wrapperType); if (initializer != null) { return getValue(initializer, defaultValue); } @@ -148,7 +148,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser { return this.staticFinals.get(expression.toString()); } if (expression.getKind().equals("MEMBER_SELECT")) { - return wellKnownStaticFinals.get(expression.toString()); + return WELL_KNOWN_STATIC_FINALS.get(expression.toString()); } return defaultValue; } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java index a94eba7fa4..e7a0ebc679 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java @@ -123,7 +123,7 @@ public final class Layouts { */ public static class War implements Layout { - private static final Map scopeDestinations; + private static final Map SCOPE_DESTINATIONS; static { Map map = new HashMap(); @@ -131,7 +131,7 @@ public final class Layouts { map.put(LibraryScope.CUSTOM, "WEB-INF/lib/"); map.put(LibraryScope.RUNTIME, "WEB-INF/lib/"); map.put(LibraryScope.PROVIDED, "WEB-INF/lib-provided/"); - scopeDestinations = Collections.unmodifiableMap(map); + SCOPE_DESTINATIONS = Collections.unmodifiableMap(map); } @Override @@ -141,7 +141,7 @@ public final class Layouts { @Override public String getLibraryDestination(String libraryName, LibraryScope scope) { - return scopeDestinations.get(scope); + return SCOPE_DESTINATIONS.get(scope); } @Override diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java index ac18044ff9..2a5e71c3af 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java @@ -42,7 +42,7 @@ import org.springframework.boot.loader.tools.LibraryScope; */ public class ArtifactsLibraries implements Libraries { - private static final Map scopes; + private static final Map SCOPES; static { Map libraryScopes = new HashMap(); @@ -50,7 +50,7 @@ public class ArtifactsLibraries implements Libraries { libraryScopes.put(Artifact.SCOPE_RUNTIME, LibraryScope.RUNTIME); libraryScopes.put(Artifact.SCOPE_PROVIDED, LibraryScope.PROVIDED); libraryScopes.put(Artifact.SCOPE_SYSTEM, LibraryScope.PROVIDED); - scopes = Collections.unmodifiableMap(libraryScopes); + SCOPES = Collections.unmodifiableMap(libraryScopes); } private final Set artifacts; @@ -70,7 +70,7 @@ public class ArtifactsLibraries implements Libraries { public void doWithLibraries(LibraryCallback callback) throws IOException { Set duplicates = getDuplicates(this.artifacts); for (Artifact artifact : this.artifacts) { - LibraryScope scope = scopes.get(artifact.getScope()); + LibraryScope scope = SCOPES.get(artifact.getScope()); if (scope != null && artifact.getFile() != null) { String name = getFileName(artifact); if (duplicates.contains(name)) { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java index ab79d13ae2..e3fc67029c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java @@ -49,7 +49,7 @@ import org.springframework.boot.ansi.AnsiStyle; @ConverterKeys({ "clr", "color" }) public final class ColorConverter extends LogEventPatternConverter { - private static final Map elements; + private static final Map ELEMENTS; static { Map ansiElements = new HashMap(); @@ -60,17 +60,17 @@ public final class ColorConverter extends LogEventPatternConverter { ansiElements.put("blue", AnsiColor.BLUE); ansiElements.put("magenta", AnsiColor.MAGENTA); ansiElements.put("cyan", AnsiColor.CYAN); - elements = Collections.unmodifiableMap(ansiElements); + ELEMENTS = Collections.unmodifiableMap(ansiElements); } - private static final Map levels; + private static final Map LEVELS; static { Map ansiLevels = new HashMap(); ansiLevels.put(Level.FATAL.intLevel(), AnsiColor.RED); ansiLevels.put(Level.ERROR.intLevel(), AnsiColor.RED); ansiLevels.put(Level.WARN.intLevel(), AnsiColor.YELLOW); - levels = Collections.unmodifiableMap(ansiLevels); + LEVELS = Collections.unmodifiableMap(ansiLevels); } private final List formatters; @@ -101,7 +101,7 @@ public final class ColorConverter extends LogEventPatternConverter { } PatternParser parser = PatternLayout.createPatternParser(config); List formatters = parser.parse(options[0]); - AnsiElement element = (options.length == 1 ? null : elements.get(options[1])); + AnsiElement element = (options.length == 1 ? null : ELEMENTS.get(options[1])); return new ColorConverter(formatters, element); } @@ -125,7 +125,7 @@ public final class ColorConverter extends LogEventPatternConverter { AnsiElement element = this.styling; if (element == null) { // Assume highlighting - element = levels.get(event.getLevel().intLevel()); + element = LEVELS.get(event.getLevel().intLevel()); element = (element == null ? AnsiColor.GREEN : element); } appendAnsiString(toAppendTo, buf.toString(), element); diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java index 83711cd329..3d5421e01b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java @@ -38,7 +38,7 @@ import org.springframework.boot.ansi.AnsiStyle; */ public class ColorConverter extends CompositeConverter { - private static final Map elements; + private static final Map ELEMENTS; static { Map ansiElements = new HashMap(); @@ -49,24 +49,24 @@ public class ColorConverter extends CompositeConverter { ansiElements.put("blue", AnsiColor.BLUE); ansiElements.put("magenta", AnsiColor.MAGENTA); ansiElements.put("cyan", AnsiColor.CYAN); - elements = Collections.unmodifiableMap(ansiElements); + ELEMENTS = Collections.unmodifiableMap(ansiElements); } - private static final Map levels; + private static final Map LEVELS; static { Map ansiLevels = new HashMap(); ansiLevels.put(Level.ERROR_INTEGER, AnsiColor.RED); ansiLevels.put(Level.WARN_INTEGER, AnsiColor.YELLOW); - levels = Collections.unmodifiableMap(ansiLevels); + LEVELS = Collections.unmodifiableMap(ansiLevels); } @Override protected String transform(ILoggingEvent event, String in) { - AnsiElement element = elements.get(getFirstOption()); + AnsiElement element = ELEMENTS.get(getFirstOption()); if (element == null) { // Assume highlighting - element = levels.get(event.getLevel().toInteger()); + element = LEVELS.get(event.getLevel().toInteger()); element = (element == null ? AnsiColor.GREEN : element); } return toAnsiString(in, element); diff --git a/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java b/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java index 4bbdbe2563..18073ee275 100644 --- a/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java +++ b/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java @@ -66,23 +66,23 @@ public class ApplicationPidFileWriter private static final String DEFAULT_FILE_NAME = "application.pid"; - private static final List fileProperties; + private static final List FILE_PROPERTIES; static { List properties = new ArrayList(); properties.add(new SpringProperty("spring.pid.", "file")); properties.add(new SpringProperty("spring.", "pidfile")); properties.add(new SystemProperty("PIDFILE")); - fileProperties = Collections.unmodifiableList(properties); + FILE_PROPERTIES = Collections.unmodifiableList(properties); } - private static final List failOnWriteErrorProperties; + private static final List FAIL_ON_WRITE_ERROR_PROPERTIES; static { List properties = new ArrayList(); properties.add(new SpringProperty("spring.pid.", "fail-on-write-error")); properties.add(new SystemProperty("PID_FAIL_ON_WRITE_ERROR")); - failOnWriteErrorProperties = Collections.unmodifiableList(properties); + FAIL_ON_WRITE_ERROR_PROPERTIES = Collections.unmodifiableList(properties); } private static final AtomicBoolean created = new AtomicBoolean(false); @@ -153,7 +153,7 @@ public class ApplicationPidFileWriter private void writePidFile(SpringApplicationEvent event) throws IOException { File pidFile = this.file; - String override = getProperty(event, fileProperties); + String override = getProperty(event, FILE_PROPERTIES); if (override != null) { pidFile = new File(override); } @@ -162,7 +162,7 @@ public class ApplicationPidFileWriter } private boolean failOnWriteError(SpringApplicationEvent event) { - String value = getProperty(event, failOnWriteErrorProperties); + String value = getProperty(event, FAIL_ON_WRITE_ERROR_PROPERTIES); return (value == null ? false : Boolean.parseBoolean(value)); } diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java index f8852b8244..0c95faa7ee 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java @@ -43,14 +43,14 @@ import org.springframework.web.context.WebApplicationContext; class ServletComponentRegisteringPostProcessor implements BeanFactoryPostProcessor, ApplicationContextAware { - private static final List handlers; + private static final List HANDLERS; static { List servletComponentHandlers = new ArrayList(); servletComponentHandlers.add(new WebServletHandler()); servletComponentHandlers.add(new WebFilterHandler()); servletComponentHandlers.add(new WebListenerHandler()); - handlers = Collections.unmodifiableList(servletComponentHandlers); + HANDLERS = Collections.unmodifiableList(servletComponentHandlers); } private final Set packagesToScan; @@ -78,7 +78,7 @@ class ServletComponentRegisteringPostProcessor for (BeanDefinition candidate : componentProvider .findCandidateComponents(packageToScan)) { if (candidate instanceof ScannedGenericBeanDefinition) { - for (ServletComponentHandler handler : handlers) { + for (ServletComponentHandler handler : HANDLERS) { handler.handle(((ScannedGenericBeanDefinition) candidate), (BeanDefinitionRegistry) this.applicationContext); } @@ -97,7 +97,7 @@ class ServletComponentRegisteringPostProcessor false); componentProvider.setEnvironment(this.applicationContext.getEnvironment()); componentProvider.setResourceLoader(this.applicationContext); - for (ServletComponentHandler handler : handlers) { + for (ServletComponentHandler handler : HANDLERS) { componentProvider.addIncludeFilter(handler.getTypeFilter()); } return componentProvider;