Make sure all constants are static final (#643)

Author: valfirst

src/main/java/com/networknt/schema/DateTimeValidator.java

@@ -29,10 +29,10 @@
 
 public class DateTimeValidator extends BaseJsonValidator implements JsonValidator {
     private static final Logger logger = LoggerFactory.getLogger(DateTimeValidator.class);
+    private static final String DATE = "date";
+    private static final String DATETIME = "date-time";
 
     private final String formatName;
-    private final String DATE = "date";
-    private final String DATETIME = "date-time";
 
     public DateTimeValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext, String formatName, ValidatorTypeCode type) {
         super(schemaPath, schemaNode, parentSchema, type, validationContext);

src/main/java/com/networknt/schema/FormatKeyword.java

@@ -25,15 +25,15 @@
 import java.util.Map;
 
 public class FormatKeyword implements Keyword {
+    private static final String DATE = "date";
+    private static final String DATE_TIME = "date-time";
+    private static final String UUID = "uuid";
+    private static final String EMAIL = "email";
+    private static final String DURATION = "duration";
+
     private final ValidatorTypeCode type;
     private final Map<String, Format> formats;
 
-    private final String DATE = "date";
-    private final String DATE_TIME = "date-time";
-    private final String UUID = "uuid";
-    private final String EMAIL = "email";
-    private final String DURATION = "duration";
-
     public FormatKeyword(ValidatorTypeCode type, Map<String, Format> formats) {
         this.type = type;
         this.formats = formats;

src/main/java/com/networknt/schema/ValidatorTypeCode.java

@@ -100,12 +100,12 @@ public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSc
     DEPENDENT_SCHEMAS("dependentSchemas", "1046", new MessageFormat(I18nSupport.getString("dependentSchemas")), DependentSchemas.class, VersionCode.MinV201909),
     UNEVALUATED_PROPERTIES("unevaluatedProperties","1047",new MessageFormat(I18nSupport.getString("unevaluatedProperties")),UnEvaluatedPropertiesValidator.class, VersionCode.MinV6);
 
-    private static Map<String, ValidatorTypeCode> constants = new HashMap<String, ValidatorTypeCode>();
-    private static SpecVersion specVersion = new SpecVersion();
+    private static final Map<String, ValidatorTypeCode> CONSTANTS = new HashMap<String, ValidatorTypeCode>();
+    private static final SpecVersion SPEC_VERSION = new SpecVersion();
 
     static {
         for (ValidatorTypeCode c : values()) {
-            constants.put(c.value, c);
+            CONSTANTS.put(c.value, c);
         }
     }
 
@@ -131,15 +131,15 @@ private ValidatorTypeCode(String value, String errorCode, MessageFormat messageF
     public static List<ValidatorTypeCode> getNonFormatKeywords(SpecVersion.VersionFlag versionFlag) {
         final List<ValidatorTypeCode> result = new ArrayList<ValidatorTypeCode>();
         for (ValidatorTypeCode keyword : values()) {
-            if (!FORMAT.equals(keyword) && specVersion.getVersionFlags(keyword.versionCode).contains(versionFlag)) {
+            if (!FORMAT.equals(keyword) && SPEC_VERSION.getVersionFlags(keyword.versionCode).contains(versionFlag)) {
                 result.add(keyword);
             }
         }
         return result;
     }
 
     public static ValidatorTypeCode fromValue(String value) {
-        ValidatorTypeCode constant = constants.get(value);
+        ValidatorTypeCode constant = CONSTANTS.get(value);
         if (constant == null) {
             throw new IllegalArgumentException(value);
         } else {

src/main/java/com/networknt/schema/Version201909.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 public class Version201909 extends JsonSchemaVersion{
-    private static String URI = "https://json-schema.org/draft/2019-09/schema";
+    private static final String URI = "https://json-schema.org/draft/2019-09/schema";
     private static final String ID = "$id";
 
     static {

src/main/java/com/networknt/schema/Version202012.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 public class Version202012 extends JsonSchemaVersion {
-    private static String URI = "https://json-schema.org/draft/2020-12/schema";
+    private static final String URI = "https://json-schema.org/draft/2020-12/schema";
     private static final String ID = "$id";
 
     static {

src/main/java/com/networknt/schema/Version6.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 public class Version6 extends JsonSchemaVersion{
-    private static String URI = "https://json-schema.org/draft-06/schema";
+    private static final String URI = "https://json-schema.org/draft-06/schema";
     // Draft 6 uses "$id"
     private static final String ID = "$id";
 

src/main/java/com/networknt/schema/Version7.java

@@ -3,7 +3,7 @@
 import java.util.Arrays;
 
 public class Version7 extends JsonSchemaVersion{
-    private static String URI = "https://json-schema.org/draft-07/schema";
+    private static final String URI = "https://json-schema.org/draft-07/schema";
     private static final String ID = "$id";
 
     static {

src/main/java/com/networknt/schema/format/EmailValidator.java

@@ -58,8 +58,9 @@ public class EmailValidator extends BaseJsonValidator implements JsonValidator {
 
     private static final int MAX_USERNAME_LEN = 64;
 
-    private final boolean allowLocal = false;
-    private final boolean allowTld = false;
+    private static final boolean ALLOW_LOCAL = false;
+    private static final boolean ALLOW_TLD = false;
+
     private final String formatName;
 
 
@@ -114,8 +115,8 @@ protected boolean isValidDomain(String domain) {
         }
         // Domain is symbolic name
         DomainValidator domainValidator =
-                DomainValidator.getInstance(allowLocal);
-        if (allowTld) {
+                DomainValidator.getInstance(ALLOW_LOCAL);
+        if (ALLOW_TLD) {
             return domainValidator.isValid(domain) || (!domain.startsWith(".") && domainValidator.isValidTld(domain));
         } else {
             return domainValidator.isValid(domain);