[Git][java-team/libsejda-commons-java][upstream] New upstream version 1.1.7

[Markus Koschany (@apo)]

Markus Koschany pushed to branch upstream at Debian Java Maintainers / libsejda-commons-java


Commits:
a681a284 by Markus Koschany at 2021-09-06T21:18:13+02:00
New upstream version 1.1.7
- - - - -


3 changed files:

- pom.xml
- src/main/java/org/sejda/commons/util/NumericalSortFilenameComparator.java
- src/test/java/org/sejda/commons/util/NumericalSortFilenameComparatorTest.java


Changes:

=====================================
pom.xml
=====================================
@@ -5,7 +5,7 @@
 	<artifactId>sejda-commons</artifactId>
 	<packaging>jar</packaging>
 	<name>sejda-commons</name>
-	<version>1.1.6</version>
+	<version>1.1.7</version>
 
 	<description>A collection of utilities and common classes.</description>
 	<url>http://www.sejda.org</url>
@@ -37,7 +37,7 @@
 		<connection>scm:git:git at github.com:torakiki/sejda-commons.git</connection>
 		<developerConnection>scm:git:git at github.com:torakiki/sejda-commons.git</developerConnection>
 		<url>scm:git:git at github.com:torakiki/sejda-commons.git</url>
-		<tag>v1.1.6</tag>
+		<tag>v1.1.7</tag>
 	</scm>
 
 	<developers>


=====================================
src/main/java/org/sejda/commons/util/NumericalSortFilenameComparator.java
=====================================
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
  */
 public class NumericalSortFilenameComparator implements Comparator<File> {
 
-    private static Pattern PATTERN = Pattern.compile("^(\\d*)(\\D*)(\\d*)$");
+    private static Pattern PATTERN = Pattern.compile("^(\\d*)(.*)(\\d*)$");
 
     private static Function<String, BigInteger> DIGITS_EXTRACTOR = (g) -> {
         return ofNullable(g).filter(StringUtils::isNotEmpty).map(BigInteger::new).orElse(null);


=====================================
src/test/java/org/sejda/commons/util/NumericalSortFilenameComparatorTest.java
=====================================
@@ -34,6 +34,15 @@ public class NumericalSortFilenameComparatorTest {
         assertTrue(victim.compare(new File("bla"), null) < 0);
     }
 
+    @Test
+    public void onlyDigits() {
+        NumericalSortFilenameComparator victim = new NumericalSortFilenameComparator();
+        assertTrue(victim.compare(new File("123.pdf"), new File("1.pdf")) > 0);
+        assertTrue(victim.compare(new File("0023.pdf"), new File("230.pdf")) < 0);
+        assertTrue(victim.compare(new File("1"), new File("001.pdf")) > 0);
+        assertTrue(victim.compare(new File("005.pdf"), new File("500.pdf")) < 0);
+    }
+
     @Test
     public void nonDigit() {
         NumericalSortFilenameComparator victim = new NumericalSortFilenameComparator();
@@ -74,5 +83,8 @@ public class NumericalSortFilenameComparatorTest {
         assertTrue(victim.compare(new File("banana.pdf"), new File("avocado.pdf")) > 0);
         assertTrue(victim.compare(new File("chuck.pdf"), new File("chuck.abc")) > 0);
         assertTrue(victim.compare(new File("1234file.pdf"), new File("chuck.abc")) < 0);
+        assertTrue(victim.compare(new File("bla003abc.pdf"), new File("chuck.pdf")) < 0);
     }
+
+
 }



View it on GitLab: https://salsa.debian.org/java-team/libsejda-commons-java/-/commit/a681a2849b12a75882931ec00f0350d34fc67db2

-- 
View it on GitLab: https://salsa.debian.org/java-team/libsejda-commons-java/-/commit/a681a2849b12a75882931ec00f0350d34fc67db2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210906/bc20e7a7/attachment.htm>