From 8a1ca0464512b38c7559e8860c41405c2e866158 Mon Sep 17 00:00:00 2001
From: srasmusson <rasmusson.stefan@gmail.com>
Date: Mon, 16 May 2016 00:36:04 +0200
Subject: [PATCH] Removing unused code and rearranging

---
 src/main/java/no/steras/opensamlbook/sp/AccessFilter.java   | 5 +++--
 .../java/no/steras/opensamlbook/sp/ConsumerServlet.java     | 6 +-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java b/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java
index 0a2dd95..57b9b71 100644
--- a/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java
+++ b/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java
@@ -88,9 +88,10 @@ public class AccessFilter implements Filter {
 
     private void redirectUserWithRequest(HttpServletResponse httpServletResponse, AuthnRequest authnRequest) {
 
-        HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
         MessageContext context = new MessageContext();
 
+        context.setMessage(authnRequest);
+
         SAMLPeerEntityContext peerEntityContext = context.getSubcontext(SAMLPeerEntityContext.class, true);
 
         SAMLEndpointContext endpointContext = peerEntityContext.getSubcontext(SAMLEndpointContext.class, true);
@@ -103,7 +104,7 @@ public class AccessFilter implements Filter {
 
         context.getSubcontext(SecurityParametersContext.class, true).setSignatureSigningParameters(signatureSigningParameters);
 
-        context.setMessage(authnRequest);
+        HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
 
         encoder.setMessageContext(context);
         encoder.setHttpServletResponse(httpServletResponse);
diff --git a/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java b/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java
index 0907b9c..e098c26 100644
--- a/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java
+++ b/src/main/java/no/steras/opensamlbook/sp/ConsumerServlet.java
@@ -241,16 +241,12 @@ public class ConsumerServlet extends HttpServlet {
                     HttpClientRequestSOAP11Encoder encoder = new HttpClientRequestSOAP11Encoder();
                     HttpClientResponseSOAP11Decoder decoder = new HttpClientResponseSOAP11Decoder();
 
-                    decoder.setBodyHandler(new SAMLSOAPDecoderBodyHandler());
                     BasicHttpClientMessagePipeline pipeline = new BasicHttpClientMessagePipeline(
                             encoder,
                             decoder
                     );
 
-                    BasicMessageHandlerChain<SAMLObject> outboundPayloadHandler = new BasicMessageHandlerChain<SAMLObject>();
-                    outboundPayloadHandler.setHandlers(Lists.<MessageHandler<SAMLObject>>newArrayList(
-                            new SAMLOutboundProtocolMessageSigningHandler()));
-                    pipeline.setOutboundPayloadHandler(outboundPayloadHandler);
+                    pipeline.setOutboundPayloadHandler(new SAMLOutboundProtocolMessageSigningHandler());
                     return pipeline;
                 }};