From bfa291f671a10e98ccf21712893f5b53c32bd84b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 30 Sep 2017 02:47:40 +0900 Subject: [PATCH] Polish --- CONTRIBUTING.adoc | 2 +- .../session/SessionProperties.java | 2 +- .../boot/cli/DefaultCommandFactory.java | 6 +-- ...DevToolsPropertyDefaultsPostProcessor.java | 33 ++++++++-------- .../appendix-application-properties.adoc | 2 +- spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- .../asciidoc/production-ready-features.adoc | 2 +- .../main/asciidoc/spring-boot-features.adoc | 2 +- .../context/ImportsContextCustomizer.java | 6 +-- .../javac/JavaCompilerFieldValuesParser.java | 12 +++--- .../boot/loader/tools/Layouts.java | 6 +-- .../boot/maven/ArtifactsLibraries.java | 18 ++++----- .../boot/logging/log4j2/ColorConverter.java | 38 +++++++++---------- .../boot/logging/logback/ColorConverter.java | 36 +++++++++--------- .../boot/system/ApplicationPidFileWriter.java | 12 +++--- ...vletComponentRegisteringPostProcessor.java | 18 ++++----- 16 files changed, 99 insertions(+), 98 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 013646044b..1c4b06660f 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -115,7 +115,7 @@ Running a full build is a two phase process. Preparing the build will compile and install the `spring-boot-maven-plugin` so that it can be referenced during the full build. It also generates a `settings.xml` file that enables a `snapshot`, `milestone` or `release` profiles based on the version being -build. To prepare the build, from the root directory use: +built. To prepare the build, from the root directory use: [indent=0] ---- diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java index a1e11d9faf..8eccfa6ea5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java @@ -38,7 +38,7 @@ public class SessionProperties { */ private StoreType storeType; - private Integer timeout; + private final Integer timeout; private final Hazelcast hazelcast = new Hazelcast(); 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 9e7b7104fd..a64a7b5bd0 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 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. @@ -39,14 +39,14 @@ import org.springframework.boot.cli.command.test.TestCommand; */ public class DefaultCommandFactory implements CommandFactory { - private static final List DEFAULT_COMMANDS = Arrays.asList( + 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()); @Override public Collection getCommands() { - return DEFAULT_COMMANDS; + return defaultCommands; } } 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 5fdf4141c8..88ac111ff6 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 @@ -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. @@ -42,22 +42,23 @@ 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 properties = new HashMap(); - properties.put("spring.thymeleaf.cache", "false"); - properties.put("spring.freemarker.cache", "false"); - properties.put("spring.groovy.template.cache", "false"); - properties.put("spring.mustache.cache", "false"); - properties.put("server.session.persistent", "true"); - properties.put("spring.h2.console.enabled", "true"); - properties.put("spring.resources.cache-period", "0"); - properties.put("spring.resources.chain.cache", "false"); - properties.put("spring.template.provider.cache", "false"); - properties.put("spring.mvc.log-resolved-exception", "true"); - properties.put("server.jsp-servlet.init-parameters.development", "true"); - PROPERTIES = Collections.unmodifiableMap(properties); + Map devToolsProperties = new HashMap(); + devToolsProperties.put("spring.thymeleaf.cache", "false"); + devToolsProperties.put("spring.freemarker.cache", "false"); + devToolsProperties.put("spring.groovy.template.cache", "false"); + devToolsProperties.put("spring.mustache.cache", "false"); + devToolsProperties.put("server.session.persistent", "true"); + devToolsProperties.put("spring.h2.console.enabled", "true"); + devToolsProperties.put("spring.resources.cache-period", "0"); + devToolsProperties.put("spring.resources.chain.cache", "false"); + devToolsProperties.put("spring.template.provider.cache", "false"); + devToolsProperties.put("spring.mvc.log-resolved-exception", "true"); + devToolsProperties.put("server.servlet.jsp.init-parameters.development", "true"); + devToolsProperties.put("spring.reactor.stacktrace-mode.enabled", "true"); + properties = Collections.unmodifiableMap(devToolsProperties); } @Override @@ -65,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-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 950880d1da..764f5ee07b 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1022,7 +1022,7 @@ content into your application; rather pick only the properties that you need. endpoints.flyway.sensitive= # Mark if the endpoint exposes sensitive information. endpoints.health.enabled= # Enable the endpoint. endpoints.health.id= # Endpoint identifier. - endpoints.health.mapping.*= # Mapping of health statuses to HttpStatus codes. By default, registered health statuses map to sensible defaults (i.e. UP maps to 200). + endpoints.health.mapping.*= # Mapping of health statuses to HTTP status codes. By default, registered health statuses map to sensible defaults (i.e. UP maps to 200). endpoints.health.path= # Endpoint path. endpoints.health.sensitive= # Mark if the endpoint exposes sensitive information. endpoints.health.time-to-live=1000 # Time to live for cached result, in milliseconds. diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index dce913d482..be16e984c2 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -2061,7 +2061,7 @@ respectively. Spring Data REST can expose the `Repository` implementations as REST endpoints for you as long as Spring MVC has been enabled for the application. -Spring Boot exposes as set of useful properties from the `spring.data.rest` namespace that +Spring Boot exposes a set of useful properties from the `spring.data.rest` namespace that customize the {spring-data-rest-javadoc}/core/config/RepositoryRestConfiguration.{dc-ext}[`RepositoryRestConfiguration`]. If you need to provide additional customization, you should use a diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index b42617a7c3..82553128f2 100644 --- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -397,7 +397,7 @@ to your application properties: The HTTP status code in the response reflects the overall health status (e.g. `UP` maps to 200, `OUT_OF_SERVICE` or `DOWN` to 503). You might also want to register custom status mappings with the `HealthMvcEndpoint` if you access the health endpoint over HTTP. -For example, the following maps `FATAL` to `HttpStatus.SERVICE_UNAVAILABLE`: +For example, the following maps `FATAL` to 503 (service unavailable): [source,properties,indent=0] ---- diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 00b5fc8c7e..14522cd3a7 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1876,7 +1876,7 @@ can be achieved as follows: You can also customize the static resource locations using `spring.resources.static-locations` (replacing the default values with a list of directory locations). If you do this the default welcome page detection will switch to your custom -locations, so if there is an `index.html` in any of your locations on startup, it will be +locations. So if there is an `index.html` in any of your locations on startup, it will be the home page of the application. In addition to the '`standard`' static resource locations above, a special case is made 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 b77a7dffb9..a00c18c19e 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 ANNOTATION_FILTERS; + private static final Set annotationFilters; static { Set filters = new HashSet(); filters.add(new JavaLangAnnotationFilter()); filters.add(new KotlinAnnotationFilter()); filters.add(new SpockAnnotationFilter()); - ANNOTATION_FILTERS = Collections.unmodifiableSet(filters); + annotationFilters = Collections.unmodifiableSet(filters); } private final Set key; @@ -274,7 +274,7 @@ class ImportsContextCustomizer implements ContextCustomizer { } private boolean isIgnoredAnnotation(Annotation annotation) { - for (AnnotationFilter annotationFilter : ANNOTATION_FILTERS) { + for (AnnotationFilter annotationFilter : annotationFilters) { 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 6c9e80e293..54e2e30b9f 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> DEFAULT_TYPE_VALUES; + private static final Map, Object> defaultTypeValues; 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); - DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values); + defaultTypeValues = Collections.unmodifiableMap(values); } - private static final Map WELL_KNOWN_STATIC_FINALS; + private static final Map wellKnownStaticFinals; static { Map values = new HashMap(); values.put("Boolean.TRUE", true); values.put("Boolean.FALSE", false); - WELL_KNOWN_STATIC_FINALS = Collections.unmodifiableMap(values); + wellKnownStaticFinals = 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 = DEFAULT_TYPE_VALUES.get(wrapperType); + Object defaultValue = defaultTypeValues.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 WELL_KNOWN_STATIC_FINALS.get(expression.toString()); + return wellKnownStaticFinals.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 e7a0ebc679..a94eba7fa4 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 SCOPE_DESTINATIONS; + private static final Map scopeDestinations; 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/"); - SCOPE_DESTINATIONS = Collections.unmodifiableMap(map); + scopeDestinations = Collections.unmodifiableMap(map); } @Override @@ -141,7 +141,7 @@ public final class Layouts { @Override public String getLibraryDestination(String libraryName, LibraryScope scope) { - return SCOPE_DESTINATIONS.get(scope); + return scopeDestinations.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 dd83710824..ac18044ff9 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 @@ -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. @@ -42,15 +42,15 @@ import org.springframework.boot.loader.tools.LibraryScope; */ public class ArtifactsLibraries implements Libraries { - private static final Map SCOPES; + private static final Map scopes; static { - Map scopes = new HashMap(); - scopes.put(Artifact.SCOPE_COMPILE, LibraryScope.COMPILE); - scopes.put(Artifact.SCOPE_RUNTIME, LibraryScope.RUNTIME); - scopes.put(Artifact.SCOPE_PROVIDED, LibraryScope.PROVIDED); - scopes.put(Artifact.SCOPE_SYSTEM, LibraryScope.PROVIDED); - SCOPES = Collections.unmodifiableMap(scopes); + Map libraryScopes = new HashMap(); + libraryScopes.put(Artifact.SCOPE_COMPILE, LibraryScope.COMPILE); + 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); } 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 af4c305ec6..ab79d13ae2 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 @@ -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. @@ -49,28 +49,28 @@ 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 elements = new HashMap(); - elements.put("faint", AnsiStyle.FAINT); - elements.put("red", AnsiColor.RED); - elements.put("green", AnsiColor.GREEN); - elements.put("yellow", AnsiColor.YELLOW); - elements.put("blue", AnsiColor.BLUE); - elements.put("magenta", AnsiColor.MAGENTA); - elements.put("cyan", AnsiColor.CYAN); - ELEMENTS = Collections.unmodifiableMap(elements); + Map ansiElements = new HashMap(); + ansiElements.put("faint", AnsiStyle.FAINT); + ansiElements.put("red", AnsiColor.RED); + ansiElements.put("green", AnsiColor.GREEN); + ansiElements.put("yellow", AnsiColor.YELLOW); + ansiElements.put("blue", AnsiColor.BLUE); + ansiElements.put("magenta", AnsiColor.MAGENTA); + ansiElements.put("cyan", AnsiColor.CYAN); + elements = Collections.unmodifiableMap(ansiElements); } - private static final Map LEVELS; + private static final Map levels; static { - Map levels = new HashMap(); - levels.put(Level.FATAL.intLevel(), AnsiColor.RED); - levels.put(Level.ERROR.intLevel(), AnsiColor.RED); - levels.put(Level.WARN.intLevel(), AnsiColor.YELLOW); - LEVELS = Collections.unmodifiableMap(levels); + 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); } 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 aaac78b3a3..83711cd329 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 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. @@ -38,35 +38,35 @@ import org.springframework.boot.ansi.AnsiStyle; */ public class ColorConverter extends CompositeConverter { - private static final Map ELEMENTS; + private static final Map elements; static { - Map elements = new HashMap(); - elements.put("faint", AnsiStyle.FAINT); - elements.put("red", AnsiColor.RED); - elements.put("green", AnsiColor.GREEN); - elements.put("yellow", AnsiColor.YELLOW); - elements.put("blue", AnsiColor.BLUE); - elements.put("magenta", AnsiColor.MAGENTA); - elements.put("cyan", AnsiColor.CYAN); - ELEMENTS = Collections.unmodifiableMap(elements); + Map ansiElements = new HashMap(); + ansiElements.put("faint", AnsiStyle.FAINT); + ansiElements.put("red", AnsiColor.RED); + ansiElements.put("green", AnsiColor.GREEN); + ansiElements.put("yellow", AnsiColor.YELLOW); + ansiElements.put("blue", AnsiColor.BLUE); + ansiElements.put("magenta", AnsiColor.MAGENTA); + ansiElements.put("cyan", AnsiColor.CYAN); + elements = Collections.unmodifiableMap(ansiElements); } - private static final Map LEVELS; + private static final Map levels; static { - Map levels = new HashMap(); - levels.put(Level.ERROR_INTEGER, AnsiColor.RED); - levels.put(Level.WARN_INTEGER, AnsiColor.YELLOW); - LEVELS = Collections.unmodifiableMap(levels); + Map ansiLevels = new HashMap(); + ansiLevels.put(Level.ERROR_INTEGER, AnsiColor.RED); + ansiLevels.put(Level.WARN_INTEGER, AnsiColor.YELLOW); + 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 18073ee275..4bbdbe2563 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 FILE_PROPERTIES; + private static final List fileProperties; static { List properties = new ArrayList(); properties.add(new SpringProperty("spring.pid.", "file")); properties.add(new SpringProperty("spring.", "pidfile")); properties.add(new SystemProperty("PIDFILE")); - FILE_PROPERTIES = Collections.unmodifiableList(properties); + fileProperties = Collections.unmodifiableList(properties); } - private static final List FAIL_ON_WRITE_ERROR_PROPERTIES; + private static final List failOnWriteErrorProperties; static { List properties = new ArrayList(); properties.add(new SpringProperty("spring.pid.", "fail-on-write-error")); properties.add(new SystemProperty("PID_FAIL_ON_WRITE_ERROR")); - FAIL_ON_WRITE_ERROR_PROPERTIES = Collections.unmodifiableList(properties); + failOnWriteErrorProperties = 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, FILE_PROPERTIES); + String override = getProperty(event, fileProperties); if (override != null) { pidFile = new File(override); } @@ -162,7 +162,7 @@ public class ApplicationPidFileWriter } private boolean failOnWriteError(SpringApplicationEvent event) { - String value = getProperty(event, FAIL_ON_WRITE_ERROR_PROPERTIES); + String value = getProperty(event, failOnWriteErrorProperties); 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 abc4b90d07..f8852b8244 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 @@ -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. @@ -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 handlers = new ArrayList(); - handlers.add(new WebServletHandler()); - handlers.add(new WebFilterHandler()); - handlers.add(new WebListenerHandler()); - HANDLERS = Collections.unmodifiableList(handlers); + List servletComponentHandlers = new ArrayList(); + servletComponentHandlers.add(new WebServletHandler()); + servletComponentHandlers.add(new WebFilterHandler()); + servletComponentHandlers.add(new WebListenerHandler()); + 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;