X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FFuture.java;h=67923e80e0e9a618beace4a6502c9b56889e028a;hb=78ccdcc1d1c29760e4cf833f94df62e1c5aa733f;hp=4f87e330a2318ee5f33c68ba2a0273fc8939c81b;hpb=889a9891f6df5bbb26a760cfb106be947e87aa5c;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
index 4f87e330..67923e80 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
@@ -9,9 +9,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.
@@ -49,14 +49,14 @@ import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
 
 public class Future implements CacheChange.Data, Comparable<Future> {
-    public static final Map<UUID,Future> data = new TreeMap<>();
-    public static final Map<String,List<Future>> byRole = new TreeMap<>();
-    
+    protected static final Map<UUID,Future> data = new TreeMap<>();
+    protected static final Map<String,List<Future>> byRole = new TreeMap<>();
+
     public final FutureDAO.Data fdd;
     public final String role; // derived
     private static final CacheChange<Future> cache = new CacheChange<>();
 
-    public static Creator<Future> v2_0_17 = new Creator<Future>() {
+    public static final Creator<Future> v2_0_17 = new Creator<Future>() {
         @Override
         public Future create(Row row) {
             return new Future(row.getUUID(0),row.getString(1),row.getString(2),
@@ -69,7 +69,7 @@ public class Future implements CacheChange.Data, Comparable<Future> {
         }
     };
 
-    public static Creator<Future> withConstruct = new Creator<Future>() {
+    public static final Creator<Future> withConstruct = new Creator<Future>() {
         @Override
         public String select() {
             return "select id,memo,target,start,expires,construct from authz.future";
@@ -93,58 +93,49 @@ public class Future implements CacheChange.Data, Comparable<Future> {
         fdd.expires = expires;
         fdd.construct = construct;
         String role = null;
-        switch(target) {
-        	case "user_role":
-    			UserRoleDAO.Data urdd = new UserRoleDAO.Data();
-    			try {
-    				urdd.reconstitute(construct);
-    				fdd.target_key = urdd.user + '|' + urdd.role;
-    				fdd.target_date=urdd.expires;
-    				role=urdd.role;
-    			} catch (IOException e) {
-    				e.printStackTrace(System.err);
-    			}
-    			break;
+        if ("user_role".equals(target)) {
+            UserRoleDAO.Data urdd = new UserRoleDAO.Data();
+            try {
+                urdd.reconstitute(construct);
+                fdd.target_key = urdd.user + '|' + urdd.role;
+                fdd.target_date = urdd.expires;
+                role = urdd.role;
+            } catch (IOException e) {
+                e.printStackTrace(System.err);
+            }
         }
-    	this.role = role;
+        this.role = role;
     }
-    
+
     public final UUID id() {
         return fdd.id;
     }
-    
+
     public final String memo() {
         return fdd.memo;
     }
-    
+
     public final String target() {
         return fdd.target;
     }
-    
+
     public final Date start() {
         return fdd.start;
     }
-    
+
     public final Date expires() {
         return fdd.expires;
     }
-    
+
     public static void load(Trans trans, Session session, Creator<Future> creator) {
-    	load(trans,session,creator, new Visitor<Future>() {
-			@Override
-			public void visit(Future f) {
-			    data.put(f.fdd.id,f);
-			    if (f.role==null) {
-			        return;
-			    }
-			    List<Future> lf = byRole.get(f.role);
-			    if (lf==null) {
-			        lf = new ArrayList<>();
-			        byRole.put(f.role,lf);
-			    }
-			    lf.add(f);
-			}
-		});
+        load(trans,session,creator, f -> {
+            data.put(f.fdd.id,f);
+            if (f.role==null) {
+                return;
+            }
+            List<Future> lf = byRole.computeIfAbsent(f.role, k -> new ArrayList<>());
+            lf.add(f);
+        });
     }
 
 
@@ -158,13 +149,13 @@ public class Future implements CacheChange.Data, Comparable<Future> {
         } finally {
             tt.done();
         }
-        
+
         int count = 0;
         tt = trans.start("Process Futures", Env.SUB);
         try {
             for (Row row : results.all()) {
-        	    ++count;
-            	visitor.visit(creator.create(row));
+                ++count;
+                visitor.visit(creator.create(row));
             }
         } finally {
             tt.done();
@@ -190,7 +181,7 @@ public class Future implements CacheChange.Data, Comparable<Future> {
         }
         return rv;
     }
-    
+
     /* (non-Javadoc)
      * @see org.onap.aaf.auth.helpers.CacheChange.Data#resetLocalData()
      */
@@ -216,7 +207,7 @@ public class Future implements CacheChange.Data, Comparable<Future> {
     public static void resetLocalData() {
         cache.resetLocalData();
     }
-    
+
     public static int sizeForDeletion() {
         return cache.cacheSize();
     }
@@ -224,16 +215,16 @@ public class Future implements CacheChange.Data, Comparable<Future> {
     public static boolean pendingDelete(Future f) {
         return cache.contains(f);
     }
-    
-	public static void row(CSV.Writer cw, Future f) {
-		cw.row("future",f.fdd.id,f.fdd.target,f.fdd.expires,f.role,f.fdd.memo);
-	}
+
+    public static void row(CSV.Writer cw, Future f) {
+        cw.row("future",f.fdd.id,f.fdd.target,f.fdd.expires,f.role,f.fdd.memo);
+    }
 
 
-	public static void deleteByIDBatch(StringBuilder sb, String id) {
-		sb.append("DELETE from authz.future where id=");
-		sb.append(id);
-		sb.append(";\n");
-	}
+    public static void deleteByIDBatch(StringBuilder sb, String id) {
+        sb.append("DELETE from authz.future where id=");
+        sb.append(id);
+        sb.append(";\n");
+    }
 
 }