aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capabilities/pom.xml2
-rw-r--r--common-logging/pom.xml2
-rw-r--r--common-parameters/pom.xml2
-rw-r--r--gson/pom.xml2
-rw-r--r--gson/src/main/java/org/onap/policy/common/gson/MapDoubleAdapterFactory.java4
-rw-r--r--integrity-audit/pom.xml2
-rw-r--r--integrity-monitor/pom.xml2
-rw-r--r--policy-endpoints/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--utils-test/pom.xml2
-rw-r--r--utils/pom.xml2
-rw-r--r--utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java4
-rw-r--r--utils/src/main/java/org/onap/policy/common/utils/validation/Version.java40
-rw-r--r--version.properties2
14 files changed, 35 insertions, 35 deletions
diff --git a/capabilities/pom.xml b/capabilities/pom.xml
index 8489cd8f..61e85573 100644
--- a/capabilities/pom.xml
+++ b/capabilities/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>capabilities</artifactId>
diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index c0aecd27..cddbe9b4 100644
--- a/common-logging/pom.xml
+++ b/common-logging/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>ONAP-Logging</artifactId>
diff --git a/common-parameters/pom.xml b/common-parameters/pom.xml
index 9eefb551..6c698914 100644
--- a/common-parameters/pom.xml
+++ b/common-parameters/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>common-parameters</artifactId>
diff --git a/gson/pom.xml b/gson/pom.xml
index 7d7797a2..1d65ebc7 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>gson</artifactId>
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/integrity-audit/pom.xml b/integrity-audit/pom.xml
index c662b3d5..e06cdd9c 100644
--- a/integrity-audit/pom.xml
+++ b/integrity-audit/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<name>Integrity Audit</name>
diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml
index 7bc1d761..4b3046be 100644
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<name>Integrity Monitor</name>
diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml
index 53e2186f..818122df 100644
--- a/policy-endpoints/pom.xml
+++ b/policy-endpoints/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>policy-endpoints</artifactId>
diff --git a/pom.xml b/pom.xml
index 2d425a30..8c4c5a35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/utils-test/pom.xml b/utils-test/pom.xml
index fffe6105..7dfc46a1 100644
--- a/utils-test/pom.xml
+++ b/utils-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>utils-test</artifactId>
diff --git a/utils/pom.xml b/utils/pom.xml
index f20cdac1..ddae7252 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.common</groupId>
<artifactId>common-modules</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>utils</artifactId>
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
@@ -51,6 +51,26 @@ 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;
+ }
+ }
+
+ /**
* Creates a version object.
*
* @param type type of object with which the version is associated, used when logging
@@ -84,26 +104,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.
*
* @return a new version, of the form major.0.0, where "major" is one more than "this" version's major number
diff --git a/version.properties b/version.properties
index 668657e9..eff345ce 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=1
minor=4
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}