Miscellaneous code clean up

Issue-ID: POLICY-2203
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I5731d4636bd2aaecbc486406298bcba1b19e8f4d
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

9 files changed, 58 insertions, 59 deletions

diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/CancellableScheduledTask.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/CancellableScheduledTask.java
index b16f44ad..f0d3b267 100644
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/CancellableScheduledTask.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/CancellableScheduledTask.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,5 +29,5 @@ public interface CancellableScheduledTask {
     /**
      * Cancels the scheduled task.
      */
-    public void cancel();
+    void cancel();
 }
diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java
index d4704afe..da8a918f 100644
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java
@@ -339,7 +339,7 @@ public class PoolingFeature implements PolicyEngineFeatureApi, PolicyControllerF
          * @return {@code true} if the request was handled by the manager, {@code false} otherwise
          * @throws PoolingFeatureException feature exception
          */
-        public boolean apply(PoolingManagerImpl mgr) throws PoolingFeatureException;
+        boolean apply(PoolingManagerImpl mgr) throws PoolingFeatureException;
     }
 
     /**
diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java
index e8e0174d..e3576b8f 100644
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * 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.
@@ -33,108 +33,108 @@ public interface PoolingManager {
 
     /**
      * Gets the properties used to configure the manager.
-     * 
+     *
      * @return pooling properties
      */
-    public PoolingProperties getProperties();
+    PoolingProperties getProperties();
 
     /**
      * Gets the host id.
-     * 
+     *
      * @return the host id
      */
-    public String getHost();
+    String getHost();
 
     /**
      * Gets the name of the internal DMaaP topic used by this manager to communicate with
      * its other hosts.
-     * 
+     *
      * @return the name of the internal DMaaP topic
      */
-    public String getTopic();
+    String getTopic();
 
     /**
      * Starts distributing requests according to the given bucket assignments.
-     * 
+     *
      * @param assignments must <i>not</i> be {@code null}
      */
-    public void startDistributing(BucketAssignments assignments);
+    void startDistributing(BucketAssignments assignments);
 
     /**
      * Gets the current bucket assignments.
-     * 
+     *
      * @return the current bucket assignments, or {@code null} if no assignments have been
      *         made
      */
-    public BucketAssignments getAssignments();
+    BucketAssignments getAssignments();
 
     /**
      * Publishes a message to the internal topic on the administrative channel.
-     * 
+     *
      * @param msg message to be published
      */
-    public void publishAdmin(Message msg);
+    void publishAdmin(Message msg);
 
     /**
      * Publishes a message to the internal topic on a particular channel.
-     * 
+     *
      * @param channel channel on which the message should be published
      * @param msg message to be published
      */
-    public void publish(String channel, Message msg);
+    void publish(String channel, Message msg);
 
     /**
      * Handles a {@link Forward} event that was received from the internal topic.
-     * 
+     *
      * @param event event
      */
-    public void handle(Forward event);
+    void handle(Forward event);
 
     /**
      * Schedules a timer to fire after a delay.
-     * 
+     *
      * @param delayMs delay, in milliseconds
      * @param task task
      * @return a new scheduled task
      */
-    public CancellableScheduledTask schedule(long delayMs, StateTimerTask task);
+    CancellableScheduledTask schedule(long delayMs, StateTimerTask task);
 
     /**
      * Schedules a timer to fire repeatedly.
-     * 
+     *
      * @param initialDelayMs initial delay, in milliseconds
      * @param delayMs delay, in milliseconds
      * @param task task
      * @return a new scheduled task
      */
-    public CancellableScheduledTask scheduleWithFixedDelay(long initialDelayMs, long delayMs, StateTimerTask task);
+    CancellableScheduledTask scheduleWithFixedDelay(long initialDelayMs, long delayMs, StateTimerTask task);
 
     /**
      * Transitions to the "start" state.
-     * 
+     *
      * @return the new state
      */
-    public State goStart();
+    State goStart();
 
     /**
      * Transitions to the "query" state.
-     * 
+     *
      * @return the new state
      */
