[NOID] fix tests

neo4j-contrib · Dec 5, 2024 · e30ac57 · e30ac57
1 parent 32da6d9
commit e30ac57
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/core/src/main/java/apoc/export/graphml/XmlGraphMLReader.java b/core/src/main/java/apoc/export/graphml/XmlGraphMLReader.java
@@ -43,6 +43,8 @@
 import org.neo4j.graphdb.*;
 import org.neo4j.procedure.TerminationGuard;
 
+import static apoc.util.ConvertUtil.toValidValue;
+
 /**
  * Created by mh on 10.07.13.
  */

diff --git a/core/src/main/java/apoc/load/Xml.java b/core/src/main/java/apoc/load/Xml.java
@@ -115,7 +115,7 @@ public Stream<MapResult> xml(
             @Name(value = "config", defaultValue = "{}") Map<String, Object> config,
             @Name(value = "simple", defaultValue = "false") boolean simpleMode)
             throws Exception {
-        return xmlXpathToMapResult(urlOrBinary, simpleMode, path, config);
+        return xmlXpathToMapResult(urlOrBinary, simpleMode, path, config, terminationGuard);
     }
 
     @UserFunction("apoc.xml.parse")
@@ -128,29 +128,29 @@ public Map<String, Object> parse(
             throws Exception {
         if (config == null) config = Collections.emptyMap();
         boolean failOnError = (boolean) config.getOrDefault("failOnError", true);
-        return parse(new ByteArrayInputStream(data.getBytes(Charset.forName("UTF-8"))), simpleMode, path, failOnError)
+        return parse(new ByteArrayInputStream(data.getBytes(Charset.forName("UTF-8"))), simpleMode, path, failOnError, terminationGuard)
                 .map(mr -> mr.value)
                 .findFirst()
                 .orElse(null);
     }
 
     public static Stream<MapResult> xmlXpathToMapResult(
-            @Name("urlOrBinary") Object urlOrBinary, boolean simpleMode, String path, Map<String, Object> config)
+            @Name("urlOrBinary") Object urlOrBinary, boolean simpleMode, String path, Map<String, Object> config, TerminationGuard terminationGuard)
             throws Exception {
         if (config == null) config = Collections.emptyMap();
         boolean failOnError = (boolean) config.getOrDefault("failOnError", true);
         try {
             Map<String, Object> headers = (Map) config.getOrDefault("headers", Collections.emptyMap());
             CountingInputStream is = FileUtils.inputStreamFor(
                     urlOrBinary, headers, null, (String) config.getOrDefault(COMPRESSION, CompressionAlgo.NONE.name()));
-            return parse(is, simpleMode, path, failOnError);
+            return parse(is, simpleMode, path, failOnError, terminationGuard);
         } catch (Exception e) {
             if (!failOnError) return Stream.of(new MapResult(Collections.emptyMap()));
             else throw e;
         }
     }
 
