steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added all suggested changes from the comments by reviewers

Browse source
This commit is contained in:
Rithvik Sriram 2025-12-04 17:28:02 +01:00
commit 26483e6d13
4 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/main/java/client/utils/Config.java
View file

@ -5,14 +5,11 @@ import java.util.List;
public class Config { 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 language = "en";
private String serverUrl = "http://localhost:8080"; private String serverUrl = "http://localhost:8080";
private List<String> favourites = new ArrayList<>(); private List<Long> favourites = new ArrayList<>();
private List<String> shoppingList = new ArrayList<>(); private List<String> shoppingList = new ArrayList<>();
public Config(){} public Config(){}
@ -25,7 +22,7 @@ public class Config {
return shoppingList; return shoppingList;
} }
public List<String> getFavourites() { public List<Long> getFavourites() {
return favourites; return favourites;
} }
@ -41,7 +38,7 @@ public class Config {
this.serverUrl = serverUrl; this.serverUrl = serverUrl;
} }
public void setFavourites(List<String> favourites) { public void setFavourites(List<Long> favourites) {
this.favourites = favourites; this.favourites = favourites;
} }

15
client/src/main/java/client/utils/ConfigService.java
View file

@ -31,21 +31,18 @@ public class ConfigService {
*/ */
private void load(){ private void load(){
File file = configPath.toFile(); //reads the config file as file File file = configPath.toFile(); //reads the config file as file
if(file.exists()){ if (!file.exists()) { //if file doesn't exist then it creates a config object
config = new Config();
return;
}
try{ try{
config = mapper.readValue(file, Config.class); //uses Jackson to map the file to the config attribute config = mapper.readValue(file, Config.class); //uses Jackson to map the file to the config attribute
} catch (StreamReadException e) {
throw new RuntimeException(e);
} catch (DatabindException e) {
throw new RuntimeException(e);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
}
else{
config = new Config(); // if file doesn't exist, it creates one
}
} }
public Path getConfigPath() { public Path getConfigPath() {

6
client/src/test/java/client/scenes/ConfigServiceTest.java
View file

@ -48,9 +48,9 @@ public class ConfigServiceTest {
assertEquals("de", config.getLanguage()); assertEquals("de", config.getLanguage());
assertEquals("http://exmple12.com", config.getServerUrl()); assertEquals("http://exmple12.com", config.getServerUrl());
List<String> x = new ArrayList<>(); List<Long> x = new ArrayList<>();
x.add("banana bread"); x.add(23412L);
x.add("pineapple pie"); x.add(25412L);
List<String> y = new ArrayList<>(); List<String> y = new ArrayList<>();
y.add("milk"); y.add("milk");

7
client/src/test/java/client/scenes/ConfigTest.java
View file

@ -39,8 +39,11 @@ public class ConfigTest {
ArrayList<String> x = new ArrayList<>(); ArrayList<String> x = new ArrayList<>();
x.add("Lava Cake"); x.add("Lava Cake");
x.add("Brownie"); x.add("Brownie");
config.setFavourites(x); ArrayList<Long> y = new ArrayList<>();
assertEquals(config.getFavourites(), x); y.add(1234L);
y.add(1235L);
config.setFavourites(y);
assertEquals(config.getFavourites(), y);
config.setShoppingList(x); config.setShoppingList(x);
assertEquals(config.getShoppingList(), x); assertEquals(config.getShoppingList(), x);
} }