spline #831 - rename "appName" back to "name"

AbsaOSS · Apr 6, 2021 · 98bda85 · 98bda85
1 parent 8508e13
commit 98bda85
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/persistence/src/main/resources/foxx/spline/services/lineage-overview.js b/persistence/src/main/resources/foxx/spline/services/lineage-overview.js
@@ -98,7 +98,7 @@ function eventLineageOverviewGraph(startEvent, maxDepth) {
                         : {
                             "_id": vert._key,
                             "_class": "za.co.absa.spline.consumer.service.model.ExecutionNode",
-                            "name": vert.appName
+                            "name": vert.name
                         }
             )
             

diff --git a/persistence/src/main/scala/za/co/absa/spline/persistence/model/entities.scala b/persistence/src/main/scala/za/co/absa/spline/persistence/model/entities.scala
@@ -100,15 +100,15 @@ object DataSource {
   * from the inputs to the output.
   */
 case class ExecutionPlan(
-  appName: Option[ExecutionPlan.AppName],
+  name: Option[ExecutionPlan.Name],
   systemInfo: Map[String, Any],
   agentInfo: Map[String, Any],
   extra: Map[String, Any],
   override val _key: ArangoDocument.Key
 ) extends Vertex with RootEntity
 
 object ExecutionPlan {
-  type AppName = String
+  type Name = String
 }
 
 /**

diff --git a/...la/za/co/absa/spline/producer/modelmapper/v1/ExecutionPlanComponentConverterFactory.scala b/...la/za/co/absa/spline/producer/modelmapper/v1/ExecutionPlanComponentConverterFactory.scala
@@ -24,7 +24,7 @@ import za.co.absa.spline.producer.{model => v1}
 import scala.PartialFunction.condOpt
 
 trait ExecutionPlanComponentConverterFactory {
-  def appNameExtractor: v1.ExecutionPlan => Option[v1_1.ExecutionPlan.AppName]
+  def execPlanNameExtractor: v1.ExecutionPlan => Option[v1_1.ExecutionPlan.Name]
   def attributeConverter: Option[CachingConverter {type To = v1_1.Attribute}]
   def expressionConverter: Option[CachingConverter {type To = v1_1.ExpressionLike}]
   def outputConverter: Option[OperationOutputConverter]
@@ -34,7 +34,7 @@ trait ExecutionPlanComponentConverterFactory {
 object ExecutionPlanComponentConverterFactory {
 
   object EmptyFactory extends ExecutionPlanComponentConverterFactory {
-    override def appNameExtractor: v1.ExecutionPlan => Option[v1_1.ExecutionPlan.AppName] = _ => None
+    override def execPlanNameExtractor: v1.ExecutionPlan => Option[v1_1.ExecutionPlan.Name] = _ => None
 
     override def attributeConverter: Option[AttributeConverter with CachingConverter] = None
 

diff --git a/...model-mapper/src/main/scala/za/co/absa/spline/producer/modelmapper/v1/ModelMapperV1.scala b/...model-mapper/src/main/scala/za/co/absa/spline/producer/modelmapper/v1/ModelMapperV1.scala
@@ -43,7 +43,7 @@ object ModelMapperV1 extends ModelMapper {
     val maybeExpressionConverter = epccf.expressionConverter
     val maybeOutputConverter = epccf.outputConverter
     val objectConverter = epccf.objectConverter
-    val planNameExtractor = epccf.appNameExtractor
+    val planNameExtractor = epccf.execPlanNameExtractor
 
     val operationConverter = new OperationConverter(objectConverter, maybeOutputConverter) with CachingConverter
 
@@ -63,7 +63,7 @@ object ModelMapperV1 extends ModelMapper {
 
     ExecutionPlan(
       id = plan1.id,
-      appName = planNameExtractor(plan1),
+      name = planNameExtractor(plan1),
       operations = operations,
       attributes = attributes,
       expressions = maybeExpressions,

diff --git a/...ine/producer/modelmapper/v1/spark/SparkSplineExecutionPlanComponentConverterFactory.scala b/...ine/producer/modelmapper/v1/spark/SparkSplineExecutionPlanComponentConverterFactory.scala
@@ -27,7 +27,7 @@ import scala.util.Try
 
 class SparkSplineExecutionPlanComponentConverterFactory(agentVersion: String, plan1: v1.ExecutionPlan) extends ExecutionPlanComponentConverterFactory {
 
-  override def appNameExtractor: v1.ExecutionPlan => Option[v1_1.ExecutionPlan.AppName] = _.extraInfo.get(FieldNamesV1.PlanExtraInfo.AppName).map(_.toString)
+  override def execPlanNameExtractor: v1.ExecutionPlan => Option[v1_1.ExecutionPlan.Name] = _.extraInfo.get(FieldNamesV1.PlanExtraInfo.AppName).map(_.toString)
 
   override def expressionConverter: Option[CachingConverter {type To = v1_1.ExpressionLike}] = Some(_expressionConverter)
 

diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/executionPlan.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/executionPlan.scala
@@ -20,7 +20,7 @@ import java.util.UUID
 
 case class ExecutionPlan(
   id: UUID = UUID.randomUUID(),
-  appName: Option[ExecutionPlan.AppName],
+  name: Option[ExecutionPlan.Name],
 
   operations: Operations,
   attributes: Seq[Attribute] = Nil,
@@ -41,7 +41,7 @@ case class ExecutionPlan(
 }
 
 object ExecutionPlan {
-  type AppName = String
+  type Name = String
   type DataSourceUri = String
 }
 

diff --git a/.../co/absa/spline/producer/rest/controller/ExecutionPlansControllerDeserFixAspectSpec.scala b/.../co/absa/spline/producer/rest/controller/ExecutionPlansControllerDeserFixAspectSpec.scala
@@ -118,7 +118,7 @@ object ExecutionPlansControllerDeserFixAspectSpec {
 
     ExecutionPlan(
       id = planId,
-      appName = None,
+      name = None,
       operations = Operations(
         write = WriteOperation(
           id = "1",

diff --git a/.../scala/za/co/absa/spline/producer/service/model/ExecutionPlanPersistentModelBuilder.scala b/.../scala/za/co/absa/spline/producer/service/model/ExecutionPlanPersistentModelBuilder.scala
@@ -75,7 +75,7 @@ class ExecutionPlanPersistentModelBuilder private(
 
   def build(): ExecutionPlanPersistentModel = {
     val pmExecutionPlan = pm.ExecutionPlan(
-      appName = ep.appName,
+      name = ep.name,
       _key = ep.id.toString,
       systemInfo = ep.systemInfo.toJsonAs[Map[String, Any]],
       agentInfo = ep.agentInfo.map(_.toJsonAs[Map[String, Any]]).orNull,

diff --git a/.../main/scala/za/co/absa/spline/producer/service/repo/ExecutionProducerRepositoryImpl.scala b/.../main/scala/za/co/absa/spline/producer/service/repo/ExecutionProducerRepositoryImpl.scala
@@ -83,7 +83,7 @@ class ExecutionProducerRepositoryImpl @Autowired()(db: ArangoDatabaseAsync) exte
          |    RETURN {
          |        "${ExecutionPlanDetails.ExecutionPlanId}" : ep._key,
          |        "${ExecutionPlanDetails.FrameworkName}" : CONCAT(ep.systemInfo.name, " ", ep.systemInfo.version),
-         |        "${ExecutionPlanDetails.ApplicationName}" : ep.appName,
+         |        "${ExecutionPlanDetails.ApplicationName}" : ep.name,
          |        "${ExecutionPlanDetails.DataSourceUri}" : writeOp.outputSource,
          |        "${ExecutionPlanDetails.DataSourceType}" : writeOp.extra.destinationType,
          |        "${ExecutionPlanDetails.Append}" : writeOp.append