Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15896 Fix the toString method of SolrVersion (#500)

Jan Høydahlf6c1db6fc08a
diff --git a/solr/core/src/java/org/apache/solr/util/SolrVersion.java b/solr/core/src/java/org/apache/solr/util/SolrVersion.java
index a45f4d29568..678a3d62ba4 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrVersion.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrVersion.java
@@ -21,6 +21,8 @@ import com.github.zafarkhaja.semver.Version;
import com.github.zafarkhaja.semver.expr.ExpressionParser;
import org.apache.solr.common.SolrException;
+import java.util.Locale;
+
/**
* Simple Solr version representation backed by a <a href="https://devhints.io/semver">Semantic Versioning</a> library.
* Provides a constant for current Solr version as well as methods to parse string versions and
@@ -57,7 +59,17 @@ public final class SolrVersion implements Comparable<SolrVersion> {
*/
@Override
public String toString() {
- return version.toString();
+ // Workaround for bug https://github.com/zafarkhaja/jsemver/issues/32
+ // TODO: Needs to find a newer SemVer lib
+ StringBuilder sb = new StringBuilder(String.format(Locale.ROOT, "%d.%d.%d",
+ version.getMajorVersion(), version.getMinorVersion(), version.getPatchVersion()));
+ if (!version.getPreReleaseVersion().isEmpty()) {
+ sb.append("-").append(version.getPreReleaseVersion());
+ }
+ if (!version.getBuildMetadata().isEmpty()) {
+ sb.append("+").append(version.getBuildMetadata());
+ }
+ return sb.toString();
}
public boolean greaterThan(SolrVersion other) {
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrVersion.java b/solr/core/src/test/org/apache/solr/util/TestSolrVersion.java
index ae3d52006ae..f7d67c38e29 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrVersion.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrVersion.java
@@ -27,12 +27,12 @@ public class TestSolrVersion extends SolrTestCase {
}
public void testVersionComponents() {
- SolrVersion v9_0_1_rc1 = SolrVersion.valueOf("9.0.1-rc1");
- assertEquals("9.0.1-rc1", v9_0_1_rc1.toString());
+ SolrVersion v9_0_1_rc1 = SolrVersion.valueOf("9.0.1-rc1.0+b123");
+ assertEquals("9.0.1-rc1.0+b123", v9_0_1_rc1.toString());
assertEquals(9, v9_0_1_rc1.getMajorVersion());
assertEquals(0, v9_0_1_rc1.getMinorVersion());
assertEquals(1, v9_0_1_rc1.getPatchVersion());
- assertEquals("rc1", v9_0_1_rc1.getPrereleaseVersion());
+ assertEquals("rc1.0", v9_0_1_rc1.getPrereleaseVersion());
}
public void testLatestInitialized() {