diff --git a/client/src/main/java/client/utils/Config.java b/client/src/main/java/client/utils/Config.java index 1d879a0..c94dd4c 100644 --- a/client/src/main/java/client/utils/Config.java +++ b/client/src/main/java/client/utils/Config.java @@ -5,14 +5,11 @@ import java.util.List; public class Config { - /* - Sets parameters for what the config file needs with a config - Object that will be used in the ConfigService object - */ + private String language = "en"; private String serverUrl = "http://localhost:8080"; - private List favourites = new ArrayList<>(); + private List favourites = new ArrayList<>(); private List shoppingList = new ArrayList<>(); public Config(){} @@ -25,7 +22,7 @@ public class Config { return shoppingList; } - public List getFavourites() { + public List getFavourites() { return favourites; } @@ -41,7 +38,7 @@ public class Config { this.serverUrl = serverUrl; } - public void setFavourites(List favourites) { + public void setFavourites(List favourites) { this.favourites = favourites; } diff --git a/client/src/main/java/client/utils/ConfigService.java b/client/src/main/java/client/utils/ConfigService.java index 3abe0a5..0215d74 100644 --- a/client/src/main/java/client/utils/ConfigService.java +++ b/client/src/main/java/client/utils/ConfigService.java @@ -31,21 +31,18 @@ public class ConfigService { */ private void load(){ File file = configPath.toFile(); //reads the config file as file - if(file.exists()){ - try{ - config = mapper.readValue(file, Config.class); //uses Jackson to map the file to the config attribute + if (!file.exists()) { //if file doesn't exist then it creates a config object + config = new Config(); + return; + } - } catch (StreamReadException e) { - throw new RuntimeException(e); - } catch (DatabindException e) { - throw new RuntimeException(e); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - else{ - config = new Config(); // if file doesn't exist, it creates one + try{ + config = mapper.readValue(file, Config.class); //uses Jackson to map the file to the config attribute + + } catch (IOException e) { + throw new RuntimeException(e); } + } public Path getConfigPath() { diff --git a/client/src/test/java/client/scenes/ConfigServiceTest.java b/client/src/test/java/client/scenes/ConfigServiceTest.java index 63c51a9..31fa0a5 100644 --- a/client/src/test/java/client/scenes/ConfigServiceTest.java +++ b/client/src/test/java/client/scenes/ConfigServiceTest.java @@ -48,9 +48,9 @@ public class ConfigServiceTest { assertEquals("de", config.getLanguage()); assertEquals("http://exmple12.com", config.getServerUrl()); - List x = new ArrayList<>(); - x.add("banana bread"); - x.add("pineapple pie"); + List x = new ArrayList<>(); + x.add(23412L); + x.add(25412L); List y = new ArrayList<>(); y.add("milk"); diff --git a/client/src/test/java/client/scenes/ConfigTest.java b/client/src/test/java/client/scenes/ConfigTest.java index 34e27b5..d715839 100644 --- a/client/src/test/java/client/scenes/ConfigTest.java +++ b/client/src/test/java/client/scenes/ConfigTest.java @@ -39,8 +39,11 @@ public class ConfigTest { ArrayList x = new ArrayList<>(); x.add("Lava Cake"); x.add("Brownie"); - config.setFavourites(x); - assertEquals(config.getFavourites(), x); + ArrayList y = new ArrayList<>(); + y.add(1234L); + y.add(1235L); + config.setFavourites(y); + assertEquals(config.getFavourites(), y); config.setShoppingList(x); assertEquals(config.getShoppingList(), x); }