Improve Pool

[aaf/authz.git] / misc / env / src / main / java / org / onap / aaf / misc / env / impl / BasicEnv.java

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