Merge pull request #21118 from wordpress-mobile/bump_checkstyle_8_29

Bump `checkstyle` to `10.17.0`
wordpress-mobile · Aug 8, 2024 · 4d9631b · 4d9631b
2 parents 4c6c953 + 72a4b0e
commit 4d9631b
Show file tree

Hide file tree

Showing 32 changed files with 80 additions and 77 deletions.
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/UserAgentTest.java b/WordPress/src/androidTest/java/org/wordpress/android/UserAgentTest.java
@@ -9,13 +9,13 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.testing.HiltAndroidRule;
+import dagger.hilt.android.testing.HiltAndroidTest;
+
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertTrue;
 
-import dagger.hilt.android.testing.HiltAndroidRule;
-import dagger.hilt.android.testing.HiltAndroidTest;
-
 @HiltAndroidTest
 public class UserAgentTest {
     /**

diff --git a/...Press/src/androidTest/java/org/wordpress/android/networking/AuthenticatorRequestTest.java b/...Press/src/androidTest/java/org/wordpress/android/networking/AuthenticatorRequestTest.java
@@ -7,11 +7,11 @@
 import org.junit.Test;
 import org.wordpress.android.FactoryUtils;
 
+import dagger.hilt.android.testing.HiltAndroidTest;
+
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNull;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-
 @HiltAndroidTest
 public class AuthenticatorRequestTest {
     RestClient mRestClient;

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/networking/WPNetworkImageViewTest.java b/WordPress/src/androidTest/java/org/wordpress/android/networking/WPNetworkImageViewTest.java
@@ -17,11 +17,11 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static junit.framework.TestCase.assertTrue;
-
 import dagger.hilt.android.testing.HiltAndroidRule;
 import dagger.hilt.android.testing.HiltAndroidTest;
 
+import static junit.framework.TestCase.assertTrue;
+
 @HiltAndroidTest
 public class WPNetworkImageViewTest {
     @Rule(order = 0)

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java b/WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java
@@ -46,6 +46,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
+import dagger.hilt.android.testing.HiltAndroidRule;
+
 import static androidx.compose.ui.test.junit4.AndroidComposeTestRule_androidKt.createComposeRule;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesTypes;
@@ -56,8 +58,6 @@
 import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_PASSWORD;
 import static org.wordpress.android.support.WPSupportUtils.isElementDisplayed;
 
-import dagger.hilt.android.testing.HiltAndroidRule;
-
 public class BaseTest {
     static final String TAG = BaseTest.class.getSimpleName();
     public static final int WIREMOCK_PORT = 8080;

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/notifications/NotesParseTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/notifications/NotesParseTest.java
@@ -5,12 +5,12 @@
 import org.junit.Test;
 import org.wordpress.android.util.HtmlUtils;
 
+import dagger.hilt.android.testing.HiltAndroidTest;
+
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertTrue;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-
 @HiltAndroidTest
 public class NotesParseTest {
     @Test

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/posts/PostUtilsTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/posts/PostUtilsTest.java
@@ -2,12 +2,12 @@
 
 import org.junit.Test;
 
+import dagger.hilt.android.testing.HiltAndroidTest;
+
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-
 @HiltAndroidTest
 public class PostUtilsTest {
     @Test

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/JPScreenshotTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/JPScreenshotTest.java
@@ -26,6 +26,11 @@
 
 import java.util.Locale;
 
+import dagger.hilt.android.testing.HiltAndroidTest;
+import tools.fastlane.screengrab.Screengrab;
+import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
+import tools.fastlane.screengrab.locale.LocaleTestRule;
+
 import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
@@ -54,11 +59,6 @@
 import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayedWithoutFailure;
 import static org.wordpress.android.support.WPSupportUtils.waitForImagesOfTypeWithPlaceholder;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-import tools.fastlane.screengrab.Screengrab;
-import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
-import tools.fastlane.screengrab.locale.LocaleTestRule;
-
 @LargeTest
 @HiltAndroidTest
 public class JPScreenshotTest extends BaseTest {

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
@@ -23,6 +23,11 @@
 import org.wordpress.android.util.UiTestingUtils;
 import org.wordpress.android.util.image.ImageType;
 
+import dagger.hilt.android.testing.HiltAndroidTest;
+import tools.fastlane.screengrab.Screengrab;
+import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
+import tools.fastlane.screengrab.locale.LocaleTestRule;
+
 import static org.wordpress.android.support.WPSupportUtils.clickOn;
 import static org.wordpress.android.support.WPSupportUtils.clickOnViewWithTag;
 import static org.wordpress.android.support.WPSupportUtils.getCurrentActivity;
@@ -38,11 +43,6 @@
 import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayedWithoutFailure;
 import static org.wordpress.android.support.WPSupportUtils.waitForImagesOfTypeWithPlaceholder;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-import tools.fastlane.screengrab.Screengrab;
-import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
-import tools.fastlane.screengrab.locale.LocaleTestRule;
-
 @LargeTest
 @HiltAndroidTest
 public class WPScreenshotTest extends BaseTest {

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/util/AutolinkUtilsTest.java b/WordPress/src/androidTest/java/org/wordpress/android/util/AutolinkUtilsTest.java
@@ -4,11 +4,11 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertEquals;
-
 import dagger.hilt.android.testing.HiltAndroidRule;
 import dagger.hilt.android.testing.HiltAndroidTest;
 
+import static junit.framework.TestCase.assertEquals;
+
 @HiltAndroidTest
 public class AutolinkUtilsTest {
     @Rule

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/util/UrlUtilsTest.java b/WordPress/src/androidTest/java/org/wordpress/android/util/UrlUtilsTest.java
@@ -2,10 +2,10 @@
 
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertEquals;
-
 import dagger.hilt.android.testing.HiltAndroidTest;
 
+import static junit.framework.TestCase.assertEquals;
+
 @HiltAndroidTest
 public class UrlUtilsTest {
     @Test

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/util/WPUrlUtilsTest.java b/WordPress/src/androidTest/java/org/wordpress/android/util/WPUrlUtilsTest.java
@@ -7,11 +7,11 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import dagger.hilt.android.testing.HiltAndroidTest;
+
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 
-import dagger.hilt.android.testing.HiltAndroidTest;
-
 @HiltAndroidTest
 public class WPUrlUtilsTest {
     private static final String WPCOM_ADDRESS_1 = "http://wordpress.com/xmlrpc.php";

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java
@@ -49,6 +49,7 @@
 import dagger.hilt.android.qualifiers.ApplicationContext;
 import dagger.hilt.components.SingletonComponent;
 import kotlinx.coroutines.CoroutineScope;
+
 import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
 
 @InstallIn(SingletonComponent.class)

diff --git a/WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java
@@ -20,10 +20,10 @@
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.push.GCMMessageHandler.PUSH_TYPE_ZENDESK;
-
 import dagger.hilt.android.AndroidEntryPoint;
 
+import static org.wordpress.android.push.GCMMessageHandler.PUSH_TYPE_ZENDESK;
+
 @AndroidEntryPoint
 public class GCMMessageService extends FirebaseMessagingService {
     public static final String EXTRA_VOICE_OR_INLINE_REPLY = "extra_voice_or_inline_reply";

diff --git a/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java b/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java
@@ -55,11 +55,11 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.AndroidEntryPoint;
+
 import static org.wordpress.android.push.NotificationPushIds.GROUP_NOTIFICATION_ID;
 import static org.wordpress.android.push.NotificationPushIds.QUICK_START_REMINDER_NOTIFICATION_ID;
 
-import dagger.hilt.android.AndroidEntryPoint;
-
 /**
  * service which makes it possible to process Notifications quick actions in the background,
  * such as:

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java
@@ -85,13 +85,13 @@
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.util.ActivityUtils.hideKeyboard;
-
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.HasAndroidInjector;
 import dagger.hilt.android.AndroidEntryPoint;
 
+import static org.wordpress.android.util.ActivityUtils.hideKeyboard;
+
 @AndroidEntryPoint
 public class LoginActivity extends LocaleAwareActivity implements ConnectionCallbacks, OnConnectionFailedListener,
         Callback, LoginListener, GoogleListener, LoginPrologueListener,

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java
@@ -43,10 +43,10 @@
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.ui.comments.unified.CommentConstants.COMMENTS_PER_PAGE;
-
 import dagger.hilt.android.AndroidEntryPoint;
 
+import static org.wordpress.android.ui.comments.unified.CommentConstants.COMMENTS_PER_PAGE;
+
 /**
  * @deprecated
  * Comments are being refactored as part of Comments Unification project. If you are adding any

diff --git a/...s/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java b/...s/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java
@@ -27,11 +27,11 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.AndroidEntryPoint;
+
 import static org.wordpress.android.WordPress.getContext;
 import static org.wordpress.android.ui.main.WPMainActivity.ARG_BYPASS_MIGRATION;
 
-import dagger.hilt.android.AndroidEntryPoint;
-
 /**
  * An activity to handle deep linking and intercepting links like:
  * <p>

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -185,18 +185,18 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.AndroidEntryPoint;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function3;
+
 import static androidx.lifecycle.Lifecycle.State.STARTED;
 import static org.wordpress.android.WordPress.SITE;
 import static org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartVariant.NEXT_STEPS;
 import static org.wordpress.android.login.LoginAnalyticsListener.CreatedAccountSource.EMAIL;
 import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
 import static org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS;
 
-import dagger.hilt.android.AndroidEntryPoint;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function3;
-
 /**
  * Main activity which hosts sites, reader, me and notifications pages
  */

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java
@@ -53,10 +53,10 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
-
 import kotlinx.coroutines.CoroutineScope;
 
+import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
+
 /**
  * An adapter for the media gallery grid.
  */

diff --git a/...ess/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/...ess/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
@@ -76,14 +76,14 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.AndroidEntryPoint;
+
 import static org.wordpress.android.models.Note.NOTE_COMMENT_LIKE_TYPE;
 import static org.wordpress.android.models.Note.NOTE_COMMENT_TYPE;
 import static org.wordpress.android.models.Note.NOTE_FOLLOW_TYPE;
 import static org.wordpress.android.models.Note.NOTE_LIKE_TYPE;
 import static org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter.IS_TAPPED_ON_NOTIFICATION;
 
-import dagger.hilt.android.AndroidEntryPoint;
-
 @AndroidEntryPoint
 @SuppressWarnings("deprecation")
 public class NotificationsDetailActivity extends LocaleAwareActivity implements

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
@@ -62,11 +62,11 @@
 
 import javax.inject.Inject;
 
+import kotlin.Unit;
+
 import static com.google.android.material.textfield.TextInputLayout.END_ICON_DROPDOWN_MENU;
 import static com.google.android.material.textfield.TextInputLayout.END_ICON_NONE;
 
-import kotlin.Unit;
-
 public class PeopleInviteFragment extends Fragment implements RoleSelectDialogFragment.OnRoleSelectListener,
         PeopleManagementActivity.InvitationSender {
     private static final String URL_USER_ROLES_DOCUMENTATION = "https://en.support.wordpress.com/user-roles/";

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -113,10 +113,10 @@
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.ui.prefs.WPComSiteSettings.supportsJetpackSiteAcceleratorSettings;
-
 import kotlin.Triple;
 
+import static org.wordpress.android.ui.prefs.WPComSiteSettings.supportsJetpackSiteAcceleratorSettings;
+
 /**
  * Allows interfacing with WordPress site settings. Works with WP.com and WP.org v4.5+ (pending).
  * <p>

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeDetailFragment.java
@@ -26,10 +26,10 @@
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.ui.publicize.PublicizeTwitterDeprecationNoticeConstantsKt.TWITTER_DEPRECATION_FIND_OUT_MORE_URL;
-
 import kotlin.Unit;
 
+import static org.wordpress.android.ui.publicize.PublicizeTwitterDeprecationNoticeConstantsKt.TWITTER_DEPRECATION_FIND_OUT_MORE_URL;
+
 public class PublicizeDetailFragment extends PublicizeBaseFragment
         implements PublicizeConnectionAdapter.OnAdapterLoadedListener {
     private SiteModel mSite;

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListFragment.java
@@ -56,11 +56,11 @@
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.ENABLE_POST_SHARING;
-
 import dagger.hilt.android.AndroidEntryPoint;
 import kotlin.Unit;
 
+import static org.wordpress.android.fluxc.store.QuickStartStore.QuickStartNewSiteTask.ENABLE_POST_SHARING;
+
 @AndroidEntryPoint
 public class PublicizeListFragment extends PublicizeBaseFragment {
     public interface PublicizeButtonPrefsListener {

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartReminderReceiver.java b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartReminderReceiver.java
@@ -26,10 +26,10 @@
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
-
 import dagger.hilt.android.AndroidEntryPoint;
 
+import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
+
 @AndroidEntryPoint
 public class QuickStartReminderReceiver extends BroadcastReceiver {
     public static final String ARG_QUICK_START_TASK_BATCH = "ARG_QUICK_START_TASK_BATCH";

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java
@@ -96,15 +96,15 @@
 
 import javax.inject.Inject;
 
+import dagger.hilt.android.AndroidEntryPoint;
+import kotlin.Unit;
+
 import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_REPLY;
 import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_SELECTION_END;
 import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_SELECTION_START;
 import static org.wordpress.android.ui.reader.FollowConversationUiStateKt.FOLLOW_CONVERSATION_UI_STATE_FLAGS_KEY;
 import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper;
 
-import dagger.hilt.android.AndroidEntryPoint;
-import kotlin.Unit;
-
 @AndroidEntryPoint
 public class ReaderCommentListActivity extends LocaleAwareActivity implements OnConfirmListener,
         OnCollapseListener {