Refactor URL building

Author: tfmorris

src/main/java/org/openrefine/extensions/commons/importer/FileFetcher.java

@@ -9,7 +9,6 @@
 import com.google.common.collect.Iterators;
 
 import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
@@ -19,18 +18,17 @@
 public class FileFetcher implements Iterator<JsonNode>{
     String apiUrl;
     String categoryName;
-    boolean subcategories;
-    HttpUrl urlBase;
-    HttpUrl urlContinue;
+    String cmType;
     JsonNode callResults;
     private int indexRow = 0;
     String cmcontinue;
 
     public FileFetcher(String apiUrl, String categoryName, boolean subcategories) {
         this.apiUrl = apiUrl;
         this.categoryName = categoryName;
-        this.subcategories = subcategories;
+        this.cmType = subcategories ? "subcat" : "file";
         try {
+            // TODO: it's weird that this uses categoryName as a parameter, but subcategories implicitly from the field
             getCallResults(categoryName);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -43,18 +41,22 @@ public FileFetcher(String apiUrl, String categoryName, boolean subcategories) {
      */
     public void getCallResults(String category) throws IOException {
 
-        urlBase = HttpUrl.parse(apiUrl).newBuilder()
+        HttpUrl urlBase = buildBaseUrl(category, cmType);
+        JsonNode jsonNode = getJson(urlBase);
+        callResults = jsonNode.path("query").path("categorymembers");
+        cmcontinue = jsonNode.path("continue").path("cmcontinue").asText();
+
+    }
+
+    private HttpUrl buildBaseUrl(String category, String cmtype) {
+        return HttpUrl.parse(apiUrl).newBuilder()
                 .addQueryParameter("action", "query")
                 .addQueryParameter("list", "categorymembers")
                 .addQueryParameter("cmtitle", category)
-                .addQueryParameter("cmtype", subcategories ? "subcat":"file")
+                .addQueryParameter("cmtype", cmtype)
                 .addQueryParameter("cmprop", "title|type|ids")
                 .addQueryParameter("cmlimit", "500")
                 .addQueryParameter("format", "json").build();
-        JsonNode jsonNode = getJson(urlBase);
-        callResults = jsonNode.path("query").path("categorymembers");
-        cmcontinue = jsonNode.path("continue").path("cmcontinue").asText();
-
     }
 
     /**
@@ -172,7 +174,7 @@ public JsonNode next() {
         indexRow++;
 
         if ((indexRow == callResults.size()) && !cmcontinue.isBlank()) {
-            urlContinue = HttpUrl.parse(urlBase.toString()).newBuilder()
+            HttpUrl urlContinue = buildBaseUrl(categoryName, cmType).newBuilder()
                     .addQueryParameter("cmcontinue", cmcontinue).build();
             try {
                 getContinuationResults(urlContinue);