Skip to content

Commit dfdd7e5

Browse files
fgefge
committed
Upgrade dependencies; fix code
1 parent 0bed59f commit dfdd7e5

31 files changed

+95
-91
lines changed

‎build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ apply(from: "project.gradle");
6565
* Repositories to use
6666
*/
6767
repositories {
68+
mavenLocal();
6869
mavenCentral();
6970
}
7071

‎project.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ project.ext {
3333
*/
3434
dependencies {
3535
compile(group: "com.github.fge", name: "json-schema-validator",
36-
version: "2.1.7");
36+
version: "2.1.9-SNAPSHOT");
3737
compile(group: "org.apache.avro", name: "avro", version: "1.7.4") {
3838
exclude(group: "org.slf4j", module: "slf4j-api");
3939
exclude(group: "org.apache.commons", module: "commons-compress");

‎src/main/java/com/github/fge/avro/Avro2JsonSchemaProcessor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.github.fge.avro.translators.AvroTranslators;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.processing.RawProcessor;
25-
import com.github.fge.jsonschema.report.ProcessingReport;
26-
import com.github.fge.jsonschema.tree.CanonicalSchemaTree;
27-
import com.github.fge.jsonschema.tree.JsonTree;
28-
import com.github.fge.jsonschema.tree.SchemaTree;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.processing.RawProcessor;
25+
import com.github.fge.jsonschema.core.report.ProcessingReport;
26+
import com.github.fge.jsonschema.core.tree.CanonicalSchemaTree;
27+
import com.github.fge.jsonschema.core.tree.JsonTree;
28+
import com.github.fge.jsonschema.core.tree.SchemaTree;
2929
import org.apache.avro.AvroRuntimeException;
3030
import org.apache.avro.Schema;
3131

‎src/main/java/com/github/fge/avro/IllegalAvroSchemaException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
package com.github.fge.avro;
2020

21-
import com.github.fge.jsonschema.exceptions.ProcessingException;
21+
22+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
2223

2324
public final class IllegalAvroSchemaException
2425
extends ProcessingException

‎src/main/java/com/github/fge/avro/MutableTree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.github.fge.jackson.JacksonUtils;
2525
import com.github.fge.jackson.NodeType;
2626
import com.github.fge.jackson.jsonpointer.JsonPointer;
27-
import com.github.fge.jsonschema.util.AsJson;
27+
import com.github.fge.jsonschema.core.util.AsJson;
2828

2929
import javax.annotation.concurrent.NotThreadSafe;
3030

‎src/main/java/com/github/fge/avro/translators/ArrayTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.github.fge.avro.MutableTree;
2323
import com.github.fge.jackson.NodeType;
2424
import com.github.fge.jackson.jsonpointer.JsonPointer;
25-
import com.github.fge.jsonschema.exceptions.ProcessingException;
26-
import com.github.fge.jsonschema.report.ProcessingReport;
25+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
26+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2727
import org.apache.avro.Schema;
2828

2929
final class ArrayTranslator

‎src/main/java/com/github/fge/avro/translators/AvroTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
2222
import com.github.fge.avro.MutableTree;
2323
import com.github.fge.jackson.JacksonUtils;
24-
import com.github.fge.jsonschema.exceptions.ProcessingException;
25-
import com.github.fge.jsonschema.report.ProcessingReport;
24+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
25+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2626
import org.apache.avro.Schema;
2727

2828
public abstract class AvroTranslator

‎src/main/java/com/github/fge/avro/translators/ByteTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import com.github.fge.avro.MutableTree;
2222
import com.github.fge.jackson.NodeType;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2525
import org.apache.avro.Schema;
2626

2727
final class ByteTranslator

‎src/main/java/com/github/fge/avro/translators/EnumTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.fasterxml.jackson.databind.node.ArrayNode;
2222
import com.github.fge.avro.MutableTree;
23-
import com.github.fge.jsonschema.report.ProcessingReport;
23+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2424
import org.apache.avro.Schema;
2525

2626
final class EnumTranslator

‎src/main/java/com/github/fge/avro/translators/FixedTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.github.fge.avro.MutableTree;
2222
import com.github.fge.jackson.NodeType;
23-
import com.github.fge.jsonschema.report.ProcessingReport;
23+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2424
import org.apache.avro.Schema;
2525

2626
final class FixedTranslator

‎src/main/java/com/github/fge/avro/translators/IntTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import com.github.fge.avro.MutableTree;
2222
import com.github.fge.jackson.NodeType;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2525
import org.apache.avro.Schema;
2626

2727
final class IntTranslator

‎src/main/java/com/github/fge/avro/translators/LongTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import com.github.fge.avro.MutableTree;
2222
import com.github.fge.jackson.NodeType;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2525
import org.apache.avro.Schema;
2626

2727
final class LongTranslator

‎src/main/java/com/github/fge/avro/translators/MapTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.github.fge.avro.MutableTree;
2323
import com.github.fge.jackson.NodeType;
2424
import com.github.fge.jackson.jsonpointer.JsonPointer;
25-
import com.github.fge.jsonschema.exceptions.ProcessingException;
26-
import com.github.fge.jsonschema.report.ProcessingReport;
25+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
26+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2727
import org.apache.avro.Schema;
2828

2929
final class MapTranslator

‎src/main/java/com/github/fge/avro/translators/NamedAvroTypeTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import com.github.fge.avro.MutableTree;
2222
import com.github.fge.jackson.jsonpointer.JsonPointer;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2525
import org.apache.avro.Schema;
2626

2727
import java.net.URI;

‎src/main/java/com/github/fge/avro/translators/RecordTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import com.github.fge.jackson.JsonLoader;
2525
import com.github.fge.jackson.NodeType;
2626
import com.github.fge.jackson.jsonpointer.JsonPointer;
27-
import com.github.fge.jsonschema.exceptions.ProcessingException;
28-
import com.github.fge.jsonschema.report.ProcessingReport;
27+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
28+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2929
import org.apache.avro.Schema;
3030
import org.codehaus.jackson.JsonNode;
3131
import org.codehaus.jackson.map.ObjectMapper;

‎src/main/java/com/github/fge/avro/translators/SimpleTypeTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import com.github.fge.avro.MutableTree;
2222
import com.github.fge.jackson.NodeType;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2525
import org.apache.avro.Schema;
2626

2727
final class SimpleTypeTranslator

‎src/main/java/com/github/fge/avro/translators/UnionTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.fasterxml.jackson.databind.node.ArrayNode;
2222
import com.github.fge.avro.MutableTree;
2323
import com.github.fge.jackson.jsonpointer.JsonPointer;
24-
import com.github.fge.jsonschema.exceptions.ProcessingException;
25-
import com.github.fge.jsonschema.report.ProcessingReport;
24+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
25+
import com.github.fge.jsonschema.core.report.ProcessingReport;
2626
import org.apache.avro.Schema;
2727

2828
import java.util.List;

‎src/main/java/com/github/fge/jsonschema2avro/AvroPayload.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818

1919
package com.github.fge.jsonschema2avro;
2020

21-
import com.github.fge.jsonschema.report.MessageProvider;
22-
import com.github.fge.jsonschema.report.ProcessingMessage;
23-
import com.github.fge.jsonschema.tree.SchemaTree;
21+
22+
import com.github.fge.jsonschema.core.report.MessageProvider;
23+
import com.github.fge.jsonschema.core.report.ProcessingMessage;
24+
import com.github.fge.jsonschema.core.tree.SchemaTree;
2425

2526
public final class AvroPayload
2627
implements MessageProvider

‎src/main/java/com/github/fge/jsonschema2avro/AvroWriterProcessor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
package com.github.fge.jsonschema2avro;
2020

21-
import com.github.fge.jsonschema.exceptions.ProcessingException;
22-
import com.github.fge.jsonschema.processing.Processor;
23-
import com.github.fge.jsonschema.processing.ProcessorSelector;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
25-
import com.github.fge.jsonschema.tree.SchemaTree;
26-
import com.github.fge.jsonschema.util.ValueHolder;
21+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
22+
import com.github.fge.jsonschema.core.processing.Processor;
23+
import com.github.fge.jsonschema.core.processing.ProcessorSelector;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
25+
import com.github.fge.jsonschema.core.tree.SchemaTree;
26+
import com.github.fge.jsonschema.core.util.ValueHolder;
2727
import com.github.fge.jsonschema2avro.writers.ArrayWriter;
2828
import com.github.fge.jsonschema2avro.writers.EnumWriter;
2929
import com.github.fge.jsonschema2avro.writers.MapWriter;

‎src/main/java/com/github/fge/jsonschema2avro/UnsupportedJsonSchemaException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
package com.github.fge.jsonschema2avro;
2020

21-
import com.github.fge.jsonschema.exceptions.ProcessingException;
21+
22+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
2223

2324
public final class UnsupportedJsonSchemaException
2425
extends ProcessingException

‎src/main/java/com/github/fge/jsonschema2avro/writers/ArrayWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.github.fge.jackson.jsonpointer.JsonPointer;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
25-
import com.github.fge.jsonschema.tree.SchemaTree;
26-
import com.github.fge.jsonschema.util.ValueHolder;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
25+
import com.github.fge.jsonschema.core.tree.SchemaTree;
26+
import com.github.fge.jsonschema.core.util.ValueHolder;
2727
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
2828
import org.apache.avro.Schema;
2929

‎src/main/java/com/github/fge/jsonschema2avro/writers/AvroWriter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
package com.github.fge.jsonschema2avro.writers;
2020

21-
import com.github.fge.jsonschema.exceptions.ProcessingException;
22-
import com.github.fge.jsonschema.processing.Processor;
23-
import com.github.fge.jsonschema.report.ProcessingReport;
24-
import com.github.fge.jsonschema.tree.SchemaTree;
25-
import com.github.fge.jsonschema.util.ValueHolder;
21+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
22+
import com.github.fge.jsonschema.core.processing.Processor;
23+
import com.github.fge.jsonschema.core.report.ProcessingReport;
24+
import com.github.fge.jsonschema.core.tree.SchemaTree;
25+
import com.github.fge.jsonschema.core.util.ValueHolder;
2626
import com.github.fge.jsonschema2avro.AvroPayload;
2727
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
2828
import org.apache.avro.Schema;

‎src/main/java/com/github/fge/jsonschema2avro/writers/EnumWriter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
package com.github.fge.jsonschema2avro.writers;
2020

2121
import com.fasterxml.jackson.databind.JsonNode;
22-
import com.github.fge.jsonschema.exceptions.ProcessingException;
23-
import com.github.fge.jsonschema.report.ProcessingReport;
24-
import com.github.fge.jsonschema.tree.SchemaTree;
22+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
23+
import com.github.fge.jsonschema.core.report.ProcessingReport;
24+
import com.github.fge.jsonschema.core.tree.SchemaTree;
2525
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
2626
import com.google.common.collect.Lists;
2727
import org.apache.avro.Schema;

‎src/main/java/com/github/fge/jsonschema2avro/writers/MapWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
package com.github.fge.jsonschema2avro.writers;
2020

2121
import com.github.fge.jackson.jsonpointer.JsonPointer;
22-
import com.github.fge.jsonschema.exceptions.ProcessingException;
23-
import com.github.fge.jsonschema.report.ProcessingReport;
24-
import com.github.fge.jsonschema.tree.SchemaTree;
25-
import com.github.fge.jsonschema.util.ValueHolder;
22+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
23+
import com.github.fge.jsonschema.core.report.ProcessingReport;
24+
import com.github.fge.jsonschema.core.tree.SchemaTree;
25+
import com.github.fge.jsonschema.core.util.ValueHolder;
2626
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
2727
import org.apache.avro.Schema;
2828

‎src/main/java/com/github/fge/jsonschema2avro/writers/RecordWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
package com.github.fge.jsonschema2avro.writers;
2020

2121
import com.github.fge.jackson.jsonpointer.JsonPointer;
22-
import com.github.fge.jsonschema.exceptions.ProcessingException;
23-
import com.github.fge.jsonschema.report.ProcessingReport;
24-
import com.github.fge.jsonschema.tree.SchemaTree;
25-
import com.github.fge.jsonschema.util.ValueHolder;
22+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
23+
import com.github.fge.jsonschema.core.report.ProcessingReport;
24+
import com.github.fge.jsonschema.core.tree.SchemaTree;
25+
import com.github.fge.jsonschema.core.util.ValueHolder;
2626
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
2727
import com.google.common.collect.Lists;
2828
import org.apache.avro.Schema;

‎src/main/java/com/github/fge/jsonschema2avro/writers/SimpleTypeWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.github.fge.jackson.NodeType;
23-
import com.github.fge.jsonschema.report.ProcessingReport;
24-
import com.github.fge.jsonschema.tree.SchemaTree;
23+
import com.github.fge.jsonschema.core.report.ProcessingReport;
24+
import com.github.fge.jsonschema.core.tree.SchemaTree;
2525
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
2626
import com.google.common.collect.ImmutableMap;
2727
import org.apache.avro.Schema;

‎src/main/java/com/github/fge/jsonschema2avro/writers/SimpleUnionWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.github.fge.jackson.jsonpointer.JsonPointer;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.ProcessingReport;
25-
import com.github.fge.jsonschema.tree.SchemaTree;
26-
import com.github.fge.jsonschema.util.ValueHolder;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.ProcessingReport;
25+
import com.github.fge.jsonschema.core.tree.SchemaTree;
26+
import com.github.fge.jsonschema.core.util.ValueHolder;
2727
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
2828
import com.google.common.collect.Lists;
2929
import org.apache.avro.Schema;

‎src/main/java/com/github/fge/jsonschema2avro/writers/TypeUnionWriter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.fasterxml.jackson.databind.node.ArrayNode;
2323
import com.fasterxml.jackson.databind.node.ObjectNode;
24-
import com.github.fge.jsonschema.exceptions.ProcessingException;
25-
import com.github.fge.jsonschema.report.ProcessingReport;
26-
import com.github.fge.jsonschema.tree.CanonicalSchemaTree;
27-
import com.github.fge.jsonschema.tree.SchemaTree;
28-
import com.github.fge.jsonschema.util.ValueHolder;
24+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
25+
import com.github.fge.jsonschema.core.report.ProcessingReport;
26+
import com.github.fge.jsonschema.core.tree.CanonicalSchemaTree;
27+
import com.github.fge.jsonschema.core.tree.SchemaTree;
28+
import com.github.fge.jsonschema.core.util.ValueHolder;
2929
import com.github.fge.jsonschema2avro.AvroWriterProcessor;
3030
import com.google.common.collect.Lists;
3131
import org.apache.avro.Schema;

‎src/test/java/com/github/fge/avro/Avro2JsonSchemaProcessorTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.github.fge.jackson.JsonLoader;
23-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24-
import com.github.fge.jsonschema.report.DevNullProcessingReport;
25-
import com.github.fge.jsonschema.report.ProcessingMessage;
26-
import com.github.fge.jsonschema.report.ProcessingReport;
27-
import com.github.fge.jsonschema.tree.JsonTree;
28-
import com.github.fge.jsonschema.tree.SimpleJsonTree;
29-
import com.github.fge.jsonschema.util.ValueHolder;
23+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.report.DevNullProcessingReport;
25+
import com.github.fge.jsonschema.core.report.ProcessingMessage;
26+
import com.github.fge.jsonschema.core.report.ProcessingReport;
27+
import com.github.fge.jsonschema.core.tree.JsonTree;
28+
import com.github.fge.jsonschema.core.tree.SimpleJsonTree;
29+
import com.github.fge.jsonschema.core.util.ValueHolder;
3030
import org.apache.avro.SchemaParseException;
3131
import org.testng.annotations.BeforeClass;
3232
import org.testng.annotations.Test;

‎src/test/java/com/github/fge/avro/AvroTranslationsTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.github.fge.jackson.JsonLoader;
2323
import com.github.fge.jsonschema.cfg.ValidationConfiguration;
24-
import com.github.fge.jsonschema.exceptions.ProcessingException;
24+
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
25+
import com.github.fge.jsonschema.core.report.DevNullProcessingReport;
26+
import com.github.fge.jsonschema.core.report.ProcessingReport;
27+
import com.github.fge.jsonschema.core.tree.JsonTree;
28+
import com.github.fge.jsonschema.core.tree.SchemaTree;
29+
import com.github.fge.jsonschema.core.tree.SimpleJsonTree;
30+
import com.github.fge.jsonschema.core.util.ValueHolder;
2531
import com.github.fge.jsonschema.processors.syntax.SyntaxValidator;
26-
import com.github.fge.jsonschema.report.DevNullProcessingReport;
27-
import com.github.fge.jsonschema.report.ProcessingReport;
28-
import com.github.fge.jsonschema.tree.JsonTree;
29-
import com.github.fge.jsonschema.tree.SchemaTree;
30-
import com.github.fge.jsonschema.tree.SimpleJsonTree;
31-
import com.github.fge.jsonschema.util.ValueHolder;
3232
import com.google.common.collect.Lists;
3333
import org.testng.annotations.BeforeMethod;
3434
import org.testng.annotations.DataProvider;

0 commit comments

Comments
 (0)