spotless + null collector fix

nbauernfeind · Feb 9, 2024 · 5f5c70d · 5f5c70d
1 parent 7f03162
commit 5f5c70d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonDeephavenSession.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonDeephavenSession.java
@@ -42,6 +42,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -303,10 +304,14 @@ protected synchronized Object setVariable(String name, @Nullable Object newValue
 
     @Override
     protected Map<String, Object> getAllValues(Predicate<Map.Entry<String, Object>> predicate) {
-        return PyLib
-                .ensureGil(() -> scope.getEntries()
-                        .filter(predicate)
-                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+        final HashMap<String, Object> result = new HashMap<>();
+        // note: we can't use collect(Collectors.toMap()) because we allow null values
+        return PyLib.ensureGil(() -> {
+            scope.getEntries()
+                    .filter(predicate)
+                    .forEach(entry -> result.put(entry.getKey(), entry.getValue()));
+            return result;
+        });
     }
 
     @Override

diff --git a/engine/table/src/main/java/io/deephaven/engine/util/GroovyDeephavenSession.java b/engine/table/src/main/java/io/deephaven/engine/util/GroovyDeephavenSession.java
@@ -772,9 +772,12 @@ protected Object setVariable(String name, @Nullable Object newValue) {
     @Override
     protected Map<String, Object> getAllValues(@NotNull final Predicate<Map.Entry<String, Object>> predicate) {
         synchronized (bindingBackingMap) {
-            return bindingBackingMap.entrySet().stream()
+            final HashMap<String, Object> result = new HashMap<>();
+            // note: we can't use collect(Collectors.toMap()) because we allow null values
+            bindingBackingMap.entrySet().stream()
                     .filter(predicate)
-                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                    .forEach(e -> result.put(e.getKey(), e.getValue()));
+            return result;
         }
     }
 

diff --git a/engine/table/src/main/java/io/deephaven/engine/util/NoLanguageDeephavenSession.java b/engine/table/src/main/java/io/deephaven/engine/util/NoLanguageDeephavenSession.java
@@ -94,11 +94,14 @@ protected Object setVariable(String name, @Nullable Object newValue) {
 
     @Override
     protected Map<String, Object> getAllValues(Predicate<Map.Entry<String, Object>> predicate) {
+        // note: we can't use collect(Collectors.toMap()) because we allow null values
+        final HashMap<String, Object> result = new HashMap<>();
         synchronized (variables) {
-            return variables.entrySet().stream()
+            variables.entrySet().stream()
                     .filter(predicate)
-                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                    .forEach(entry -> result.put(entry.getKey(), entry.getValue()));
         }
+        return result;
     }
 
     @Override

diff --git a/engine/table/src/main/java/io/deephaven/engine/util/PythonScopeJpyImpl.java b/engine/table/src/main/java/io/deephaven/engine/util/PythonScopeJpyImpl.java
@@ -21,6 +21,7 @@
 public class PythonScopeJpyImpl implements PythonScope<PyObject> {
     private static volatile boolean cacheEnabled =
             Configuration.getInstance().getBooleanForClassWithDefault(PythonScopeJpyImpl.class, "cacheEnabled", false);
+
     public static void setCacheEnabled(boolean enabled) {
         cacheEnabled = enabled;
     }