Skip to content

Commit ac586b7

Browse files
committed
PR - Remove unused constructor & make schemaVisitorListener final
1 parent 872d542 commit ac586b7

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private static boolean isNull(Object obj) {
3333

3434
protected Object subject;
3535

36-
private SchemaVisitorListener schemaVisitorListener;
36+
private final SchemaVisitorListener schemaVisitorListener;
3737

3838
private ValidationFailureReporter failureReporter;
3939

@@ -58,10 +58,6 @@ void visit(Schema schema) {
5858
this.schemaVisitorListener = schemaVisitorListener;
5959
}
6060

61-
ValidatingVisitor(Object subject, ValidationFailureReporter failureReporter, ReadWriteValidator readWriteValidator) {
62-
this(subject, failureReporter, readWriteValidator, null);
63-
}
64-
6561
@Override
6662
void visitNumberSchema(NumberSchema numberSchema) {
6763
numberSchema.accept(new NumberSchemaValidatingVisitor(subject, this));

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,49 +31,49 @@ public void before() {
3131

3232
@Test
3333
public void passesTypeCheck_otherType_noRequires() {
34-
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null);
34+
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null, null);
3535
assertFalse(subject.passesTypeCheck(JSONObject.class, false, null));
3636
verifyZeroInteractions(reporter);
3737
}
3838

3939
@Test
4040
public void passesTypeCheck_otherType_requires() {
41-
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null);
41+
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null, null);
4242
assertFalse(subject.passesTypeCheck(JSONObject.class, true, null));
4343
verify(reporter).failure(JSONObject.class, "string");
4444
}
4545

4646
@Test
4747
public void passesTypeCheck_otherType_nullPermitted_nullObject() {
48-
ValidatingVisitor subject = new ValidatingVisitor(JSONObject.NULL, reporter, null);
48+
ValidatingVisitor subject = new ValidatingVisitor(JSONObject.NULL, reporter, null, null);
4949
assertFalse(subject.passesTypeCheck(JSONObject.class, true, Boolean.TRUE));
5050
verifyZeroInteractions(reporter);
5151
}
5252

5353
@Test
5454
public void passesTypeCheck_otherType_nullPermitted_nullReference() {
55-
ValidatingVisitor subject = new ValidatingVisitor(null, reporter, null);
55+
ValidatingVisitor subject = new ValidatingVisitor(null, reporter, null, null);
5656
assertFalse(subject.passesTypeCheck(JSONObject.class, true, Boolean.TRUE));
5757
verifyZeroInteractions(reporter);
5858
}
5959

6060
@Test
6161
public void passesTypeCheck_nullPermitted_nonNullValue() {
62-
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null);
62+
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null, null);
6363
assertFalse(subject.passesTypeCheck(JSONObject.class, true, Boolean.TRUE));
6464
verify(reporter).failure(JSONObject.class, "string");
6565
}
6666

6767
@Test
6868
public void passesTypeCheck_requiresType_nullableIsNull() {
69-
ValidatingVisitor subject = new ValidatingVisitor(null, reporter, null);
69+
ValidatingVisitor subject = new ValidatingVisitor(null, reporter, null, null);
7070
assertFalse(subject.passesTypeCheck(JSONObject.class, true, null));
7171
verify(reporter).failure(JSONObject.class, null);
7272
}
7373

7474
@Test
7575
public void passesTypeCheck_sameType() {
76-
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null);
76+
ValidatingVisitor subject = new ValidatingVisitor("string", reporter, null, null);
7777
assertTrue(subject.passesTypeCheck(String.class, true, Boolean.TRUE));
7878
verifyZeroInteractions(reporter);
7979
}
@@ -105,13 +105,13 @@ public Object[] notPermittedTypes() {
105105
@Test
106106
@Parameters(method = "permittedTypes")
107107
public void permittedTypeSuccess(Object subject) {
108-
new ValidatingVisitor(subject, reporter, ReadWriteValidator.NONE);
108+
new ValidatingVisitor(subject, reporter, ReadWriteValidator.NONE, null);
109109
}
110110

111111
@Test(expected = IllegalArgumentException.class)
112112
@Parameters(method = "notPermittedTypes")
113113
public void notPermittedTypeFailure(Object subject) {
114-
new ValidatingVisitor(subject, reporter, ReadWriteValidator.NONE);
114+
new ValidatingVisitor(subject, reporter, ReadWriteValidator.NONE, null);
115115
}
116116

117117
}

0 commit comments

Comments
 (0)