adding NumberSchema#describePropertiesTo()

Author: erosb

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

@@ -15,6 +15,8 @@
  */
 package org.everit.json.schema;
 
+import org.everit.json.schema.internal.JSONPrinter;
+
 import java.math.BigDecimal;
 import java.util.Objects;
 
@@ -218,6 +220,22 @@ public boolean equals(Object o) {
         }
     }
 
+    @Override
+    void describePropertiesTo(JSONPrinter writer) {
+        if (requiresInteger) {
+            writer.key("type");
+            writer.value("integer");
+        } else if (requiresNumber) {
+            writer.key("type");
+            writer.value("number");
+        }
+        writer.ifPresent("minimum", minimum);
+        writer.ifPresent("maximum", maximum);
+        writer.ifPresent("multipleOf", multipleOf);
+        writer.ifTrue("exclusiveMinimum", exclusiveMinimum);
+        writer.ifTrue("exclusiveMaximum", exclusiveMaximum);
+    }
+
     @Override
     public int hashCode() {
         return Objects

core/src/test/java/org/everit/json/schema/NumberSchemaTest.java

@@ -17,10 +17,18 @@
 
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
+import org.everit.json.schema.loader.SchemaLoader;
+import org.json.JSONObject;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class NumberSchemaTest {
 
+    private final ResourceLoader loader = new ResourceLoader("/org/everit/jsonvalidator/tostring/");
+
     @Test
     public void exclusiveMinimum() {
         NumberSchema subject = NumberSchema.builder().minimum(10.0).exclusiveMinimum(true).build();
@@ -119,4 +127,27 @@ public void equalsVerifier() {
                 .suppress(Warning.STRICT_INHERITANCE)
                 .verify();
     }
+
+    @Test
+    public void toStringTest() {
+        JSONObject rawSchemaJson = loader.readObj("numberschema.json");
+        String actual = SchemaLoader.load(rawSchemaJson).toString();
+        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+    }
+
+    @Test
+    public void toStringNoExplicitType() {
+        JSONObject rawSchemaJson = loader.readObj("numberschema.json");
+        rawSchemaJson.remove("type");
+        String actual = SchemaLoader.load(rawSchemaJson).toString();
+        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+    }
+
+    @Test
+    public void toStringReqInteger() {
+        JSONObject rawSchemaJson = loader.readObj("numberschema.json");
+        rawSchemaJson.put("type", "integer");
+        String actual = SchemaLoader.load(rawSchemaJson).toString();
+        assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
+    }
 }

core/src/test/resources/org/everit/jsonvalidator/tostring/numberschema.json

@@ -0,0 +1,8 @@
+{
+  "type": "number",
+  "minimum": 0,
+  "maximum": 10,
+  "multipleOf": 5,
+  "exclusiveMinimum": true,
+  "exclusiveMaximum": true
+}