Give unique element ids for virtual nodes as well

Author: gem-neo4j

common/src/main/java/apoc/result/VirtualNode.java

@@ -47,7 +47,7 @@ public VirtualNode(Label[] labels, Map<String, Object> props) {
         this.id = MIN_ID.decrementAndGet();
         addLabels(asList(labels));
         this.props.putAll(props);
-        this.elementId = null;
+        this.elementId = UUID.randomUUID().toString();
     }
 
     @SuppressWarnings("unused") // used from extended
@@ -65,15 +65,17 @@ public VirtualNode(long nodeId) {
 
     public VirtualNode(Node node, List<String> propertyNames, boolean wrapNodeIDs) {
         Objects.requireNonNull(node, ERROR_NODE_NULL);
-        final long id = node.getId();
-        // if node is already virtual, we return the same id
-        this.id = id < 0 || wrapNodeIDs ? id : -id - 1;
+        final long givenNodeId = node.getId();
+        // if node is already virtual, we return the same id/element id
+        this.id = givenNodeId < 0 || wrapNodeIDs ? givenNodeId : -givenNodeId - 1;
+        this.elementId = givenNodeId < 0 || wrapNodeIDs
+                ? node.getElementId()
+                : UUID.randomUUID().toString();
         // to not overlap this nodes ids with ids from VirtualNode(Label[] labels, Map<String, Object> props)
         MIN_ID.updateAndGet(x -> Math.min(x, this.id));
         this.labels.addAll(Util.labelStrings(node));
         String[] keys = propertyNames.toArray(new String[propertyNames.size()]);
         this.props.putAll(node.getProperties(keys));
-        this.elementId = node.getElementId();
     }
 
     public VirtualNode(Node node, List<String> propertyNames) {