[s7Ob7Zm7] 4.x changes

neo4j-contrib · Jun 19, 2023 · 3b8cada · 3b8cada
1 parent 012d603
commit 3b8cada
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/core/src/test/java/apoc/export/ExportCoreSecurityTest.java b/core/src/test/java/apoc/export/ExportCoreSecurityTest.java
@@ -26,7 +26,7 @@
 import apoc.util.FileUtils;
 import apoc.util.TestUtil;
 import apoc.util.Util;
-import com.nimbusds.jose.util.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -111,7 +111,7 @@ public static List<Object[]> getParameterData(List<Pair<String, Consumer<Map>>>
                                         new Object[] { procName, procPair.getLeft(), procPair.getRight(), fileName.getLeft(), fileName.getRight() }
                                 )
                         )
-                ).toList();
+                ).collect(Collectors.toList());
     }
 
     /**
@@ -187,7 +187,7 @@ public TestIllegalExternalFSAccess(String exportMethod, String exportMethodType,
 
             List<Pair<String, Consumer<Map>>> notExistingDirList = casesNotExistingDir.stream()
                     .map(i -> Pair.of(i, EXCEPTION_NOT_FOUND_CONSUMER))
-                    .toList();
+                    .collect(Collectors.toList());
 
             dataPairs.addAll(notExistingDirList);
         }
@@ -305,7 +305,7 @@ They result in a file being created (and deleted after).
         @Parameterized.Parameters(name = PARAM_NAMES)
         public static Collection<Object[]> data() {
             List<Pair<String, Consumer<Map>>> collect = mainDirCases.stream().map(i -> Pair.of(i, MAIN_DIR_CONSUMER)).collect(Collectors.toList());
-            List<Pair<String, Consumer<Map>>> collect2 = subDirCases.stream().map(i -> Pair.of(i, SUB_DIR_CONSUMER)).toList();
+            List<Pair<String, Consumer<Map>>> collect2 = subDirCases.stream().map(i -> Pair.of(i, SUB_DIR_CONSUMER)).collect(Collectors.toList());
             collect.addAll(collect2);
 
             return getParameterData(collect);

diff --git a/core/src/test/java/apoc/export/ImportAndLoadCoreSecurityTest.java b/core/src/test/java/apoc/export/ImportAndLoadCoreSecurityTest.java
@@ -85,7 +85,7 @@ public static Collection<String[]> data() {
         // transform `Pair(<KEY>, <VALUE>)` to `Pair(apoc.load.<KEY> , <VALUE>)`
         List<Pair<String, String>> loadProcedures = LOAD_PROCEDURES
                 .map(e -> Pair.of( "apoc.load." + e.getLeft() , e.getRight() ))
-                .toList();
+                .collect(Collectors.toList());
 
         importAndLoadProcedures.addAll(loadProcedures);
 
@@ -111,7 +111,7 @@ private static List<String[]> getParameterData(List<Pair<String, String>> import
                         .map(
                             procPair -> new String[] { procPair.getLeft(), procPair.getRight(), fileName }
                         )
-                ).toList();
+                ).collect(Collectors.toList());
     }
 
     @ClassRule

diff --git a/core/src/test/java/apoc/export/arrow/ExportArrowSecurityTest.java b/core/src/test/java/apoc/export/arrow/ExportArrowSecurityTest.java
@@ -23,7 +23,7 @@
 import apoc.meta.Meta;
 import apoc.util.TestUtil;
 import apoc.util.Util;
-import com.nimbusds.jose.util.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -194,7 +194,7 @@ public TestPathTraversalIsNormalisedWithinDirectory(String exportMethod, String
         @Parameterized.Parameters(name = PARAM_NAMES)
         public static Collection<Object[]> data() {
             List<Pair<String, Consumer<Map>>> collect = mainDirCases.stream().map(i -> Pair.of(i, MAIN_DIR_CONSUMER)).collect(Collectors.toList());
-            List<Pair<String, Consumer<Map>>> collect2 = subDirCases.stream().map(i -> Pair.of(i, SUB_DIR_CONSUMER)).toList();
+            List<Pair<String, Consumer<Map>>> collect2 = subDirCases.stream().map(i -> Pair.of(i, SUB_DIR_CONSUMER)).collect(Collectors.toList());
             collect.addAll(collect2);
 
             return ExportArrowSecurityTest.getParameterData(collect);

diff --git a/core/src/test/java/apoc/load/LoadCoreSecurityTest.java b/core/src/test/java/apoc/load/LoadCoreSecurityTest.java
@@ -137,7 +137,7 @@ public void testIllegalFSAccessWithImportDisabled() {
         @Test
         public void testIllegalFSAccessWithImportEnabled() {
             final String message = apocProcedure + " should throw an exception";
-            final String fileName = SensitivePathGenerator.etcPasswd(db).first();
+            final String fileName = SensitivePathGenerator.etcPasswd().getLeft();
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ENABLED, true);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_USE_NEO4J_CONFIG, true);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM, false);
@@ -155,7 +155,7 @@ public void testIllegalFSAccessWithImportEnabled() {
         public void testReadSensitiveFileWorks() {
             // as we're defining ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM to true
             // and ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM to false the next call should work
-            final String fileName = SensitivePathGenerator.etcPasswd(db).first();
+            final String fileName = SensitivePathGenerator.etcPasswd().getLeft();
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ENABLED, true);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_USE_NEO4J_CONFIG, false);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM, true);

diff --git a/full/src/test/java/apoc/load/LoadFullSecurityTest.java b/full/src/test/java/apoc/load/LoadFullSecurityTest.java
@@ -131,7 +131,7 @@ public void testIllegalFSAccessWithImportDisabled() {
         @Test
         public void testIllegalFSAccessWithImportEnabled() {
             final String message = apocProcedure + " should throw an exception";
-            final String fileName = SensitivePathGenerator.etcPasswd(db).first();
+            final String fileName = SensitivePathGenerator.etcPasswd().getLeft();
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ENABLED, true);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_USE_NEO4J_CONFIG, true);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM, false);
@@ -149,7 +149,7 @@ public void testIllegalFSAccessWithImportEnabled() {
         public void testReadSensitiveFileWorks() {
             // as we're defining ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM to true
             // and ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM to false the next call should work
-            final String fileName = SensitivePathGenerator.etcPasswd(db).first();
+            final String fileName = SensitivePathGenerator.etcPasswd().getLeft();
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ENABLED, true);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_USE_NEO4J_CONFIG, false);
             ApocConfig.apocConfig().setProperty(ApocConfig.APOC_IMPORT_FILE_ALLOW__READ__FROM__FILESYSTEM, true);

diff --git a/test-utils/src/main/java/apoc/util/SensitivePathGenerator.java b/test-utils/src/main/java/apoc/util/SensitivePathGenerator.java
@@ -1,6 +1,6 @@
 package apoc.util;
 
-import org.neo4j.internal.helpers.collection.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 
 import java.nio.file.Path;