chore: Force unified imports order (#1793)

Author: valfirst

google-style.xml renamed to appium-style.xml

@@ -2,20 +2,10 @@
 <!DOCTYPE module PUBLIC
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
-
-<!-- Originally designed by:-->
 <!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
-    To completely disable a check, just comment it out or delete it from the file.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+    Checkstyle configuration that checks the Appium coding conventions (partially based on Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html).
  -->
-<!-- Modified by: Sergey Tikhomirov-->
 
 <module name = "Checker">
     <property name="charset" value="UTF-8"/>
@@ -41,9 +31,16 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="AvoidStarImport">
-            <property name="severity" value="warning"/>
-        </module>
+        <module name="AvoidStarImport"/>
+        <module name="CustomImportOrder">
+          <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+          <property name="specialImportsRegExp" value="^javax\."/>
+          <property name="standardPackageRegExp" value="^java\."/>
+          <property name="sortImportsInGroupAlphabetically" value="true"/>
+          <property name="separateLineBetweenGroups" value="false"/>
+       </module>
+       <module name="RedundantImport"/>
+       <module name="UnusedImports"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">

build.gradle

@@ -96,7 +96,7 @@ jacocoTestReport.dependsOn test
 
 checkstyle {
     toolVersion = '8.32'
-    configFile = file("$projectDir/google-style.xml")
+    configFile = file("$projectDir/appium-style.xml")
     showViolations = true
     ignoreFailures = false
 }

src/main/java/io/appium/java_client/AppiumDriver.java

@@ -16,11 +16,6 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.internal.CapabilityHelpers.APPIUM_PREFIX;
-import static io.appium.java_client.remote.MobileCapabilityType.AUTOMATION_NAME;
-import static io.appium.java_client.remote.MobileCapabilityType.PLATFORM_NAME;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-
 import io.appium.java_client.internal.CapabilityHelpers;
 import io.appium.java_client.remote.AppiumCommandExecutor;
 import io.appium.java_client.remote.AppiumNewSessionCommandPayload;
@@ -51,6 +46,11 @@
 import java.util.Collections;
 import java.util.Map;
 
+import static io.appium.java_client.internal.CapabilityHelpers.APPIUM_PREFIX;
+import static io.appium.java_client.remote.MobileCapabilityType.AUTOMATION_NAME;
+import static io.appium.java_client.remote.MobileCapabilityType.PLATFORM_NAME;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
 /**
  * Default Appium driver implementation.
  */

src/main/java/io/appium/java_client/AppiumExecutionMethod.java

@@ -17,7 +17,6 @@
 package io.appium.java_client;
 
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.remote.ExecuteMethod;
 import org.openqa.selenium.remote.Response;
 

src/main/java/io/appium/java_client/AppiumFluentWait.java

@@ -17,7 +17,6 @@
 package io.appium.java_client;
 
 import com.google.common.base.Throwables;
-
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.openqa.selenium.TimeoutException;

src/main/java/io/appium/java_client/ComparesImages.java

@@ -16,8 +16,6 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.compareImagesCommand;
-
 import io.appium.java_client.imagecomparison.ComparisonMode;
 import io.appium.java_client.imagecomparison.FeaturesMatchingOptions;
 import io.appium.java_client.imagecomparison.FeaturesMatchingResult;
@@ -27,11 +25,13 @@
 import io.appium.java_client.imagecomparison.SimilarityMatchingResult;
 import org.apache.commons.io.FileUtils;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Map;
-import javax.annotation.Nullable;
+
+import static io.appium.java_client.MobileCommand.compareImagesCommand;
 
 public interface ComparesImages extends ExecutesMethod {
 

src/main/java/io/appium/java_client/ErrorCodesMobile.java

@@ -18,7 +18,6 @@
 package io.appium.java_client;
 
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.ErrorCodes;
 

src/main/java/io/appium/java_client/HasAppStrings.java

@@ -16,12 +16,12 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.GET_STRINGS;
-import static io.appium.java_client.MobileCommand.prepareArguments;
-
 import java.util.AbstractMap;
 import java.util.Map;
 
+import static io.appium.java_client.MobileCommand.GET_STRINGS;
+import static io.appium.java_client.MobileCommand.prepareArguments;
+
 public interface HasAppStrings extends ExecutesMethod {
     /**
      * Get all defined Strings from an app for the default language.

src/main/java/io/appium/java_client/HasDeviceTime.java

@@ -16,16 +16,15 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.GET_DEVICE_TIME;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.Response;
 
 import java.util.Map;
 
+import static io.appium.java_client.MobileCommand.GET_DEVICE_TIME;
+
 public interface HasDeviceTime extends ExecutesMethod {
 
     /**

src/main/java/io/appium/java_client/HasSettings.java

@@ -16,16 +16,16 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.getSettingsCommand;
-import static io.appium.java_client.MobileCommand.setSettingsCommand;
-
 import org.openqa.selenium.remote.Response;
 
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
+import static io.appium.java_client.MobileCommand.getSettingsCommand;
+import static io.appium.java_client.MobileCommand.setSettingsCommand;
+
 public interface HasSettings extends ExecutesMethod {
 
     /**