refactor to OpenSAML 4.x

1 files changed, 27 insertions, 27 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
index b7b18f0f..21912592 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
@@ -20,34 +20,14 @@
 package at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder;
 
 import java.security.MessageDigest;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
 import javax.naming.ConfigurationException;
 
-import at.gv.egiz.eaaf.core.api.data.EaafConstants;
-import at.gv.egiz.eaaf.core.api.data.ILoALevelMapper;
-import at.gv.egiz.eaaf.core.api.idp.IAuthData;
-import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.slo.SloInformationInterface;
-import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException;
-import at.gv.egiz.eaaf.core.impl.data.Pair;
-import at.gv.egiz.eaaf.core.impl.idp.controller.protocols.RequestImpl;
-import at.gv.egiz.eaaf.core.impl.utils.Random;
-import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
-import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
-import at.gv.egiz.eaaf.modules.pvp2.exception.QaaNotSupportedException;
-import at.gv.egiz.eaaf.modules.pvp2.idp.api.builder.ISubjectNameIdGenerator;
-import at.gv.egiz.eaaf.modules.pvp2.idp.exception.ResponderErrorException;
-import at.gv.egiz.eaaf.modules.pvp2.idp.exception.UnprovideableAttributeException;
-import at.gv.egiz.eaaf.modules.pvp2.idp.impl.PvpSProfilePendingRequest;
-import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpAttributeBuilder;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.QaaLevelVerifier;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
-
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.core.Assertion;
 import org.opensaml.saml.saml2.core.Attribute;
@@ -79,6 +59,26 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Base64Utils;
 
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.data.ILoALevelMapper;
+import at.gv.egiz.eaaf.core.api.idp.IAuthData;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.slo.SloInformationInterface;
+import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException;
+import at.gv.egiz.eaaf.core.impl.data.Pair;
+import at.gv.egiz.eaaf.core.impl.idp.controller.protocols.RequestImpl;
+import at.gv.egiz.eaaf.core.impl.utils.Random;
+import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
+import at.gv.egiz.eaaf.modules.pvp2.exception.QaaNotSupportedException;
+import at.gv.egiz.eaaf.modules.pvp2.idp.api.builder.ISubjectNameIdGenerator;
+import at.gv.egiz.eaaf.modules.pvp2.idp.exception.ResponderErrorException;
+import at.gv.egiz.eaaf.modules.pvp2.idp.exception.UnprovideableAttributeException;
+import at.gv.egiz.eaaf.modules.pvp2.idp.impl.PvpSProfilePendingRequest;
+import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpAttributeBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.QaaLevelVerifier;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
+
 @Service("PVP2AssertionBuilder")
 public class Pvp2AssertionBuilder implements PvpConstants {
 
@@ -102,7 +102,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
    * @throws Pvp2Exception In case of an error
    */
   public Assertion buildAssertion(final String issuerEntityID, final AttributeQuery attrQuery,
-      final List<Attribute> attrList, final DateTime now, final DateTime validTo,
+      final List<Attribute> attrList, final Instant now, final Instant validTo,
       final String qaaLevel, final String sessionIndex) throws Pvp2Exception {
 
     final AuthnContextClassRef authnContextClassRef =
@@ -140,7 +140,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
    */
   public Assertion buildAssertion(final String issuerEntityID,
       final PvpSProfilePendingRequest pendingReq, final AuthnRequest authnRequest,
-      final IAuthData authData, final EntityDescriptor peerEntity, final DateTime date,
+      final IAuthData authData, final EntityDescriptor peerEntity, final Instant date,
       final AssertionConsumerService assertionConsumerService,
       final SloInformationInterface sloInformation) throws Pvp2Exception {
 
@@ -249,7 +249,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
 
       if (attributeConsumingService != null) {
         final Iterator<RequestedAttribute> it =
-            attributeConsumingService.getRequestAttributes().iterator();
+            attributeConsumingService.getRequestedAttributes().iterator();
         while (it.hasNext()) {
           final RequestedAttribute reqAttribut = it.next();
           try {
@@ -364,7 +364,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
         Saml2Utils.createSamlObject(SubjectConfirmationData.class);
     subjectConfirmationData.setInResponseTo(authnRequest.getID());
     subjectConfirmationData
-        .setNotOnOrAfter(new DateTime(authData.getSsoSessionValidTo().getTime()));
+        .setNotOnOrAfter(Instant.ofEpochMilli(authData.getSsoSessionValidTo().getTime()));
 
     // set 'recipient' attribute in subjectConformationData
     subjectConfirmationData.setRecipient(assertionConsumerService.getLocation());
@@ -403,10 +403,10 @@ public class Pvp2AssertionBuilder implements PvpConstants {
    * @throws ConfigurationException In case on an error
    */
 
-  public Assertion buildGenericAssertion(String issuer, final String entityID, final DateTime date,
+  public Assertion buildGenericAssertion(String issuer, final String entityID, final Instant date,
       final AuthnContextClassRef authnContextClassRef, final List<Attribute> attrList,
       final NameID subjectNameID, final SubjectConfirmationData subjectConfirmationData,
-      final String sessionIndex, final DateTime isValidTo) throws ResponderErrorException {
+      final String sessionIndex, final Instant isValidTo) throws ResponderErrorException {
     final Assertion assertion = Saml2Utils.createSamlObject(Assertion.class);
 
     final AuthnContext authnContext = Saml2Utils.createSamlObject(AuthnContext.class);