- Nuiton-utils-commits - mailman.cloud.codelutin.com

r2686 - trunk
by maven-release＠users.nuiton.org Sept. 11, 2014

Sept. 11, 2014

Author: maven-release Date: 2014-09-11 18:03:49 +0200 (Thu, 11 Sep 2014) New Revision: 2686 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2686 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-11 16:03:45 UTC (rev 2685) +++ trunk/pom.xml 2014-09-11 16:03:49 UTC (rev 2686) @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-8</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description> @@ -121,12 +121,12 @@ <scm> <connection> - scm:svn:https://svn.nuiton.org/nuiton-utils/tags/nuiton-utils-3.0-rc-8 + scm:svn:https://svn.nuiton.org/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-utils/tags/nuiton-utils-3.0-rc-8 + scm:svn:https://svn.nuiton.org/nuiton-utils/trunk </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-…</url> + <url>https://forge.nuiton.org/projects/nuiton-utils/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2685 - in tags: . nuiton-utils-3.0-rc-8
by maven-release＠users.nuiton.org Sept. 11, 2014

Sept. 11, 2014

Author: maven-release Date: 2014-09-11 18:03:45 +0200 (Thu, 11 Sep 2014) New Revision: 2685 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2685 Log: [maven-release-plugin] copy for tag nuiton-utils-3.0-rc-8 Added: tags/nuiton-utils-3.0-rc-8/ Property changes on: tags/nuiton-utils-3.0-rc-8 ___________________________________________________________________ Added: svn:mergeinfo + Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea

1 0

r2684 - trunk
by maven-release＠users.nuiton.org Sept. 11, 2014

Sept. 11, 2014

Author: maven-release Date: 2014-09-11 18:03:42 +0200 (Thu, 11 Sep 2014) New Revision: 2684 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2684 Log: [maven-release-plugin] prepare release nuiton-utils-3.0-rc-8 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-09 15:45:37 UTC (rev 2683) +++ trunk/pom.xml 2014-09-11 16:03:42 UTC (rev 2684) @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-rc-8</version> <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description> @@ -121,12 +121,12 @@ <scm> <connection> - scm:svn:https://svn.nuiton.org/nuiton-utils/trunk + scm:svn:https://svn.nuiton.org/nuiton-utils/tags/nuiton-utils-3.0-rc-8 </connection> <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-utils/trunk + scm:svn:https://svn.nuiton.org/nuiton-utils/tags/nuiton-utils-3.0-rc-8 </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-utils/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-…</url> </scm> <distributionManagement>

1 0

r2683 - trunk/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org Sept. 9, 2014

Sept. 9, 2014

Author: tchemit Date: 2014-09-09 17:45:37 +0200 (Tue, 09 Sep 2014) New Revision: 2683 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2683 Log: fixes #3500: Add org.nuiton.util.beans.BeanUtil#getMutator method Modified: trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java Modified: trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java 2014-09-09 12:43:03 UTC (rev 2682) +++ trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java 2014-09-09 15:45:37 UTC (rev 2683) @@ -32,6 +32,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -314,6 +315,27 @@ return new HashSet<PropertyDescriptor>(result.values()); } + public static Method getMutator(Object bean, String property) { + Method mutator = null; + if (bean == null) { + throw new NullPointerException("could not find bean"); + } + if (property == null) { + throw new NullPointerException("could not find property"); + } + + try { + PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); + if (descriptor != null) { + mutator = descriptor.getWriteMethod(); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + + return mutator; + } + protected static void getDescriptors(Class<?> beanType, Predicate<PropertyDescriptor> predicate, Map<String, PropertyDescriptor> result,

1 0

r2682 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org Sept. 9, 2014

Sept. 9, 2014

