root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12032 from igor-suhorukov 

* pr/12032:
  Polish static final usage for constants
This commit is contained in:
Phillip Webb 2018-02-13 14:54:29 -08:00
parent 94bbaa74e6 e98b93844a
commit a9eefaedcf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/ExitStatus.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
@ -29,12 +29,12 @@ public final class ExitStatus {
/**
* Generic "OK" exit status with zero exit code and {@literal hangup=false}.
*/
public static ExitStatus OK = new ExitStatus(0, "OK");
public static final ExitStatus OK = new ExitStatus(0, "OK");
/**
* Generic "not OK" exit status with non-zero exit code and {@literal hangup=true}.
*/
public static ExitStatus ERROR = new ExitStatus(-1, "ERROR", true);
public static final ExitStatus ERROR = new ExitStatus(-1, "ERROR", true);
private final int code;

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java vendored
View File

@ -59,12 +59,12 @@ public class SpringApplicationJsonEnvironmentPostProcessor
/**
* Name of the {@code spring.application.json} property.
*/
public static String SPRING_APPLICATION_JSON_PROPERTY = "spring.application.json";
public static final String SPRING_APPLICATION_JSON_PROPERTY = "spring.application.json";
/**
* Name of the {@code SPRING_APPLICATION_JSON} environment variable.
*/
public static String SPRING_APPLICATION_JSON_ENVIRONMENT_VARIABLE = "SPRING_APPLICATION_JSON";
public static final String SPRING_APPLICATION_JSON_ENVIRONMENT_VARIABLE = "SPRING_APPLICATION_JSON";
private static final String SERVLET_ENVIRONMENT_CLASS = "org.springframework.web."
+ "context.support.StandardServletEnvironment";
@ -176,7 +176,7 @@ public class SpringApplicationJsonEnvironmentPostProcessor
private final JsonPropertyValue propertyValue;
JsonPropertySource(JsonPropertyValue propertyValue, Map<String, Object> source) {
super("spring.application.json", source);
super(SPRING_APPLICATION_JSON_PROPERTY, source);
this.propertyValue = propertyValue;
}