Skip to content

update dependencies and refactor code #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-yonkov-yonkov merged 6 commits into from
Nov 12, 2025
Merged

update dependencies and refactor code #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddab851
update dependencies and refactor code
s-yonkov-yonkov Oct 23, 2025
fd1ae4c
add unit tests
s-yonkov-yonkov Nov 6, 2025
8580141
fix comments Vankata D
s-yonkov-yonkov Nov 7, 2025
9384549
fix comments Kris
s-yonkov-yonkov Nov 10, 2025
a95a50e
Update on comments, refactor of the Test class
s-yonkov-yonkov Nov 11, 2025
3ba4b9e
fix comments
s-yonkov-yonkov Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion multiapps-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion multiapps-mta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>com.vdurmont</groupId>
<groupId>org.semver4j</groupId>
<artifactId>semver4j</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion multiapps-mta/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
requires org.apache.commons.collections4;
requires org.apache.commons.io;
requires org.apache.commons.lang3;
requires semver4j;
requires org.semver4j;
requires org.apache.commons.compress;

requires static java.compiler;
Expand Down
30 changes: 9 additions & 21 deletions multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@

import org.cloudfoundry.multiapps.common.ParsingException;
import org.cloudfoundry.multiapps.mta.Messages;
import org.cloudfoundry.multiapps.mta.parsers.PartialVersionConverter;

import com.vdurmont.semver4j.Semver;
import com.vdurmont.semver4j.Semver.SemverType;
import com.vdurmont.semver4j.SemverException;
import org.semver4j.Semver;
import org.semver4j.SemverException;