Author: tchemit Date: 2014-09-09 14:43:03 +0200 (Tue, 09 Sep 2014) New Revision: 2682 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2682 Log: fixes #3498: Add more methods on DateUtil Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtil.java 2014-08-26 17:32:49 UTC (rev 2681) +++ trunk/src/main/java/org/nuiton/util/DateUtil.java 2014-09-09 12:43:03 UTC (rev 2682) @@ -257,7 +257,7 @@ * @param beforeDate the first date of the period * @param afterDate the second date of the period * @return true if the current date is included between the two dates, - * false otherwise + * false otherwise * @see #between(Date, Date, Date) */ public static boolean currentPeriod(Date beforeDate, Date afterDate) { @@ -407,11 +407,11 @@ */ public static Date getYesterday(Date date) { Calendar cal = getDefaultCalendar(date); - if (cal.get(Calendar.MONTH)==Calendar.JANUARY && cal.get(Calendar.DAY_OF_MONTH)==1){ - cal.roll(Calendar.YEAR,false); + if (cal.get(Calendar.MONTH) == Calendar.JANUARY && cal.get(Calendar.DAY_OF_MONTH) == 1) { + cal.roll(Calendar.YEAR, false); } - if (cal.get(Calendar.DAY_OF_MONTH)==1) { - cal.roll(Calendar.MONTH,false); + if (cal.get(Calendar.DAY_OF_MONTH) == 1) { + cal.roll(Calendar.MONTH, false); } cal.roll(Calendar.DAY_OF_MONTH, false); return cal.getTime(); @@ -439,7 +439,7 @@ * * @param date any date * @return a date in the same week as given date, a monday. All field below - * (hours, secondes, ms) are zeroed. + * (hours, secondes, ms) are zeroed. */ public static Date truncateToDayOfWeek(Date date) { Calendar calendar = Calendar.getInstance(); @@ -451,4 +451,104 @@ calendar.set(Calendar.MILLISECOND, 0); return calendar.getTime(); } + + + /** + * Enleve les données des heures (hour, minute, second, milli = 0). + * + * @param date la date a modifier + * @return la date d'un jour + */ + public static Date getDay(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.HOUR_OF_DAY, 0); + date = calendar.getTime(); + return date; + } + + /** + * Positionne une date sur la fin d'un jour + * + * @param date la date a modifier + * @return la date d'un jour + */ + public static Date getEndOfDay(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.MILLISECOND, 999); + calendar.set(Calendar.SECOND, 59); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.HOUR_OF_DAY, 23); + date = calendar.getTime(); + return date; + } + + /** + * Créer la date qui utilise le jour donné dans {@code day} et l'heure + * donnée dans {@code time}. + * + * @param day le jour à utiliser + * @param time l'heure a utiliser + * @return la date donnée avec l'heure courante + */ + public static Date getDateAndTime(Date day, Date time, boolean useSecond, boolean useMiliSecond) { + + Calendar calendar = Calendar.getInstance(); + + // recuperation de l'heure + calendar.setTime(time); + int h = calendar.get(Calendar.HOUR_OF_DAY); + int m = calendar.get(Calendar.MINUTE); + int s = useSecond ? calendar.get(Calendar.SECOND) : 0; + int ms = useMiliSecond ? calendar.get(Calendar.MILLISECOND) : 0; + + calendar.setTime(day); + + // appliquer l'heure + calendar.set(Calendar.HOUR_OF_DAY, h); + calendar.set(Calendar.MINUTE, m); + calendar.set(Calendar.SECOND, s); + calendar.set(Calendar.MILLISECOND, ms); + + return calendar.getTime(); + + } + + /** + * Créer la date qui utilise uniquement l'heure + * donnée dans {@code dayTime}. + * + * @param dayTime l'heure a utiliser + * @return la date donnée avec uniquement l'heure courante + */ + public static Date getTime(Date dayTime, boolean useSecond, boolean useMiliSecond) { + Calendar calendar = Calendar.getInstance(); + + // recuperation de l'heure + calendar.setTime(dayTime); + int h = calendar.get(Calendar.HOUR_OF_DAY); + int m = calendar.get(Calendar.MINUTE); + int s = calendar.get(Calendar.SECOND); + int ms = calendar.get(Calendar.MILLISECOND); + + + // on part d'une date vide + calendar.setTimeInMillis(0); + + // appliquer l'heure + calendar.set(Calendar.HOUR_OF_DAY, h); + calendar.set(Calendar.MINUTE, m); + if (useSecond) { + calendar.set(Calendar.SECOND, s); + } + if (useMiliSecond) { + calendar.set(Calendar.MILLISECOND, ms); + } + + return calendar.getTime(); + } }

1 0

r2681 - in trunk/src: main/java/org/nuiton/util/version test/java/org/nuiton/util/version
by tchemit＠users.nuiton.org Aug. 26, 2014

Aug. 26, 2014

