1 files changed, 6 insertions, 8 deletions
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 41ff832a..46e006bd 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP COMMON
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,7 @@
 
 package org.onap.policy.common.utils.validation;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.google.re2j.Pattern;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
@@ -56,14 +55,13 @@ public class Version implements Comparable<Version> {
      * @param versionString the version string
      */
     public Version(@NonNull final String versionString) {
-        Version newVersion = makeVersion("String", "constructor", versionString);
+        var newVersion = makeVersion("String", "constructor", versionString);
 
         if (newVersion != null) {
             this.major = newVersion.major;
             this.minor = newVersion.minor;
             this.patch = newVersion.patch;
-        }
-        else {
+        } else {
             this.major = 0;
             this.minor = 0;
             this.patch = 0;
@@ -80,7 +78,7 @@ public class Version implements Comparable<Version> {
      *         that does not match the major.minor.patch form)
      */
     public static Version makeVersion(String type, String name, String versionText) {
-        Matcher matcher = VERSION_PAT.matcher(versionText);
+        var matcher = VERSION_PAT.matcher(versionText);
         if (!matcher.matches()) {
             logger.info("invalid version for {} {}: {}", type, name, versionText);
             return null;
@@ -114,7 +112,7 @@ public class Version implements Comparable<Version> {
 
     @Override
     public int compareTo(Version other) {
-        int result = Integer.compare(major, other.major);
+        var result = Integer.compare(major, other.major);
         if (result != 0) {
             return result;
         }