Revert "Migrate concepts to use JDT annotations"

[yangtools.git] / common / concepts / src / main / java / org / opendaylight / yangtools / concepts / SemVer.java

diff --git a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java
index 0df08925e0af52155cc1fbc4195df4d763b03e4b..8bdae1d24b473d7f8cc831e1b99c64fbf20ec4d2 100644 (file)
--- a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java
+++ b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.yangtools.concepts;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.io.Serializable;
 import java.util.Objects;
 import javax.annotation.Nonnull;
@@ -24,11 +25,11 @@ public final class SemVer implements Comparable<SemVer>, Serializable {
     private final int patch;
 
     private SemVer(final int major, final int minor, final int patch) {
-        Preconditions.checkArgument(major >= 0);
+        checkArgument(major >= 0);
         this.major = major;
-        Preconditions.checkArgument(minor >= 0);
+        checkArgument(minor >= 0);
         this.minor = minor;
-        Preconditions.checkArgument(patch >= 0);
+        checkArgument(patch >= 0);
         this.patch = patch;
     }
 
@@ -54,10 +55,10 @@ public final class SemVer implements Comparable<SemVer>, Serializable {
         final int patchIdx = str.indexOf('.', minorIdx + 1);
         if (patchIdx == -1) {
             minorStr = str.substring(minorIdx + 1);
-        } else {
-            minorStr = str.substring(minorIdx + 1, patchIdx);
+            return create(Integer.parseInt(str.substring(0, minorIdx), 10), Integer.parseInt(minorStr, 10));
         }
 
+        minorStr = str.substring(minorIdx + 1, patchIdx);
         return create(Integer.parseInt(str.substring(0, minorIdx), 10), Integer.parseInt(minorStr, 10),
             Integer.parseInt(str.substring(patchIdx + 1), 10));
     }
@@ -90,7 +91,7 @@ public final class SemVer implements Comparable<SemVer>, Serializable {
     }
 
     @Override
-    public int compareTo(final SemVer other) {
+    public int compareTo(@Nonnull final SemVer other) {
         int cmp = Integer.compare(major, other.major);
         if (cmp == 0) {
             cmp = Integer.compare(minor, other.minor);