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, 12 insertions, 20 deletions

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java
index 35a79bf1..7b1f185b 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java
@@ -8,9 +8,9 @@
  * 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.
@@ -29,20 +29,12 @@ import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
  * DMAAP Topic Source Factory.
  */
 public interface DmaapTopicSourceFactory {
-    String DME2_READ_TIMEOUT_PROPERTY = "AFT_DME2_EP_READ_TIMEOUT_MS";
-    String DME2_EP_CONN_TIMEOUT_PROPERTY = "AFT_DME2_EP_CONN_TIMEOUT";
-    String DME2_ROUNDTRIP_TIMEOUT_PROPERTY = "AFT_DME2_ROUNDTRIP_TIMEOUT_MS";
-    String DME2_VERSION_PROPERTY = "Version";
-    String DME2_ROUTE_OFFER_PROPERTY = "routeOffer";
-    String DME2_SERVICE_NAME_PROPERTY = "ServiceName";
-    String DME2_SUBCONTEXT_PATH_PROPERTY = "SubContextPath";
-    String DME2_SESSION_STICKINESS_REQUIRED_PROPERTY = "sessionstickinessrequired";
 
     /**
      * Creates an DMAAP Topic Source based on properties files.
-     * 
+     *
      * @param properties Properties containing initialization values
-     * 
+     *
      * @return an DMAAP Topic Source
      * @throws IllegalArgumentException if invalid parameters are present
      */
@@ -50,7 +42,7 @@ public interface DmaapTopicSourceFactory {
 
     /**
      * Instantiates a new DMAAP Topic Source.
-     * 
+     *
      * @param busTopicParams parameters object
      * @return a DMAAP Topic Source
      */
@@ -58,12 +50,12 @@ public interface DmaapTopicSourceFactory {
 
     /**
      * Instantiates a new DMAAP Topic Source.
-     * 
+     *
      * @param servers list of servers
      * @param topic topic name
      * @param apiKey API Key
      * @param apiSecret API Secret
-     * 
+     *
      * @return an DMAAP Topic Source
      * @throws IllegalArgumentException if invalid parameters are present
      */
@@ -71,10 +63,10 @@ public interface DmaapTopicSourceFactory {
 
     /**
      * Instantiates a new DMAAP Topic Source.
-     * 
+     *
      * @param servers list of servers
      * @param topic topic name
-     * 
+     *
      * @return an DMAAP Topic Source
      * @throws IllegalArgumentException if invalid parameters are present
      */
@@ -82,7 +74,7 @@ public interface DmaapTopicSourceFactory {
 
     /**
      * Destroys an DMAAP Topic Source based on a topic.
-     * 
+     *
      * @param topic topic name
      * @throws IllegalArgumentException if invalid parameters are present
      */
@@ -95,7 +87,7 @@ public interface DmaapTopicSourceFactory {
 
     /**
      * Gets an DMAAP Topic Source based on topic name.
-     * 
+     *
      * @param topic the topic name
      * @return an DMAAP Topic Source with topic name
      * @throws IllegalArgumentException if an invalid topic is provided
@@ -105,7 +97,7 @@ public interface DmaapTopicSourceFactory {
 
     /**
      * Provides a snapshot of the DMAAP Topic Sources.
-     * 
+     *
      * @return a list of the DMAAP Topic Sources
      */
     List<DmaapTopicSource> inventory();