Move the ApiQueryClient one level up in the package hierarchy

It should now be ready to work with different APIs, not only the Wikidata Action API.
JOSM · Jun 11, 2018 · b0bc2d0 · b0bc2d0
1 parent f33b086
commit b0bc2d0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/org/wikipedia/WikipediaApp.java b/src/org/wikipedia/WikipediaApp.java
@@ -33,7 +33,7 @@
 import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
-import org.wikipedia.api.wikidata_action.ApiQueryClient;
+import org.wikipedia.api.ApiQueryClient;
 import org.wikipedia.api.wikidata_action.WikidataActionApiQuery;
 import org.wikipedia.api.wikidata_action.json.CheckEntityExistsResult;
 import org.wikipedia.data.WikidataEntry;

diff --git a/...a/api/wikidata_action/ApiQueryClient.java → src/org/wikipedia/api/ApiQueryClient.java b/...a/api/wikidata_action/ApiQueryClient.java → src/org/wikipedia/api/ApiQueryClient.java
@@ -1,5 +1,5 @@
 // License: GPL. For details, see LICENSE file.
-package org.wikipedia.api.wikidata_action;
+package org.wikipedia.api;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -18,7 +18,6 @@
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
 import org.wikipedia.Caches;
-import org.wikipedia.api.ApiQuery;
 
 public final class ApiQueryClient {
 

diff --git a/src/org/wikipedia/validator/WikidataItemExists.java b/src/org/wikipedia/validator/WikidataItemExists.java
@@ -13,7 +13,7 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.I18n;
 import org.wikipedia.WikipediaPlugin;
-import org.wikipedia.api.wikidata_action.ApiQueryClient;
+import org.wikipedia.api.ApiQueryClient;
 import org.wikipedia.api.wikidata_action.WikidataActionApiQuery;
 import org.wikipedia.api.wikidata_action.json.CheckEntityExistsResult;
 import org.wikipedia.tools.ListUtil;

diff --git a/src/org/wikipedia/validator/WikipediaAgainstWikidata.java b/src/org/wikipedia/validator/WikipediaAgainstWikidata.java
@@ -15,7 +15,7 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Pair;
 import org.wikipedia.WikipediaPlugin;
-import org.wikipedia.api.wikidata_action.ApiQueryClient;
+import org.wikipedia.api.ApiQueryClient;
 import org.wikipedia.api.wikidata_action.WikidataActionApiQuery;
 import org.wikipedia.api.wikidata_action.json.CheckEntityExistsResult;
 import org.wikipedia.tools.ListUtil;

diff --git a/test/unit/org/wikipedia/api/wikidata_action/WikidataActionApiQueryTest.java b/test/unit/org/wikipedia/api/wikidata_action/WikidataActionApiQueryTest.java
@@ -30,6 +30,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.wikipedia.api.ApiQueryClient;
 import org.wikipedia.api.wikidata_action.json.CheckEntityExistsResult;
 
 public class WikidataActionApiQueryTest {