Collection syntax change because of Sonar

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

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/HistoryDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/HistoryDAO.java
index 8e4ada1..13af879 100644 (file)
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/HistoryDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/HistoryDAO.java
@@ -56,9 +56,6 @@ import com.datastax.driver.core.Row;
 public class HistoryDAO extends CassDAOImpl<AuthzTrans, HistoryDAO.Data> {
        private static final String TABLE = "history";
 
-       public static final SimpleDateFormat monthFormat = new SimpleDateFormat("yyyyMM");
-//     private static final SimpleDateFormat dayTimeFormat = new SimpleDateFormat("ddHHmmss");
-
        private String[] helpers;
 
        private HistLoader defLoader;
@@ -85,13 +82,6 @@ public class HistoryDAO extends CassDAOImpl<AuthzTrans, HistoryDAO.Data> {
                public String target;
                public String subject;
                public String  memo;
-//             Map<String, String>  detail = null;
-//             public Map<String, String>  detail() {
-//                     if(detail == null) {
-//                             detail = new HashMap<String, String>();
-//                     }
-//                     return detail;
-//             }
                public ByteBuffer reconstruct;
        }
        
@@ -109,7 +99,6 @@ public class HistoryDAO extends CassDAOImpl<AuthzTrans, HistoryDAO.Data> {
                        data.target = row.getString(4);
                        data.subject = row.getString(5);
                        data.memo = row.getString(6);
-//                     data.detail = row.getMap(6, String.class, String.class);
                        data.reconstruct = row.getBytes(7);
                        return data;
                }
@@ -177,7 +166,8 @@ public class HistoryDAO extends CassDAOImpl<AuthzTrans, HistoryDAO.Data> {
        public static Data newInitedData() {
                Data data = new Data();
                Date now = new Date();
-               data.yr_mon = Integer.parseInt(monthFormat.format(now));
+               // Sonar claims that SimpleDateFormat is not thread safe, so we can't be static
+               data.yr_mon = Integer.parseInt(new SimpleDateFormat("yyyyMM").format(now));
                // data.day_time = Integer.parseInt(dayTimeFormat.format(now));
                return data;            
        }