refactor(eidas): split 'authmodule-eIDAS-v2' into 'common-eidas'

 code and connector-specific elements

1 files changed, 12 insertions, 10 deletions

diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
index b9525de5..9f62d41e 100644
--- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
+++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
@@ -61,9 +61,9 @@ import at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint;
 import at.asitplus.eidas.specific.connector.provider.PvpEndPointCredentialProvider;
 import at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider;
 import at.asitplus.eidas.specific.connector.test.saml2.Pvp2SProfileEndPointTest;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasSignalServlet;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.gv.bmi.namespace.zmr_su.base._20040201.ResponseType;
 import at.gv.bmi.namespace.zmr_su.base._20040201.WorkflowInfoServer;
 import at.gv.bmi.namespace.zmr_su.base._20040201_.ServicePort;
@@ -144,7 +144,7 @@ public class FullStartUpAndProcessTest {
 
   private SZR szrMock;
   private ServicePort zmrClient;
-
+  
   private static MockWebServer mockWebServer;
   
   private String cc;
@@ -159,6 +159,8 @@ public class FullStartUpAndProcessTest {
 
 
 
+
+
   /**
    * jUnit class initializer.
    * @throws InterruptedException In case of an error
@@ -425,7 +427,7 @@ public class FullStartUpAndProcessTest {
     StatusResponseType saml2 = (StatusResponseType) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         new ByteArrayInputStream(Base64Utils.decodeFromString(saml2RespB64)));
-    Assert.assertEquals("SAML2 status", Constants.SUCCESS_URI, saml2.getStatus().getStatusCode().getValue());
+    Assert.assertEquals("SAML2 status", EidasConstants.SUCCESS_URI, saml2.getStatus().getStatusCode().getValue());
 
     final AssertionAttributeExtractor extractor = new AssertionAttributeExtractor(saml2);
 
@@ -483,7 +485,7 @@ public class FullStartUpAndProcessTest {
     EidasIdentitaetErgebnisType eidasPersonalIdentifier = new EidasIdentitaetErgebnisType();
     personInfo.getEidasIdentitaet().add(eidasPersonalIdentifier);
     eidasPersonalIdentifier.setEidasWert(pseudonym);
-    eidasPersonalIdentifier.setEidasArt(Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER);
+    eidasPersonalIdentifier.setEidasArt(EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER);
     eidasPersonalIdentifier.setStaatscode2(cc);
 
     NatuerlichePersonErgebnisType natInfo = new NatuerlichePersonErgebnisType();
@@ -521,20 +523,20 @@ public class FullStartUpAndProcessTest {
 
     //set response from eIDAS node
     BinaryLightToken respoToken = springManagedSpecificConnectorCommunicationService.putResponse(
-        buildDummyAuthResponse(Constants.SUCCESS_URI, req.getId()));
+        buildDummyAuthResponse(EidasConstants.SUCCESS_URI, req.getId()));
     return Base64Utils.encodeToString(respoToken.getTokenBytes());
 
   }
 
   private AuthenticationResponse buildDummyAuthResponse(String statusCode, String reqId) throws URISyntaxException {
     final AttributeDefinition<?> attributeDef = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
     final AttributeDefinition<?> attributeDef2 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
     final AttributeDefinition<?> attributeDef3 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTGIVENNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME).first();
     final AttributeDefinition<?> attributeDef4 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_DATEOFBIRTH).first();
+        EidasConstants.eIDAS_ATTR_DATEOFBIRTH).first();
 
     final ImmutableAttributeMap attributeMap = ImmutableAttributeMap.builder()
         .put(attributeDef, personalId)