1 files changed, 20 insertions, 19 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
index 29bf02ba9..124a2e46a 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBRead.java
@@ -67,7 +67,7 @@ public class NewConfigurationDBRead {
 		Logger.trace("Get All OnlineApplications from database.");
 
 		// select onlineapplication from OnlineApplication onlineapplication
-		return conf.getList("getOnlineApplications", OnlineApplication.class);
+		return conf.getList(MOAIDConfigurationConstants.ONLINE_APPLICATIONS_KEY, OnlineApplication.class);
 
 	}
 
@@ -104,28 +104,29 @@ public class NewConfigurationDBRead {
 	public static MOAIDConfiguration getMOAIDConfiguration() {
 		Logger.trace("Load MOAID Configuration from database.");
 
-		AuthComponentGeneral authComponent = (AuthComponentGeneral) conf.get("getAuthComponentGeneral",
+		AuthComponentGeneral authComponent = (AuthComponentGeneral) conf.get(MOAIDConfigurationConstants.AUTH_COMPONENT_GENERAL_KEY,
 				AuthComponentGeneral.class);
-		ChainingModes chainingModes = (ChainingModes) conf.get("getChainingModes", ChainingModes.class);
-		List<OnlineApplication> oas = (List<OnlineApplication>) conf.getList("getOnlineApplications",
+
+		ChainingModes chainingModes = (ChainingModes) conf.get(MOAIDConfigurationConstants.CHAINING_MODES_KEY, ChainingModes.class);
+		List<OnlineApplication> oas = (List<OnlineApplication>) conf.getList(MOAIDConfigurationConstants.ONLINE_APPLICATIONS_KEY,
 				OnlineApplication.class);
 		List<GenericConfiguration> genericConfigurations = (List<GenericConfiguration>) conf.getList(
-				"getGenericConfigurations", GenericConfiguration.class);
-		String trustedCaCertificates = (String) conf.get("getTrustedCACertificates", String.class);
-		DefaultBKUs defaultBKUs = (DefaultBKUs) conf.get("getDefaultBKUs", DefaultBKUs.class);
-		SLRequestTemplates slrRequestRemplates = (SLRequestTemplates) conf.get("getSLRequestTemplates",
+				MOAIDConfigurationConstants.GENERIC_CONFIGURATION_KEY, GenericConfiguration.class);
+		String trustedCaCertificates = (String) conf.get(MOAIDConfigurationConstants.TRUSTED_CERTIFICATES_KEY, String.class);
+		DefaultBKUs defaultBKUs = (DefaultBKUs) conf.get(MOAIDConfigurationConstants.DEFAULT_BKUS_KEY, DefaultBKUs.class);
+		SLRequestTemplates slrRequestRemplates = (SLRequestTemplates) conf.get(MOAIDConfigurationConstants.SLREQUEST_TEMPLATES_KEY,
 				SLRequestTemplates.class);
-		Date timeStamp = (Date) conf.get("getTimeStampItem", Date.class);
-		Date pvp2Refresh = (Date) conf.get("getPvp2RefreshItem", Date.class);
-
-		if (authComponent == null || chainingModes == null || trustedCaCertificates == null || defaultBKUs == null
-				|| slrRequestRemplates == null || timeStamp == null || pvp2Refresh == null
-
-		) {
-			// TODO: is there a better approach in case of error?
-			Logger.trace("Not all necessary data available. Create fresh instance.");
-			return new MOAIDConfiguration();
-		}
+		Date timeStamp = (Date) conf.get(MOAIDConfigurationConstants.TIMESTAMP_ITEM_KEY, Date.class);
+		Date pvp2Refresh = (Date) conf.get(MOAIDConfigurationConstants.PVP2REFRESH_ITEM_KEY, Date.class);
+
+		// if (authComponent == null || chainingModes == null || trustedCaCertificates == null || defaultBKUs == null
+		// || slrRequestRemplates == null || timeStamp == null || pvp2Refresh == null
+		//
+		// ) {
+		// // TODO: is there a better approach in case of error?
+		// Logger.trace("Not all necessary data available. Create fresh instance.");
+		// return new MOAIDConfiguration();
+		// }
 
 		// select moaidconfiguration from MOAIDConfiguration moaidconfiguration
 		MOAIDConfiguration result = new MOAIDConfiguration();