-    public State goQuery();
+    State goQuery();
 
     /**
      * Transitions to the "active" state.
-     * 
+     *
      * @return the new state
      */
-    public State goActive();
+    State goActive();
 
     /**
      * Transitions to the "inactive" state.
-     * 
+     *
      * @return the new state
      */
-    public State goInactive();
+    State goInactive();
 
 }
diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/Extractor.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/Extractor.java
index 38d440cb..5e02d602 100644
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/Extractor.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/Extractor.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * 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.
@@ -28,9 +28,9 @@ public interface Extractor {
 
     /**
      * Extracts an object contained within another object.
-     * 
+     *
      * @param object object from which to extract the contained object
      * @return the extracted value, or {@code null} if it cannot be extracted
      */
-    public Object extract(Object object);
+    Object extract(Object object);
 }
diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StateTimerTask.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StateTimerTask.java
index 346d4496..e4607f81 100644
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StateTimerTask.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StateTimerTask.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * 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.
@@ -28,9 +28,9 @@ public interface StateTimerTask {
 
     /**
      * Fires the timer.
-     * 
+     *
      * @return the new state, or {@code null} if the state is unchanged
      */
-    public State fire();
+    State fire();
 
 }
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java
index 5768e1d8..d51e61e6 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java
@@ -1105,6 +1105,6 @@ public class FeatureTest {
     @FunctionalInterface
     private static interface VoidFunction {
 
-        public void apply();
+        void apply();
     }
 }
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java
index a711a7e9..5293b794 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java
@@ -95,7 +95,6 @@ public class PoolingManagerImplTest {
      */
     private Queue<ScheduledFuture<?>> futures;
 
-    private Properties plainProps;
     private PoolingProperties poolProps;
     private ListeningController controller;
     private ClassExtractors extractors;
@@ -111,12 +110,12 @@ public class PoolingManagerImplTest {
 
     /**
      * Setup.
-     * 
+     *
      * @throws Exception throws exception
      */
     @Before
     public void setUp() throws Exception {
-        plainProps = new Properties();
+        Properties plainProps = new Properties();
 
         poolProps = mock(PoolingProperties.class);
         when(poolProps.getSource()).thenReturn(plainProps);
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/extractor/ClassExtractorsTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/extractor/ClassExtractorsTest.java
index c277a00f..0bf087a3 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/extractor/ClassExtractorsTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/extractor/ClassExtractorsTest.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * 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.
@@ -412,7 +412,7 @@ public class ClassExtractorsTest {
      */
     private static interface WithString {
 
-        public String getStrValue();
+        String getStrValue();
     }
 
     /**
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportBasicMessageTester.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportBasicMessageTester.java
index 19e7ab0b..86247835 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportBasicMessageTester.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportBasicMessageTester.java
@@ -207,7 +207,7 @@ public abstract class SupportBasicMessageTester<T extends Message> {
 
     /**
      * Verifies that fields are set as expected by {@link #makeValidMessage()}.
-     * 
+     *
      * @param msg message whose fields are to be validated
      */
     public void testValidFields(T msg) {
@@ -217,7 +217,7 @@ public abstract class SupportBasicMessageTester<T extends Message> {
 
     /**
      * Function that updates a message.
-     * 
+     *
      * @param <T> type of Message the function updates
      */
     @FunctionalInterface
@@ -225,15 +225,15 @@ public abstract class SupportBasicMessageTester<T extends Message> {
 
         /**
          * Updates a message.
-         * 
+         *
          * @param msg message to be updated
          */
-        public void update(T msg);
+        void update(T msg);
     }
 
     /**
      * Function that updates a single field within a message.
-     * 
+     *
      * @param <T> type of Message the function updates
      */
     @FunctionalInterface
@@ -241,10 +241,10 @@ public abstract class SupportBasicMessageTester<T extends Message> {
 
         /**
          * Updates a field within a message.
-         * 
+         *
          * @param msg message to be updated
          * @param newValue new field value
          */
-        public void update(T msg, String newValue);
+        void update(T msg, String newValue);
     }
 }