cache providers to avoid printing the warnings all the time, but prin…

…t it only once
enso-org · Nov 29, 2024 · 162231c · 162231c
1 parent 0c7a6d9
commit 162231c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/std-bits/base/src/main/java/org/enso/base/file_format/FileFormatSPI.java b/std-bits/base/src/main/java/org/enso/base/file_format/FileFormatSPI.java
@@ -13,7 +13,7 @@ public static List<Value> get_types(boolean refresh) {
     if (refresh) {
       loader.reload();
     }
-    return loader.getProviders().map(AbstractEnsoTypeSPI::getTypeObject).toList();
+    return loader.getProviders().stream().map(AbstractEnsoTypeSPI::getTypeObject).toList();
   }
 
   public static Value findFormatForDataLinkSubType(String subType) {

diff --git a/std-bits/base/src/main/java/org/enso/base/file_system/FileSystemSPI.java b/std-bits/base/src/main/java/org/enso/base/file_system/FileSystemSPI.java
@@ -34,7 +34,7 @@ public static List<Value> get_types(boolean refresh) {
     if (refresh) {
       loader.reload();
     }
-    return loader.getProviders().map(FileSystemSPI::getTypeObject).toList();
+    return loader.getProviders().stream().map(FileSystemSPI::getTypeObject).toList();
   }
 
   /**

diff --git a/std-bits/base/src/main/java/org/enso/base/read/ReadManyReturnSPI.java b/std-bits/base/src/main/java/org/enso/base/read/ReadManyReturnSPI.java
@@ -26,6 +26,6 @@ public static List<Value> get_types(boolean refresh) {
     if (refresh) {
       loader.reload();
     }
-    return loader.getProviders().map(ReadManyReturnSPI::getTypeObject).toList();
+    return loader.getProviders().stream().map(ReadManyReturnSPI::getTypeObject).toList();
   }
 }
diff --git a/std-bits/base/src/main/java/org/enso/base/spi/AbstractEnsoTypeSPI.java b/std-bits/base/src/main/java/org/enso/base/spi/AbstractEnsoTypeSPI.java
@@ -1,10 +1,10 @@
 package org.enso.base.spi;
 
+import java.util.List;
 import java.util.ServiceLoader;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.enso.base.polyglot.EnsoMeta;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Value;
@@ -67,16 +67,27 @@ public Loader(Class<T> clazz) {
       loader = ServiceLoader.load(clazz, clazz.getClassLoader());
     }
 
+    private transient List<T> cachedProviders = null;
+
     public final void reload() {
+      cachedProviders = null;
       loader.reload();
     }
 
-    public final Stream<T> getProviders() {
-      return loader.stream().map(ServiceLoader.Provider::get).filter(AbstractEnsoTypeSPI::isLoaded);
+    public final List<T> getProviders() {
+      if (cachedProviders == null) {
+        cachedProviders =
+            loader.stream()
+                .map(ServiceLoader.Provider::get)
+                .filter(AbstractEnsoTypeSPI::isLoaded)
+                .toList();
+      }
+
+      return cachedProviders;
     }
 
     public T findSingleProvider(Predicate<T> predicate, String predicateDescription) {
-      var found = getProviders().filter(predicate).toList();
+      var found = getProviders().stream().filter(predicate).toList();
       if (found.isEmpty()) {
         return null;
       } else if (found.size() > 1) {

diff --git a/std-bits/database/src/main/java/org/enso/database/DatabaseConnectionDetailsSPI.java b/std-bits/database/src/main/java/org/enso/database/DatabaseConnectionDetailsSPI.java
@@ -17,8 +17,7 @@ public static String[][] get_default_constructors(boolean refresh) {
     if (refresh) {
       loader.reload();
     }
-    return loader
-        .getProviders()
+    return loader.getProviders().stream()
         .map(
             provider ->
                 new String[] {
@@ -37,7 +36,7 @@ public static List<Value> get_types(boolean refresh) {
     if (refresh) {
       loader.reload();
     }
-    return loader.getProviders().map(DatabaseConnectionDetailsSPI::getTypeObject).toList();
+    return loader.getProviders().stream().map(DatabaseConnectionDetailsSPI::getTypeObject).toList();
   }
 
   private static final class DatabaseConnectionDetailsLoader