Skip to content

Commit ef596d6

Browse files
committed
[NOID] 4.4 changes
1 parent 0247aec commit ef596d6

35 files changed

+374
-1467
lines changed

core/src/main/java/apoc/load/util/LoadCsvConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import apoc.load.Mapping;
2626
import apoc.util.CompressionConfig;
27-
import apoc.util.Util;
2827
import java.util.*;
2928

3029
public class LoadCsvConfig extends CompressionConfig {
@@ -91,7 +90,7 @@ private static String parseStringFromConfig(Map<String, Object> config, String k
9190
}
9291
return separator;
9392
}
94-
93+
9594
private Map<String, Mapping> createMapping(
9695
Map<String, Map<String, Object>> mapping, char arraySep, List<String> ignore) {
9796
if (mapping.isEmpty()) return Collections.emptyMap();

core/src/test/java/apoc/export/arrow/ArrowTest.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
import static org.junit.Assert.assertEquals;
2727

2828
import apoc.ApocSettings;
29+
import java.io.File;
30+
import java.time.LocalDateTime;
31+
import java.time.ZoneOffset;
32+
import java.util.Arrays;
33+
import java.util.List;
34+
import java.util.Map;
35+
import java.util.stream.Collectors;
36+
import java.util.stream.LongStream;
2937
import org.junit.AfterClass;
3038
import org.junit.Before;
3139
import org.junit.BeforeClass;
@@ -36,16 +44,6 @@
3644
import org.neo4j.test.rule.DbmsRule;
3745
import org.neo4j.test.rule.ImpermanentDbmsRule;
3846

39-
import java.io.File;
40-
import java.time.LocalDateTime;
41-
import java.time.ZoneOffset;
42-
import java.util.Arrays;
43-
import java.util.List;
44-
import java.util.Map;
45-
import java.util.stream.Collectors;
46-
import java.util.stream.LongStream;
47-
48-
4947
public class ArrowTest {
5048

5149
private static File directory = new File("target/arrow import");
@@ -62,8 +60,6 @@ public class ArrowTest {
6260
directory.toPath().toAbsolutePath())
6361
.withSetting(ApocSettings.apoc_export_file_enabled, true);
6462

65-
66-
6763
@BeforeClass
6864
public static void beforeClass() {
6965
initDbCommon(db);

core/src/test/java/apoc/export/arrow/ArrowTestUtil.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
package apoc.export.arrow;
22

3+
import static apoc.util.TestUtil.testCall;
4+
import static apoc.util.TestUtil.testResult;
5+
import static org.junit.Assert.assertArrayEquals;
6+
import static org.junit.Assert.assertEquals;
7+
import static org.junit.Assert.assertFalse;
8+
39
import apoc.graph.Graphs;
410
import apoc.load.LoadArrow;
511
import apoc.meta.Meta;
612
import apoc.util.JsonUtil;
713
import apoc.util.TestUtil;
814
import com.fasterxml.jackson.core.JsonProcessingException;
15+
import java.time.LocalDateTime;
16+
import java.time.ZoneOffset;
17+
import java.util.HashMap;
18+
import java.util.List;
19+
import java.util.Map;
20+
import java.util.stream.Collectors;
921
import org.neo4j.graphdb.GraphDatabaseService;
1022
import org.neo4j.graphdb.Node;
1123
import org.neo4j.graphdb.Relationship;
@@ -19,19 +31,6 @@
1931
import org.neo4j.values.storable.PointValue;
2032
import org.neo4j.values.virtual.VirtualValues;
2133

22-
import java.time.LocalDateTime;
23-
import java.time.ZoneOffset;
24-
import java.util.HashMap;
25-
import java.util.List;
26-
import java.util.Map;
27-
import java.util.stream.Collectors;
28-
29-
import static apoc.util.TestUtil.testCall;
30-
import static apoc.util.TestUtil.testResult;
31-
import static org.junit.Assert.assertArrayEquals;
32-
import static org.junit.Assert.assertEquals;
33-
import static org.junit.Assert.assertFalse;
34-
3534
public class ArrowTestUtil {
3635
public static String ARROW_BASE_FOLDER = "target/arrowImport";
3736

core/src/test/java/apoc/util/s3/S3TestUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ public static void assertS3KeyEventually(Runnable runnable) {
8282
v -> v,
8383
30L,
8484
TimeUnit.SECONDS);
85-
}
86-
85+
}
86+
8787
public static String removeRegionFromUrl(S3Container s3Container, String url) {
8888
return url.replace(s3Container.getEndpointConfiguration().getSigningRegion() + ".", "");
8989
}
90-
90+
9191
public static String putToS3AndGetUrl(S3Container s3Container, String filename) {
9292
String url = s3Container.putFile(filename);
9393
return removeRegionFromUrl(s3Container, url);

extended-it/src/test/java/apoc/azure/ArrowAzureStorageTest.java

Lines changed: 0 additions & 62 deletions
This file was deleted.

extended-it/src/test/java/apoc/azure/AzureStorageBaseTest.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

extended-it/src/test/java/apoc/azure/ImportAzureStorageTest.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

extended-it/src/test/java/apoc/azure/LoadAzureStorageTest.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)