X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Frserv%2FTransOnlyFilter.java;h=0cf4b83e50f137a1710bf35118e11d3fed0804bf;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=e0f7512d8ad7d6a09f51b173710034a0e15d0465;hpb=ceda6e8bc270202bcb24340b86617110289c902e;p=aaf%2Fauthz.git

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TransOnlyFilter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TransOnlyFilter.java
index e0f7512d..0cf4b83e 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TransOnlyFilter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TransOnlyFilter.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,6 +29,8 @@ import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.onap.aaf.cadi.principal.TaggedPrincipal;
 import org.onap.aaf.misc.env.TimeTaken;
@@ -36,42 +38,41 @@ import org.onap.aaf.misc.env.TransStore;
 
 /**
  * Create a new Transaction Object for each and every incoming Transaction
- * 
+ *
  * Attach to Request.  User "FilterHolder" mechanism to retain single instance.
- * 
+ *
  * TransFilter includes CADIFilter as part of the package, so that it can
  * set User Data, etc, as necessary.
- * 
+ *
  * @author Jonathan
  *
  */
 public abstract class TransOnlyFilter<TRANS extends TransStore> implements Filter {
-	@Override
-	public void init(FilterConfig filterConfig) throws ServletException {
-	}
-	
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+
 
+    protected abstract TRANS newTrans(HttpServletRequest req, HttpServletResponse resp);
+    protected abstract TimeTaken start(TRANS trans);
+    protected abstract void authenticated(TRANS trans, TaggedPrincipal p);
+    protected abstract void tallyHo(TRANS trans);
 
-	protected abstract TRANS newTrans();
-	protected abstract TimeTaken start(TRANS trans, ServletRequest request);
-	protected abstract void authenticated(TRANS trans, TaggedPrincipal p);
-	protected abstract void tallyHo(TRANS trans);
-	
-	@Override
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-		TRANS trans = newTrans();
-		
-		TimeTaken overall = start(trans,request);
-		try {
-			request.setAttribute(TransFilter.TRANS_TAG, trans);
-			chain.doFilter(request, response);
-		} finally {
-			overall.done();
-		}
-		tallyHo(trans);
-	}
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        TRANS trans = newTrans((HttpServletRequest)request,(HttpServletResponse)response);
+        TimeTaken overall = start(trans);
+        try {
+            request.setAttribute(TransFilter.TRANS_TAG, trans);
+            chain.doFilter(request, response);
+        } finally {
+            overall.done();
+        }
+        tallyHo(trans);
+    }
 
-	@Override
-	public void destroy() {
-	};
+    @Override
+    public void destroy() {
+    };
 }