Fix sonar issues in policy/endpoints

Sonar fixes, other than code coverage.  These changes are disruptive
and will likely cause breakage in a number of policy repos.
Renamed constants.
Moved constants/factories from interfaces to classes.

Change-Id: I182d50320aa6b53e383081af806c60dd2f806cbe
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java
index 0953465b..164f2b16 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java
@@ -29,6 +29,7 @@ import org.onap.policy.common.endpoints.event.comm.FilterableTopicSource;
 import org.onap.policy.common.endpoints.event.comm.TopicListener;
 import org.onap.policy.common.endpoints.event.comm.bus.BusTopicSource;
 import org.onap.policy.common.endpoints.event.comm.bus.internal.BusConsumer.FilterableBusConsumer;
+import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
 import org.onap.policy.common.utils.network.NetworkUtil;
@@ -103,13 +104,13 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
         }
 
         if (busTopicParams.getFetchTimeout() <= 0) {
-            this.fetchTimeout = NO_TIMEOUT_MS_FETCH;
+            this.fetchTimeout = PolicyEndPointProperties.NO_TIMEOUT_MS_FETCH;
         } else {
             this.fetchTimeout = busTopicParams.getFetchTimeout();
         }
 
         if (busTopicParams.getFetchLimit() <= 0) {
-            this.fetchLimit = NO_LIMIT_FETCH;
+            this.fetchLimit = PolicyEndPointProperties.NO_LIMIT_FETCH;
         } else {
             this.fetchLimit = busTopicParams.getFetchLimit();
         }
@@ -225,7 +226,7 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
         while (this.alive) {
             try {
                 fetchAllMessages();
-            } catch (Exception e) {
+            } catch (IOException | RuntimeException e) {
                 logger.error("{}: cannot fetch because of ", this, e.getMessage(), e);
             }
         }
@@ -233,7 +234,7 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
         logger.info("{}: exiting thread", this);
     }
 
-    private void fetchAllMessages() throws InterruptedException, IOException {
+    private void fetchAllMessages() throws IOException {
         for (String event : this.consumer.fetch()) {
             synchronized (this) {
                 this.recentEvents.add(event);