From d5a3d18e8834a9c7bf1aaeb6200d9bcef8be6959 Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Thu, 27 Jun 2024 15:06:29 +0200 Subject: [PATCH] add prefix to technical accessors, just like we used to in odb (#211) --- .../codegen/DomainClassesGenerator.scala | 2 +- .../generic/neighboraccessors/NodeA.scala | 8 ++++---- .../gratefuldead/neighboraccessors/Artist.scala | 8 ++++---- .../gratefuldead/neighboraccessors/Song.scala | 16 ++++++++-------- .../neighboraccessors/BaseNode.scala | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala b/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala index 8aeab63f..43d034f6 100644 --- a/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala +++ b/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala @@ -1118,7 +1118,7 @@ class DomainClassesGenerator(schema: Schema) { val neighborContexts = adjacentNodes.map { adjacentNode => val scaladoc = s"""/** ${adjacentNode.customStepDoc.getOrElse("")} | * Traverse to ${adjacentNode.neighbor.name} via ${edge.name} $direction edge. */""".stripMargin - val defaultMethodName = camelCase(s"${adjacentNode.neighbor.name}_Via_${edge.name}_$direction") + val defaultMethodName = "_" + camelCase(s"${adjacentNode.neighbor.name}_Via_${edge.name}_$direction") NeighborContext(adjacentNode, scaladoc, defaultMethodName, adjacentNode.customStepName) } NeighborContextsByEdge(direction, edge, neighborContexts) diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/generic/neighboraccessors/NodeA.scala b/test-schemas-domain-classes/src/main/scala/testdomains/generic/neighboraccessors/NodeA.scala index 9b733867..de0d9ae7 100644 --- a/test-schemas-domain-classes/src/main/scala/testdomains/generic/neighboraccessors/NodeA.scala +++ b/test-schemas-domain-classes/src/main/scala/testdomains/generic/neighboraccessors/NodeA.scala @@ -7,12 +7,12 @@ final class AccessNeighborsForNodeA(val node: nodes.NodeA) extends AnyVal { /** Traverse to node_a via connected_to IN edge. */ - def nodeAViaConnectedToIn: Iterator[nodes.NodeA] = connectedToIn.collectAll[nodes.NodeA] + def _nodeAViaConnectedToIn: Iterator[nodes.NodeA] = connectedToIn.collectAll[nodes.NodeA] /** Connected neighbor node Traverse to node_a via connected_to OUT edge. */ @deprecated("please use connectedTo instead") - def nodeAViaConnectedToOut: Iterator[nodes.NodeA] = connectedTo + def _nodeAViaConnectedToOut: Iterator[nodes.NodeA] = connectedTo /** Connected neighbor node Traverse to node_a via connected_to OUT edge. */ @@ -27,7 +27,7 @@ final class AccessNeighborsForNodeATraversal(val traversal: Iterator[nodes.NodeA /** Traverse to node_a via connected_to IN edge. */ - def nodeAViaConnectedToIn: Iterator[nodes.NodeA] = traversal.flatMap(_.nodeAViaConnectedToIn) + def _nodeAViaConnectedToIn: Iterator[nodes.NodeA] = traversal.flatMap(_._nodeAViaConnectedToIn) /** Connected neighbor node Traverse to node_a via connected_to OUT edge. */ @@ -36,7 +36,7 @@ final class AccessNeighborsForNodeATraversal(val traversal: Iterator[nodes.NodeA /** Connected neighbor node Traverse to node_a via connected_to OUT edge. */ @deprecated("please use connectedTo instead") - def nodeAViaConnectedToOut: Iterator[nodes.NodeA] = traversal.flatMap(_.nodeAViaConnectedToOut) + def _nodeAViaConnectedToOut: Iterator[nodes.NodeA] = traversal.flatMap(_._nodeAViaConnectedToOut) def connectedToIn: Iterator[nodes.NodeA] = traversal.flatMap(_.connectedToIn) diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Artist.scala b/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Artist.scala index b749bc2d..8cc080ba 100644 --- a/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Artist.scala +++ b/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Artist.scala @@ -8,7 +8,7 @@ final class AccessNeighborsForArtist(val node: nodes.Artist) extends AnyVal { /** Traverse to song via sungBy IN edge. */ @deprecated("please use sang instead") - def songViaSungbyIn: Iterator[nodes.Song] = sang + def _songViaSungbyIn: Iterator[nodes.Song] = sang /** Traverse to song via sungBy IN edge. */ @@ -17,7 +17,7 @@ final class AccessNeighborsForArtist(val node: nodes.Artist) extends AnyVal { /** Traverse to song via writtenBy IN edge. */ @deprecated("please use wrote instead") - def songViaWrittenbyIn: Iterator[nodes.Song] = wrote + def _songViaWrittenbyIn: Iterator[nodes.Song] = wrote /** Traverse to song via writtenBy IN edge. */ @@ -37,7 +37,7 @@ final class AccessNeighborsForArtistTraversal(val traversal: Iterator[nodes.Arti /** Traverse to song via sungBy IN edge. */ @deprecated("please use sang instead") - def songViaSungbyIn: Iterator[nodes.Song] = traversal.flatMap(_.songViaSungbyIn) + def _songViaSungbyIn: Iterator[nodes.Song] = traversal.flatMap(_._songViaSungbyIn) /** Traverse to song via writtenBy IN edge. */ @@ -46,7 +46,7 @@ final class AccessNeighborsForArtistTraversal(val traversal: Iterator[nodes.Arti /** Traverse to song via writtenBy IN edge. */ @deprecated("please use wrote instead") - def songViaWrittenbyIn: Iterator[nodes.Song] = traversal.flatMap(_.songViaWrittenbyIn) + def _songViaWrittenbyIn: Iterator[nodes.Song] = traversal.flatMap(_._songViaWrittenbyIn) def sungbyIn: Iterator[nodes.Song] = traversal.flatMap(_.sungbyIn) diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Song.scala b/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Song.scala index 7aeedbb3..e269c42a 100644 --- a/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Song.scala +++ b/test-schemas-domain-classes/src/main/scala/testdomains/gratefuldead/neighboraccessors/Song.scala @@ -8,7 +8,7 @@ final class AccessNeighborsForSong(val node: nodes.Song) extends AnyVal { /** Traverse to artist via sungBy OUT edge. */ @deprecated("please use sungBy instead") - def artistViaSungbyOut: Iterator[nodes.Artist] = sungBy + def _artistViaSungbyOut: Iterator[nodes.Artist] = sungBy /** Traverse to artist via sungBy OUT edge. */ @@ -17,7 +17,7 @@ final class AccessNeighborsForSong(val node: nodes.Song) extends AnyVal { /** Traverse to artist via writtenBy OUT edge. */ @deprecated("please use writtenBy instead") - def artistViaWrittenbyOut: Iterator[nodes.Artist] = writtenBy + def _artistViaWrittenbyOut: Iterator[nodes.Artist] = writtenBy /** Traverse to artist via writtenBy OUT edge. */ @@ -25,12 +25,12 @@ final class AccessNeighborsForSong(val node: nodes.Song) extends AnyVal { /** Traverse to song via followedBy IN edge. */ - def songViaFollowedbyIn: Iterator[nodes.Song] = followedbyIn.collectAll[nodes.Song] + def _songViaFollowedbyIn: Iterator[nodes.Song] = followedbyIn.collectAll[nodes.Song] /** Traverse to song via followedBy OUT edge. */ @deprecated("please use followedBy instead") - def songViaFollowedbyOut: Iterator[nodes.Song] = followedBy + def _songViaFollowedbyOut: Iterator[nodes.Song] = followedBy /** Traverse to song via followedBy OUT edge. */ @@ -54,7 +54,7 @@ final class AccessNeighborsForSongTraversal(val traversal: Iterator[nodes.Song]) /** Traverse to artist via sungBy OUT edge. */ @deprecated("please use sungBy instead") - def artistViaSungbyOut: Iterator[nodes.Artist] = traversal.flatMap(_.artistViaSungbyOut) + def _artistViaSungbyOut: Iterator[nodes.Artist] = traversal.flatMap(_._artistViaSungbyOut) /** Traverse to artist via writtenBy OUT edge. */ @@ -63,11 +63,11 @@ final class AccessNeighborsForSongTraversal(val traversal: Iterator[nodes.Song]) /** Traverse to artist via writtenBy OUT edge. */ @deprecated("please use writtenBy instead") - def artistViaWrittenbyOut: Iterator[nodes.Artist] = traversal.flatMap(_.artistViaWrittenbyOut) + def _artistViaWrittenbyOut: Iterator[nodes.Artist] = traversal.flatMap(_._artistViaWrittenbyOut) /** Traverse to song via followedBy IN edge. */ - def songViaFollowedbyIn: Iterator[nodes.Song] = traversal.flatMap(_.songViaFollowedbyIn) + def _songViaFollowedbyIn: Iterator[nodes.Song] = traversal.flatMap(_._songViaFollowedbyIn) /** Traverse to song via followedBy OUT edge. */ @@ -76,7 +76,7 @@ final class AccessNeighborsForSongTraversal(val traversal: Iterator[nodes.Song]) /** Traverse to song via followedBy OUT edge. */ @deprecated("please use followedBy instead") - def songViaFollowedbyOut: Iterator[nodes.Song] = traversal.flatMap(_.songViaFollowedbyOut) + def _songViaFollowedbyOut: Iterator[nodes.Song] = traversal.flatMap(_._songViaFollowedbyOut) def followedbyIn: Iterator[nodes.Song] = traversal.flatMap(_.followedbyIn) diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/neighboraccessors/BaseNode.scala b/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/neighboraccessors/BaseNode.scala index 164e8936..f15784e2 100644 --- a/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/neighboraccessors/BaseNode.scala +++ b/test-schemas-domain-classes/src/main/scala/testdomains/hierarchical/neighboraccessors/BaseNode.scala @@ -7,12 +7,12 @@ final class AccessNeighborsForBaseNode(val node: nodes.BaseNode) extends AnyVal /** Traverse to base_node via connected_to IN edge. */ - def baseNodeViaConnectedToIn: Iterator[nodes.BaseNode] = connectedToIn.collectAll[nodes.BaseNode] + def _baseNodeViaConnectedToIn: Iterator[nodes.BaseNode] = connectedToIn.collectAll[nodes.BaseNode] /** Traverse to base_node via connected_to OUT edge. */ @deprecated("please use connectedTo instead") - def baseNodeViaConnectedToOut: Iterator[nodes.BaseNode] = connectedTo + def _baseNodeViaConnectedToOut: Iterator[nodes.BaseNode] = connectedTo /** Traverse to base_node via connected_to OUT edge. */ @@ -27,7 +27,7 @@ final class AccessNeighborsForBaseNodeTraversal(val traversal: Iterator[nodes.Ba /** Traverse to base_node via connected_to IN edge. */ - def baseNodeViaConnectedToIn: Iterator[nodes.BaseNode] = traversal.flatMap(_.baseNodeViaConnectedToIn) + def _baseNodeViaConnectedToIn: Iterator[nodes.BaseNode] = traversal.flatMap(_._baseNodeViaConnectedToIn) /** Traverse to base_node via connected_to OUT edge. */ @@ -36,7 +36,7 @@ final class AccessNeighborsForBaseNodeTraversal(val traversal: Iterator[nodes.Ba /** Traverse to base_node via connected_to OUT edge. */ @deprecated("please use connectedTo instead") - def baseNodeViaConnectedToOut: Iterator[nodes.BaseNode] = traversal.flatMap(_.baseNodeViaConnectedToOut) + def _baseNodeViaConnectedToOut: Iterator[nodes.BaseNode] = traversal.flatMap(_._baseNodeViaConnectedToOut) def connectedToIn: Iterator[nodes.BaseNode] = traversal.flatMap(_.connectedToIn)