public class Version implements Comparable<Version> {

private static final PartialVersionConverter PARTIAL_VERSION_CONVERTER = new PartialVersionConverter();

private final Semver version;

private Version(Semver version) {
Expand All @@ -32,21 +28,12 @@ public int getPatch() {
return version.getPatch();
}

public String getBuild() {
return version.getBuild();
}

public String[] getSuffixTokens() {
return version.getSuffixTokens();
}

public static Version parseVersion(String versionString) {
try {
String fullVersionString = PARTIAL_VERSION_CONVERTER.convertToFullVersionString(versionString);
return new Version(new Semver(fullVersionString, SemverType.NPM));
} catch (SemverException e) {
throw new ParsingException(e, Messages.UNABLE_TO_PARSE_VERSION, versionString);
var version = Semver.coerce(versionString);
if (version == null) {
throw new ParsingException(MessageFormat.format(Messages.UNABLE_TO_PARSE_VERSION, versionString));
}
return new Version(version);
}

@Override
Expand All @@ -56,7 +43,7 @@ public int hashCode() {

@Override
public String toString() {
return version.getValue();
return version.toString();
}

@Override
Expand All @@ -81,7 +68,8 @@ public boolean equals(Object obj) {

public boolean satisfies(String requirement) {
try {
return version.satisfies(requirement);
// The second parameter is preventing the default behavior of Semver to treat the suffix as a pre-release tag.
return version.satisfies(requirement, true);
} catch (SemverException e) {
throw new IllegalArgumentException(MessageFormat.format(Messages.UNABLE_TO_PARSE_VERSION_REQUIREMENT, requirement));
}
Expand Down
48 changes: 0 additions & 48 deletions ...pps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/PartialVersionConverter.java
View file
Open in desktop

This file was deleted.

205 changes: 205 additions & 0 deletions multiapps-mta/src/test/java/org/cloudfoundry/multiapps/mta/model/VersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
package org.cloudfoundry.multiapps.mta.model;

import java.util.stream.Stream;

import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

class VersionTest {

private static final String UNABLE_TO_PARSE_VERSION = "Unable to parse version";

// ---------------------------------------------------------------------------------------------
// PARSING AND NORMALIZATION TESTS
// ---------------------------------------------------------------------------------------------
@Nested
@DisplayName("parseVersion() and normalization behavior")
class ParseVersionTests {

@Test
@DisplayName("should parse complex versions with build metadata and timestamps")
void testParseComplexVersions() {
Version v1 = Version.parseVersion("0.0.1-20251105063220+e303076b5d51da7f0f3a10cd69de018ac0a3853d");
Version v2 = Version.parseVersion("1.2.0-20251105043948+cb754700fb069b3367c869938ac6beb396c800e4");
Version v3 = Version.parseVersion("1.0.0-SNAPSHOT-20240116224612+200df4832787863cc2f94d998c6cbcd711518933");

assertNotNull(v1);
assertNotNull(v2);
assertNotNull(v3);

assertVersionParts(v1, 0, 0, 1);
assertVersionParts(v2, 1, 2, 0);
assertVersionParts(v3, 1, 0, 0);
}

private void assertVersionParts(Version version, int major, int minor, int patch) {
assertEquals(major, version.getMajor());
assertEquals(minor, version.getMinor());
assertEquals(patch, version.getPatch());
}

@ParameterizedTest(name = "Partial version \"{0}\" should normalize to \"{1}\"")
@MethodSource
void testNormalizePartialVersions(String input, String expected) {
Version version = Version.parseVersion(input);
assertEquals(expected, version.toString());
}

static Stream<Arguments> testNormalizePartialVersions() {
return Stream.of(
Arguments.of("1.0.0", "1.0.0"),
Arguments.of("2.1", "2.1.0"),
Arguments.of("2", "2.0.0"),
Arguments.of("1.9.0-SNAPSHOT", "1.9.0-SNAPSHOT"),
Arguments.of("1.9-SNAPSHOT", "1.9.0"),
Arguments.of("1-SNAPSHOT", "1.0.0"),
Arguments.of("1.2.0-beta+exp.sha.5114f85", "1.2.0-beta+exp.sha.5114f85"),
Arguments.of("1.2-beta+exp.sha.5114f85", "1.2.0"),
Arguments.of("1-beta+exp.sha.5114f85", "1.0.0"),
Arguments.of("v1.2.3", "1.2.3")
);
}

@ParameterizedTest(name = "Invalid version \"{0}\" should throw SemverException or ParsingException")
@MethodSource
void testInvalidVersions(String invalid, String expectedMessage) {
Exception ex = assertThrows(Exception.class, () -> Version.parseVersion(invalid));
assertTrue(ex.getMessage()
.contains(expectedMessage));
}

static Stream<Arguments> testInvalidVersions() {
return Stream.of(
Arguments.of("a.b.c", UNABLE_TO_PARSE_VERSION),
Arguments.of("", UNABLE_TO_PARSE_VERSION),
Arguments.of("null", UNABLE_TO_PARSE_VERSION),
Arguments.of("not-a-version", UNABLE_TO_PARSE_VERSION)
);
}
}

// ---------------------------------------------------------------------------------------------
// COMPARISON AND EQUALITY TESTS
// ---------------------------------------------------------------------------------------------
@Nested
@DisplayName("compareTo() and equality behavior")
class CompareTests {

@Test
void testVersionComparison() {
Version v1 = Version.parseVersion("1.2.3");
Version v2 = Version.parseVersion("1.3.0");
Version v3 = Version.parseVersion("1.2.3");

assertTrue(v1.compareTo(v2) < 0);
assertTrue(v2.compareTo(v1) > 0);
assertEquals(0, v1.compareTo(v3));
}

@Test
void testEqualsAndHashCode() {
Version v1 = Version.parseVersion("2.0.0");
Version v2 = Version.parseVersion("2.0.0");
Version v3 = Version.parseVersion("2.0.1");

assertEquals(v1, v2);
assertNotEquals(v1, v3);
assertEquals(v1.hashCode(), v2.hashCode());
assertNotEquals(v1.hashCode(), v3.hashCode());
}
}

// ---------------------------------------------------------------------------------------------
// TO STRING & EDGE CASE TESTS
// ---------------------------------------------------------------------------------------------
@Nested
class ToStringAndEdgeCases {

@Test
void testToStringRepresentation() {
String raw = "3.4.5-alpha+build";
Version version = Version.parseVersion(raw);
assertEquals(raw, version.toString());
}

@Test
void testLargeVersionNumbers() {
Version version = Version.parseVersion("9999.9999.9999");
assertEquals(9999, version.getMajor());
}

@Test
void testPreReleaseVersion() {
Version version = Version.parseVersion("1.0.0-alpha");
assertTrue(version.toString()
.contains("alpha"));
}
}

// ---------------------------------------------------------------------------------------------
// SATISFIES() RANGE CHECK TESTS
// ---------------------------------------------------------------------------------------------
@Nested
class SatisfiesBehavior {

@Test
void testSimpleComparisons() {
Version v = Version.parseVersion("3.1.4");

assertTrue(v.satisfies(">3.0.0"));
assertTrue(v.satisfies(">=3.1.4"));
assertFalse(v.satisfies("<3.0.0"));
assertFalse(v.satisfies("<=3.1.3"));
}

@Test
void testCompositeRanges() {
Version v = Version.parseVersion("3.1.4");
assertTrue(v.satisfies(">=3.1.4 <4.0.0"));
assertTrue(v.satisfies(">=3.0.0 <=3.1.4"));
assertFalse(v.satisfies(">=3.2.0 <4.0.0"));
}

@Test
void testCaretAndTilde() {
Version v = Version.parseVersion("1.3.5");
assertTrue(v.satisfies("^1.3.0"));
assertTrue(v.satisfies("~1.3.0"));
assertFalse(v.satisfies("^2.0.0"));
}

@Test
void testMalformedRequirementsReturnFalse() {
Version v = Version.parseVersion("3.1.4");
assertFalse(v.satisfies("not-a-requirement"));
assertFalse(v.satisfies("pesho3.1.4"));
assertFalse(v.satisfies("3.1.4.2.3.4.5"));
}

@Test
void testNullRequirement() {
Version v = Version.parseVersion("3.1.4");
assertThrows(NullPointerException.class, () -> v.satisfies(null));
}

@Test
void testSatisfiesWithComplexVersions() {
Version v = Version.parseVersion("1.2.3-20251105063220+e303076b5d51da7f0f3a10cd69de018ac0a3853d");
assertTrue(v.satisfies(">=1.2.0"));
assertFalse(v.satisfies(">1.2.3"));
assertTrue(v.satisfies(">=1.2.0 <2.0.0"));
assertFalse(v.satisfies(">1.2.3 <2.0.0"));
}
}
}
Loading
Loading