Clean up (#1028)

* Remove redundant 'throws' clauses

* Simplify assertions in unit tests

* Replace 'Collection.addAll()' with parametrized constructor call

* Remove redundant array creation for calling varargs method

* Remove redundant type arguments

* Use `isEmpty` to check for empty string

Author: valfirst

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

@@ -445,7 +445,7 @@ public static ImmutableMap<String, Object> prepareArguments(String[] params,
      * {@link java.util.Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> unlockDeviceCommand() {
-        return new AbstractMap.SimpleEntry<>(UNLOCK, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(UNLOCK, ImmutableMap.of());
     }
 
     /**
@@ -456,11 +456,11 @@ public static ImmutableMap<String, Object> prepareArguments(String[] params,
      * {@link java.util.Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> getIsDeviceLockedCommand() {
-        return new AbstractMap.SimpleEntry<>(IS_LOCKED, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(IS_LOCKED, ImmutableMap.of());
     }
 
     public static Map.Entry<String, Map<String, ?>> getSettingsCommand() {
-        return new AbstractMap.SimpleEntry<>(GET_SETTINGS, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(GET_SETTINGS, ImmutableMap.of());
     }
 
     public static Map.Entry<String, Map<String, ?>> setSettingsCommand(Setting setting, Object value) {
@@ -522,7 +522,6 @@ public static ImmutableMap<String, Object> prepareArguments(String[] params,
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> isKeyboardShownCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                IS_KEYBOARD_SHOWN, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(IS_KEYBOARD_SHOWN, ImmutableMap.of());
     }
 }

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

@@ -40,8 +40,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> currentActivityCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                CURRENT_ACTIVITY, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(CURRENT_ACTIVITY, ImmutableMap.of());
     }
 
     /**
@@ -50,8 +49,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> currentPackageCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                GET_CURRENT_PACKAGE, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(GET_CURRENT_PACKAGE, ImmutableMap.of());
     }
 
     /**
@@ -77,8 +75,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      *
      */
     public static Map.Entry<String, Map<String, ?>> getSupportedPerformanceDataTypesCommand() {
-        return new AbstractMap.SimpleEntry<>(
-            GET_SUPPORTED_PERFORMANCE_DATA_TYPES, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(GET_SUPPORTED_PERFORMANCE_DATA_TYPES, ImmutableMap.of());
     }
 
     /**
@@ -108,10 +105,9 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      *                        [1478095200, null, null, 10079213, 19962, 2487705, 20015, 0, 3600],
      *                        [1478098800, null, null, 4444433, 10227, 1430356, 10493, 0, 3600]]
      *          in case of cpu info : [[user, kernel], [0.9, 1.3]]
-     * @throws Exception if the performance data type is not supported, thows Error
      */
     public static Map.Entry<String, Map<String, ?>> getPerformanceDataCommand(
-                    String packageName, String dataType, int dataReadTimeout) throws Exception {
+                    String packageName, String dataType, int dataReadTimeout) {
         String[] parameters = new String[] {"packageName", "dataType", "dataReadTimeout"};
         Object[] values = new Object[] {packageName, dataType, dataReadTimeout};
         return new AbstractMap.SimpleEntry<>(
@@ -126,8 +122,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> getDisplayDensityCommand() {
-        return new AbstractMap.SimpleEntry<>(
-            GET_DISPLAY_DENSITY, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(GET_DISPLAY_DENSITY, ImmutableMap.of());
     }
 
     /**
@@ -137,8 +132,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> getNetworkConnectionCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                GET_NETWORK_CONNECTION, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(GET_NETWORK_CONNECTION, ImmutableMap.of());
     }
 
     /**
@@ -148,8 +142,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> getSystemBarsCommand() {
-        return new AbstractMap.SimpleEntry<>(
-            GET_SYSTEM_BARS, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(GET_SYSTEM_BARS, ImmutableMap.of());
     }
 
     /**
@@ -159,8 +152,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> isLockedCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                IS_LOCKED, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(IS_LOCKED, ImmutableMap.of());
     }
 
     /**
@@ -180,8 +172,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> openNotificationsCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                OPEN_NOTIFICATIONS, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(OPEN_NOTIFICATIONS, ImmutableMap.of());
     }
 
     /**
@@ -250,7 +241,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> toggleLocationServicesCommand() {
-        return new AbstractMap.SimpleEntry<>(TOGGLE_LOCATION_SERVICES, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(TOGGLE_LOCATION_SERVICES, ImmutableMap.of());
     }
 
     /**
@@ -259,7 +250,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> unlockCommand() {
-        return new AbstractMap.SimpleEntry<>(UNLOCK, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(UNLOCK, ImmutableMap.of());
     }
 
 
@@ -392,7 +383,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> toggleWifiCommand() {
-        return new AbstractMap.SimpleEntry<>(TOGGLE_WIFI, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(TOGGLE_WIFI, ImmutableMap.of());
     }
 
     /**
@@ -401,7 +392,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> toggleAirplaneCommand() {
-        return new AbstractMap.SimpleEntry<>(TOGGLE_AIRPLANE_MODE, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(TOGGLE_AIRPLANE_MODE, ImmutableMap.of());
     }
 
     /**
@@ -410,6 +401,6 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> toggleDataCommand() {
-        return new AbstractMap.SimpleEntry<>(TOGGLE_DATA, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(TOGGLE_DATA, ImmutableMap.of());
     }
 }

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

@@ -48,10 +48,8 @@ default List<String> getSupportedPerformanceDataTypes() {
      *                        [1478095200, null, null, 10079213, 19962, 2487705, 20015, 0, 3600],
      *                        [1478098800, null, null, 4444433, 10227, 1430356, 10493, 0, 3600]]
      *          in case of cpu info : [[user, kernel], [0.9, 1.3]]
-     * @throws Exception if the performance data type is not supported, thows Error
      */
-    default List<List<Object>> getPerformanceData(String packageName, String dataType, int dataReadTimeout)
-            throws Exception {
+    default List<List<Object>> getPerformanceData(String packageName, String dataType, int dataReadTimeout) {
         return CommandExecutionHelper.execute(this,
                 getPerformanceDataCommand(packageName, dataType, dataReadTimeout));
     }

src/main/java/io/appium/java_client/events/DefaultAspect.java

@@ -165,7 +165,7 @@ private Object transformToListenable(Object toBeTransformed) {
         return result;
     }
 
-    private List<Object> returnProxyList(List<Object> originalList) throws Exception {
+    private List<Object> returnProxyList(List<Object> originalList) {
         try {
             List<Object> proxyList = new ArrayList<>();
             for (Object o : originalList) {

src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java

@@ -31,8 +31,7 @@ public class IOSMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>>  shakeCommand() {
-        return new AbstractMap.SimpleEntry<>(
-                SHAKE, ImmutableMap.<String, Object>of());
+        return new AbstractMap.SimpleEntry<>(SHAKE, ImmutableMap.of());
     }
 
     /**

src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java

@@ -96,8 +96,8 @@ private static String getFilledValue(Annotation mobileBy) {
             }
 
             try {
-                String strategyParameter = value.invoke(mobileBy, new Object[] {}).toString();
-                if (!"".equals(strategyParameter)) {
+                String strategyParameter = value.invoke(mobileBy).toString();
+                if (!strategyParameter.isEmpty()) {
                     return value.getName();
                 }
             } catch (IllegalAccessException

src/main/java/io/appium/java_client/pagefactory/bys/builder/Strategies.java

@@ -127,7 +127,7 @@ private static String getValue(Annotation annotation, Strategies strategy) {
         try {
             Method m = annotation.getClass()
                 .getMethod(strategy.valueName, AppiumByBuilder.DEFAULT_ANNOTATION_METHOD_ARGUMENTS);
-            return m.invoke(annotation, new Object[] {}).toString();
+            return m.invoke(annotation).toString();
         } catch (NoSuchMethodException
                 | SecurityException
                 | IllegalAccessException

src/main/java/io/appium/java_client/remote/NewAppiumSessionPayload.java

@@ -497,8 +497,7 @@ public Object setValue(Object value) {
     }
 
     private Map<String, Object> applyTransforms(Map<String, Object> caps) {
-        Queue<Map.Entry<String, Object>> toExamine = new LinkedList<>();
-        toExamine.addAll(caps.entrySet());
+        Queue<Map.Entry<String, Object>> toExamine = new LinkedList<>(caps.entrySet());
         Set<String> seenKeys = new HashSet<>();
         Map<String, Object> toReturn = new TreeMap<>();
 

src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java

@@ -349,7 +349,7 @@ public void addLogMessageConsumer(Consumer<String> consumer) {
             StringBuilder lineBuilder = new StringBuilder();
 
             @Override
-            public void write(int chr) throws IOException {
+            public void write(int chr) {
                 try {
                     lineBuilder.append((char) chr);
                     Matcher matcher = LOG_MESSAGE_PATTERN.matcher(lineBuilder.toString());

src/test/java/io/appium/java_client/android/AndroidContextTest.java

@@ -17,7 +17,6 @@
 package io.appium.java_client.android;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import io.appium.java_client.NoSuchContextException;
 import org.junit.BeforeClass;
@@ -49,7 +48,7 @@ public class AndroidContextTest extends BaseAndroidTest {
 
     @Test(expected = NoSuchContextException.class) public void testContextError() {
         driver.context("Planet of the Ape-ium");
-        assertTrue(driver.getContext().equals("Planet of the Ape-ium"));
+        assertEquals("Planet of the Ape-ium", driver.getContext());
     }
 
 }

src/test/java/io/appium/java_client/android/AndroidDriverTest.java

@@ -258,7 +258,7 @@ public class AndroidDriverTest extends BaseAndroidTest {
 
     }
 
-    @Test public void getPerformanceDataTest() throws Exception {
+    @Test public void getPerformanceDataTest() {
         driver.startActivity(new Activity(APP_ID, ".ApiDemos"));
 
         List<String> supportedPerformanceDataTypes = driver.getSupportedPerformanceDataTypes();

src/test/java/io/appium/java_client/appium/element/generation/BaseElementGenerationTest.java

@@ -1,6 +1,6 @@
 package io.appium.java_client.appium.element.generation;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
@@ -17,7 +17,7 @@ public class BaseElementGenerationTest {
     protected AppiumDriver<?> driver;
     protected final BiPredicate<By, Class<? extends WebElement>> commonPredicate = (by, aClass) -> {
         WebElement element = driver.findElement(by);
-        assertTrue(element.getClass().equals(aClass));
+        assertEquals(element.getClass(), aClass);
         return true;
     };
 

src/test/java/io/appium/java_client/ios/IOSContextTest.java

@@ -19,7 +19,6 @@
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 import io.appium.java_client.NoSuchContextException;
 import org.junit.Test;
@@ -43,6 +42,6 @@ public class IOSContextTest extends BaseIOSWebViewTest {
 
     @Test(expected = NoSuchContextException.class) public void testContextError() {
         driver.context("Planet of the Ape-ium");
-        assertTrue(driver.getContext().equals("Planet of the Ape-ium"));
+        assertEquals("Planet of the Ape-ium", driver.getContext());
     }
 }

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

@@ -21,6 +21,7 @@
 import static junit.framework.TestCase.assertNotNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 import io.appium.java_client.MobileElement;
 import io.appium.java_client.android.AndroidElement;
@@ -367,14 +368,14 @@ public class AndroidPageObjectTest extends BaseAndroidTest {
     }
 
     @Test public void checkThatClassObjectMethodsDoNotInvokeTheSearching() {
-        assertEquals(true, AndroidElement.class.isAssignableFrom(fakeElement.getClass()));
-        assertEquals(false, AndroidElement.class.equals(fakeElement.getClass()));
-        assertEquals(true, driver.equals(((WrapsDriver) fakeElement).getWrappedDriver()));
+        assertTrue(AndroidElement.class.isAssignableFrom(fakeElement.getClass()));
+        assertNotEquals(AndroidElement.class, fakeElement.getClass());
+        assertEquals(driver, ((WrapsDriver) fakeElement).getWrappedDriver());
     }
 
     @Test public void checkThatClassObjectMethodsDoNotInvokeTheSearchingOfElementLest() {
-        assertEquals(true, List.class.isAssignableFrom(fakeElements.getClass()));
-        assertEquals(false, ArrayList.class.equals(fakeElements.getClass()));
+        assertTrue(List.class.isAssignableFrom(fakeElements.getClass()));
+        assertNotEquals(ArrayList.class, fakeElements.getClass());
     }
 
     @Test public void checkCached() {

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

@@ -19,8 +19,8 @@
 import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE;
 import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
 import static java.time.Duration.ofSeconds;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
 
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
@@ -67,10 +67,10 @@ public class DesktopBrowserCompatibilityTest {
                     .toURI().toString());
             assertNotEquals(0, foundLinks.size());
             assertNotEquals(0, main.size());
-            assertEquals(null, trap1);
-            assertEquals(null, trap2);
+            assertNull(trap1);
+            assertNull(trap2);
         } finally {
             driver.quit();
         }
     }
-}
+}

src/test/java/io/appium/java_client/service/local/AppiumDriverLocalServiceTest.java

@@ -12,7 +12,7 @@
 public class AppiumDriverLocalServiceTest {
 
     @Test
-    public void canParseSlf4jLoggerContext() throws Exception {
+    public void canParseSlf4jLoggerContext() {
         assertLoggerContext(INFO, "appium.service.androidbootstrap", 
             "[AndroidBootstrap] [BOOTSTRAP LOG] [debug] json loading complete.");
         assertLoggerContext(INFO, "appium.service.adb", 

src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java

@@ -127,7 +127,7 @@ public void tearDown() throws Exception {
     @Test public void checkAbilityToStartDefaultService() {
         service = buildDefaultService();
         service.start();
-        assertEquals(true, service.isRunning());
+        assertTrue(service.isRunning());
     }
 
     @Test public void checkAbilityToFindNodeDefinedInProperties() {