adding CombinedSchema#synthetic attribute to avoid adding the wrapping allOf to the output

Author: erosb

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

@@ -24,6 +24,8 @@ public static class Builder extends Schema.Builder<CombinedSchema> {
 
         private Collection<Schema> subschemas = new ArrayList<>();
 
+        private boolean synthetic;
+
         @Override
         public CombinedSchema build() {
             return new CombinedSchema(this);
@@ -44,6 +46,10 @@ public Builder subschemas(Collection<Schema> subschemas) {
             return this;
         }
 
+        public Builder isSynthetic(boolean synthetic) {
+            this.synthetic = synthetic;
+            return this;
+        }
     }
 
     /**
@@ -147,6 +153,8 @@ public static Builder oneOf(Collection<Schema> schemas) {
         return builder(schemas).criterion(ONE_CRITERION);
     }
 
+    private final boolean synthetic;
+
     private final Collection<Schema> subschemas;
 
     private final ValidationCriterion criterion;
@@ -159,6 +167,7 @@ public static Builder oneOf(Collection<Schema> schemas) {
      */
     public CombinedSchema(Builder builder) {
         super(builder);
+        this.synthetic = builder.synthetic;
         this.criterion = requireNonNull(builder.criterion, "criterion cannot be null");
         this.subschemas = requireNonNull(builder.subschemas, "subschemas cannot be null");
     }
@@ -208,10 +217,14 @@ public boolean equals(Object o) {
 
     @Override
     void describePropertiesTo(JSONPrinter writer) {
-        writer.key(criterion.toString());
-        writer.array();
-        subschemas.forEach(subschema -> subschema.describeTo(writer));
-        writer.endArray();
+        if (synthetic) {
+            subschemas.forEach(subschema -> subschema.describePropertiesTo(writer));
+        } else {
+            writer.key(criterion.toString());
+            writer.array();
+            subschemas.forEach(subschema -> subschema.describeTo(writer));
+            writer.endArray();
+        }
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package org.everit.json.schema;
 
+import org.everit.json.schema.internal.JSONPrinter;
+
 /**
  * @author erosb
  */
@@ -30,7 +32,7 @@ public FalseSchema(Builder builder) {
         visitor.visitFalseSchema(this);
     }
 
-    @Override public String toString() {
-        return "false";
+    @Override public void describeTo(JSONPrinter writer) {
+        writer.value(false);
     }
 }

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

@@ -1,5 +1,7 @@
 package org.everit.json.schema;
 
+import org.everit.json.schema.internal.JSONPrinter;
+
 /**
  * @author erosb
  */
@@ -20,8 +22,7 @@ public TrueSchema(Builder builder) {
         super(builder);
     }
 
-    @Override public String toString() {
-        return "true";
+    @Override public void describeTo(JSONPrinter writer) {
+        writer.value(true);
     }
-
 }

core/src/main/java/org/everit/json/schema/loader/SchemaLoader.java

@@ -331,7 +331,7 @@ private Schema.Builder loadSchemaObject(JsonObject o) {
                     .map(Schema.Builder::build)
                     .map(Schema.class::cast)
                     .collect(toList());
-            effectiveReturnedSchema = CombinedSchema.allOf(built);
+            effectiveReturnedSchema = CombinedSchema.allOf(built).isSynthetic(true);
         }
         loadCommonSchemaProperties(effectiveReturnedSchema);
         return effectiveReturnedSchema;

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

@@ -135,6 +135,20 @@ public void toStringTest() {
                 + "]}"), actual));
     }
 
+    @Test
+    public void toStringTest_withSynthetic() {
+        CombinedSchema subject = CombinedSchema.builder().criterion(CombinedSchema.ALL_CRITERION)
+                .subschema(BooleanSchema.INSTANCE)
+                .subschema(EmptySchema.INSTANCE)
+                .isSynthetic(true)
+                .build();
+
+        String actual = subject.toString();
+
+        assertTrue(ObjectComparator.deepEquals(new JSONObject(BooleanSchema.INSTANCE.toString()),
+                new JSONObject(actual)));
+    }
+
     @Test
     public void oneOfEarlyFailureTest() {
         CombinedSchema subject = CombinedSchema

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -33,6 +33,7 @@
 import org.everit.json.schema.NotSchema;
 import org.everit.json.schema.NullSchema;
 import org.everit.json.schema.NumberSchema;
+import org.everit.json.schema.ObjectComparator;
 import org.everit.json.schema.ObjectSchema;
 import org.everit.json.schema.ReferenceSchema;
 import org.everit.json.schema.ResourceLoader;
@@ -684,4 +685,14 @@ public void unknownMetaSchemaException() {
             assertEquals("#", e.getSchemaLocation());
         }
     }
+
+    @Test
+    public void sythetizedAllOf() {
+        String actual = SchemaLoader.load(get("boolAndNot")).toString();
+        assertTrue(ObjectComparator.deepEquals(
+                get("boolAndNot"),
+                new JSONObject(actual)
+        ));
+
+    }
 }

core/src/test/resources/org/everit/jsonvalidator/testschemas.json

@@ -642,5 +642,9 @@
   },
   "unknownMetaSchema": {
     "$schema": "http://json-schema.org/draft-09.75/schema"
+  },
+  "boolAndNot": {
+    "type": "boolean",
+    "not": false
   }
 }