Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / env / AuthzTransOnlyFilter.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransOnlyFilter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransOnlyFilter.java
index d7b6f1d..396f0d1 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransOnlyFilter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransOnlyFilter.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.
@@ -21,8 +21,8 @@
 
 package org.onap.aaf.auth.env;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.onap.aaf.auth.rserv.TransOnlyFilter;
 import org.onap.aaf.cadi.principal.TaggedPrincipal;
@@ -39,17 +39,18 @@ public class AuthzTransOnlyFilter extends TransOnlyFilter<AuthzTrans> {
     public AuthzTransOnlyFilter(AuthzEnv env) {
         this.env = env;
         serviceMetric = new Metric();
-        serviceMetric.buckets = new float[BUCKETSIZE]; 
+        serviceMetric.buckets = new float[BUCKETSIZE];
     }
-    
+
     @Override
-    protected AuthzTrans newTrans() {
-        return env.newTrans();
+    protected AuthzTrans newTrans(HttpServletRequest req, HttpServletResponse resp) {
+        AuthzTrans trans = env.newTrans();
+        trans.set(req, resp);
+        return trans;
     }
 
     @Override
-    protected TimeTaken start(AuthzTrans trans, ServletRequest request) {
-        trans.set((HttpServletRequest)request);
+    protected TimeTaken start(AuthzTrans trans) {
         return trans.start("Trans " + //(context==null?"n/a":context.toString()) +
         " IP: " + trans.ip() +
         " Port: " + trans.port()
@@ -70,7 +71,7 @@ public class AuthzTransOnlyFilter extends TransOnlyFilter<AuthzTrans> {
         Metric m = trans.auditTrail(1, sb, Env.REMOTE,Env.JSON);
         // Add current Metrics to total metrics
         serviceMetric.total+= m.total;
-        for(int i=0;i<serviceMetric.buckets.length;++i) {
+        for (int i=0;i<serviceMetric.buckets.length;++i) {
             serviceMetric.buckets[i]+=m.buckets[i];
         }
         // Log current info