update to latest EAAF-components that uses OpenSAML3.x

1 files changed, 16 insertions, 16 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PvpMetadataConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PvpMetadataConfiguration.java
index f1828f87..0fc061ff 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PvpMetadataConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PvpMetadataConfiguration.java
@@ -26,12 +26,11 @@ package at.asitplus.eidas.specific.connector.config;
 import java.util.Arrays;
 import java.util.List;
 
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.NameIDType;
-import org.opensaml.saml2.metadata.ContactPerson;
-import org.opensaml.saml2.metadata.Organization;
-import org.opensaml.saml2.metadata.RequestedAttribute;
-import org.opensaml.xml.security.credential.Credential;
+import org.opensaml.saml.saml2.core.Attribute;
+import org.opensaml.saml.saml2.core.NameIDType;
+import org.opensaml.saml.saml2.metadata.ContactPerson;
+import org.opensaml.saml.saml2.metadata.Organization;
+import org.opensaml.saml.saml2.metadata.RequestedAttribute;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,17 +38,18 @@ import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.modules.pvp2.api.IPvp2BasicConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.credential.EaafX509Credential;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.utils.IPvp2CredentialProvider;
 import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
 import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpAttributeBuilder;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
 public class PvpMetadataConfiguration implements IPvpMetadataBuilderConfiguration {
   private static final Logger log = LoggerFactory.getLogger(PvpMetadataConfiguration.class);
 
   private final IConfiguration basicConfig;
   private final String authUrl;
-  private final AbstractCredentialProvider pvpIdpCredentials;
+  private final IPvp2CredentialProvider pvpIdpCredentials;
   private final IPvp2BasicConfiguration pvpBasicConfig;
 
   /**
@@ -58,12 +58,12 @@ public class PvpMetadataConfiguration implements IPvpMetadataBuilderConfiguratio
    * @param basicConfig Application configuration
    * @param authUrl Public-URL Prefix of the application 
    * @param pvpBasicConfig PVP2 configuration object
-   * @param pvpIdpCredentials PVP2 credentials
+   * @param pvpIdpCredentials2 PVP2 credentials
    */
   public PvpMetadataConfiguration(IConfiguration basicConfig, String authUrl,
-      IPvp2BasicConfiguration pvpBasicConfig, AbstractCredentialProvider pvpIdpCredentials) {
+      IPvp2BasicConfiguration pvpBasicConfig, IPvp2CredentialProvider pvpIdpCredentials2) {
     this.authUrl = authUrl;
-    this.pvpIdpCredentials = pvpIdpCredentials;
+    this.pvpIdpCredentials = pvpIdpCredentials2;
     this.basicConfig = basicConfig;
     this.pvpBasicConfig = pvpBasicConfig;
 
@@ -145,19 +145,19 @@ public class PvpMetadataConfiguration implements IPvpMetadataBuilderConfiguratio
   }
 
   @Override
-  public Credential getMetadataSigningCredentials() throws CredentialsNotAvailableException {
-    return pvpIdpCredentials.getIdpMetaDataSigningCredential();
+  public EaafX509Credential getMetadataSigningCredentials() throws CredentialsNotAvailableException {
+    return pvpIdpCredentials.getMetaDataSigningCredential();
 
   }
 
   @Override
-  public Credential getRequestorResponseSigningCredentials() throws CredentialsNotAvailableException {
-    return pvpIdpCredentials.getIdpAssertionSigningCredential();
+  public EaafX509Credential getRequestorResponseSigningCredentials() throws CredentialsNotAvailableException {
+    return pvpIdpCredentials.getMessageSigningCredential();
 
   }
 
   @Override
-  public Credential getEncryptionCredentials() throws CredentialsNotAvailableException {
+  public EaafX509Credential getEncryptionCredentials() throws CredentialsNotAvailableException {
     return null;
 
   }