[POLICY-81] Code cleanup to eliminate the presence of warning messages in Eclipse. 37/6237/1
authorMagnusen, Drew (dm741q) <dm741q@att.com>
Tue, 25 Jul 2017 17:25:52 +0000 (12:25 -0500)
committerMagnusen, Drew (dm741q) <dm741q@att.com>
Tue, 25 Jul 2017 19:19:50 +0000 (14:19 -0500)
Change-Id: Id98fdf0241487d56707ac91cde47975c91225f3c
Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
29 files changed:
common-logging/src/main/java/org/openecomp/policy/common/logging/ECOMPLoggingContext.java
common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/ErrorCodeMap.java
common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java
common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfo.java
common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventTrackInfoHandler.java
common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/EelfLogger.java
common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/Logger4J.java
common-logging/src/main/java/org/openecomp/policy/common/logging/flexlogger/SystemOutLogger.java
integrity-audit/src/main/java/org/openecomp/policy/common/ia/DbDAO.java
integrity-audit/src/main/java/org/openecomp/policy/common/ia/jpa/IntegrityAuditEntity.java
integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditCompareEntriesTest.java
integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbAuditTest.java
integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/DbDAOTest.java
integrity-audit/src/test/java/org/openecomp/policy/common/ia/test/jpa/IaTestEntity.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/IntegrityMonitor.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/StandbyStatusException.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateElement.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateManagement.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/StateTransition.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/jmx/JmxAgentConnection.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ForwardProgressEntity.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ImTestEntity.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/ResourceRegistrationEntity.java
integrity-monitor/src/main/java/org/openecomp/policy/common/im/jpa/StateManagementEntity.java
integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/IntegrityMonitorTest.java
integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementEntityTest.java
integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateManagementTest.java
integrity-monitor/src/test/java/org/openecomp/policy/common/im/test/StateTransitionTest.java
site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java

index e6e2b1c..606e872 100644 (file)
@@ -24,18 +24,10 @@ package org.openecomp.policy.common.logging;
 //import static org.openecomp.policy.common.logging.eelf.Configuration.TRANSACTION_ELAPSED_TIME;
 //import static org.openecomp.policy.common.logging.eelf.Configuration.TRANSACTION_END_TIME_STAMP;
 
-import static com.att.eelf.configuration.Configuration.MDC_ALERT_SEVERITY;
-import static com.att.eelf.configuration.Configuration.MDC_INSTANCE_UUID;
-
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.Instant;
-import java.time.ZoneOffset;
 import java.util.Date;
-import java.util.Properties;
-import java.util.Timer;
-import java.util.TimerTask;
-
 import org.slf4j.MDC;
 
 import org.openecomp.policy.common.logging.nsa.LoggingContextFactory;
