Skip to content

Commit 7afcf8b

Browse files
committed
flatgraph migration: promote neighbor accessors (remove _ prefix)
1 parent 5042694 commit 7afcf8b

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

codegen/src/main/scala/overflowdb/codegen/CodeGen.scala

+17-3
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ class CodeGen(schema: Schema) {
539539
val entireNodeHierarchy: Set[AbstractNodeType] = neighbor.subtypes(schema.allNodeTypes.toSet) ++ (neighbor.extendzRecursively :+ neighbor)
540540
entireNodeHierarchy.map { neighbor =>
541541
val accessorName = adjacentNode.customStepName.getOrElse(
542-
s"_${camelCase(neighbor.name)}Via${edge.className.capitalize}${camelCaseCaps(direction.toString)}"
542+
s"${camelCase(neighbor.name)}Via${edge.className.capitalize}${camelCaseCaps(direction.toString)}"
543543
)
544544
val accessorImpl0 = s"$edgeAccessorName.collectAll[${neighbor.className}]"
545545
val cardinality = adjacentNode.cardinality
@@ -558,6 +558,10 @@ class CodeGen(schema: Schema) {
558558
| */ ${docAnnotationMaybe(adjacentNode.customStepDoc)}
559559
|def $accessorName: ${fullScalaType(neighbor, cardinality)} =
560560
| $accessorImpl1
561+
|
562+
|@deprecated("please use `$accessorName`", "June 2024")
563+
|def _$accessorName = $accessorName
564+
|
561565
| """.stripMargin
562566
}
563567
}.distinct.mkString(lineSeparator)
@@ -1013,9 +1017,14 @@ class CodeGen(schema: Schema) {
10131017
s"""/** ${neighborNodeInfo.customStepDoc.getOrElse("")}
10141018
| * Traverse to ${neighborNodeInfo.neighborNode.name} via ${neighborNodeInfo.edge.name} $direction edge.
10151019
| */ ${docAnnotationMaybe(neighborNodeInfo.customStepDoc)}
1016-
|def $accessorNameForNode: ${neighborNodeInfo.returnType} = get().$accessorNameForNode""".stripMargin
1020+
|def $accessorNameForNode: ${neighborNodeInfo.returnType} = get().$accessorNameForNode
1021+
|
1022+
|@deprecated("please use `$accessorNameForNode`", "June 2024")
1023+
|def _$accessorNameForNode = $accessorNameForNode
1024+
|""".stripMargin
10171025
}.mkString(lineSeparator)
10181026

1027+
10191028
val neighborNodeClass = neighborInfo.deriveNeighborNodeType.getOrElse(schema.anyNode).className
10201029
s"""def $edgeAccessorName: Iterator[$neighborNodeClass] = get().$edgeAccessorName
10211030
|override def _$edgeAccessorName = get()._$edgeAccessorName
@@ -1090,11 +1099,16 @@ class CodeGen(schema: Schema) {
10901099
case EdgeType.Cardinality.ZeroOrOne => s"$accessorImpl0.nextOption()"
10911100
case _ => accessorImpl0
10921101
}
1093-
s"def ${accessorName(neighborNodeInfo)}: ${neighborNodeInfo.returnType} = $accessorImpl1"
1102+
val accessorNameForNode = accessorName(neighborNodeInfo)
1103+
s"""@deprecated("please use `$accessorNameForNode`", "June 2024")
1104+
|def _$accessorNameForNode = $accessorNameForNode
1105+
|
1106+
|def $accessorNameForNode: ${neighborNodeInfo.returnType} = $accessorImpl1""".stripMargin
10941107
}.mkString(lineSeparator)
10951108

10961109
s"""def $edgeAccessorName: Iterator[$neighborType] = createAdjacentNodeScalaIteratorByOffSet[$neighborType]($offsetPosition)
10971110
|override def _$edgeAccessorName = createAdjacentNodeScalaIteratorByOffSet[StoredNode]($offsetPosition)
1111+
|
10981112
|$nodeAccessors
10991113
|""".stripMargin
11001114
}.mkString(lineSeparator)

0 commit comments

Comments
 (0)