rename PropertyKeys -> Properties (to minify diff and mental context) (…

…#214) in odb's codegen these are calles Properties rather than PropertyKeys, so to minify the diff (and mental context) let's keep it that way
joernio · Jul 2, 2024 · 6dfa1cd · 6dfa1cd
1 parent ad79979
commit 6dfa1cd
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/core/src/test/scala/flatgraph/GraphTests.scala b/core/src/test/scala/flatgraph/GraphTests.scala
@@ -749,7 +749,7 @@ class GraphTests extends AnyWordSpec with Matchers {
   "node property accessors" in {
     val Node0Label = "V0"
 
-    // PropertyKeys - these are normally generated by the DomainClassesGenerator based on the schema
+    // Properties - these are normally generated by the DomainClassesGenerator based on the schema
     val propertySingle   = new SinglePropertyKey[String](kind = 0, name = "propertySingle", default = "propertySingleDefault")
     val propertyOptional = new OptionalPropertyKey[String](kind = 1, name = "propertyOptional")
     val propertyMulti    = new MultiPropertyKey[String](kind = 2, name = "propertyMulti")

diff --git a/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala b/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala
@@ -387,7 +387,7 @@ class DomainClassesGenerator(schema: Schema) {
         sourceLines.result().mkString("\n")
       }
 
-      val propertyKeys = {
+      val properties = {
         val sourceLines = Seq.newBuilder[String]
         nodeType.properties.map { property =>
           propertyKeySource(property, propertyKindByProperty(property))
@@ -518,8 +518,8 @@ class DomainClassesGenerator(schema: Schema) {
            |  object PropertyNames {
            |    $propertyNames
            |  }
-           |  object PropertyKeys {
-           |    $propertyKeys
+           |  object Properties {
+           |    $properties
            |  }
            |  object PropertyDefaults {
            |    $propertyDefaults
@@ -1121,12 +1121,12 @@ class DomainClassesGenerator(schema: Schema) {
         propertyKeySource(property, propertyKind = kindContexts.propertyKindByProperty(property))
       }
     }.mkString("\n\n")
-    val file = outputDir / "PropertyKeys.scala"
+    val file = outputDir / "Properties.scala"
     os.write(
       file,
       s"""package ${schema.basePackage}
          |
-         |object PropertyKeys {
+         |object Properties {
          |$propertyKeysConstantsSource
          |}""".stripMargin
     )

diff --git a/...la/testdomains/generic/PropertyKeys.scala → ...cala/testdomains/generic/Properties.scala b/...la/testdomains/generic/PropertyKeys.scala → ...cala/testdomains/generic/Properties.scala
@@ -1,6 +1,6 @@
 package testdomains.generic
 
-object PropertyKeys {
+object Properties {
   val IntList = flatgraph.MultiPropertyKey[Int](kind = 0, name = "int_list")
 
   val IntMandatory = flatgraph.SinglePropertyKey[Int](kind = 1, name = "int_mandatory", default = 42: Int)

diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/generic/nodes/NodeA.scala b/test-schemas-domain-classes/src/main/scala/testdomains/generic/nodes/NodeA.scala
@@ -48,7 +48,7 @@ object NodeA {
     val StringOptional = "string_optional"
     val NodeB          = "node_b"
   }
-  object PropertyKeys {
+  object Properties {
     val IntList         = flatgraph.MultiPropertyKey[Int](kind = 0, name = "int_list")
     val IntMandatory    = flatgraph.SinglePropertyKey[Int](kind = 1, name = "int_mandatory", default = 42: Int)
     val IntOptional     = flatgraph.OptionalPropertyKey[Int](kind = 2, name = "int_optional")

diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/generic/nodes/NodeB.scala b/test-schemas-domain-classes/src/main/scala/testdomains/generic/nodes/NodeB.scala
@@ -24,7 +24,7 @@ object NodeB {
 
     val StringOptional = "string_optional"
   }
-  object PropertyKeys {
+  object Properties {
     val StringOptional = flatgraph.OptionalPropertyKey[String](kind = 5, name = "string_optional")
   }
   object PropertyDefaults {}

diff --git a/...stdomains/gratefuldead/PropertyKeys.scala → ...testdomains/gratefuldead/Properties.scala b/...stdomains/gratefuldead/PropertyKeys.scala → ...testdomains/gratefuldead/Properties.scala
@@ -1,6 +1,6 @@
 package testdomains.gratefuldead
 
-object PropertyKeys {
+object Properties {
   val Name = flatgraph.SinglePropertyKey[String](kind = 0, name = "name", default = "")
 
   val Performances = flatgraph.OptionalPropertyKey[Int](kind = 1, name = "performances")

diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/nodes/Artist.scala b/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/nodes/Artist.scala
@@ -24,7 +24,7 @@ object Artist {
 
     val Name = "name"
   }
-  object PropertyKeys {
+  object Properties {
     val Name = flatgraph.SinglePropertyKey[String](kind = 0, name = "name", default = "")
   }
   object PropertyDefaults {

diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/nodes/Song.scala b/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/nodes/Song.scala
@@ -30,7 +30,7 @@ object Song {
 
     val Songtype = "songType"
   }
-  object PropertyKeys {
+  object Properties {
     val Name         = flatgraph.SinglePropertyKey[String](kind = 0, name = "name", default = "")
     val Performances = flatgraph.OptionalPropertyKey[Int](kind = 1, name = "performances")
     val Songtype     = flatgraph.OptionalPropertyKey[String](kind = 2, name = "songType")

diff --git a/...stdomains/hierarchical/PropertyKeys.scala → ...testdomains/hierarchical/Properties.scala b/...stdomains/hierarchical/PropertyKeys.scala → ...testdomains/hierarchical/Properties.scala
@@ -1,5 +1,5 @@
 package testdomains.hierarchical
 
-object PropertyKeys {
+object Properties {
   val Name = flatgraph.SinglePropertyKey[String](kind = 0, name = "name", default = "<empty>")
 }
diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/nodes/NodeX.scala b/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/nodes/NodeX.scala
@@ -24,7 +24,7 @@ object NodeX {
 
     val Name = "name"
   }
-  object PropertyKeys {
+  object Properties {
     val Name = flatgraph.SinglePropertyKey[String](kind = 0, name = "name", default = "<empty>")
   }
   object PropertyDefaults {

diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/nodes/NodeY.scala b/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/nodes/NodeY.scala
@@ -24,7 +24,7 @@ object NodeY {
 
     val Name = "name"
   }
-  object PropertyKeys {
+  object Properties {
     val Name = flatgraph.SinglePropertyKey[String](kind = 0, name = "name", default = "<empty>")
   }
   object PropertyDefaults {

diff --git a/tests/src/test/scala/flatgraph/GraphTests.scala b/tests/src/test/scala/flatgraph/GraphTests.scala
@@ -24,7 +24,7 @@ class GraphTests extends AnyWordSpec with MockFactory {
     val mockSchemaViolationReporter = mock[SchemaViolationReporter]
     mockSchemaViolationReporter.illegalNodeProperty.expects(nodeA.nodeKind: Int, "UNKNOWN", schema)
     mockSchemaViolationReporter.illegalNodeProperty.expects(nodeA.nodeKind: Int, 999, schema)
-    mockSchemaViolationReporter.illegalNodeProperty.expects(nodeB.nodeKind: Int, NodeA.PropertyKeys.IntOptional.kind, schema)
+    mockSchemaViolationReporter.illegalNodeProperty.expects(nodeB.nodeKind: Int, NodeA.Properties.IntOptional.kind, schema)
     mockSchemaViolationReporter.illegalNodeProperty.expects(nodeB.nodeKind: Int, 998, schema)
 
     val setProperties = new DiffGraphBuilder(schema, mockSchemaViolationReporter)

diff --git a/tests/src/test/scala/flatgraph/traversal/PathTraversalTests.scala b/tests/src/test/scala/flatgraph/traversal/PathTraversalTests.scala
@@ -124,7 +124,7 @@ class PathTraversalTests extends AnyWordSpec with FlatlineGraphFixture {
 
         center.start.enablePathTracking.out
           .sideEffectPF {
-            case node if node.property(NodeA.PropertyKeys.StringMandatory).startsWith("L") =>
+            case node if node.property(NodeA.Properties.StringMandatory).startsWith("L") =>
               sack.addOne(node)
           }
           .out

diff --git a/tests/src/test/scala/flatgraph/traversal/RepeatTraversalTests.scala b/tests/src/test/scala/flatgraph/traversal/RepeatTraversalTests.scala
@@ -4,7 +4,7 @@ import flatgraph.GNode
 import flatgraph.TestGraphs.FlatlineGraphFixture
 import testdomains.generic.GenericDomain
 import testdomains.generic.language.*
-import testdomains.generic.PropertyKeys.StringMandatory
+import testdomains.generic.Properties.StringMandatory
 import testdomains.generic.edges.ConnectedTo
 import testdomains.generic.nodes.{NewNodeA, NodeA}
 import org.scalatest.matchers.should.Matchers.*