inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-953 Unable to upgrade from ACS-7.0-M1 or ACS-7.0-M2 to ACS-7.0-A12 (#183)

Browse Source 
* ACS-953 Unable to upgrade from ACS-7.0-M1 or ACS-7.0-M2 to ACS-7.0-A12

Now that we create internal releases of the form M.m.r-M9 (milestone), M.m.r-A9 (alpha) and M.m.r-RC9 (release candidate) during development and testing, we need to ensure we can upgrade from any of these to any other, as they may occur in any order and also to the final external release M.m.r. We also will allow a change from the final release back to an internal one for regression testing. The code within ModuleComponentHelper which calls this method, checks if it is the same version (0) and then if it is downgrading (> 0), so if they share the same M.m.r part matches AND is one of these formats, we return <0.
This commit is contained in:
Alan Davis
2020-11-30 19:54:21 +00:00
committed by GitHub
parent 73c875eac9
commit ea4e18d347
4 changed files with 180 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/test/java/org/alfresco/util/VersionNumberTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2020 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -74,6 +74,22 @@ public class VersionNumberTest extends TestCase
{
// OK
}
try
{
new VersionNumber("1.2.3-M4");
fail("Should not have created an invalid version");
} catch (Exception exception)
{
// OK
}
try
{
new VersionNumber("1.2.3-A4");
fail("Should not have created an invalid version");
} catch (Exception exception)
{
// OK
}
}
public void testEquals()

55
repository/src/main/java/org/alfresco/repo/module/ModuleVersionNumber.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* Copyright (C) 2005 - 2020 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -29,6 +29,8 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.alfresco.util.VersionNumber;
import org.apache.maven.artifact.versioning.ComparableVersion;
@@ -50,6 +52,10 @@ public class ModuleVersionNumber implements Externalizable
public static final ModuleVersionNumber VERSION_ZERO = new ModuleVersionNumber("0");;
public static final ModuleVersionNumber VERSION_BIG = new ModuleVersionNumber("999.999.999.99");
// Matches versions with 3 or 4 parts to their basic number such as 1.2.3 or 1.2.3.4
// that also optionally have a -A9 -M9 or -RC9 suffix whe 9 is an integer.
private static Pattern A_M_RC_VERSION_PATTERN = Pattern.compile("((\\d+\\.){2,3}\\d+)(-(A|M|RC)\\d+)?");
protected ComparableVersion delegate;
public ModuleVersionNumber()
@@ -67,11 +73,56 @@ public class ModuleVersionNumber implements Externalizable
this(versionCurrent.toString());
}
/**
* Now that we create internal releases of the form {@code M.m.r-M9} (milestone), {@code M.m.r-A9} (alpha) and
* {@code M.m.r-RC9} (release candidate) during development and testing, we need to ensure we can upgrade from any
* of these to any other, as they may occur in any order and also to the final external release {@code M.m.r}. We
* also will allow a change from the final release back to an internal one for regression testing.
*
* The code within {@link ModuleComponentHelper} which calls this method, checks if it is the same version
* ({@code 0}) and then if it is downgrading ({@code > 0}), so if they share the same {@code M.m.r} part matches
* AND is one of these formats, we return {@code <0}.
*
* @param installingVersion the new version
* @return a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than
* the specified object.
*/
public int compareTo(ModuleVersionNumber installingVersion)
{
String thisVersion = toString();
String thatVersion = installingVersion.toString();
if (thisVersion.equals(thatVersion))
{
return 0;
}
String thisVersionWithoutSuffix = getVersionWithoutSuffix();
if (thisVersionWithoutSuffix != null)
{
String thatVersionWithoutSuffix = installingVersion.getVersionWithoutSuffix();
if (thisVersionWithoutSuffix.equals(thatVersionWithoutSuffix))
{
return -1;
}
}
return delegate.compareTo(installingVersion.delegate);
}
String getVersionWithoutSuffix()
{
String versionWithoutAMOrRc = null;
String fullVersion = toString();
Matcher matcher = A_M_RC_VERSION_PATTERN.matcher(fullVersion);
if (matcher.matches())
{
versionWithoutAMOrRc = matcher.group(1);
// matcher.group(3) would be the suffix, such as "-M4"
// matcher.group(4) would be the type of release: "RC", "A" or "M"
}
return versionWithoutAMOrRc;
}
@Override
public int hashCode()
{
@@ -114,6 +165,4 @@ public class ModuleVersionNumber implements Externalizable
String versionString = in.readUTF();
delegate = new ComparableVersion(versionString);
}
}

