Merge branch 'eugenp:master' into master

Author: sIvanovKonstantyn

core-java-modules/core-java-classloader/pom.xml

@@ -11,6 +11,15 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
+	<dependencies>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -36,11 +45,4 @@
 		</plugins>
 	</build>
 
-	<properties>
-		<maven.compiler.source>22</maven.compiler.source>
-		<maven.compiler.target>22</maven.compiler.target>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>22</java.version>
-	</properties>
-
 </project>

core-java-modules/core-java-classloader/src/test/java/com/baeldung/classloader/ClassloaderDelegationModelTest.java renamed to core-java-modules/core-java-classloader/src/test/java/com/baeldung/classloader/ClassloaderDelegationModelUnitTest.java

@@ -15,7 +15,7 @@
 import com.baeldung.classloader.internal.InternalClasspathResolver;
 import com.baeldung.classloader.internal.InternalJdkSupport;
 
-class ClassloaderDelegationModelTest {
+class ClassloaderDelegationModelUnitTest {
 
     private static final String CLASS_TO_LOAD = "com.google.common.base.Function";
 

core-java-modules/core-java-classloader/src/test/java/com/baeldung/classloader/GetURLsFromClassloaderTest.java renamed to core-java-modules/core-java-classloader/src/test/java/com/baeldung/classloader/GetURLsFromClassloaderUnitTest.java

@@ -20,7 +20,7 @@
 import com.baeldung.classloader.internal.InternalClasspathResolver;
 import com.baeldung.classloader.internal.InternalJdkSupport;
 
-class GetURLsFromClassloaderTest {
+class GetURLsFromClassloaderUnitTest {
 
     final Logger log = LoggerFactory.getLogger(getClass());
 

core-java-modules/core-java-classloader/src/test/java/com/baeldung/classloader/ScopedClassLoadingTest.java renamed to core-java-modules/core-java-classloader/src/test/java/com/baeldung/classloader/ScopedClassLoadingUnitTest.java

@@ -9,6 +9,8 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Objects;
@@ -24,27 +26,26 @@
 import com.baeldung.classloader.internal.InternalJdkSupport;
 import com.baeldung.classloader.spi.ClasspathResolver;
 
-class ScopedClassLoadingTest {
+class ScopedClassLoadingUnitTest {
 
     final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * Some ides may treat test-classes as a dynamic module-path.
-     *
      */
     private void ammendTestClasspath(Set<URL> classpath) {
         var testCp = classpath.stream()
-            .filter(url -> Objects.equals(url.getProtocol(), "file") && url.getPath()
-                .contains("test-classes"))
-            .findFirst()
-            .orElse(null);
+                .filter(url -> Objects.equals(url.getProtocol(), "file") && url.getPath()
+                        .contains("test-classes"))
+                .findFirst()
+                .orElse(null);
 
         if (testCp == null) {
             log.info("Amending test classpath for Eclipse");
 
             var loc = getClass().getProtectionDomain()
-                .getCodeSource()
-                .getLocation();
+                    .getCodeSource()
+                    .getLocation();
 
             testCp = toURL(loc.toString());
 
@@ -60,15 +61,15 @@ private Set<URL> createNarrowClasspath(Predicate<URL> filter) {
         var loader = getClass().getClassLoader();
 
         var full = ClasspathResolver.get()
-            .getFullClasspath(loader);
+                .getFullClasspath(loader);
 
         ammendTestClasspath(full);
 
         mergeClasspathWithModulePath(full, filter);
 
         var classpath = full.stream()
-            .filter(filter)
-            .collect(Collectors.toCollection(HashSet::new));
+                .filter(filter)
+                .collect(Collectors.toCollection(HashSet::new));
 
         log.info("Narrowed Classpath: \n[\n{}\n]", classpath);
 
@@ -80,14 +81,14 @@ void givenAForkedJVM_whenClassPathIsNarrowed_thenAccessWillBeLimitedToItsScope()
         var scope = Pattern.compile("(test-classes|slf|logback)");
 
         var classpath = createNarrowClasspath(url -> scope.matcher(url.toString())
-            .find()).stream()
-            .map(URL::toString)
-            .collect(Collectors.joining(":"));
+                .find()).stream()
+                .map(URL::toString)
+                .collect(Collectors.joining(":"));
 
         var executable = ProcessHandle.current()
-            .info()
-            .command()
-            .orElse("java");
+                .info()
+                .command()
+                .orElse("java");
 
         var pb = new ProcessBuilder(executable, "-cp");
         var command = pb.command();
@@ -99,7 +100,7 @@ void givenAForkedJVM_whenClassPathIsNarrowed_thenAccessWillBeLimitedToItsScope()
         pb.redirectError(Redirect.INHERIT);
 
         log.info("VM at PID {} will fork another JVM with narrowed classpath", ProcessHandle.current()
-            .pid());
+                .pid());
 
         var process = pb.start();
 
@@ -110,7 +111,7 @@ void givenAForkedJVM_whenClassPathIsNarrowed_thenAccessWillBeLimitedToItsScope()
 
     @Test
     void givenScopedClassLoader_whenClasspathIsNarrowed_thenAccessWillBeLimitedToItsScope() throws InterruptedException, IOException,
-    ReflectiveOperationException {
+            ReflectiveOperationException {
         var thread = Thread.currentThread();
         var current = thread.getContextClassLoader();
 
@@ -119,20 +120,20 @@ void givenScopedClassLoader_whenClasspathIsNarrowed_thenAccessWillBeLimitedToIts
         var scope = Pattern.compile("(test-classes|slf|logback)");
 
         var classpath = createNarrowClasspath(url -> scope.matcher(url.toString())
-            .find()).toArray(URL[]::new);
+                .find()).toArray(URL[]::new);
 
         var loader = new CustomClassLoader(classpath);
 
         thread.setContextClassLoader(loader);
 
         try {
             var service = Class.forName(ForkedService.class.getName(), true, Thread.currentThread()
-                .getContextClassLoader());
+                    .getContextClassLoader());
 
             assertEquals(loader, service.getClassLoader());
 
             ((Runnable) service.getConstructor()
-                .newInstance()).run();
+                    .newInstance()).run();
         } finally {
             thread.setContextClassLoader(current);
         }
@@ -144,22 +145,27 @@ private void mergeClasspathWithModulePath(Set<URL> files, Predicate<URL> filter)
         if (modules != null && !modules.isBlank()) {
             log.info("Converting module-path ({}) to classpath", modules);
 
-            Arrays.stream(modules.split(":"))
-            .map(this::toURL)
-            .filter(filter)
-            .forEach(files::add);
+            String pathSeparator = System.getProperty("path.separator");
+
+            Arrays.stream(modules.split(Pattern.quote(pathSeparator)))
+                    .map(this::toURL)
+                    .filter(filter)
+                    .forEach(files::add);
         } else {
             log.info("No module path");
         }
     }
 
     private URL toURL(String name) {
-        if (!name.startsWith("file:")) {
-            name = "file://" + name;
-        }
         try {
-            return URI.create(name)
-                .toURL();
+            // If it's already a valid URL, use it as-is
+            if (name.startsWith("file:")) {
+                return URI.create(name).toURL();
+            }
+
+            Path path = Paths.get(name);
+            return path.toUri().toURL();
+
         } catch (MalformedURLException e) {
             throw new UncheckedIOException(e);
         }

core-java-modules/core-java-collections-conversions-2/pom.xml

@@ -25,9 +25,9 @@
             <version>${modelmapper.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.vavr</groupId>
-            <artifactId>vavr</artifactId>
-            <version>${vavr.version}</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
         </dependency>
     </dependencies>
 
@@ -42,7 +42,7 @@
     </build>
 
     <properties>
-        <vavr.version>0.10.3</vavr.version>
         <modelmapper.version>3.2.0</modelmapper.version>
     </properties>
+
 </project>

core-java-modules/core-java-collections-conversions/src/main/java/com/baeldung/convertcollectiontoarraylist/Foo.java renamed to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/convertcollectiontoarraylist/Foo.java

@@ -1,14 +1,14 @@
 package com.baeldung.hashmaptoarraylist;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Maps.EntryTransformer;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Maps.EntryTransformer;
-
 public class HashMapToArrayListConverterUtils {
 
     static ArrayList<String> convertUsingConstructor(HashMap<Integer, String> hashMap) {

core-java-modules/core-java-collections-conversions-3/src/main/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtils.java renamed to core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtils.java

@@ -1,13 +1,11 @@
 package com.baeldung.convertcollectiontoarraylist;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import static java.util.stream.Collectors.toCollection;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
+import java.util.*;
+
+import static java.util.stream.Collectors.toCollection;
 import static org.junit.Assert.*;
 
 /**

core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertcollectiontoarraylist/CollectionToArrayListUnitTest.java renamed to core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/convertcollectiontoarraylist/CollectionToArrayListUnitTest.java

@@ -1,8 +1,10 @@
 package com.baeldung.convertiteratortolist;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.IteratorUtils;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,12 +13,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import org.apache.commons.collections4.IteratorUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 
 public class ConvertIteratorToListServiceUnitTest {
 

core-java-modules/core-java-collections-conversions/src/test/java/com/baeldung/convertiteratortolist/ConvertIteratorToListServiceUnitTest.java renamed to core-java-modules/core-java-collections-conversions-2/src/test/java/com/baeldung/convertiteratortolist/ConvertIteratorToListServiceUnitTest.java

@@ -1,13 +1,13 @@
 package com.baeldung.hashmaptoarraylist;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 public class HashMapToArrayListConverterUtilsUnitTest {