Skip to content

Commit 2bf560d

Browse files
committed
constructor cleanup in ReferenceLookup
1 parent 9f103a5 commit 2bf560d

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.everit.json.schema.ReferenceSchema;
1111
import org.everit.json.schema.Schema;
12-
import org.everit.json.schema.loader.internal.DefaultSchemaClient;
1312
import org.everit.json.schema.loader.internal.ReferenceResolver;
1413
import org.json.JSONObject;
1514

@@ -46,19 +45,9 @@ static Map<String, Object> extend(Map<String, Object> additional, Map<String, Ob
4645

4746
private SchemaClient httpClient;
4847

49-
/**
50-
* Creates an instance which uses a {@link DefaultSchemaClient}.
51-
*
52-
* @deprecated use {@link #ReferenceLookup(LoadingState, SchemaClient)} instead
53-
*/
54-
@Deprecated
5548
public ReferenceLookup(LoadingState ls) {
56-
this(ls, new DefaultSchemaClient());
57-
}
58-
59-
ReferenceLookup(LoadingState ls, SchemaClient httpClient) {
6049
this.ls = requireNonNull(ls, "ls cannot be null");
61-
this.httpClient = requireNonNull(httpClient, "httpClient cannot be null");
50+
this.httpClient = ls.config.httpClient;
6251
}
6352

6453
private Map<String, Object> doExtend(Map<String, Object> additional, Map<String, Object> original) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ private Schema.Builder<?> buildSchemaWithoutExplicitType() {
325325
}
326326
if (ls.schemaJson().containsKey("$ref")) {
327327
String ref = ls.schemaJson().require("$ref").requireString();
328-
return new ReferenceLookup(ls, config.httpClient).lookup(ref, ls.schemaJson());
328+
return new ReferenceLookup(ls).lookup(ref, ls.schemaJson());
329329
}
330330
Schema.Builder<?> rval = sniffSchemaByProps();
331331
if (rval != null) {

0 commit comments

Comments
 (0)