Author: tchemit Date: 2014-08-26 19:32:49 +0200 (Tue, 26 Aug 2014) New Revision: 2681 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2681 Log: fixes #3476: Move increments/decrements methods to Versions class Modified: trunk/src/main/java/org/nuiton/util/version/Version.java trunk/src/main/java/org/nuiton/util/version/Versions.java trunk/src/test/java/org/nuiton/util/version/VersionTest.java trunk/src/test/java/org/nuiton/util/version/VersionsTest.java Modified: trunk/src/main/java/org/nuiton/util/version/Version.java =================================================================== --- trunk/src/main/java/org/nuiton/util/version/Version.java 2014-08-26 09:27:46 UTC (rev 2680) +++ trunk/src/main/java/org/nuiton/util/version/Version.java 2014-08-26 17:32:49 UTC (rev 2681) @@ -34,9 +34,8 @@ import java.util.List; /** - * A class to represent a version. - * <p/> - * Replace previously {@code org.nuiton.util.Version} class. + * <p>A class to represent a version.</p> + * <p>Replace previously {@code org.nuiton.util.Version} class.</p> * <h3>Definition</h3> * A version is defined of n {@code componants} separated by {@code componantSeparator}. * <h4>Componants</h4> @@ -46,13 +45,17 @@ * <li>String componant: a sequence of characters which can't be either number nor componant separators</li> * </ul> * <h4>Componant separators</h4> + * <p> * Componant separator are characters which can't be alphanumeric and can be {@code empty character}. - * <p/> + * </p> + * <p> * Componant separators are optional and componants will be detected as soon as a character changed from a numeric string sequence to a alpha (none numeric!) sequence. + * </p> + * <p> * For example, version {@code 1a2} is composed of three componants: {code 1}, {@code a} and {@code 3}. + * </p> * <h4>Snapshot flag</h4> * Additionnaly version can be qualifed as a {@code SNAPSHOT} (see below section about ordering). - * <p/> * <h3Examples</h3> * <pre> * 0 (one componant 0) @@ -68,13 +71,8 @@ * <h3>Ordering</h3> * A version is comparable, to have all the detail of order see {@link VersionComparator}. * <h3>Immutability</h3> - * The version is immutable, to create or modify a version, use the {@link VersionBuilder} API or the internal methods - * <ul> - * <li>{@link #increments()}</li> - * <li>{@link #increments(char)}</li> - * <li>{@link #increments(int)}</li> - * <li>{@link #decrements(int)}</li> - * </ul> + * The version is immutable, to create or modify a version, use the {@link VersionBuilder} API + * or shortcut methods in {@link Versions}. * * @author tchemit <chemit(a)codelutin.com> * @see VersionBuilder @@ -153,7 +151,7 @@ } - public String getClassifierComponant(int componantPosition) { + public String getTextComponant(int componantPosition) { VersionComponant comparable = getComponant(componantPosition); Preconditions.checkState(comparable instanceof StringVersionComponant, "componant at " + componantPosition + " for version " + this + " is not a string (" + comparable + ")"); @@ -161,6 +159,13 @@ } + public VersionComponant getComponant(int level) { + + Preconditions.checkArgument(level > 0 || level < getComponantCount(), "not a valid level " + level + " for the Version " + this); + return componants.get(level); + + } + /** * @return the string represention value of the version */ @@ -220,11 +225,13 @@ * </ul> * * @return the incremented version + * @deprecated use instead {@link Versions#increments(Version)} */ + @Deprecated public Version increments() { - Version version = increments(DEFAULT_JOIN_COMPONANT_SEPARATOR); - return version; + Version newVersion = Versions.increments(this); + return newVersion; } @@ -242,33 +249,12 @@ * * @param componantSeperator the componant separator to use the last componant is a classifier * @return the incremented version + * @deprecated use instead {@link Versions#increments(Version, char)} */ + @Deprecated public Version increments(char componantSeperator) { - Version newVersion; - - VersionComponant lastComponant = getLastComponant(); - - if (lastComponant instanceof StringVersionComponant) { - - // must then add new number componant with value 1 - - newVersion = VersionBuilder - .create(this) - .addComponant(1, componantSeperator) - .build(); - - } else { - - // increments it - int numberComponant = ((NumberVersionComponant) lastComponant).getValue(); - - newVersion = VersionBuilder - .create(this) - .setComponant(getComponantCount() - 1, numberComponant + 1) - .build(); - } - + Version newVersion = Versions.increments(this, componantSeperator); return newVersion; } @@ -281,16 +267,12 @@ * * @param componantPosition position of the version componant to increment * @return the incremented version + * @deprecated use instead {@link Versions#increments(Version, int)} */ + @Deprecated public Version increments(int componantPosition) { - int numberComponant = getNumberComponant(componantPosition); - - Version newVersion = VersionBuilder - .create(this) - .setComponant(componantPosition, numberComponant + 1) - .build(); - + Version newVersion = Versions.increments(this, componantPosition); return newVersion; } @@ -303,16 +285,12 @@ * * @param componantPosition position of the version componant to increment * @return the decremented version + * @deprecated use {@link Versions#decrements(Version, int)} instead */ + @Deprecated public Version decrements(int componantPosition) { - int numberComponant = getNumberComponant(componantPosition); - Preconditions.checkArgument(componantPosition > 0, "Componant at position " + componantPosition + " values 0, can't decrement it."); - Version newVersion = VersionBuilder - .create(this) - .setComponant(componantPosition, numberComponant - 1) - .build(); - + Version newVersion = Versions.decrements(this, componantPosition); return newVersion; } @@ -362,13 +340,6 @@ return result; } - protected VersionComponant getComponant(int level) { - - Preconditions.checkArgument(level > 0 || level < getComponantCount(), "not a valid level " + level + " for the Version " + this); - return componants.get(level); - - } - protected VersionComponant getLastComponant() { return componants.get(getComponantCount() - 1); @@ -426,12 +397,13 @@ protected final boolean preRelease; protected final String value; + protected final String lowerCaseValue; public StringVersionComponant(boolean preRelease, String value) { this.preRelease = preRelease; this.value = value; - this.lowerCaseValue= value.toLowerCase(); + this.lowerCaseValue = value.toLowerCase(); } @Override Modified: trunk/src/main/java/org/nuiton/util/version/Versions.java =================================================================== --- trunk/src/main/java/org/nuiton/util/version/Versions.java 2014-08-26 09:27:46 UTC (rev 2680) +++ trunk/src/main/java/org/nuiton/util/version/Versions.java 2014-08-26 17:32:49 UTC (rev 2681) @@ -1,5 +1,7 @@ package org.nuiton.util.version; +import com.google.common.base.Preconditions; + import java.util.ArrayList; import java.util.List; @@ -126,8 +128,8 @@ /** * Create a new version containing a single component from a given version. - * - * @param version original version + * + * @param version original version * @param component component index to extract * @return new {@link Version} with a single component */ @@ -138,10 +140,10 @@ /** * Create a new version containing a sub set of component from a given version. - * - * @param version original version + * + * @param version original version * @param firstComponent first component index - * @param lastComponent last component index + * @param lastComponent last component index * @return new {@link Version} with a components sub set */ public static Version extractVersion(Version version, int firstComponent, int lastComponent) { @@ -155,8 +157,118 @@ Comparable component = version.getComponant(index).getValue(); componants.add(component); } - + Version result = VersionBuilder.create().setComponants(componants).build(); return result; } + + /** + * Creates a new version from this one incremented. + * <p/> + * If the last componant is a number, then just increments this number; otherwise add a new + * number componant with value 1. + * <p/> + * Example: + * <ul> + * <li>1 -> 2</li> + * <li>1-a -> 1-a.1</li> + * </ul> + * + * @return the incremented version + */ + public static Version increments(Version version) { + + Version result = increments(version, Version.DEFAULT_JOIN_COMPONANT_SEPARATOR); + return result; + + } + + /** + * Creates a new version from this one incremented. + * <p/> + * If the last componant is a number, then just increments this number; otherwise add a new + * number componant with value 1. + * <p/> + * Example: + * <ul> + * <li>1 -> 2</li> + * <li>1-a -> 1-a.1</li> + * </ul> + * + * @param componantSeperator the componant separator to use the last componant is a classifier + * @return the incremented version + */ + public static Version increments(Version version, char componantSeperator) { + + Version newVersion; + + Version.VersionComponant lastComponant = version.getLastComponant(); + + if (lastComponant instanceof Version.StringVersionComponant) { + + // must then add new number componant with value 1 + + newVersion = VersionBuilder + .create(version) + .addComponant(1, componantSeperator) + .build(); + + } else { + + // increments it + int numberComponant = ((Version.NumberVersionComponant) lastComponant).getValue(); + + newVersion = VersionBuilder + .create(version) + .setComponant(version.getComponantCount() - 1, numberComponant + 1) + .build(); + } + + return newVersion; + + } + + /** + * Creates a new version from this one with the number componant incremented at the given position. + * <p/> + * <strong>Note:</strong> + * Will fail if the componant at the required position is not a number. + * + * @param componantPosition position of the version componant to increment + * @return the incremented version + */ + public static Version increments(Version version, int componantPosition) { + + int numberComponant = version.getNumberComponant(componantPosition); + + Version newVersion = VersionBuilder + .create(version) + .setComponant(componantPosition, numberComponant + 1) + .build(); + + return newVersion; + + } + + /** + * Creates a new version from this one with the number componant decremented at the given position. + * <p/> + * <strong>Note:</strong> + * Will fail if the componant at the required position is not a number, or his value is 0. + * + * @param componantPosition position of the version componant to increment + * @return the decremented version + */ + public static Version decrements(Version version, int componantPosition) { + + int numberComponant = version.getNumberComponant(componantPosition); + Preconditions.checkArgument(componantPosition > 0, "Componant at position " + componantPosition + " values 0, can't decrement it."); + Version newVersion = VersionBuilder + .create(version) + .setComponant(componantPosition, numberComponant - 1) + .build(); + + return newVersion; + + } } Modified: trunk/src/test/java/org/nuiton/util/version/VersionTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/version/VersionTest.java 2014-08-26 09:27:46 UTC (rev 2680) +++ trunk/src/test/java/org/nuiton/util/version/VersionTest.java 2014-08-26 17:32:49 UTC (rev 2681) @@ -38,66 +38,13 @@ public void testEquals() { // Ignore case on string componants - assertEquals(VersionBuilder.create("1.1-rc").build(), VersionBuilder.create("1.1-Rc").build()); + assertEquals(Versions.valueOf("1.1-rc"), Versions.valueOf("1.1-Rc")); // Ignore componants join separator - assertEquals(VersionBuilder.create("1.1").build(), VersionBuilder.create(Lists.<Comparable>newArrayList(1, 1)).setJoinSeparator(' ').build()); + assertEquals(Versions.valueOf("1.1"), VersionBuilder.create(Lists.<Comparable>newArrayList(1, 1)).setJoinSeparator(' ').build()); } - @Test - public void testIncrements() { - - Version[] versions = new Version[]{ - VersionBuilder.create().setSnapshot(true).build(), - VersionBuilder.create().build(), - VersionBuilder.create("1").build(), - VersionBuilder.create("1.1-alpha-1").build(), - VersionBuilder.create("1.1-alpha-2").build(), - VersionBuilder.create("1.1-beta-1").build(), - VersionBuilder.create("1.1-rc-1-SNAPSHOT").build(), - VersionBuilder.create("1.1-rc-1").build(), - VersionBuilder.create("1.1-rc2").build(), - VersionBuilder.create("1.1").build(), - VersionBuilder.create("1.1.1").build(), - VersionBuilder.create("1.1.1-blablah").build(), - VersionBuilder.create("1.1.1-blablah1-SNAPSHOT").build(), - VersionBuilder.create("1.1.1-blablah1").build(), - VersionBuilder.create("1.1.1-blablah1a").build(), - VersionBuilder.create("1.1.1-blablah1b").build() - }; - - Version[] versionsIncrements = new Version[]{ - VersionBuilder.create("1-SNAPSHOT").build(), - VersionBuilder.create("1").build(), - VersionBuilder.create("2").build(), - VersionBuilder.create("1.1-alpha-2").build(), - VersionBuilder.create("1.1-alpha-3").build(), - VersionBuilder.create("1.1-beta-2").build(), - VersionBuilder.create("1.1-rc-2-SNAPSHOT").build(), - VersionBuilder.create("1.1-rc-2").build(), - VersionBuilder.create("1.1-rc3").build(), - VersionBuilder.create("1.2").build(), - VersionBuilder.create("1.1.2").build(), - VersionBuilder.create("1.1.1-blablah.1").build(), - VersionBuilder.create("1.1.1-blablah2-SNAPSHOT").build(), - VersionBuilder.create("1.1.1-blablah2").build(), - VersionBuilder.create("1.1.1-blablah1a.1").build(), - VersionBuilder.create("1.1.1-blablah1b.1").build() - }; - - for (int i = 0, l = versions.length; i < l; i++) { - - Version v = versions[i]; - Version vIncrements = versionsIncrements[i]; - Version increments = v.increments(); - Assert.assertTrue(v + " + 1 = " + increments + " should be " + vIncrements, increments.equals(vIncrements)); - Assert.assertTrue(v + " + 1 = " + increments + " should be " + vIncrements, increments.getVersion().equals(vIncrements.getVersion())); - - } - - } - protected void buildVersion(Version version, String stringRepresentation, int nbComponants, Modified: trunk/src/test/java/org/nuiton/util/version/VersionsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/version/VersionsTest.java 2014-08-26 09:27:46 UTC (rev 2680) +++ trunk/src/test/java/org/nuiton/util/version/VersionsTest.java 2014-08-26 17:32:49 UTC (rev 2681) @@ -60,4 +60,57 @@ Version initVersion = Versions.valueOf("10.20.30.40"); Version subVersion = Versions.extractVersion(initVersion, 3, 2); } + + @Test + public void testIncrements() { + + Version[] versions = new Version[]{ + VersionBuilder.create().setSnapshot(true).build(), + VersionBuilder.create().build(), + Versions.valueOf("1"), + Versions.valueOf("1.1-alpha-1"), + Versions.valueOf("1.1-alpha-2"), + Versions.valueOf("1.1-beta-1"), + Versions.valueOf("1.1-rc-1-SNAPSHOT"), + Versions.valueOf("1.1-rc-1"), + Versions.valueOf("1.1-rc2"), + Versions.valueOf("1.1"), + Versions.valueOf("1.1.1"), + Versions.valueOf("1.1.1-blablah"), + Versions.valueOf("1.1.1-blablah1-SNAPSHOT"), + Versions.valueOf("1.1.1-blablah1"), + Versions.valueOf("1.1.1-blablah1a"), + Versions.valueOf("1.1.1-blablah1b") + }; + + Version[] versionsIncrements = new Version[]{ + Versions.valueOf("1-SNAPSHOT"), + Versions.valueOf("1"), + Versions.valueOf("2"), + Versions.valueOf("1.1-alpha-2"), + Versions.valueOf("1.1-alpha-3"), + Versions.valueOf("1.1-beta-2"), + Versions.valueOf("1.1-rc-2-SNAPSHOT"), + Versions.valueOf("1.1-rc-2"), + Versions.valueOf("1.1-rc3"), + Versions.valueOf("1.2"), + Versions.valueOf("1.1.2"), + Versions.valueOf("1.1.1-blablah.1"), + Versions.valueOf("1.1.1-blablah2-SNAPSHOT"), + Versions.valueOf("1.1.1-blablah2"), + Versions.valueOf("1.1.1-blablah1a.1"), + Versions.valueOf("1.1.1-blablah1b.1") + }; + + for (int i = 0, l = versions.length; i < l; i++) { + + 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())); + + } + + } }

