jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: rename Site to WikiSite ......................................................................
Hygiene: rename Site to WikiSite Move org.wikipedia.Site to org.wikipedia.dataclient.WikiSite. No user visible change intended. Site appears to have originally been intended as a generic wiki URL. If not, that's what is expected now as class assumptions around URL structure are wiki specific, especially language. This patch renames Site to WikiSite and moves it under the dataclient package to help alleviate confusion over its purpose. Site is misused to accept unsupported URLs in some cases. A future refactor should find and fix these instances. There are also some wiki corner cases that aren't fully handled around language including: meta, upload, deployment, and test. Maybe a more generic Site super class would help. Additional changes: • Use "wiki" terminology instead of "site". Retaining site nomenclature would be keeping some confusion. Where models are thought to be kept as JSON, @SerializedName is used. For volatile storage, @SerializedName is not used • Use WikiSite.forLanguageCode instead of hardcoding *.wikipedia.org • Removed always null Site member from GalleryCollection • In tests, replace a couple instances of: (WikipediaApp) getInstrumentation().getTargetContext().getApplicationContext()` With: `WikipediaApp.getInstance()` My apologies for the unhappily large diff. I recommend viewing through a few programs including icdiff and grep. Change-Id: Ic967146a77b1301c87a0e6fa552c2f70663ca2fe --- A app/src/androidTest/java/org/wikipedia/dataclient/WikiSiteTest.java M app/src/androidTest/java/org/wikipedia/editing/EditPreviewTaskTest.java M app/src/androidTest/java/org/wikipedia/page/BasePageLoadTest.java M app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java M app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java M app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java M app/src/androidTest/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java M app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java M app/src/androidTest/java/org/wikipedia/test/GetDescriptionsTaskTests.java M app/src/androidTest/java/org/wikipedia/test/LanguageVariantTests.java M app/src/androidTest/java/org/wikipedia/test/LoginClientTest.java M app/src/androidTest/java/org/wikipedia/test/PageTests.java M app/src/androidTest/java/org/wikipedia/test/ParcelableTest.java D app/src/androidTest/java/org/wikipedia/test/SiteTests.java M app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java M app/src/main/java/org/wikipedia/LongPressHandler.java M app/src/main/java/org/wikipedia/WikipediaApp.java M app/src/main/java/org/wikipedia/analytics/AppearanceChangeFunnel.java M app/src/main/java/org/wikipedia/analytics/EditFunnel.java M app/src/main/java/org/wikipedia/analytics/FindInPageFunnel.java M app/src/main/java/org/wikipedia/analytics/Funnel.java M app/src/main/java/org/wikipedia/analytics/GalleryFunnel.java M app/src/main/java/org/wikipedia/analytics/ProtectedEditAttemptFunnel.java M app/src/main/java/org/wikipedia/analytics/ReadingListsFunnel.java M app/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java M app/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java M app/src/main/java/org/wikipedia/analytics/TimedFunnel.java M app/src/main/java/org/wikipedia/analytics/ToCInteractionFunnel.java M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java R app/src/main/java/org/wikipedia/dataclient/WikiSite.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/dataclient/retrofit/RetrofitFactory.java D app/src/main/java/org/wikipedia/dataclient/retrofit/SiteCachedService.java A app/src/main/java/org/wikipedia/dataclient/retrofit/WikiCachedService.java M app/src/main/java/org/wikipedia/editing/CaptchaHandler.java M app/src/main/java/org/wikipedia/editing/CaptchaResult.java M app/src/main/java/org/wikipedia/editing/EditHandler.java M app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java M app/src/main/java/org/wikipedia/editing/EditPreviewTask.java M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java M app/src/main/java/org/wikipedia/editing/EditTask.java M app/src/main/java/org/wikipedia/editing/EditTokenStorage.java M app/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java M app/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java M app/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java M app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java M app/src/main/java/org/wikipedia/feed/FeedFragment.java M app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java M app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java M app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingClient.java M app/src/main/java/org/wikipedia/feed/dataclient/DummyClient.java M app/src/main/java/org/wikipedia/feed/dataclient/FeedClient.java M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java M app/src/main/java/org/wikipedia/feed/image/FeaturedImage.java M app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java M app/src/main/java/org/wikipedia/feed/mainpage/MainPageCard.java M app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java M app/src/main/java/org/wikipedia/feed/mainpage/MainPageClient.java M app/src/main/java/org/wikipedia/feed/mostread/MostReadItemCard.java M app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java M app/src/main/java/org/wikipedia/feed/news/NewsItem.java M app/src/main/java/org/wikipedia/feed/news/NewsItemCard.java M app/src/main/java/org/wikipedia/feed/news/NewsListCard.java M app/src/main/java/org/wikipedia/feed/random/RandomCard.java M app/src/main/java/org/wikipedia/feed/random/RandomCardView.java M app/src/main/java/org/wikipedia/feed/random/RandomClient.java M app/src/main/java/org/wikipedia/feed/searchbar/SearchClient.java M app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java M app/src/main/java/org/wikipedia/json/UriTypeAdapter.java M app/src/main/java/org/wikipedia/language/AcceptLanguageUtil.java M app/src/main/java/org/wikipedia/language/LangLinksActivity.java M app/src/main/java/org/wikipedia/language/LangLinksFetchTask.java M app/src/main/java/org/wikipedia/login/GroupMembershipClient.java M app/src/main/java/org/wikipedia/login/LoginActivity.java M app/src/main/java/org/wikipedia/login/LoginClient.java M app/src/main/java/org/wikipedia/main/MainFragment.java M app/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java M app/src/main/java/org/wikipedia/news/NewsActivity.java M app/src/main/java/org/wikipedia/news/NewsFragment.java M app/src/main/java/org/wikipedia/news/NewsLinkCard.java M app/src/main/java/org/wikipedia/page/DisambigListAdapter.java M app/src/main/java/org/wikipedia/page/ImageLicenseFetchTask.java M app/src/main/java/org/wikipedia/page/LinkHandler.java M app/src/main/java/org/wikipedia/page/MwApiResultPage.java M app/src/main/java/org/wikipedia/page/Namespace.java M app/src/main/java/org/wikipedia/page/Page.java M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/java/org/wikipedia/page/PageDataClient.java M app/src/main/java/org/wikipedia/page/PageFragment.java M app/src/main/java/org/wikipedia/page/PageInfoUnmarshaller.java M app/src/main/java/org/wikipedia/page/PageProperties.java M app/src/main/java/org/wikipedia/page/PageQueryTask.java M app/src/main/java/org/wikipedia/page/PageTitle.java M app/src/main/java/org/wikipedia/page/SuggestionsTask.java M app/src/main/java/org/wikipedia/page/ToCHandler.java M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java M app/src/main/java/org/wikipedia/page/gallery/GalleryCollection.java M app/src/main/java/org/wikipedia/page/gallery/GalleryCollectionFetchTask.java M app/src/main/java/org/wikipedia/page/gallery/GalleryItemFetchTask.java M app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.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/page/snippet/ShareHandler.java M app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java M app/src/main/java/org/wikipedia/pageimages/PageImagesTask.java M app/src/main/java/org/wikipedia/random/RandomSummaryService.java M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java M app/src/main/java/org/wikipedia/readinglist/ReadingListImageFetcher.java M app/src/main/java/org/wikipedia/readinglist/ReadingListPageInfoTask.java M app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java M app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java M app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListDaoProxy.java M app/src/main/java/org/wikipedia/readinglist/page/database/ReadingListPageTable.java M app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java M app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java M app/src/main/java/org/wikipedia/search/SearchResults.java M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java M app/src/main/java/org/wikipedia/search/TitleSearchTask.java M app/src/main/java/org/wikipedia/server/PageLeadProperties.java M app/src/main/java/org/wikipedia/server/PageServiceFactory.java M app/src/main/java/org/wikipedia/server/mwapi/MwPageEndpointsCache.java M app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java M app/src/main/java/org/wikipedia/server/mwapi/MwPageService.java M app/src/main/java/org/wikipedia/server/restbase/RbPageCombo.java M app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java M app/src/main/java/org/wikipedia/server/restbase/RbPageLead.java M app/src/main/java/org/wikipedia/server/restbase/RbPageService.java M app/src/main/java/org/wikipedia/settings/RbSwitch.java M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java M app/src/main/java/org/wikipedia/useroption/dataclient/DefaultUserOptionDataClient.java M app/src/main/java/org/wikipedia/useroption/dataclient/UserOptionDataClientSingleton.java M app/src/main/java/org/wikipedia/util/FeedbackUtil.java M app/src/main/java/org/wikipedia/util/L10nUtil.java M app/src/main/java/org/wikipedia/util/UriUtil.java M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java M app/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java M app/src/test/java/org/wikipedia/page/PageTest.java M app/src/test/java/org/wikipedia/page/PageTitleTest.java 146 files changed, 904 insertions(+), 900 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/315457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic967146a77b1301c87a0e6fa552c2f70663ca2fe Gerrit-PatchSet: 3 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
