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

*** 20,55 ****
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
- 
  package jdk.internal.module;
  
- import java.lang.module.Configuration;
- import java.lang.module.ModuleFinder;
  import java.util.Map;
  import java.util.Set;
  import java.util.function.Function;
! 
  import jdk.internal.misc.VM;
  
  /**
!  * Used by ModuleBootstrap to obtain the archived system modules and finder.
   */
! final class ArchivedModuleGraph {
      private static ArchivedModuleGraph archivedModuleGraph;
  
      private final boolean hasSplitPackages;
      private final boolean hasIncubatorModules;
      private final ModuleFinder finder;
      private final Configuration configuration;
      private final Function<String, ClassLoader> classLoaderFunction;
      private final Map<String, Set<String>> concealedPackagesToOpen;
      private final Map<String, Set<String>> exportedPackagesToOpen;
  
!     public ArchivedModuleGraph(boolean hasSplitPackages,
                                 boolean hasIncubatorModules,
                                 ModuleFinder finder,
                                 Configuration configuration,
                                 Function<String, ClassLoader> classLoaderFunction,
                                 Map<String, Set<String>> concealedPackagesToOpen,
--- 20,54 ----
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.internal.module;
  
  import java.util.Map;
  import java.util.Set;
  import java.util.function.Function;
! import java.lang.module.Configuration;
! import java.lang.module.ModuleFinder;
  import jdk.internal.misc.VM;
  
  /**
!  * Used by ModuleBootstrap for archiving the configuration for the boot layer,
!  * the system module finder, and the maps used to create the IllegalAccessLogger.
   */
! class ArchivedModuleGraph {
      private static ArchivedModuleGraph archivedModuleGraph;
  
      private final boolean hasSplitPackages;
      private final boolean hasIncubatorModules;
      private final ModuleFinder finder;
      private final Configuration configuration;
      private final Function<String, ClassLoader> classLoaderFunction;
      private final Map<String, Set<String>> concealedPackagesToOpen;
      private final Map<String, Set<String>> exportedPackagesToOpen;
  
!     private ArchivedModuleGraph(boolean hasSplitPackages,
                                  boolean hasIncubatorModules,
                                  ModuleFinder finder,
                                  Configuration configuration,
                                  Function<String, ClassLoader> classLoaderFunction,
                                  Map<String, Set<String>> concealedPackagesToOpen,
*** 105,116 ****
      }
  
      /**
       * Archive the module graph for the given initial module.
       */
!     static void archive(ArchivedModuleGraph graph) {
!         archivedModuleGraph = graph;
      }
  
      static {
          VM.initializeFromArchive(ArchivedModuleGraph.class);
      }
--- 104,127 ----
      }
  
      /**
       * Archive the module graph for the given initial module.
       */
!     static void archive(boolean hasSplitPackages,
!                         boolean hasIncubatorModules,
!                         ModuleFinder finder,
!                         Configuration configuration,
!                         Function<String, ClassLoader> classLoaderFunction,
!                         Map<String, Set<String>> concealedPackagesToOpen,
!                         Map<String, Set<String>> exportedPackagesToOpen) {
!         archivedModuleGraph = new ArchivedModuleGraph(hasSplitPackages,
!                                                       hasIncubatorModules,
!                                                       finder,
!                                                       configuration,
!                                                       classLoaderFunction,
!                                                       concealedPackagesToOpen,
!                                                       exportedPackagesToOpen);
      }
  
      static {
          VM.initializeFromArchive(ArchivedModuleGraph.class);
      }