X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FMiscID.java;h=4d46c20bef7381c2b13d4fad747bb6bd0af3f2e5;hb=4b6435c97dc1e05ee6a1e06190e3c431f9d1a8fe;hp=45875a2076a652485096edc7694abbd71e82e74d;hpb=343481da5dac494c0b063f0b5b0ddb865fa1f214;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java
index 45875a20..4d46c20b 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java
@@ -4,6 +4,8 @@
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
  * ===========================================================================
+ * Modifications 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.
  * You may obtain a copy of the License at
@@ -47,9 +49,13 @@ public class MiscID  {
     CREATE_DATE - Date when MiscID was created 
     LAST_RENEWAL_DATE - Date when MiscID Sponsorship was last renewed
     */
-    public String id,sponsor,created,renewal;
+    public String id;
+    public String sponsor;
+    public String created;
+    public String renewal;
+    public static String SELECT_QUERY = "SELECT ";
 
-    private static final String fieldString = "id,created,sponsor,renewal";
+    private static final String FIELD_STRING = "id,created,sponsor,renewal";
     
     /**
      * Load a Row of Strings (from CSV file).
@@ -59,12 +65,12 @@ public class MiscID  {
      * 2) DB "suits.cql"
      * 3) Alter existing Tables
      * @param row
-     * @throws BatchException 
-     * @throws IllegalAccessException 
-     * @throws IllegalArgumentException 
+     * @throws BatchException
      */
-    public void set(String row []) throws BatchException {
-        if (row.length<4) {throw new BatchException("Row of MiscID_XRef is too short");}
+    public void set(String[] row ) throws BatchException {
+        if (row.length<4) {
+            throw new BatchException("Row of MiscID_XRef is too short");
+        }
         id      = row[0];
         sponsor = row[1];
         created = row[2];
@@ -80,15 +86,15 @@ public class MiscID  {
     
 
     public static void load(Trans trans, Session session ) {
-        load(trans, session,"SELECT " + fieldString + " FROM authz.miscid;",data);
+        load(trans, session,SELECT_QUERY + FIELD_STRING + " FROM authz.miscid;",data);
     }
 
     public static void load(Trans trans, Session session, Map<String,MiscID> map ) {
-        load(trans, session,"SELECT " + fieldString + " FROM authz.miscid;",map);
+        load(trans, session,SELECT_QUERY + FIELD_STRING + " FROM authz.miscid;",map);
     }
 
     public static void loadOne(Trans trans, Session session, String id ) {
-        load(trans, session,"SELECT " + fieldString + " FROM authz.miscid WHERE id ='" + id + "';", data);
+        load(trans, session,SELECT_QUERY + FIELD_STRING + " FROM authz.miscid WHERE id ='" + id + "';", data);
     }
 
     public static void load(Trans trans, Session session, String query, Map<String,MiscID> map) {
@@ -133,15 +139,15 @@ public class MiscID  {
      */
     @Override
     public boolean equals(Object obj) {
-        if (obj!=null && obj instanceof MiscID) {
+        if (null!=obj && obj instanceof MiscID) {
             return id.equals(((MiscID)obj).id);
         }
         return false;
     }
 
-    public StringBuilder insertStmt() throws IllegalArgumentException, IllegalAccessException {
+    public StringBuilder insertStmt() {
         StringBuilder sb = new StringBuilder("INSERT INTO authz.miscid (");
-        sb.append(fieldString);
+        sb.append(FIELD_STRING);
         sb.append(") VALUES ('");
         sb.append(id);
         sb.append("','");