Skip to content

Commit 43287ea

Browse files
committed
removing some dead code and fixing failing integ tests
1 parent 836e619 commit 43287ea

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,6 @@ public Collection<Schema> getSubschemas() {
171171
return subschemas;
172172
}
173173

174-
private ValidationException getFailure(final Schema schema, final Object subject) {
175-
try {
176-
schema.validate(subject);
177-
return null;
178-
} catch (ValidationException e) {
179-
return e;
180-
}
181-
}
182-
183174
@Override void accept(Visitor visitor) {
184175
visitor.visitCombinedSchema(this);
185176
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ private static boolean isNull(Object obj) {
109109
try {
110110
criterion.validate(subschemas.size(), matchingCount);
111111
} catch (ValidationException e) {
112-
throw new ValidationException(combinedSchema,
112+
failureReporter.failure(new ValidationException(combinedSchema,
113113
new StringBuilder(e.getPointerToViolation()),
114114
e.getMessage(),
115115
failures,
116116
e.getKeyword(),
117-
combinedSchema.getSchemaLocation());
117+
combinedSchema.getSchemaLocation()));
118118
}
119119
}
120120

0 commit comments

Comments
 (0)