Sfoglia il codice sorgente

Remove useless case by making things a bit easier.

Sam Jaffe 6 anni fa
parent
commit
da1ae04a80

+ 4 - 3
src/main/lombok/org/leumasjaffe/json/schema/Schema.java

@@ -13,10 +13,8 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 
 import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-@NoArgsConstructor
 @FieldDefaults(level=AccessLevel.PRIVATE)
 public class Schema implements Tester {
 	private static final String SELF = "$self";
@@ -29,6 +27,10 @@ public class Schema implements Tester {
 			"maxLength", "minLength", "pattern", "format");
 	Map<String, Tester> children = new HashMap<>();
 	
+	public Schema() {
+		this(ACCEPT);
+	}
+	
 	public Schema(Tester self) {
 		children.put(SELF, self);
 	}
@@ -39,7 +41,6 @@ public class Schema implements Tester {
 
 	@Override
 	public JsonNodeType[] acceptedTypes() {
-		if (children.isEmpty()) return ANY;
 		final Set<JsonNodeType> set = new HashSet<>();
 		children.values().stream().map(Tester::acceptedTypes)
 				.forEach(a -> set.addAll(Arrays.asList(a)));

+ 1 - 1
src/test/java/org/leumasjaffe/json/schema/SchemaTest.java

@@ -54,7 +54,7 @@ public class SchemaTest {
 	
 	@Test
 	public void testAcceptsAnyIfNoMatchers() {
-		assertThat(new Schema().acceptedTypes(), is(Tester.ANY));
+		assertThat(new Schema().acceptedTypes().length, is(Tester.ANY.length));
 	}
 
 	@Test