upgrade to 1.0.34 and update changelog

networknt · Mar 12, 2020 · 55794b4 · 55794b4
1 parent cb338c5
commit 55794b4
Show file tree

Hide file tree

Showing 24 changed files with 791 additions and 498 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 1.0.34 - 2020-03-12
+
+### Added
+
+### Changed
+
+- fixes #268 Collector Context changes to handle simple Objects. Thanks @prashanthjos
+- fixes #266 reformat the code and resolve javadoc warnnings
+
 ## 1.0.33 - 2020-03-09
 
 ### Added

diff --git a/README.md b/README.md
@@ -80,15 +80,15 @@ Maven:
 <dependency>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.33</version>
+    <version>1.0.34</version>
 </dependency>
 ```
 
 Gradle:
 
 ```
 dependencies {
-    compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.33");
+    compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.34");
 }
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.33</version>
+    <version>1.0.34</version>
     <packaging>bundle</packaging>
     <description>A json schema validator that supports draft v4, v6, v7 and v2019-09</description>
     <url>https://github.com/networknt/json-schema-validator</url>

diff --git a/src/main/java/com/networknt/schema/AbstractCollector.java b/src/main/java/com/networknt/schema/AbstractCollector.java
@@ -1,9 +1,24 @@
+/*
+ * Copyright (c) 2020 Network New Technologies Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.networknt.schema;
 
-public abstract class AbstractCollector<E> implements Collector<E>{
+public abstract class AbstractCollector<E> implements Collector<E> {
 
-	@Override
-	public void combine(Object object) {
-		// Do nothing. This is the default Implementation.
-	}
+    @Override
+    public void combine(Object object) {
+        // Do nothing. This is the default Implementation.
+    }
 }
diff --git a/src/main/java/com/networknt/schema/Collector.java b/src/main/java/com/networknt/schema/Collector.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020 Network New Technologies Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.networknt.schema;
 
 /**
@@ -9,20 +25,22 @@
 public interface Collector<E> {
 
 
-	/**
-	 * This method should be called by the intermediate touch points that want to
-	 * combine the data being collected by this collector. This is an optional
-	 * method and could be used when the same collector is used for collecting data
-	 * at multiple touch points or accumulating data at same touch point.
-	 */
-	public void combine(Object object);
+    /**
+     * This method should be called by the intermediate touch points that want to
+     * combine the data being collected by this collector. This is an optional
+     * method and could be used when the same collector is used for collecting data
+     * at multiple touch points or accumulating data at same touch point.
+	 * @param object Object
+     */
+    public void combine(Object object);
 
-	/**
-	 * Final method called by the framework that returns the actual collected data.
-	 * If the collector is not accumulating data or being used to collect data at
-	 * multiple touch points, only this method can be implemented.
-	 */
-	public E collect();
+    /**
+     * Final method called by the framework that returns the actual collected data.
+     * If the collector is not accumulating data or being used to collect data at
+     * multiple touch points, only this method can be implemented.
+	 * @return E element
+     */
+    public E collect();
 
 
 }
diff --git a/src/main/java/com/networknt/schema/CollectorContext.java b/src/main/java/com/networknt/schema/CollectorContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2020 Network New Technologies Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.networknt.schema;
 
 import java.util.HashMap;
