Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333454 )
Change subject: Hygiene: consolidate org.wikipedia.server into org.wikipedia.dataclient ...................................................................... Hygiene: consolidate org.wikipedia.server into org.wikipedia.dataclient org.wikipedia.server is mostly a page data client so start breaking classes into page subpackages Change-Id: I7915807d44a4173c48be416e41629e44c9efe7e5 --- R app/src/main/java/org/wikipedia/dataclient/ServiceError.java M app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiException.java R app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiResponsePage.java M app/src/main/java/org/wikipedia/dataclient/mwapi/MwResponse.java R app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java R app/src/main/java/org/wikipedia/dataclient/mwapi/NearbyPageMwResponse.java R app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageCombo.java R app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageLead.java R app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageRemaining.java R app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java R app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java R app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageSummary.java R app/src/main/java/org/wikipedia/dataclient/page/PageCombo.java R app/src/main/java/org/wikipedia/dataclient/page/PageLead.java R app/src/main/java/org/wikipedia/dataclient/page/PageLeadProperties.java R app/src/main/java/org/wikipedia/dataclient/page/PageRemaining.java R app/src/main/java/org/wikipedia/dataclient/page/PageService.java R app/src/main/java/org/wikipedia/dataclient/page/PageServiceFactory.java R app/src/main/java/org/wikipedia/dataclient/page/PageSummary.java R app/src/main/java/org/wikipedia/dataclient/page/Protection.java R app/src/main/java/org/wikipedia/dataclient/restbase/RbDefinition.java R app/src/main/java/org/wikipedia/dataclient/restbase/RbServiceError.java R app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageCombo.java R app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageLead.java R app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageRemaining.java R app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java R app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java R app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java M app/src/main/java/org/wikipedia/dataclient/retrofit/MwCachedService.java M app/src/main/java/org/wikipedia/dataclient/retrofit/RbCachedService.java M app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java M app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java M app/src/main/java/org/wikipedia/edit/preview/Wikitext.java M app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java M app/src/main/java/org/wikipedia/feed/model/FeedPageSummary.java M app/src/main/java/org/wikipedia/feed/random/RandomCardView.java M app/src/main/java/org/wikipedia/language/LangLinks.java M app/src/main/java/org/wikipedia/login/LoginClient.java M app/src/main/java/org/wikipedia/nearby/Nearby.java M app/src/main/java/org/wikipedia/nearby/NearbyPage.java M app/src/main/java/org/wikipedia/page/PageDataClient.java M app/src/main/java/org/wikipedia/page/PageProperties.java M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java M app/src/main/java/org/wikipedia/random/RandomSummaryClient.java M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java M app/src/main/java/org/wikipedia/search/SearchResult.java M app/src/main/java/org/wikipedia/search/SearchResults.java M app/src/main/java/org/wikipedia/settings/DeveloperSettingsFragment.java M app/src/main/java/org/wikipedia/useroption/dataclient/DefaultUserOptionDataClient.java M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java R app/src/test/java/org/wikipedia/dataclient/restbase/RbPageLeadTest.java M app/src/test/java/org/wikipedia/random/RandomSummaryClientTest.java M app/src/test/java/org/wikipedia/server/BasePageLeadTest.java M app/src/test/java/org/wikipedia/server/mwapi/MwPageLeadTest.java 56 files changed, 107 insertions(+), 100 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/54/333454/1 diff --git a/app/src/main/java/org/wikipedia/server/ServiceError.java b/app/src/main/java/org/wikipedia/dataclient/ServiceError.java similarity index 79% rename from app/src/main/java/org/wikipedia/server/ServiceError.java rename to app/src/main/java/org/wikipedia/dataclient/ServiceError.java index 9b6ff67..f703338 100644 --- a/app/src/main/java/org/wikipedia/server/ServiceError.java +++ b/app/src/main/java/org/wikipedia/dataclient/ServiceError.java @@ -1,4 +1,4 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient; /** * The API reported an error in the payload. diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiException.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiException.java index ddf9d6d..641f892 100644 --- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiException.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiException.java @@ -3,8 +3,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import org.wikipedia.server.mwapi.MwServiceError; - public class MwApiException extends RuntimeException { @SuppressWarnings("unused") @NonNull private final MwServiceError error; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwApiResponsePage.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiResponsePage.java similarity index 98% rename from app/src/main/java/org/wikipedia/server/mwapi/MwApiResponsePage.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiResponsePage.java index 18920cf..265b926 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwApiResponsePage.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwApiResponsePage.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwResponse.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwResponse.java index 17b6bfd..693ce2b 100644 --- a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwResponse.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwResponse.java @@ -2,8 +2,6 @@ import android.support.annotation.Nullable; -import org.wikipedia.server.mwapi.MwServiceError; - public abstract class MwResponse { @SuppressWarnings("unused") @Nullable private MwServiceError error; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwServiceError.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java similarity index 95% rename from app/src/main/java/org/wikipedia/server/mwapi/MwServiceError.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java index 3f882f2..e0729d1 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwServiceError.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.java @@ -1,11 +1,11 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.google.gson.annotations.SerializedName; -import org.wikipedia.server.ServiceError; +import org.wikipedia.dataclient.ServiceError; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/NearbyPageMwResponse.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/NearbyPageMwResponse.java similarity index 96% rename from app/src/main/java/org/wikipedia/server/mwapi/NearbyPageMwResponse.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/NearbyPageMwResponse.java index db9deea..3433656 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/NearbyPageMwResponse.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/NearbyPageMwResponse.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwPageCombo.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageCombo.java similarity index 77% rename from app/src/main/java/org/wikipedia/server/mwapi/MwPageCombo.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageCombo.java index 7586add..0b301ef 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageCombo.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageCombo.java @@ -1,6 +1,6 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi.page; -import org.wikipedia.server.PageCombo; +import org.wikipedia.dataclient.page.PageCombo; /** * Combines MwPageLead and MwPageRemaining Gson POJOs for mobileview API. diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageLead.java similarity index 96% rename from app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageLead.java index 9d08270..e4a1ae6 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageLead.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi.page; import android.location.Location; import android.support.annotation.NonNull; @@ -8,14 +8,15 @@ import com.google.gson.annotations.SerializedName; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.mwapi.MwServiceError; +import org.wikipedia.dataclient.page.PageLead; +import org.wikipedia.dataclient.page.PageLeadProperties; +import org.wikipedia.dataclient.page.Protection; import org.wikipedia.page.Namespace; import org.wikipedia.page.Page; import org.wikipedia.page.PageProperties; import org.wikipedia.page.PageTitle; import org.wikipedia.page.Section; -import org.wikipedia.server.PageLead; -import org.wikipedia.server.PageLeadProperties; -import org.wikipedia.server.Protection; import org.wikipedia.util.log.L; import java.util.Collections; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwPageRemaining.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageRemaining.java similarity index 90% rename from app/src/main/java/org/wikipedia/server/mwapi/MwPageRemaining.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageRemaining.java index 0f8f198..6573824 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageRemaining.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageRemaining.java @@ -1,10 +1,10 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi.page; import android.support.annotation.Nullable; +import org.wikipedia.dataclient.page.PageRemaining; import org.wikipedia.page.Page; import org.wikipedia.page.Section; -import org.wikipedia.server.PageRemaining; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwPageService.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java similarity index 95% rename from app/src/main/java/org/wikipedia/server/mwapi/MwPageService.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java index 0e2b66a..e4032a6 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageService.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java @@ -1,15 +1,15 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi.page; import org.wikipedia.Constants; import org.wikipedia.WikipediaApp; +import org.wikipedia.dataclient.ServiceError; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.page.PageLead; +import org.wikipedia.dataclient.page.PageRemaining; +import org.wikipedia.dataclient.page.PageService; +import org.wikipedia.dataclient.page.PageSummary; +import org.wikipedia.dataclient.restbase.page.RbPageServiceCache; import org.wikipedia.dataclient.retrofit.RetrofitException; -import org.wikipedia.server.PageLead; -import org.wikipedia.server.PageRemaining; -import org.wikipedia.server.PageService; -import org.wikipedia.server.PageSummary; -import org.wikipedia.server.ServiceError; -import org.wikipedia.server.restbase.RbPageServiceCache; import org.wikipedia.settings.RbSwitch; import org.wikipedia.zero.WikipediaZeroHandler; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwPageServiceCache.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java similarity index 96% rename from app/src/main/java/org/wikipedia/server/mwapi/MwPageServiceCache.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java index 54b431b..0e6af71 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageServiceCache.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageServiceCache.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi.page; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwPageSummary.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageSummary.java similarity index 92% rename from app/src/main/java/org/wikipedia/server/mwapi/MwPageSummary.java rename to app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageSummary.java index 7d453b5..79fea94 100644 --- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageSummary.java +++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageSummary.java @@ -1,8 +1,9 @@ -package org.wikipedia.server.mwapi; +package org.wikipedia.dataclient.mwapi.page; import android.support.annotation.Nullable; -import org.wikipedia.server.PageSummary; +import org.wikipedia.dataclient.mwapi.MwServiceError; +import org.wikipedia.dataclient.page.PageSummary; import org.wikipedia.util.log.L; /** diff --git a/app/src/main/java/org/wikipedia/server/PageCombo.java b/app/src/main/java/org/wikipedia/dataclient/page/PageCombo.java similarity index 91% rename from app/src/main/java/org/wikipedia/server/PageCombo.java rename to app/src/main/java/org/wikipedia/dataclient/page/PageCombo.java index dcb1935..c066b07 100644 --- a/app/src/main/java/org/wikipedia/server/PageCombo.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/PageCombo.java @@ -1,4 +1,4 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; /** * Combines PageLead and PageRemaining Gson POJIs for mobileview API. diff --git a/app/src/main/java/org/wikipedia/server/PageLead.java b/app/src/main/java/org/wikipedia/dataclient/page/PageLead.java similarity index 89% rename from app/src/main/java/org/wikipedia/server/PageLead.java rename to app/src/main/java/org/wikipedia/dataclient/page/PageLead.java index 6042a97..5170f8c 100644 --- a/app/src/main/java/org/wikipedia/server/PageLead.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/PageLead.java @@ -1,8 +1,9 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; import android.location.Location; import android.support.annotation.Nullable; +import org.wikipedia.dataclient.ServiceError; import org.wikipedia.page.Page; import org.wikipedia.page.PageTitle; diff --git a/app/src/main/java/org/wikipedia/server/PageLeadProperties.java b/app/src/main/java/org/wikipedia/dataclient/page/PageLeadProperties.java similarity index 96% rename from app/src/main/java/org/wikipedia/server/PageLeadProperties.java rename to app/src/main/java/org/wikipedia/dataclient/page/PageLeadProperties.java index 99a85a3..e359b2c 100644 --- a/app/src/main/java/org/wikipedia/server/PageLeadProperties.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/PageLeadProperties.java @@ -1,4 +1,4 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; import android.location.Location; import android.support.annotation.NonNull; diff --git a/app/src/main/java/org/wikipedia/server/PageRemaining.java b/app/src/main/java/org/wikipedia/dataclient/page/PageRemaining.java similarity index 89% rename from app/src/main/java/org/wikipedia/server/PageRemaining.java rename to app/src/main/java/org/wikipedia/dataclient/page/PageRemaining.java index 6f9e095..795872b 100644 --- a/app/src/main/java/org/wikipedia/server/PageRemaining.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/PageRemaining.java @@ -1,4 +1,4 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; import org.wikipedia.page.Page; diff --git a/app/src/main/java/org/wikipedia/server/PageService.java b/app/src/main/java/org/wikipedia/dataclient/page/PageService.java similarity index 97% rename from app/src/main/java/org/wikipedia/server/PageService.java rename to app/src/main/java/org/wikipedia/dataclient/page/PageService.java index 62e1f9e..3a003b2 100644 --- a/app/src/main/java/org/wikipedia/server/PageService.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/PageService.java @@ -1,4 +1,4 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; import java.io.IOException; diff --git a/app/src/main/java/org/wikipedia/server/PageServiceFactory.java b/app/src/main/java/org/wikipedia/dataclient/page/PageServiceFactory.java similarity index 84% rename from app/src/main/java/org/wikipedia/server/PageServiceFactory.java rename to app/src/main/java/org/wikipedia/dataclient/page/PageServiceFactory.java index 62849b9..3c7b93f 100644 --- a/app/src/main/java/org/wikipedia/server/PageServiceFactory.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/PageServiceFactory.java @@ -1,11 +1,11 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; import android.support.annotation.NonNull; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.mwapi.page.MwPageService; +import org.wikipedia.dataclient.restbase.page.RbPageService; import org.wikipedia.page.Namespace; -import org.wikipedia.server.mwapi.MwPageService; -import org.wikipedia.server.restbase.RbPageService; import org.wikipedia.settings.RbSwitch; /** diff --git a/app/src/main/java/org/wikipedia/server/PageSummary.java b/app/src/main/java/org/wikipedia/dataclient/page/PageSummary.java similarity index 85% rename from app/src/main/java/org/wikipedia/server/PageSummary.java rename to app/src/main/java/org/wikipedia/dataclient/page/PageSummary.java index b23799c..912044f 100644 --- a/app/src/main/java/org/wikipedia/server/PageSummary.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/PageSummary.java @@ -1,7 +1,9 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; import android.support.annotation.Nullable; +import org.wikipedia.dataclient.ServiceError; + /** * Represents a summary of a page, useful for page previews. */ diff --git a/app/src/main/java/org/wikipedia/server/Protection.java b/app/src/main/java/org/wikipedia/dataclient/page/Protection.java similarity index 94% rename from app/src/main/java/org/wikipedia/server/Protection.java rename to app/src/main/java/org/wikipedia/dataclient/page/Protection.java index a77daba..27aa66d 100644 --- a/app/src/main/java/org/wikipedia/server/Protection.java +++ b/app/src/main/java/org/wikipedia/dataclient/page/Protection.java @@ -1,4 +1,4 @@ -package org.wikipedia.server; +package org.wikipedia.dataclient.page; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java b/app/src/main/java/org/wikipedia/dataclient/restbase/RbDefinition.java similarity index 93% rename from app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/RbDefinition.java index 58c0142..cbedbc3 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/RbDefinition.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -12,7 +12,7 @@ @Required @NonNull private Map<String, Usage[]> usagesByLang; @SuppressWarnings("unused") @Nullable private RbServiceError error; - RbDefinition(@NonNull Map<String, RbDefinition.Usage[]> usages) { + public RbDefinition(@NonNull Map<String, RbDefinition.Usage[]> usages) { usagesByLang = usages; } diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbServiceError.java b/app/src/main/java/org/wikipedia/dataclient/restbase/RbServiceError.java similarity index 90% rename from app/src/main/java/org/wikipedia/server/restbase/RbServiceError.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/RbServiceError.java index ef67d20..1f6b826 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbServiceError.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/RbServiceError.java @@ -1,6 +1,6 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase; -import org.wikipedia.server.ServiceError; +import org.wikipedia.dataclient.ServiceError; /** * Gson POJO for a RESTBase API error. diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbPageCombo.java b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageCombo.java similarity index 93% rename from app/src/main/java/org/wikipedia/server/restbase/RbPageCombo.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageCombo.java index 8d2ac6d..741271e 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbPageCombo.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageCombo.java @@ -1,14 +1,15 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase.page; import android.location.Location; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.page.PageCombo; +import org.wikipedia.dataclient.restbase.RbServiceError; import org.wikipedia.page.Page; import org.wikipedia.page.PageProperties; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.PageCombo; import org.wikipedia.util.log.L; diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbPageLead.java b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageLead.java similarity index 96% rename from app/src/main/java/org/wikipedia/server/restbase/RbPageLead.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageLead.java index 549ba59..15b8cf4 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbPageLead.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageLead.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase.page; import android.location.Location; import android.support.annotation.NonNull; @@ -8,6 +8,10 @@ import com.google.gson.annotations.SerializedName; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.page.PageLead; +import org.wikipedia.dataclient.page.PageLeadProperties; +import org.wikipedia.dataclient.page.Protection; +import org.wikipedia.dataclient.restbase.RbServiceError; import org.wikipedia.login.User; import org.wikipedia.page.GeoTypeAdapter; import org.wikipedia.page.Namespace; @@ -15,9 +19,6 @@ import org.wikipedia.page.PageProperties; import org.wikipedia.page.PageTitle; import org.wikipedia.page.Section; -import org.wikipedia.server.PageLead; -import org.wikipedia.server.PageLeadProperties; -import org.wikipedia.server.Protection; import org.wikipedia.util.UriUtil; import org.wikipedia.util.log.L; diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbPageRemaining.java b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageRemaining.java similarity index 83% rename from app/src/main/java/org/wikipedia/server/restbase/RbPageRemaining.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageRemaining.java index d3b181f..7cabd77 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbPageRemaining.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageRemaining.java @@ -1,10 +1,10 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase.page; import android.support.annotation.Nullable; +import org.wikipedia.dataclient.page.PageRemaining; import org.wikipedia.page.Page; import org.wikipedia.page.Section; -import org.wikipedia.server.PageRemaining; import java.util.List; diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbPageService.java b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java similarity index 96% rename from app/src/main/java/org/wikipedia/server/restbase/RbPageService.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java index 3f6c19a..171d98c 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbPageService.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase.page; import android.support.annotation.NonNull; @@ -6,13 +6,14 @@ import com.google.gson.JsonParseException; import org.wikipedia.WikipediaApp; +import org.wikipedia.dataclient.ServiceError; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.page.PageLead; +import org.wikipedia.dataclient.page.PageRemaining; +import org.wikipedia.dataclient.page.PageService; +import org.wikipedia.dataclient.page.PageSummary; +import org.wikipedia.dataclient.restbase.RbDefinition; import org.wikipedia.dataclient.retrofit.RetrofitException; -import org.wikipedia.server.PageLead; -import org.wikipedia.server.PageRemaining; -import org.wikipedia.server.PageService; -import org.wikipedia.server.PageSummary; -import org.wikipedia.server.ServiceError; import org.wikipedia.settings.RbSwitch; import org.wikipedia.zero.WikipediaZeroHandler; diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbPageServiceCache.java b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java similarity index 96% rename from app/src/main/java/org/wikipedia/server/restbase/RbPageServiceCache.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java index 4fea1b9..d6de9d8 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbPageServiceCache.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageServiceCache.java @@ -1,4 +1,4 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase.page; import android.support.annotation.NonNull; diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbPageSummary.java b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java similarity index 92% rename from app/src/main/java/org/wikipedia/server/restbase/RbPageSummary.java rename to app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java index efd3099..1bcf6c4 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbPageSummary.java +++ b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java @@ -1,10 +1,11 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase.page; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import org.wikipedia.dataclient.page.PageSummary; +import org.wikipedia.dataclient.restbase.RbServiceError; import org.wikipedia.json.annotations.Required; -import org.wikipedia.server.PageSummary; import org.wikipedia.util.log.L; /** diff --git a/app/src/main/java/org/wikipedia/dataclient/retrofit/MwCachedService.java b/app/src/main/java/org/wikipedia/dataclient/retrofit/MwCachedService.java index d101492..049ecf3 100644 --- a/app/src/main/java/org/wikipedia/dataclient/retrofit/MwCachedService.java +++ b/app/src/main/java/org/wikipedia/dataclient/retrofit/MwCachedService.java @@ -3,7 +3,7 @@ import android.support.annotation.NonNull; import org.wikipedia.dataclient.WikiSite; -import org.wikipedia.server.mwapi.MwPageServiceCache; +import org.wikipedia.dataclient.mwapi.page.MwPageServiceCache; import retrofit2.Retrofit; diff --git a/app/src/main/java/org/wikipedia/dataclient/retrofit/RbCachedService.java b/app/src/main/java/org/wikipedia/dataclient/retrofit/RbCachedService.java index e9bc878..adefcab 100644 --- a/app/src/main/java/org/wikipedia/dataclient/retrofit/RbCachedService.java +++ b/app/src/main/java/org/wikipedia/dataclient/retrofit/RbCachedService.java @@ -3,7 +3,7 @@ import android.support.annotation.NonNull; import org.wikipedia.dataclient.WikiSite; -import org.wikipedia.server.restbase.RbPageServiceCache; +import org.wikipedia.dataclient.restbase.page.RbPageServiceCache; import retrofit2.Retrofit; diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java index a3046a4..6af4533 100644 --- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java +++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditClient.java @@ -6,12 +6,12 @@ import android.text.TextUtils; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.mwapi.MwServiceError; import org.wikipedia.dataclient.retrofit.MwCachedService; import org.wikipedia.dataclient.retrofit.RetrofitException; import org.wikipedia.login.User; import org.wikipedia.page.Page; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.mwapi.MwServiceError; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java index 61b276b..d42bd3b 100644 --- a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java +++ b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewClient.java @@ -4,10 +4,10 @@ import android.support.annotation.VisibleForTesting; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.restbase.page.RbPageServiceCache; import org.wikipedia.dataclient.retrofit.MwCachedService; import org.wikipedia.dataclient.retrofit.RetrofitException; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.restbase.RbPageServiceCache; import retrofit2.Call; import retrofit2.Response; diff --git a/app/src/main/java/org/wikipedia/edit/preview/Wikitext.java b/app/src/main/java/org/wikipedia/edit/preview/Wikitext.java index 4676150..ed3afa0 100644 --- a/app/src/main/java/org/wikipedia/edit/preview/Wikitext.java +++ b/app/src/main/java/org/wikipedia/edit/preview/Wikitext.java @@ -2,8 +2,8 @@ import android.support.annotation.Nullable; +import org.wikipedia.dataclient.mwapi.MwApiResponsePage; import org.wikipedia.model.BaseModel; -import org.wikipedia.server.mwapi.MwApiResponsePage; import java.util.Iterator; import java.util.Map; diff --git a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java index 79fad7c..60eaf69 100644 --- a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java +++ b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java @@ -10,6 +10,7 @@ import org.wikipedia.WikipediaApp; import org.wikipedia.dataclient.WikiSite; import org.wikipedia.dataclient.mwapi.MwApiException; +import org.wikipedia.dataclient.mwapi.MwApiResponsePage; import org.wikipedia.dataclient.mwapi.MwQueryResponse; import org.wikipedia.dataclient.retrofit.MwCachedService; import org.wikipedia.dataclient.retrofit.RetrofitException; @@ -19,7 +20,6 @@ import org.wikipedia.page.bottomcontent.MainPageReadMoreTopicTask; import org.wikipedia.search.SearchResult; import org.wikipedia.search.SearchResults; -import org.wikipedia.server.mwapi.MwApiResponsePage; import org.wikipedia.util.log.L; import org.wikipedia.zero.WikipediaZeroHandler; diff --git a/app/src/main/java/org/wikipedia/feed/model/FeedPageSummary.java b/app/src/main/java/org/wikipedia/feed/model/FeedPageSummary.java index b80784e..1a798f1 100644 --- a/app/src/main/java/org/wikipedia/feed/model/FeedPageSummary.java +++ b/app/src/main/java/org/wikipedia/feed/model/FeedPageSummary.java @@ -5,8 +5,8 @@ import com.google.gson.annotations.SerializedName; +import org.wikipedia.dataclient.restbase.page.RbPageSummary; import org.wikipedia.json.annotations.Required; -import org.wikipedia.server.restbase.RbPageSummary; /** * An RbPageSummary plus a "normalizedtitle" field, injected by RESTBase for all page summary diff --git a/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java b/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java index 6b09cd1..4758671 100644 --- a/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java +++ b/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java @@ -6,13 +6,12 @@ import android.view.View; import org.wikipedia.R; +import org.wikipedia.dataclient.restbase.page.RbPageSummary; import org.wikipedia.feed.view.FeedAdapter; import org.wikipedia.feed.view.StaticCardView; import org.wikipedia.history.HistoryEntry; import org.wikipedia.page.PageTitle; import org.wikipedia.random.RandomSummaryClient; -import org.wikipedia.server.restbase.RbPageSummary; - import org.wikipedia.util.log.L; import retrofit2.Call; diff --git a/app/src/main/java/org/wikipedia/language/LangLinks.java b/app/src/main/java/org/wikipedia/language/LangLinks.java index 2dc59cb..c1950ba 100644 --- a/app/src/main/java/org/wikipedia/language/LangLinks.java +++ b/app/src/main/java/org/wikipedia/language/LangLinks.java @@ -4,8 +4,8 @@ import android.support.annotation.Nullable; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.mwapi.MwApiResponsePage; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.mwapi.MwApiResponsePage; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/org/wikipedia/login/LoginClient.java b/app/src/main/java/org/wikipedia/login/LoginClient.java index 07c1d4f..83b33eb 100644 --- a/app/src/main/java/org/wikipedia/login/LoginClient.java +++ b/app/src/main/java/org/wikipedia/login/LoginClient.java @@ -9,8 +9,8 @@ import org.wikipedia.WikipediaApp; import org.wikipedia.dataclient.WikiSite; import org.wikipedia.dataclient.mwapi.MwQueryResponse; +import org.wikipedia.dataclient.mwapi.MwServiceError; import org.wikipedia.dataclient.retrofit.MwCachedService; -import org.wikipedia.server.mwapi.MwServiceError; import org.wikipedia.util.log.L; import java.io.IOException; diff --git a/app/src/main/java/org/wikipedia/nearby/Nearby.java b/app/src/main/java/org/wikipedia/nearby/Nearby.java index 7fe0ccb..795b5c5 100644 --- a/app/src/main/java/org/wikipedia/nearby/Nearby.java +++ b/app/src/main/java/org/wikipedia/nearby/Nearby.java @@ -3,7 +3,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import org.wikipedia.server.mwapi.NearbyPageMwResponse; +import org.wikipedia.dataclient.mwapi.NearbyPageMwResponse; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyPage.java b/app/src/main/java/org/wikipedia/nearby/NearbyPage.java index e83f744..7203692 100644 --- a/app/src/main/java/org/wikipedia/nearby/NearbyPage.java +++ b/app/src/main/java/org/wikipedia/nearby/NearbyPage.java @@ -5,7 +5,7 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; -import org.wikipedia.server.mwapi.NearbyPageMwResponse; +import org.wikipedia.dataclient.mwapi.NearbyPageMwResponse; import java.util.List; diff --git a/app/src/main/java/org/wikipedia/page/PageDataClient.java b/app/src/main/java/org/wikipedia/page/PageDataClient.java index a5f5add..03b1ff1 100644 --- a/app/src/main/java/org/wikipedia/page/PageDataClient.java +++ b/app/src/main/java/org/wikipedia/page/PageDataClient.java @@ -20,6 +20,10 @@ import org.wikipedia.WikipediaApp; import org.wikipedia.bridge.CommunicationBridge; import org.wikipedia.database.contract.PageImageHistoryContract; +import org.wikipedia.dataclient.ServiceError; +import org.wikipedia.dataclient.page.PageLead; +import org.wikipedia.dataclient.page.PageRemaining; +import org.wikipedia.dataclient.page.PageServiceFactory; import org.wikipedia.edit.EditHandler; import org.wikipedia.edit.EditSectionActivity; import org.wikipedia.history.HistoryEntry; @@ -30,10 +34,6 @@ import org.wikipedia.pageimages.PageImage; import org.wikipedia.pageimages.PageImagesTask; import org.wikipedia.savedpages.LoadSavedPageTask; -import org.wikipedia.server.PageLead; -import org.wikipedia.server.PageRemaining; -import org.wikipedia.server.PageServiceFactory; -import org.wikipedia.server.ServiceError; import org.wikipedia.util.DeviceUtil; import org.wikipedia.util.DimenUtil; import org.wikipedia.util.L10nUtil; diff --git a/app/src/main/java/org/wikipedia/page/PageProperties.java b/app/src/main/java/org/wikipedia/page/PageProperties.java index ca4cd51..71a0700 100644 --- a/app/src/main/java/org/wikipedia/page/PageProperties.java +++ b/app/src/main/java/org/wikipedia/page/PageProperties.java @@ -12,7 +12,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.wikipedia.dataclient.WikiSite; -import org.wikipedia.server.PageLeadProperties; +import org.wikipedia.dataclient.page.PageLeadProperties; import java.text.ParseException; import java.util.Date; diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java index 88f4289..b4f09e4 100755 --- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java +++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewContents.java @@ -5,9 +5,9 @@ import android.text.TextUtils; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.page.PageSummary; import org.wikipedia.page.Page; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.PageSummary; import java.text.BreakIterator; import java.util.ArrayList; diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java index e65df46..8228d18 100755 --- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java +++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java @@ -23,6 +23,8 @@ import org.wikipedia.activity.FragmentUtil; import org.wikipedia.analytics.GalleryFunnel; import org.wikipedia.analytics.LinkPreviewFunnel; +import org.wikipedia.dataclient.page.PageServiceFactory; +import org.wikipedia.dataclient.page.PageSummary; import org.wikipedia.history.HistoryEntry; import org.wikipedia.page.Page; import org.wikipedia.page.PageCache; @@ -32,8 +34,6 @@ import org.wikipedia.page.gallery.GalleryCollectionFetchTask; import org.wikipedia.page.gallery.GalleryThumbnailScrollView; import org.wikipedia.savedpages.LoadSavedPageTask; -import org.wikipedia.server.PageServiceFactory; -import org.wikipedia.server.PageSummary; import org.wikipedia.util.FeedbackUtil; import org.wikipedia.util.GeoUtil; import org.wikipedia.util.log.L; diff --git a/app/src/main/java/org/wikipedia/random/RandomSummaryClient.java b/app/src/main/java/org/wikipedia/random/RandomSummaryClient.java index 1b2dff2..a5b816c 100644 --- a/app/src/main/java/org/wikipedia/random/RandomSummaryClient.java +++ b/app/src/main/java/org/wikipedia/random/RandomSummaryClient.java @@ -7,9 +7,9 @@ import org.wikipedia.WikipediaApp; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.restbase.page.RbPageSummary; import org.wikipedia.dataclient.retrofit.RbCachedService; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.restbase.RbPageSummary; import org.wikipedia.util.log.L; import java.io.IOException; diff --git a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java index d2bb367..631f8e3 100644 --- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java +++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java @@ -8,13 +8,13 @@ import org.wikipedia.WikipediaApp; import org.wikipedia.dataclient.OkHttpConnectionFactory; +import org.wikipedia.dataclient.page.PageService; +import org.wikipedia.dataclient.page.PageServiceFactory; import org.wikipedia.page.Page; import org.wikipedia.page.PageTitle; import org.wikipedia.readinglist.page.ReadingListPageRow; import org.wikipedia.readinglist.page.database.ReadingListPageDao; import org.wikipedia.readinglist.page.database.disk.ReadingListPageDiskRow; -import org.wikipedia.server.PageService; -import org.wikipedia.server.PageServiceFactory; import org.wikipedia.util.DeviceUtil; import org.wikipedia.util.FileUtil; import org.wikipedia.util.UriUtil; diff --git a/app/src/main/java/org/wikipedia/search/SearchResult.java b/app/src/main/java/org/wikipedia/search/SearchResult.java index 5f8aa71..91a1c5a 100644 --- a/app/src/main/java/org/wikipedia/search/SearchResult.java +++ b/app/src/main/java/org/wikipedia/search/SearchResult.java @@ -7,8 +7,8 @@ import android.text.TextUtils; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.mwapi.MwApiResponsePage; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.mwapi.MwApiResponsePage; public class SearchResult implements Parcelable { private PageTitle pageTitle; diff --git a/app/src/main/java/org/wikipedia/search/SearchResults.java b/app/src/main/java/org/wikipedia/search/SearchResults.java index 9706ba0..1982c4a 100644 --- a/app/src/main/java/org/wikipedia/search/SearchResults.java +++ b/app/src/main/java/org/wikipedia/search/SearchResults.java @@ -4,8 +4,8 @@ import org.wikipedia.Constants; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.mwapi.MwApiResponsePage; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.mwapi.MwApiResponsePage; import org.wikipedia.util.ReleaseUtil; import org.wikipedia.util.log.L; diff --git a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsFragment.java b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsFragment.java index 7cbd59b..744e454 100644 --- a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsFragment.java +++ b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsFragment.java @@ -3,8 +3,8 @@ import android.content.SharedPreferences; import org.wikipedia.R; -import org.wikipedia.server.mwapi.MwPageServiceCache; -import org.wikipedia.server.restbase.RbPageServiceCache; +import org.wikipedia.dataclient.mwapi.page.MwPageServiceCache; +import org.wikipedia.dataclient.restbase.page.RbPageServiceCache; public class DeveloperSettingsFragment extends PreferenceLoaderFragment { public static DeveloperSettingsFragment newInstance() { diff --git a/app/src/main/java/org/wikipedia/useroption/dataclient/DefaultUserOptionDataClient.java b/app/src/main/java/org/wikipedia/useroption/dataclient/DefaultUserOptionDataClient.java index e9afddd..94145d1 100644 --- a/app/src/main/java/org/wikipedia/useroption/dataclient/DefaultUserOptionDataClient.java +++ b/app/src/main/java/org/wikipedia/useroption/dataclient/DefaultUserOptionDataClient.java @@ -8,11 +8,11 @@ import org.wikipedia.WikipediaApp; import org.wikipedia.csrf.CsrfToken; import org.wikipedia.csrf.CsrfTokenClient; +import org.wikipedia.dataclient.ServiceError; import org.wikipedia.dataclient.WikiSite; import org.wikipedia.dataclient.mwapi.MwPostResponse; import org.wikipedia.dataclient.mwapi.MwQueryResponse; import org.wikipedia.dataclient.retrofit.RetrofitFactory; -import org.wikipedia.server.ServiceError; import org.wikipedia.useroption.UserOption; import org.wikipedia.util.log.L; diff --git a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java index 7050cbd..f991505 100644 --- a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java +++ b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java @@ -16,11 +16,11 @@ import org.wikipedia.Constants; import org.wikipedia.R; import org.wikipedia.WikipediaApp; +import org.wikipedia.dataclient.page.PageLead; +import org.wikipedia.dataclient.page.PageService; +import org.wikipedia.dataclient.page.PageServiceFactory; import org.wikipedia.page.PageActivity; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.PageLead; -import org.wikipedia.server.PageService; -import org.wikipedia.server.PageServiceFactory; import org.wikipedia.staticdata.MainPageNameData; import org.wikipedia.util.DimenUtil; import org.wikipedia.util.StringUtil; diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java index 31f76d7..03b7745 100644 --- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java +++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java @@ -16,15 +16,15 @@ import org.wikipedia.activity.FragmentUtil; import org.wikipedia.analytics.WiktionaryDialogFunnel; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.page.PageService; +import org.wikipedia.dataclient.page.PageServiceFactory; +import org.wikipedia.dataclient.restbase.RbDefinition; +import org.wikipedia.dataclient.restbase.page.RbPageService; +import org.wikipedia.dataclient.restbase.page.RbPageService.DefinitionCallback; import org.wikipedia.page.ExtendedBottomSheetDialogFragment; import org.wikipedia.page.LinkMovementMethodExt; import org.wikipedia.page.Namespace; import org.wikipedia.page.PageTitle; -import org.wikipedia.server.PageService; -import org.wikipedia.server.PageServiceFactory; -import org.wikipedia.server.restbase.RbDefinition; -import org.wikipedia.server.restbase.RbPageService; -import org.wikipedia.server.restbase.RbPageService.DefinitionCallback; import org.wikipedia.util.StringUtil; import org.wikipedia.util.log.L; import org.wikipedia.views.AppTextView; diff --git a/app/src/test/java/org/wikipedia/server/restbase/RbPageLeadTest.java b/app/src/test/java/org/wikipedia/dataclient/restbase/RbPageLeadTest.java similarity index 90% rename from app/src/test/java/org/wikipedia/server/restbase/RbPageLeadTest.java rename to app/src/test/java/org/wikipedia/dataclient/restbase/RbPageLeadTest.java index 10d6e9b..7fcdcb5 100644 --- a/app/src/test/java/org/wikipedia/server/restbase/RbPageLeadTest.java +++ b/app/src/test/java/org/wikipedia/dataclient/restbase/RbPageLeadTest.java @@ -1,9 +1,10 @@ -package org.wikipedia.server.restbase; +package org.wikipedia.dataclient.restbase; import org.junit.Test; import org.junit.runner.RunWith; +import org.wikipedia.dataclient.mwapi.page.MwPageLead; +import org.wikipedia.dataclient.restbase.page.RbPageLead; import org.wikipedia.server.BasePageLeadTest; -import org.wikipedia.server.mwapi.MwPageLead; import org.wikipedia.test.TestRunner; import static org.wikipedia.json.GsonUnmarshaller.unmarshal; diff --git a/app/src/test/java/org/wikipedia/random/RandomSummaryClientTest.java b/app/src/test/java/org/wikipedia/random/RandomSummaryClientTest.java index d2065a4..bf845ad 100644 --- a/app/src/test/java/org/wikipedia/random/RandomSummaryClientTest.java +++ b/app/src/test/java/org/wikipedia/random/RandomSummaryClientTest.java @@ -7,10 +7,10 @@ import org.junit.Test; import org.wikipedia.dataclient.WikiSite; +import org.wikipedia.dataclient.restbase.page.RbPageSummary; import org.wikipedia.page.PageTitle; import org.wikipedia.random.RandomSummaryClient.Callback; import org.wikipedia.random.RandomSummaryClient.Service; -import org.wikipedia.server.restbase.RbPageSummary; import org.wikipedia.test.MockWebServerTest; import java.io.IOException; diff --git a/app/src/test/java/org/wikipedia/server/BasePageLeadTest.java b/app/src/test/java/org/wikipedia/server/BasePageLeadTest.java index 1c40016..d96974d 100644 --- a/app/src/test/java/org/wikipedia/server/BasePageLeadTest.java +++ b/app/src/test/java/org/wikipedia/server/BasePageLeadTest.java @@ -2,8 +2,9 @@ import android.support.annotation.NonNull; -import org.wikipedia.server.mwapi.MwPageLead; -import org.wikipedia.server.mwapi.MwServiceError; +import org.wikipedia.dataclient.mwapi.MwServiceError; +import org.wikipedia.dataclient.mwapi.page.MwPageLead; +import org.wikipedia.dataclient.page.PageLeadProperties; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/app/src/test/java/org/wikipedia/server/mwapi/MwPageLeadTest.java b/app/src/test/java/org/wikipedia/server/mwapi/MwPageLeadTest.java index 743f676..9b87ecb 100644 --- a/app/src/test/java/org/wikipedia/server/mwapi/MwPageLeadTest.java +++ b/app/src/test/java/org/wikipedia/server/mwapi/MwPageLeadTest.java @@ -2,6 +2,7 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.wikipedia.dataclient.mwapi.page.MwPageLead; import org.wikipedia.server.BasePageLeadTest; import org.wikipedia.test.TestRunner; -- To view, visit https://gerrit.wikimedia.org/r/333454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7915807d44a4173c48be416e41629e44c9efe7e5 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits