Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-384 - Polished toString() representation of Version.

Browse Source 
Trailing zeros now get removed up until the minor version number.
This commit is contained in:
Oliver Gierke
2013-11-04 10:20:59 +01:00
parent 9b077890b4
commit 057c2e9bf8
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/data/util/Version.java
View File

@@ -1,6 +1,10 @@
package org.springframework.data.util;
import java.util.ArrayList;
import java.util.List;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* Value object to represent a Version consisting of major, minor and bugfix part.
@@ -176,6 +180,19 @@ public class Version implements Comparable<Version> {
*/
@Override
public String toString() {
return String.format("%d.%d.%d.%d", major, minor, bugfix, build);
List<Integer> digits = new ArrayList<Integer>();
digits.add(major);
digits.add(minor);
if (build != 0 || bugfix != 0) {
digits.add(bugfix);
}
if (build != 0) {
digits.add(build);
}
return StringUtils.collectionToDelimitedString(digits, ".");
}
}

12
src/test/java/org/springframework/data/util/VersionUnitTests.java
View File

@@ -111,4 +111,16 @@ public class VersionUnitTests {
assertThat(nextBugfix.compareTo(version), is(greaterThan(0)));
assertThat(nextBuild.compareTo(version), is(greaterThan(0)));
}
@Test
public void removesTrailingZerosAfterSecondValueForToString() {
assertThat(new Version(2).toString(), is("2.0"));
assertThat(new Version(2, 0).toString(), is("2.0"));
assertThat(new Version(2, 0, 0).toString(), is("2.0"));
assertThat(new Version(2, 0, 0, 0).toString(), is("2.0"));
assertThat(new Version(2, 0, 1).toString(), is("2.0.1"));
assertThat(new Version(2, 0, 1, 0).toString(), is("2.0.1"));
assertThat(new Version(2, 0, 0, 1).toString(), is("2.0.0.1"));
}
}