Merge remote-tracking branch 'origin/fb_requireJava25' into fb_requireJava25

Author: labkey-jeckels

api/src/org/labkey/api/data/BaseSelector.java

@@ -248,9 +248,6 @@ public T next()
         }, false);
     }
 
-    /**
-     * Returns a cached Map Stream that <b>must be closed</b>
-     */
     @Override
     public Stream<Map<String, Object>> mapStream()
     {

api/src/org/labkey/api/data/CachedResultSet.java

@@ -79,7 +79,6 @@ public class CachedResultSet implements ResultSet, TableResultSet
     private final boolean _isComplete;
 
     private boolean _wasClosed = false;
-    private boolean _requireClose = true;
 
     // state
     private int _row = -1;
@@ -149,7 +148,7 @@ private void close()
 
         stackTrace is used to set an alternate stack trace -- good for async queries, to indicate original creation stack trace
      */
-    CachedResultSet(ResultSetMetaData md, ArrayList<RowMap<Object>> maps, boolean isComplete, @Nullable StackTraceElement[] stackTrace)
+    CachedResultSet(ResultSetMetaData md, ArrayList<RowMap<Object>> maps, boolean isComplete, boolean requireClose, @Nullable StackTraceElement[] stackTrace)
     {
         _rowMaps = maps;
         _isComplete = isComplete;
@@ -197,23 +196,12 @@ private void close()
             }
         }
 
-        _state = new CachedResultSetState(_requireClose, stackTrace, threadName, url, _log);
+        _state = new CachedResultSetState(requireClose, stackTrace, threadName, url, _log);
         _cleanable = CLEANER.register(this, _state);
 
         MemTracker.getInstance().put(this);
     }
 
