From 119fc53d7272184333b0a90fc911b988bc25d5a1 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Mon, 29 Apr 2019 11:43:05 -0400
Subject: Fix sonar issue with double compare

The gson code to convert Double to Long/Integer use a direct comparison
of the original double with a long.  However, sonar does not like that
so changed the code to use the Double.compare() method instead.
Also fixed sonar issue with diamond operator.
Addressed some sonar issues in ServiceManager.
Addressed some sonar issues in Version.

Change-Id: I0959603918d251db671e87e12c295c6ec911f427
Issue-ID: POLICY-1707
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../common/gson/MapDoubleAdapterFactory.java       |  4 +--
 .../common/utils/services/ServiceManager.java      |  4 +--
 .../policy/common/utils/validation/Version.java    | 40 +++++++++++-----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/gson/src/main/java/org/onap/policy/common/gson/MapDoubleAdapterFactory.java b/gson/src/main/java/org/onap/policy/common/gson/MapDoubleAdapterFactory.java
index 3892a07f..e56f9dd3 100644
--- a/gson/src/main/java/org/onap/policy/common/gson/MapDoubleAdapterFactory.java
+++ b/gson/src/main/java/org/onap/policy/common/gson/MapDoubleAdapterFactory.java
@@ -55,7 +55,7 @@ public class MapDoubleAdapterFactory implements TypeAdapterFactory {
 
         TypeAdapter<T> delegate = gson.getDelegateAdapter(this, type);
 
-        return new MapAdapter<T>(delegate);
+        return new MapAdapter<>(delegate);
     }
 
     /**
@@ -134,7 +134,7 @@ public class MapDoubleAdapterFactory implements TypeAdapterFactory {
             Double num = (Double) obj;
             long longval = num.longValue();
 
-            if (num.doubleValue() == longval) {
+            if (Double.compare(num.doubleValue(), longval) == 0) {
                 // it's integral - determine if it's an integer or a long
                 int intval = (int) longval;
 
diff --git a/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java b/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java
index 13cd6de8..5c8c01df 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java
@@ -98,7 +98,7 @@ public class ServiceManager implements Startable {
             throw new IllegalStateException(name + " is already running; cannot add " + stepName);
         }
 
-        items.add(new Service(stepName, () -> service.start(), () -> service.stop()));
+        items.add(new Service(stepName, service::start, service::stop));
         return this;
     }
 
@@ -173,7 +173,7 @@ public class ServiceManager implements Startable {
      * @param running services that are running, in the order they were started
      * @throws ServiceManagerException if a service fails to stop
      */
-    private void rewind(Deque<Service> running) throws ServiceManagerException {
+    private void rewind(Deque<Service> running) {
         Exception ex = null;
 
         logger.info("{} stopping", name);
diff --git a/utils/src/main/java/org/onap/policy/common/utils/validation/Version.java b/utils/src/main/java/org/onap/policy/common/utils/validation/Version.java
index d8106ec6..41ff832a 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/validation/Version.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/validation/Version.java
@@ -50,6 +50,26 @@ public class Version implements Comparable<Version> {
     private final int patch;
 
 
+    /**
+     * String constructor.
+     *
+     * @param versionString the version string
+     */
+    public Version(@NonNull final String versionString) {
+        Version newVersion = makeVersion("String", "constructor", versionString);
+
+        if (newVersion != null) {
+            this.major = newVersion.major;
+            this.minor = newVersion.minor;
+            this.patch = newVersion.patch;
+        }
+        else {
+            this.major = 0;
+            this.minor = 0;
+            this.patch = 0;
+        }
+    }
+
     /**
      * Creates a version object.
      *
@@ -83,26 +103,6 @@ public class Version implements Comparable<Version> {
         }
     }
 
-    /**
-     * String constructor.
-     *
-     * @param versionString the version string
-     */
-    public Version(@NonNull final String versionString) {
-        Version newVersion = makeVersion("String", "constructor", versionString);
-
-        if (newVersion != null) {
-            this.major = newVersion.major;
-            this.minor = newVersion.minor;
-            this.patch = newVersion.patch;
-        }
-        else {
-            this.major = 0;
-            this.minor = 0;
-            this.patch = 0;
-        }
-    }
-
     /**
      * Generates a new version from a string.
      *
-- 
cgit 1.2.3-korg