IGNITE-27354 Fix deployment unit version (#7236)

Author: valepakh

modules/api/src/main/java/org/apache/ignite/deployment/version/UnitVersion.java

@@ -35,17 +35,17 @@ class UnitVersion implements Version {
     );
 
     /** Major version number. */
-    private final byte major;
+    private final int major;
 
     /** Minor version number. */
-    private final byte minor;
+    private final int minor;
 
     /** Maintenance version number. */
-    private final byte maintenance;
+    private final int maintenance;
 
     /** Patch version number. */
     @Nullable
-    private final Byte patch;
+    private final Integer patch;
 
     /** Pre-release version. */
     @Nullable
@@ -58,7 +58,7 @@ class UnitVersion implements Version {
      * @param minor Minor part of version.
      * @param maintenance Maintenance part of version.
      */
-    UnitVersion(byte major, byte minor, byte maintenance, @Nullable Byte patch, @Nullable String preRelease) {
+    UnitVersion(int major, int minor, int maintenance, @Nullable Integer patch, @Nullable String preRelease) {
         this.major = major;
         this.minor = minor;
         this.maintenance = maintenance;
@@ -93,10 +93,10 @@ public static UnitVersion parse(String rawVersion) {
             String preRelease = matcher.group("preRelease");
 
             return new UnitVersion(
-                    Byte.parseByte(matcher.group("major")),
-                    nullOrBlank(minor) ? 0 : Byte.parseByte(minor),
-                    nullOrBlank(maintenance) ? 0 : Byte.parseByte(maintenance),
-                    nullOrBlank(patch) ? null : Byte.parseByte(patch),
+                    Integer.parseUnsignedInt(matcher.group("major")),
+                    nullOrBlank(minor) ? 0 : Integer.parseUnsignedInt(minor),
+                    nullOrBlank(maintenance) ? 0 : Integer.parseUnsignedInt(maintenance),
+                    nullOrBlank(patch) ? null : Integer.parseUnsignedInt(patch),
                     nullOrBlank(preRelease) ? null : preRelease
             );
         } catch (NumberFormatException e) {
@@ -118,17 +118,17 @@ public int compareTo(Version o) {
         int res;
 
         // Compare major, minor, maintenance
-        res = Byte.compare(major, other.major);
+        res = Integer.compare(major, other.major);
         if (res != 0) {
             return res;
         }
 
-        res = Byte.compare(minor, other.minor);
+        res = Integer.compare(minor, other.minor);
         if (res != 0) {
             return res;
         }
 
-        res = Byte.compare(maintenance, other.maintenance);
+        res = Integer.compare(maintenance, other.maintenance);
         if (res != 0) {
             return res;
         }
@@ -144,9 +144,9 @@ public int compareTo(Version o) {
         return res;
     }
 
-    private static int compareNullable(@Nullable Byte a, @Nullable Byte b) {
+    private static int compareNullable(@Nullable Integer a, @Nullable Integer b) {
         if (a != null && b != null) {
-            return Byte.compare(a, b);
+            return Integer.compare(a, b);
         } else if (a != null) {
             return 1;
         } else if (b != null) {
@@ -156,7 +156,7 @@ private static int compareNullable(@Nullable Byte a, @Nullable Byte b) {
     }
 
     @Nullable
-    private static Byte preReleaseOrder(@Nullable String preRelease) {
+    private static Integer preReleaseOrder(@Nullable String preRelease) {
         if (preRelease == null) {
             return null;
         }

modules/api/src/test/java/org/apache/ignite/deployment/version/VersionTest.java

@@ -37,6 +37,7 @@ private static Stream<Arguments> validVersions() {
         return Stream.of(
                 arguments("1.1.0", version(1, 1, 0, null, null)),
                 arguments("1.1.01", version(1, 1, 1, null, null)),
+                arguments("1000.10000.100000", version(1000, 10000, 100000, null, null)),
                 arguments("1.1", version(1, 1, 0, null, null)),
                 arguments("1", version(1, 0, 0, null, null)),
                 arguments("1.1.1.1", version(1, 1, 1, 1, null)),
@@ -52,15 +53,14 @@ public void testParseCorrect(String versionString, Version expected) {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"", "version", "1.", "65536", "1.1f"})
+    @ValueSource(strings = {"", "version", "1.", "-1", "1.1f"})
     public void testParseErrors(String versionString) {
         assertThrows(VersionParseException.class, () -> Version.parseVersion(versionString));
     }
 
     private static UnitVersion version(
             int major, int minor, int maintenance, @Nullable Integer patch, @Nullable String preRelease
     ) {
-        Byte patchByte = patch != null ? patch.byteValue() : null;
-        return new UnitVersion((byte) major, (byte) minor, (byte) maintenance, patchByte, preRelease);
+        return new UnitVersion(major, minor, maintenance, patch, preRelease);
     }
 }