Merge "Use managed guava version"

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / taf / HttpEpiTaf.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java b/cadi/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
index 5cd6323..1d7967e 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
@@ -93,11 +93,17 @@ public class HttpEpiTaf implements HttpTaf {
                TafResp tresp = null;
                TafResp firstTry = null;
                List<Redirectable> redirectables = null;
-               List<TafResp> log = (access.willLog(Level.DEBUG)) ? new ArrayList<TafResp>() : null;
+               List<TafResp> log;
+               if(access.willLog(Level.DEBUG)) {
+                       log = new ArrayList<>();
+               } else {
+                       log = null;
+               }
                try {
                        for (HttpTaf taf : tafs) {
+                               final long start = System.nanoTime();
                                tresp = taf.validate(reading, req, resp);
-                               addToLog(log, tresp);
+                               addToLog(log, tresp, start);
                                switch(tresp.isAuthenticated()) {
                                        case TRY_ANOTHER_TAF:
                                                break; // and loop
@@ -176,10 +182,11 @@ public class HttpEpiTaf implements HttpTaf {
                return Resp.NOT_MINE;
        }
        
-       private void addToLog(List<TafResp> log, TafResp tresp) {
+       private void addToLog(List<TafResp> log, final TafResp tresp, final long start) {
                if (log == null) {
                        return;
                }
+               tresp.timing(start);
                log.add(tresp);
        }
        
@@ -188,7 +195,7 @@ public class HttpEpiTaf implements HttpTaf {
                        return;
                }
                for (TafResp tresp : log) {
-                       access.log(Level.DEBUG, tresp.desc());
+                       access.printf(Level.DEBUG, "%s: %s, ms=%f", tresp.taf(), tresp.desc(), tresp.timing());
                }
        }