Formatted code to fix the spacing issue

removed redundant validation of StringUtils#isBlank() on the basepath
replaced Assert#fail with Assert#assertThrows for the test cases

Author: robinGupta11392

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

@@ -20,30 +20,15 @@
 import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.common.collect.ImmutableList;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.appium.java_client.remote.AndroidMobileCapabilityType;
 import io.appium.java_client.remote.MobileBrowserType;
 import io.appium.java_client.remote.MobileCapabilityType;
 import io.appium.java_client.service.local.flags.GeneralServerFlag;
 import io.appium.java_client.service.local.flags.ServerArgument;
-
-import lombok.SneakyThrows;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.commons.validator.routines.InetAddressValidator;
-import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.Platform;
-import org.openqa.selenium.os.ExecutableFinder;
-import org.openqa.selenium.remote.Browser;
-import org.openqa.selenium.remote.service.DriverService;
-
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
-
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -55,6 +40,17 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
+import javax.annotation.Nullable;
+import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.validator.routines.InetAddressValidator;
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.os.ExecutableFinder;
+import org.openqa.selenium.remote.Browser;
+import org.openqa.selenium.remote.service.DriverService;
 
 public final class AppiumServiceBuilder
         extends DriverService.Builder<AppiumDriverLocalService, AppiumServiceBuilder> {
@@ -219,7 +215,7 @@ public AppiumServiceBuilder withArgument(ServerArgument argument, String value)
                 withLogFile(new File(value));
                 break;
             case "--base-path":
-                serverArguments.put(argName,sanitizeBasePath(value));
+                serverArguments.put(argName, sanitizeBasePath(value));
                 break;
             default:
                 serverArguments.put(argName, value);
@@ -230,8 +226,8 @@ public AppiumServiceBuilder withArgument(ServerArgument argument, String value)
 
     private static String sanitizeBasePath(String basePath) {
         basePath = checkNotNull(basePath).trim();
-        if (StringUtils.isBlank(basePath) || basePath.isEmpty()) {
-            throw new InvalidBasePathException(
+        if (basePath.isEmpty()) {
+            throw new IllegalArgumentException(
                 "Given base path is not valid - blank or empty values are not allowed for base path");
         }
         return basePath.endsWith("/") ? basePath : basePath + "/";

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

@@ -6,9 +6,9 @@
 import static io.appium.java_client.service.local.AppiumServiceBuilder.APPIUM_PATH;
 import static io.appium.java_client.service.local.AppiumServiceBuilder.BROADCAST_IP_ADDRESS;
 import static io.appium.java_client.service.local.AppiumServiceBuilder.DEFAULT_APPIUM_PORT;
+import static io.appium.java_client.service.local.flags.GeneralServerFlag.BASEPATH;
 import static io.appium.java_client.service.local.flags.GeneralServerFlag.CALLBACK_ADDRESS;
 import static io.appium.java_client.service.local.flags.GeneralServerFlag.SESSION_OVERRIDE;
-import static io.appium.java_client.service.local.flags.GeneralServerFlag.BASEPATH;
 import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
 import static java.lang.System.getProperty;
 import static java.lang.System.setProperty;
@@ -21,23 +21,22 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.github.bonigarcia.wdm.WebDriverManager;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class ServerBuilderTest {
@@ -327,7 +326,7 @@ public void checkAbilityToStartServiceUsingValidBasePathWithMultiplePathParams()
         service = new AppiumServiceBuilder().withArgument(BASEPATH, basePath).build();
         service.start();
         assertTrue(service.isRunning());
-        assertEquals(baseUrl + basePath + "/",service.getUrl().toString());
+        assertEquals(baseUrl + basePath + "/", service.getUrl().toString());
     }
 
     @Test
@@ -337,38 +336,29 @@ public void checkAbilityToStartServiceUsingValidBasePathWithSinglePathParams() {
         service = new AppiumServiceBuilder().withArgument(BASEPATH, basePath).build();
         service.start();
         assertTrue(service.isRunning());
-        assertEquals(baseUrl + basePath.substring(1) ,service.getUrl().toString());
+        assertEquals(baseUrl + basePath.substring(1), service.getUrl().toString());
     }
 
     @Test
     public void checkAbilityToValidateBasePathForEmptyBasePath() {
-        try {
+        Exception exception = assertThrows(IllegalArgumentException.class, () -> {
             service = new AppiumServiceBuilder().withArgument(BASEPATH, "").build();
-            fail("Base path was not validated for Blank or Empty string");
-        } catch (Exception e) {
-            assertEquals(InvalidBasePathException.class, e.getClass());
-            assertEquals(INVALID_BASE_PATH_ERROR_MESSAGE, e.getMessage());
-        }
+        });
+        assertEquals(INVALID_BASE_PATH_ERROR_MESSAGE, exception.getMessage());
     }
 
     @Test
     public void checkAbilityToValidateBasePathForBlankBasePath() {
-        try {
+        Exception exception = assertThrows(IllegalArgumentException.class, () -> {
             service = new AppiumServiceBuilder().withArgument(BASEPATH, "   ").build();
-            fail("Base path was not validated for Blank or Empty string");
-        } catch (Exception e) {
-            assertEquals(InvalidBasePathException.class, e.getClass());
-            assertEquals(INVALID_BASE_PATH_ERROR_MESSAGE, e.getMessage());
-        }
+        });
+        assertEquals(INVALID_BASE_PATH_ERROR_MESSAGE, exception.getMessage());
     }
 
     @Test
     public void checkAbilityToValidateBasePathForNullBasePath() {
-        try {
+        assertThrows(NullPointerException.class, () -> {
             service = new AppiumServiceBuilder().withArgument(BASEPATH, null).build();
-            fail("Base path was not validated for a null value");
-        } catch (Exception e) {
-            assertEquals(NullPointerException.class, e.getClass());
-        }
+        });
     }
 }