From b0bc2d0d0b3fe25620102f21316b470ddbb5f654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Sch=C3=A4fer?= <florian@schaeferban.de>
Date: Mon, 11 Jun 2018 16:55:51 +0200
Subject: [PATCH] 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.
---
 src/org/wikipedia/WikipediaApp.java                            | 2 +-
 .../wikipedia/api/{wikidata_action => }/ApiQueryClient.java    | 3 +--
 src/org/wikipedia/validator/WikidataItemExists.java            | 2 +-
 src/org/wikipedia/validator/WikipediaAgainstWikidata.java      | 2 +-
 .../api/wikidata_action/WikidataActionApiQueryTest.java        | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/org/wikipedia/api/{wikidata_action => }/ApiQueryClient.java (98%)

diff --git a/src/org/wikipedia/WikipediaApp.java b/src/org/wikipedia/WikipediaApp.java
index 8c42caf..20811c1 100644
--- 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/src/org/wikipedia/api/wikidata_action/ApiQueryClient.java b/src/org/wikipedia/api/ApiQueryClient.java
similarity index 98%
rename from src/org/wikipedia/api/wikidata_action/ApiQueryClient.java
rename to src/org/wikipedia/api/ApiQueryClient.java
index 46eedba..8770694 100644
--- a/src/org/wikipedia/api/wikidata_action/ApiQueryClient.java
+++ b/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
index 3b9cc79..87c687e 100644
--- 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
index d269a0c..d6aaefa 100644
--- 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
index 19c2944..a39abbb 100644
--- 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 {