Fixed code review issues

Author: mialeska

src/main/java/aquality/appium/mobile/application/Application.java

@@ -14,27 +14,20 @@ public class Application implements IApplication {
 
     private final ILocalizedLogger localizedLogger;
     private final IApplicationProfile applicationProfile;
-    private final ITimeoutConfiguration timeouts;
     private Duration timeoutImpl;
     private final AppiumDriver appiumDriver;
     private final DriverService driverService;
 
     public Application(AppiumDriver appiumDriver) {
-        this.appiumDriver = appiumDriver;
-        this.driverService = null;
-        localizedLogger = AqualityServices.getLocalizedLogger();
-        applicationProfile = AqualityServices.getApplicationProfile();
-        this.timeouts = AqualityServices.get(ITimeoutConfiguration.class);
-        this.timeoutImpl = timeouts.getImplicit();
-        setImplicitlyWaitToDriver(timeoutImpl.getSeconds());
+        this(null, appiumDriver);
     }
 
     public Application(DriverService driverService, AppiumDriver appiumDriver) {
         this.appiumDriver = appiumDriver;
         this.driverService = driverService;
         localizedLogger = AqualityServices.getLocalizedLogger();
         applicationProfile = AqualityServices.getApplicationProfile();
-        this.timeouts = AqualityServices.get(ITimeoutConfiguration.class);
+        ITimeoutConfiguration timeouts = AqualityServices.get(ITimeoutConfiguration.class);
         this.timeoutImpl = timeouts.getImplicit();
         setImplicitlyWaitToDriver(timeoutImpl.getSeconds());
     }

src/main/java/aquality/appium/mobile/application/MobileModule.java

@@ -17,7 +17,7 @@ public MobileModule(Provider<Application> applicationProvider) {
     @Override
     protected void configure() {
         super.configure();
-        bind(IApplicationProfile.class).to(getBrowserProfileImplementation()).in(Singleton.class);
+        bind(IApplicationProfile.class).to(getApplicationProfileImplementation()).in(Singleton.class);
         bind(IConfiguration.class).to(getConfigurationImplementation());
         bind(IElementFactory.class).to(getElementFactoryImplementation());
     }

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

@@ -8,7 +8,7 @@ public interface IConfigurationsModule extends aquality.selenium.core.configurat
     /**
      * @return class which implements {@link IApplicationProfile}
      */
-    default Class<? extends IApplicationProfile> getBrowserProfileImplementation() {
+    default Class<? extends IApplicationProfile> getApplicationProfileImplementation() {
         return ApplicationProfile.class;
     }
 

src/main/java/aquality/appium/mobile/configuration/driversettings/AndroidSettings.java

@@ -5,19 +5,12 @@
 
 public class AndroidSettings extends DriverSettings{
 
-    private final ISettingsFile settingsFile;
-
     public AndroidSettings(ISettingsFile settingsFile){
-        this.settingsFile = settingsFile;
+        super(settingsFile);
     }
 
     @Override
     public PlatformName getPlatformName() {
         return PlatformName.ANDROID;
     }
-
-    @Override
-    protected ISettingsFile getSettingsFile() {
-        return settingsFile;
-    }
 }

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

@@ -14,8 +14,11 @@ abstract class DriverSettings implements IDriverSettings {
 
     private static final String appPathKey = "applicationPath";
     private static final String appCapabilityKey = "app";
+    private final ISettingsFile settingsFile;
 
-    abstract ISettingsFile getSettingsFile();
+    DriverSettings(ISettingsFile settingsFile) {
+        this.settingsFile = settingsFile;
+    }
 
     @Override
     public Capabilities getCapabilities() {
@@ -29,7 +32,7 @@ public Capabilities getCapabilities() {
     }
 
     private Map<String, Object> getCapabilitiesFromSettings(){
-        return getSettingsFile().getMap(getDriverCapabilitiesJsonPath());
+        return settingsFile.getMap(getDriverCapabilitiesJsonPath());
     }
 
     private String getAbsolutePath(String relativePath) {
@@ -43,13 +46,13 @@ private String getAbsolutePath(String relativePath) {
         }
     }
 
-    protected boolean hasApplicationPath() {
-        return getSettingsFile().getMap(getDriverSettingsPath()).containsKey(appPathKey);
+    private boolean hasApplicationPath() {
+        return settingsFile.getMap(getDriverSettingsPath()).containsKey(appPathKey);
     }
 
     @Override
     public String getApplicationPath() {
-        return String.valueOf(getSettingsFile().getValue(getDriverSettingsPath() + "/" + appPathKey));
+        return String.valueOf(settingsFile.getValue(getDriverSettingsPath() + "/" + appPathKey));
     }
 
     private String getDriverCapabilitiesJsonPath(){

src/main/java/aquality/appium/mobile/configuration/driversettings/IOSSettings.java

@@ -5,19 +5,12 @@
 
 public class IOSSettings extends DriverSettings{
 
-    private final ISettingsFile settingsFile;
-
     public IOSSettings(ISettingsFile settingsFile){
-        this.settingsFile = settingsFile;
+        super(settingsFile);
     }
 
     @Override
     public PlatformName getPlatformName() {
         return PlatformName.IOS;
     }
-
-    @Override
-    protected ISettingsFile getSettingsFile() {
-        return settingsFile;
-    }
 }