Subprocess -> fragment

docs/Changelog.md

@@ -57,6 +57,7 @@ Nussknacker versions
 * [#1357](https://github.com/TouK/nussknacker/pull/1357) Add run mode to nodes to be able to determine if we are inside e.g. test process run.
   Run mode is can be declared as a dependency in generic node transformations. Nodes created via `@MethodToInvoke` can declare `RunMode` as an implicit parameter.
   `RunMode` is also available in `FlinkCustomNodeContext`.
+* [#1911](https://github.com/TouK/nussknacker/pull/1911) Rename `process` to `scenario`, `subprocess` to `fragment` in messages at backend and some test cases names                                                        
 
 0.3.1 (not released yet) 
 ------------------------

docs/components/ComponentConfiguration.md

@@ -0,0 +1,7 @@
+Component configuration
+=======================
+
+```
+
+```
+

engine/api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/CustomAction.scala

@@ -44,7 +44,7 @@ sealed trait CustomActionError extends Exception {
 case class CustomActionFailure(request: CustomActionRequest, msg: String) extends CustomActionError
 
 case class CustomActionInvalidStatus(request: CustomActionRequest, stateStatusName: String) extends CustomActionError {
-  override val msg: String = s"Process status: $stateStatusName is not allowed for action ${request.name}"
+  override val msg: String = s"Scenario status: $stateStatusName is not allowed for action ${request.name}"
 }
 
 case class CustomActionNotImplemented(request: CustomActionRequest) extends CustomActionError {

engine/api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/simple/SimpleProcessStateDefinitionManager.scala

@@ -89,21 +89,21 @@ object SimpleProcessStateDefinitionManager extends ProcessStateDefinitionManager
     statusDescriptionsMap.get(stateStatus)
 
   def shouldBeRunningTooltip(deployedVersionId: Long, user: String): String =
-    s"Process deployed in version ${deployedVersionId} (by ${user}), should be running!"
+    s"Scenario deployed in version ${deployedVersionId} (by ${user}), should be running!"
 
   def mismatchDeployedVersionTooltip(deployedVersionId: Long, exceptedVersionId: Long, user: String): String =
-    s"Process deployed in version ${deployedVersionId} (by ${user}), expected version ${exceptedVersionId}!"
+    s"Scenario deployed in version ${deployedVersionId} (by ${user}), expected version ${exceptedVersionId}!"
 
   def missingDeployedVersionTooltip(exceptedVersionId: Long, user: String): String =
-    s"Process deployed without version (by ${user}), expected version ${exceptedVersionId}!"
+    s"Scenario deployed without version (by ${user}), expected version ${exceptedVersionId}!"
 
-  val shouldBeRunningDescription: String = "Process currently is not running!"
+  val shouldBeRunningDescription: String = "Scenario currently is not running!"
 
   val mismatchDeployedVersionDescription: String = "Deployed scenario mismatch version!"
 
   val missingDeployedVersionDescription: String = "Missing version of deployed scenario!"
 
-  val processWithoutActionMessage: String = "Process state error - no actions found!"
+  val processWithoutActionMessage: String = "Scenario state error - no actions found!"
 
   val deployFailedIcon: URI = URI.create("/assets/states/deploy-failed.svg")
 
@@ -114,8 +114,8 @@ object SimpleProcessStateDefinitionManager extends ProcessStateDefinitionManager
   val notDeployedWarningIcon: URI = URI.create("/assets/states/not-deployed-warning.svg")
 
   def  shouldNotBeRunningMessage(deployed: Boolean): String =
-    if (deployed) "Process has been canceled but still is running!"
-    else "Process has been never deployed but now is running!"
+    if (deployed) "Scenario has been canceled but still is running!"
+    else "Scenario has been never deployed but now is running!"
 
   def shouldNotBeRunningIcon(deployed: Boolean): URI =
     if (deployed) stoppingWarningIcon else notDeployedWarningIcon

engine/flink/management/periodic/src/main/scala/pl/touk/nussknacker/engine/management/periodic/PeriodicProcessManager.scala

@@ -93,7 +93,7 @@ class PeriodicProcessManager(val delegate: ProcessManager,
       .map(_.isDefined)
       .flatMap(shouldStop => {
         if (shouldStop) {
-          logger.info(s"Process ${processVersion.processName} is running or scheduled. Cancelling before reschedule")
+          logger.info(s"Scenario ${processVersion.processName} is running or scheduled. Cancelling before reschedule")
           cancel(processVersion.processName, user).map(_ => ())
         }
         else Future.successful(())

engine/flink/management/periodic/src/main/scala/pl/touk/nussknacker/engine/management/periodic/PeriodicProcessService.scala

@@ -217,15 +217,15 @@ class PeriodicProcessService(delegateProcessManager: ProcessManager,
     } yield externalDeploymentId
     deploymentAction
       .flatMap { externalDeploymentId =>
-        logger.info("Process has been deployed {} for deployment id {}", deploymentWithJarData.processVersion, id)
+        logger.info("Scenario has been deployed {} for deployment id {}", deploymentWithJarData.processVersion, id)
         //TODO: add externalDeploymentId??
         scheduledProcessesRepository.markDeployed(id)
           .flatMap(_ => scheduledProcessesRepository.findProcessData(id))
           .flatMap(afterChange => handleEvent(DeployedEvent(afterChange, externalDeploymentId))).run
       }
       // We can recover since deployment actor watches only future completion.
       .recoverWith { case exception =>
-        logger.error(s"Process deployment ${deployment.display} failed", exception)
+        logger.error(s"Scenario deployment ${deployment.display} failed", exception)
         markFailedAction(deployment, None).run
       }
   }

engine/flink/management/periodic/src/main/scala/pl/touk/nussknacker/engine/management/periodic/SchedulePropertyExtractor.scala

@@ -17,7 +17,7 @@ object SchedulePropertyExtractor {
     processDeploymentData match {
       case GraphProcess(processAsJson) =>
         for {
-          canonicalProcess <- ProcessMarshaller.fromJson(processAsJson).leftMap(_ => "Process is unparseable").toEither.right
+          canonicalProcess <- ProcessMarshaller.fromJson(processAsJson).leftMap(_ => "Scenario is unparseable").toEither.right
           property <- canonicalProcess.metaData.additionalFields.flatMap(_.properties.get(name)).toRight(s"$name property is missing").right
         } yield property
       case CustomProcess(_) => Left("Custom scenario is not supported")

engine/flink/management/periodic/src/test/scala/pl/touk/nussknacker/engine/management/periodic/CronSchedulePropertyExtractorTest.scala

@@ -22,7 +22,7 @@ class CronSchedulePropertyExtractorTest extends FunSuite
   test("should fail for unparseable scenario json") {
     val result = extractor(GraphProcess("broken"))
 
-    inside(result) { case Left("Process is unparseable") => }
+    inside(result) { case Left("Scenario is unparseable") => }
   }
 
   test("should fail for missing cron property") {

engine/flink/management/src/main/scala/pl/touk/nussknacker/engine/management/FlinkProcessStateDefinitionManager.scala

@@ -16,11 +16,11 @@ object FlinkProcessStateDefinitionManager extends ProcessStateDefinitionManager
   )
 
   val statusTooltipsMap: Map[StateStatus, String] = Map(
-    FlinkStateStatus.Restarting -> "Process was deployed but now is restarting..."
+    FlinkStateStatus.Restarting -> "Scenario was deployed but now is restarting..."
   )
 
   val statusDescriptionsMap: Map[StateStatus, String] = Map(
-    FlinkStateStatus.Restarting -> "Process is restarting..."
+    FlinkStateStatus.Restarting -> "Scenario is restarting..."
   )
 
   override def statusTooltip(stateStatus: StateStatus): Option[String] =

engine/flink/process/src/main/scala/pl/touk/nussknacker/engine/process/registrar/FlinkProcessRegistrar.scala

@@ -237,7 +237,7 @@ class FlinkProcessRegistrar(compileProcess: (EspProcess, ProcessVersion, Deploym
           Map()
 
         case part: SinkPart =>
-          throw new IllegalArgumentException(s"Process can only use flink sinks, instead given: ${part.obj}")
+          throw new IllegalArgumentException(s"Scenario can only use flink sinks, instead given: ${part.obj}")
         case part@CustomNodePart(transformerObj, node, contextBefore, contextAfter, _, _) =>
 
           val transformer = transformerObj match {

engine/flink/process/src/main/scala/pl/touk/nussknacker/engine/process/runner/FlinkProcessMain.scala

@@ -19,7 +19,7 @@ trait FlinkProcessMain[Env] extends FlinkRunner with LazyLogging {
     try {
       val args = FlinkArgsDecodeHack.prepareProgramArgs(argsWithHack)
 
-      require(args.nonEmpty, "Process json should be passed as a first argument")
+      require(args.nonEmpty, "Scenario json should be passed as a first argument")
       val process = readProcessFromArg(args(0))
       val processVersion = parseProcessVersion(args(1))
       val deploymentData = parseDeploymentData(args(2))

engine/flink/process/src/test/scala/pl/touk/nussknacker/engine/process/functional/SubprocessSpec.scala

@@ -21,7 +21,7 @@ class SubprocessSpec extends FunSuite with Matchers with ProcessTestHelpers {
 
   import pl.touk.nussknacker.engine.spel.Implicits._
 
-  test("should accept same id in subprocess and main process ") {
+  test("should accept same id in fragment and main process ") {
 
     val process = resolve(EspProcessBuilder.id("proc1")
       .exceptionHandler()
@@ -39,7 +39,7 @@ class SubprocessSpec extends FunSuite with Matchers with ProcessTestHelpers {
     MockService.data.head shouldBe "a"
   }
 
-  test("should handle split in subprocess") {
+  test("should handle split in fragment") {
 
     val process = resolve(EspProcessBuilder.id("proc1")
       .exceptionHandler()
@@ -57,7 +57,7 @@ class SubprocessSpec extends FunSuite with Matchers with ProcessTestHelpers {
     MockService.data.head shouldBe "a"
   }
 
-  test("be possible to use global vars in subprocess") {
+  test("be possible to use global vars in fragment") {
     val process = resolve(EspProcessBuilder.id("proc1")
       .exceptionHandler()
       .source("id", "input")
@@ -74,7 +74,7 @@ class SubprocessSpec extends FunSuite with Matchers with ProcessTestHelpers {
     MockService.data.head shouldBe "a"
   }
 
-  test("be possible to use diamond subprocesses") {
+  test("be possible to use diamond fragments") {
     val process = resolve(EspProcessBuilder.id("proc1")
       .exceptionHandler()
       .source("id", "input")

engine/interpreter/src/test/scala/pl/touk/nussknacker/engine/InterpreterSpec.scala

@@ -374,7 +374,7 @@ class InterpreterSpec extends FunSuite with Matchers {
 
   }
 
-  test("handle subprocess") {
+  test("handle fragment") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "transaction-source")
@@ -398,7 +398,7 @@ class InterpreterSpec extends FunSuite with Matchers {
     interpretProcess(resolved, Transaction(accountId = "a"), List()) shouldBe "result"
   }
 
-  test("handle subprocess with two occurrences") {
+  test("handle fragment with two occurrences") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "transaction-source")
@@ -427,7 +427,7 @@ class InterpreterSpec extends FunSuite with Matchers {
   }
 
 
-  test("handle nested subprocess") {
+  test("handle nested fragment") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "transaction-source")
@@ -457,7 +457,7 @@ class InterpreterSpec extends FunSuite with Matchers {
     interpretProcess(resolved, Transaction(accountId = "a"), List()) shouldBe "result"
   }
 
-  test("handle subprocess with more than one output") {
+  test("handle fragment with more than one output") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "transaction-source")
@@ -484,7 +484,7 @@ class InterpreterSpec extends FunSuite with Matchers {
     interpretProcess(resolved, Transaction(accountId = "b"), List()) shouldBe "result2"
   }
 
-  test("handle subprocess at end") {
+  test("handle fragment at end") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "transaction-source")
@@ -503,7 +503,7 @@ class InterpreterSpec extends FunSuite with Matchers {
     interpretProcess(resolved, Transaction(accountId = "a"), List()) shouldBe "result"
   }
 
-  test("interprets subprocess output fields") {
+  test("interprets fragment output fields") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "transaction-source")

engine/interpreter/src/test/scala/pl/touk/nussknacker/engine/canonicalgraph/CanonicalProcessTest.scala

@@ -42,14 +42,14 @@ class CanonicalProcessTest extends FunSuite with Matchers {
     withNodesEnabled.withoutDisabledNodes shouldBe withNodesEnabled
   }
 
-  test("#withoutDisabledNodes with disabled subprocess") {
+  test("#withoutDisabledNodes with disabled fragment") {
     val withDisabledSubprocess = process(
       List(source1, subprocess(List(sink1), isDisabled = true)))
 
     withDisabledSubprocess.withoutDisabledNodes shouldBe process(List(source1, sink1))
   }
 
-  test("#withoutDisabledNodes with subprocess with disabled subprocess") {
+  test("#withoutDisabledNodes with fragment with disabled fragment") {
     val withSubprocessWithDisabledSubprocess = process(
       List(
         source1,
@@ -76,7 +76,7 @@ class CanonicalProcessTest extends FunSuite with Matchers {
     )
   }
 
-  test("#withoutDisabledNodes with disabled subprocess with disabled subprocess") {
+  test("#withoutDisabledNodes with disabled fragment with disabled fragment") {
     val withDisabledSubprocessWithDisabledSubprocess = process(
       List(
         source1,
@@ -135,7 +135,7 @@ class CanonicalProcessTest extends FunSuite with Matchers {
     )
   }
 
-  test("#withoutDisabledNodes with split with subprocess with disabled subprocess") {
+  test("#withoutDisabledNodes with split with fragment with disabled fragment") {
     process(
       List(
         source1,

engine/interpreter/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala

@@ -188,7 +188,7 @@ class NodeDataValidatorSpec extends FunSuite with Matchers with Inside {
     }
   }
 
-  ignore("should validate subprocess") {
+  ignore("should validate fragment") {
     //TODO
   }
 

engine/interpreter/src/test/scala/pl/touk/nussknacker/engine/compile/ProcessValidatorSpec.scala

@@ -550,7 +550,7 @@ class ProcessValidatorSpec extends FunSuite with Matchers with Inside {
 
 
 
-  test("not validate exception handler params in subprocess") {
+  test("not validate exception handler params in fragment") {
 
     val subprocess = CanonicalProcess(MetaData("subProcess1", StreamMetaData(), true), ExceptionHandlerRef(List()),
       List(

engine/interpreter/src/test/scala/pl/touk/nussknacker/engine/compile/SubprocessResolverSpec.scala

@@ -54,7 +54,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
 
   }
 
-  test("resolve nested subprocesses") {
+  test("resolve nested fragments") {
 
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
@@ -92,7 +92,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
     resolved.nodes.find(_.id == "sub-sub2-f1") shouldBe 'defined
   }
 
-  test("not resolve subprocess with missing parameters") {
+  test("not resolve fragment with missing parameters") {
 
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
@@ -112,7 +112,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
 
   }
 
-  test("not resolve subprocess with bad outputs") {
+  test("not resolve fragment with bad outputs") {
 
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
@@ -133,7 +133,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
 
   }
 
-  test("not disable subprocess with many outputs") {
+  test("not disable fragment with many outputs") {
 
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
@@ -163,7 +163,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
     resolvedValidated shouldBe Invalid(NonEmptyList.of(DisablingManyOutputsSubprocess("sub", Set("output1", "output2"))))
 
   }
-  test("not disable subprocess with no outputs") {
+  test("not disable fragment with no outputs") {
 
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
@@ -186,7 +186,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
 
   }
 
-  test("inline disabled subprocess without inner nodes") {
+  test("inline disabled fragment without inner nodes") {
     val processWithEmptySubprocess = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "source1")
@@ -252,7 +252,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
     inside(resolver.resolve(processWithDisabledSubprocess))(pattern)
   }
 
-  test("resolve subprocess at end of process") {
+  test("resolve fragment at end of process") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "source1")
@@ -273,7 +273,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
     resolved.nodes.filter(_.isInstanceOf[Subprocess]) shouldBe 'empty
   }
 
-  test("detect unknown subprocess") {
+  test("detect unknown fragment") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder
       .id("process1")
       .exceptionHandler()
@@ -287,7 +287,7 @@ class SubprocessResolverSpec extends FunSuite with Matchers with Inside{
     resolvedValidated shouldBe Invalid(NonEmptyList.of(UnknownSubprocess(id = "subProcessId", nodeId = "nodeSubprocessId")))
   }
 
-  test("should resolve diamond subprocesses") {
+  test("should resolve diamond fragments") {
     val process = ProcessCanonizer.canonize(EspProcessBuilder.id("test")
       .exceptionHandler()
       .source("source", "source1")

engine/standalone/engine/src/main/scala/pl/touk/nussknacker/engine/standalone/deployment/DeploymentService.scala

@@ -59,7 +59,7 @@ class DeploymentService(context: StandaloneContextPreparer, modelData: ModelData
           val currentAtPath = pathToInterpreterMap.get(pathToDeploy).map(_.id)
           currentAtPath match {
             case Some(oldId) if oldId != processName.value =>
-              Invalid(NonEmptyList.of(DeploymentError(Set(), s"Process $oldId is already deployed at path $pathToDeploy")))
+              Invalid(NonEmptyList.of(DeploymentError(Set(), s"Scenario $oldId is already deployed at path $pathToDeploy")))
             case _ =>
               val interpreter = newInterpreter(process)
               interpreter.foreach { processInterpreter =>

ui/server/src/main/scala/pl/touk/nussknacker/ui/api/AppResources.scala

@@ -89,7 +89,7 @@ class AppResources(config: Config,
               if (processes.isEmpty) {
                 createHealthCheckHttpResponse(OK)
               } else {
-                createHealthCheckHttpResponse(ERROR, Some("Processes with validation errors"), Some(processes.toSet))
+                createHealthCheckHttpResponse(ERROR, Some("Scenarios with validation errors"), Some(processes.toSet))
               }
             }
           }

ui/server/src/main/scala/pl/touk/nussknacker/ui/api/NotificationResources.scala

@@ -54,7 +54,7 @@ class NotificationResources(managementActor: ActorRef,
       case DeploymentActionType.Deployment => "deployed"
       case DeploymentActionType.Cancel => "cancelled"
     }
-    Notification(s"Process ${processName.value} is $actionString by ${deploymentInfo.userId}", NotificationType.info)
+    Notification(s"Scenario ${processName.value} is $actionString by ${deploymentInfo.userId}", NotificationType.info)
   }
 
 }

ui/server/src/main/scala/pl/touk/nussknacker/ui/api/ProcessReportResources.scala

@@ -32,7 +32,7 @@ class ProcessReportResources(countsReporter: CountsReporter, processCounter: Pro
                   case Some(displayable) => computeCounts(displayable, request)
                   case None => Future.successful(HttpResponse(status = StatusCodes.NotFound, entity = "Counts unavailable for this scenario"))
                 }
-              case None => Future.successful(HttpResponse(status = StatusCodes.NotFound, entity = "Process not found"))
+              case None => Future.successful(HttpResponse(status = StatusCodes.NotFound, entity = "Scenario not found"))
             }
           }
         }