added JSONPrinter#printSchemaMap() (with unittest), made Schema#describeTo() public and added unittest, using printSchemaMap() in ObjectSchema#describePropertiesTo()

Author: erosb

core/src/main/java/org/everit/json/schema/ObjectSchema.java

@@ -467,12 +467,7 @@ void describePropertiesTo(JSONPrinter writer) {
         }
         if (!propertySchemas.isEmpty()) {
             writer.key("properties");
-            writer.object();
-            propertySchemas.entrySet().forEach(entry -> {
-                writer.key(entry.getKey());
-                entry.getValue().describeTo(writer);
-            });
-            writer.endObject();
+            writer.printSchemaMap(propertySchemas);
         }
         writer.ifPresent("minProperties", minProperties);
         writer.ifPresent("maxProperties", maxProperties);
@@ -488,12 +483,7 @@ void describePropertiesTo(JSONPrinter writer) {
         }
         if (!patternProperties.isEmpty()) {
             writer.key("patternProperties");
-            writer.object();
-            patternProperties.entrySet().forEach(entry -> {
-                writer.key(entry.getKey().toString());
-                entry.getValue().describeTo(writer);
-            });
-            writer.endObject();
+            writer.printSchemaMap(patternProperties);
         }
     }
 

core/src/main/java/org/everit/json/schema/Schema.java

@@ -165,11 +165,16 @@ public String getId() {
     }
 
     /**
-     * <<<<<<< HEAD Describes the instance as a JSONObject to {@code writer}.
+     * Describes the instance as a JSONObject to {@code writer}.
+     *
+     * First it adds the {@code "title} , {@code "description"} and {@code "id"} properties then calls
+     * {@link #describePropertiesTo(JSONPrinter)}, which will add the subclass-specific properties.
+     *
+     * It is used by {@link #toString()} to serialize the schema instance into its JSON representation.
      *
      * @param writer it will receive the schema description
      */
-    final void describeTo(final JSONPrinter writer) {
+    public final void describeTo(final JSONPrinter writer) {
         writer.object();
         writer.ifPresent("title", title);
         writer.ifPresent("description", description);

core/src/main/java/org/everit/json/schema/internal/JSONPrinter.java

@@ -1,8 +1,11 @@
 package org.everit.json.schema.internal;
 
+import org.everit.json.schema.Schema;
 import org.json.JSONWriter;
 
 import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
 
@@ -70,4 +73,13 @@ public void ifFalse(String key, Boolean value) {
             writer.value(value);
         }
     }
+
+    public <K> void printSchemaMap(Map<K, Schema> input) {
+        object();
+        input.entrySet().forEach(entry -> {
+            key(entry.getKey().toString());
+            entry.getValue().describeTo(this);
+        });
+        endObject();
+    }
 }

core/src/test/java/org/everit/json/schema/internal/JSONPrinterTest.java

@@ -1,12 +1,15 @@
 package org.everit.json.schema.internal;
 
+import org.everit.json.schema.NullSchema;
+import org.everit.json.schema.Schema;
 import org.json.JSONObject;
 import org.json.JSONWriter;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.StringWriter;
+import java.util.HashMap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -106,7 +109,7 @@ public void ifFalseOmits() {
         assertNull(actualObj().opt("mykey"));
     }
 
-    @Test @Ignore
+    @Test
     public void ifFalseHandlesNullAsTrue() {
         JSONPrinter subject = subject();
         subject.object();
@@ -124,4 +127,12 @@ public void arraySupport() {
         assertEquals("[true]", buffer.toString());
     }
 
+    @Test
+    public void printSchemaMap() {
+        HashMap<Number, Schema> input = new HashMap<Number, Schema>();
+        input.put(2, NullSchema.INSTANCE);
+        subject().printSchemaMap(input);
+        assertEquals("{\"2\":"+NullSchema.INSTANCE.toString() + "}", buffer.toString());
+    }
+
 }