integrate Spring ModelAndView into EAAF GUI framework

1 files changed, 13 insertions, 12 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HTTPPostEncoderWithOwnTemplate.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HTTPPostEncoderWithOwnTemplate.java
index e9a8b320..8af12acc 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HTTPPostEncoderWithOwnTemplate.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HTTPPostEncoderWithOwnTemplate.java
@@ -43,8 +43,8 @@ import org.opensaml.ws.transport.http.HTTPTransportUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IGUIFormBuilder;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGUIBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiFormBuilder;
 
 /**
  * @author tlenz
@@ -54,15 +54,15 @@ public class HTTPPostEncoderWithOwnTemplate extends HTTPPostEncoder {
 	private static final Logger log = LoggerFactory.getLogger(HTTPPostEncoderWithOwnTemplate.class);
 	
 	
-	private VelocityEngine velocityEngine;
-	private IGUIBuilderConfiguration guiConfig;
-	private IGUIFormBuilder guiBuilder;
+	private final VelocityEngine velocityEngine;
+	private final IVelocityGUIBuilderConfiguration guiConfig;
+	private final IVelocityGuiFormBuilder guiBuilder;
 	
 	/**
 	 * @param engine
 	 * @param templateId
 	 */
-	public HTTPPostEncoderWithOwnTemplate(IGUIBuilderConfiguration guiConfig, IGUIFormBuilder guiBuilder, VelocityEngine engine) {
+	public HTTPPostEncoderWithOwnTemplate(IVelocityGUIBuilderConfiguration guiConfig, IVelocityGuiFormBuilder guiBuilder, VelocityEngine engine) {
 		super(engine, null);
 		this.velocityEngine = engine;
 		this.guiConfig = guiConfig;
@@ -78,12 +78,13 @@ public class HTTPPostEncoderWithOwnTemplate extends HTTPPostEncoder {
      * 
      * @throws MessageEncodingException thrown if there is a problem encoding the message
      */
-    protected void postEncode(SAMLMessageContext messageContext, String endpointURL) throws MessageEncodingException {
+    @Override
+	protected void postEncode(SAMLMessageContext messageContext, String endpointURL) throws MessageEncodingException {
     	log.debug("Invoking Velocity template to create POST body");
         InputStream is = null;
         try {        	
         	//build Velocity Context from GUI input paramters
-			VelocityContext context = guiBuilder.generateVelocityContextFromConfiguration(guiConfig);
+			final VelocityContext context = guiBuilder.generateVelocityContextFromConfiguration(guiConfig);
         	
 			//load template
 			is = guiBuilder.getTemplateInputStream(guiConfig);
@@ -92,17 +93,17 @@ public class HTTPPostEncoderWithOwnTemplate extends HTTPPostEncoder {
             populateVelocityContext(context, messageContext, endpointURL);
 
             //populate transport parameter
-            HTTPOutTransport outTransport = (HTTPOutTransport) messageContext.getOutboundMessageTransport();
+            final HTTPOutTransport outTransport = (HTTPOutTransport) messageContext.getOutboundMessageTransport();
             HTTPTransportUtils.addNoCacheHeaders(outTransport);
             HTTPTransportUtils.setUTF8Encoding(outTransport);
             HTTPTransportUtils.setContentType(outTransport, "text/html");
 
             //evaluate template and write content to response
-            Writer out = new OutputStreamWriter(outTransport.getOutgoingStream(), "UTF-8");                        
+            final Writer out = new OutputStreamWriter(outTransport.getOutgoingStream(), "UTF-8");                        
             velocityEngine.evaluate(context, out, "SAML2_POST_BINDING", new BufferedReader(new InputStreamReader(is)));            
             out.flush();
             
-        } catch (Exception e) {
+        } catch (final Exception e) {
         	log.error("Error invoking Velocity template", e);
             throw new MessageEncodingException("Error creating output document", e);
             
@@ -111,7 +112,7 @@ public class HTTPPostEncoderWithOwnTemplate extends HTTPPostEncoder {
 				try {
 					is.close();
 					
-				} catch (IOException e) {
+				} catch (final IOException e) {
 					log.error("Can NOT close GUI-Template InputStream.", e);
 				}
 			}