-    public static Stream<MapResult> parse(InputStream data, boolean simpleMode, String path, boolean failOnError)
+    public static Stream<MapResult> parse(InputStream data, boolean simpleMode, String path, boolean failOnError, TerminationGuard terminationGuard)
             throws Exception {
         List<MapResult> result = new ArrayList<>();
         try {
@@ -173,7 +173,7 @@ public static Stream<MapResult> parse(InputStream data, boolean simpleMode, Stri
             for (int i = 0; i < nodeList.getLength(); i++) {
                 final Deque<Map<String, Object>> stack = new LinkedList<>();
 
-                handleNode(stack, nodeList.item(i), simpleMode);
+                handleNode(stack, nodeList.item(i), simpleMode, terminationGuard);
                 for (int index = 0; index < stack.size(); index++) {
                     result.add(new MapResult(stack.pollFirst()));
                 }
@@ -223,15 +223,15 @@ private boolean proceedReader(XMLStreamReader reader) throws XMLStreamException
         }
     }
 
-    private void handleNode(Deque<Map<String, Object>> stack, Node node, boolean simpleMode) {
+    private static void handleNode(Deque<Map<String, Object>> stack, Node node, boolean simpleMode, TerminationGuard terminationGuard) {
         terminationGuard.check();
 
         // Handle document node
         if (node.getNodeType() == Node.DOCUMENT_NODE) {
             NodeList children = node.getChildNodes();
             for (int i = 0; i < children.getLength(); i++) {
                 if (children.item(i).getLocalName() != null) {
-                    handleNode(stack, children.item(i), simpleMode);
+                    handleNode(stack, children.item(i), simpleMode, terminationGuard);
                     return;
                 }
             }
@@ -248,7 +248,7 @@ private void handleNode(Deque<Map<String, Object>> stack, Node node, boolean sim
 
             // This is to deal with text between xml tags for example new line characters
             if (child.getNodeType() != Node.TEXT_NODE && child.getNodeType() != Node.CDATA_SECTION_NODE) {
-                handleNode(stack, child, simpleMode);
+                handleNode(stack, child, simpleMode, terminationGuard);
                 count++;
             } else {
                 // Deal with text nodes
@@ -290,7 +290,7 @@ private void handleNode(Deque<Map<String, Object>> stack, Node node, boolean sim
      * @param node
      * @param elementMap
      */
-    private void handleTypeAndAttributes(Node node, Map<String, Object> elementMap) {
+    private static void handleTypeAndAttributes(Node node, Map<String, Object> elementMap) {
         // Set type
         if (node.getLocalName() != null) {
             elementMap.put("_type", node.getLocalName());
@@ -312,7 +312,7 @@ private void handleTypeAndAttributes(Node node, Map<String, Object> elementMap)
      * @param node
      * @param elementMap
      */
-    private void handleTextNode(Node node, Map<String, Object> elementMap) {
+    private static void handleTextNode(Node node, Map<String, Object> elementMap) {
         Object text = "";
         int nodeType = node.getNodeType();
         switch (nodeType) {
@@ -344,7 +344,7 @@ private void handleTextNode(Node node, Map<String, Object> elementMap) {
      * @param text
      * @return
      */
-    private String normalizeText(String text) {
+    private static String normalizeText(String text) {
         String[] tokens = StringUtils.split(text, "\n");
         for (int i = 0; i < tokens.length; i++) {
             tokens[i] = tokens[i].trim();
@@ -682,7 +682,7 @@ private void setPropertyIfNotNull(org.neo4j.graphdb.Node root, String propertyKe
         }
     }
 
-    private RuntimeException generateXmlDoctypeException() {
+    private static RuntimeException generateXmlDoctypeException() {
         throw new RuntimeException("XML documents with a DOCTYPE are not allowed.");
     }
 }
diff --git a/...src/main/java/apoc/util/ExtendedUtil.java → .../src/main/java/apoc/util/ConvertUtil.java b/...src/main/java/apoc/util/ExtendedUtil.java → .../src/main/java/apoc/util/ConvertUtil.java
@@ -3,6 +3,17 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.json.JsonWriteFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.neo4j.exceptions.Neo4jException;
+import org.neo4j.values.storable.DateTimeValue;
+import org.neo4j.values.storable.DateValue;
+import org.neo4j.values.storable.DurationValue;
+import org.neo4j.values.storable.LocalDateTimeValue;
+import org.neo4j.values.storable.LocalTimeValue;
+import org.neo4j.values.storable.PointValue;
+import org.neo4j.values.storable.TimeValue;
+import org.neo4j.values.storable.Values;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -14,18 +25,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
-import org.neo4j.exceptions.Neo4jException;
-import org.neo4j.values.storable.DateTimeValue;
-import org.neo4j.values.storable.DateValue;
-import org.neo4j.values.storable.DurationValue;
-import org.neo4j.values.storable.LocalDateTimeValue;
-import org.neo4j.values.storable.LocalTimeValue;
-import org.neo4j.values.storable.PointValue;
-import org.neo4j.values.storable.TimeValue;
-import org.neo4j.values.storable.Values;
 
-public class ExtendedUtil {
+public class ConvertUtil {
     public static Object toValidValue(Object object, String field, Map<String, Object> mapping) {
         Object fieldName = mapping.get(field);
         if (object != null && fieldName != null) {
@@ -46,8 +47,8 @@ public static Object toValidValue(Object object, String field, Map<String, Objec
         if (object instanceof Map) {
             return ((Map<String, Object>) object)
                     .entrySet().stream()
-                            .collect(Collectors.toMap(
-                                    Map.Entry::getKey, e -> toValidValue(e.getValue(), field, mapping)));
+                    .collect(Collectors.toMap(
+                            Map.Entry::getKey, e -> toValidValue(e.getValue(), field, mapping)));
         }
         return getNeo4jValue(object);
     }
@@ -71,7 +72,7 @@ private static Object getNeo4jValue(Object object) {
     private static Object convertValue(String value, String typeName) {
         typeName = typeName.toLowerCase(); // Suitable to work with Parquet/Arrow/Gexf
         switch (typeName) {
-                // {"crs":"wgs-84-3d","latitude":13.1,"longitude":33.46789,"height":100.0}
+            // {"crs":"wgs-84-3d","latitude":13.1,"longitude":33.46789,"height":100.0}
             case "point":
                 return getPointValue(value);
             case "localdatetime":

diff --git a/full/src/main/java/apoc/export/arrow/ImportArrow.java b/full/src/main/java/apoc/export/arrow/ImportArrow.java
@@ -5,7 +5,7 @@
 import static apoc.export.arrow.ArrowUtils.FIELD_SOURCE_ID;
 import static apoc.export.arrow.ArrowUtils.FIELD_TARGET_ID;
 import static apoc.export.arrow.ArrowUtils.FIELD_TYPE;
-import static apoc.util.ExtendedUtil.toValidValue;
+import static apoc.util.ConvertUtil.toValidValue;
 
 import apoc.Extended;
 import apoc.Pools;

diff --git a/full/src/main/java/apoc/load/Gexf.java b/full/src/main/java/apoc/load/Gexf.java
@@ -46,7 +46,7 @@ public Stream<MapResult> gexf(
             throws Exception {
         boolean simpleMode = Util.toBoolean(config.getOrDefault("simpleMode", false));
         String path = (String) config.getOrDefault("path", "/");
-        return xmlXpathToMapResult(urlOrBinary, simpleMode, path, config);
+        return xmlXpathToMapResult(urlOrBinary, simpleMode, path, config, terminationGuard);
     }
 
     @Procedure(name = "apoc.import.gexf", mode = Mode.WRITE)