3
repository/src/test/java/org/alfresco/AllUnitTestsSuite.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2017 Alfresco Software Limited
* Copyright (C) 2005 - 2020 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -79,6 +79,7 @@ import org.junit.runners.Suite;
org.alfresco.service.cmr.calendar.CalendarRecurrenceHelperTest.class,
org.alfresco.service.cmr.calendar.CalendarTimezoneHelperTest.class,
org.alfresco.tools.RenameUserTest.class,
org.alfresco.util.VersionNumberTest.class,
org.alfresco.util.FileNameValidatorTest.class,
org.alfresco.util.HttpClientHelperTest.class,
org.alfresco.util.JSONtoFmModelTest.class,

85
repository/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java
View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* Copyright (C) 2005 - 2020 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -230,4 +230,87 @@ public class ModuleVersionNumberTest extends TestCase
ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
return (ModuleVersionNumber) objectInputStream.readObject();
}
// Tests that we can strip the suffixes such as "-M2", "-A12" or "-RC2" from versions "7.0.0-M2", "6.2.2-A12", "7.0.1-RC2"
// The main version may contain 3 or 4 digit parts.
public void testGetVersionWithoutSuffix()
{
for (String[] pair: new String[][]
{{null, "1.2"},
{"1.2.3", "1.2.3"},
{"1.2.3.4", "1.2.3.4"},
{null, "1.2.3.4.5"},
{"1.2.3", "1.2.3-M4"},
{"1.2.3.4", "1.2.3.4-A56"},
{"1.2.3", "1.2.3-RC456"},
{"11.22.33.44", "11.22.33.44-A5"},
{null, "1.2.3-456"},
{null, "1.2.3-X12"},
{null, "1.2.5-A6-A6"},
{null, "1.2.3.4.5-A6"},
{null, "1.2-M3"},
{null, "1.2.3-RCA-45"},
{null, "1.2.3-AM4"},
{null, "1.2.3-A56A"},
})
{
String expected = pair[0];
String value = pair[1];
ModuleVersionNumber version = new ModuleVersionNumber(value);
String actual = version.getVersionWithoutSuffix();
assertEquals(expected, actual);
}
}
public void testInternalVersionsAreUpgrades()
{
for (String[] pair: new String[][]
// same base version with an optional special suffix (-A9, -M9, -RC9)
{{"upgrade", "7.0.0-A10", "7.0.0"},
{"upgrade", "7.0.0", "7.0.0-A11"},
{"upgrade", "7.0.0-A10", "7.0.0-A12"},
{"upgrade", "7.0.0-A13", "7.0.0-M1"},
{"upgrade", "7.0.0-A13", "7.0.0-RC1"},
// Just the same version
{"same", "7.0.0", "7.0.0"},
{"same", "7.0.0-A14", "7.0.0-A14"},
// Normal versions using standard maven compare
{"downgrade", "7.0.0", "6.2.3"},
{"upgrade", "6.2.3", "7.0.0"},
// standard maven compare - note sure these even make sense as these are not maven format versions!
{"upgrade", "7.0.0-A15", "7.0.0-1234"},
{"downgrade", "7.0.0-1234", "7.0.0-M2"},
{"downgrade", "7.0.0-Rubbish1", "7.0.0-M3"},
{"upgrade", "7.0.0-A16", "7.0.0-Rubbish2"}
})
{
String expected = pair[0];
String value1 = pair[1];
String value2 = pair[2];
ModuleVersionNumber thisVersion = new ModuleVersionNumber(value1);
ModuleVersionNumber thatVersion = new ModuleVersionNumber(value2);
int actual = thisVersion.compareTo(thatVersion);
if ("downgrade".equals(expected))
{
assertTrue("Expected "+thisVersion+" to be a downgrade "+thatVersion+" ("+actual+")", actual > 0);
}
else if ("same".equals(expected))
{
assertTrue("Expected "+thisVersion+" to be the same base version as "+thatVersion+" ("+actual+")", actual == 0);
}
else if ("upgrade".equals(expected))
{
assertTrue("Expected "+thisVersion+" to be an upgrade from "+thatVersion+" ("+actual+")", actual < 0);
}
}
}
}