[NOID] changes after rebase

Author: vga91

common/src/main/java/apoc/export/util/BatchTransaction.java

@@ -32,8 +32,8 @@ public void increment() {
     public void rollback() {
         tx.rollback();
     }
-    
-    private void doCommit() {
+
+    public void doCommit() {
         tx.commit();
         tx.close();
         if (reporter!=null) reporter.progress("commit after " + count + " row(s) ");

core/src/main/java/apoc/export/csv/CsvEntityLoader.java

@@ -141,7 +141,7 @@ public void loadNodes(final Object fileName, final List<String> labels, final Gr
                     btx.increment();
                     reporter.update(1, 0, props++);
                 });
-                btx.commit();
+                btx.doCommit();
             } catch (RuntimeException e) {
                 btx.rollback();
                 throw e;
@@ -192,11 +192,11 @@ public void loadRelationships(
             try (final var csv = new CSVReaderBuilder(reader).withCSVParser(parser).build()) {
                 final String[] loadCsvCompatibleHeader = fields.stream().map(f -> f.getName()).toArray(String[]::new);
 
-            AtomicInteger lineNo = new AtomicInteger();
-            BatchTransaction btx = new BatchTransaction(db, clc.getBatchSize(), reporter);
-            try {
-                csv.forEach(line -> {
-                    lineNo.getAndIncrement();
+                AtomicInteger lineNo = new AtomicInteger();
+                BatchTransaction btx = new BatchTransaction(db, clc.getBatchSize(), reporter);
+                try {
+                    csv.forEach(line -> {
+                        lineNo.getAndIncrement();
 
                         final EnumSet<Results> results = EnumSet.of(Results.map);
                         final CSVResult result = new CSVResult(
@@ -226,23 +226,24 @@ public void loadRelationships(
                         }
                         final Relationship rel = source.createRelationshipTo(target, RelationshipType.withName(currentType));
 
-                    // add properties
-                    int props = 0;
-                    for (CsvHeaderField field : edgePropertiesFields) {
-                        final String name = field.getName();
-                        Object value = result.map.get(name);
-                        boolean propertyAdded = CsvPropertyConverter.addPropertyToGraphEntity(rel, field, value, clc);
-                        props += propertyAdded ? 1 : 0;
-                    }
-                    btx.increment();
-                    reporter.update(0, 1, props);
-                });
-                btx.commit();
-            } catch (RuntimeException e) {
-                btx.rollback();
-                throw e;
-            } finally {
-                btx.close();
+                        // add properties
+                        int props = 0;
+                        for (CsvHeaderField field : edgePropertiesFields) {
+                            final String name = field.getName();
+                            Object value = result.map.get(name);
+                            boolean propertyAdded = CsvPropertyConverter.addPropertyToGraphEntity(rel, field, value, clc);
+                            props += propertyAdded ? 1 : 0;
+                        }
+                        btx.increment();
+                        reporter.update(0, 1, props);
+                    });
+                    btx.doCommit();
+                } catch (RuntimeException e) {
+                    btx.rollback();
+                    throw e;
+                } finally {
+                    btx.close();
+                }
             }
         }
     }

core/src/main/java/apoc/export/graphml/XmlGraphMLReader.java

@@ -291,7 +291,7 @@ public long parseXML(Reader input) throws XMLStreamException {
                     }
                 }
             }
-            tx.commit();
+            tx.doCommit();
         } catch (Exception e) {
             tx.rollback();
             throw e;

core/src/test/java/apoc/export/csv/ImportCsvTest.java

@@ -245,7 +245,7 @@ public void issue2826WithImportCsv() {
                     (r) -> fail());
         } catch (RuntimeException e) {
             String expected = "Failed to invoke procedure `apoc.import.csv`: " +
-                    "Caused by: IndexEntryConflictException{propertyValues=( String(\"John\") ), addedNodeId=-1, existingNodeId=0}";
+                    "Caused by: IndexEntryConflictException{propertyValues=( String(\"John\") ), addedEntityId=-1, existingEntityId=0}";
             assertEquals(expected, e.getMessage());
         }