-    public boolean isRequireClose()
-    {
-        return _requireClose;
-    }
-
-    public CachedResultSet setRequireClose(boolean requireClose)
-    {
-        _requireClose = requireClose;
-        return this;
-    }
-
     @Override
     public @Nullable Connection getConnection() throws SQLException
     {

api/src/org/labkey/api/data/CachedResultSets.java

@@ -32,12 +32,12 @@
  */
 public class CachedResultSets
 {
-    public static CachedResultSet create(ResultSet rs, boolean cacheMetaData, int maxRows) throws SQLException
+    public static CachedResultSet create(ResultSet rs, boolean cacheMetaData, boolean requireClose, int maxRows) throws SQLException
     {
-        return create(rs, cacheMetaData, maxRows, null, QueryLogging.emptyQueryLogging());
+        return create(rs, cacheMetaData, requireClose, maxRows, null, QueryLogging.emptyQueryLogging());
     }
 
-    public static CachedResultSet create(ResultSet rsIn, boolean cacheMetaData, int maxRows, @Nullable StackTraceElement[] stackTrace, QueryLogging queryLogging) throws SQLException
+    public static CachedResultSet create(ResultSet rsIn, boolean cacheMetaData, boolean requireClose, int maxRows, @Nullable StackTraceElement[] stackTrace, QueryLogging queryLogging) throws SQLException
     {
         try (ResultSet rs = new LoggingResultSetWrapper(rsIn, queryLogging))         // TODO: avoid if we're passed a read-only and empty one??
         {
@@ -58,13 +58,13 @@ public static CachedResultSet create(ResultSet rsIn, boolean cacheMetaData, int
             // If we have another row, then we're not complete
             boolean isComplete = !rs.next();
 
-            return new CachedResultSet(md, list, isComplete, stackTrace);
+            return new CachedResultSet(md, list, isComplete, requireClose, stackTrace);
         }
     }
 
     public static CachedResultSet create(ResultSetMetaData md, List<Map<String, Object>> maps, boolean isComplete)
     {
-        return new CachedResultSet(md, convertToRowMaps(md, maps), isComplete, null);
+        return new CachedResultSet(md, convertToRowMaps(md, maps), isComplete, true, null);
     }
 
     public static CachedResultSet create(List<Map<String, Object>> maps)
@@ -88,7 +88,7 @@ public static CachedResultSet create(List<Map<String, Object>> maps, Collection<
         ResultSetMetaData md = createMetaData(columnNames);
 
         // Avoid error message from CachedResultSet.finalize() about unclosed CachedResultSet.
-        try (CachedResultSet crs = new CachedResultSet(md, convertToRowMaps(md, maps), true, null))
+        try (CachedResultSet crs = new CachedResultSet(md, convertToRowMaps(md, maps), true, true, null))
         {
             return crs;
         }

api/src/org/labkey/api/data/DbScope.java

@@ -1878,7 +1878,7 @@ private static void detectUnexpectedConnections(Connection conn, LabKeyDataSourc
             stmt.setString(1, databaseName);
             stmt.setString(2, applicationName);
 
-            try (CachedResultSet rs = CachedResultSets.create(stmt.executeQuery(), true, 1000))
+            try (CachedResultSet rs = CachedResultSets.create(stmt.executeQuery(), true, true, 1000))
             {
                 count = rs.getSize();
                 if (count != 0)

api/src/org/labkey/api/data/ResultSetSelector.java

@@ -103,7 +103,7 @@ protected TableResultSet wrapResultSet(ResultSet rs, Connection conn, boolean ca
     {
         if (cache)
         {
-            return CachedResultSets.create(rs, true, Table.ALL_ROWS).setRequireClose(requireClose);
+            return CachedResultSets.create(rs, true, requireClose, Table.ALL_ROWS);
         }
         else
         {

api/src/org/labkey/api/data/ResultSetSelectorTestCase.java

@@ -79,7 +79,7 @@ private <K> void test(DbScope scope, ResultSet rs, Class<K> clazz) throws SQLExc
                 assertEquals("Non-scrollable ResultSet can't be used with ScrollToTop", e.getMessage());
             }
 
-            rs = CachedResultSets.create(rs, true, Table.ALL_ROWS, null, QueryLogging.emptyQueryLogging());
+            rs = CachedResultSets.create(rs, true, true, Table.ALL_ROWS, null, QueryLogging.emptyQueryLogging());
         }
 
         ResultSetSelector selector = new ResultSetSelector(scope, rs);

api/src/org/labkey/api/data/SqlExecutingSelector.java

@@ -211,7 +211,7 @@ protected TableResultSet wrapResultSet(ResultSet rs, Connection conn, boolean ca
         if (cache)
         {
             // Cache ResultSet and meta data
-            return CachedResultSets.create(rs, true, _maxRows, _loggingStacktrace, getQueryLogging()).setRequireClose(requireClose);
+            return CachedResultSets.create(rs, true, requireClose, _maxRows, _loggingStacktrace, getQueryLogging());
         }
         else
         {

api/src/org/labkey/api/data/TableSelectorTestCase.java

@@ -281,9 +281,12 @@ private void testColumnList(TableSelector selector, boolean stable) throws SQLEx
             assertEquals(count, emails.size());
         }
 
-        try (Stream<Map<String, Object>> s = selector.mapStream())
+        assertEquals(count, selector.mapStream().count());
+
+        // Auto-closing is allowed (but not required for a Stream over cached results)
+        try (Stream<Map<String, Object>> mapStream = selector.mapStream())
         {
-            assertEquals(count, s.count());
+            assertEquals(count, mapStream.count());
         }
 
         try (Stream<Map<String, Object>> uncachedMapStream = selector.uncachedMapStream())

api/src/org/labkey/api/exp/OntologyManager.java

@@ -88,7 +88,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static java.util.Collections.emptySet;
 import static java.util.Collections.unmodifiableCollection;
@@ -215,11 +214,9 @@ public List<Pair<String, Boolean>> load(@NotNull Pair<String, GUID> key, @Nullab
                 _sharedContainer.getProject().getId()
             );
 
-            try (Stream<Map<String, Object>> s = new SqlSelector(getExpSchema(), sql).mapStream())
-            {
-                return s.map(map -> Pair.of((String) map.get("PropertyURI"), (Boolean) map.get("Required")))
-                    .toList();
-            }
+            return new SqlSelector(getExpSchema(), sql).mapStream()
+                .map(map -> Pair.of((String)map.get("PropertyURI"), (Boolean)map.get("Required")))
+                .toList();
         }
     });
     private static final Cache<Container, Map<String, DomainDescriptor>> DOMAIN_DESCRIPTORS_BY_CONTAINER_CACHE = DatabaseCache.get(getExpSchema().getScope(), 2000, "Domain descriptors by container", (c, argument) -> {

api/src/org/labkey/api/security/AuthenticationConfigurationCache.java

@@ -72,17 +72,14 @@ private AuthenticationConfigurationCollections()
             // Select the configurations stored in the core.AuthenticationConfigurations table, add the database
             // authentication configuration, map each to the appropriate AuthenticationConfiguration, and add to the maps.
 
-            Stream<Map<String, Object>> configs;
-            try (var s = new TableSelector(CoreSchema.getInstance().getTableInfoAuthenticationConfigurations(), null, new Sort("SortOrder, RowId")).mapStream())
-            {
-                configs = Stream.concat(
-                        s,
-                        // Gather the "permanent" configurations -- this should be just a single configuration for Database authentication
-                        AuthenticationManager.getAllPrimaryProviders().stream()
-                                .filter(AuthenticationProvider::isPermanent)
-                                .map(p -> Map.of("Provider", p.getName()))
-                );
-            }
+            Stream<Map<String, Object>> configs = Stream.concat(
+                new TableSelector(CoreSchema.getInstance().getTableInfoAuthenticationConfigurations(), null, new Sort("SortOrder, RowId")).mapStream(),
+
+                // Gather the "permanent" configurations -- this should be just a single configuration for Database authentication
+                AuthenticationManager.getAllPrimaryProviders().stream()
+                    .filter(AuthenticationProvider::isPermanent)
+                    .map(p->Map.of("Provider", p.getName()))
+            );
 
             configs
                 .map(this::getAuthenticationConfiguration)