Merge branch 'master' of https://github.com/mykola-mokhnach/java-client into lock

# Conflicts:
#	src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
#	src/main/java/io/appium/java_client/android/LocksAndroidDevice.java

Author: Mykola Mokhnach

README.md

@@ -1,7 +1,7 @@
 # java-client
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.appium/java-client/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.appium/java-client)
-[![Javadoc](https://javadoc-emblem.rhcloud.com/doc/io.appium/java-client/badge.svg)](http://www.javadoc.io/doc/io.appium/java-client)
+[![Javadoc](https://www.javadoc.io/badge/io.appium/java-client.svg)](http://www.javadoc.io/doc/io.appium/java-client)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f365c5e9458b42bf8a5b1d928d7e4f48)](https://www.codacy.com/app/appium/java-client)
 [![Build Status](https://travis-ci.org/appium/java-client.svg?branch=master)](https://travis-ci.org/appium/java-client)
 
@@ -24,6 +24,7 @@ This is the Java language binding for writing Appium Tests, conforms to [Mobile
 - **[DEPENDENCY UPDATES]**
   - `org.seleniumhq.selenium:selenium-java` was updated to 3.8.1
 - **[BREAKING CHANGE]** Removal of deprecated listener-methods from the AlertEventListener. [#797](https://github.com/appium/java-client/pull/797)
+- **[BUG FIX]**. Fix the `pushFile` command. [#812](https://github.com/appium/java-client/pull/812) [#816](https://github.com/appium/java-client/pull/816)
 
 *6.0.0-BETA2*
 - **[ENHANCEMENT]** The `fingerPrint` ability was added. It is supported by Android for now. [#473](https://github.com/appium/java-client/pull/473) [#786](https://github.com/appium/java-client/pull/786)

build.gradle

@@ -12,21 +12,17 @@ version '6.0.0-BETA2'
 
 repositories {
     jcenter()
-    maven {
-        url 'http://repo.maven.apache.org/maven2'
-    }
+    mavenCentral()
 }
 
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'http://repo.maven.apache.org/maven2'
-        }
+        mavenCentral()
     }
     dependencies {
         classpath 'org.owasp:dependency-check-gradle:1.4.0'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
     }
 }
 
@@ -60,9 +56,7 @@ dependencies {
     compile ("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") {
         force = true
 
-        exclude module: 'cglib'
         exclude group: 'com.google.code.gson'
-        exclude module: 'phantomjsdriver'
         exclude module: 'htmlunit-driver'
         exclude group: 'net.sourceforge.htmlunit'
 
@@ -93,22 +87,6 @@ ext {
     Docs = file("$buildDir/doc")
 }
 
-sourceSets {
-    main {
-        java {
-            srcDir('src/main/java')
-        }
-        resources {
-            srcDir('src/main/resources')
-        }
-    }
-    test {
-        java {
-            srcDir('src/test/java')
-        }
-    }
-}
-
 dependencyCheck {
     failBuildOnCVSS=22
 }
@@ -128,19 +106,12 @@ tasks.withType(JacocoReport) {
 jacocoTestReport.dependsOn test
 
 checkstyle {
-    toolVersion = '7.0'
+    toolVersion = '8.7'
+    configFile = file("$projectDir/google-style.xml")
     showViolations = true
-}
-
-dependencies {
-    checkstyle( 'com.puppycrawl.tools:checkstyle:7.0' )
-}
-
-tasks.withType(Checkstyle) {
     ignoreFailures = false
-    configFile = file("$projectDir/google-style.xml")
-    exclude '**/org/openqa/selenium/**'
 }
+checkstyleMain.excludes = ['**/org/openqa/selenium/**']
 
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
@@ -221,10 +192,7 @@ uploadArchives {
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.3.1'
-    description 'Generates the Gradle wrapper scripts.'
-}
+wrapper.gradleVersion = '4.4.1'
 
 test {
     useJUnit()

docs/How-to-propose-a-PR.md

@@ -21,4 +21,4 @@ with pasted java code samples or put them at a PR description using markdown. Ab
 
 # Pull-request template
 
-There is [PULL_REQUEST_TEMPLATE.md)](https://github.com/appium/java-client/blob/master/PULL_REQUEST_TEMPLATE.md) which should help you to make a good pull request.
+There is [PULL_REQUEST_TEMPLATE.md](https://github.com/appium/java-client/blob/master/PULL_REQUEST_TEMPLATE.md) which should help you to make a good pull request.

google-style.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
 
 <!-- Originally designed by:-->
 <!--
@@ -46,19 +46,16 @@
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="AvoidStarImport">
-			<property name="severity" value="warning"/>
-		</module>
+            <property name="severity" value="warning"/>
+        </module>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">
             <property name="option" value="TEXT"/>
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
-        <module name="RightCurly"/>
+        <module name="LeftCurly" />
         <module name="RightCurly">
             <property name="option" value="alone"/>
             <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
@@ -97,7 +94,7 @@
              value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypeName">
-			<property name="format" value="^([*iOSFindBy*]||[*iOSXCUITFind*])||([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>
@@ -166,7 +163,7 @@
             <property name="specialImportsRegExp" value="com.google"/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
-			<property name="severity" value="warning"/>
+            <property name="severity" value="warning"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
@@ -182,19 +179,19 @@
         </module>
         <module name="NonEmptyAtclauseDescription"/>
         <module name="JavadocTagContinuationIndentation">
-			<property name="severity" value="warning"/>
-		</module>
+            <property name="severity" value="warning"/>
+        </module>
         <module name="SummaryJavadoc">
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-			<property name="severity" value="warning"/>
+            <property name="severity" value="warning"/>
         </module>
         <module name="JavadocParagraph">
-			<property name="severity" value="warning"/>
-		</module>
+            <property name="severity" value="warning"/>
+        </module>
         <module name="AtclauseOrder">
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-			<property name="severity" value="warning"/>
+            <property name="severity" value="warning"/>
         </module>
         <module name="JavadocMethod">
             <property name="scope" value="public"/>
@@ -215,8 +212,8 @@
         </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>
-			
+
         </module>
         <module name="CommentsIndentation"/>
     </module>
-</module>
+</module>

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -53,14 +53,14 @@
 import java.util.Set;
 
 /**
-* @param <T> the required type of class which implement {@link org.openqa.selenium.WebElement}.
+ * Default Appium driver implementation.
+ *
+ * @param <T> the required type of class which implement {@link WebElement}.
  *          Instances of the defined type will be returned via findElement* and findElements*
  *          Warning (!!!). Allowed types:
- *          {@link org.openqa.selenium.WebElement}
- *          {@link org.openqa.selenium.remote.RemoteWebElement}
- *          {@link io.appium.java_client.MobileElement} and its subclasses that designed
- *          specifically
- *          for each target mobile OS (still Android and iOS)
+ *          {@link WebElement}, {@link org.openqa.selenium.remote.RemoteWebElement},
+ *          {@link MobileElement} and its subclasses that designed
+ *          specifically for each target mobile OS (still Android and iOS)
 */
 @SuppressWarnings("unchecked")
 public class AppiumDriver<T extends WebElement>
@@ -73,11 +73,12 @@ public class AppiumDriver<T extends WebElement>
     private ExecuteMethod executeMethod;
 
     /**
-     * @param executor is an instance of {@link org.openqa.selenium.remote.HttpCommandExecutor}
+     * Creates a new instance based on command {@code executor} and {@code capabilities}.
+     *
+     * @param executor is an instance of {@link HttpCommandExecutor}
      *                 or class that extends it. Default commands or another vendor-specific
      *                 commands may be specified there.
-     * @param capabilities take a look
-     *                     at {@link org.openqa.selenium.Capabilities}
+     * @param capabilities take a look at {@link Capabilities}
      */
     public AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, capabilities);
@@ -129,6 +130,8 @@ public AppiumDriver(Capabilities desiredCapabilities) {
     }
 
     /**
+     * Changes platform name and returns new capabilities.
+     *
      * @param originalCapabilities the given {@link Capabilities}.
      * @param newPlatform a {@link MobileCapabilityType#PLATFORM_NAME} value which has
      *                    to be set up

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

@@ -41,7 +41,7 @@ public Object execute(String commandName, Map<String, ?> parameters) {
         Response response;
 
         if (parameters == null || parameters.isEmpty()) {
-            response = driver.execute(commandName, ImmutableMap.<String, Object>of());
+            response = driver.execute(commandName, ImmutableMap.of());
         } else {
             response = driver.execute(commandName, parameters);
         }

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

@@ -94,13 +94,17 @@ public Duration getInterval() {
     }
 
     /**
+     * The input value to pass to the evaluated conditions.
+     *
      * @param input The input value to pass to the evaluated conditions.
      */
     public AppiumFluentWait(T input) {
         super(input);
     }
 
     /**
+     * Creates wait object based on {@code input} value, {@code clock} and {@code sleeper}.
+     *
      * @param input   The input value to pass to the evaluated conditions.
      * @param clock   The clock to use when measuring the timeout.
      * @param sleeper Used to put the thread to sleep between evaluation loops.
@@ -211,10 +215,9 @@ public AppiumFluentWait<T> withPollingStrategy(Function<IterationInfo, Duration>
      * <ol>
      * <li>the function returns neither null nor false,</li>
      * <li>the function throws an unignored exception,</li>
-     * <li>the timeout expires,
-     * <li>
+     * <li>the timeout expires,</li>
      * <li>the current thread is interrupted</li>
-     * </ol>
+     * </ol>.
      *
      * @param isTrue the parameter to pass to the expected condition
      * @param <V>    The function's expected return type.

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

@@ -22,16 +22,16 @@
 
 public final class CommandExecutionHelper {
 
-    public static <T extends Object> T execute(ExecutesMethod executesMethod,
+    public static <T> T execute(ExecutesMethod executesMethod,
         Map.Entry<String, Map<String, ?>> keyValuePair) {
         return handleResponse(executesMethod.execute(keyValuePair.getKey(), keyValuePair.getValue()));
     }
 
-    public static <T extends Object> T execute(ExecutesMethod executesMethod, String command) {
+    public static <T> T execute(ExecutesMethod executesMethod, String command) {
         return handleResponse(executesMethod.execute(command));
     }
 
-    private static <T extends Object> T handleResponse(Response response) {
+    private static <T> T handleResponse(Response response) {
         if (response != null) {
             return (T) response.getValue();
         }