From d5825ba7a0388afd545e20b7ac999ddd423631b8 Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Tue, 16 Jun 2020 20:42:40 +0200
Subject: [PATCH] use @Autowired to get AppSettings Object

---
 .../hso/ecommerce/app/config/AppSettings.java | 34 +++++++++----------
 .../ecommerce/components/SlotInitializer.java |  5 ++-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/prototype/src/main/java/org/hso/ecommerce/app/config/AppSettings.java b/prototype/src/main/java/org/hso/ecommerce/app/config/AppSettings.java
index 0f5d40d..fe02203 100644
--- a/prototype/src/main/java/org/hso/ecommerce/app/config/AppSettings.java
+++ b/prototype/src/main/java/org/hso/ecommerce/app/config/AppSettings.java
@@ -11,18 +11,18 @@ import org.yaml.snakeyaml.constructor.Constructor;
 
 import javax.annotation.PostConstruct;
 
-@Component
+@Component("appSettings")
 public class AppSettings {
 
-	private static YAMLData data;
+	private YAMLData data;
 
-	private static String installationName;
-	private static String companyName;
-	private static Address companyAddress;
-	private static int numberOfStorageSpaces;
-	private static List<YAMLData.Supplier> suppliers;
-	private static String parcelServiceName;
-	private static String parcelServiceApiURL;
+	private String installationName;
+	private String companyName;
+	private Address companyAddress;
+	private int numberOfStorageSpaces;
+	private List<YAMLData.Supplier> suppliers;
+	private String parcelServiceName;
+	private String parcelServiceApiURL;
 
 	@PostConstruct
 	/**
@@ -119,35 +119,35 @@ public class AppSettings {
 		return data;
 	}
 
-	public static YAMLData getData() {
+	public YAMLData getData() {
 		return data;
 	}
 
-	public static String getInstallationName() {
+	public String getInstallationName() {
 		return installationName;
 	}
 
-	public static String getCompanyName() {
+	public String getCompanyName() {
 		return companyName;
 	}
 
-	public static Address getCompanyAddress() {
+	public Address getCompanyAddress() {
 		return companyAddress;
 	}
 
-	public static int getNumberOfStorageSpaces() {
+	public int getNumberOfStorageSpaces() {
 		return numberOfStorageSpaces;
 	}
 
-	public static List<YAMLData.Supplier> getSuppliers() {
+	public List<YAMLData.Supplier> getSuppliers() {
 		return suppliers;
 	}
 
-	public static String getParcelServiceName() {
+	public String getParcelServiceName() {
 		return parcelServiceName;
 	}
 
-	public static String getParcelServiceApiURL() {
+	public String getParcelServiceApiURL() {
 		return parcelServiceApiURL;
 	}
 }
\ No newline at end of file
diff --git a/prototype/src/main/java/org/hso/ecommerce/components/SlotInitializer.java b/prototype/src/main/java/org/hso/ecommerce/components/SlotInitializer.java
index ba0e2a8..ae9f572 100644
--- a/prototype/src/main/java/org/hso/ecommerce/components/SlotInitializer.java
+++ b/prototype/src/main/java/org/hso/ecommerce/components/SlotInitializer.java
@@ -14,10 +14,13 @@ public class SlotInitializer {
     @Autowired
     private final SlotRepository slotRepository = null;
 
-    private final int NUM_SLOTS = AppSettings.getNumberOfStorageSpaces();
+    @Autowired
+    private final AppSettings appSettings = null;
 
     @PostConstruct
     public void init() {
+        int NUM_SLOTS = appSettings.getNumberOfStorageSpaces();
+
         for (int i = 1; i <= NUM_SLOTS; i++) {
             if (!slotRepository.findBySlotNum(i).isPresent()) {
                 Slot slotAdded = new Slot();