Package libraries Java code as Java Modules

distribution/lib/Standard/AWS/0.0.0-dev/package.yaml

@@ -8,3 +8,6 @@ authors:
 maintainers:
   - name: Enso Team
     email: [email protected]
+requires:
+  - Standard.Base
+  - Standard.Database

distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso

@@ -170,7 +170,6 @@ export project.Nothing.Nothing
 
 export project.Panic.Panic
 
-export project.Polyglot.Java
 export project.Polyglot.Polyglot
 
 export project.Random.Random

distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso

@@ -13,7 +13,6 @@ import project.Error.Error as Base_Error
 import project.Errors.Common.Not_Found
 import project.Function.Function
 import project.Nothing.Nothing
-import project.Polyglot.Java
 from project.Data.Boolean import Boolean, False, True
 from project.Runtime.Managed_Resource import Managed_Resource
 
@@ -445,7 +444,7 @@ is_a value typ = @Builtin_Method "Meta.is_a"
 java_instance_check value typ =
     val_java = get_polyglot_language value == "java"
     typ_java = get_polyglot_language typ == "java"
-    val_java && typ_java && Java.is_instance value typ
+    val_java && typ_java && typ.class.isInstance value
 
 ## PRIVATE
    ADVANCED

distribution/lib/Standard/Base/0.0.0-dev/src/Polyglot.enso

@@ -132,50 +132,3 @@ type Polyglot
        Returns the executable name of a polyglot object.
     get_executable_name : Any -> Text
     get_executable_name value = @Builtin_Method "Polyglot.get_executable_name"
-
-## Utilities for working with Java polyglot objects.
-type Java
-    ## PRIVATE
-       ADVANCED
-       Adds the provided entry to the host class path.
-
-       Arguments:
-       - path: The java classpath entry to add.
-
-       Use of the actual polyglot imports system should be preferred to use of
-       this method.
-
-       > Example
-         Adding Random to the classpath.
-
-            Java.add_to_class_path "java.util.Random"
-    add_to_class_path : Text -> Nothing
-    add_to_class_path path = @Builtin_Method "Java.add_to_class_path"
-
-    ## PRIVATE
-       ADVANCED
-       Looks up a java symbol on the classpath by name.
-
-       Arguments:
-       - name: The name of the java symbol to look up.
-
-       Use of the actual polyglot imports system should be preferred to use of
-       this method.
-
-       > Example
-         Look up java's Random class.
-
-             Java.lookup_class "java.util.Random"
-    lookup_class : Text -> Any
-    lookup_class name = @Builtin_Method "Java.lookup_class"
-
-    ## PRIVATE
-       Checks whether an object is an instance of a given class.
-
-       Arguments:
-       - object: The object to check for class membership.
-       - class: The java class to check for membership in.
-    is_instance : Any -> Any -> Boolean
-    is_instance object class =
-        class_object = class.class
-        class_object.isInstance object

distribution/lib/Standard/Database/0.0.0-dev/package.yaml

@@ -8,3 +8,6 @@ authors:
 maintainers:
   - name: Enso Team
     email: [email protected]
+requires:
+  - Standard.Base
+  - Standard.Table

distribution/lib/Standard/Image/0.0.0-dev/package.yaml

@@ -8,3 +8,5 @@ authors:
 maintainers:
   - name: Enso Team
     email: [email protected]
+requires:
+  - Standard.Base

distribution/lib/Standard/Microsoft/0.0.0-dev/package.yaml

@@ -8,3 +8,6 @@ authors:
 maintainers:
   - name: Enso Team
     email: [email protected]
+requires:
+  - Standard.Base
+  - Standard.Database

distribution/lib/Standard/Table/0.0.0-dev/package.yaml

@@ -8,3 +8,5 @@ authors:
 maintainers:
   - name: Enso Team
     email: [email protected]
+requires:
+  - Standard.Base

distribution/lib/Standard/Tableau/0.0.0-dev/package.yaml

@@ -8,3 +8,5 @@ authors:
 maintainers:
   - name: Enso Team
     email: [email protected]
