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

r1684 - trunk
by tchemit＠users.nuiton.org 26 Sep '09

26 Sep '09

Author: tchemit Date: 2009-09-26 04:30:43 +0200 (Sat, 26 Sep 2009) New Revision: 1684 Modified: trunk/pom.xml Log: - bump mavenpom, i18n and junit version - adding redmine extra files Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-22 09:32:56 UTC (rev 1683) +++ trunk/pom.xml 2009-09-26 02:30:43 UTC (rev 1684) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -62,7 +62,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency> @@ -85,7 +85,12 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.0.1</i18n.version> + <i18n.version>1.0.2-SNAPSHOT</i18n.version> + +  + <redmine.releaseFiles>target/${project.artifactId}-${project.version}-deps.zip, + target/${project.artifactId}-${project.version}-full.zip</redmine.releaseFiles> + </properties> <build>

1 0

r1683 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by echatellier＠users.nuiton.org 22 Sep '09

22 Sep '09

Author: echatellier Date: 2009-09-22 11:32:56 +0200 (Tue, 22 Sep 2009) New Revision: 1683 Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java trunk/src/test/java/org/nuiton/util/FileUtilTest.java Log: Add java grep implementation Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2009-09-03 18:26:13 UTC (rev 1682) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2009-09-22 09:32:56 UTC (rev 1683) @@ -29,9 +29,6 @@ package org.nuiton.util; -import org.apache.commons.logging.LogFactory; - -import javax.swing.JFileChooser; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -46,12 +43,24 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; +import java.nio.CharBuffer; +import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.swing.JFileChooser; + +import org.apache.commons.logging.LogFactory; + public class FileUtil { // FileUtil /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -910,7 +919,7 @@ } /** - * @param file le fichier à tester. + * @param file le fichier à tester. * @param includePatterns les patterns pour accepeter le fichier depuis son nom * @return <code>true</code> si le fichier est accepté, <code>false> autrement. */ @@ -925,6 +934,126 @@ } return result; } + + /** + * Use the linePattern to break the given CharBuffer into lines, applying + * the input pattern to each line to see if we have a match + * + * Code taken from : + * + * http://java.sun.com/javase/6/docs/technotes/guides/io/example/Grep.java + * + * @param regex regex to search into file + * @param cb nio buffer + * @return matching lines (or {code null} if no matching lines) + * @throws IOException + */ + protected static List<CharSequence> grep(String regex, CharBuffer cb) { + + List<CharSequence> linesList = null; + + Pattern pattern = Pattern.compile(regex); + Pattern linePattern = Pattern.compile(".*\r?\n"); + + Matcher lm = linePattern.matcher(cb); // Line matcher + Matcher pm = null; // Pattern matcher + int lines = 0; + while (lm.find()) { + lines++; + CharSequence cs = lm.group(); // The current line + if (pm == null) { + pm = pattern.matcher(cs); + } + else { + pm.reset(cs); + } + if (pm.find()) { + // init + if (linesList == null) { + linesList = new ArrayList<CharSequence>(); + } + linesList.add(cs); + } + if (lm.end() == cb.limit()) { + break; + } + } + + return linesList; + } + + /** + * Java implementation for the unix grep command. + * + * Code taken from : + * + * http://java.sun.com/javase/6/docs/technotes/guides/io/example/Grep.java + * + * @param searchRegex regex to search into file + * @param f file to search into + * @param encoding encoding to use + * @return matching lines (or {code null} if no matching lines) + * @throws IOException + */ + public static List<CharSequence> grep(String searchRegex, File f, String encoding) throws IOException { + + // Open the file and then get a channel from the stream + FileInputStream fis = new FileInputStream(f); + FileChannel fc = fis.getChannel(); + + // Get the file's size and then map it into memory + int sz = (int)fc.size(); + MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); + + // Decode the file into a char buffer + Charset charset = Charset.forName(encoding); + CharsetDecoder decoder = charset.newDecoder(); + CharBuffer cb = decoder.decode(bb); + + // Perform the search + List<CharSequence> lines = grep(searchRegex, cb); + + // Close the channel and the stream + fc.close(); + + return lines; + } + + /** + * Java implementation for the unix grep command. + * + * @param searchRegex regex to search into file + * @param rootDirectory directory to seacrh into + * @param fileRegex regex for file to find in {@code rootDirectory} + * @param encoding encoding to use + * @return all matching lines for each files + * @throws IOException + */ + public static Map<File, List<CharSequence>> grep(String searchRegex, File rootDirectory, String fileRegex, String encoding) throws IOException { + Map<File, List<CharSequence>> results = new HashMap<File, List<CharSequence>>(); + List<File> files = FileUtil.find(rootDirectory, fileRegex, true); + for (File file : files) { + List<CharSequence> lines = grep(searchRegex, file, encoding); + if (lines != null) { + results.put(file, lines); + } + } + return results; + } + + /** + * Search for files matching regex in current directory. + * + * @param searchRegex regex to search into file + * @param fileRegex regex for file to find in current dir + * @param encoding encoding to use + * @return all matching lines for each files + * @throws IOException + */ + public static Map<File, List<CharSequence>> grep(String searchRegex, String fileRegex, String encoding) throws IOException { + Map<File, List<CharSequence>> results = grep(searchRegex, new File("."), fileRegex, encoding); + return results; + } + } // FileUtil - Modified: trunk/src/test/java/org/nuiton/util/FileUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2009-09-03 18:26:13 UTC (rev 1682) +++ trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2009-09-22 09:32:56 UTC (rev 1683) @@ -18,7 +18,9 @@ package org.nuiton.util; import java.io.File; +import java.io.IOException; import java.util.List; +import java.util.Map; import org.junit.Assert; import org.junit.Test; @@ -38,7 +40,7 @@ @Test public void testFind() throws Exception { - List result = FileUtil.find(new File("."), ".*FileUtil.*", true); + List<File> result = FileUtil.find(new File("."), ".*FileUtil.*", true); Assert.assertTrue(result.size() != 0); } @@ -95,6 +97,49 @@ Assert.assertEquals(file.length(), dest.length()); Assert.assertEquals(content, FileUtil.readAsString(dest)); } + + /** + * Test grep on a single file. + * + * Search for grep() method count. + * + * @throws IOException + */ + @Test + public void testGrepSingleFile() throws IOException { + // search for + File testUtilFile = FileUtil.find(new File("."), ".*FileUtil\\.java", true).get(0); + + List<CharSequence> lines = FileUtil.grep("grep\$String .*\$", testUtilFile , "UTF-8"); + + Assert.assertNotNull(lines); + Assert.assertEquals(4, lines.size()); + + // assert result are ordered + Assert.assertTrue(lines.get(0).toString().indexOf("CharBuffer") > 0); + Assert.assertTrue(lines.get(1).toString().indexOf("File f,") > 0); + Assert.assertTrue(lines.get(2).toString().indexOf("rootDirectory") > 0); + Assert.assertTrue(lines.get(3).toString().indexOf("String searchRegex, String fileRegex, String encoding") > 0); + } + + /** + * Test grep on a multiple files. + * + * Try to find all java file containing "CodeLutin". Can fail if some + * src files are deleted. + * + * @throws IOException + */ + @Test + public void testGrepMultiple() throws IOException { + + File rootDir = new File("src"); + + Map<File, List<CharSequence>> results = FileUtil.grep("CodeLutin", rootDir , ".*\\.java", "UTF-8"); + + Assert.assertTrue(results.size() > 100); + + } + } // FileUtilTest -

1 0

r1682 - trunk
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 20:26:13 +0200 (Thu, 03 Sep 2009) New Revision: 1682 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 18:26:11 UTC (rev 1681) +++ trunk/pom.xml 2009-09-03 18:26:13 UTC (rev 1682) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> <dependencies> @@ -133,9 +133,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0

r1681 - in tags: . nuiton-utils-1.1.1
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 20:26:11 +0200 (Thu, 03 Sep 2009) New Revision: 1681 Added: tags/nuiton-utils-1.1.1/ Log: [maven-scm] copy for tag nuiton-utils-1.1.1 Property changes on: tags/nuiton-utils-1.1.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath lutinutil.iml lutinutil.ipr lutinutil.iws .settings .project Added: svn:mergeinfo +

1 0

r1680 - trunk
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 20:26:06 +0200 (Thu, 03 Sep 2009) New Revision: 1680 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release nuiton-utils-1.1.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 18:04:26 UTC (rev 1679) +++ trunk/pom.xml 2009-09-03 18:26:06 UTC (rev 1680) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> <dependencies> @@ -133,9 +133,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1679 - trunk
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 20:04:26 +0200 (Thu, 03 Sep 2009) New Revision: 1679 Modified: trunk/pom.xml Log: bump i18n version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 17:08:12 UTC (rev 1678) +++ trunk/pom.xml 2009-09-03 18:04:26 UTC (rev 1679) @@ -85,7 +85,7 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.0.1-SNAPSHOT</i18n.version> + <i18n.version>1.0.1</i18n.version> </properties> <build>

1 0

r1678 - in trunk: . src/main/java/org/nuiton/util src/test/java/org/nuiton/util
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 19:08:12 +0200 (Thu, 03 Sep 2009) New Revision: 1678 Modified: trunk/changelog.txt trunk/pom.xml trunk/src/main/java/org/nuiton/util/VersionUtil.java trunk/src/test/java/org/nuiton/util/VersionUtilTest.java Log: Evolution #39: add a Filter method in VersionUtil bump versions Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-08-25 22:39:54 UTC (rev 1677) +++ trunk/changelog.txt 2009-09-03 17:08:12 UTC (rev 1678) @@ -1,4 +1,11 @@ -ver 1.1.0 ? +1.1.1 chemit 20090903 + + * [FEATURE] #39 add a filterVersions method in VersionUtil + +-- chemit -- Thu, 03 Sep 2009 18:51:54 +0200 + + +ver 1.1.0 20090830 * can auto-load converters at runtime via a ServiceLoader mecanism (see org.nuiton.util.ConverterUtil#initConverters() ) * migrate to org.nuiton groupId Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-25 22:39:54 UTC (rev 1677) +++ trunk/pom.xml 2009-09-03 17:08:12 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/src/main/java/org/nuiton/util/VersionUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/VersionUtil.java 2009-08-25 22:39:54 UTC (rev 1677) +++ trunk/src/main/java/org/nuiton/util/VersionUtil.java 2009-09-03 17:08:12 UTC (rev 1678) @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Set; import java.util.regex.Pattern; /** @@ -194,6 +195,41 @@ } /** + * Filter versions. + * + * @param versions versions to filter + * @param min min version to accept + * @param max max version to accept + * @param includeMin flag to include min version + * @param includeMax flag to include max version + * @return versions between min and max + */ + public static List<Version> filterVersions(Set<Version> versions, Version min, Version max, boolean includeMin, boolean includeMax) { + List<Version> toApply = new ArrayList<Version>(); + for (Version v : versions) { + int t; + if (min != null) { + t = v.compareTo(min); +// if (v.compareTo(min) <= 0) { + if (t < 0 || (t == 0 && !includeMin)) { + // version trop ancienne + continue; + } + } + if (max != null) { + t = v.compareTo(max); +// if (v.compareTo(max) > 0) { + if (t > 0 || (t == 0 && !includeMax)) { + // version trop recente + continue; + } + } + toApply.add(v); + } + return toApply; + } + + /** * Le contrat d'un comparateur de versions permettant de controler * l'ordre du numero de version, classifier et numero de classifer. * Modified: trunk/src/test/java/org/nuiton/util/VersionUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/VersionUtilTest.java 2009-08-25 22:39:54 UTC (rev 1677) +++ trunk/src/test/java/org/nuiton/util/VersionUtilTest.java 2009-09-03 17:08:12 UTC (rev 1678) @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Set; +import java.util.TreeSet; import java.util.regex.Matcher; import org.junit.Test; import static org.junit.Assert.*; @@ -229,6 +231,92 @@ } } + /** + * Test of filterVersions method, of class VersionUtil. + */ + @Test + public void testFilterVersions() { + + Set<Version> versions = new TreeSet<Version>(); + Version v1 = new Version(1); + Version v2 = new Version(2); + Version v3 = new Version(3); + Version v4 = new Version(4); + Version v5 = new Version(5); + versions.add(v1); + versions.add(v2); + versions.add(v3); + versions.add(v4); + versions.add(v5); + + List<Version> actual; + + // filter [0,0] = [] + actual = VersionUtil.filterVersions(versions, Version.VZERO, Version.VZERO, true, true); + assertVersionsEquals(actual); + + // filter [0,1[ = [] + actual = VersionUtil.filterVersions(versions, Version.VZERO, v1, true, false); + assertVersionsEquals(actual); + + // filter [0,1] = [1] + actual = VersionUtil.filterVersions(versions, Version.VZERO, v1, true, true); + assertVersionsEquals(actual, v1); + + // filter [0,2[ = [1] + actual = VersionUtil.filterVersions(versions, Version.VZERO, v2, true, false); + assertVersionsEquals(actual, v1); + + // filter [0,2] = [1,2] + actual = VersionUtil.filterVersions(versions, Version.VZERO, v2, true, true); + assertVersionsEquals(actual, v1, v2); + + // filter [1,2] = [1,2] + actual = VersionUtil.filterVersions(versions, v1, v2, true, true); + assertVersionsEquals(actual, v1, v2); + + // filter ]1,2] = [2] + actual = VersionUtil.filterVersions(versions, v1, v2, false, true); + assertVersionsEquals(actual, v2); + + // filter [2,2] = [2] + actual = VersionUtil.filterVersions(versions, v2, v2, true, true); + assertVersionsEquals(actual, v2); + + // filter ]2,2] = [2] + actual = VersionUtil.filterVersions(versions, v2, v2, false, true); + assertVersionsEquals(actual); + + // filter ]2,2[ = [] + actual = VersionUtil.filterVersions(versions, v2, v2, false, false); + assertVersionsEquals(actual); + + // filter ]Null,2[ = [1] + actual = VersionUtil.filterVersions(versions, null, v2, false, false); + assertVersionsEquals(actual, v1); + + // filter [Null,2[ = [1] + actual = VersionUtil.filterVersions(versions, null, v2, true, false); + assertVersionsEquals(actual, v1); + + // filter ]Null,2] = [1,2] + actual = VersionUtil.filterVersions(versions, null, v2, false, true); + assertVersionsEquals(actual, v1, v2); + + // filter ]Null,Null[ = [1,2,3,4,5] + actual = VersionUtil.filterVersions(versions, null, null, false, false); + assertVersionsEquals(actual, v1, v2, v3, v4, v5); + + // filter ]2,Null[ = [3,4,5] + actual = VersionUtil.filterVersions(versions, v2, null, false, false); + assertVersionsEquals(actual, v3, v4, v5); + + // filter [2,Null[ = [2,3,4,5] + actual = VersionUtil.filterVersions(versions, v2, null, true, false); + assertVersionsEquals(actual, v2, v3, v4, v5); + + } + protected static void compareVersions(int order, Iterable<Version> versions) { Iterator<Version> iterator = versions.iterator(); @@ -274,4 +362,13 @@ } } } + + private void assertVersionsEquals(List<Version> actual, Version... expected) { + assertEquals(expected.length, actual.size()); + int i = 0; + for (Version a : actual) { + Version e = expected[i++]; + assertEquals(a, e); + } + } }

1 0