1 0

r2680 - trunk
by echatellier＠users.nuiton.org Aug. 26, 2014

Aug. 26, 2014

Author: echatellier Date: 2014-08-26 11:27:46 +0200 (Tue, 26 Aug 2014) New Revision: 2680 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2680 Log: Fix version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-26 09:24:42 UTC (rev 2679) +++ trunk/pom.xml 2014-08-26 09:27:46 UTC (rev 2680) @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>3.�0-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description>

1 0

r2679 - in trunk/src: main/java/org/nuiton/util/version test/java/org/nuiton/util/version
by echatellier＠users.nuiton.org Aug. 26, 2014

Aug. 26, 2014

Author: echatellier Date: 2014-08-26 11:24:42 +0200 (Tue, 26 Aug 2014) New Revision: 2679 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2679 Log: fixes #3477: Add Versions#extractVersion(Version, int, int) Added: trunk/src/test/java/org/nuiton/util/version/VersionsTest.java Modified: trunk/src/main/java/org/nuiton/util/version/Versions.java Modified: trunk/src/main/java/org/nuiton/util/version/Versions.java =================================================================== --- trunk/src/main/java/org/nuiton/util/version/Versions.java 2014-08-25 12:25:59 UTC (rev 2678) +++ trunk/src/main/java/org/nuiton/util/version/Versions.java 2014-08-26 09:24:42 UTC (rev 2679) @@ -1,5 +1,8 @@ package org.nuiton.util.version; +import java.util.ArrayList; +import java.util.List; + /* * #%L * Nuiton Utils @@ -120,4 +123,40 @@ Version result = VersionBuilder.create(version).setSnapshot(false).build(); return result; } + + /** + * Create a new version containing a single component from a given version. + * + * @param version original version + * @param component component index to extract + * @return new {@link Version} with a single component + */ + public static Version extractVersion(Version version, int component) { + Version result = extractVersion(version, component, component); + return result; + } + + /** + * Create a new version containing a sub set of component from a given version. + * + * @param version original version + * @param firstComponent first component index + * @param lastComponent last component index + * @return new {@link Version} with a components sub set + */ + public static Version extractVersion(Version version, int firstComponent, int lastComponent) { + if (lastComponent < firstComponent) { + throw new IllegalArgumentException("lastComponent must be greater or equals to firstComponent"); + } + + // extract components + List<Comparable> componants = new ArrayList<Comparable>(); + for (int index = firstComponent; index <= lastComponent; index++) { + Comparable component = version.getComponant(index).getValue(); + componants.add(component); + } + + Version result = VersionBuilder.create().setComponants(componants).build(); + return result; + } } Added: trunk/src/test/java/org/nuiton/util/version/VersionsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/version/VersionsTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/util/version/VersionsTest.java 2014-08-26 09:24:42 UTC (rev 2679) @@ -0,0 +1,63 @@ +package org.nuiton.util.version; + +import org.junit.Assert; +import org.junit.Test; + +/* + * #%L + * Nuiton Utils + * %% + * Copyright (C) 2014 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +/** + * Test about {@link Versions} utility class. + * + * @author Eric Chatellier + */ +public class VersionsTest { + + /** + * Test to create a new version by extracting a single component. + */ + @Test + public void testExtractSingleComponent() { + Version initVersion = Versions.valueOf("10.20.30.40"); + Version subVersion = Versions.extractVersion(initVersion, 2); + Assert.assertEquals(Versions.valueOf("30"), subVersion); + } + + /** + * Test to create a new version by extracting a components sub set. + */ + @Test + public void testExtractTwoComponents() { + Version initVersion = Versions.valueOf("10.20.30.40"); + Version subVersion = Versions.extractVersion(initVersion, 2, 3); + Assert.assertEquals(Versions.valueOf("30.40"), subVersion); + } + + /** + * Test to create a new version by extracting with illegal parameters. + */ + @Test(expected=IllegalArgumentException.class) + public void testExtractIllegalParams() { + Version initVersion = Versions.valueOf("10.20.30.40"); + Version subVersion = Versions.extractVersion(initVersion, 3, 2); + } +} Property changes on: trunk/src/test/java/org/nuiton/util/version/VersionsTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

