spline #671 Refine model

AbsaOSS · May 23, 2020 · 7b75ffc · 7b75ffc
1 parent 75ae2d8
commit 7b75ffc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/Attribute.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/Attribute.scala
@@ -16,18 +16,15 @@
 
 package za.co.absa.spline.producer.model.v1_1
 
-import java.util.UUID
-
 import za.co.absa.spline.producer.model.v1_1.Attribute.Id
 
 object Attribute {
- type Id = UUID
+ type Id = String
 }
 
 case class Attribute(
  id: Id,
  name: String,
  dataType: Option[DataType],
- dependencies: Seq[Attribute.Id],
  extra: Map[String, Any]
 )
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
@@ -43,8 +43,8 @@ case class Operations(
 case class Attributes(
  attrDefs: Seq[Attribute],
  exprDefs: Seq[Expression],
- operationSchemaMapping: Map[OperationLike.Id, Seq[Attribute.Id]],
- attributeExpressionMapping: Map[Attribute.Id, Seq[Expression.Id]]
+ operationSchemaMapping: Map[OperationLike.Id, Array[Attribute.Id]],
+ attributeExpressionMapping: Map[Attribute.Id, Array[Expression.Id]]
 )
 
 case class NameAndVersion(name: String, version: String)
diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/expressions.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/expressions.scala
@@ -16,12 +16,10 @@
 
 package za.co.absa.spline.producer.model.v1_1
 
-import java.util.UUID
-
 sealed trait Expression
 
 object Expression {
- type Id = UUID
+ type Id = String
 }
 
 case class GenericExpression(

diff --git a/producer-rest-core/pom.xml b/producer-rest-core/pom.xml
@@ -71,6 +71,11 @@
  <groupId>io.swagger</groupId>
  <artifactId>swagger-annotations</artifactId>
  </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-core</artifactId>
+ <version>2.9.2</version>
+ </dependency>
  <dependency>
  <groupId>com.twitter</groupId>
  <artifactId>finatra-jackson_${scala.compat.version}</artifactId>

diff --git a/...ain/scala/za/co/absa/spline/producer/rest/controller/v1/ExecutionEventsV1Controller.scala b/...ain/scala/za/co/absa/spline/producer/rest/controller/v1/ExecutionEventsV1Controller.scala
@@ -20,12 +20,14 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation._
+import springfox.documentation.annotations.ApiIgnore
 import za.co.absa.spline.producer.model.ExecutionEvent
 import za.co.absa.spline.producer.rest.modelmapper.ModelMapperV1
 import za.co.absa.spline.producer.service.repo.ExecutionProducerRepository
 
 import scala.concurrent.{ExecutionContext, Future}
 
+@ApiIgnore
 @Controller
 @RequestMapping(consumes = Array("application/json"))
 class ExecutionEventsV1Controller @Autowired()(

diff --git a/...main/scala/za/co/absa/spline/producer/rest/controller/v1/ExecutionPlansV1Controller.scala b/...main/scala/za/co/absa/spline/producer/rest/controller/v1/ExecutionPlansV1Controller.scala
@@ -21,12 +21,14 @@ import java.util.UUID
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation._
+import springfox.documentation.annotations.ApiIgnore
 import za.co.absa.spline.producer.model.ExecutionPlan
 import za.co.absa.spline.producer.rest.modelmapper.ModelMapperV1
 import za.co.absa.spline.producer.service.repo.ExecutionProducerRepository
 
 import scala.concurrent.{ExecutionContext, Future}
 
+@ApiIgnore
 @RestController
 @RequestMapping(consumes = Array("application/json"))
 class ExecutionPlansV1Controller @Autowired()(

diff --git a/...-rest-core/src/main/scala/za/co/absa/spline/producer/rest/modelmapper/ModelMapperV1.scala b/...-rest-core/src/main/scala/za/co/absa/spline/producer/rest/modelmapper/ModelMapperV1.scala
@@ -16,8 +16,6 @@
 
 package za.co.absa.spline.producer.rest.modelmapper
 
-import java.util.UUID
-
 import za.co.absa.spline.producer.model.v1_1._
 import za.co.absa.spline.producer.model.{ExecutionEvent => ExecutionEventV1, ExecutionPlan => ExecutionPlanV1, Operations => OperationsV1}
 
@@ -90,8 +88,8 @@ object ModelMapperV1 extends ModelMapper {
  extra = event.extra
  )
 
- private def convertSchema(schema1: Any): Seq[Attribute.Id] = {
+ private def convertSchema(schema1: Any): Array[Attribute.Id] = {
  // Fixme in SPLINE-677
- schema1.asInstanceOf[Seq[String]].map(UUID.fromString)
+ schema1.asInstanceOf[Seq[String]].toArray
  }
 }
diff --git a/...rvices/src/main/scala/za/co/absa/spline/producer/service/repo/RecursiveSchemaFinder.scala b/...rvices/src/main/scala/za/co/absa/spline/producer/service/repo/RecursiveSchemaFinder.scala
@@ -22,7 +22,7 @@ import scala.collection.mutable
 
 class RecursiveSchemaFinder(
  operations: Seq[OperationLike],
- schemaMapping: Map[OperationLike.Id, Seq[Attribute.Id]]) {
+ schemaMapping: Map[OperationLike.Id, Array[Attribute.Id]]) {
 
  private val schemaByOperationIdCollector = mutable.Map.empty[Int, Option[Any]]
  private val operationById: Map[Int, OperationLike] = operations.map(op => op.id -> op).toMap