From: Taka Cho <takamune.cho@att.com>
Date: Mon, 8 Jun 2020 19:58:46 +0000 (-0400)
Subject: reduce sonar issue - drools-pdp
X-Git-Tag: 1.7.0~27
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e0c469dccc5e9c65e1e37d1865b29de4cc7b5fe5;p=policy%2Fdrools-pdp.git

reduce sonar issue - drools-pdp

remove unused import
rename the method name

Issue-ID: POLICY-2616
Change-Id: I15845159063ec5fa3cfb34a59b9c433ba3201ccc
Signed-off-by: Taka Cho <takamune.cho@att.com>
---

diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java
index 14784fc2..3682dcb4 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java
@@ -23,6 +23,7 @@ package org.onap.policy.drools.pooling.state;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -268,7 +269,7 @@ public class ProcessingStateTest extends SupportBasicStateTester {
 
         String[] arr = captureHostArray();
 
-        assertTrue(arr != HOST_ARR3);
+        assertNotSame(arr, HOST_ARR3);
         assertEquals(Arrays.asList(HOST_ARR3), Arrays.asList(arr));
     }
 
diff --git a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/Server.java b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/Server.java
index 8ee0f2d2..ad0e25ee 100644
--- a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/Server.java
+++ b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/Server.java
@@ -72,7 +72,6 @@ import java.util.Properties;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.UUID;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.LinkedTransferQueue;
diff --git a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/TargetLock.java b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/TargetLock.java
index 65804082..dc4c0a79 100644
--- a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/TargetLock.java
+++ b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/TargetLock.java
@@ -2576,14 +2576,14 @@ public class TargetLock implements Lock, Serializable {
                 Bucket bucket = Bucket.getBucket(i);
 
                 // client data
-                build_clientData(bucket);
+                buildClientData(bucket);
 
                 // server data
-                build_serverData(bucket);
+                buildServerData(bucket);
             }
         }
 
-        private void build_clientData(Bucket bucket) {
+        private void buildClientData(Bucket bucket) {
             // client data
             LocalLocks localLocks =
                 bucket.getAdjunctDontCreate(LocalLocks.class);
@@ -2603,7 +2603,7 @@ public class TargetLock implements Lock, Serializable {
             }
         }
 
-        private void build_serverData(Bucket bucket) {
+        private void buildServerData(Bucket bucket) {
             // server data
             GlobalLocks globalLocks =
                 bucket.getAdjunctDontCreate(GlobalLocks.class);
diff --git a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/persistence/Persistence.java b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/persistence/Persistence.java
index 60e740c5..0f7321de 100644
--- a/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/persistence/Persistence.java
+++ b/feature-server-pool/src/main/java/org/onap/policy/drools/serverpool/persistence/Persistence.java
@@ -667,10 +667,10 @@ public class Persistence implements PolicySessionFeatureApi, ServerPoolApi {
             // one entry for each Drools session being restored --
             // indicates when the restore is complete (restore runs within
             // the Drools session thread)
-            List<CountDownLatch> sessionLatches = restoreBucket_droolsSessions();
+            List<CountDownLatch> sessionLatches = restoreBucketDroolsSessions();
 
             // restore lock data
-            restoreBucket_locks(bucket);
+            restoreBucketLocks(bucket);
 
             // wait for all of the sessions to update
             try {
@@ -686,7 +686,7 @@ public class Persistence implements PolicySessionFeatureApi, ServerPoolApi {
             }
         }
 
-        private List<CountDownLatch> restoreBucket_droolsSessions() {
+        private List<CountDownLatch> restoreBucketDroolsSessions() {
             List<CountDownLatch> sessionLatches = new LinkedList<>();
             for (Map.Entry<String, ReceiverSessionBucketData> entry : sessionData.entrySet()) {
                 String sessionName = entry.getKey();
@@ -769,7 +769,7 @@ public class Persistence implements PolicySessionFeatureApi, ServerPoolApi {
             return sessionLatches;
         }
 
-        private void restoreBucket_locks(Bucket bucket) {
+        private void restoreBucketLocks(Bucket bucket) {
             if (lockData != null) {
                 Object obj = null;
                 try {