Organization defined users whose user roles do not expire will also not have their...

[aaf/authz.git] / auth / auth-cass / src / main / java / org / onap / aaf / auth / dao / Loader.java

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/Loader.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/Loader.java
index cdfd069..9320381 100644 (file)
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/Loader.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/Loader.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.
@@ -40,11 +40,11 @@ public abstract class Loader<DATA> {
     public Loader(int keylimit) {
         this.keylimit = keylimit;
     }
-    
+
     public int keylimit() {
         return keylimit;
     }
-    
+
     protected abstract DATA load(DATA data, Row row);
     protected abstract void key(DATA data, int idx, Object[] obj);
     protected abstract void body(DATA data, int idx, Object[] obj);
@@ -60,23 +60,23 @@ public abstract class Loader<DATA> {
                 rv = new Object[size];
                 body(data,0,rv);
                 int body = size-keylimit();
-                if(body>0) {
+                if (body>0) {
                     key(data,body,rv);
                 }
                 break;
             default:
                 rv = new Object[size];
                 key(data,0,rv);
-                if(size>keylimit()) {
+                if (size>keylimit()) {
                     body(data,keylimit(),rv);
                 }
                 break;
         }
         return rv;
     }
-    
+
     public static void writeString(DataOutputStream os, String s) throws IOException {
-        if(s==null) {
+        if (s==null) {
             os.writeInt(-1);
         } else {
             switch(s.length()) {
@@ -90,11 +90,11 @@ public abstract class Loader<DATA> {
             }
         }
     }
-    
-    
+
+
     /**
      * We use bytes here to set a Maximum
-     * 
+     *
      * @param is
      * @param MAX
      * @return
@@ -108,7 +108,7 @@ public abstract class Loader<DATA> {
             case  0: return "";
             default:
                 // Cover case where there is a large string, without always allocating a large buffer.
-                if(l>buff.length) {
+                if (l>buff.length) {
                     buff = new byte[l];
                 }
                 is.read(buff,0,l);
@@ -118,63 +118,63 @@ public abstract class Loader<DATA> {
 
     /**
      * Write a set with proper sizing
-     * 
+     *
      * Note: at the moment, this is just String.  Probably can develop system where types
      * are supported too... but not now.
-     * 
+     *
      * @param os
      * @param set
      * @throws IOException
      */
     public static void writeStringSet(DataOutputStream os, Collection<String> set) throws IOException {
-        if(set==null) {
+        if (set==null) {
             os.writeInt(-1);
         } else {
             os.writeInt(set.size());
-            for(String s : set) {
+            for (String s : set) {
                 writeString(os, s);
             }
         }
 
     }
-    
+
     public static Set<String> readStringSet(DataInputStream is, byte[] buff) throws IOException {
         int l = is.readInt();
-        if(l<0) {
+        if (l<0) {
             return null;
         }
         Set<String> set = new HashSet<>(l);
-        for(int i=0;i<l;++i) {
+        for (int i=0;i<l;++i) {
             set.add(readString(is,buff));
         }
         return set;
     }
-    
+
     public static List<String> readStringList(DataInputStream is, byte[] buff) throws IOException {
         int l = is.readInt();
-        if(l<0) {
+        if (l<0) {
             return null;
         }
         List<String> list = new ArrayList<>(l);
-        for(int i=0;i<l;++i) {
+        for (int i=0;i<l;++i) {
             list.add(Loader.readString(is,buff));
         }
         return list;
     }
 
-    /** 
+    /**
      * Write a map
      * @param os
      * @param map
      * @throws IOException
      */
     public static void writeStringMap(DataOutputStream os, Map<String,String> map) throws IOException {
-        if(map==null) {
+        if (map==null) {
             os.writeInt(-1);
         } else {
             Set<Entry<String, String>> es = map.entrySet();
             os.writeInt(es.size());
-            for(Entry<String,String> e : es) {
+            for (Entry<String,String> e : es) {
                 writeString(os, e.getKey());
                 writeString(os, e.getValue());
             }
@@ -184,11 +184,11 @@ public abstract class Loader<DATA> {
 
     public static Map<String,String> readStringMap(DataInputStream is, byte[] buff) throws IOException {
         int l = is.readInt();
-        if(l<0) {
+        if (l<0) {
             return null;
         }
         Map<String,String> map = new HashMap<>(l);
-        for(int i=0;i<l;++i) {
+        for (int i=0;i<l;++i) {
             String key = readString(is,buff);
             map.put(key,readString(is,buff));
         }
@@ -198,13 +198,13 @@ public abstract class Loader<DATA> {
         os.writeInt(magic);
         os.writeInt(version);
     }
-    
+
     public static int readHeader(DataInputStream is, final int magic, final int version) throws IOException {
-        if(is.readInt()!=magic) {
+        if (is.readInt()!=magic) {
             throw new IOException("Corrupted Data Stream");
         }
         int v = is.readInt();
-        if(version<0 || v>version) {
+        if (version<0 || v>version) {
             throw new IOException("Unsupported Data Version: " + v);
         }
         return v;