fixed issue with visibility of the resources in the jar files

Author: d.bogatko

src/main/java/aquality/selenium/configuration/Configuration.java

@@ -2,9 +2,6 @@
 
 import aquality.selenium.utils.JsonFile;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-
 public class Configuration implements IConfiguration{
 
  private static ThreadLocal<Configuration> instance = ThreadLocal.withInitial(Configuration::new);
@@ -47,10 +44,6 @@ public ILoggerConfiguration getLoggerConfiguration() {
 
  private JsonFile getSettings() {
  String settingsProfile = System.getProperty("profile") == null ? "settings.json" : "settings." + System.getProperty("profile") + ".json";
- try{
- return new JsonFile(settingsProfile);
- }catch (IOException e){
- throw new UncheckedIOException(String.format("Browser profile assigned in file %1$s was not found in the root of resources directory", settingsProfile), e);
- }
+ return new JsonFile(settingsProfile);
  }
 }

src/main/java/aquality/selenium/localization/LocalizationManager.java

@@ -3,9 +3,6 @@
 import aquality.selenium.configuration.Configuration;
 import aquality.selenium.utils.JsonFile;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-
 public class LocalizationManager {
 
  private final JsonFile localManager;
@@ -14,11 +11,7 @@ public class LocalizationManager {
  private LocalizationManager(){
  SupportedLanguage language = Configuration.getInstance().getLoggerConfiguration().getLanguage();
  String translateDictFile = String.format("localization/%1$s.json", language.name().toLowerCase());
- try {
- localManager = new JsonFile(translateDictFile);
- } catch (IOException | IllegalArgumentException e) {
- throw new UncheckedIOException("LocalizationManager was not instantiated. Localization file was not found by path " + translateDictFile, new IOException(e));
- }
+ localManager = new JsonFile(translateDictFile);
  }
 
  public static LocalizationManager getInstance() {

src/main/java/aquality/selenium/utils/JsonFile.java

@@ -7,7 +7,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
@@ -16,17 +15,17 @@ public class JsonFile {
 
  private final ObjectMapper mapper = new ObjectMapper();
  private final String fileCanonicalPath;
+ private final String content;
 
  public JsonFile(File file) throws IOException {
- this.fileCanonicalPath = file.getCanonicalPath();
+ this.content = getFileContent(file.getCanonicalPath());
+ fileCanonicalPath = file.getCanonicalPath();
  }
 
- public String getFileCanonicalPath(){
- return fileCanonicalPath;
- }
-
- public JsonFile(String resourceName) throws IOException {
- this(new File(getResourcePath(resourceName)));
+ public JsonFile(String resourceName) {
+ ResourceFile resourceFile = new ResourceFile(resourceName);
+ this.content = resourceFile.getFileContent();
+ this.fileCanonicalPath = resourceFile.getFileCanonicalPath();
  }
 
  public Object getValue(String jsonPath){
@@ -68,10 +67,10 @@ public Map<String, Object> getMap(String jsonPath) {
 
  private JsonNode getJsonNode(String jsonPath){
  try{
- JsonNode node = mapper.readTree(getFileContent(getFileCanonicalPath()));
+ JsonNode node = mapper.readTree(getContent());
  return node.at(jsonPath);
  }catch (IOException e){
- throw new UncheckedIOException(String.format("Json field by json-path %1$s was not found in the file %2$s", jsonPath, getFileCanonicalPath()),e);
+ throw new UncheckedIOException(String.format("Json field by json-path %1$s was not found in the file %2$s", jsonPath, getContent()),e);
  }
  }
 
@@ -83,12 +82,11 @@ private String getFileContent(String filename) {
  }
  }
 
- private static String getResourcePath(final String resourceName) {
- try{
- URL resourceURL = JsonFile.class.getClassLoader().getResource(resourceName);
- return Objects.requireNonNull(resourceURL).getPath();
- }catch (NullPointerException e){
- throw new IllegalArgumentException(String.format("Resource file %1$s was not found or cannot be loaded", resourceName), e);
- }
+ public String getContent() {
+ return content;
+ }
+
+ public String getFileCanonicalPath() {
+ return fileCanonicalPath;
  }
 }

src/test/java/tests/usecases/BrowserFactoryTests.java

@@ -9,6 +9,7 @@
 import aquality.selenium.configuration.driversettings.FirefoxSettings;
 import aquality.selenium.configuration.driversettings.IDriverSettings;
 import aquality.selenium.utils.JsonFile;
+import aquality.selenium.waitings.ConditionalWait;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import io.github.bonigarcia.wdm.WebDriverManager;
 import org.openqa.selenium.InvalidArgumentException;
@@ -19,11 +20,9 @@
 import org.testng.annotations.Test;
 import theinternet.TheInternetPage;
 import theinternet.forms.FileDownloaderForm;
-import aquality.selenium.waitings.ConditionalWait;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -38,11 +37,7 @@ public class BrowserFactoryTests {
  private final JsonFile jsonProfile;
 
  public BrowserFactoryTests() {
- try{
- this.jsonProfile = new JsonFile("settings.json");
- }catch (IOException e){
- throw new UncheckedIOException(e);
- }
+ this.jsonProfile = new JsonFile("settings.json");
  }
 
  @Test

src/test/resources/settings.json

@@ -55,7 +55,7 @@
  },
  "timeouts": {
  "timeoutImplicit" : 0,
- "timeoutCondition" : 15,
+ "timeoutCondition" : 25,
  "timeoutScript" : 10,
  "timeoutPageLoad" : 30,
  "timeoutPollingInterval": 300,