Merge branch 'master' into develop

Author: stevehu

CHANGELOG.md

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 0.1.14 - 2017-02-14
+
+### Added
+
+### Changed
+- Fixes #64 Add simple tests for ValidatorTypeCode. Thanks @ehrmann
+- Fixes #61 Restore validator type code from value. Thanks @ehrmann
+
 ## 0.1.13 - 2017-12-10
 
 ### Added

pom.xml

@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>0.1.13</version>
+    <version>0.1.14</version>
     <description>A json schema validator that supports draft v4</description>
     <url>https://github.com/networknt/json-schema-validator</url>
     <name>JsonSchemaValidator</name>

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

@@ -19,7 +19,9 @@
 import java.lang.reflect.Constructor;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -62,6 +64,14 @@ public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSc
     UNION_TYPE("unionType", "1030", new MessageFormat("{0}: {1} found, but {2} is required")),
     UNIQUE_ITEMS("uniqueItems", "1031", new MessageFormat("{0}: the items in the array must be unique"));
 
+	private static Map<String, ValidatorTypeCode> constants = new HashMap<String, ValidatorTypeCode>();
+
+    static {
+        for (ValidatorTypeCode c : values()) {
+            constants.put(c.value, c);
+        }
+    }
+
     private final String value;
     private final String errorCode;
     private final MessageFormat messageFormat;
@@ -83,6 +93,15 @@ public static List<ValidatorTypeCode> getNonFormatKeywords() {
         }
         return result;
     }
+
+    public static ValidatorTypeCode fromValue(String value) {
+        ValidatorTypeCode constant = constants.get(value);
+        if (constant == null) {
+            throw new IllegalArgumentException(value);
+        } else {
+            return constant;
+        }
+    }
 
     public JsonValidator newValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) throws Exception {
             String shortClassName = getValue();

src/test/java/com/networknt/schema/ValidatorTypeCodeTest.java

@@ -0,0 +1,25 @@
+package com.networknt.schema;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class ValidatorTypeCodeTest {
+
+    @Test
+    public void testFromValueString() {
+        assertEquals(ValidatorTypeCode.ADDITIONAL_PROPERTIES, ValidatorTypeCode.fromValue("additionalProperties"));
+    }
+
+    @Test
+    public void testFromValueAll() {
+        for (ValidatorTypeCode code : ValidatorTypeCode.values()) {
+            assertEquals(code, ValidatorTypeCode.fromValue(code.getValue()));
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testFromValueMissing() {
+        assertEquals(ValidatorTypeCode.ADDITIONAL_PROPERTIES, ValidatorTypeCode.fromValue("missing"));
+    }
+
+}