index 4e4457d..abd972e 100644 (file)
@@ -21,7 +21,6 @@
 package org.openecomp.policy.common.logging.eelf;
 
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 
@@ -31,7 +30,7 @@ import java.util.Map;
 public class ErrorCodeMap {
        
 
-    public static HashMap<MessageCodes, ErrorCodeInfo> hm = new HashMap();
+    public static HashMap<MessageCodes, ErrorCodeInfo> hm = new HashMap<MessageCodes, ErrorCodeInfo>();
     
     private static String ERROR_PERMISSIONS = "POLICY-100E";
        private static String ERROR_PERMISSIONS_DESCRIPTION = "This is a Permissions Error. Please check the error message for detail information";
index eb0bffc..d26a497 100644 (file)
@@ -22,8 +22,6 @@ package org.openecomp.policy.common.logging.eelf;
 
 import java.time.Instant;
 
-import javax.swing.text.html.parser.Entity;
-
 /**
  * 
  * EventData can be used for logging a rule event.
index c6ed63d..f1b7afb 100644 (file)
 
 package org.openecomp.policy.common.logging.eelf;
 
-import java.io.IOException;
-import java.time.Instant;
-import java.util.Properties;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openecomp.policy.common.logging.flexlogger.PropertyUtil;
-
 /**
  * 
  * EventTrackInfo contains a ConcurrentHashMap of EventData
index a947ed0..e45f899 100644 (file)
@@ -23,8 +23,6 @@ package org.openecomp.policy.common.logging.eelf;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Timer;
 import java.util.TimerTask;
 
 /**
index 31c1755..106c734 100644 (file)
@@ -36,14 +36,18 @@ import com.att.eelf.configuration.EELFLogger.Level;
 
 public class EelfLogger implements Logger, Serializable {
        
-    private String className = "";
+    /**
+        * 
+        */
+       private static final long serialVersionUID = 5385586713941277192L;
+       private String className = "";
     private String transId = UUID.randomUUID().toString();
     
     /**
      * Constructor
      * @param clazz
      */
-       public EelfLogger(Class clazz) {
+       public EelfLogger(Class<?> clazz) {
                if(clazz != null){
                   className = clazz.getName();
                }
@@ -66,7 +70,7 @@ public class EelfLogger implements Logger, Serializable {
         * @param clazz
         * @param isNewTransaction
         */
-       public EelfLogger(Class clazz, boolean isNewTransaction) {
+       public EelfLogger(Class<?> clazz, boolean isNewTransaction) {
                if(clazz != null){
                   className = clazz.getName();
                }
@@ -98,7 +102,7 @@ public class EelfLogger implements Logger, Serializable {
         * @param clazz
         * @param transId
         */
-       public EelfLogger(Class clazz, String transId) {
+       public EelfLogger(Class<?> clazz, String transId) {
                if(clazz != null){
                   className = clazz.getName();
                }
index 23cafb4..506e1ea 100644 (file)
@@ -40,6 +40,10 @@ import com.att.eelf.configuration.EELFLogger.Level;
  */
 public class Logger4J implements org.openecomp.policy.common.logging.flexlogger.Logger, Serializable {
        
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 3183729429888828471L;
        private Logger log = null;
     private String methodName = "";
     private String className = "";
@@ -49,7 +53,7 @@ public class Logger4J implements org.openecomp.policy.common.logging.flexlogger.
      * Constructor
      * @param clazz
      */
-       public Logger4J (Class clazz){
+       public Logger4J (Class<?> clazz){
                System.out.println("create instance of Logger4J");
                if(clazz != null){
                   log = Logger.getLogger(clazz);
index 91e16b9..596914a 100644 (file)
@@ -34,6 +34,10 @@ import com.att.eelf.configuration.EELFLogger.Level;
  */
 public class SystemOutLogger implements Logger, Serializable {
        
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 4956408061058933929L;
        private String className = "";
        private boolean isDebugEnabled = true;
        private boolean isInfoEnabled = true;
@@ -47,7 +51,7 @@ public class SystemOutLogger implements Logger, Serializable {
      * Constructor
      * @param clazz
      */
-       public SystemOutLogger (Class clazz){
+       public SystemOutLogger (Class<?> clazz){
                System.out.println("create instance of SystemOutLogger");
                if(clazz != null){
                        className = clazz.getName();
index 70f39a2..5ab16d5 100644 (file)
@@ -42,7 +42,6 @@ import javax.persistence.metamodel.Metamodel;
 
 //import org.apache.log4j.Logger;
 
-import org.openecomp.policy.common.ia.IntegrityAuditProperties.NodeTypeEnum;
 import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
 import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
 import org.openecomp.policy.common.logging.flexlogger.Logger;
index 3d50d83..21b200c 100644 (file)
@@ -32,7 +32,6 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
index 5b3c755..e2fd922 100644 (file)
@@ -340,12 +340,9 @@ public class DbAuditCompareEntriesTest {
                dbDAO = new DbDAO(resourceName, persistenceUnit, properties);
                DbAudit dbAudit = new DbAudit(dbDAO);
                
-               @SuppressWarnings("unused")
-               String className = null;
                HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
                HashSet<Object> mismatchResult = new HashSet<Object>();
                for(String c : classNameSet) {
-                       className = c;
                        if (c.equals("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity")){
                                String resourceName1 = resourceName;
                                String resourceName2 = resourceName;
@@ -529,12 +526,12 @@ public class DbAuditCompareEntriesTest {
                
                // Add entries into DB1
                dbDAO = new DbDAO(resourceName, persistenceUnit, properties);
-               DbDAO dbDAO2 = new DbDAO("pdp2", persistenceUnit, properties);
+               new DbDAO("pdp2", persistenceUnit, properties);
                DbAudit dbAudit = new DbAudit(dbDAO);
                
                // Add entries into DB2
                DbDAO dbDAO3 = new DbDAO(resourceName, persistenceUnit, properties2);
-               DbDAO dbDAO4 = new DbDAO("pdp2", persistenceUnit, properties2);
+               new DbDAO("pdp2", persistenceUnit, properties2);
                
                // Pull all entries and compare
                HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
index 21e3bfa..82ea866 100644 (file)
@@ -27,7 +27,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStreamReader;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
 
index 351fe5f..3bd847c 100644 (file)
@@ -228,9 +228,9 @@ public class DbDAOTest {
                try {
                        // Add some entries to the DB
                        d = new DbDAO(resourceName, persistenceUnit, properties);
-                       DbDAO d2 = new DbDAO("pdp1", persistenceUnit, properties);
+                       new DbDAO("pdp1", persistenceUnit, properties);
                        properties.put(IntegrityAuditProperties.NODE_TYPE, "pdp_drools");
-                       DbDAO d3 = new DbDAO("pdp2", persistenceUnit, properties);
+                       new DbDAO("pdp2", persistenceUnit, properties);
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
@@ -474,8 +474,8 @@ public class DbDAOTest {
                try {
                        // create entries for the IntegrityAuditEntity table
                        d = new DbDAO(resourceName, persistenceUnit, properties);
-                       DbDAO d2 = new DbDAO("pdp1", persistenceUnit, properties);
-                       DbDAO d3 = new DbDAO("pdp2", persistenceUnit, properties);
+                       new DbDAO("pdp1", persistenceUnit, properties);
+                       new DbDAO("pdp2", persistenceUnit, properties);
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
@@ -516,8 +516,8 @@ public class DbDAOTest {
                try {
                        // create entries for the IntegrityAuditEntity table
                        d = new DbDAO(resourceName, persistenceUnit, properties);
-                       DbDAO d2 = new DbDAO("pdp1", persistenceUnit, properties);
-                       DbDAO d3 = new DbDAO("pdp2", persistenceUnit, properties);
+                       new DbDAO("pdp1", persistenceUnit, properties);
+                       new DbDAO("pdp2", persistenceUnit, properties);
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
@@ -578,8 +578,8 @@ public class DbDAOTest {
                try {
                        // create entries for the IntegrityAuditEntity table
                        d = new DbDAO(resourceName, persistenceUnit, properties);
-                       DbDAO d2 = new DbDAO("pdp1", persistenceUnit, properties);
-                       DbDAO d3 = new DbDAO("pdp2", persistenceUnit, properties);
+                       new DbDAO("pdp1", persistenceUnit, properties);
+                       new DbDAO("pdp2", persistenceUnit, properties);
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
@@ -620,8 +620,8 @@ public class DbDAOTest {
                try {
                        // create entries for the IntegrityAuditEntity table
                        d = new DbDAO(resourceName, persistenceUnit, properties);
-                       DbDAO d2 = new DbDAO("pdp1", persistenceUnit, properties);
-                       DbDAO d3 = new DbDAO("pdp2", persistenceUnit, properties);
+                       new DbDAO("pdp1", persistenceUnit, properties);
+                       new DbDAO("pdp2", persistenceUnit, properties);
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
@@ -682,8 +682,8 @@ public class DbDAOTest {
                try {
                        // create entries for the IntegrityAuditEntity table
                        d = new DbDAO(resourceName, persistenceUnit, properties);
-                       DbDAO d2 = new DbDAO("pdp1", persistenceUnit, properties);
-                       DbDAO d3 = new DbDAO("pdp2", persistenceUnit, properties);
+                       new DbDAO("pdp1", persistenceUnit, properties);
+                       new DbDAO("pdp2", persistenceUnit, properties);
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
index e875fa3..21b0946 100644 (file)
@@ -28,19 +28,13 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-import javax.persistence.Version;
-/*
- * The Entity class to persist a policy object Action Body
- */
 
 @Entity
 @Table(name="IaTestEntity")
index 57182f7..4e573d8 100644 (file)
@@ -62,7 +62,6 @@ public class IntegrityMonitor {
        private static IntegrityMonitor instance = null;
        
        private static String resourceName = null;
-       private boolean fpcError = false;
        boolean alarmExists = false;
        
        /*
@@ -79,7 +78,6 @@ public class IntegrityMonitor {
        // Persistence Unit for JPA 
        private static final String PERSISTENCE_UNIT = "operationalPU";
        
-       private ComponentAdmin admin = null;
        private StateManagement stateManager = null;
        
        private static final int CYCLE_INTERVAL_MILLIS = 1000;
@@ -350,13 +348,12 @@ public class IntegrityMonitor {
                
                // create management bean
                try {
-                       admin = new ComponentAdmin(resourceName, this, stateManager);
+                       new ComponentAdmin(resourceName, this, stateManager);
                } catch (Exception e) {
                        logger.error("ComponentAdmin constructor exception: " + e.toString());
                }
                
-               // create FPManager inner class
-               FPManager fpMonitor = new FPManager();
+               new FPManager();
                
 
        }
@@ -1244,8 +1241,6 @@ public class IntegrityMonitor {
                                        // no forward progress
                                        missedCycles += 1;
                                        if (missedCycles >= failedCounterThreshold && !alarmExists) {
-                                               // set op state to disabled failed
-                                               fpcError = true;
                                                logger.info("Forward progress not detected for resource " + resourceName + ". Setting state to disable failed.");
                                                if(!(stateManager.getOpState()).equals(StateManagement.DISABLED)){
                                                        // Note: The refreshStateAudit will make redundant calls
@@ -1258,7 +1253,6 @@ public class IntegrityMonitor {
                                        // forward progress has occurred
                                        lastFpCounter = fpCounter;
                                        missedCycles = 0;
-                                       fpcError = false;
                                        // set op state to enabled
                                        logger.debug("Forward progress detected for resource " + resourceName + ". Setting state to enable not failed.");
                                        if(!(stateManager.getOpState()).equals(StateManagement.ENABLED)){
index 3167dde..1de08b0 100644 (file)
 package org.openecomp.policy.common.im;
 
 public class StandbyStatusException extends Exception {
+       /**
+        * 
+        */
+       private static final long serialVersionUID = -5262512285108747134L;
+
        public StandbyStatusException()
        {
        }
index 6c6ce59..ad60b46 100644 (file)
@@ -20,8 +20,6 @@
 
 package org.openecomp.policy.common.im;
 
-import java.util.*;
-
 //import org.apache.log4j.Logger;
 import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
 import org.openecomp.policy.common.logging.flexlogger.Logger;
@@ -40,7 +38,7 @@ public class StateElement {
        String endingStandbyStatus = null;
        String exception  = null;
         
-       public void StateElement()
+       public StateElement()
        {
        }
        
index fd0f3d9..d86cfcf 100644 (file)
@@ -34,7 +34,6 @@ import javax.persistence.Query;
 import org.openecomp.policy.common.im.jpa.StateManagementEntity;
 import org.openecomp.policy.common.im.StateElement;
 import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.im.StateChangeNotifier; 
 import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
 import org.openecomp.policy.common.logging.flexlogger.Logger;
 
@@ -73,16 +72,12 @@ public class StateManagement extends Observable {
   public static final String AVAILABLE_STATUS= "availStatus"; 
   public static final String STANDBY_STATUS  = "standbyStatus"; 
   
-  private static final String REMOVE  = "remove"; 
-  private static final String ADD     = "add"; 
-  
   private String resourceName = null; 
   private String adminState = null; 
   private String opState = null; 
   private String availStatus = null; 
   private String standbyStatus = null; 
   private EntityManager em; 
-  private EntityManagerFactory emf = null; 
   private StateTransition st = null;
     
   /*
@@ -108,7 +103,6 @@ public class StateManagement extends Observable {
   public StateManagement(EntityManagerFactory emf, String resourceName) throws Exception
   {
          logger.debug("StateManagement: constructor, resourceName: " + resourceName);
-         this.emf = emf; 
          em = emf.createEntityManager();
       EntityTransaction et = em.getTransaction();
 
index 3bc5bbc..c380534 100644 (file)
@@ -126,7 +126,7 @@ public class StateTransition {
                 }  
             String key = adminState + "," + opState + "," + availStatus2 + "," + standbyStatus + "," + actionName;
             logger.debug("Ending State search key: " + key);
-            String value = (String)StateTable.get(key); 
+            String value = StateTable.get(key); 
              
             if (value != null) {
              try {
@@ -715,11 +715,11 @@ public class StateTransition {
   
   public void displayStateTable()
   {
-         Set set = StateTable.entrySet();
-      Iterator iter = set.iterator();
+         Set<?> set = StateTable.entrySet();
+      Iterator<?> iter = set.iterator();
  
          while(iter.hasNext()) {
-             Map.Entry me = (Map.Entry)iter.next();
+             Map.Entry<?, ?> me = (Map.Entry<?, ?>)iter.next();
              logger.debug((String)me.getKey() + ((String)me.getValue()).replace(".",  ",")); 
          }
   }
index 4940c4d..bc28c48 100644 (file)
@@ -26,8 +26,6 @@ package org.openecomp.policy.common.im.jmx;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
-
 import javax.management.MBeanServerConnection;
 import javax.management.Notification;
 import javax.management.NotificationListener;
index 4662f58..99a0d0a 100644 (file)
@@ -32,7 +32,6 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
index 0eee38b..c7ae0ab 100644 (file)
@@ -28,19 +28,13 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-import javax.persistence.Version;
-/*
- * The Entity class to persist a policy object Action Body
- */
 
 @Entity
 @Table(name="ImTestEntity")
index c7eec08..2944308 100644 (file)
@@ -32,7 +32,6 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
index b747c8f..737daec 100644 (file)
@@ -31,7 +31,6 @@ import javax.persistence.Id;
 import javax.persistence.NamedQuery;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
index d2fbac4..8e8720d 100644 (file)
@@ -49,7 +49,6 @@ import org.openecomp.policy.common.im.IntegrityMonitor;
 import org.openecomp.policy.common.im.IntegrityMonitorProperties;
 import org.openecomp.policy.common.im.StateManagement;
 import org.openecomp.policy.common.im.jpa.ForwardProgressEntity;
-import org.openecomp.policy.common.im.jpa.ImTestEntity;
 import org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity;
 import org.openecomp.policy.common.im.jpa.StateManagementEntity;
 import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
@@ -603,9 +602,8 @@ public class IntegrityMonitorTest {
                StateManagement stateManager = new StateManagement(emf, "group2_dep1");
                stateManager.lock();
                
-               //Now add new group1 stateManager instances
-               StateManagement sm2 = new StateManagement(emf, "group1_dep1");
-               StateManagement sm3 = new StateManagement(emf, "group1_dep2");
+               new StateManagement(emf, "group1_dep1");
+               new StateManagement(emf, "group1_dep2");
                
                boolean sanityPass = true;
                Thread.sleep(15000);
@@ -658,7 +656,7 @@ public class IntegrityMonitorTest {
 
                IntegrityMonitor.deleteInstance();
 
-               IntegrityMonitor im = IntegrityMonitor.getInstance(resourceName, myProp);
+               IntegrityMonitor.getInstance(resourceName, myProp);
 
                //the state here is unlocked, enabled, null, null
                StateManagementEntity sme = null;
@@ -790,8 +788,7 @@ public class IntegrityMonitorTest {
                em.flush();
                et.commit();
 
-               //Now add new group1 stateManager instances
-               StateManagement sm2 = new StateManagement(emf, "group1_dep1");
+               new StateManagement(emf, "group1_dep1");
                
                boolean sanityPass = true;
                //Thread.sleep(15000);
@@ -990,7 +987,7 @@ public class IntegrityMonitorTest {
                
                logger.debug("\nIntegrityMonitorTest:testStateAudit getting list of StateManagementEntity entries\n\n");
                Query query = em.createQuery("SELECT s FROM StateManagementEntity s");
-               List smeList = query.getResultList();
+               List<?> smeList = query.getResultList();
                
                logger.debug("\n\n");
                logger.debug("IntegrityMonitorTest:testStateAudit:StateManagementEntity entries");
index b422256..6116ef0 100644 (file)
@@ -20,9 +20,6 @@
 
 package org.openecomp.policy.common.im.test;
 
-import static org.junit.Assert.*;
-
-import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
@@ -160,7 +157,6 @@ public class StateManagementEntityTest {
                //Just test that we are retrieving the right object
                @SuppressWarnings("rawtypes")
                List resourceList = query.getResultList();
-               String resource = null; 
                if (!resourceList.isEmpty()) {
                   // exist 
                   StateManagementEntity sme2 = (StateManagementEntity) resourceList.get(0);
index f51f5ac..92fc225 100644 (file)
 
 package org.openecomp.policy.common.im.test;
 
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
-import java.util.StringTokenizer;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.LockModeType;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-
-
-
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.im.StateTransition;
 import org.openecomp.policy.common.im.StandbyStatusException; 
 import org.openecomp.policy.common.im.StateChangeNotifier; 
 import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
index d76cad0..d90e27b 100644 (file)
 
 package org.openecomp.policy.common.im.test;
 
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
-import java.util.StringTokenizer;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -46,8 +33,6 @@ import org.junit.Test;
 
 import org.openecomp.policy.common.im.StateTransition;
 import org.openecomp.policy.common.im.StateElement;
-import org.openecomp.policy.common.im.StandbyStatusException; 
-import org.openecomp.policy.common.im.StateChangeNotifier; 
 import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
 import org.openecomp.policy.common.logging.flexlogger.Logger;
 /*
@@ -90,8 +75,6 @@ public class StateTransitionTest {
        @Test
        public void testJPA() throws Exception {
                logger.info("\n\nlogger.infor StateTransitionTest: Entering\n\n");
-               boolean standbyExceptionThrown = false; 
-               
                //These parameters are in a properties file
                EntityManagerFactory emf = null; 
                try {
index 52f36e3..5bb8474 100644 (file)
@@ -597,13 +597,13 @@ public class Main
        String formatString = sb.toString();
 
        // display column headers
-       System.out.printf(formatString, labels);
-       System.out.printf(formatString, underlines);
+       System.out.printf(formatString, (Object[])labels);
+       System.out.printf(formatString, (Object[])underlines);
 
        // display all of the rows
        for (String[] values : treeset)
          {
-               System.out.printf(formatString, values);
+               System.out.printf(formatString, (Object[])values);
          }
   }
 }