[#521] set meaningful defaults in models

# New features and improvements

- Set empty list as default machine learning models to be applied
- Set `timed=false` as default in RawModel

# Related issue

Closes #521

Author: Peppo Lorusso

model/src/main/scala/it/agilelab/bigdata/wasp/models/BatchJobModel.scala

@@ -4,35 +4,31 @@ import com.typesafe.config.{Config, ConfigFactory, ConfigRenderOptions}
 import it.agilelab.bigdata.wasp.models.JobStatus.JobStatus
 import spray.json._
 
-
 object JobStatus extends Enumeration {
   type JobStatus = Value
 
   val PENDING, PROCESSING, SUCCESSFUL, FAILED, STOPPED = Value
 }
 
-
-case class BatchJobModel(override val name: String,
-                         description: String,
-                         owner: String,
-                         system: Boolean,
-                         creationTime: Long,
-                         etl: BatchETL,
-                         exclusivityConfig: BatchJobExclusionConfig = BatchJobExclusionConfig(
-                           isFullyExclusive = true,
-                           Seq.empty[String])
-                        )
-  extends Model
-
-
-case class BatchJobInstanceModel(override val name: String,
-                                 instanceOf: String,
-                                 startTimestamp: Long,
-                                 currentStatusTimestamp: Long,
-                                 status: JobStatus,
-                                 restConfig: Config = ConfigFactory.empty,
-                                 error: Option[String] = None
-                                ) extends Model
+case class BatchJobModel(
+    override val name: String,
+    description: String,
+    owner: String,
+    system: Boolean,
+    creationTime: Long,
+    etl: BatchETL,
+    exclusivityConfig: BatchJobExclusionConfig = BatchJobExclusionConfig(isFullyExclusive = true, Seq.empty[String])
+) extends Model
+
+case class BatchJobInstanceModel(
+    override val name: String,
+    instanceOf: String,
+    startTimestamp: Long,
+    currentStatusTimestamp: Long,
+    status: JobStatus,
+    restConfig: Config = ConfigFactory.empty,
+    error: Option[String] = None
+) extends Model
 
 sealed trait BatchETL {
   val name: String
@@ -42,25 +38,51 @@ sealed trait BatchETL {
   var isActive: Boolean
 }
 
-case class BatchETLModel(name: String,
-                         inputs: List[ReaderModel],
-                         output: WriterModel,
-                         mlModels: List[MlModelOnlyInfo],
-                         strategy: Option[StrategyModel],
-                         kafkaAccessType: String,
-                         group: String = "default",
-                         var isActive: Boolean = false) extends BatchETL
+case class BatchETLModel(
+    name: String,
+    inputs: List[ReaderModel],
+    output: WriterModel,
+    mlModels: List[MlModelOnlyInfo],
+    strategy: Option[StrategyModel],
+    kafkaAccessType: String,
+    group: String = "default",
+    var isActive: Boolean = false
+) extends BatchETL
+
 object BatchETLModel {
   val TYPE = "BatchETL"
+
+  // Alternative constructor to avoid passing (often) empty machine learning models
+  def create(
+      name: String,
+      inputs: List[ReaderModel],
+      output: WriterModel,
+      strategy: Option[StrategyModel],
+      kafkaAccessType: String,
+      group: String,
+      isActive: Boolean
+  ): BatchETLModel =
+    new BatchETLModel(
+      name = name,
+      inputs = inputs,
+      output = output,
+      mlModels = List.empty[MlModelOnlyInfo],
+      strategy = strategy,
+      kafkaAccessType = kafkaAccessType,
+      group = group,
+      isActive = isActive
+    )
 }
 
-case class BatchGdprETLModel(name: String,
-                             dataStores: List[DataStoreConf],
-                             strategyConfig: String,
-                             inputs: List[ReaderModel],
-                             output: WriterModel,
-                             group: String = "default",
-                             var isActive: Boolean = false) extends BatchETL {
+case class BatchGdprETLModel(
+    name: String,
+    dataStores: List[DataStoreConf],
+    strategyConfig: String,
+    inputs: List[ReaderModel],
+    output: WriterModel,
+    group: String = "default",
+    var isActive: Boolean = false
+) extends BatchETL {
   val strategy: GdprStrategyModel = GdprStrategyModel(
     "it.agilelab.bigdata.wasp.consumers.spark.strategies.gdpr.GdprStrategy",
     dataStores,
@@ -70,13 +92,15 @@ case class BatchGdprETLModel(name: String,
 object BatchGdprETLModel {
   val TYPE = "BatchGdprETL"
 
-  def create(name: String,
-             dataStores: List[DataStoreConf],
-             strategyConfig: Config,
-             inputs: List[ReaderModel],
-             output: WriterModel,
-             group: String = "default",
-             isActive: Boolean = false): BatchGdprETLModel = {
+  def create(
+      name: String,
+      dataStores: List[DataStoreConf],
+      strategyConfig: Config,
+      inputs: List[ReaderModel],
+      output: WriterModel,
+      group: String = "default",
+      isActive: Boolean = false
+  ): BatchGdprETLModel = {
     BatchGdprETLModel(
       name,
       dataStores,
@@ -89,7 +113,6 @@ object BatchGdprETLModel {
   }
 }
 
-
 case class BatchJobExclusionConfig(isFullyExclusive: Boolean, restConfigExclusiveParams: Seq[String])
 
 trait BatchJobJsonSupport extends DefaultJsonProtocol {
@@ -100,24 +123,27 @@ trait BatchJobJsonSupport extends DefaultJsonProtocol {
                      strategyModelFormat: RootJsonFormat[StrategyModel]) = {
     implicit val
   }
-*/
+   */
 
-  def createBatchETLFormat(implicit batchETLModelFormat: RootJsonFormat[BatchETLModel],
-                           batchGdprETLModelFormat: RootJsonFormat[BatchGdprETLModel]): RootJsonFormat[BatchETL] = {
+  def createBatchETLFormat(
+      implicit batchETLModelFormat: RootJsonFormat[BatchETLModel],
+      batchGdprETLModelFormat: RootJsonFormat[BatchGdprETLModel]
+  ): RootJsonFormat[BatchETL] = {
 
     new RootJsonFormat[BatchETL] {
       override def read(json: JsValue): BatchETL = {
         json.asJsObject.getFields("type") match {
-          case Seq(JsString("BatchETLModel")) => json.convertTo[BatchETLModel]
+          case Seq(JsString("BatchETLModel"))     => json.convertTo[BatchETLModel]
           case Seq(JsString("BatchGdprETLModel")) => json.convertTo[BatchGdprETLModel]
-          case _ => throw DeserializationException("Unknown json")
+          case _                                  => throw DeserializationException("Unknown json")
         }
       }
 
-      override def write(obj: BatchETL): JsValue = JsObject(obj match {
-        case etl: BatchETLModel => etl.toJson.asJsObject.fields + ("type" -> JsString("BatchETLModel"))
-        case gdpr: BatchGdprETLModel => gdpr.toJson.asJsObject.fields + ("type" -> JsString("BatchGdprETLModel"))
-      })
+      override def write(obj: BatchETL): JsValue =
+        JsObject(obj match {
+          case etl: BatchETLModel      => etl.toJson.asJsObject.fields + ("type"  -> JsString("BatchETLModel"))
+          case gdpr: BatchGdprETLModel => gdpr.toJson.asJsObject.fields + ("type" -> JsString("BatchGdprETLModel"))
+        })
     }
   }
 }