X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fhelpers%2FRole.java;h=46d3cced42d8b59eabc723c0c166493ab187754a;hb=refs%2Fchanges%2F75%2F65275%2F1;hp=a173c4fa224d4cb3f643bc76dc41fa44e2e1b5d3;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java
index a173c4fa..46d3cced 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java
@@ -42,134 +42,134 @@ public class Role implements Comparable<Role> {
     public static final TreeMap<Role,Set<String>> data = new TreeMap<>();
     public static final TreeMap<String,Role> keys = new TreeMap<>();
     public static final TreeMap<String,Role> byName = new TreeMap<>();
-	private static List<Role> deleteRoles = new ArrayList<>();
-
-	public final String ns, name, description;
-	private String full, encode;
-	public final Set<String> perms;
-	
-	public Role(String full) {
-		ns = name = description = "";
-		this.full = full;
-		perms = new HashSet<>();
-	}
-	
-	public Role(String ns, String name, String description,Set<String> perms) {
-		this.ns = ns;
-		this.name = name;
-		this.description = description;
-		this.full = null;
-		this.encode = null;
-		this.perms = perms;
-	}
-	
-	public String encode() {
-		if(encode==null) {
-			encode = ns + '|' + name;
-		} 
-		return encode;
-	}
-
-	public String fullName() {
-		if(full==null) {
-			full = ns + '.' + name;
-		} 
-		return full;
-	}
-
-	public static void load(Trans trans, Session session ) {
-		load(trans,session,"select ns, name, description, perms from authz.role;");
-	}
-
-	public static void loadOneNS(Trans trans, Session session, String ns ) {
-		load(trans,session,"select ns, name, description, perms from authz.role WHERE ns='" + ns + "';");
-	}
-
-	private static void load(Trans trans, Session session, String query) {
+    private static List<Role> deleteRoles = new ArrayList<>();
+
+    public final String ns, name, description;
+    private String full, encode;
+    public final Set<String> perms;
+    
+    public Role(String full) {
+        ns = name = description = "";
+        this.full = full;
+        perms = new HashSet<>();
+    }
+    
+    public Role(String ns, String name, String description,Set<String> perms) {
+        this.ns = ns;
+        this.name = name;
+        this.description = description;
+        this.full = null;
+        this.encode = null;
+        this.perms = perms;
+    }
+    
+    public String encode() {
+        if(encode==null) {
+            encode = ns + '|' + name;
+        } 
+        return encode;
+    }
+
+    public String fullName() {
+        if(full==null) {
+            full = ns + '.' + name;
+        } 
+        return full;
+    }
+
+    public static void load(Trans trans, Session session ) {
+        load(trans,session,"select ns, name, description, perms from authz.role;");
+    }
+
+    public static void loadOneNS(Trans trans, Session session, String ns ) {
+        load(trans,session,"select ns, name, description, perms from authz.role WHERE ns='" + ns + "';");
+    }
+
+    private static void load(Trans trans, Session session, String query) {
         trans.info().log( "query: " + query );
         TimeTaken tt = trans.start("Read Roles", Env.REMOTE);
        
         ResultSet results;
-		try {
-	        Statement stmt = new SimpleStatement( query );
-	        results = session.execute(stmt);
+        try {
+            Statement stmt = new SimpleStatement( query );
+            results = session.execute(stmt);
         } finally {
-        	tt.done();
+            tt.done();
         }
 
         try {
-	        Iterator<Row> iter = results.iterator();
-	        Row row;
-	        tt = trans.start("Load Roles", Env.SUB);
-	        try {
-		        while(iter.hasNext()) {
-		        	row = iter.next();
-		        	Role rk =new Role(row.getString(0),row.getString(1), row.getString(2),row.getSet(3,String.class));
-		        	keys.put(rk.encode(), rk);
-		        	data.put(rk,rk.perms);
-		        	byName.put(rk.fullName(), rk);
-		        }
-	        } finally {
-	        	tt.done();
-	        }
+            Iterator<Row> iter = results.iterator();
+            Row row;
+            tt = trans.start("Load Roles", Env.SUB);
+            try {
+                while(iter.hasNext()) {
+                    row = iter.next();
+                    Role rk =new Role(row.getString(0),row.getString(1), row.getString(2),row.getSet(3,String.class));
+                    keys.put(rk.encode(), rk);
+                    data.put(rk,rk.perms);
+                    byName.put(rk.fullName(), rk);
+                }
+            } finally {
+                tt.done();
+            }
         } finally {
-        	trans.info().log("Found",data.size(),"roles");
+            trans.info().log("Found",data.size(),"roles");
         }
-	}
-	
-	public static long count(Trans trans, Session session) {
-		String query = "select count(*) from authz.role LIMIT 1000000;";
+    }
+    
+    public static long count(Trans trans, Session session) {
+        String query = "select count(*) from authz.role LIMIT 1000000;";
         trans.info().log( "query: " + query );
         TimeTaken tt = trans.start("Count Namespaces", Env.REMOTE);
         ResultSet results;
         try {
-        	Statement stmt = new SimpleStatement(query).setReadTimeoutMillis(12000);
-	        results = session.execute(stmt);
-	        return results.one().getLong(0);
+            Statement stmt = new SimpleStatement(query).setReadTimeoutMillis(12000);
+            results = session.execute(stmt);
+            return results.one().getLong(0);
         } finally {
-        	tt.done();
+            tt.done();
+        }
+    }
+
+    public String toString() {
+        return encode();
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return encode().hashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        return encode().equals(obj);
+    }
+
+    @Override
+    public int compareTo(Role o) {
+        return encode().compareTo(o.encode());
+    }
+
+    public static String fullName(String role) {
+        return role.replace('|', '.');
+    }
+    
+    public static void stageRemove(Role r) {
+        deleteRoles.add(r);
+    }
+    
+    public static void executeRemove() {
+        for(Role p : deleteRoles) {
+            keys.remove(p.encode);
+            data.remove(p);
         }
-	}
-
-	public String toString() {
-		return encode();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return encode().hashCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		return encode().equals(obj);
-	}
-
-	@Override
-	public int compareTo(Role o) {
-		return encode().compareTo(o.encode());
-	}
-
-	public static String fullName(String role) {
-		return role.replace('|', '.');
-	}
-	
-	public static void stageRemove(Role r) {
-		deleteRoles.add(r);
-	}
-	
-	public static void executeRemove() {
-		for(Role p : deleteRoles) {
-			keys.remove(p.encode);
-			data.remove(p);
-		}
-		deleteRoles.clear();
-	}
+        deleteRoles.clear();
+    }
 
 }
\ No newline at end of file