X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Frserv%2FCachingFileAccess.java;h=3c76e928c6d9bd4151e97d833e590f6c3fb5baf5;hb=3ca2e6964bf2aab93394cf542b6354ca735703c0;hp=37f3b0889ff5a4f5ff65693db7c70d1ec8ec718f;hpb=82093b06399d9a57cd7e486e9fbeeea9d026cc7c;p=aaf%2Fauthz.git

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/CachingFileAccess.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/CachingFileAccess.java
index 37f3b088..3c76e928 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/CachingFileAccess.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/CachingFileAccess.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.
@@ -55,15 +55,15 @@ import org.onap.aaf.misc.env.Store;
 import org.onap.aaf.misc.env.Trans;
 /*
  * CachingFileAccess
- * 
+ *
  * Author: Jonathan Gathman, Gathsys 2010
- *  
+ *
  */
 public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void> {
     public static void setEnv(Store store, String[] args) {
-        for (int i=0;i<args.length-1;i+=2) { // cover two parms required for each 
+        for (int i=0;i<args.length-1;i+=2) { // cover two parms required for each
             if (CFA_WEB_PATH.equals(args[i])) {
-                store.put(store.staticSlot(CFA_WEB_PATH), args[i+1]); 
+                store.put(store.staticSlot(CFA_WEB_PATH), args[i+1]);
             } else if (CFA_CACHE_CHECK_INTERVAL.equals(args[i])) {
                 store.put(store.staticSlot(CFA_CACHE_CHECK_INTERVAL), Long.parseLong(args[i+1]));
             } else if (CFA_MAX_SIZE.equals(args[i])) {
@@ -71,7 +71,7 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
             }
         }
     }
-    
+
     private static String MAX_AGE = "max-age=3600"; // 1 hour Caching
     private final Map<String,String> typeMap;
     private final NavigableMap<String,Content> content;
@@ -79,7 +79,7 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
     public final static String CFA_WEB_PATH = "aaf_cfa_web_path";
     // when to re-validate from file
     // Re validating means comparing the Timestamp on the disk, and seeing it has changed.  Cache is not marked
-    // dirty unless file has changed, but it still makes File IO, which for some kinds of cached data, i.e. 
+    // dirty unless file has changed, but it still makes File IO, which for some kinds of cached data, i.e.
     // deployed GUI elements is unnecessary, and wastes time.
     // This parameter exists to cover the cases where data can be more volatile, so the user can choose how often the
     // File IO will be accessed, based on probability of change.  "0", of course, means, check every time.
@@ -96,10 +96,10 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
     private String web_path;
     // A command key is set in the Properties, preferably changed on deployment.
     // it is compared at the beginning of the path, and if so, it is assumed to issue certain commands
-    // It's purpose is to protect, to some degree the command, even though it is HTTP, allowing 
+    // It's purpose is to protect, to some degree the command, even though it is HTTP, allowing
     // local batch files to, for instance, clear caches on resetting of files.
     private String clear_command;
-    
+
     public CachingFileAccess(EnvJAXB env, String ... args) throws IOException {
         super(null,"Caching File Access");
         setEnv(env,args);
@@ -130,32 +130,38 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
         typeMap.put("class", "application/java");
         typeMap.put("props", "text/plain");
         typeMap.put("jks", "application/octet-stream");
-        
+
         // Fonts
         typeMap.put("ttf","font/ttf");
         typeMap.put("woff","font/woff");
         typeMap.put("woff2","font/woff2");
 
-        
+
         timer = new Timer("Caching Cleanup",true);
         timer.schedule(new Cleanup(content,500),60000,60000);
-        
+
         // Property params
         web_path = env.get(env.staticSlot(CFA_WEB_PATH));
         env.init().log("CachingFileAccess path: " + new File(web_path).getCanonicalPath());
         Object obj;
         obj = env.get(env.staticSlot(CFA_CACHE_CHECK_INTERVAL),600000L);  // Default is 10 mins
-        if (obj instanceof Long) {checkInterval=(Long)obj;
-        } else {checkInterval=Long.parseLong((String)obj);}
-        
+        if (obj instanceof Long) {
+          checkInterval=(Long)obj;
+        } else {
+          checkInterval=Long.parseLong((String)obj);
+        }
+
         obj = env.get(env.staticSlot(CFA_MAX_SIZE), 512000);    // Default is max file 500k
-        if (obj instanceof Integer) {maxItemSize=(Integer)obj;
-        } else {maxItemSize =Integer.parseInt((String)obj);}
-              
+        if (obj instanceof Integer) {
+          maxItemSize=(Integer)obj;
+        } else {
+          maxItemSize =Integer.parseInt((String)obj);
+        }
+
          clear_command = env.getProperty(CFA_CLEAR_COMMAND,null);
     }
 
-    
+
 
     @Override
     public void handle(TRANS trans, HttpServletRequest req, HttpServletResponse resp) throws IOException {
@@ -184,12 +190,12 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
     public String webPath() {
         return web_path;
     }
-    
+
     /**
      * Reset the Cleanup size and interval
-     * 
+     *
      * The size and interval when started are 500 items (memory size unknown) checked every minute in a background thread.
-     * 
+     *
      * @param size
      * @param interval
      */
@@ -198,13 +204,13 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
         timer = new Timer();
         timer.schedule(new Cleanup(content,size), interval, interval);
     }
-    
 
-    
+
+
     /**
      * Load a file, first checking cache
-     * 
-     * 
+     *
+     *
      * @param logTarget - logTarget can be null (won't log)
      * @param dataRoot - data root storage directory
      * @param key - relative File Path
@@ -228,7 +234,7 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
             isRoot = false;
         }
         Content c = content.get(key);
-        long systime = System.currentTimeMillis(); 
+        long systime = System.currentTimeMillis();
         File f=null;
         if (c!=null) {
             // Don't check every hit... only after certain time value
@@ -239,11 +245,11 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
                 }
             }
         }
-        if (c==null) {    
+        if (c==null) {
             if (logTarget!=null) {
                 logTarget.log("File Read: ",key);
             }
-            
+
             if (f==null){
                 f = new File(fileName);
             }
@@ -260,7 +266,7 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
                         c = new CachedContent(f);
                         cacheMe = checkInterval>0;
                     }
-                    
+
                     if (mediaType==null) { // determine from file Ending
                         int idx = key.lastIndexOf('.');
                         String subkey = key.substring(++idx);
@@ -273,9 +279,9 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
                         c.contentType=mediaType;
                         c.attachmentOnly = false;
                     }
-                    
+
                     c.date = f.lastModified();
-                    
+
                     if (cacheMe) {
                         content.put(key, c);
                     }
@@ -291,14 +297,14 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
         c.access = systime;
         return c;
     }
-    
+
 
     public void invalidate(String key) {
         content.remove(key);
     }
-    
+
     private static final Content NULL=new Content() {
-        
+
         @Override
         public void setHeader(HttpServletResponse resp) {
             resp.setStatus(404/*NOT_FOUND_404*/);
@@ -312,37 +318,37 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
         @Override
         public void write(OutputStream os) throws IOException {
         }
-        
+
     };
 
     private static abstract class Content {
         private long date;   // date of the actual artifact (i.e. File modified date)
         private long access; // last accessed
-        
+
         protected String  contentType;
         protected boolean attachmentOnly;
-        
+
         public void setHeader(HttpServletResponse resp) {
             resp.setStatus(200/*OK_200*/);
             resp.setHeader("Content-Type",contentType);
             resp.setHeader("Cache-Control", MAX_AGE);
         }
-        
+
         public abstract void write(Writer writer) throws IOException;
         public abstract void write(OutputStream os) throws IOException;
 
     }
 
     private static class DirectFileContent extends Content {
-        private File file; 
+        private File file;
         public DirectFileContent(File f) {
             file = f;
         }
-        
+
         public String toString() {
             return file.getName();
         }
-        
+
         public void write(Writer writer) throws IOException {
             FileReader fr = new FileReader(file);
             char[] buff = new char[1024];
@@ -381,7 +387,7 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
 
         public DirectoryContent(File directory, boolean isRoot) {
             notRoot = !isRoot;
-        
+
             files = directory.listFiles();
             Arrays.sort(files,new Comparator<File>() {
                 @Override
@@ -393,7 +399,7 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
                         // if numbers, are the numbers in the same start position
                         int i1 = m1.start();
                         int i2 = m2.start();
-                        
+
                         // If same start position and the text is the same, then reverse sort
                         if (i1==i2 && f1.getName().startsWith(f2.getName().substring(0,i1))) {
                             // reverse sort files that start similarly, but have numbers in them
@@ -402,14 +408,14 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
                     }
                     return f1.compareTo(f2);
                 }
-                
+
             });
             name = directory.getName();
             attachmentOnly = false;
             contentType = "text/html";
         }
-        
-    
+
+
         @Override
         public void write(Writer w) throws IOException {
             w.append(H1);
@@ -429,19 +435,19 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
             w.append(F);
             w.flush();
         }
-    
+
         @Override
         public void write(OutputStream os) throws IOException {
             write(new OutputStreamWriter(os));
         }
-    
+
     }
 
     private static class CachedContent extends Content {
         private byte[] data;
         private int end;
-        private char[] cdata; 
-        
+        private char[] cdata;
+
         public CachedContent(File f) throws IOException {
             // Read and Cache
             ByteBuffer bb = ByteBuffer.allocate((int)f.length());
@@ -456,11 +462,11 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
             end = bb.position();
             cdata=null;
         }
-        
+
         public String toString() {
             return Arrays.toString(data);
         }
-        
+
         public void write(Writer writer) throws IOException {
             synchronized(this) {
                 // do the String Transformation once, and only if actually used
@@ -489,24 +495,24 @@ public class CachingFileAccess<TRANS extends Trans> extends HttpCode<TRANS, Void
     private static class Cleanup extends TimerTask {
         private int maxSize;
         private NavigableMap<String, Content> content;
-        
+
         public Cleanup(NavigableMap<String, Content> content, int size) {
             maxSize = size;
             this.content = content;
         }
-        
+
         private class Comp implements Comparable<Comp> {
             public Map.Entry<String, Content> entry;
-            
+
             public Comp(Map.Entry<String, Content> en) {
                 entry = en;
             }
-            
+
             @Override
             public int compareTo(Comp o) {
                 return (int)(entry.getValue().access-o.entry.getValue().access);
             }
-            
+
         }
         @SuppressWarnings("unchecked")
         @Override