Fixing all of codacys ills

Author: stevewalton28

src/main/java/uk/co/evoco/webdriver/WebDriverListener.java

@@ -1,7 +1,11 @@
 package uk.co.evoco.webdriver;
 
 import org.apache.commons.io.FileUtils;
-import org.openqa.selenium.*;
+import org.openqa.selenium.By;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.events.WebDriverEventListener;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;

src/main/java/uk/co/evoco/webdriver/configuration/ConfigurationLoader.java

@@ -1,6 +1,6 @@
 package uk.co.evoco.webdriver.configuration;
 
-import uk.co.evoco.webdriver.configuration.utils.FileLoader;
+import uk.co.evoco.webdriver.configuration.utils.FileLoaderUtils;
 import uk.co.evoco.webdriver.utils.JsonUtils;
 
 import java.io.IOException;
@@ -12,8 +12,6 @@ public class ConfigurationLoader {
 
     private final String INTERNAL_CONFIGURATION_FILE = "config.json";
     private String targetConfigurationFile;
-    private boolean useDefaultConfig = false;
-    private boolean useConfigFile = false;
 
     /**
      * Method for figuring out if we're using the internal, default configuration, or we're setting a reference
@@ -23,13 +21,11 @@ public class ConfigurationLoader {
     public ConfigurationLoader decideWhichConfigurationToUse() {
         String configurationProperty = System.getProperty("config", "DEFAULT");
         if(configurationProperty.toUpperCase().trim().equals("DEFAULT")) {
-            useDefaultConfig = true;
             this.targetConfigurationFile = INTERNAL_CONFIGURATION_FILE;
             return this;
         }
 
         if(configurationProperty.toLowerCase().trim().contains(".json")) {
-            useConfigFile = true;
             this.targetConfigurationFile = configurationProperty;
             return this;
         }
@@ -43,6 +39,6 @@ public ConfigurationLoader decideWhichConfigurationToUse() {
      * @throws IOException
      */
     public WebDriverConfig build() throws IOException {
-        return JsonUtils.fromFile(FileLoader.loadFromClasspathOrFileSystem(targetConfigurationFile), WebDriverConfig.class);
+        return JsonUtils.fromFile(FileLoaderUtils.loadFromClasspathOrFileSystem(targetConfigurationFile), WebDriverConfig.class);
     }
 }

src/main/java/uk/co/evoco/webdriver/configuration/utils/FileLoader.java renamed to src/main/java/uk/co/evoco/webdriver/configuration/utils/FileLoaderUtils.java

@@ -3,7 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 
-public final class FileLoader {
+public final class FileLoaderUtils {
 
     /**
      * Look for a file to load on a fully qualified path, or the classpath

src/main/java/uk/co/evoco/webdriver/results/ResultsManager.java

@@ -1,7 +1,6 @@
 package uk.co.evoco.webdriver.results;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/uk/co/evoco/webdriver/utils/data/Dates.java

@@ -6,9 +6,6 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class Dates extends MockUnitBase {
 
     private static final String DATE_FORMAT = "dd/MM/yyyy";

src/test/java/uk/co/evoco/webdriver/configuration/utils/FileLoaderTests.java renamed to src/test/java/uk/co/evoco/webdriver/configuration/utils/FileLoaderUtilsTests.java

@@ -11,19 +11,19 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public class FileLoaderTests {
+public class FileLoaderUtilsTests {
 
     @Test
     public void testCanLoadConfigFileFromClasspath() throws IOException {
-        File file = FileLoader.loadFromClasspathOrFileSystem("fixtures/sample-config.json");
+        File file = FileLoaderUtils.loadFromClasspathOrFileSystem("fixtures/sample-config.json");
         WebDriverConfig webDriverConfig = JsonUtils.fromFile(file, WebDriverConfig.class);
         assertThat(file, instanceOf(File.class));
         assertThat(webDriverConfig.getBaseUrl(), is("https://www.google.com"));
     }
 
     @Test
     public void testCanLoadConfigFileFromPath() throws IOException {
-        File file = FileLoader.loadFromClasspathOrFileSystem("./config-fs.json");
+        File file = FileLoaderUtils.loadFromClasspathOrFileSystem("./config-fs.json");
         WebDriverConfig webDriverConfig = JsonUtils.fromFile(file, WebDriverConfig.class);
         assertThat(file, instanceOf(File.class));
         assertThat(webDriverConfig.getBaseUrl(), is("https://www.yahoo.com"));