renaming httpClient members to schemaClient consistently

Author: erosb

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

@@ -19,7 +19,7 @@ static LoaderConfig defaultV4Config() {
         return new LoaderConfig(new DefaultSchemaClient(), DRAFT_4.defaultFormatValidators(), DRAFT_4, false);
     }
 
-    final SchemaClient httpClient;
+    final SchemaClient schemaClient;
 
     final Map<String, FormatValidator> formatValidators;
 
@@ -31,15 +31,15 @@ static LoaderConfig defaultV4Config() {
 
     final RegexpFactory regexpFactory;
 
-    LoaderConfig(SchemaClient httpClient, Map<String, FormatValidator> formatValidators,
+    LoaderConfig(SchemaClient schemaClient, Map<String, FormatValidator> formatValidators,
             SpecificationVersion specVersion, boolean useDefaults) {
-        this(httpClient, formatValidators, specVersion, useDefaults, false, new JavaUtilRegexpFactory());
+        this(schemaClient, formatValidators, specVersion, useDefaults, false, new JavaUtilRegexpFactory());
     }
 
-    LoaderConfig(SchemaClient httpClient, Map<String, FormatValidator> formatValidators,
+    LoaderConfig(SchemaClient schemaClient, Map<String, FormatValidator> formatValidators,
             SpecificationVersion specVersion, boolean useDefaults, boolean nullableSupport,
             RegexpFactory regexpFactory) {
-        this.httpClient = requireNonNull(httpClient, "httpClient cannot be null");
+        this.schemaClient = requireNonNull(schemaClient, "schemaClient cannot be null");
         this.formatValidators = requireNonNull(formatValidators, "formatValidators cannot be null");
         this.specVersion = requireNonNull(specVersion, "specVersion cannot be null");
         this.useDefaults = useDefaults;

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

@@ -72,7 +72,7 @@ static URI extractChildId(URI parentScopeId, Object childJson, String idKeyword)
 
     SchemaLoader.SchemaLoaderBuilder initChildLoader() {
         SchemaLoader.SchemaLoaderBuilder rval = SchemaLoader.builder()
-                .httpClient(this.config.httpClient)
+                .schemaClient(this.config.schemaClient)
                 .formatValidators(new HashMap<>(this.config.formatValidators))
                 .resolutionScope(id)
                 .schemaJson(schemaJson)

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

@@ -45,11 +45,11 @@ static Map<String, Object> extend(Map<String, Object> additional, Map<String, Ob
 
     private LoadingState ls;
 
-    private SchemaClient httpClient;
+    private SchemaClient schemaClient;
 
     public ReferenceLookup(LoadingState ls) {
         this.ls = requireNonNull(ls, "ls cannot be null");
-        this.httpClient = ls.config.httpClient;
+        this.schemaClient = ls.config.schemaClient;
     }
 
     private Map<String, Object> doExtend(Map<String, Object> additional, Map<String, Object> original) {
@@ -154,7 +154,7 @@ Schema.Builder<?> lookup(String relPointerString, JsonObject ctx) {
         boolean isInternal = isSameDocumentRef(absPointerString);
         JsonPointerEvaluator pointer = isInternal
                 ? JsonPointerEvaluator.forDocument(ls.rootSchemaJson(), absPointerString)
-                : JsonPointerEvaluator.forURL(httpClient, absPointerString, ls);
+                : JsonPointerEvaluator.forURL(schemaClient, absPointerString, ls);
         ReferenceSchema.Builder refBuilder = ReferenceSchema.builder()
                 .refValue(relPointerString);
         ls.pointerSchemas.put(absPointerString, refBuilder);

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

@@ -47,7 +47,7 @@ static JSONObject toOrgJSONObject(JsonObject value) {
      */
     public static class SchemaLoaderBuilder {
 
-        SchemaClient httpClient = new DefaultSchemaClient();
+        SchemaClient schemaClient = new DefaultSchemaClient();
 
         Object schemaJson;
 
@@ -148,8 +148,17 @@ public JSONObject getRootSchemaJson() {
             return new JSONObject((Map<String, Object>) (rootSchemaJson == null ? schemaJson : rootSchemaJson));
         }
 
+        /**
+         * @deprecated use {@link #schemaClient(SchemaClient)} instead
+         */
+        @Deprecated
         public SchemaLoaderBuilder httpClient(SchemaClient httpClient) {
-            this.httpClient = httpClient;
+            this.schemaClient = httpClient;
+            return this;
+        }
+
+        public SchemaLoaderBuilder schemaClient(SchemaClient schemaClient) {
+            this.schemaClient = schemaClient;
             return this;
         }
 
@@ -251,14 +260,14 @@ public static Schema load(final JSONObject schemaJson) {
      *
      * @param schemaJson
      *         the JSON representation of the schema.
-     * @param httpClient
+     * @param schemaClient
      *         the HTTP client to be used for resolving remote JSON references.
      * @return the created schema
      */
-    public static Schema load(final JSONObject schemaJson, final SchemaClient httpClient) {
+    public static Schema load(final JSONObject schemaJson, final SchemaClient schemaClient) {
         SchemaLoader loader = builder()
                 .schemaJson(schemaJson)
-                .httpClient(httpClient)
+                .schemaClient(schemaClient)
                 .build();
         return loader.load().build();
     }
@@ -296,7 +305,7 @@ public SchemaLoader(SchemaLoaderBuilder builder) {
         } else {
             specVersion = builder.specVersion;
         }
-        this.config = new LoaderConfig(builder.httpClient,
+        this.config = new LoaderConfig(builder.schemaClient,
                 builder.formatValidators,
                 specVersion,
                 builder.useDefaults,

core/src/test/java/org/everit/json/schema/loader/JsonPointerEvaluatorTest.java

@@ -63,8 +63,8 @@ public void escaping() {
         assertEquals("tiled", actual.require("description").requireString());
     }
 
-    private LoadingState createLoadingState(SchemaClient httpClient, String ref) {
-        LoaderConfig config = new LoaderConfig(httpClient, emptyMap(), SpecificationVersion.DRAFT_4, false);
+    private LoadingState createLoadingState(SchemaClient schemaClient, String ref) {
+        LoaderConfig config = new LoaderConfig(schemaClient, emptyMap(), SpecificationVersion.DRAFT_4, false);
         URI parentScopeId = null;
         Object rootSchemaJson = this.rootSchemaJson;
         HashMap<String, Object> schemaJson = new HashMap<>();
@@ -74,10 +74,10 @@ private LoadingState createLoadingState(SchemaClient httpClient, String ref) {
 
     @Test
     public void remoteDocumentSuccess() {
-        SchemaClient httpClient = mock(SchemaClient.class);
-        when(httpClient.get("http://localhost:1234/hello")).thenReturn(rootSchemaJsonAsStream());
+        SchemaClient schemaClient = mock(SchemaClient.class);
+        when(schemaClient.get("http://localhost:1234/hello")).thenReturn(rootSchemaJsonAsStream());
         JsonPointerEvaluator pointer = JsonPointerEvaluator
-                .forURL(httpClient, "http://localhost:1234/hello#/definitions/Bar", createLoadingState(httpClient, "#/definitions/Foo"));
+                .forURL(schemaClient, "http://localhost:1234/hello#/definitions/Bar", createLoadingState(schemaClient, "#/definitions/Foo"));
         JsonObject actual = pointer.query().getQueryResult().requireObject();
         assertEquals("dummy schema at #/definitions/Bar", actual.require("description").requireString());
         assertEquals("http://localhost:1234/folder/", actual.ls.id.toString());

core/src/test/java/org/everit/json/schema/loader/ReferenceLookupTest.java

@@ -24,11 +24,11 @@ public class ReferenceLookupTest {
 
     private static final String v4Subschema = ResourceLoader.DEFAULT.readObj("v4-referred-subschema.json").toString();
 
-    private SchemaClient httpClient;
+    private SchemaClient schemaClient;
 
     @Before
     public void before() {
-        httpClient = mock(SchemaClient.class);
+        schemaClient = mock(SchemaClient.class);
     }
 
     private Schema performLookup(String pointerToRef) {
@@ -46,7 +46,7 @@ private ReferenceSchema obtainReferenceSchema(String pointerToRef) {
 
     @Test
     public void referenceSchemaLocationIsSet() {
-        when(httpClient.get("http://localhost/child-ref")).thenReturn(asStream(v4Subschema));
+        when(schemaClient.get("http://localhost/child-ref")).thenReturn(asStream(v4Subschema));
         ReferenceSchema ref = obtainReferenceSchema("#/properties/definitionInRemote");
         assertEquals("http://localhost/child-ref#/definitions/SubSchema", ref.getSchemaLocation());
     }
@@ -58,7 +58,7 @@ public void sameDocumentLookup() {
     }
 
     private JsonValue query(String pointer) {
-        LoadingState rootLs = new LoadingState(new LoaderConfig(httpClient, emptyMap(), SpecificationVersion.DRAFT_6, false),
+        LoadingState rootLs = new LoadingState(new LoaderConfig(schemaClient, emptyMap(), SpecificationVersion.DRAFT_6, false),
                 new HashMap<>(),
                 rootSchemaJson,
                 rootSchemaJson,
@@ -76,21 +76,21 @@ public void sameDocumentLookupById() {
 
     @Test
     public void absoluteRef() {
-        when(httpClient.get("http://localhost/schema.json")).thenReturn(asStream("{\"description\":\"ok\"}"));
+        when(schemaClient.get("http://localhost/schema.json")).thenReturn(asStream("{\"description\":\"ok\"}"));
         Schema actual = performLookup("#/properties/absoluteRef");
         assertEquals("ok", actual.getDescription());
     }
 
     @Test
     public void withParentScope() {
-        when(httpClient.get("http://localhost/child-ref")).thenReturn(asStream("{\"description\":\"ok\"}"));
+        when(schemaClient.get("http://localhost/child-ref")).thenReturn(asStream("{\"description\":\"ok\"}"));
         Schema actual = performLookup("#/properties/parent/child");
         assertEquals("ok", actual.getDescription());
     }
 
     @Test
     public void schemaVersionChange() {
-        when(httpClient.get("http://localhost/child-ref")).thenReturn(asStream(v4Subschema));
+        when(schemaClient.get("http://localhost/child-ref")).thenReturn(asStream(v4Subschema));
         NumberSchema actual = (NumberSchema) performLookup("#/properties/definitionInRemote");
         assertTrue(actual.isExclusiveMinimum());
     }

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -90,7 +90,7 @@ public void builderhasDefaultFormatValidators() {
     public void builderUsesDefaultSchemaClient() {
         SchemaLoaderBuilder actual = SchemaLoader.builder();
         assertNotNull(actual);
-        assertTrue(actual.httpClient instanceof DefaultSchemaClient);
+        assertTrue(actual.schemaClient instanceof DefaultSchemaClient);
     }
 
     @Test
@@ -338,12 +338,12 @@ public void refWithType() {
 
     @Test
     public void remotePointerResulion() {
-        SchemaClient httpClient = mock(SchemaClient.class);
-        when(httpClient.get("http://example.org/asd")).thenReturn(asStream("{}"));
-        when(httpClient.get("http://example.org/otherschema.json")).thenReturn(asStream("{}"));
-        when(httpClient.get("http://example.org/folder/subschemaInFolder.json")).thenReturn(
+        SchemaClient schemaClient = mock(SchemaClient.class);
+        when(schemaClient.get("http://example.org/asd")).thenReturn(asStream("{}"));
+        when(schemaClient.get("http://example.org/otherschema.json")).thenReturn(asStream("{}"));
+        when(schemaClient.get("http://example.org/folder/subschemaInFolder.json")).thenReturn(
                 asStream("{}"));
-        SchemaLoader.load(get("remotePointerResolution"), httpClient);
+        SchemaLoader.load(get("remotePointerResolution"), schemaClient);
     }
 
     @Test
@@ -439,7 +439,7 @@ public void schemaJsonIdIsRecognized() {
         ByteArrayInputStream retval = new ByteArrayInputStream("{}".getBytes());
         when(client.get("http://example.org/schema/schema.json")).thenReturn(retval);
         SchemaLoader.builder().schemaJson(get("schemaWithId"))
-                .httpClient(client)
+                .schemaClient(client)
                 .build().load();
     }
 
@@ -450,7 +450,7 @@ public void v6SchemaJsonIdIsRecognized() {
         when(client.get("http://example.org/schema/schema.json")).thenReturn(retval);
         v6Loader()
                 .schemaJson(get("schemaWithIdV6"))
-                .httpClient(client)
+                .schemaClient(client)
                 .build().load();
     }
 
@@ -509,7 +509,7 @@ public void folderNameResolution() {
         SchemaClient client = mock(SchemaClient.class);
         when(client.get("http://localhost/folder/Identifier.json")).thenReturn(asStream("{}"));
         v6Loader().schemaJson(get("folderNameResolution"))
-                .httpClient(client).build().load().build();
+                .schemaClient(client).build().load().build();
 
     }
 
@@ -520,32 +520,32 @@ public void otherFolderNameResolution() {
 
     @Test
     public void refRemoteV4() {
-        SchemaClient httpClient = mock(SchemaClient.class);
-        when(httpClient.get("http://localhost:1234/folder/folderInteger.json")).thenReturn(asStream("{}"));
+        SchemaClient schemaClient = mock(SchemaClient.class);
+        when(schemaClient.get("http://localhost:1234/folder/folderInteger.json")).thenReturn(asStream("{}"));
 
-        SchemaLoader.builder().httpClient(httpClient)
+        SchemaLoader.builder().schemaClient(schemaClient)
                 .schemaJson(get("refRemoteV4"))
                 .build()
                 .load().build();
     }
 
     @Test
     public void refPointerDerivatedFromPointer() {
-        SchemaClient httpClient = mock(SchemaClient.class);
-        when(httpClient.get("http://localhost:1234/folder/folderInteger.json")).thenReturn(asStream("{}"));
+        SchemaClient schemaClient = mock(SchemaClient.class);
+        when(schemaClient.get("http://localhost:1234/folder/folderInteger.json")).thenReturn(asStream("{}"));
 
-        SchemaLoader.builder().httpClient(httpClient)
+        SchemaLoader.builder().schemaClient(schemaClient)
                 .schemaJson(get("refPointerDerivatedFromPointer"))
                 .build()
                 .load().build();
     }
 
     @Test
     public void relativeIdInReferencedSchemaRoot() {
-        SchemaClient httpClient = mock(SchemaClient.class);
-        when(httpClient.get("http://localhost:1234/folder/folderInteger.json")).thenReturn(asStream("{}"));
+        SchemaClient schemaClient = mock(SchemaClient.class);
+        when(schemaClient.get("http://localhost:1234/folder/folderInteger.json")).thenReturn(asStream("{}"));
 
-        SchemaLoader.builder().httpClient(httpClient)
+        SchemaLoader.builder().schemaClient(schemaClient)
                 .schemaJson(get("relativeIdInReferencedSchemaRoot"))
                 .build()
                 .load().build();