9 files changed, 54 insertions, 56 deletions

diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PdpxPolicy.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PdpxPolicy.java
index 14d686be..6e0eb3bd 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PdpxPolicy.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/PdpxPolicy.java
@@ -5,15 +5,15 @@
  * 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
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -24,7 +24,7 @@ import org.onap.policy.distribution.model.Policy;
 import org.onap.policy.distribution.reception.decoding.PolicyDecoder;
 
 /**
- * A PDP-X Policy, decoded by a {@link PolicyDecoder}
+ * A PDP-X Policy, decoded by a {@link PolicyDecoder}.
  */
 public class PdpxPolicy implements Policy {
 
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/PSSDConfiguration.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/PssdConfiguration.java
index baba4d42..c5c877e1 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/PSSDConfiguration.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/PssdConfiguration.java
@@ -23,25 +23,25 @@ package org.onap.policy.distribution.reception.handling.sdc;
 import java.util.List;
 
 import org.onap.sdc.api.consumer.IConfiguration;
-import org.onap.policy.distribution.reception.parameters.PSSDConfigurationParametersGroup;
+import org.onap.policy.distribution.reception.parameters.PssdConfigurationParametersGroup;
 
 /**
  * Properties for the handling Sdc
  *
  */
-public class PSSDConfiguration implements IConfiguration {
+public class PssdConfiguration implements IConfiguration {
 
     // Configuration file structure
 
     // Configuration file properties
-    private PSSDConfigurationParametersGroup configParameters = null;
+    private PssdConfigurationParametersGroup configParameters = null;
 
     /**
      * Original constructor
      *
      * @param configParameters properties needed to be configured for the model loader
      */
-    public PSSDConfiguration(final PSSDConfigurationParametersGroup configParameters) {
+    public PssdConfiguration(final PssdConfigurationParametersGroup configParameters) {
         this.configParameters = configParameters;
 
     }
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDControllerException.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdControllerException.java
index ff9acfd0..9dece808 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDControllerException.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdControllerException.java
@@ -22,9 +22,9 @@ package org.onap.policy.distribution.reception.handling.sdc.exceptions;
 
 
 /**
- * Exception of the PSSD controller.
+ * Exception of the Pssd controller.
  */
-public class PSSDControllerException extends Exception {
+public class PssdControllerException extends Exception {
 
     /**
      * serialization id.
@@ -32,22 +32,22 @@ public class PSSDControllerException extends Exception {
     private static final long serialVersionUID = -8507246953751956974L;
 
     /**
-     * Constructor for creating PSSDControllerException using message.
+     * Constructor for creating PssdControllerException using message.
      *
      * @param message The message to dump
      */
-    public PSSDControllerException (final String message) {
+    public PssdControllerException (final String message) {
         super (message);
        
     }
     
     /**
-     * Constructor for creating PSSDControllerException using message and exception.
+     * Constructor for creating PssdControllerException using message and exception.
      *
      * @param message The message to dump
      * @param e the exception that caused this exception to be thrown
      */
-    public PSSDControllerException (final String message, final Exception e) {
+    public PssdControllerException (final String message, final Exception e) {
         super (message, e);
        
     }
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDDownloadException.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdDownloadException.java
index f95179c1..14c6b5ea 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDDownloadException.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdDownloadException.java
@@ -22,9 +22,9 @@ package org.onap.policy.distribution.reception.handling.sdc.exceptions;
 
 
 /**
- * Exception during download from PSSD.
+ * Exception during download from Pssd.
  */
-public class PSSDDownloadException extends Exception {
+public class PssdDownloadException extends Exception {
 
     /**
      * serialization id.
@@ -32,22 +32,22 @@ public class PSSDDownloadException extends Exception {
     private static final long serialVersionUID = -8507246953751956974L;
 
     /**
-     * Constructor for creating PSSDDownloadException using message.
+     * Constructor for creating PssdDownloadException using message.
      *
      * @param message The message to dump
      */
-    public PSSDDownloadException (final String message) {
+    public PssdDownloadException (final String message) {
         super (message);
        
     }
     
     /**
-     * Constructor for creating PSSDDownloadException using message and exception.
+     * Constructor for creating PssdDownloadException using message and exception.
      *
      * @param message The message to dump
      * @param e the exception that caused this exception to be thrown
      */
-    public PSSDDownloadException (final String message, final Exception e) {
+    public PssdDownloadException (final String message, final Exception e) {
         super (message, e);
        
     }
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDParametersException.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdParametersException.java
index 91922d7d..ca17796c 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDParametersException.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdParametersException.java
@@ -22,9 +22,9 @@ package org.onap.policy.distribution.reception.handling.sdc.exceptions;
 
 
 /**
- * Exception of the PSSD controller.
+ * Exception of the Pssd controller.
  */
-public class PSSDParametersException extends Exception {
+public class PssdParametersException extends Exception {
 
     /**
      * serialization id.
@@ -32,22 +32,22 @@ public class PSSDParametersException extends Exception {
     private static final long serialVersionUID = -8507246953751956974L;
 
     /**
-     * Constructor for creating PSSDParametersException using message.
+     * Constructor for creating PssdParametersException using message.
      *
      * @param message The message to dump
      */
-    public PSSDParametersException (final String message) {
+    public PssdParametersException (final String message) {
         super (message);
        
     }
     
     /**
-     * Constructor for creating PSSDParametersException using message and exception.
+     * Constructor for creating PssdParametersException using message and exception.
      *
      * @param message The message to dump
      * @param e the exception that caused this exception to be thrown
      */
-    public PSSDParametersException (final String message, final Exception e) {
+    public PssdParametersException (final String message, final Exception e) {
         super (message, e);
        
     }
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/PSSDConfigurationTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/PssdConfigurationTest.java
index 435b7577..5c24a792 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/PSSDConfigurationTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/PssdConfigurationTest.java
@@ -5,15 +5,15 @@
  * 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
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -28,50 +28,48 @@ import static org.junit.Assert.fail;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+
 import org.junit.Test;
 import org.onap.policy.common.parameters.GroupValidationResult;
-import org.onap.policy.distribution.reception.parameters.PSSDConfigurationParametersGroup;
+import org.onap.policy.distribution.reception.parameters.PssdConfigurationParametersGroup;
 
 /*-
- * Tests for PSSDConfiguration class
+ * Tests for PssdConfiguration class
  *
  */
-public class PSSDConfigurationTest {
-    
+public class PssdConfigurationTest {
+
     @Test
-    public void testPSSDConfigurationParametersGroup() throws IOException {
-        PSSDConfigurationParametersGroup configParameters = null;
+    public void testPssdConfigurationParametersGroup() throws IOException {
+        PssdConfigurationParametersGroup configParameters = null;
         try {
             final Gson gson = new GsonBuilder().create();
-            configParameters = 
-                gson.fromJson(new FileReader("src/test/resources/handling-sdc.json"), 
-                        PSSDConfigurationParametersGroup.class);
+            configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdc.json"),
+                    PssdConfigurationParametersGroup.class);
         } catch (final Exception e) {
             fail("test should not thrown an exception here: " + e.getMessage());
         }
         final GroupValidationResult validationResult = configParameters.validate();
         assertTrue(validationResult.isValid());
-        PSSDConfiguration config = new PSSDConfiguration(configParameters);
+        final PssdConfiguration config = new PssdConfiguration(configParameters);
         assertEquals(20, config.getPollingInterval());
-        assertEquals(30,config.getPollingTimeout());
+        assertEquals(30, config.getPollingTimeout());
     }
 
     @Test
-    public void testInvalidPSSDConfigurationParametersGroup() throws IOException {
-        PSSDConfigurationParametersGroup configParameters = null;
+    public void testInvalidPssdConfigurationParametersGroup() throws IOException {
+        PssdConfigurationParametersGroup configParameters = null;
         try {
             final Gson gson = new GsonBuilder().create();
-            configParameters = 
-                gson.fromJson(new FileReader("src/test/resources/handling-sdcInvalid.json"), 
-                        PSSDConfigurationParametersGroup.class);
+            configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdcInvalid.json"),
+                    PssdConfigurationParametersGroup.class);
         } catch (final Exception e) {
             fail("test should not thrown an exception here: " + e.getMessage());
         }
         final GroupValidationResult validationResult = configParameters.validate();
         assertFalse(validationResult.isValid());
-        
+
     }
 }
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDControllerExceptionTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdControllerExceptionTest.java
index b467cbad..5f8e507a 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDControllerExceptionTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdControllerExceptionTest.java
@@ -26,11 +26,11 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-public class PSSDControllerExceptionTest {
+public class PssdControllerExceptionTest {
 
     @Test
     public void test() {
-        assertNotNull(new PSSDControllerException("Message"));
-        assertNotNull(new PSSDControllerException("Message", new IOException()));
+        assertNotNull(new PssdControllerException("Message"));
+        assertNotNull(new PssdControllerException("Message", new IOException()));
     }
 }
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDDownloadExceptionTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdDownloadExceptionTest.java
index 0ca4330d..9f76b375 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDDownloadExceptionTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdDownloadExceptionTest.java
@@ -26,11 +26,11 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-public class PSSDDownloadExceptionTest {
+public class PssdDownloadExceptionTest {
 
     @Test
     public void test() {
-        assertNotNull(new PSSDDownloadException("Message"));
-        assertNotNull(new PSSDDownloadException("Message", new IOException()));
+        assertNotNull(new PssdDownloadException("Message"));
+        assertNotNull(new PssdDownloadException("Message", new IOException()));
     }
 }
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDParametersExceptionTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdParametersExceptionTest.java
index 040895e6..7a1f5512 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PSSDParametersExceptionTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/PssdParametersExceptionTest.java
@@ -26,11 +26,11 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-public class PSSDParametersExceptionTest {
+public class PssdParametersExceptionTest {
 
     @Test
     public void test() {
-        assertNotNull(new PSSDParametersException("Message"));
-        assertNotNull(new PSSDParametersException("Message", new IOException()));
+        assertNotNull(new PssdParametersException("Message"));
+        assertNotNull(new PssdParametersException("Message", new IOException()));
     }
 }