Fix unchecked cast sonar issue

Removed the unused variable. We are reasonably
sure that the cast is ok.

Fixed the JUnit tests, removed useless imports,
unused variables and raw types.

Issue-ID: POLICY-1256
Change-Id: Iad7dbbf02a4dd48648fc9d5c20595c9f0f8d7acb
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/FileSystemReceptionHandler.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/FileSystemReceptionHandler.java
index db0b0b7..941cdd6 100644 (file)
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/FileSystemReceptionHandler.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/FileSystemReceptionHandler.java
@@ -75,7 +75,6 @@ public class FileSystemReceptionHandler extends AbstractReceptionHandler {
      * 
      * @param watchPath Path to watch
      */
-    @SuppressWarnings("unchecked")
     public void main(String watchPath) throws IOException {
         try (final WatchService watcher = FileSystems.getDefault().newWatchService()) {
             final Path dir = Paths.get(watchPath);
@@ -96,7 +95,6 @@ public class FileSystemReceptionHandler extends AbstractReceptionHandler {
             key = watcher.take();
 
             for (final WatchEvent<?> event : key.pollEvents()) {
-                final WatchEvent.Kind<?> kind = event.kind();
                 final WatchEvent<Path> ev = (WatchEvent<Path>) event;
                 final Path fileName = ev.context();
                 LOGGER.debug("new CSAR found: " + fileName);

diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandler.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandler.java
index 29eb3f7..fc2a2b6 100644 (file)
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandler.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandler.java
@@ -26,6 +26,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -37,7 +38,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
@@ -45,7 +45,6 @@ import org.mockito.stubbing.Answer;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.common.parameters.ParameterService;
-import org.onap.policy.distribution.forwarding.PolicyForwarder;
 import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
 import org.onap.policy.distribution.reception.statistics.DistributionStatisticsManager;
 
@@ -56,7 +55,6 @@ import org.onap.policy.distribution.reception.statistics.DistributionStatisticsM
 public class TestFileSystemReceptionHandler {
 
     private static final Logger LOGGER = FlexLogger.getLogger(TestFileSystemReceptionHandler.class);
-    private static final String DUMMY_SERVICE_CSAR = "dummyService.csar";
 
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();
@@ -80,9 +78,7 @@ public class TestFileSystemReceptionHandler {
         DistributionStatisticsManager.resetAllStatistics();
 
         final Gson gson = new GsonBuilder().create();
-        String json = "{ \"name\": \"parameterConfig9\", \"watchPath\": \"";
-        json += tempFolder.getRoot().getAbsolutePath() + "\"}";
-        pssdConfigParameters = gson.fromJson(json,
+        pssdConfigParameters = gson.fromJson(new FileReader("src/test/resources/handling-filesystem.json"),
                 FileSystemReceptionHandlerConfigurationParameterGroup.class);
         ParameterService.register(pssdConfigParameters);
         fileSystemHandler = new FileSystemReceptionHandler();
@@ -127,7 +123,7 @@ public class TestFileSystemReceptionHandler {
         Processed cond = new Processed();
 
         final FileSystemReceptionHandler sypHandler = Mockito.spy(fileSystemHandler);
-        Mockito.doAnswer(new Answer() {
+        Mockito.doAnswer(new Answer<Object>() {
             public Object answer(InvocationOnMock invocation) {
                 synchronized (lock) {
                     cond.processed = true;

diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandlerConfigurationParameterGroup.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandlerConfigurationParameterGroup.java
index b4b905c..3039560 100644 (file)
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandlerConfigurationParameterGroup.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestFileSystemReceptionHandlerConfigurationParameterGroup.java
@@ -30,7 +30,6 @@ import com.google.gson.GsonBuilder;
 
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.Arrays;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -49,16 +48,19 @@ public class TestFileSystemReceptionHandlerConfigurationParameterGroup {
     @Test
     public void testFileSystemConfiguration() throws IOException {
         FileSystemReceptionHandlerConfigurationParameterGroup configParameters = null;
+        String validPath = null;
         try {
-            final Gson gson = new GsonBuilder().create();
-            configParameters = gson.fromJson(new FileReader("src/test/resources/handling-filesystem.json"),
-                    FileSystemReceptionHandlerConfigurationParameterGroup.class);
+            validPath = tempFolder.getRoot().getAbsolutePath();
+
+            final FileSystemReceptionHandlerConfigurationParameterBuilder builder =
+                    new FileSystemReceptionHandlerConfigurationParameterBuilder().setWatchPath(validPath);
+            configParameters = new FileSystemReceptionHandlerConfigurationParameterGroup(builder);
         } catch (final Exception e) {
             fail("test should not thrown an exception here: " + e.getMessage());
         }
         final GroupValidationResult validationResult = configParameters.validate();
         assertTrue(validationResult.isValid());
-        assertEquals("/tmp", configParameters.getWatchPath());
+        assertEquals(validPath, configParameters.getWatchPath());
     }
 
     @Test