+requires:
+  - Standard.Table

distribution/lib/Standard/Test/0.0.0-dev/package.yaml

@@ -8,3 +8,5 @@ authors:
 maintainers:
   - name: Enso Team
     email: [email protected]
+requires:
+  - Standard.Base

engine/language-server/src/test/scala/org/enso/languageserver/libraries/ComponentGroupsResolverSpec.scala

@@ -278,6 +278,7 @@ object ComponentGroupsResolverSpec {
       license              = "",
       authors              = Nil,
       maintainers          = Nil,
+      requires             = List(),
       edition              = None,
       preferLocalLibraries = true,
       componentGroups      = Some(componentGroups)
@@ -296,6 +297,7 @@ object ComponentGroupsResolverSpec {
       license              = "",
       authors              = Nil,
       maintainers          = Nil,
+      requires             = List(),
       edition              = None,
       preferLocalLibraries = true,
       componentGroups      = None

engine/language-server/src/test/scala/org/enso/languageserver/libraries/ComponentGroupsValidatorSpec.scala

@@ -188,6 +188,7 @@ object ComponentGroupsValidatorSpec {
       authors              = Nil,
       maintainers          = Nil,
       edition              = None,
+      requires             = List(),
       preferLocalLibraries = true,
       componentGroups = Some(
         ComponentGroups(

engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/PolyglotTest.scala

@@ -17,9 +17,10 @@ class PolyglotTest extends InterpreterTest {
       val code =
         """from Standard.Base import all
           |import Standard.Base.Data.Array.Array
+          |polyglot java import org.enso.example.TestClass
           |
           |main =
-          |    class = Java.lookup_class "org.enso.example.TestClass"
+          |    class = TestClass
           |    method = Polyglot.get_member class "add"
           |    Polyglot.execute method ([1, 2].to_array)
           |""".stripMargin
@@ -60,9 +61,10 @@ class PolyglotTest extends InterpreterTest {
     "allow instantiating objects and calling methods on them" in {
       val code =
         """from Standard.Base import all
+          |polyglot java import org.enso.example.TestClass
           |
           |main =
-          |    class = Java.lookup_class "org.enso.example.TestClass"
+          |    class = TestClass
           |    instance = Polyglot.new class [x -> x * 2]
           |    Polyglot.invoke instance "callFunctionAndIncrement" [10]
           |""".stripMargin
@@ -72,9 +74,10 @@ class PolyglotTest extends InterpreterTest {
     "allow listing available members of an object" in {
       val code =
         """from Standard.Base import all
+          |polyglot java import org.enso.example.TestClass
           |
           |main =
-          |    class = Java.lookup_class "org.enso.example.TestClass"
+          |    class = TestClass
           |    instance = Polyglot.new class []
           |    members = Polyglot.get_members instance
           |    IO.println members.length

engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoClassPath.java

@@ -0,0 +1,138 @@
+package org.enso.interpreter.runtime;
+
+import com.oracle.truffle.api.TruffleLogger;
+import java.lang.module.Configuration;
+import java.lang.module.FindException;
+import java.lang.module.ModuleFinder;
+import java.lang.module.ResolutionException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.logging.Level;
+
+/** Representation of an Enso library class path. */
+public final class EnsoClassPath {
+  static final EnsoClassPath EMPTY = new EnsoClassPath("empty", null, null, null);
+  private final Object id;
+  private final ModuleLayer.Controller cntrl;
+  private final ModuleLayer layer;
+  final ClassLoader loader;
+
+  private EnsoClassPath(
+      Object id, ModuleLayer.Controller cntrl, ModuleLayer layer, ClassLoader loader) {
+    this.id = id;
+    if (cntrl != null) {
+      // cannot be null
+      layer.getClass();
+    }
+    this.cntrl = cntrl;
+    this.layer = layer;
+    this.loader = loader;
+  }
+
+  private static ModuleLayer bootLayer() {
+    var myLayer = EnsoClassPath.class.getModule().getLayer();
+    if (myLayer != null) {
+      return myLayer;
+    } else {
+      return ModuleLayer.boot();
+    }
+  }
+
+  static EnsoClassPath create(Path file, List<EnsoClassPath> parents, TruffleLogger log) {
+    try {
+      return createImpl(file, parents);
+    } catch (FindException | ResolutionException e) {
+      var sb = new StringBuilder();
+      sb.append("Cannot instantiate modules at ").append(file);
+      log.log(Level.FINE, sb.toString(), e);
+      for (var cp : parents) {
+        sb.append("\n  with parent ").append(cp);
+      }
+      e.setStackTrace(
+          Arrays.asList(e.getStackTrace()).stream().limit(10).toArray(StackTraceElement[]::new));
+      log.log(Level.SEVERE, sb.toString(), e);
+      return EnsoClassPath.EMPTY;
+    }
+  }
+
+  private static EnsoClassPath createImpl(Path file, List<EnsoClassPath> parents) {
+    var locations = new ArrayList<Path>();
+    var moduleNames = new ArrayList<String>();
+    MODULE_LOOP:
+    for (var mod : ModuleFinder.of(file).findAll()) {
+      if (bootLayer().findModule(mod.descriptor().name()).isPresent()) {
+        continue;
+      }
+      for (var p : parents) {
+        if (p.layer != null && p.layer.findModule(mod.descriptor().name()).isPresent()) {
+          continue MODULE_LOOP;
+        }
+      }
+      moduleNames.add(mod.descriptor().name());
+      var uri = mod.location().get();
+      locations.add(Path.of(uri));
+    }
+    if (moduleNames.isEmpty() && parents.isEmpty()) {
+      return EMPTY;
+    } else {
+      var finder = ModuleFinder.of(locations.toArray(new Path[0]));
+      ModuleLayer.Controller cntrl;
+      if (parents.isEmpty()) {
+        var parent = bootLayer();
+        var parentLoader = parent.findLoader("java.base");
+        var parentCfgs = Collections.singletonList(parent.configuration());
+        var parentModules = Collections.singletonList(parent);
+        var cfg =
+            Configuration.resolveAndBind(finder, parentCfgs, ModuleFinder.ofSystem(), moduleNames);
+        cntrl = ModuleLayer.defineModulesWithOneLoader(cfg, parentModules, parentLoader);
+      } else {
+        var parentCfgs = new ArrayList<Configuration>();
+        var parentLayers = new ArrayList<ModuleLayer>();
+        for (var cp : parents) {
+          if (cp.layer == null) {
+            continue;
+          }
+          parentLayers.add(cp.layer);
+          parentCfgs.add(cp.layer.configuration());
+        }
+        if (parentLayers.isEmpty()) {
+          parentLayers.add(ModuleLayer.boot());
+          parentCfgs.add(ModuleLayer.boot().configuration());
+        }
+        var parentLoader = bootLayer().findLoader("java.base");
+        var cfg =
+            Configuration.resolveAndBind(finder, parentCfgs, ModuleFinder.ofSystem(), moduleNames);
+        cntrl = ModuleLayer.defineModulesWithOneLoader(cfg, parentLayers, parentLoader);
+      }
+      var layer = cntrl.layer();
+      var loader =
+          !moduleNames.isEmpty() ? layer.findLoader(moduleNames.get(0)) : parents.get(0).loader;
+
+      registerLayer(layer);
+      return new EnsoClassPath(file, cntrl, layer, loader);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private static void registerLayer(ModuleLayer moduleLayer) {
+    var props = System.getProperties();
+    Collection<ModuleLayer> layers;
+    if (props.get("enso.class.path") instanceof Collection registeredLayers) {
+      layers = registeredLayers;
+    } else {
+      layers = new LinkedHashSet<>();
+      props.put("enso.class.path", layers);
+    }
+    layers.add(moduleLayer);
+  }
+
+  @Override
+  public String toString() {
+    return "EnsoClassPath[id=" + id + "]";
+  }
+}