a lot of more OpenSAML3 refactoring staff

This version is also NOT stable!

1 files changed, 7 insertions, 11 deletions

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;
 }