minor upgrade/downgrade detection: refactor, documentation update

Author: host6

docs/minor-release-status.md

@@ -45,6 +45,8 @@ Status denotes next action which should be undertaken to finish patch build: {AC
 - mdeps are not locked => ERROR
 - `subComponents` are calculated using mdeps from particular RB
 - Any component is not in DONE status => BUILD_MDEPS
+- Any component `nextVersion`.truncatePatch is not equal to one mentioned in `mdeps` -> error (disallow minor upgrade/downgrade)
+- Any component `nextVersion`.patch is less than one mentioned in `mdeps` -> error (patch upgrade only is allowed)
 - Any component has patch which is greater than one mentioned in `mdeps` => ACTUALIZE_PATCHES
 - No valuable commits after last tag => DONE
   - Using #scm-ver is not safe, it is possible to lost commit which is done between build and increasing version

src/main/java/org/scm4j/releaser/ExtendedStatusBuilder.java

@@ -1,13 +1,25 @@
 package org.scm4j.releaser;
 
+import static org.scm4j.releaser.Utils.reportDuration;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
 import org.scm4j.commons.Version;
 import org.scm4j.commons.progress.IProgress;
 import org.scm4j.commons.progress.ProgressConsole;
 import org.scm4j.releaser.branch.DevelopBranch;
 import org.scm4j.releaser.branch.ReleaseBranchCurrent;
 import org.scm4j.releaser.branch.ReleaseBranchFactory;
 import org.scm4j.releaser.branch.ReleaseBranchPatch;
-import org.scm4j.releaser.conf.*;
+import org.scm4j.releaser.conf.Component;
+import org.scm4j.releaser.conf.DelayedTag;
+import org.scm4j.releaser.conf.DelayedTagsFile;
+import org.scm4j.releaser.conf.VCSRepository;
+import org.scm4j.releaser.conf.VCSRepositoryFactory;
 import org.scm4j.releaser.exceptions.EMinorUpgradeDowngrade;
 import org.scm4j.releaser.exceptions.ENoReleaseBranchForPatch;
 import org.scm4j.releaser.exceptions.ENoReleases;
@@ -17,15 +29,6 @@
 import org.scm4j.vcs.api.VCSTag;
 import org.scm4j.vcs.api.WalkDirection;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-
-import static org.scm4j.releaser.Constants.ZERO_PATCH;
-import static org.scm4j.releaser.Utils.reportDuration;
-
 public class ExtendedStatusBuilder {
 
 	private static final int PARALLEL_CALCULATION_AWAIT_TIME = 500;
@@ -217,34 +220,37 @@ private <T> T walkOnCommits(VCSRepository repo, ReleaseBranchPatch rb, Function<
 		} while (commits.size() >= COMMITS_RANGE_LIMIT);
 		return null;
 	}
-
+	
 	private boolean areMDepsPatchesActual(Component rootComp, VCSRepository repo, List<Component> mDeps, CachedStatuses cache) {
 		for (Component mDep : mDeps) {
 			String url = repoFactory.getUrl(mDep);
-			Version nextMDepVersion = cache.get(url).getNextVersion();
-			if (!nextMDepVersion.toReleaseNoPatch().equals(mDep.getVersion().toReleaseNoPatch())) {
+			Version nextVersion = cache.get(url).getNextVersion();
+			
+			// Any component `nextVersion`.truncatePatch is not equal to one mentioned in `mdeps` -> error (disallow minor upgrade/downgrade)
+			if (!nextVersion.toReleaseNoPatch().equals(mDep.getVersion().toReleaseNoPatch())) {
 				cache.remove(repo.getUrl());
-				throw new EMinorUpgradeDowngrade(rootComp, mDep, nextMDepVersion.toPreviousPatch());
+				throw new EMinorUpgradeDowngrade(rootComp, mDep, nextVersion.toPreviousPatch());
 			}
+			
+			
 			DelayedTagsFile mdf = new DelayedTagsFile();
-			Integer cachedMDepPatch;
-			if (!(nextMDepVersion.getPatch().equals(ZERO_PATCH) && mdf.getDelayedTagByUrl(url) != null)) {
-				cachedMDepPatch = Integer.parseInt(nextMDepVersion.toPreviousPatch().getPatch());
+			Version verToActualizeOn ;
+			if (mdf.getDelayedTagByUrl(url) != null) { // if delayed tag
+				verToActualizeOn = nextVersion;
 			} else {
-				cachedMDepPatch = Integer.parseInt(nextMDepVersion.getPatch());
+				verToActualizeOn = nextVersion.toPreviousPatch();
 			}
-			 
+			
 			Integer mDepPatch = Integer.parseInt(mDep.getVersion().getPatch());
-			if (cachedMDepPatch == mDepPatch) {
-				continue;
-			}
+			Integer nextVersionPatch = Integer.parseInt(verToActualizeOn.getPatch());
 
-			if (cachedMDepPatch < mDepPatch) {
+			// Any component `nextVersion`.patch is less than one mentioned in `mdeps` -> error (patch upgrade only is allowed)
+			if (nextVersionPatch < mDepPatch) {
 				cache.remove(repo.getUrl());
-				throw new EMinorUpgradeDowngrade(rootComp, mDep, nextMDepVersion.toPreviousPatch());
+				throw new EMinorUpgradeDowngrade(rootComp, mDep, verToActualizeOn);
 			}
-				
-			if (!(nextMDepVersion.getPatch().equals(ZERO_PATCH) && mdf.getDelayedTagByUrl(url) != null)) {
+			
+			if (nextVersionPatch > mDepPatch) {
 				return false;
 			}
 		}

src/test/java/org/scm4j/releaser/WorkflowPatchesTest.java

@@ -200,10 +200,10 @@ public void testMinorUpgradeDowngradeException() {
 		} catch (EMinorUpgradeDowngrade e) {
 			if (e.getRootComp().equals(compUBL.clone(crbUBL.getVersion().toPreviousPatch()))) {
 				assertEquals(compUnTillDb.clone("2.59.0"), e.getProblematicMDep());
-			} else if (e.getRootComp().equals(compUnTill.clone(crbUnTill.getVersion().toPreviousPatch()))) {
+			} else if (e.getRootComp().equals(compUnTill.clone(env.getUnTillVer().toRelease()))) {
 				assertEquals(compUnTillDb.clone("2.60.0"), e.getProblematicMDep());
 			} else {
-				assertEquals(e.getRootComp(), compUBL.clone(crbUBL.getVersion().toPreviousPatch()));
+				fail();
 			}
 		}
 	}
@@ -214,7 +214,6 @@ public void testPatchDowngradeException() {
 
 		// unTill uses 2.59.0 version of UnTillDb
 		// make UBL use 2.59.1 version of unTillDb
-		ReleaseBranchCurrent crbUnTill = ReleaseBranchFactory.getCRB(repoUnTill);
 		ReleaseBranchCurrent crbUBL = ReleaseBranchFactory.getCRB(repoUBL);
 		ReleaseBranchCurrent crbUnTillDb = ReleaseBranchFactory.getCRB(repoUnTillDb);
 		MDepsFile mdf = new MDepsFile(env.getUblVCS().getFileContent(crbUBL.getName(), Constants.MDEPS_FILE_NAME, null));
@@ -230,7 +229,7 @@ public void testPatchDowngradeException() {
 		} catch (EMinorUpgradeDowngrade e) {
 			if (e.getRootComp().equals(compUBL.clone(crbUBL.getVersion().toPreviousPatch()))) {
 				assertEquals(compUnTillDb.clone("2.59.1"), e.getProblematicMDep());
-			} else if (e.getRootComp().equals(compUnTill.clone(crbUnTill.getVersion().toPreviousPatch()))) {
+			} else if (e.getRootComp().equals(compUnTill.clone(env.getUnTillVer().toRelease()))) {
 				assertEquals(compUnTillDb.clone("2.59.0"), e.getProblematicMDep());
 			} else {
 				fail();