spline #831 clean up: remove redundant OperationID type alias

AbsaOSS · Apr 6, 2021 · 15ef71e · 15ef71e
1 parent 9f0e692
commit 15ef71e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/...umer-services/src/main/scala/za/co/absa/spline/consumer/service/model/AttributeNode.scala b/...umer-services/src/main/scala/za/co/absa/spline/consumer/service/model/AttributeNode.scala
@@ -17,7 +17,6 @@
 package za.co.absa.spline.consumer.service.model
 
 import io.swagger.annotations.{ApiModel, ApiModelProperty}
-import za.co.absa.spline.consumer.service.model.LineageDetailed.OperationID
 
 @ApiModel(description = "Attribute Node")
 case class AttributeNode
@@ -29,10 +28,10 @@ case class AttributeNode
   name: String,
 
   @ApiModelProperty(value = "Operation Id in which the attribute was created")
-  originOpId: OperationID,
+  originOpId: Operation.Id,
 
   @ApiModelProperty(value = "Operation Ids which the attribute passes through")
-  transOpIds: Seq[OperationID]
+  transOpIds: Seq[Operation.Id]
 
 ) extends Graph.Node {
   def this() = this(null, null, null, null)

diff --git a/...er-services/src/main/scala/za/co/absa/spline/consumer/service/model/LineageDetailed.scala b/...er-services/src/main/scala/za/co/absa/spline/consumer/service/model/LineageDetailed.scala
@@ -28,7 +28,3 @@ case class LineageDetailed(
 ) {
   def this() = this(null, null)
 }
-
-object LineageDetailed {
-  type OperationID = String
-}
diff --git a/consumer-services/src/main/scala/za/co/absa/spline/consumer/service/model/Operation.scala b/consumer-services/src/main/scala/za/co/absa/spline/consumer/service/model/Operation.scala
@@ -17,25 +17,25 @@
 package za.co.absa.spline.consumer.service.model
 
 import io.swagger.annotations.{ApiModel, ApiModelProperty}
-import za.co.absa.spline.consumer.service.model.LineageDetailed.OperationID
 
 @ApiModel(description = "Operation")
 case class Operation
 (
   @ApiModelProperty(value = "Operation Id")
-  _id: OperationID,
+  _id: Operation.Id,
   @ApiModelProperty(value = "Type of the operation", example = "Read / Transformation / Write")
-  `type`: String,
+  `type`: Operation.Type,
   @ApiModelProperty(value = "Name of the operation")
-  name: String,
+  name: Option[String],
   @ApiModelProperty(value = "Properties of the operation")
   properties: Map[String, Any]
 ) extends Graph.Node {
-  override type Id = OperationID
+  override type Id = Operation.Id
 
   def this() = this(null, null, null, null)
 }
 
 object Operation {
   type Id = String
+  type Type = String // Read / Transformation / Write
 }
diff --git a/consumer-services/src/main/scala/za/co/absa/spline/consumer/service/model/Transition.scala b/consumer-services/src/main/scala/za/co/absa/spline/consumer/service/model/Transition.scala
@@ -17,17 +17,16 @@
 package za.co.absa.spline.consumer.service.model
 
 import io.swagger.annotations.{ApiModel, ApiModelProperty}
-import za.co.absa.spline.consumer.service.model.LineageDetailed.OperationID
 
 @ApiModel(description="Link between operations")
 case class Transition
 (
   @ApiModelProperty(value = "Source Operation")
-  source: OperationID,
+  source: Operation.Id,
   @ApiModelProperty(value = "Target Operation")
-  target: OperationID
+  target: Operation.Id
 ) extends Graph.Edge {
   def this() = this(null, null)
 
-  override type JointId = OperationID
+  override type JointId = Operation.Id
 }