Refactor DriverSettings, removed redundant classes

Author: mialeska

src/main/java/aquality/appium/mobile/configuration/ApplicationProfile.java

@@ -1,9 +1,6 @@
 package aquality.appium.mobile.configuration;
 
 import aquality.appium.mobile.application.PlatformName;
-import aquality.appium.mobile.configuration.driversettings.AndroidSettings;
-import aquality.appium.mobile.configuration.driversettings.IDriverSettings;
-import aquality.appium.mobile.configuration.driversettings.IOSSettings;
 import aquality.selenium.core.utilities.ISettingsFile;
 import com.google.inject.Inject;
 import org.openqa.selenium.InvalidArgumentException;
@@ -32,18 +29,7 @@ public boolean isRemote() {
 
     @Override
     public IDriverSettings getDriverSettings() {
-        IDriverSettings driverSettings;
-        switch (getPlatformName()) {
-            case ANDROID:
-                driverSettings = new AndroidSettings(settingsFile);
-                break;
-            case IOS:
-                driverSettings = new IOSSettings(settingsFile);
-                break;
-            default:
-                throw new IllegalArgumentException("There are no assigned behaviour for retrieving driver driversettings for platform " + getPlatformName());
-        }
-        return driverSettings;
+        return new DriverSettings(settingsFile, getPlatformName());
     }
 
     @Override

src/main/java/aquality/appium/mobile/configuration/driversettings/DriverSettings.java renamed to src/main/java/aquality/appium/mobile/configuration/DriverSettings.java

@@ -1,6 +1,7 @@
-package aquality.appium.mobile.configuration.driversettings;
+package aquality.appium.mobile.configuration;
 
 import aquality.appium.mobile.application.AqualityServices;
+import aquality.appium.mobile.application.PlatformName;
 import aquality.selenium.core.localization.ILocalizationManager;
 import aquality.selenium.core.utilities.ISettingsFile;
 import org.openqa.selenium.Capabilities;
@@ -10,14 +11,16 @@
 import java.io.IOException;
 import java.util.Map;
 
-abstract class DriverSettings implements IDriverSettings {
+public class DriverSettings implements IDriverSettings {
 
     private static final String APPLICATION_PATH_KEY = "applicationPath";
     private static final String APP_CAPABILITY_KEY = "app";
     private final ISettingsFile settingsFile;
+    private final PlatformName platformName;
 
-    DriverSettings(ISettingsFile settingsFile) {
+    public DriverSettings(ISettingsFile settingsFile, PlatformName platformName) {
         this.settingsFile = settingsFile;
+        this.platformName = platformName;
     }
 
     @Override
@@ -60,6 +63,6 @@ private String getDriverCapabilitiesJsonPath(){
     }
 
     private String getDriverSettingsPath(){
-        return String.format("/driverSettings/%1$s", getPlatformName().toString().toLowerCase());
+        return String.format("/driverSettings/%1$s", platformName.toString().toLowerCase());
     }
 }

src/main/java/aquality/appium/mobile/configuration/IApplicationProfile.java

@@ -1,7 +1,6 @@
 package aquality.appium.mobile.configuration;
 
 import aquality.appium.mobile.application.PlatformName;
-import aquality.appium.mobile.configuration.driversettings.IDriverSettings;
 
 import java.net.URL;
 

src/main/java/aquality/appium/mobile/configuration/driversettings/IDriverSettings.java renamed to src/main/java/aquality/appium/mobile/configuration/IDriverSettings.java

@@ -1,6 +1,5 @@
-package aquality.appium.mobile.configuration.driversettings;
+package aquality.appium.mobile.configuration;
 
-import aquality.appium.mobile.application.PlatformName;
 import org.openqa.selenium.Capabilities;
 
 /**
@@ -14,12 +13,6 @@ public interface IDriverSettings {
      */
     Capabilities getCapabilities();
 
-    /**
-     * Get desired platform name.
-     * @return Platform name.
-     */
-    PlatformName getPlatformName();
-
     /**
      * Provides a path to the application.
      * @return path to application.