Code style issues which were found by reviewer were fixed

Author: TikhomirovSergey

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

@@ -26,6 +26,7 @@
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
+import javax.annotation.Nullable;
 
 public class AppiumElementLocatorFactory implements CacheableElementLocatorFactory {
     private final SearchContext searchContext;
@@ -47,11 +48,11 @@ public AppiumElementLocatorFactory(SearchContext searchContext, TimeOutDuration
         this.builder = builder;
     }
 
-    public CacheableLocator createLocator(Field field) {
+    public @Nullable CacheableLocator createLocator(Field field) {
         return this.createLocator((AnnotatedElement) field);
     }
 
-    @Override public CacheableLocator createLocator(AnnotatedElement annotatedElement) {
+    @Override public @Nullable CacheableLocator createLocator(AnnotatedElement annotatedElement) {
         TimeOutDuration customDuration;
         if (annotatedElement.isAnnotationPresent(WithTimeout.class)) {
             WithTimeout withTimeout = annotatedElement.getAnnotation(WithTimeout.class);

src/test/java/io/appium/java_client/ChromeDriverPathUtil.java

@@ -23,8 +23,8 @@ public static File getChromeDriver() {
             return ROOT_TEST_PATH.resolve("chromedriver.exe").toFile();
         } else if (current.is(MAC)) {
             return ROOT_TEST_PATH.resolve("chromedriver_mac").toFile();
-        } else {
-            return ROOT_TEST_PATH.resolve("chromedriver_linux").toFile();
         }
+
+        return ROOT_TEST_PATH.resolve("chromedriver_linux").toFile();
     }
 }

src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java

@@ -48,7 +48,7 @@
 
 public class TimeoutTest {
 
-    private static final long ACCEPTABLE_TIME_DIFF = 1500;
+    private static final long ACCEPTABLE_TIME_DIFF_MS = 1500;
     private static final String MESSAGE = "Check difference from the expected waiting duration %s %s";
 
     private WebDriver driver;
@@ -65,15 +65,15 @@ public class TimeoutTest {
 
     private TimeOutDuration timeOutDuration;
 
-    private static long getBenchmark(Runnable runnable) {
+    private static long getExpectedMillis(long value, TimeUnit sourceTimeUnit) {
+        return MILLISECONDS.convert(value, sourceTimeUnit);
+    }
+
+    private static long getPerformanceDiff(long expectedMs, Runnable runnable) {
         long startMark = currentTimeMillis();
         runnable.run();
         long endMark = currentTimeMillis();
-        return endMark - startMark;
-    }
-
-    private static long getExpectedMillis(long value, TimeUnit sourceTimeUnit) {
-        return MILLISECONDS.convert(value, sourceTimeUnit);
+        return abs(expectedMs  - (endMark - startMark));
     }
 
     /**
@@ -96,37 +96,37 @@ private static long getExpectedMillis(long value, TimeUnit sourceTimeUnit) {
 
     @Test public void defaultTimeOutTest() {
         assertThat(format(MESSAGE, DEFAULT_TIMEOUT, DEFAULT_TIMEUNIT),
-                abs(getExpectedMillis(DEFAULT_TIMEOUT, DEFAULT_TIMEUNIT) - getBenchmark(() -> stubElements.size())),
-                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF));
+                getPerformanceDiff(getExpectedMillis(DEFAULT_TIMEOUT, DEFAULT_TIMEUNIT), () -> stubElements.size()),
+                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF_MS));
 
         timeOutDuration.setTime(15500000, MICROSECONDS);
         assertThat(format(MESSAGE, 15500000, MICROSECONDS),
-                abs(getExpectedMillis(15500000, MICROSECONDS) - getBenchmark(() -> stubElements.size())),
-                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF));
+                getPerformanceDiff(getExpectedMillis(15500000, MICROSECONDS), () -> stubElements.size()),
+                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF_MS));
 
         timeOutDuration.setTime(3, SECONDS);
         assertThat(format(MESSAGE, 3, SECONDS),
-                abs(getExpectedMillis(3, SECONDS) - getBenchmark(() -> stubElements.size())),
-                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF));
+                getPerformanceDiff(getExpectedMillis(3, SECONDS), () -> stubElements.size()),
+                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF_MS));
     }
 
     @Test public void withCustomizedTimeOutTest() {
         assertThat(format(MESSAGE, DEFAULT_TIMEOUT, DEFAULT_TIMEUNIT),
-                abs(getExpectedMillis(DEFAULT_TIMEOUT, DEFAULT_TIMEUNIT) - getBenchmark(() -> stubElements.size())),
-                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF));
+                getPerformanceDiff(getExpectedMillis(DEFAULT_TIMEOUT, DEFAULT_TIMEUNIT), () -> stubElements.size()),
+                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF_MS));
 
         assertThat(format(MESSAGE, 5, SECONDS),
-                abs(getExpectedMillis(5, SECONDS) - getBenchmark(() -> stubElements2.size())),
-                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF));
+                getPerformanceDiff(getExpectedMillis(5, SECONDS), () -> stubElements2.size()),
+                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF_MS));
 
         timeOutDuration.setTime(15500000, MICROSECONDS);
 
         assertThat(format(MESSAGE, 15500000, MICROSECONDS),
-                abs(getExpectedMillis(15500000, MICROSECONDS) - getBenchmark(() -> stubElements.size())),
-                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF));
+                getPerformanceDiff(getExpectedMillis(15500000, MICROSECONDS), () -> stubElements.size()),
+                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF_MS));
 
         assertThat(format(MESSAGE, 5, SECONDS),
-                abs(getExpectedMillis(5, SECONDS) - getBenchmark(() -> stubElements2.size())),
-                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF));
+                getPerformanceDiff(getExpectedMillis(5, SECONDS), () -> stubElements2.size()),
+                lessThanOrEqualTo(ACCEPTABLE_TIME_DIFF_MS));
     }
 }