Merge pull request #5878 from soerenreichardt/2.1-graph-csv-io-cleanup

Csv and IO module cleanup

Author: soerenreichardt

csv/src/main/java/org/neo4j/gds/core/utils/io/file/GraphStoreToFileExporter.java

@@ -0,0 +1,40 @@
+apply plugin: 'java-library'
+
+description = 'Neo4j Graph Data Science :: I/O Core'
+
+group = 'org.neo4j.gds'
+
+dependencies {
+    annotationProcessor project(':annotations')
+    annotationProcessor project(':config-generator')
+
+    annotationProcessor group: 'org.immutables',           name: 'builder',            version: ver.'immutables'
+    annotationProcessor group: 'org.immutables',           name: 'value',              version: ver.'immutables'
+
+    compileOnly         group: 'org.immutables',           name: 'builder',            version: ver.'immutables'
+    compileOnly         group: 'org.immutables',           name: 'value-annotations',  version: ver.'immutables'
+    compileOnly         group: 'org.jetbrains',            name: 'annotations',        version: ver.'jetbrains-annotations'
+
+    implementation project(':annotations')
+    implementation project(':config-api')
+    implementation project(':core')
+    implementation project(':graph-schema-api')
+    implementation project(':memory-usage')
+    implementation project(':neo4j-kernel-adapter')
+    implementation project(':string-formatting')
+    implementation project(':subgraph-filtering')
+    implementation project(':transaction')
+
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: ver.'jackson'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-csv', version: ver.'jackson'
+    implementation group: 'de.siegmar', name: 'fastcsv', version: ver.'fastcsv'
+    implementation group: 'org.opencypher', name: 'cypher-javacc-parser-9.0', version: ver.'opencypher-front-end', transitive: false
+
+    neodeps().each {
+        compileOnly(group: 'org.neo4j', name: it, version: ver.'neo4j') {
+            transitive = false
+        }
+    }
+
+    testImplementation project(':test-utils')
+}

io/core/build.gradle

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.gds.core.utils.io;
+package org.neo4j.gds.core.io;
 
 import org.neo4j.common.Validator;
 import org.neo4j.gds.annotation.ValueClass;

core/src/main/java/org/neo4j/gds/core/utils/io/GraphStoreExporter.java renamed to io/core/src/main/java/org/neo4j/gds/core/io/GraphStoreExporter.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.gds.core.utils.io;
+package org.neo4j.gds.core.io;
 
 import org.immutables.value.Value;
 import org.neo4j.gds.RelationshipType;

core/src/main/java/org/neo4j/gds/core/utils/io/GraphStoreExporterBaseConfig.java renamed to io/core/src/main/java/org/neo4j/gds/core/io/GraphStoreExporterBaseConfig.java

@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.gds.core.utils.io;
+package org.neo4j.gds.core.io;
 
 import org.neo4j.gds.RelationshipType;
 import org.neo4j.gds.api.CompositeRelationshipIterator;
 import org.neo4j.gds.api.IdMap;
 import org.neo4j.gds.compat.CompatInput;
 import org.neo4j.gds.compat.CompatPropertySizeCalculator;
+import org.neo4j.gds.core.io.GraphStoreExporter.IdMapFunction;
 import org.neo4j.gds.core.loading.Capabilities;
-import org.neo4j.gds.core.utils.io.GraphStoreExporter.IdMapFunction;
 import org.neo4j.internal.batchimport.InputIterable;
 import org.neo4j.internal.batchimport.InputIterator;
 import org.neo4j.internal.batchimport.cache.idmapping.string.LongEncoder;
@@ -343,11 +343,11 @@ public boolean next(InputEntityVisitor visitor) throws IOException {
                         }
                     }
                 } else if (hasProperties) { // no label information, but node properties
-                    nodeStore.nodeProperties.forEach((label, nodeProperties) -> {
-                        nodeProperties.forEach((propertyKey, properties) -> {
-                            exportProperty(visitor, propertyKey, properties::getObject);
-                        });
-                    });
+                    nodeStore.nodeProperties.forEach((label, nodeProperties) -> nodeProperties.forEach((propertyKey, properties) -> exportProperty(
+                        visitor,
+                        propertyKey,
+                        properties::getObject
+                    )));
                 }
 
                 nodeStore.additionalProperties.forEach((propertyKey, propertyFn) -> {