#565: Code style issues were fixed.

Author: TikhomirovSergey

google-style.xml

@@ -97,7 +97,7 @@
              value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypeName">
-			<property name="format" value="^([iOSFindBys]||[iOSFindBy]||[iOSFindAll])||([A-Z][a-zA-Z0-9])*$"/>
+			<property name="format" value="^([*iOSFindBy*]||[*iOSXCUITFind*])||([A-Z][a-zA-Z0-9])*$"/>
             <message key="name.invalidPattern"
              value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>

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

@@ -16,6 +16,8 @@
 
 package io.appium.java_client;
 
+import static nu.pattern.OpenCV.loadShared;
+
 import org.opencv.core.Core;
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;
@@ -32,8 +34,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import static nu.pattern.OpenCV.loadShared;
-
 public class ScreenshotState {
     private static final Duration DEFAULT_INTERVAL_MS = Duration.ofMillis(500);
 

src/main/java/io/appium/java_client/pagefactory/AndroidBy.java

@@ -17,7 +17,7 @@
 package io.appium.java_client.pagefactory;
 
 /**
- * Used to build a complex android automator locator
+ * Used to build a complex android automator locator.
  */
 public @interface AndroidBy {
     /**

src/main/java/io/appium/java_client/pagefactory/AndroidFindAll.java

@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Used to mark a field on a Page/Screen Object to indicate that lookup should use a
  * series of {@link io.appium.java_client.pagefactory.AndroidBy} tags

src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java

@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 
 /**
  * Used to mark a field on a Page Object to indicate an alternative mechanism for locating the

src/main/java/io/appium/java_client/pagefactory/AndroidFindByAllSet.java

@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link AndroidFindAll}

src/main/java/io/appium/java_client/pagefactory/AndroidFindByChainSet.java

@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link io.appium.java_client.pagefactory.AndroidFindBys}

src/main/java/io/appium/java_client/pagefactory/AndroidFindBySet.java

@@ -16,13 +16,13 @@
 
 package io.appium.java_client.pagefactory;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link io.appium.java_client.pagefactory.AndroidFindBy}

src/main/java/io/appium/java_client/pagefactory/AndroidFindBys.java

@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Used to mark a field on a Page Object to indicate that lookup should use
  * a series of {@link io.appium.java_client.pagefactory.AndroidBy} tags.

src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java

@@ -16,6 +16,11 @@
 
 package io.appium.java_client.pagefactory;
 
+import static java.util.Arrays.asList;
+import static java.util.Arrays.sort;
+import static java.util.Optional.ofNullable;
+import static org.apache.commons.lang3.ArrayUtils.add;
+
 import io.appium.java_client.pagefactory.bys.ContentMappedBy;
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.bys.builder.AppiumByBuilder;
@@ -34,12 +39,11 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.*;
-
-import static java.util.Arrays.asList;
-import static java.util.Arrays.sort;
-import static java.util.Optional.ofNullable;
-import static org.apache.commons.lang3.ArrayUtils.add;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class DefaultElementByBuilder extends AppiumByBuilder {
 
@@ -133,9 +137,9 @@ private By[] getBys(Class<? extends Annotation> singleLocator, Class<? extends A
             try {
                 value = annotationClass.getMethod(VALUE, ANNOTATION_ARGUMENTS);
                 set = (Annotation[]) value.invoke(a, ANNOTATION_PARAMETERS);
-            } catch (NoSuchMethodException| IllegalAccessException| InvocationTargetException e) {
-                throw new ClassCastException(String.format("The annotation '%s' has no convenient '%s' method which " +
-                                "returns array of annotations", annotationClass.getName(), VALUE));
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                throw new ClassCastException(String.format("The annotation '%s' has no convenient '%s' method which "
+                        + "returns array of annotations", annotationClass.getName(), VALUE));
             }
 
             sort(set, comparator);
@@ -256,14 +260,12 @@ public int compare(Annotation o1, Annotation o2) {
 
                 if (p2 > p1) {
                     return -1;
-                }
-                else if (p2 < p1){
+                } else if (p2 < p1) {
                     return 1;
-                }
-                else {
+                } else {
                     return 0;
                 }
-            } catch (IllegalAccessException|InvocationTargetException e) {
+            } catch (IllegalAccessException | InvocationTargetException e) {
                 throw new RuntimeException(e);
             }
         }