X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fhelpers%2FNS.java;h=a2833e55babd60f8dbb20840917a602ee0a823a9;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hp=172768cbdcd2bac789478d74ec08bb3f8331d59c;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java
index 172768cb..a2833e55 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java
@@ -36,133 +36,133 @@ import com.datastax.driver.core.SimpleStatement;
 import com.datastax.driver.core.Statement;
 
 public class NS implements Comparable<NS> {
-	public final static Map<String,NS> data = new TreeMap<>();
-
-	public final String name, description, parent;
-	public final int scope,type;
-
-	public NS(String name, String description, String parent, int type, int scope) {
-		this.name = name;
-		this.description = description;
-		this.parent = parent;
-		this.scope = scope;
-		this.type = type;
-	}
-	
-	public static void load(Trans trans, Session session, Creator<NS> creator) {
-		load(trans,session,
-				"select name, description, parent, type, scope from authz.ns;"
-				,creator);
-	}
-	
-	public static void loadOne(Trans trans, Session session, Creator<NS> creator, String ns) {
-	    load(trans,session,
-				("select name, description, parent, type, scope from authz.ns WHERE name='"+ns+"';")
-				,creator
-				);
-	}
-
-	private static void load(Trans trans, Session session, String query, Creator<NS> creator) {
+    public final static Map<String,NS> data = new TreeMap<>();
+
+    public final String name, description, parent;
+    public final int scope,type;
+
+    public NS(String name, String description, String parent, int type, int scope) {
+        this.name = name;
+        this.description = description;
+        this.parent = parent;
+        this.scope = scope;
+        this.type = type;
+    }
+    
+    public static void load(Trans trans, Session session, Creator<NS> creator) {
+        load(trans,session,
+                "select name, description, parent, type, scope from authz.ns;"
+                ,creator);
+    }
+    
+    public static void loadOne(Trans trans, Session session, Creator<NS> creator, String ns) {
+        load(trans,session,
+                ("select name, description, parent, type, scope from authz.ns WHERE name='"+ns+"';")
+                ,creator
+                );
+    }
+
+    private static void load(Trans trans, Session session, String query, Creator<NS> creator) {
         trans.info().log( "query: " + query );
         ResultSet results;
         TimeTaken tt;
 
         tt = trans.start("Read Namespaces", Env.REMOTE);
         try {
-	        Statement stmt = new SimpleStatement( query );
-	        results = session.execute(stmt);
+            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 Namespaces", Env.SUB);
-	        try {
-		        while(iter.hasNext()) {
-		        	row = iter.next();
-		        	NS ns = creator.create(row);
-		        	data.put(ns.name,ns);
-		        }
-	        } finally {
-	        	tt.done();
-	        }
+            Iterator<Row> iter = results.iterator();
+            Row row;
+            tt = trans.start("Load Namespaces", Env.SUB);
+            try {
+                while(iter.hasNext()) {
+                    row = iter.next();
+                    NS ns = creator.create(row);
+                    data.put(ns.name,ns);
+                }
+            } finally {
+                tt.done();
+            }
         } finally {
-        	trans.info().log("Found",data.size(),"Namespaces");
+            trans.info().log("Found",data.size(),"Namespaces");
         }
 
-	}
+    }
 
-	public static long count(Trans trans, Session session) {
-		String query = "select count(*) from authz.ns LIMIT 1000000;";
+    public static long count(Trans trans, Session session) {
+        String query = "select count(*) from authz.ns 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 name;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        return name.equals(obj);
+    }
+
+    @Override
+    public int compareTo(NS o) {
+        return name.compareTo(o.name);
+    }
+    
+    public static class NSSplit {
+        public String ns;
+        public String other;
+        public NSSplit(String s, int dot) {
+            ns = s.substring(0,dot);
+            other = s.substring(dot+1);
+        }
+    }
+    public static NSSplit deriveParent(String dotted) {
+        if(dotted==null)return null;
+        for(int idx = dotted.lastIndexOf('.');idx>=0; idx=dotted.lastIndexOf('.',idx-1)) {
+            if(data.get(dotted.substring(0, idx))!=null) {
+                return new NSSplit(dotted,idx);
+            }
+        }
+        return null;
+    }
+    
+    public static Creator<NS> v2_0_11 = new Creator<NS> () {
+        @Override
+        public NS create(Row row) {
+            return new NS(row.getString(0),row.getString(1), row.getString(2),row.getInt(3),row.getInt(4));
+        }
+        
+        @Override
+        public String select() {
+            return "SELECT name, description, parent, type, scope FROM authz.ns ";
+        }
+    };
+
         
-	public String toString() {
-		return name;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return name.hashCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		return name.equals(obj);
-	}
-
-	@Override
-	public int compareTo(NS o) {
-		return name.compareTo(o.name);
-	}
-	
-	public static class NSSplit {
-		public String ns;
-		public String other;
-		public NSSplit(String s, int dot) {
-			ns = s.substring(0,dot);
-			other = s.substring(dot+1);
-		}
-	}
-	public static NSSplit deriveParent(String dotted) {
-		if(dotted==null)return null;
-		for(int idx = dotted.lastIndexOf('.');idx>=0; idx=dotted.lastIndexOf('.',idx-1)) {
-			if(data.get(dotted.substring(0, idx))!=null) {
-				return new NSSplit(dotted,idx);
-			}
-		}
-		return null;
-	}
-	
-	public static Creator<NS> v2_0_11 = new Creator<NS> () {
-		@Override
-		public NS create(Row row) {
-			return new NS(row.getString(0),row.getString(1), row.getString(2),row.getInt(3),row.getInt(4));
-		}
-		
-		@Override
-		public String select() {
-			return "SELECT name, description, parent, type, scope FROM authz.ns ";
-		}
-	};
-
-		
 }
\ No newline at end of file