This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-version. See https://gitlab.nuiton.org/nuiton/nuiton-version.git commit b866c1be0dd8b5d7b6181f7e7c51da7e4ffd9f0f Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 21:17:40 2020 +0200 Code maturity --- src/main/java/org/nuiton/version/Version.java | 4 ++-- .../java/org/nuiton/version/VersionBuilder.java | 21 ++++++++------------- .../java/org/nuiton/version/VersionComparator.java | 7 ++++--- src/main/java/org/nuiton/version/Versions.java | 2 +- src/test/java/org/nuiton/version/SemVerTest.java | 10 ++++------ src/test/java/org/nuiton/version/VersionTest.java | 2 +- src/test/java/org/nuiton/version/VersionsTest.java | 4 ++-- 7 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/nuiton/version/Version.java b/src/main/java/org/nuiton/version/Version.java index d71c0b8..e88824b 100644 --- a/src/main/java/org/nuiton/version/Version.java +++ b/src/main/java/org/nuiton/version/Version.java @@ -119,8 +119,8 @@ public class Version implements Comparable<Version>, Serializable { protected transient String version; protected Version(List<VersionComponant> componants, List<String> componantSeparators, boolean snapshot) { - this.componantSeparators = Collections.unmodifiableList(new ArrayList<String>(componantSeparators)); - this.componants = Collections.unmodifiableList(new ArrayList<VersionComponant>(componants)); + this.componantSeparators = Collections.unmodifiableList(new ArrayList<>(componantSeparators)); + this.componants = Collections.unmodifiableList(new ArrayList<>(componants)); this.snapshot = snapshot; } diff --git a/src/main/java/org/nuiton/version/VersionBuilder.java b/src/main/java/org/nuiton/version/VersionBuilder.java index d44ed99..b576c6d 100644 --- a/src/main/java/org/nuiton/version/VersionBuilder.java +++ b/src/main/java/org/nuiton/version/VersionBuilder.java @@ -104,7 +104,7 @@ public class VersionBuilder { public static VersionBuilder create(Version version) { List<Comparable> componants = toComparableList(version.getComponants()); - List<String> componantSeparators = new ArrayList<String>(version.getComponantSeparators()); + List<String> componantSeparators = new ArrayList<>(version.getComponantSeparators()); boolean snapshot = version.isSnapshot(); return new VersionBuilder().setComponants(componants).setComponantSeparators(componantSeparators).setSnapshot(snapshot); @@ -115,12 +115,12 @@ public class VersionBuilder { } public VersionBuilder() { - splitSeparators = new HashSet<Character>(); + splitSeparators = new HashSet<>(); splitSeparators.add('-'); splitSeparators.add('.'); splitSeparators.add('_'); joinSeparator = '.'; - preReleaseClassifiers = new HashSet<String>(); + preReleaseClassifiers = new HashSet<>(); preReleaseClassifiers.add("alpha"); preReleaseClassifiers.add("beta"); preReleaseClassifiers.add("rc"); @@ -164,7 +164,7 @@ public class VersionBuilder { if (componantSeparators == null) { // init it with join separator - componantSeparators = new ArrayList<String>(componants.size() - 1); + componantSeparators = new ArrayList<>(componants.size() - 1); initSeparatorList(componantSeparators, componants.size() - 2); @@ -249,8 +249,8 @@ public class VersionBuilder { public Version build() { - List<Version.VersionComponant> finalComponants = new ArrayList<Version.VersionComponant>(); - List<String> finalComponantSeparators = new ArrayList<String>(); + List<Version.VersionComponant> finalComponants = new ArrayList<>(); + List<String> finalComponantSeparators = new ArrayList<>(); boolean finalSnapshot; @@ -268,7 +268,7 @@ public class VersionBuilder { if (CollectionUtils.isNotEmpty(componantSeparators)) { - finalComponantSeparators = new ArrayList<String>(componantSeparators); + finalComponantSeparators = new ArrayList<>(componantSeparators); } else { @@ -412,12 +412,7 @@ public class VersionBuilder { protected static List<Comparable> toComparableList(List<Version.VersionComponant> componants) { - List<Comparable> result = Lists.newArrayList(Lists.transform(componants, new Function<Version.VersionComponant, Comparable>() { - @Override - public Comparable apply(Version.VersionComponant input) { - return input.getValue(); - } - })); + List<Comparable> result = Lists.newArrayList(Lists.transform(componants, input -> input.getValue())); return result; diff --git a/src/main/java/org/nuiton/version/VersionComparator.java b/src/main/java/org/nuiton/version/VersionComparator.java index 1afbe7c..972e999 100644 --- a/src/main/java/org/nuiton/version/VersionComparator.java +++ b/src/main/java/org/nuiton/version/VersionComparator.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Objects; /** * Comparator of {@link Version}. @@ -98,7 +99,7 @@ public class VersionComparator implements Comparator<Version>, Serializable { Version.VersionComponant o1Componant = o1.getComponant(i); Version.VersionComponant o2Componant = o2.getComponant(i); - if (ObjectUtils.equals(o1Componant.getClass(), o2Componant.getClass())) { + if (Objects.equals(o1Componant.getClass(), o2Componant.getClass())) { // same componant type, using natural order result = o1Componant.compareTo(o2Componant); @@ -206,12 +207,12 @@ public class VersionComparator implements Comparator<Version>, Serializable { */ public static void main(String... args) { - List<Version> versions = new ArrayList<Version>(); + List<Version> versions = new ArrayList<>(); for (String arg : args) { Version version = Versions.valueOf(arg); versions.add(version); } - Collections.sort(versions, Collections.reverseOrder(new VersionComparator())); + versions.sort(Collections.reverseOrder(new VersionComparator())); String join = Joiner.on(' ').join(versions); System.out.println(join); diff --git a/src/main/java/org/nuiton/version/Versions.java b/src/main/java/org/nuiton/version/Versions.java index c382cbf..e7585ab 100644 --- a/src/main/java/org/nuiton/version/Versions.java +++ b/src/main/java/org/nuiton/version/Versions.java @@ -152,7 +152,7 @@ public class Versions { } // extract components - List<Comparable> componants = new ArrayList<Comparable>(); + List<Comparable> componants = new ArrayList<>(); for (int index = firstComponent; index <= lastComponent; index++) { Comparable component = version.getComponant(index).getValue(); componants.add(component); diff --git a/src/test/java/org/nuiton/version/SemVerTest.java b/src/test/java/org/nuiton/version/SemVerTest.java index ec3d1ed..0a3cafb 100644 --- a/src/test/java/org/nuiton/version/SemVerTest.java +++ b/src/test/java/org/nuiton/version/SemVerTest.java @@ -179,10 +179,9 @@ public class SemVerTest { int result = normalize(vi.compareTo(vj)); int expected = -1; - Assert.assertTrue(String.format( + Assert.assertEquals(String.format( "Bad compare: Compare(%s, %s) = %s, expected %s", - vi, vj, result, expected), - expected == result); + vi, vj, result, expected), expected, result); // System.out.println(String.format( // "Good compare: Compare(%s, %s) = %s, expected %s", // vi, vj, result, expected)); @@ -198,10 +197,9 @@ public class SemVerTest { int result = normalize(vi.compareTo(vj)); int expected = Integer.valueOf(i).compareTo(j); // AThimel 2013/02/26 Rewritten for JDK6 compatibility. Was: Integer.compare(i, j); - Assert.assertTrue(String.format( + Assert.assertEquals(String.format( "Bad compare: Compare(%s, %s) = %s, expected %s", - vi, vj, result, expected), - expected == result); + vi, vj, result, expected), expected, result); } } } diff --git a/src/test/java/org/nuiton/version/VersionTest.java b/src/test/java/org/nuiton/version/VersionTest.java index 86d1270..fc38e61 100644 --- a/src/test/java/org/nuiton/version/VersionTest.java +++ b/src/test/java/org/nuiton/version/VersionTest.java @@ -62,7 +62,7 @@ public class VersionTest { } protected void assertEquals(Version v1, Version v2) { - Assert.assertTrue(v1 + " equals to " + v2, v1.equals(v2)); + Assert.assertEquals(v1 + " equals to " + v2, v1, v2); } } diff --git a/src/test/java/org/nuiton/version/VersionsTest.java b/src/test/java/org/nuiton/version/VersionsTest.java index 4ff885e..1c49cea 100644 --- a/src/test/java/org/nuiton/version/VersionsTest.java +++ b/src/test/java/org/nuiton/version/VersionsTest.java @@ -107,8 +107,8 @@ public class VersionsTest { Version v = versions[i]; Version vIncrements = versionsIncrements[i]; Version increments = Versions.increments(v); - Assert.assertTrue(v + " + 1 = " + increments + " should be " + vIncrements, increments.equals(vIncrements)); - Assert.assertTrue(v + " + 1 = " + increments + " should be " + vIncrements, increments.getVersion().equals(vIncrements.getVersion())); + Assert.assertEquals(v + " + 1 = " + increments + " should be " + vIncrements, increments, vIncrements); + Assert.assertEquals(v + " + 1 = " + increments + " should be " + vIncrements, increments.getVersion(), vIncrements.getVersion()); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.