src/java.base/share/classes/jdk/internal/module/ModulePathValidator.java

rev 51675 : 8207690: Parsing API for classpath and similar path strings

*** 23,33 ****
   * questions.
   */
  
  package jdk.internal.module;
  
- import java.io.File;
  import java.io.IOException;
  import java.io.PrintStream;
  import java.lang.module.FindException;
  import java.lang.module.ModuleDescriptor;
  import java.lang.module.ModuleFinder;
--- 23,32 ----
*** 35,50 ****
  import java.net.URI;
  import java.nio.file.DirectoryStream;
  import java.nio.file.Files;
  import java.nio.file.NoSuchFileException;
  import java.nio.file.Path;
  import java.nio.file.attribute.BasicFileAttributes;
  import java.util.Comparator;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Optional;
- import java.util.stream.Stream;
  
  /**
   * A validator to check for errors and conflicts between modules.
   */
  
--- 34,49 ----
  import java.net.URI;
  import java.nio.file.DirectoryStream;
  import java.nio.file.Files;
  import java.nio.file.NoSuchFileException;
  import java.nio.file.Path;
+ import java.nio.file.Paths;
  import java.nio.file.attribute.BasicFileAttributes;
  import java.util.Comparator;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Optional;
  
  /**
   * A validator to check for errors and conflicts between modules.
   */
  
*** 76,86 ****
          ModulePathValidator validator = new ModulePathValidator(out);
  
          // upgrade module path
          String value = System.getProperty("jdk.module.upgrade.path");
          if (value != null) {
!             Stream.of(value.split(File.pathSeparator))
                      .map(Path::of)
                      .forEach(validator::scan);
          }
  
          // system modules
--- 75,86 ----
          ModulePathValidator validator = new ModulePathValidator(out);
  
          // upgrade module path
          String value = System.getProperty("jdk.module.upgrade.path");
          if (value != null) {
!             Paths.pathToStrings(value)
!                     .stream()
                      .map(Path::of)
                      .forEach(validator::scan);
          }
  
          // system modules
*** 89,99 ****
                  .forEach(validator::process);
  
          // application module path
          value = System.getProperty("jdk.module.path");
          if (value != null) {
!             Stream.of(value.split(File.pathSeparator))
                      .map(Path::of)
                      .forEach(validator::scan);
          }
  
          return validator.errorCount;
--- 89,100 ----
                  .forEach(validator::process);
  
          // application module path
          value = System.getProperty("jdk.module.path");
          if (value != null) {
!             Paths.pathToStrings(value)
!                     .stream()
                      .map(Path::of)
                      .forEach(validator::scan);
          }
  
          return validator.errorCount;