diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/LatestMinor.java b/rewrite-core/src/main/java/org/openrewrite/semver/LatestMinor.java new file mode 100644 index 00000000000..17737b52488 --- /dev/null +++ b/rewrite-core/src/main/java/org/openrewrite/semver/LatestMinor.java @@ -0,0 +1,60 @@ +/* + * Copyright 2021 the original author or authors. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.openrewrite.semver; + +import lombok.Value; +import org.jspecify.annotations.Nullable; +import org.openrewrite.Validated; + +@Value +public class LatestMinor implements VersionComparator { + @Nullable + String metadataPattern; + + @Override + public boolean isValid(@Nullable String currentVersion, String version) { + Validated validated = currentVersion == null ? + LatestRelease.buildLatestRelease("latest.release", metadataPattern) : + TildeRange.build("~" + Semver.majorVersion(currentVersion), metadataPattern); + + if (validated.isValid()) { + VersionComparator comparator = validated.getValue(); + if (comparator != null) { + return comparator.isValid(currentVersion, version); + } + } + return false; + } + + @Override + public int compare(@Nullable String currentVersion, String v1, String v2) { + if(currentVersion == null) { + return new LatestRelease(null) + .compare(null, v1, v2); + } + + //noinspection ConstantConditions + return TildeRange.build("~" + Semver.majorVersion(currentVersion) + "." + Semver.minorVersion(currentVersion), metadataPattern) + .getValue() + .compare(currentVersion, v1, v2); + } + + public static Validated build(String toVersion, @Nullable String metadataPattern) { + return "latest.minor".equalsIgnoreCase(toVersion) ? + Validated.valid("latestMinor", new LatestMinor(metadataPattern)) : + Validated.invalid("latestMinor", toVersion, "not latest release"); + } +} diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java b/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java index 18fc5d4b12e..df8fac8951c 100644 --- a/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java +++ b/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java @@ -168,7 +168,7 @@ public int compare(@Nullable String currentVersion, String v1, String v2) { } public static Validated buildLatestRelease(String toVersion, @Nullable String metadataPattern) { - return "latest.release".equalsIgnoreCase(toVersion) ? + return "latest.release".equalsIgnoreCase(toVersion) || "latest.major".equalsIgnoreCase(toVersion) ? Validated.valid("latestRelease", new LatestRelease(metadataPattern)) : Validated.invalid("latestRelease", toVersion, "not latest release"); } diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java b/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java index d4d6388702a..e47ec996629 100644 --- a/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java +++ b/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java @@ -59,6 +59,7 @@ public static Validated validate(String toVersion, @Nullable ).and(Validated.none() .or(LatestRelease.buildLatestRelease(toVersion, metadataPattern)) .or(LatestIntegration.build(toVersion, metadataPattern)) + .or(LatestMinor.build(toVersion, metadataPattern)) .or(LatestPatch.build(toVersion, metadataPattern)) .or(HyphenRange.build(toVersion, metadataPattern)) .or(XRange.build(toVersion, metadataPattern)) diff --git a/rewrite-core/src/test/java/org/openrewrite/semver/LatestMinorTest.java b/rewrite-core/src/test/java/org/openrewrite/semver/LatestMinorTest.java new file mode 100644 index 00000000000..ef551e1d882 --- /dev/null +++ b/rewrite-core/src/test/java/org/openrewrite/semver/LatestMinorTest.java @@ -0,0 +1,38 @@ +/* + * Copyright 2024 the original author or authors. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.openrewrite.semver; + +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class LatestMinorTest { + private final LatestMinor latestMinor = new LatestMinor(null); + + @Test + void isValidWhenCurrentIsNull() { + assertThat(latestMinor.isValid(null, "1.0.0")).isTrue(); + } + @Test + void isValid() { + assertThat(latestMinor.isValid("1.0.0", "1.0.0")).isTrue(); + assertThat(latestMinor.isValid("1.0.0", "1.0.0.1")).isTrue(); + assertThat(latestMinor.isValid("1.0.0", "1.0.1")).isTrue(); + assertThat(latestMinor.isValid("1.0", "1.0.1")).isTrue(); + assertThat(latestMinor.isValid("1.0.0", "1.1.0")).isTrue(); + assertThat(latestMinor.isValid("1.0.0", "2.0.0")).isFalse(); + } +}