Mass removal of all Tabs (Style Warnings)
[aaf/authz.git] / auth / auth-cass / src / main / java / org / onap / aaf / auth / dao / cass / CertDAO.java
index 28e2749..00c9ae9 100644 (file)
@@ -52,9 +52,9 @@ public class CertDAO extends CassDAOImpl<AuthzTrans,CertDAO.Data> {
     public static final int CACHE_SEG = 0x40; // yields segment 0x0-0x3F
     
     private HistoryDAO historyDAO;
-       private CIDAO<AuthzTrans> infoDAO;
-       private PSInfo psX500,psID;
-       
+    private CIDAO<AuthzTrans> infoDAO;
+    private PSInfo psX500,psID;
+    
     public CertDAO(AuthzTrans trans, Cluster cluster, String keyspace) throws APIException, IOException {
         super(trans, CertDAO.class.getSimpleName(),cluster, keyspace, Data.class,TABLE, readConsistency(trans,TABLE), writeConsistency(trans,TABLE));
         init(trans);
@@ -68,47 +68,47 @@ public class CertDAO extends CassDAOImpl<AuthzTrans,CertDAO.Data> {
     }
     
     public static final int KEYLIMIT = 2;
-       public static class Data extends CacheableData implements Bytification {
-       
-        public String                                  ca;
-               public BigInteger                               serial;
-        public String                          id;
-        public String                                  x500;
-        public String                                  x509;
+    public static class Data extends CacheableData implements Bytification {
+        
+        public String                    ca;
+        public BigInteger                 serial;
+        public String                      id;
+        public String                    x500;
+        public String                    x509;
 
         @Override
-               public int[] invalidate(Cached<?,?> cache) {
-               return new int[] {
-                       seg(cache,ca,serial)
-               };
-               }
+        public int[] invalidate(Cached<?,?> cache) {
+            return new int[] {
+                seg(cache,ca,serial)
+            };
+        }
         
-               @Override
-               public ByteBuffer bytify() throws IOException {
-                       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                       CertLoader.deflt.marshal(this,new DataOutputStream(baos));
-                       return ByteBuffer.wrap(baos.toByteArray());
-               }
-               
-               @Override
-               public void reconstitute(ByteBuffer bb) throws IOException {
-                       CertLoader.deflt.unmarshal(this, toDIS(bb));
-               }
+        @Override
+        public ByteBuffer bytify() throws IOException {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            CertLoader.deflt.marshal(this,new DataOutputStream(baos));
+            return ByteBuffer.wrap(baos.toByteArray());
+        }
+        
+        @Override
+        public void reconstitute(ByteBuffer bb) throws IOException {
+            CertLoader.deflt.unmarshal(this, toDIS(bb));
+        }
     }
 
     private static class CertLoader extends Loader<Data> implements Streamer<Data>{
-               public static final int MAGIC=85102934;
-       public static final int VERSION=1;
-       public static final int BUFF_SIZE=48; // Note: 
+        public static final int MAGIC=85102934;
+        public static final int VERSION=1;
+        public static final int BUFF_SIZE=48; // Note: 
 
-       public static final CertLoader deflt = new CertLoader(KEYLIMIT);
-       public CertLoader(int keylimit) {
+        public static final CertLoader deflt = new CertLoader(KEYLIMIT);
+        public CertLoader(int keylimit) {
             super(keylimit);
         }
 
-       @Override
+        @Override
         public Data load(Data data, Row row) {
-               data.ca = row.getString(0);
+            data.ca = row.getString(0);
             ByteBuffer bb = row.getBytesUnsafe(1);
             byte[] bytes = new byte[bb.remaining()];
             bb.get(bytes);
@@ -127,7 +127,7 @@ public class CertDAO extends CassDAOImpl<AuthzTrans,CertDAO.Data> {
 
         @Override
         protected void body(Data data, int _idx, Object[] obj) {
-               int idx = _idx;
+            int idx = _idx;
 
             obj[idx] = data.id;
             obj[++idx] = data.x500;
@@ -136,74 +136,74 @@ public class CertDAO extends CassDAOImpl<AuthzTrans,CertDAO.Data> {
             
         }
 
-               @Override
-               public void marshal(Data data, DataOutputStream os) throws IOException {
-                       writeHeader(os,MAGIC,VERSION);
-                       writeString(os, data.id);
-                       writeString(os, data.x500);
-                       writeString(os, data.x509);
-                       writeString(os, data.ca);
-                       if(data.serial==null) {
-                               os.writeInt(-1);
-                       } else {
-                               byte[] dsba = data.serial.toByteArray();
-                               int l = dsba.length;
-                               os.writeInt(l);
-                               os.write(dsba,0,l);
-                       }
-               }
-
-               @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.id = readString(is,buff);
-                       data.x500 = readString(is,buff);
-                       data.x509 = readString(is,buff);
-                       data.ca = readString(is,buff);
-                       int i = is.readInt();
-                       data.serial=null;
-                       if(i>=0) {
-                               byte[] bytes = new byte[i]; // a bit dangerous, but lessened because of all the previous sized data reads
-                               if(is.read(bytes)>0) {
-                                       data.serial = new BigInteger(bytes);
-                               }
-                       }
-               }
+        @Override
+        public void marshal(Data data, DataOutputStream os) throws IOException {
+            writeHeader(os,MAGIC,VERSION);
+            writeString(os, data.id);
+            writeString(os, data.x500);
+            writeString(os, data.x509);
+            writeString(os, data.ca);
+            if(data.serial==null) {
+                os.writeInt(-1);
+            } else {
+                byte[] dsba = data.serial.toByteArray();
+                int l = dsba.length;
+                os.writeInt(l);
+                os.write(dsba,0,l);
+            }
+        }
+
+        @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.id = readString(is,buff);
+            data.x500 = readString(is,buff);
+            data.x509 = readString(is,buff);
+            data.ca = readString(is,buff);
+            int i = is.readInt();
+            data.serial=null;
+            if(i>=0) {
+                byte[] bytes = new byte[i]; // a bit dangerous, but lessened because of all the previous sized data reads
+                if(is.read(bytes)>0) {
+                    data.serial = new BigInteger(bytes);
+                }
+            }
+        }
     }
     
     public Result<List<CertDAO.Data>> read(AuthzTrans trans, Object ... key) {
-       // Translate BigInteger to Byte array for lookup
-       return super.read(trans, key[0],ByteBuffer.wrap(((BigInteger)key[1]).toByteArray()));
+        // Translate BigInteger to Byte array for lookup
+        return super.read(trans, key[0],ByteBuffer.wrap(((BigInteger)key[1]).toByteArray()));
     }
 
     private void init(AuthzTrans trans) throws APIException, IOException {
         // Set up sub-DAOs
         if(historyDAO==null) {
-               historyDAO = new HistoryDAO(trans,this);
+            historyDAO = new HistoryDAO(trans,this);
+        }
+        if(infoDAO==null) {
+            infoDAO = new CacheInfoDAO(trans,this);
         }
-               if(infoDAO==null) {
-                       infoDAO = new CacheInfoDAO(trans,this);
-               }
 
-               String[] helpers = setCRUD(trans, TABLE, Data.class, CertLoader.deflt);
+        String[] helpers = setCRUD(trans, TABLE, Data.class, CertLoader.deflt);
 
-               psID = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE +
-                               " WHERE id = ?", CertLoader.deflt,readConsistency);
+        psID = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE +
+                " WHERE id = ?", CertLoader.deflt,readConsistency);
 
-               psX500 = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE +
-                               " WHERE x500 = ?", CertLoader.deflt,readConsistency);
-               
+        psX500 = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + " FROM " + TABLE +
+                " WHERE x500 = ?", CertLoader.deflt,readConsistency);
+        
     }
     
-       public Result<List<Data>> readX500(AuthzTrans trans, String x500) {
-               return psX500.read(trans, R_TEXT, new Object[]{x500});
-       }
+    public Result<List<Data>> readX500(AuthzTrans trans, String x500) {
+        return psX500.read(trans, R_TEXT, new Object[]{x500});
+    }
 
-       public Result<List<Data>> readID(AuthzTrans trans, String id) {
-               return psID.read(trans, R_TEXT, new Object[]{id});
-       }
+    public Result<List<Data>> readID(AuthzTrans trans, String id) {
+        return psID.read(trans, R_TEXT, new Object[]{id});
+    }
 
     /**
      * Log Modification statements to History
@@ -214,8 +214,8 @@ public class CertDAO extends CassDAOImpl<AuthzTrans,CertDAO.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();
@@ -226,19 +226,19 @@ public class CertDAO extends CassDAOImpl<AuthzTrans,CertDAO.Data> {
                 ? String.format("%s by %s", override[0], hd.user)
                 : (modified.name() + "d certificate info for " + data.id);
         // Detail?
-               if(modified==CRUD.delete) {
-                               try {
-                                       hd.reconstruct = data.bytify();
-                               } catch (IOException e) {
-                                       trans.error().log(e,"Could not serialize CertDAO.Data");
-                               }
-                       }
+           if(modified==CRUD.delete) {
+                    try {
+                        hd.reconstruct = data.bytify();
+                    } catch (IOException e) {
+                        trans.error().log(e,"Could not serialize CertDAO.Data");
+                    }
+                }
 
         if(historyDAO.create(trans, hd).status!=Status.OK) {
-               trans.error().log("Cannot log to History");
+            trans.error().log("Cannot log to History");
         }
         if(infoDAO.touch(trans, TABLE,data.invalidate(cache)).status!=Status.OK) {
-               trans.error().log("Cannot touch Cert");
+            trans.error().log("Cannot touch Cert");
         }
     }
 }