[ANN] - Nuiton Utils 3.0-rc-7 released
by nuiton.org Release Notification Aug. 25, 2014

Aug. 25, 2014

The Nuiton Utils team is pleased to announce the nuiton-utils-3.0-rc-7 release! Library of usefull class to be used in any project. Documentation of the project can be found here: http://doc.nuiton.org/nuiton-utils Changes ------- Changes in this version include: New features: o Introduce a Versions class Issue: 3461. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.nuiton.org/projects/nuiton-utils/files * nuiton-utils-3.0-rc-7-deps.zip - http://forge.nuiton.org/attachments/download/1106 * nuiton-utils-3.0-rc-7-full.zip - http://forge.nuiton.org/attachments/download/1107 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|nuiton-utils|3.0-rc-7|j… Have fun! -Nuiton Utils team

1 0

r2678 - trunk
by maven-release＠users.nuiton.org Aug. 25, 2014

Aug. 25, 2014

Author: maven-release Date: 2014-08-25 14:25:59 +0200 (Mon, 25 Aug 2014) New Revision: 2678 Url: http://forge.nuiton.org/projects/nuiton-utils/repository/revisions/2678 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-25 12:25:53 UTC (rev 2677) +++ trunk/pom.xml 2014-08-25 12:25:59 UTC (rev 2678) @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-7</version> + <version>3.�0-SNAPSHOT</version> <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description> @@ -121,12 +121,12 @@ <scm> <connection> - scm:svn:https://svn.nuiton.org/nuiton-utils/tags/nuiton-utils-3.0-rc-7 + scm:svn:https://svn.nuiton.org/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-utils/tags/nuiton-utils-3.0-rc-7 + scm:svn:https://svn.nuiton.org/nuiton-utils/trunk </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-…</url> + <url>https://forge.nuiton.org/projects/nuiton-utils/repository/show/trunk</url> </scm> <distributionManagement>

1 0