Mass removal of all Tabs (Style Warnings)
[aaf/authz.git] / auth / auth-cass / src / main / java / org / onap / aaf / auth / dao / cass / ArtiDAO.java
index a6fbeca..6702476 100644 (file)
@@ -52,7 +52,7 @@ public class ArtiDAO extends CassDAOImpl<AuthzTrans,ArtiDAO.Data> {
     
     private HistoryDAO historyDAO;
     private PSInfo psByMechID,psByMachine, psByNs;
-       
+    
     public ArtiDAO(AuthzTrans trans, Cluster cluster, String keyspace) {
         super(trans, ArtiDAO.class.getSimpleName(),cluster, keyspace, Data.class,TABLE, readConsistency(trans,TABLE), writeConsistency(trans,TABLE));
         init(trans);
@@ -65,67 +65,67 @@ public class ArtiDAO extends CassDAOImpl<AuthzTrans,ArtiDAO.Data> {
     }
 
     public static final int KEYLIMIT = 2;
-       public static class Data implements Bytification {
-               public String                           mechid;
-               public String                           machine;
-        private Set<String>                    type;
-        public String                                  sponsor;
-        public String                                  ca;
-        public String                                  dir;
-        public String                                  ns;
-        public String                                  os_user;
-        public String                                  notify;
-        public Date                                    expires;
-        public int                                             renewDays;
-        public Set<String>                             sans;
+    public static class Data implements Bytification {
+        public String                   mechid;
+        public String                   machine;
+        private Set<String>              type;
+        public String                    sponsor;
+        public String                    ca;
+        public String                    dir;
+        public String                    ns;
+        public String                    os_user;
+        public String                    notify;
+        public Date                      expires;
+        public int                        renewDays;
+        public Set<String>                sans;
         
 //      // Getters
-               public Set<String> type(boolean mutable) {
-                       if (type == null) {
-                               type = new HashSet<>();
-                       } else if (mutable && !(type instanceof HashSet)) {
-                               type = new HashSet<>(type);
-                       }
-                       return type;
-               }
+        public Set<String> type(boolean mutable) {
+            if (type == null) {
+                type = new HashSet<>();
+            } else if (mutable && !(type instanceof HashSet)) {
+                type = new HashSet<>(type);
+            }
+            return type;
+        }
 
-               public Set<String> sans(boolean mutable) {
-                       if (sans == null) {
-                               sans = new HashSet<>();
-                       } else if (mutable && !(sans instanceof HashSet)) {
-                               sans = new HashSet<>(sans);
-                       }
-                       return sans;
-               }
+        public Set<String> sans(boolean mutable) {
+            if (sans == null) {
+                sans = new HashSet<>();
+            } else if (mutable && !(sans instanceof HashSet)) {
+                sans = new HashSet<>(sans);
+            }
+            return sans;
+        }
 
-               @Override
-               public ByteBuffer bytify() throws IOException {
-                       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                       ArtifactLoader.deflt.marshal(this,new DataOutputStream(baos));
-                       return ByteBuffer.wrap(baos.toByteArray());
-               }
-               
-               @Override
-               public void reconstitute(ByteBuffer bb) throws IOException {
-                       ArtifactLoader.deflt.unmarshal(this, toDIS(bb));
-               }
+        @Override
+        public ByteBuffer bytify() throws IOException {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ArtifactLoader.deflt.marshal(this,new DataOutputStream(baos));
+            return ByteBuffer.wrap(baos.toByteArray());
+        }
+        
+        @Override
+        public void reconstitute(ByteBuffer bb) throws IOException {
+            ArtifactLoader.deflt.unmarshal(this, toDIS(bb));
+        }
 
-               public String toString() {
-                       return mechid + ' ' + machine + ' ' + Chrono.dateTime(expires);
-               }
+        public String toString() {
+            return mechid + ' ' + machine + ' ' + Chrono.dateTime(expires);
+        }
     }
 
     private static class ArtifactLoader extends Loader<Data> implements Streamer<Data>{
-               public static final int MAGIC=95829343;
-       public static final int VERSION=1;
-       public static final int BUFF_SIZE=48; // Note: 
+        public static final int MAGIC=95829343;
+        public static final int VERSION=1;
+        public static final int BUFF_SIZE=48; // Note: 
 
-       public static final ArtifactLoader deflt = new ArtifactLoader(KEYLIMIT);
-       public ArtifactLoader(int keylimit) {
+        public static final ArtifactLoader deflt = new ArtifactLoader(KEYLIMIT);
+        public ArtifactLoader(int keylimit) {
             super(keylimit);
         }
 
-       @Override
+        @Override
         public Data load(Data data, Row row) {
             data.mechid = row.getString(0);
             data.machine = row.getString(1);
@@ -144,7 +144,7 @@ public class ArtiDAO extends CassDAOImpl<AuthzTrans,ArtiDAO.Data> {
 
         @Override
         protected void key(final Data data, final int idx, Object[] obj) {
-               int i;
+            int i;
             obj[i=idx] = data.mechid;
             obj[++i] = data.machine;
         }
@@ -164,110 +164,110 @@ public class ArtiDAO extends CassDAOImpl<AuthzTrans,ArtiDAO.Data> {
             obj[++i] = data.sans;
         }
 
-               @Override
-               public void marshal(Data data, DataOutputStream os) throws IOException {
-                       writeHeader(os,MAGIC,VERSION);
-                       writeString(os, data.mechid);
-                       writeString(os, data.machine);
-                       os.writeInt(data.type.size());
-                       for(String s : data.type) {
-                               writeString(os, s);
-                       }
-                       writeString(os, data.sponsor);
-                       writeString(os, data.ca);
-                       writeString(os, data.dir);
-                       writeString(os, data.ns);
-                       writeString(os, data.os_user);
-                       writeString(os, data.notify);
-                       os.writeLong(data.expires==null?-1:data.expires.getTime());
-                       os.writeInt(data.renewDays);
-                       if(data.sans!=null) {
-                               os.writeInt(data.sans.size());
-                               for(String s : data.sans) {
-                                       writeString(os, s);
-                               }
-                       } else {
-                               os.writeInt(0);
-                       }
-               }
+        @Override
+        public void marshal(Data data, DataOutputStream os) throws IOException {
+            writeHeader(os,MAGIC,VERSION);
+            writeString(os, data.mechid);
+            writeString(os, data.machine);
+            os.writeInt(data.type.size());
+            for(String s : data.type) {
+                writeString(os, s);
+            }
+            writeString(os, data.sponsor);
+            writeString(os, data.ca);
+            writeString(os, data.dir);
+            writeString(os, data.ns);
+            writeString(os, data.os_user);
+            writeString(os, data.notify);
+            os.writeLong(data.expires==null?-1:data.expires.getTime());
+            os.writeInt(data.renewDays);
+            if(data.sans!=null) {
+                os.writeInt(data.sans.size());
+                for(String s : data.sans) {
+                    writeString(os, s);
+                }
+            } else {
+                os.writeInt(0);
+            }
+        }
 
-               @Override
-               public void unmarshal(Data data, DataInputStream is) throws IOException {
-                       /*int version = */readHeader(is,MAGIC,VERSION);
-                       // If Version Changes between Production runs, you'll need to do a switch Statement, and adequately read in fields
-                       byte[] buff = new byte[BUFF_SIZE];
-                       data.mechid = readString(is,buff);
-                       data.machine = readString(is,buff);
-                       int size = is.readInt();
-                       data.type = new HashSet<>(size);
-                       for(int i=0;i<size;++i) {
-                               data.type.add(readString(is,buff));
-                       }
-                       data.sponsor = readString(is,buff);
-                       data.ca = readString(is,buff);
-                       data.dir = readString(is,buff);
-                       data.ns = readString(is,buff);
-                       data.os_user = readString(is,buff);
-                       data.notify = readString(is,buff);
-                       long l = is.readLong();
-                       data.expires = l<0?null:new Date(l);
-                       data.renewDays = is.readInt();
-                       size = is.readInt();
-                       data.sans = new HashSet<>(size);
-                       for(int i=0;i<size;++i) {
-                               data.sans.add(readString(is,buff));
-                       }
-               }
+        @Override
+        public void unmarshal(Data data, DataInputStream is) throws IOException {
+            /*int version = */readHeader(is,MAGIC,VERSION);
+            // If Version Changes between Production runs, you'll need to do a switch Statement, and adequately read in fields
+            byte[] buff = new byte[BUFF_SIZE];
+            data.mechid = readString(is,buff);
+            data.machine = readString(is,buff);
+            int size = is.readInt();
+            data.type = new HashSet<>(size);
+            for(int i=0;i<size;++i) {
+                data.type.add(readString(is,buff));
+            }
+            data.sponsor = readString(is,buff);
+            data.ca = readString(is,buff);
+            data.dir = readString(is,buff);
+            data.ns = readString(is,buff);
+            data.os_user = readString(is,buff);
+            data.notify = readString(is,buff);
+            long l = is.readLong();
+            data.expires = l<0?null:new Date(l);
+            data.renewDays = is.readInt();
+            size = is.readInt();
+            data.sans = new HashSet<>(size);
+            for(int i=0;i<size;++i) {
+                data.sans.add(readString(is,buff));
+            }
+        }
     }
 
     private void init(AuthzTrans trans) {
         // Set up sub-DAOs
         if(historyDAO==null) {
-               historyDAO = new HistoryDAO(trans,this);
+            historyDAO = new HistoryDAO(trans,this);
         }
         
         String[] helpers = setCRUD(trans, TABLE, Data.class, ArtifactLoader.deflt);
 
-               psByMechID = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE + 
-                               " WHERE mechid = ?", new ArtifactLoader(1) {
-                       @Override
-                       protected void key(Data data, int idx, Object[] obj) {
-                               obj[idx]=data.type;
-                       }
-               },readConsistency);
+        psByMechID = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE + 
+                " WHERE mechid = ?", new ArtifactLoader(1) {
+            @Override
+            protected void key(Data data, int idx, Object[] obj) {
+                obj[idx]=data.type;
+            }
+        },readConsistency);
 
-               psByMachine = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE + 
-                               " WHERE machine = ?", new ArtifactLoader(1) {
-                       @Override
-                       protected void key(Data data, int idx, Object[] obj) {
-                               obj[idx]=data.type;
-                       }
-               },readConsistency);
+        psByMachine = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE + 
+                " WHERE machine = ?", new ArtifactLoader(1) {
+            @Override
+            protected void key(Data data, int idx, Object[] obj) {
+                obj[idx]=data.type;
+            }
+        },readConsistency);
 
-               psByNs = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE + 
-                               " WHERE ns = ?", new ArtifactLoader(1) {
-                       @Override
-                       protected void key(Data data, int idx, Object[] obj) {
-                               obj[idx]=data.type;
-                       }
-               },readConsistency);
+        psByNs = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE + 
+                " WHERE ns = ?", new ArtifactLoader(1) {
+            @Override
+            protected void key(Data data, int idx, Object[] obj) {
+                obj[idx]=data.type;
+            }
+        },readConsistency);
 
 }
     
