fmt

joernio · Apr 29, 2024 · 8d535ea · 8d535ea
1 parent e5056f3
commit 8d535ea
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 33 deletions.
diff --git a/core/src/main/scala/flatgraph/Schema.scala b/core/src/main/scala/flatgraph/Schema.scala
@@ -187,9 +187,9 @@ class FreeSchema(
   override def getEdgePropertyName(label: String): Option[String]         = None
   override def getPropertyLabel(nodeKind: Int, propertyKind: Int): String = propertyLabels(propertyKind)
   override def getPropertyKindByName(label: String): Int                  = propMap.getOrElse(label, Schema.UndefinedKind)
-  override def getNodePropertyNames(nodeLabel: String): Set[String]       = propertyNamesByNodeLabel.getOrElse(nodeLabel, default = Set.empty)
-  override def getNumberOfPropertyKinds: Int                              = propertyLabels.length
-  override def makeNode(graph: Graph, nodeKind: Short, seq: Int): GNode   = new GNode(graph, nodeKind, seq)
+  override def getNodePropertyNames(nodeLabel: String): Set[String]     = propertyNamesByNodeLabel.getOrElse(nodeLabel, default = Set.empty)
+  override def getNumberOfPropertyKinds: Int                            = propertyLabels.length
+  override def makeNode(graph: Graph, nodeKind: Short, seq: Int): GNode = new GNode(graph, nodeKind, seq)
   override def makeEdge(src: GNode, dst: GNode, edgeKind: Short, subSeq: Int, property: Any): Edge =
     new Edge(src, dst, edgeKind, subSeq, property)
 

diff --git a/core/src/main/scala/flatgraph/storage/Deserialization.scala b/core/src/main/scala/flatgraph/storage/Deserialization.scala
@@ -99,12 +99,12 @@ object Deserialization {
   }
 
   private def freeSchemaFromManifest(manifest: Manifest.GraphItem): FreeSchema = {
-    val nodeLabels    = manifest.nodes.map { n => n.nodeLabel }
-    val nodePropNames = mutable.LinkedHashMap.empty[String, AnyRef]
+    val nodeLabels               = manifest.nodes.map { n => n.nodeLabel }
+    val nodePropNames            = mutable.LinkedHashMap.empty[String, AnyRef]
     val propertyNamesByNodeLabel = mutable.LinkedHashMap.empty[String, Set[String]]
     for (prop <- manifest.properties) {
       propertyNamesByNodeLabel.updateWith(prop.nodeLabel) {
-        case None => Some(Set(prop.propertyLabel))
+        case None             => Some(Set(prop.propertyLabel))
         case Some(oldEntries) => Some(oldEntries + prop.propertyLabel)
       }
       nodePropNames(prop.propertyLabel) = protoFromOutline(prop.property)

diff --git a/formats-tests/src/test/scala/flatgraph/formats/neo4jcsv/Neo4jCsvTests.scala b/formats-tests/src/test/scala/flatgraph/formats/neo4jcsv/Neo4jCsvTests.scala
@@ -5,7 +5,6 @@ import flatgraph.DiffGraphApplier
 import org.scalatest.matchers.should.Matchers.*
 import org.scalatest.wordspec.AnyWordSpec
 import flatgraph.formats.{ExportResult, ExporterMain, ImporterMain}
-import flatgraph.traversal.*
 import flatgraph.util.DiffTool
 import flatgraph.testdomains.generic.GenericDomain
 import flatgraph.testdomains.generic.Language.*
@@ -14,7 +13,7 @@ import flatgraph.testdomains.generic.nodes.{NewNodeA, NodeA}
 
 import java.io.FileNotFoundException
 import java.nio.file.Paths
-import scala.jdk.CollectionConverters.{CollectionHasAsScala, IterableHasAsJava, IteratorHasAsScala}
+import scala.jdk.CollectionConverters.CollectionHasAsScala
 
 class Neo4jCsvTests extends AnyWordSpec {
   val subprojectRoot = testutils.ProjectRoot.relativise("formats-tests")
@@ -96,15 +95,13 @@ class Neo4jCsvTests extends AnyWordSpec {
 
   "Importer" should {
     "import valid csv" in {
-      val csvInputFiles = Seq(
-        "edges_connected_to_header.csv",
-        "edges_connected_to_data.csv",
-        "nodes_node_a_header.csv",
-        "nodes_node_a_data.csv"
-      ).map(neo4jcsvRoot.resolve)
+      val csvInputFiles =
+        Seq("edges_connected_to_header.csv", "edges_connected_to_data.csv", "nodes_node_a_header.csv", "nodes_node_a_data.csv").map(
+          neo4jcsvRoot.resolve
+        )
 
       val genericDomain = GenericDomain.empty
-      val graph = genericDomain.graph
+      val graph         = genericDomain.graph
       Neo4jCsvImporter.runImport(graph, csvInputFiles)
 
       graph.nodeCount shouldBe 2
@@ -132,10 +129,7 @@ class Neo4jCsvTests extends AnyWordSpec {
     }
 
     "fail if multiple labels are used (unsupported by flatgraph)" in {
-      val csvInputFiles = Seq(
-        "unsupported_multiple_labels_header.csv",
-        "unsupported_multiple_labels_data.csv"
-      ).map(neo4jcsvRoot.resolve)
+      val csvInputFiles = Seq("unsupported_multiple_labels_header.csv", "unsupported_multiple_labels_data.csv").map(neo4jcsvRoot.resolve)
 
       val graph = GenericDomain.empty.graph
       intercept[NotImplementedError] {
@@ -144,10 +138,7 @@ class Neo4jCsvTests extends AnyWordSpec {
     }
 
     "fail if input file doesn't exist" in {
-      val csvInputFiles = Seq(
-        "does_not_exist_header.csv",
-        "does_not_exist_data.csv"
-      ).map(neo4jcsvRoot.resolve)
+      val csvInputFiles = Seq("does_not_exist_header.csv", "does_not_exist_data.csv").map(neo4jcsvRoot.resolve)
 
       val graph = GenericDomain.empty.graph
       intercept[FileNotFoundException] {
@@ -156,10 +147,7 @@ class Neo4jCsvTests extends AnyWordSpec {
     }
 
     "fail with context information (line number etc.) for invalid input" in {
-      val csvInputFiles = Seq(
-        "invalid_column_content_header.csv",
-        "invalid_column_content_data.csv"
-      ).map(neo4jcsvRoot.resolve)
+      val csvInputFiles = Seq("invalid_column_content_header.csv", "invalid_column_content_data.csv").map(neo4jcsvRoot.resolve)
 
       val graph = GenericDomain.empty.graph
       intercept[RuntimeException] {
@@ -170,8 +158,8 @@ class Neo4jCsvTests extends AnyWordSpec {
 
   "main apps for cli export/import" in {
     File.usingTemporaryDirectory(getClass.getName) { tmpDir =>
-      val graphPath = tmpDir / "original.fg"
-      val exportPath = tmpDir / "export"
+      val graphPath     = tmpDir / "original.fg"
+      val exportPath    = tmpDir / "export"
       val genericDomain = GenericDomain.withStorage(graphPath.path)
 
       val node1 = NewNodeA().stringMandatory("node 2 a").stringOptional("node 2 b").stringList(Seq("node 3 c1", "node 3 c2"))
@@ -190,8 +178,8 @@ class Neo4jCsvTests extends AnyWordSpec {
       exportedFiles.size shouldBe 6
 
       // use importer for round trip
-      val importerMain = ImporterMain(flatgraph.testdomains.generic.GraphSchema)
-      val reimportPath = tmpDir / "reimported.fg"
+      val importerMain       = ImporterMain(flatgraph.testdomains.generic.GraphSchema)
+      val reimportPath       = tmpDir / "reimported.fg"
       val relevantInputFiles = exportedFiles.filterNot(_.name.contains(CypherFileSuffix)).map(_.pathAsString)
       importerMain(Array("--format=neo4jcsv", s"--out=${reimportPath.pathAsString}") ++ relevantInputFiles)
 

diff --git a/test-schemas-domain-classes/src/main/scala/flatgraph/testdomains/generic/GraphSchema.scala b/test-schemas-domain-classes/src/main/scala/flatgraph/testdomains/generic/GraphSchema.scala
@@ -53,7 +53,7 @@ object GraphSchema extends flatgraph.Schema {
   override def getNodeKindByLabel(label: String): Int             = nodeKindByLabel.getOrElse(label, flatgraph.Schema.UndefinedKind)
   override def getEdgeLabel(nodeKind: Int, edgeKind: Int): String = edgeLabels(edgeKind)
   override def getEdgeKindByLabel(label: String): Int             = edgeKindByLabel.getOrElse(label, flatgraph.Schema.UndefinedKind)
-  def getNodePropertyNames(nodeLabel: String): Set[String] = {
+  override def getNodePropertyNames(nodeLabel: String): Set[String] = {
     nodeLabel match {
       case "node_a" =>
         Set("int_list", "int_mandatory", "int_optional", "string_list", "string_mandatory", "string_optional")

diff --git a/...chemas-domain-classes/src/main/scala/flatgraph/testdomains/gratefuldead/GraphSchema.scala b/...chemas-domain-classes/src/main/scala/flatgraph/testdomains/gratefuldead/GraphSchema.scala
@@ -44,7 +44,7 @@ object GraphSchema extends flatgraph.Schema {
   override def getNodeKindByLabel(label: String): Int             = nodeKindByLabel.getOrElse(label, flatgraph.Schema.UndefinedKind)
   override def getEdgeLabel(nodeKind: Int, edgeKind: Int): String = edgeLabels(edgeKind)
   override def getEdgeKindByLabel(label: String): Int             = edgeKindByLabel.getOrElse(label, flatgraph.Schema.UndefinedKind)
-  def getNodePropertyNames(nodeLabel: String): Set[String] = {
+  override def getNodePropertyNames(nodeLabel: String): Set[String] = {
     nodeLabel match {
       case "artist" => Set("name")
       case "song"   => Set("name", "songType")