From d41afe91ee59daf6b5f5037cecac52900fe2ccb2 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 31 Jan 2020 20:41:54 +0100
Subject: a lot of more OpenSAML3 refactoring staff This version is also NOT
 stable!

---
 .../egiz/eaaf/modules/pvp2/api/binding/IDecoder.java   |  9 +++------
 .../egiz/eaaf/modules/pvp2/api/binding/IEncoder.java   | 18 +++++++-----------
 2 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding')

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
index 57dd63bf..e8da499c 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
@@ -23,18 +23,15 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
 import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
 
-import org.opensaml.messaging.decoder.MessageDecodingException;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.security.SecurityException;
-
 import net.shibboleth.utilities.java.support.net.URIComparator;
 
 public interface IDecoder {
   InboundMessageInterface decode(HttpServletRequest req, HttpServletResponse resp,
-      MetadataProvider metadataProvider, boolean isSpEndPoint, URIComparator comparator)
-      throws MessageDecodingException, SecurityException, Pvp2Exception;
+      IPvp2MetadataProvider metadataProvider, boolean isSpEndPoint, URIComparator comparator)
+      throws Pvp2Exception;
 
   boolean handleDecode(String action, HttpServletRequest req);
 
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
index 01f541a9..691d6574 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
@@ -23,13 +23,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.modules.pvp2.api.credential.EaafX509Credential;
 import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
 
-import org.opensaml.messaging.encoder.MessageEncodingException;
 import org.opensaml.saml.saml2.core.RequestAbstractType;
 import org.opensaml.saml.saml2.core.StatusResponseType;
 import org.opensaml.security.SecurityException;
-import org.opensaml.security.credential.Credential;
 
 public interface IEncoder {
 
@@ -44,13 +43,11 @@ public interface IEncoder {
    * @param credentials    Credential to sign the request object
    * @param pendingReq     Internal MOA-ID request object that contains
    *                       session-state informations but never null
-   * @throws MessageEncodingException In case of an error
-   * @throws SecurityException        In case of an error
-   * @throws Pvp2Exception            In case of an error
+   * @throws Pvp2Exception In case of an error
    */
   void encodeRequest(HttpServletRequest req, HttpServletResponse resp,
-      RequestAbstractType request, String targetLocation, String relayState, Credential credentials,
-      IRequest pendingReq) throws MessageEncodingException, SecurityException, Pvp2Exception;
+      RequestAbstractType request, String targetLocation, String relayState, EaafX509Credential credentials,
+      IRequest pendingReq) throws Pvp2Exception;
 
   /**
    * Encoder SAML Response.
@@ -63,10 +60,9 @@ public interface IEncoder {
    * @param credentials    Credential to sign the response object
    * @param pendingReq     Internal MOA-ID request object that contains
    *                       session-state informations but never null
-   * @throws MessageEncodingException In case of an error
    * @throws SecurityException        In case of an error
    */
-  void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
-      StatusResponseType response, String targetLocation, String relayState, Credential credentials,
-      IRequest pendingReq) throws MessageEncodingException, SecurityException, Pvp2Exception;
+  void encodeResponse(HttpServletRequest req, HttpServletResponse resp,
+      StatusResponseType response, String targetLocation, String relayState, EaafX509Credential credentials,
+      IRequest pendingReq) throws Pvp2Exception;
 }
-- 
cgit v1.2.3