localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

feature/config #78

Merged
CodeSteak merged 10 commits from feature/config into master 2020-06-18 14:09:47 +02:00
Conversation 1 Commits 10 Files Changed 5 +31 -28
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bba4173269 - Show all commits

11
prototype/eCommerce_config.yml
View File

@ -1,3 +1,8 @@
!!org.hso.ecommerce.app.config.YAMLData {companyName: newCommerce GmbH, installationName: Fast-Web-Shop,
numberOfStorageSpaces: 128, parcelServiceApiURL: 'https://dhl.api.ecommerce.mosad.xyz',
parcelServiceName: DHL International GmbH}
!!org.hso.ecommerce.app.config.YAMLData
CodeSteak commented 2020-06-17 20:14:26 +02:00
Outdated
Review
Copy Link

Würde eher nicht unter dem "echten" Dateinamen mit falschen Daten ins Repo commiten.
Vlcht eher "example_config.yml" oder in ne Art readme rein pasten und drüber den Pfad.
Oder Alternativ eine funktionierende Konfiguration.

Würde eher nicht unter dem "echten" Dateinamen mit falschen Daten ins Repo commiten. Vlcht eher "example_config.yml" oder in ne Art readme rein pasten und drüber den Pfad. Oder Alternativ eine funktionierende Konfiguration.
Seil0 commented 2020-06-17 22:31:51 +02:00
Outdated
Review
Copy Link

Ohne die Datei startet die Anwendung halt nicht mehr.

Ohne die Datei startet die Anwendung halt nicht mehr.
companyAddress: {cityName: Berlin, countryName: Germany, houseNumber: '6', streetName: Kupfergraben,
zipCode: '10117'}
companyName: newCommerce GmbH
installationName: Fast-Web-Shop
numberOfStorageSpaces: 128
parcelServiceApiURL: https://dhl.api.ecommerce.mosad.xyz
parcelServiceName: DHL International GmbH

5
prototype/src/main/java/org/hso/ecommerce/app/Application.java
View File

@ -18,13 +18,10 @@ public class Application {
AppSettings appSettings = AppSettings.getInstance(); // This does not belongs here
//appSettings.writeDemoConfig();
appSettings.writeDemoConfig();
appSettings.readConfig(); // This does not belongs here either
//SpringApplication.run(Application.class, args);
}

27
prototype/src/main/java/org/hso/ecommerce/app/config/AppSettings.java
View File

@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.hso.ecommerce.app.config.YAMLData.Address;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@ -35,7 +36,7 @@ public class AppSettings {
data.setInstallationName("Fast-Web-Shop");
data.setCompanyName("newCommerce GmbH");
//data.setCompanyAddress(new Address("Kupfergraben", "6", "10117", "Berlin", "Germany"));
data.setCompanyAddress(new Address("Kupfergraben", "6", "10117", "Berlin", "Germany"));
data.setNumberOfStorageSpaces(128);
/*
@ -67,23 +68,23 @@ public class AppSettings {
}
public void readConfig() {
/*
Yaml yaml = new Yaml(new Constructor(YAMLData.class));
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("./eCommerce_config.yml");
InputStream inputStream;
try {
inputStream = new FileInputStream("./eCommerce_config.yml");
YAMLData data = yaml.load(inputStream);
*/
String input = "!!org.hso.ecommerce.app.config.YAMLData {companyName: newCommerce GmbH, installationName: Fast-Web-Shop,\n" +
" numberOfStorageSpaces: 128, parcelServiceApiURL: 'https://dhl.api.ecommerce.mosad.xyz',\n" +
" parcelServiceName: DHL International GmbH}\n" +
"";
Yaml yaml = new Yaml(new Constructor(YAMLData.class));
YAMLData data = yaml.load(input);
System.out.println(data.getCompanyName());
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}

10
prototype/src/main/java/org/hso/ecommerce/app/config/YAMLData.java
View File

@ -7,7 +7,7 @@ public class YAMLData {
private String installationName;
private String companyName;
//private Address companyAddress;
private Address companyAddress;
private int numberOfStorageSpaces;
//private List<Supplier> suppliers;
private String parcelServiceName;
@ -26,14 +26,14 @@ public class YAMLData {
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
/*
public Address getCompanyAddress() {
return companyAddress;
}
public void setCompanyAddress(Address companyAddress) {
this.companyAddress = companyAddress;
}
*/
public int getNumberOfStorageSpaces() {
return numberOfStorageSpaces;
}
@ -60,7 +60,7 @@ public class YAMLData {
public void setParcelServiceApiURL(String parcelServiceApiURL) {
this.parcelServiceApiURL = parcelServiceApiURL;
}
/*
public static class Address {
public String streetName;
@ -77,7 +77,7 @@ public class YAMLData {
this.countryName = countryName;
}
}
/*
public static class Supplier {
public String name;