-       
+    
     public Result<List<Data>> readByMechID(AuthzTrans trans, String mechid) {
-               return psByMechID.read(trans, R_TEXT, new Object[]{mechid});
-       }
+        return psByMechID.read(trans, R_TEXT, new Object[]{mechid});
+    }
 
-       public Result<List<ArtiDAO.Data>> readByMachine(AuthzTrans trans, String machine) {
-               return psByMachine.read(trans, R_TEXT, new Object[]{machine});
-       }
+    public Result<List<ArtiDAO.Data>> readByMachine(AuthzTrans trans, String machine) {
+        return psByMachine.read(trans, R_TEXT, new Object[]{machine});
+    }
 
-       public Result<List<org.onap.aaf.auth.dao.cass.ArtiDAO.Data>> readByNs(AuthzTrans trans, String ns) {
-               return psByNs.read(trans, R_TEXT, new Object[]{ns});
-       }
+    public Result<List<org.onap.aaf.auth.dao.cass.ArtiDAO.Data>> readByNs(AuthzTrans trans, String ns) {
+        return psByNs.read(trans, R_TEXT, new Object[]{ns});
+    }
 
-       /**
+    /**
      * Log Modification statements to History
      *
      * @param modified        which CRUD action was done
@@ -276,8 +276,8 @@ public class ArtiDAO extends CassDAOImpl<AuthzTrans,ArtiDAO.Data> {
      */
     @Override
     protected void wasModified(AuthzTrans trans, CRUD modified, Data data, String ... override) {
-       boolean memo = override.length>0 && override[0]!=null;
-       boolean subject = override.length>1 && override[1]!=null;
+        boolean memo = override.length>0 && override[0]!=null;
+        boolean subject = override.length>1 && override[1]!=null;
 
         HistoryDAO.Data hd = HistoryDAO.newInitedData();
         hd.user = trans.user();
@@ -288,16 +288,16 @@ public class ArtiDAO extends CassDAOImpl<AuthzTrans,ArtiDAO.Data> {
                 ? String.format("%s by %s", override[0], hd.user)
                 : String.format("%sd %s for %s",modified.name(),data.mechid,data.machine);
         // Detail?
-               if(modified==CRUD.delete) {
-                               try {
-                                       hd.reconstruct = data.bytify();
-                               } catch (IOException e) {
-                                       trans.error().log(e,"Could not serialize CredDAO.Data");
-                               }
-                       }
+           if(modified==CRUD.delete) {
+                    try {
+                        hd.reconstruct = data.bytify();
+                    } catch (IOException e) {
+                        trans.error().log(e,"Could not serialize CredDAO.Data");
+                    }
+                }
 
         if(historyDAO.create(trans, hd).status!=Status.OK) {
-               trans.error().log("Cannot log to History");
+            trans.error().log("Cannot log to History");
         }
     }
 }