mandatory field in global config

1 files changed, 9 insertions, 14 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
index 695caa3fd..854334bed 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
@@ -7,13 +7,13 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
 import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ForeignIdentities;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
-import at.gv.egovernment.moa.id.commons.db.dao.config.RequestedAttributesType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
+import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
 
 public class GeneralStorkConfig {
 
 	private List<CPEPS> cpepslist;
-	private List<String> attributes;
+	private List<StorkAttribute> attributes;
 	private int qaa;
 
 	public void parse(MOAIDConfiguration config) {
@@ -27,16 +27,17 @@ public class GeneralStorkConfig {
 				if (foreign != null) {
 					STORK stork = foreign.getSTORK();
 					if (stork != null) {
-						// deep clone to foreclose lazyloading session timeouts
+						// deep clone all the things
+						// to foreclose lazyloading session timeouts
 						cpepslist = new ArrayList<CPEPS>();
 						for(CPEPS current : stork.getCPEPS()) {
 							cpepslist.add(current);
 						}
 
-						RequestedAttributesType tmp = stork.getRequestedAttributes();
+						List<StorkAttribute> tmp = stork.getRequestedAttributes();
 						if(null != tmp) {
-							attributes = new ArrayList<String>();
-							for(String current : tmp.getAttributeValue())
+							attributes = new ArrayList<StorkAttribute>();
+							for(StorkAttribute current : tmp)
 								attributes.add(current);
 						}
 
@@ -59,17 +60,11 @@ public class GeneralStorkConfig {
 		cpepslist = list;
 	}
 
-	public RequestedAttributesType getRequestedAttributesType() {
-		RequestedAttributesType tmp = new RequestedAttributesType();
-		tmp.setAttributeValue(attributes);
-		return tmp;
-	}
-
-	public List<String> getAttributes() {
+	public List<StorkAttribute> getAttributes() {
 		return attributes;
 	}
 
-	public void setAttributes(List<String> attributes) {
+	public void setAttributes(List<StorkAttribute> attributes) {
 		this.attributes = attributes;
 	}