Merge pull request #1892 from TouK/split.openapi.from.generic

Split openapi component from generic model

build.sbt

@@ -340,12 +340,14 @@ lazy val dist = {
       Keys.compile in Compile := (Keys.compile in Compile).dependsOn(
         (assembly in Compile) in generic,
         (assembly in Compile) in flinkProcessManager,
-        (assembly in Compile) in engineStandalone
+        (assembly in Compile) in engineStandalone,
+        (assembly in Compile) in openapi
       ).value,
       mappings in Universal ++= Seq(
         (crossTarget in generic).value / "genericModel.jar" -> "model/genericModel.jar",
         (crossTarget in flinkProcessManager).value / s"nussknacker-flink-manager.jar" -> "managers/nussknacker-flink-manager.jar",
-        (crossTarget in engineStandalone).value / s"nussknacker-standalone-manager.jar" -> "managers/nussknacker-standalone-manager.jar"
+        (crossTarget in engineStandalone).value / s"nussknacker-standalone-manager.jar" -> "managers/nussknacker-standalone-manager.jar",
+        (crossTarget in openapi).value / "openapi.jar" -> "components/openapi.jar"
       ),
       /* //FIXME: figure out how to filter out only for .tgz, not for docker
       mappings in Universal := {
@@ -553,7 +555,6 @@ lazy val generic = (project in engine("flink/generic")).
       )
     })
   .dependsOn(process % "runtime,test", avroFlinkUtil, flinkModelUtil, flinkTestUtil % "test", kafkaTestUtil % "test",
-    openapi,
     //for local development
     ui % "test")
 
@@ -916,6 +917,9 @@ lazy val openapi = (project in component("openapi")).
     configs(IntegrationTest).
     settings(commonSettings).
     settings(Defaults.itSettings).
+    settings(commonSettings).
+    settings(assemblySampleSettings("openapi.jar"): _*).
+    settings(publishAssemblySettings: _*).
     settings(
       name := "nussknacker-openapi",
       libraryDependencies ++= Seq(

demo/docker/nussknacker/nussknacker.conf

@@ -1,9 +1,12 @@
 #This configuration auguments and overrides configuration in docker image
 #Here we configure OpenAPI based enricher, which is implemented by python service in customerservice
 {
-  processTypes.streaming.modelConfig.components.openAPI {
-    url: "http://customerservice:5000/swagger"
-    rootUrl: "http://customerservice:5000"
-    categories: ["Default"]
+  processTypes.streaming.modelConfig {
+      classPath: ["model/genericModel.jar", "components/openapi.jar"]
+      components.openAPI {
+        url: "http://customerservice:5000/swagger"
+        rootUrl: "http://customerservice:5000"
+        categories: ["Default"]
+      }
   }
-}
+}

nussknacker-dist/src/universal/conf/application.conf

@@ -6,14 +6,14 @@ categoriesConfig: {
   "Default": "streaming"
 }
 
-modelClassPath: "model/genericModel.jar"
+modelClassPath: ["model/genericModel.jar"]
 modelClassPath: ${?MODEL_CLASS_PATH}
 
 processTypes {
   "streaming": {
     engineConfig: ${base.flinkEngineConfig}
     modelConfig: {
-      classPath: [${modelClassPath}]
+      classPath: ${modelClassPath}
       rocksDB: {
         checkpointDataUri: ${?FLINK_ROCKSDB_CHECKPOINT_DATA_URI}
       }