Coords: : with empty version is respected

Author: host6

src/main/java/org/scm4j/commons/Coords.java

@@ -10,6 +10,8 @@ public class Coords {
 	private final String groupId;
 	private final String classifier;
 	private final Version version;
+	private final String verPrefix;
+	private final String verSuffix;
 	private final String coordsStringNoComment;
 
 	public String getComment() {
@@ -69,7 +71,11 @@ public Coords(String coordsString) {
 		groupId = strs[0];
 		artifactId = strs[1];
 
-		classifier = strs.length > 3 ? ":" + strs[3].trim() : "";
+		verPrefix = strs.length > 2 ? ":" : "";
+
+		verSuffix = strs.length > 3 ? ":" : "";
+
+		classifier = strs.length > 3 ? strs[3].trim() : "";
 
 		version = new Version(strs.length > 2 ? strs[2] : "");
 	}
@@ -109,8 +115,9 @@ public String toString() {
 	}
 
 	public String toString(String versionStr) {
-		String str = versionStr + classifier + extension;
-		return getName() +  (str.isEmpty() ? "" : ":" + str) + commentStr;
+		String str = verPrefix.isEmpty() && !versionStr.isEmpty() ? ":" : verPrefix;
+		str += versionStr + verSuffix + classifier + extension;
+		return getName() + str + commentStr;
 	}
 
 	public String getName() {

src/test/java/org/scm4j/commons/CoordsTest.java

@@ -1,10 +1,9 @@
 package org.scm4j.commons;
 
-import static org.junit.Assert.*;
-
+import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.Test;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
+import static org.junit.Assert.*;
 
 public class CoordsTest {
 
@@ -40,8 +39,8 @@ public void testExtension() {
 	@Test
 	public void testClassifier() {
 		assertEquals("", dc("com.myproject:c1").getClassifier());
-		assertEquals(":", dc("com.myproject:c1::").getClassifier());
-		assertEquals(":class", dc("com.myproject:c1::class:").getClassifier());
+		assertEquals("", dc("com.myproject:c1::").getClassifier());
+		assertEquals("class", dc("com.myproject:c1::class:").getClassifier());
 	}
 
 	@Test
@@ -50,8 +49,8 @@ public void testToSting() {
 		assertEquals("com.myproject:  c1:1.0.0", dc("com.myproject:  c1:1.0.0").toString());
 		assertEquals("   com.myproject:  c1:1.0.0", dc("   com.myproject:  c1:1.0.0").toString());
 		assertEquals("com.myproject:c1:1.0.0#comment", dc("com.myproject:c1:1.0.0#comment").toString());
-		assertEquals("com.myproject:c1:1.0.0@ext #comment", dc("com.myproject:c1:1.0.0@ext #comment").toString());
-		assertEquals("com.myproject:c1::dfgd@ext #comment", dc("com.myproject:c1::dfgd@ext #comment").toString());
+		assertEquals("com.myproject:c1:1.0.0@ext # comment", dc("com.myproject:c1:1.0.0@ext # comment").toString());
+		assertEquals("com.myproject:c1::dfgd@ext # comment", dc("com.myproject:c1::dfgd@ext # comment").toString());
 	}
 
 	@Test
@@ -85,5 +84,15 @@ public void testEqualsAndHashCode() {
 				.usingGetClass()
 				.verify();
 	}
-	
+
+	@Test
+	public void testVersionChange() {
+		assertEquals("eu.untill:JTerminal:12.13  # comment", new Coords("eu.untill:JTerminal:  # comment").toString("12.13"));
+		assertEquals("eu.untill:JTerminal:12.13:abc@efg # comment", new Coords("eu.untill:JTerminal::abc@efg # comment").toString("12.13"));
+		assertEquals("eu.untill:JTerminal::abc@efg # comment", new Coords("eu.untill:JTerminal:12.13:abc@efg # comment").toString(""));
+		assertEquals("eu.untill:JTerminal::# comment", new Coords("eu.untill:JTerminal:12.13:# comment").toString(""));
+		assertEquals("eu.untill:JTerminal:  # comment", new Coords("eu.untill:JTerminal:12.13  # comment").toString(""));
+		assertEquals("eu.untill:JTerminal  # comment", new Coords("eu.untill:JTerminal  # comment").toString(""));
+		assertEquals("eu.untill:JTerminal:12.13  # comment", new Coords("eu.untill:JTerminal  # comment").toString("12.13"));
+	}
 }