With data-client added as library module (commons-app#3656)

* With data-client added as library module

* Fix build

Author: maskaravivek

data-client/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath "com.android.tools.build:gradle:3.4.1"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

data-client/src/main/java/org/wikipedia/dataclient/WikiSite.java

@@ -138,15 +138,6 @@ public String mobileAuthority() {
         return authorityToMobile(authority());
     }
 
-    /**
-     * Get wiki's mobile URL
-     * Eg. https://en.m.wikipedia.org
-     * @return
-     */
-    public String mobileUrl() {
-        return String.format("%1$s://%2$s", scheme(), mobileAuthority());
-    }
-
     /**
      * @return The canonical "desktop" form of the authority. For example, if the authority
      * is in a "mobile" form, e.g. en.m.wikipedia.org, this will become en.wikipedia.org.

data-client/src/main/java/org/wikipedia/dataclient/mwapi/MwException.java

@@ -2,32 +2,15 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import java.util.List;
 
 public class MwException extends RuntimeException {
-    @SuppressWarnings("unused") @Nullable private final MwServiceError error;
+    @SuppressWarnings("unused") @NonNull private final MwServiceError error;
 
-    @SuppressWarnings("unused") @Nullable private final List<MwServiceError> errors;
-
-    public MwException(@Nullable MwServiceError error,
-        @Nullable final List<MwServiceError> errors) {
+    public MwException(@NonNull MwServiceError error) {
         this.error = error;
-        this.errors = errors;
-    }
-
-    @NonNull
-    public List<MwServiceError> getErrors() {
-        return errors;
-    }
-
-    public String getErrorCode() {
-        if(error!=null) {
-            return error.getCode();
-        }
-        return errors != null ? errors.get(0).getCode() : null;
     }
 
-    @Nullable public MwServiceError getError() {
+    @NonNull public MwServiceError getError() {
         return error;
     }
 

data-client/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java

@@ -22,7 +22,6 @@ public class MwQueryPage extends BaseModel {
     @SuppressWarnings("unused") private int ns;
     @SuppressWarnings("unused") private int index;
     @SuppressWarnings("unused,NullableProblems") @NonNull private String title;
-    @SuppressWarnings("unused,NullableProblems") @NonNull private CategoryInfo categoryinfo;
     @SuppressWarnings("unused") @Nullable private List<LangLink> langlinks;
     @SuppressWarnings("unused") @Nullable private List<Revision> revisions;
     @SuppressWarnings("unused") @Nullable private List<Coordinates> coordinates;
@@ -43,10 +42,6 @@ public class MwQueryPage extends BaseModel {
         return title;
     }
 
-    @NonNull public CategoryInfo categoryInfo() {
-        return categoryinfo;
-    }
-
     public int index() {
         return index;
     }
@@ -190,17 +185,6 @@ public static class Coordinates {
         }
     }
 
-    public static class CategoryInfo {
-        @SuppressWarnings("unused") private boolean hidden;
-        @SuppressWarnings("unused") private int size;
-        @SuppressWarnings("unused") private int pages;
-        @SuppressWarnings("unused") private int files;
-        @SuppressWarnings("unused") private int subcats;
-        public boolean isHidden() {
-            return hidden;
-        }
-    }
-
     static class Thumbnail {
         @SuppressWarnings("unused") private String source;
         @SuppressWarnings("unused") private int width;

data-client/src/main/java/org/wikipedia/dataclient/mwapi/MwResponse.java

@@ -17,7 +17,7 @@ public abstract class MwResponse extends BaseModel implements PostProcessingType
     @Override
     public void postProcess() {
         if (errors != null && !errors.isEmpty()) {
-            throw new MwException(errors.get(0), errors);
+            throw new MwException(errors.get(0));
         }
     }
 }

data-client/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java

@@ -13,7 +13,6 @@
  * Gson POJO for a MediaWiki API error.
  */
 public class MwServiceError extends BaseModel implements ServiceError {
-
     @SuppressWarnings("unused") @Nullable private String code;
     @SuppressWarnings("unused") @Nullable private String text;
     @SuppressWarnings("unused") @Nullable private Data data;
@@ -56,11 +55,6 @@ public boolean hasMessageName(@NonNull String messageName) {
         return null;
     }
 
-    @Nullable
-    public String getCode() {
-        return code;
-    }
-
     private static final class Data {
         @SuppressWarnings("unused") @Nullable private List<Message> messages;
 

data-client/src/main/java/org/wikipedia/json/GsonUtil.java

@@ -1,20 +1,21 @@
 package org.wikipedia.json;
 
 import android.net.Uri;
+
 import androidx.annotation.VisibleForTesting;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import org.wikipedia.dataclient.SharedPreferenceCookieManager;
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.page.Namespace;
-import org.wikipedia.wikidata.DataValue;
 
 public final class GsonUtil {
     private static final String DATE_FORMAT = "MMM dd, yyyy HH:mm:ss";
 
     private static final GsonBuilder DEFAULT_GSON_BUILDER = new GsonBuilder()
             .setDateFormat(DATE_FORMAT)
-            .registerTypeAdapterFactory(DataValue.getPolymorphicTypeAdapter())
             .registerTypeHierarchyAdapter(Uri.class, new UriTypeAdapter().nullSafe())
             .registerTypeHierarchyAdapter(Namespace.class, new NamespaceTypeAdapter().nullSafe())
             .registerTypeAdapter(WikiSite.class, new WikiSiteTypeAdapter().nullSafe())

data-client/src/main/java/org/wikipedia/wikidata/Entities.java

@@ -2,27 +2,21 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.gson.annotations.SerializedName;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
 import org.wikipedia.dataclient.mwapi.MwResponse;
 import org.wikipedia.json.PostProcessingTypeAdapter;
 
+import java.util.Collections;
+import java.util.Map;
+
 @SuppressWarnings("unused")
 public class Entities extends MwResponse implements PostProcessingTypeAdapter.PostProcessable {
     @Nullable private Map<String, Entity> entities;
     private int success;
 
-    @NotNull
-    public Map<String, Entity> entities() {
-        return entities != null ? entities : Collections.emptyMap();
-    }
-
-    public int getSuccess() {
-        return success;
+    @Nullable public Map<String, Entity> entities() {
+        return entities;
     }
 
     @Nullable public Entity getFirst() {
@@ -45,7 +39,6 @@ public static class Entity {
         @Nullable private Map<String, Label> labels;
         @Nullable private Map<String, Label> descriptions;
         @Nullable private Map<String, SiteLink> sitelinks;
-        @Nullable @SerializedName(value = "statements", alternate = "claims") private Map<String, List<Statement_partial>> statements;
         @Nullable private String missing;
 
         @NonNull public String id() {
@@ -64,11 +57,6 @@ public static class Entity {
             return sitelinks != null ? sitelinks : Collections.emptyMap();
         }
 
-        @Nullable
-        public Map<String, List<Statement_partial>> getStatements() {
-            return statements;
-        }
-
         boolean isMissing() {
             return "-1".equals(id) && missing != null;
         }