More sonar issues cleanup

Either log or rethrow
Use boolean expression
Add at least one test
Remove commented out code

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

2 files changed, 6 insertions, 10 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 164f2b16..510ddaaa 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2018-2019 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
      * Not to be converted to PolicyLogger. This will contain all instract /out traffic and only
      * that in a single file in a concise format.
      */
-    private static Logger logger = LoggerFactory.getLogger(InlineBusTopicSink.class);
+    private static Logger logger = LoggerFactory.getLogger(SingleThreadedBusTopicSource.class);
 
     /**
      * Bus consumer group.
@@ -134,8 +134,7 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
                 logger.info("{}: register: start not attempted", this);
             }
         } catch (Exception e) {
-            logger.warn("{}: cannot start after registration of because of: {}", this, topicListener, e.getMessage(),
-                    e);
+            logger.warn("{}: cannot start after registration of because of: {}", this, topicListener, e);
         }
     }
 
@@ -176,8 +175,7 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
                     busPollerThread.start();
                     return true;
                 } catch (Exception e) {
-                    logger.warn("{}: cannot start because of {}", this, e.getMessage(), e);
-                    throw new IllegalStateException(e);
+                    throw new IllegalStateException(this + ": cannot start", e);
                 }
             }
         }
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
index e5d08a2a..6ed2e31e 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2018-2019 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -75,9 +75,7 @@ public class SingleThreadedDmaapTopicSource extends SingleThreadedBusTopicSource
         try {
             this.init();
         } catch (Exception e) {
-            logger.error("ERROR during init in dmaap-source: cannot create topic {} because of {}",
-                            topic, e.getMessage(), e);
-            throw new IllegalArgumentException(e);
+            throw new IllegalArgumentException("ERROR during init in dmaap-source: cannot create topic " + topic, e);
         }
     }