X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Fenv%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Fimpl%2FBasicEnv.java;h=8128856c39a46aeb589c66b3c0f8cb78d6f1c911;hb=HEAD;hp=94f7d47b5cf6176a77e5a454d8bb68060db63679;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java
index 94f7d47b..8128856c 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java
@@ -86,9 +86,9 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
         super(null, tags);
 //        props = new HashMap<>();
 //        String value;
-//        for(int i=0;i<tags.length;++i) {
+//        for (int i=0;i<tags.length;++i) {
 //            value = applet.getParameter(tags[i]);
-//            if(value!=null) {
+//            if (value!=null) {
 //                props.put(tags[i], value);
 //            }
 //        }
@@ -102,40 +102,61 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
         super(tag, props);
     }
 
-
-
-    // @Override
+    @Override
     public LogTarget fatal() {
         return fatal;
     }
 
-    // @Override
+    public void fatal(LogTarget lt) {
+        fatal = lt;
+    }
+
+    @Override
     public LogTarget error() {
         return error;
     }
 
+    public void error(LogTarget lt) {
+        error = lt;
+    }
     
-    // @Override
+    @Override
     public LogTarget audit() {
         return audit;
     }
 
-    // @Override
+    public void audit(LogTarget lt) {
+        audit = lt;
+    }
+
+    @Override
     public LogTarget init() {
         return init;
     }
 
-    // @Override
+    public void init(LogTarget lt) {
+        init = lt;
+    }
+
+    @Override
     public LogTarget warn() {
         return warn;
     }
 
-    // @Override
+    public void warn(LogTarget lt) {
+        warn = lt;
+    }
+
+    @Override
     public LogTarget info() {
         return info;
     }
 
-    // @Override
+    public void info(LogTarget lt) {
+        info = lt;
+    }
+
+    @Override
     public LogTarget debug() {
         return debug;
     }
@@ -144,14 +165,18 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
         debug = lt;
     }
 
-    // @Override
+    @Override
     public LogTarget trace() {
         return trace;
     }
 
-    // @Override
-    public TimeTaken start(String name, int flag) {
-        return new TimeTaken(name, flag) {
+    public void trace(LogTarget lt) {
+        trace = lt;
+    }
+
+    @Override
+    public TimeTaken start(String name, int flag, Object ... values) {
+        return new TimeTaken(name, flag, values) {
             /**
              * Format to be printed when called upon
              */
@@ -163,12 +188,12 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
                     case Env.JSON: sb.append("JSON "); break;
                     case Env.REMOTE: sb.append("REMOTE "); break;
                 }
-                sb.append(name);
-                if(flag != Env.CHECKPOINT) {
+                sb.append(String.format(name, values));
+                if ((flag & Env.CHECKPOINT) != Env.CHECKPOINT) {
                     sb.append(' ');
                     sb.append((end-start)/1000000f);
                     sb.append("ms");
-                    if(size>=0) {
+                    if (size>=0) {
                         sb.append(" size: ");
                         sb.append(Long.toString(size));
                     }
@@ -185,11 +210,11 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
     public Properties getProperties(String ... filter) {
         Properties props = new Properties();
         boolean yes;
-        for(String key : existingStaticSlotNames()) {
-            if(filter.length>0) {
+        for (String key : existingStaticSlotNames()) {
+            if (filter.length>0) {
                 yes = false;
-                for(String f : filter) {
-                    if(key.startsWith(f)) {
+                for (String f : filter) {
+                    if (key.startsWith(f)) {
                         yes = true;
                         break;
                     }
@@ -197,9 +222,9 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
             } else {
                 yes = true;
             }
-            if(yes) {
+            if (yes) {
                 String value = getProperty(key);
-                if(value!=null) {
+                if (value!=null) {
                     props.put(key, value);
                 }
             }
@@ -242,7 +267,7 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
 //    @SuppressWarnings("unchecked")
     // @Override
     public <T> DataFactory<T> newDataFactory(Class<?>... classes) throws APIException {
-//        if(String.class.isAssignableFrom(classes[0])) 
+//        if (String.class.isAssignableFrom(classes[0])) 
 //            return (DataFactory<T>) new StringDF(this);
         return new JAXBDF<T>(this,classes);
     }
@@ -250,7 +275,7 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
 //    @SuppressWarnings("unchecked")
     // @Override
     public <T> DataFactory<T> newDataFactory(Schema schema, Class<?>... classes) throws APIException {
-//        if(String.class.isAssignableFrom(classes[0])) 
+//        if (String.class.isAssignableFrom(classes[0])) 
 //            return (DataFactory<T>) new StringDF(this);
         return new JAXBDF<T>(this, schema, classes);
     }
@@ -258,7 +283,7 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
 //    @SuppressWarnings("unchecked")
     // @Override
     public<T> DataFactory<T> newDataFactory(QName qName, Class<?> ... classes) throws APIException {
-//        if(String.class.isAssignableFrom(classes[0])) 
+//        if (String.class.isAssignableFrom(classes[0])) 
 //            return (DataFactory<T>) new StringDF(this);
         return new JAXBDF<T>(this, qName, classes);
     }
@@ -274,9 +299,9 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
     }
 
     public void loadFromSystemPropsStartsWith(String ... str) {
-         for(String name : System.getProperties().stringPropertyNames()) {
-            for(String s : str) {
-                if(name.startsWith(s)) {
+         for (String name : System.getProperties().stringPropertyNames()) {
+            for (String s : str) {
+                if (name.startsWith(s)) {
                     setProperty(name, System.getProperty(name));
                 }
             }
@@ -289,10 +314,10 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
      */
     public void loadToSystemPropsStartsWith(String ... str) {
         String value;
-        for(String name : existingStaticSlotNames()) {
-            for(String s : str) {
-                if(name.startsWith(s)) {
-                    if((value = getProperty(name))!=null)
+        for (String name : existingStaticSlotNames()) {
+            for (String s : str) {
+                if (name.startsWith(s)) {
+                    if ((value = getProperty(name))!=null)
                         System.setProperty(name,value);
                 }
             }
@@ -301,24 +326,24 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX
     
     public void loadPropFiles(String tag, ClassLoader classloader) throws IOException {
         String propfiles = getProperty(tag);
-        if(propfiles!=null) {
-            for(String pf : Split.splitTrim(File.pathSeparatorChar, propfiles)) {
+        if (propfiles!=null) {
+            for (String pf : Split.splitTrim(File.pathSeparatorChar, propfiles)) {
                 InputStream is = classloader==null?null:classloader.getResourceAsStream(pf);
-                if(is==null) {
+                if (is==null) {
                     File f = new File(pf);
-                    if(f.exists()) {
+                    if (f.exists()) {
                         is = new FileInputStream(f);
                     }
                 }
-                if(is!=null) {
+                if (is!=null) {
                     BufferedReader br = new BufferedReader(new InputStreamReader(is));
                     try {
                         String line;
-                        while((line=br.readLine())!=null) {
+                        while ((line=br.readLine())!=null) {
                             line = line.trim();
-                            if(!line.startsWith("#")) {
+                            if (!line.startsWith("#")) {
                                 String[] tv = Split.splitTrim('=', line);
-                                if(tv.length==2) {
+                                if (tv.length==2) {
                                     setProperty(tv[0],tv[1]);
                                 }
                             }