Address review comments

Author: Mykola Mokhnach

…pium/java_client/ios/LocksIOSDevice.java …a/io/appium/java_client/LocksDevice.javasrc/main/java/io/appium/java_client/ios/LocksIOSDevice.java renamed to src/main/java/io/appium/java_client/LocksDevice.java src/main/java/io/appium/java_client/ios/LocksIOSDevice.java renamed to src/main/java/io/appium/java_client/LocksDevice.java

@@ -14,23 +14,38 @@
  * limitations under the License.
  */
 
-package io.appium.java_client.ios;
+package io.appium.java_client;
+
+import java.time.Duration;
 
 import static io.appium.java_client.MobileCommand.getIsDeviceLockedCommand;
 import static io.appium.java_client.MobileCommand.lockDeviceCommand;
 import static io.appium.java_client.MobileCommand.unlockDeviceCommand;
 
-import io.appium.java_client.CommandExecutionHelper;
-import io.appium.java_client.ExecutesMethod;
-
-import java.time.Duration;
+public interface LocksDevice extends ExecutesMethod {
+    /**
+     * Check if the device is locked.
+     *
+     * @deprecated Use {@link #isDeviceLocked()} instead
+     * @return true if device is locked. False otherwise
+     */
+    @Deprecated
+    default boolean isLocked() {
+        return CommandExecutionHelper.execute(this, getIsDeviceLockedCommand());
+    }
 
-public interface LocksIOSDevice extends ExecutesMethod {
+    /**
+     * This method locks a device. It will return silently if the device
+     * is already locked.
+     */
+    default void lockDevice() {
+        lockDevice(Duration.ofSeconds(0));
+    }
 
     /**
      * Lock the device (bring it to the lock screen) for a given number of
      * seconds or forever (until the command for unlocking is called). The call
-     * is ignored if the device already locked.
+     * is ignored if the device has been already locked.
      *
      * @param duration for how long to lock the screen. Minimum time resolution is one second.
      *                 A negative/zero value will lock the device and return immediately.
@@ -40,19 +55,19 @@ default void lockDevice(Duration duration) {
     }
 
     /**
-     * Unlocks the device if it is locked or returns immediately if the device is already unlocked.
+     * Unlock the device if it is locked. This method will return silently if the device
+     * is not locked.
      */
     default void unlockDevice() {
         CommandExecutionHelper.execute(this, unlockDeviceCommand());
     }
 
     /**
-     * Get the current state of the device.
+     * Check if the device is locked.
      *
      * @return true if the device is locked or false otherwise.
      */
     default boolean isDeviceLocked() {
         return CommandExecutionHelper.execute(this, getIsDeviceLockedCommand());
     }
-
 }

src/main/java/io/appium/java_client/android/AndroidDriver.java

@@ -23,6 +23,7 @@
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.FindsByAndroidUIAutomator;
+import io.appium.java_client.LocksDevice;
 import io.appium.java_client.PressesKeyCode;
 import io.appium.java_client.remote.MobilePlatform;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
@@ -46,7 +47,7 @@
 public class AndroidDriver<T extends WebElement>
     extends AppiumDriver<T>
     implements PressesKeyCode, HasNetworkConnection, PushesFiles, StartsActivity,
-        FindsByAndroidUIAutomator<T>, LocksAndroidDevice, HasAndroidSettings, HasDeviceDetails,
+        FindsByAndroidUIAutomator<T>, LocksDevice, HasAndroidSettings, HasDeviceDetails,
             HasSupportedPerformanceDataType, AuthenticatesByFinger {
 
     private static final String ANDROID_PLATFORM = MobilePlatform.ANDROID;

src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java

@@ -172,18 +172,6 @@ public class AndroidMobileCommandHelper extends MobileCommand {
             IS_KEYBOARD_SHOWN, ImmutableMap.<String, Object>of());
     }
 
-    /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * checking of the device state (is it locked or not).
-     *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
-     */
-    public static Map.Entry<String, Map<String, ?>> isLockedCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                IS_LOCKED, ImmutableMap.<String, Object>of());
-    }
-
     /**
      * This method forms a {@link java.util.Map} of parameters for the
      * finger print authentication invocation.
@@ -284,18 +272,6 @@ public class AndroidMobileCommandHelper extends MobileCommand {
         return new AbstractMap.SimpleEntry<>(TOGGLE_LOCATION_SERVICES, ImmutableMap.<String, Object>of());
     }
 
-    /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * device unlocking.
-     *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
-     */
-    public static Map.Entry<String, Map<String, ?>> unlockCommand() {
-        return new AbstractMap.SimpleEntry<>(UNLOCK, ImmutableMap.<String, Object>of());
-    }
-
-
     /**
      * This method forms a {@link java.util.Map} of parameters for the element
      * value replacement. It is used against input elements

src/main/java/io/appium/java_client/android/LocksAndroidDevice.java

@@ -24,6 +24,7 @@
 import io.appium.java_client.FindsByIosNSPredicate;
 import io.appium.java_client.FindsByIosUIAutomation;
 import io.appium.java_client.HidesKeyboardWithKeyName;
+import io.appium.java_client.LocksDevice;
 import io.appium.java_client.remote.MobilePlatform;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
@@ -51,7 +52,7 @@
 public class IOSDriver<T extends WebElement>
     extends AppiumDriver<T>
     implements HidesKeyboardWithKeyName, ShakesDevice, HasIOSSettings,
-        FindsByIosUIAutomation<T>, LocksIOSDevice, PerformsTouchID, FindsByIosNSPredicate<T>,
+        FindsByIosUIAutomation<T>, LocksDevice, PerformsTouchID, FindsByIosNSPredicate<T>,
         FindsByIosClassChain<T>, PushesFiles {
 
     private static final String IOS_PLATFORM = MobilePlatform.IOS;