adjusting hcp to updated stork schema

2 files changed, 10 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
index 761460971..70c1af82e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
@@ -52,8 +52,8 @@ import at.gv.egovernment.moa.logging.Logger;
 import eu.stork.peps.auth.commons.IPersonalAttributeList;
 import eu.stork.peps.auth.commons.PersonalAttribute;
 import eu.stork.peps.auth.commons.PersonalAttributeList;
-import eu.stork.peps.complex.attributes.IsHealthCareProfessionalType;
-import eu.stork.peps.complex.attributes.ObjectFactory;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.IsHealthCareProfessionalType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.ObjectFactory;
 
 /**
  * Fetches the attribute IsHealthcareProfessional from the BAGDAD SOAP service
@@ -67,7 +67,7 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 	 * Instantiates a new e hvd attribute provider plugin.
 	 *
 	 * @param url the service url
-	 * @param attributes 
+	 * @param supportedAttributes
 	 */
 	public EHvdAttributeProviderPlugin(String url, String supportedAttributes) {
 		super(supportedAttributes);
@@ -190,10 +190,10 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 
 				// TODO: we do not have any list of possible values yet. Fix as soon as we get some.
 //				if (collection.get("Type").equals("Medical doctor"))
-					result.setTypeOfHCP("physician");
+					result.setHCPType("physician");
 
 				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
-				result.setTypeOfOrganisation("Unknown");
+				//result.setTypeOfOrganisation("Unknown"); // TODO used in previous version, check what to do with this
 
 				result.setAQAA(4);
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
index 2000ef928..8d7d50370 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
@@ -52,9 +52,9 @@ import at.gv.egovernment.moa.logging.Logger;
 import eu.stork.peps.auth.commons.IPersonalAttributeList;
 import eu.stork.peps.auth.commons.PersonalAttribute;
 import eu.stork.peps.auth.commons.PersonalAttributeList;
-import eu.stork.peps.complex.attributes.IsHealthCareProfessionalDeprecatedType;
-import eu.stork.peps.complex.attributes.IsHealthCareProfessionalType;
-import eu.stork.peps.complex.attributes.ObjectFactory;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.IsHealthCareProfessionalType; // IsHealthCareProfessionalDeprecatedType;
+//import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion. _1_0.assertion.IsHealthCareProfessionalType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.ObjectFactory;
 
 /**
  * Fetches the attribute IsHealthcareProfessional from the BAGDAD SOAP service
@@ -68,7 +68,7 @@ public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
 	 * Instantiates a new e hvd attribute provider plugin.
 	 *
 	 * @param url the service url
-	 * @param attributes 
+	 * @param supportedAttributes
 	 */
 	public EHvdAttribute_deprecatedProviderPlugin(String url, String supportedAttributes) {
 		super(supportedAttributes);
@@ -187,7 +187,7 @@ public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
 				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), "NotAvailable");
 			} else {
 				// go on and parse the data
-                IsHealthCareProfessionalDeprecatedType result = new IsHealthCareProfessionalDeprecatedType();
+                IsHealthCareProfessionalType result = new IsHealthCareProfessionalType();
 				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
 
 				if (collection.get("Type").equals("Medical doctor"))