Merge branch 'eugenp:master' into master

Author: sdhiray7

README.md

@@ -44,19 +44,21 @@ We also have a parents profile to build only parent modules.
 
 Therefore, we have a total of 9 profiles:
 
-| Profile            | Includes                    | Type of test enabled         |
-|--------------------|-----------------------------|------------------------------|
-| default            | JDK21 projects              | *UnitTest                    |
-| integration        | JDK21 projects              | *IntegrationTest             |
-| default-jdk17      | JDK17 projects              | *UnitTest                    |
-| integration-jdk17  | JDK17 projects              | *IntegrationTest             |
-| profile-jdk22      | JDK22 projects              | *UnitTest & *IntegrationTest |
-| profile-jdk23      | JDK23 projects              | *UnitTest & *IntegrationTest |
-| default-heavy      | Heavy/long running projects | *UnitTest                    |
-| integration-heavy  | Heavy/long running projects | *IntegrationTest             |
-| default-jdk8       | JDK8  projects              | *UnitTest                    |
-| integration-jdk8   | JDK8  projects              | *IntegrationTest             |
-| parents            | Set of parent modules       | None                         |
+| Profile           | Includes                    | Type of test enabled |
+|-------------------|-----------------------------|----------------------|
+| default           | JDK21 projects              | *UnitTest            |
+| integration       | JDK21 projects              | *IntegrationTest     |
+| default-jdk17     | JDK17 projects              | *UnitTest            |
+| integration-jdk17 | JDK17 projects              | *IntegrationTest     |
+| default-jdk22     | JDK22 projects              | *UnitTest            |
+| integration-jdk22 | JDK22 projects              | *IntegrationTest     |
+| default-jdk23     | JDK23 projects              | *UnitTest            |
+| integration-jdk23 | JDK23 projects              | *IntegrationTest     |
+| default-heavy     | Heavy/long running projects | *UnitTest            |
+| integration-heavy | Heavy/long running projects | *IntegrationTest     |
+| default-jdk8      | JDK8  projects              | *UnitTest            |
+| integration-jdk8  | JDK8  projects              | *IntegrationTest     |
+| parents           | Set of parent modules       | None                 |
 
 Building the project
 ====================

akka-modules/akka-http/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-stream_${scala.version}</artifactId>
-            <version>${akka.stream.version}</version>
+            <version>${akkastreams.version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
@@ -38,7 +38,6 @@
 
     <properties>
         <akka.http.version>10.0.11</akka.http.version>
-        <akka.stream.version>2.5.11</akka.stream.version>
     </properties>
 
 </project>

akka-modules/akka-streams/pom.xml

@@ -25,8 +25,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <akkastreams.version>2.5.2</akkastreams.version>
-    </properties>
-
 </project>

akka-modules/pom.xml

@@ -33,6 +33,7 @@
 
     <properties>
         <scala.version>2.12</scala.version>
+        <akkastreams.version>2.5.11</akkastreams.version>
     </properties>
 
 </project>

algorithms-modules/algorithms-miscellaneous-1/pom.xml

@@ -68,7 +68,6 @@
     </reporting>
 
     <properties>
-        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
         <xml-bind-api.version>4.0.0</xml-bind-api.version>
     </properties>
 

algorithms-modules/algorithms-miscellaneous-4/pom.xml

@@ -37,8 +37,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <combinatoricslib3.version>3.3.3</combinatoricslib3.version>
-    </properties>
-
 </project>

algorithms-modules/algorithms-miscellaneous-5/pom.xml

@@ -47,6 +47,7 @@
                 <configuration>
                     <source>17</source>
                     <target>17</target>
+                    <release>17</release>
                 </configuration>
             </plugin>
         </plugins>

algorithms-modules/algorithms-sorting/src/main/java/com/baeldung/algorithms/stringsort/AlphanumericSort.java

@@ -0,0 +1,38 @@
+package com.baeldung.algorithms.stringsort;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+public class AlphanumericSort {
+
+    public static String lexicographicSort(String input) {
+        char[] stringChars = input.toCharArray();
+        Arrays.sort(stringChars);
+        return new String(stringChars);
+    }
+
+    public static String[] naturalAlphanumericSort(String[] arrayToSort) {
+        Arrays.sort(arrayToSort, new Comparator<String>() {
+            @Override
+            public int compare(String s1, String s2) {
+                return extractInt(s1) - extractInt(s2);
+            }
+
+            private int extractInt(String str) {
+                String num = str.replaceAll("\\D+", "");
+                return num.isEmpty() ? 0 : Integer.parseInt(num);
+            }
+        });
+        return arrayToSort;
+    }
+
+    public static String[] naturalAlphanumericCaseInsensitiveSort(String[] arrayToSort) {
+        Arrays.sort(arrayToSort, Comparator.comparing((String s) -> s.replaceAll("\\d", "").toLowerCase())
+            .thenComparingInt(s -> {
+                String num = s.replaceAll("\\D+", "");
+                return num.isEmpty() ? 0 : Integer.parseInt(num);
+            })
+            .thenComparing(Comparator.naturalOrder()));
+        return arrayToSort;
+    }
+}

algorithms-modules/algorithms-sorting/src/test/java/com/baeldung/algorithms/stringsort/AlphanumericSortUnitTest.java

@@ -0,0 +1,31 @@
+package com.baeldung.algorithms.stringsort;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class AlphanumericSortUnitTest {
+
+    @Test
+    void givenAlphanumericString_whenLexicographicSort_thenSortLettersFirst() {
+        String stringToSort = "C4B3A21";
+        String sorted = AlphanumericSort.lexicographicSort(stringToSort);
+        assertThat(sorted).isEqualTo("1234ABC");
+    }
+
+    @Test
+    void givenAlphanumericArrayOfStrings_whenAlphanumericSort_thenSortNaturalOrder() {
+        String[] arrayToSort = {"file2", "file10", "file0", "file1", "file20"};
+        String[] sorted = AlphanumericSort.naturalAlphanumericSort(arrayToSort);
+        assertThat(Arrays.toString(sorted)).isEqualTo("[file0, file1, file2, file10, file20]");
+    }
+
+    @Test
+    void givenAlphanumericArrayOfStrings_whenAlphanumericCaseInsensitveSort_thenSortNaturalOrder() {
+        String[] arrayToSort = {"a2", "A10", "b1", "B3", "A2"};
+        String[] sorted = AlphanumericSort.naturalAlphanumericCaseInsensitiveSort(arrayToSort);
+        assertThat(Arrays.toString(sorted)).isEqualTo("[A2, a2, A10, b1, B3]");
+    }
+}

algorithms-modules/pom.xml

@@ -37,6 +37,7 @@
         <commons-math3.version>3.6.1</commons-math3.version>
         <cobertura.plugin.version>2.7</cobertura.plugin.version>
         <tradukisto.version>1.0.1</tradukisto.version>
+        <combinatoricslib3.version>3.3.3</combinatoricslib3.version>
     </properties>
 
 </project>