@@ -11,105 +26,102 @@
  */
 public class CollectorContext {
 
-	// Using a namespace string as key in ThreadLocal so that it is unique in
-	// ThreadLocal.
-	static final String COLLECTOR_CONTEXT_THREAD_LOCAL_KEY = "com.networknt.schema.CollectorKey";
+    // Using a namespace string as key in ThreadLocal so that it is unique in
+    // ThreadLocal.
+    static final String COLLECTOR_CONTEXT_THREAD_LOCAL_KEY = "com.networknt.schema.CollectorKey";
 
-	// Get an instance from thread info (which uses ThreadLocal).
-	public static CollectorContext getInstance() {
-		return (CollectorContext) ThreadInfo.get(COLLECTOR_CONTEXT_THREAD_LOCAL_KEY);
-	}
+    // Get an instance from thread info (which uses ThreadLocal).
+    public static CollectorContext getInstance() {
+        return (CollectorContext) ThreadInfo.get(COLLECTOR_CONTEXT_THREAD_LOCAL_KEY);
+    }
 
-	/**
-	 * Map for holding the name and {@link Collector} or a simple Object.
-	 */
-	private Map<String, Object> collectorMap = new HashMap<String, Object>();
+    /**
+     * Map for holding the name and {@link Collector} or a simple Object.
+     */
+    private Map<String, Object> collectorMap = new HashMap<String, Object>();
 
-	/**
-	 * Map for holding the name and {@link Collector} class collect method output.
-	 */
-	private Map<String, Object> collectorLoadMap = new HashMap<String, Object>();
+    /**
+     * Map for holding the name and {@link Collector} class collect method output.
+     */
+    private Map<String, Object> collectorLoadMap = new HashMap<String, Object>();
 
-	/**
-	 * 
-	 * Adds a collector with give name. Preserving this method for backward
-	 * compatibility.
-	 * 
-	 * @param <E>
-	 * @param name
-	 * @param collector
-	 */
-	public <E> void add(String name, Collector<E> collector) {
-		collectorMap.put(name, collector);
-	}
+    /**
+     * Adds a collector with give name. Preserving this method for backward
+     * compatibility.
+     *
+     * @param <E> element
+     * @param name String
+     * @param collector Collector
+     */
+    public <E> void add(String name, Collector<E> collector) {
+        collectorMap.put(name, collector);
+    }
 
-	/**
-	 * 
-	 * Adds a collector or a simple object with give name.
-	 * 
-	 * @param <E>
-	 * @param name
-	 * @param collector
-	 */
-	public <E> void add(String name, Object object) {
-		collectorMap.put(name, object);
-	}
+    /**
+     * Adds a collector or a simple object with give name.
+     *
+     * @param <E> element
+     * @param object Object
+     * @param name String
+     *
+     */
+    public <E> void add(String name, Object object) {
+        collectorMap.put(name, object);
+    }
 
-	/**
-	 * 
-	 * Gets the data associated with a given name. Please note if you are using a
-	 * Collector you should wait till the validation is complete to gather all data.
-	 * 
-	 * For a Collector, this method will return the collector as long as load method
-	 * is not called. Once the load method is called this method will return the
-	 * actual data collected by collector.
-	 * 
-	 * @param name
-	 * @return
-	 */
-	public Object get(String name) {
-		Object object = collectorMap.get(name);
-		if (object instanceof Collector<?> && (collectorLoadMap.get(name) != null)) {
-			return collectorLoadMap.get(name);
-		}
-		return collectorMap.get(name);
-	}
+    /**
+     * Gets the data associated with a given name. Please note if you are using a
+     * Collector you should wait till the validation is complete to gather all data.
+     * <p>
+     * For a Collector, this method will return the collector as long as load method
+     * is not called. Once the load method is called this method will return the
+     * actual data collected by collector.
+     *
+     * @param name String
+     * @return Object
+     */
+    public Object get(String name) {
+        Object object = collectorMap.get(name);
+        if (object instanceof Collector<?> && (collectorLoadMap.get(name) != null)) {
+            return collectorLoadMap.get(name);
+        }
+        return collectorMap.get(name);
+    }
 
-	/**
-	 * 
-	 * Combines data with Collector identified by the given name.
-	 * 
-	 * @param name
-	 * @param data
-	 */
-	public void combineWithCollector(String name, Object data) {
-		Object object = collectorMap.get(name);
-		if (object instanceof Collector<?>) {
-			Collector<?> collector = (Collector<?>) object;
-			collector.combine(data);
-		}
-	}
+    /**
+     * Combines data with Collector identified by the given name.
+     *
+     * @param name String
+     * @param data Object
+     */
+    public void combineWithCollector(String name, Object data) {
+        Object object = collectorMap.get(name);
+        if (object instanceof Collector<?>) {
+            Collector<?> collector = (Collector<?>) object;
+            collector.combine(data);
+        }
+    }
 
-	/**
-	 * Reset the context
-	 */
-	void reset() {
-		this.collectorMap = new HashMap<String, Object>();
-		this.collectorLoadMap = new HashMap<String, Object>();
-	}
+    /**
+     * Reset the context
+     */
+    void reset() {
+        this.collectorMap = new HashMap<String, Object>();
+        this.collectorLoadMap = new HashMap<String, Object>();
+    }
 
-	/**
-	 * Loads data from all collectors.
-	 */
-	void loadCollectors() {
-		Set<Entry<String, Object>> entrySet = collectorMap.entrySet();
-		for (Entry<String, Object> entry : entrySet) {
-			if (entry.getValue() instanceof Collector<?>) {
-				Collector<?> collector = (Collector<?>) entry.getValue();
-				collectorLoadMap.put(entry.getKey(), collector.collect());
-			}
-		}
+    /**
+     * Loads data from all collectors.
+     */
+    void loadCollectors() {
+        Set<Entry<String, Object>> entrySet = collectorMap.entrySet();
+        for (Entry<String, Object> entry : entrySet) {
+            if (entry.getValue() instanceof Collector<?>) {
+                Collector<?> collector = (Collector<?>) entry.getValue();
+                collectorLoadMap.put(entry.getKey(), collector.collect());
+            }
+        }
 
-	}
+    }
 
 }
diff --git a/src/main/java/com/networknt/schema/ConstValidator.java b/src/main/java/com/networknt/schema/ConstValidator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2020 Network New Technologies Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;

diff --git a/src/main/java/com/networknt/schema/FalseValidator.java b/src/main/java/com/networknt/schema/FalseValidator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2020 Network New Technologies Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;