Sonar fix: ApprovalDAO.java

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

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/ApprovalDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/ApprovalDAO.java
index 1948ac6..5583dc0 100644 (file)
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/ApprovalDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/ApprovalDAO.java
@@ -3,6 +3,8 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modification Copyright (c) 2019 IBM
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,8 +52,12 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
     private static final String TABLE = "approval";
     private static final String TABLELOG = "approved";
     private HistoryDAO historyDAO;
-    private PSInfo psByUser, psByApprover, psByTicket, psByStatus;
+    private PSInfo psByUser;
+    private PSInfo psByApprover;
+    private PSInfo psByTicket;
+    private PSInfo psByStatus;
 
+    private static final int KEYLIMIT = 1;
     
     public ApprovalDAO(AuthzTrans trans, Cluster cluster, String keyspace) {
         super(trans, ApprovalDAO.class.getSimpleName(),cluster,keyspace,Data.class,TABLE, readConsistency(trans,TABLE), writeConsistency(trans,TABLE));
@@ -66,7 +72,6 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
         init(trans);
     }
 
-    private static final int KEYLIMIT = 1;
     public static class Data {
         public UUID   id;
         public UUID   ticket;
@@ -76,7 +81,6 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
         public String status;
         public String memo;
         public String operation;
-        public Date last_notified;
         public Date updated;
     }
     
@@ -97,11 +101,10 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
             data.status = row.getString(5);
             data.memo = row.getString(6);
             data.operation = row.getString(7);
-            data.last_notified = row.getTimestamp(8);
             // This is used to get "WRITETIME(STATUS)" from Approval, which gives us an "updated" 
-            if(row.getColumnDefinitions().size()>9) {
+            if (row.getColumnDefinitions().size()>8) {
                 // Rows reported in MicroSeconds
-                data.updated = new Date(row.getLong(9)/1000);
+                data.updated = new Date(row.getLong(8)/1000);
             }
             return data;
         }
@@ -112,8 +115,8 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
         }
 
         @Override
-        protected void body(Data data, int _idx, Object[] obj) {
-                int idx = _idx;
+        protected void body(Data data, int idxParam, Object[] obj) {
+                int idx = idxParam;
             obj[idx]=data.ticket;
             obj[++idx]=data.user;
             obj[++idx]=data.approver;
@@ -121,12 +124,11 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
             obj[++idx]=data.status;
             obj[++idx]=data.memo;
             obj[++idx]=data.operation;
-            obj[++idx]=data.last_notified;
         }
     }    
     
     private void init(AuthzTrans trans) {
-        String[] helpers = setCRUD(trans, TABLE, Data.class, ApprovalLoader.deflt,9);
+        String[] helpers = setCRUD(trans, TABLE, Data.class, ApprovalLoader.deflt,8);
         psByUser = new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] + ", WRITETIME(status) FROM " + TABLE + 
                 " WHERE user = ?", new ApprovalLoader(1) {
             @Override
@@ -168,11 +170,11 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
     @Override
     public Result<Data> create(AuthzTrans trans, Data data) {
         // If ID is not set (typical), create one.
-        if(data.id==null) {
+        if (data.id==null) {
             data.id = Chrono.dateToUUID(System.currentTimeMillis());
         }
         Result<ResultSet> rs = createPS.exec(trans, C_TEXT, data);
-        if(rs.notOK()) {
+        if (rs.notOK()) {
             return Result.err(rs);
         }
         return Result.ok(data);    
@@ -200,25 +202,31 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
      */
     @Override
     public Result<Void> delete(AuthzTrans trans, Data data, boolean reread) {
-        if(reread || data.status == null) { // if Memo is empty, likely not full record
+        if (reread || data.status == null) { // if Memo is empty, likely not full record
             Result<ResultSet> rd = readPS.exec(trans, R_TEXT, data);
-            if(rd.notOK()) {
+            if (rd.notOK()) {
                 return Result.err(rd);
             }
             ApprovalLoader.deflt.load(data, rd.value.one());
         }
-        if("approved".equals(data.status) || "denied".equals(data.status)) { 
+        if (APPROVED.equals(data.status) || DENIED.equals(data.status)) { 
             StringBuilder sb = new StringBuilder("BEGIN BATCH\n");
             sb.append("INSERT INTO ");
             sb.append(TABLELOG);
             sb.append(" (id,user,approver,type,status,memo,operation) VALUES (");
             sb.append(data.id);
-            sb.append(",'"); sb.append(data.user);
-            sb.append("','"); sb.append(data.approver);
-            sb.append("','"); sb.append(data.type);
-            sb.append("','"); sb.append(data.status);
-            sb.append("','"); sb.append(data.memo.replace("'", "''"));
-            sb.append("','"); sb.append(data.operation);
+            sb.append(",'");
+            sb.append(data.user);
+            sb.append("','");
+            sb.append(data.approver);
+            sb.append("','");
+            sb.append(data.type);
+            sb.append("','");
+            sb.append(data.status);
+            sb.append("','");
+            sb.append(data.memo.replace("'", "''"));
+            sb.append("','");
+            sb.append(data.operation);
             sb.append("');\n");
             sb.append("DELETE FROM ");
             sb.append(TABLE);
@@ -228,7 +236,7 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
             sb.append("APPLY BATCH;\n");
             TimeTaken tt = trans.start("DELETE APPROVAL",Env.REMOTE);
             try {
-                if(async) {
+                if (async) {
                     getSession(trans).executeAsync(sb.toString());
                     return Result.ok();
                 } else {
@@ -270,7 +278,7 @@ public class ApprovalDAO extends CassDAOImpl<AuthzTrans,ApprovalDAO.Data> {
                 : (modified.name() + "d approval for " + data.user);
         // Detail?
         // Reconstruct?
-        if(historyDAO.create(trans, hd).status!=Status.OK) {
+        if (historyDAO.create(trans, hd).status!=Status.OK) {
             trans.error().log("Cannot log to History");
         }
     }