diff --git a/cassandra-persistence/build.gradle b/cassandra-persistence/build.gradle
index bedf729283..5784ba50d3 100644
--- a/cassandra-persistence/build.gradle
+++ b/cassandra-persistence/build.gradle
@@ -5,7 +5,8 @@ dependencies {
implementation "com.datastax.cassandra:cassandra-driver-core:${revCassandra}"
implementation "org.apache.commons:commons-lang3"
- implementation "javax.inject:javax.inject:1"
+
+ implementation 'org.apache.logging.log4j:log4j-web'
testImplementation("org.cassandraunit:cassandra-unit:${revCassandraUnit}") {
exclude group: "com.datastax.cassandra", module: "cassandra-driver-core"
diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraClusterProvider.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraClusterProvider.java
deleted file mode 100644
index 8aa06370b2..0000000000
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraClusterProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-package com.netflix.conductor.cassandra.config;
-
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Metadata;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Provider;
-
-public class CassandraClusterProvider implements Provider {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraClusterProvider.class);
- private final CassandraProperties properties;
-
- public CassandraClusterProvider(CassandraProperties properties) {
- this.properties = properties;
- }
-
- @Override
- public Cluster get() {
- String host = properties.getHostAddress();
- int port = properties.getPort();
-
- LOGGER.info("Connecting to cassandra cluster with host:{}, port:{}", host, port);
-
- Cluster cluster = Cluster.builder()
- .addContactPoint(host)
- .withPort(port)
- .build();
-
- Metadata metadata = cluster.getMetadata();
- LOGGER.info("Connected to cluster: {}", metadata.getClusterName());
- metadata.getAllHosts().forEach(h -> {
- LOGGER.info("Datacenter:{}, host:{}, rack: {}", h.getDatacenter(), h.getAddress(), h.getRack());
- });
- return cluster;
- }
-}
diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraConfiguration.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraConfiguration.java
index c5af7efb97..a9295d8f0d 100644
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraConfiguration.java
+++ b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraConfiguration.java
@@ -13,6 +13,7 @@
package com.netflix.conductor.cassandra.config;
import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Metadata;
import com.datastax.driver.core.Session;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.netflix.conductor.cassandra.dao.CassandraEventHandlerDAO;
@@ -22,6 +23,8 @@
import com.netflix.conductor.dao.EventHandlerDAO;
import com.netflix.conductor.dao.ExecutionDAO;
import com.netflix.conductor.dao.MetadataDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -31,14 +34,31 @@
@ConditionalOnProperty(name = "db", havingValue = "cassandra")
public class CassandraConfiguration {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CassandraConfiguration.class);
+
@Bean
public Cluster cluster(CassandraProperties properties) {
- return new CassandraClusterProvider(properties).get();
+ String host = properties.getHostAddress();
+ int port = properties.getPort();
+
+ LOGGER.info("Connecting to cassandra cluster with host:{}, port:{}", host, port);
+
+ Cluster cluster = Cluster.builder()
+ .addContactPoint(host)
+ .withPort(port)
+ .build();
+
+ Metadata metadata = cluster.getMetadata();
+ LOGGER.info("Connected to cluster: {}", metadata.getClusterName());
+ metadata.getAllHosts().forEach(h -> LOGGER.info("Datacenter:{}, host:{}, rack: {}", h.getDatacenter(),
+ h.getEndPoint().resolve().getHostName(), h.getRack()));
+ return cluster;
}
@Bean
public Session session(Cluster cluster) {
- return new CassandraSessionProvider(cluster).get();
+ LOGGER.info("Initializing cassandra session");
+ return cluster.connect();
}
@Bean
diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraSessionProvider.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraSessionProvider.java
deleted file mode 100644
index 1e60cdb3cc..0000000000
--- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/CassandraSessionProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-package com.netflix.conductor.cassandra.config;
-
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Provider;
-
-public class CassandraSessionProvider implements Provider {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraSessionProvider.class);
-
- private final Cluster cluster;
-
- public CassandraSessionProvider(Cluster cluster) {
- this.cluster = cluster;
- }
-
- @Override
- public Session get() {
- LOGGER.info("Initializing cassandra session");
- return cluster.connect();
- }
-}
diff --git a/client/build.gradle b/client/build.gradle
index 8265ac0637..4213e87bd5 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -17,7 +17,7 @@ dependencies {
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider"
implementation "org.apache.commons:commons-lang3"
- implementation "commons-io:commons-io"
+ implementation "commons-io:commons-io:${revCommonsIo}"
implementation "org.slf4j:slf4j-api"
}
diff --git a/common/build.gradle b/common/build.gradle
index 14c3b66937..b3ee6c45b6 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -15,7 +15,7 @@ dependencies {
implementation "com.github.rholder:guava-retrying:${revGuavaRetrying}"
- implementation "org.apache.bval:bval-jsr"
+ implementation "org.apache.bval:bval-jsr:${revBval}"
implementation "com.google.protobuf:protobuf-java:${revProtoBuf}"
implementation "com.github.vmg.protogen:protogen-annotations:${revProtogenAnnotations}"
diff --git a/contribs/build.gradle b/contribs/build.gradle
index 508d4414fa..eb5c1c5fd2 100644
--- a/contribs/build.gradle
+++ b/contribs/build.gradle
@@ -23,8 +23,6 @@ dependencies {
implementation "io.reactivex:rxjava:${revRxJava}"
- implementation "javax.inject:javax.inject:1"
-
implementation "com.netflix.spectator:spectator-reg-metrics3:${revSpectator}"
testImplementation "org.eclipse.jetty:jetty-server:${revJettyServer}"
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/listener/archive/ArchivingWorkflowListenerConfiguration.java b/contribs/src/main/java/com/netflix/conductor/contribs/listener/archive/ArchivingWorkflowListenerConfiguration.java
index fea923f871..f7fe716104 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/listener/archive/ArchivingWorkflowListenerConfiguration.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/listener/archive/ArchivingWorkflowListenerConfiguration.java
@@ -18,7 +18,6 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
@Configuration
@ConditionalOnProperty(prefix = "workflow", name = "status.listener.type", havingValue = "archive")
public class ArchivingWorkflowListenerConfiguration {
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/listener/conductorqueue/ConductorQueueStatusPublisherConfiguration.java b/contribs/src/main/java/com/netflix/conductor/contribs/listener/conductorqueue/ConductorQueueStatusPublisherConfiguration.java
index 9ae3a71d77..59ea9341bf 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/listener/conductorqueue/ConductorQueueStatusPublisherConfiguration.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/listener/conductorqueue/ConductorQueueStatusPublisherConfiguration.java
@@ -19,7 +19,6 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
@Configuration
@ConditionalOnProperty(prefix = "workflow", name = "status.listener.type", havingValue = "queue_status_publisher")
public class ConductorQueueStatusPublisherConfiguration {
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueConfiguration.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueConfiguration.java
index c2da663169..8a4468af33 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueConfiguration.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/amqp/config/AMQPEventQueueConfiguration.java
@@ -18,15 +18,13 @@
import com.netflix.conductor.core.config.ConductorProperties;
import com.netflix.conductor.core.events.EventQueueProvider;
import com.netflix.conductor.core.events.queue.ObservableQueue;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import java.util.HashMap;
-import java.util.Map;
-
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(prefix = "workflow", name = "amqp.event.queue.enabled", havingValue = "true")
public class AMQPEventQueueConfiguration {
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamConfiguration.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamConfiguration.java
index 19a74691fe..965e63ec22 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamConfiguration.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/nats/config/NATSStreamConfiguration.java
@@ -18,7 +18,6 @@
import org.springframework.context.annotation.Configuration;
import rx.Scheduler;
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
@Configuration
@ConditionalOnProperty(prefix = "workflow", name = "nats_stream.event.queue.enabled", havingValue = "true")
public class NATSStreamConfiguration {
diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/storage/config/S3Configuration.java b/contribs/src/main/java/com/netflix/conductor/contribs/storage/config/S3Configuration.java
index a60f726e64..cd6a50b49b 100644
--- a/contribs/src/main/java/com/netflix/conductor/contribs/storage/config/S3Configuration.java
+++ b/contribs/src/main/java/com/netflix/conductor/contribs/storage/config/S3Configuration.java
@@ -18,7 +18,6 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
@Configuration
@ConditionalOnProperty(prefix = "workflow", name = "external.payload.storage", havingValue = "S3")
public class S3Configuration {
diff --git a/core/build.gradle b/core/build.gradle
index a427279542..f0146a95f8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -6,7 +6,7 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-annotations"
implementation "com.fasterxml.jackson.core:jackson-databind"
- implementation "commons-io:commons-io"
+ implementation "commons-io:commons-io:${revCommonsIo}"
implementation "com.google.protobuf:protobuf-java:${revProtoBuf}"
@@ -23,7 +23,5 @@ dependencies {
implementation "com.netflix.servo:servo-core:${revServo}"
implementation "com.netflix.spectator:spectator-api:${revSpectator}"
- implementation "org.apache.bval:bval-jsr"
-
- implementation "javax.inject:javax.inject:1"
+ implementation "org.apache.bval:bval-jsr:${revBval}"
}
diff --git a/core/src/main/java/com/netflix/conductor/service/ExecutionLockService.java b/core/src/main/java/com/netflix/conductor/service/ExecutionLockService.java
index 8a5d60467e..8db35b8230 100644
--- a/core/src/main/java/com/netflix/conductor/service/ExecutionLockService.java
+++ b/core/src/main/java/com/netflix/conductor/service/ExecutionLockService.java
@@ -15,27 +15,25 @@
import com.netflix.conductor.core.config.ConductorProperties;
import com.netflix.conductor.core.sync.Lock;
import com.netflix.conductor.metrics.Monitors;
+import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.inject.Provider;
-import java.util.concurrent.TimeUnit;
-
@Service
public class ExecutionLockService {
private static final Logger LOGGER = LoggerFactory.getLogger(ExecutionLockService.class);
private final ConductorProperties properties;
- private final Provider lockProvider;
+ private final Lock lock;
private final long lockLeaseTime;
private final long lockTimeToTry;
@Autowired
- public ExecutionLockService(ConductorProperties properties, Provider lockProvider) {
+ public ExecutionLockService(ConductorProperties properties, Lock lock) {
this.properties = properties;
- this.lockProvider = lockProvider;
+ this.lock = lock;
this.lockLeaseTime = properties.getLockLeaseTimeMs();
this.lockTimeToTry = properties.getLockTimeToTryMs();
}
@@ -59,7 +57,6 @@ public boolean acquireLock(String lockId, long timeToTryMs) {
public boolean acquireLock(String lockId, long timeToTryMs, long leaseTimeMs) {
if (properties.isWorkflowExecutionLockEnabled()) {
- Lock lock = lockProvider.get();
if (!lock.acquireLock(lockId, timeToTryMs, leaseTimeMs, TimeUnit.MILLISECONDS)) {
LOGGER.debug("Thread {} failed to acquire lock to lockId {}.", Thread.currentThread().getId(), lockId);
Monitors.recordAcquireLockUnsuccessful();
@@ -77,7 +74,6 @@ public boolean acquireLock(String lockId, long timeToTryMs, long leaseTimeMs) {
*/
public void waitForLock(String lockId) {
if (properties.isWorkflowExecutionLockEnabled()) {
- Lock lock = lockProvider.get();
lock.acquireLock(lockId);
LOGGER.debug("Thread {} acquired lock to lockId {}.", Thread.currentThread().getId(), lockId);
}
@@ -85,7 +81,6 @@ public void waitForLock(String lockId) {
public void releaseLock(String lockId) {
if (properties.isWorkflowExecutionLockEnabled()) {
- Lock lock = lockProvider.get();
lock.releaseLock(lockId);
LOGGER.debug("Thread {} released lock to lockId {}.", Thread.currentThread().getId(), lockId);
}
@@ -93,7 +88,7 @@ public void releaseLock(String lockId) {
public void deleteLock(String lockId) {
if (properties.isWorkflowExecutionLockEnabled()) {
- lockProvider.get().deleteLock(lockId);
+ lock.deleteLock(lockId);
LOGGER.debug("Thread {} deleted lockId {}.", Thread.currentThread().getId(), lockId);
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index a883c1b8a0..0968004b40 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -6,8 +6,10 @@ ext {
revAwaitility = '3.1.6'
revAwsSdk = '1.11.86'
revAzureStorageBlobSdk = '12.2.0'
+ revBval = '2.0.4'
revCassandra = '3.10.2'
revCassandraUnit = '3.11.2.0'
+ revCommonsIo = '2.7'
revCuratorRecipes = '2.4.0'
revCuratorTest = '2.4.0'
revDockerCompose = '0.13.4'
diff --git a/es6-persistence/build.gradle b/es6-persistence/build.gradle
index 51846ff53a..192b50c0f9 100644
--- a/es6-persistence/build.gradle
+++ b/es6-persistence/build.gradle
@@ -1,10 +1,9 @@
dependencies {
implementation project(':conductor-common')
implementation project(':conductor-core')
-
implementation 'org.springframework.boot:spring-boot-starter'
- implementation "commons-io:commons-io"
+ implementation "commons-io:commons-io:${revCommonsIo}"
implementation "org.apache.commons:commons-lang3"
// SBMTODO: remove guava dep
implementation "com.google.guava:guava:${revGuava}"
diff --git a/mysql-persistence/build.gradle b/mysql-persistence/build.gradle
index b4ee433e12..afa26abbb5 100644
--- a/mysql-persistence/build.gradle
+++ b/mysql-persistence/build.gradle
@@ -15,8 +15,6 @@ dependencies {
implementation project(':conductor-core')
implementation 'org.springframework.boot:spring-boot-starter'
- implementation "javax.inject:javax.inject:1"
-
// SBMTODO: remove guava dep
implementation "com.google.guava:guava:${revGuava}"
diff --git a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLConfiguration.java b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLConfiguration.java
index 5de1ab768d..88b0ad72c9 100644
--- a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLConfiguration.java
+++ b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLConfiguration.java
@@ -31,7 +31,7 @@ public class MySQLConfiguration {
@Bean
public DataSource dataSource(MySQLProperties properties) {
- return new MySQLDataSourceProvider(properties).get();
+ return new MySQLDataSourceProvider(properties).getDataSource();
}
@Bean
diff --git a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLDataSourceProvider.java b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLDataSourceProvider.java
index 491e9555b4..3d723ed16d 100644
--- a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLDataSourceProvider.java
+++ b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/config/MySQLDataSourceProvider.java
@@ -15,16 +15,14 @@
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
+import java.util.concurrent.ThreadFactory;
+import javax.sql.DataSource;
import org.flywaydb.core.Flyway;
import org.flywaydb.core.api.configuration.FluentConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Provider;
-import javax.sql.DataSource;
-import java.util.concurrent.ThreadFactory;
-
-public class MySQLDataSourceProvider implements Provider {
+public class MySQLDataSourceProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(MySQLDataSourceProvider.class);
@@ -34,8 +32,7 @@ public MySQLDataSourceProvider(MySQLProperties properties) {
this.properties = properties;
}
- @Override
- public DataSource get() {
+ public DataSource getDataSource() {
HikariDataSource dataSource = null;
try {
dataSource = new HikariDataSource(createConfiguration());
diff --git a/postgres-persistence/build.gradle b/postgres-persistence/build.gradle
index 74976bb711..8f30839f54 100644
--- a/postgres-persistence/build.gradle
+++ b/postgres-persistence/build.gradle
@@ -16,8 +16,6 @@ dependencies {
implementation project(':conductor-core')
implementation 'org.springframework.boot:spring-boot-starter'
- implementation "javax.inject:javax.inject:1"
-
// SBMTODO: remove guava dep
implementation "com.google.guava:guava:${revGuava}"
diff --git a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java
index d2fc52f950..1aa28ff197 100644
--- a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java
+++ b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java
@@ -31,7 +31,7 @@ public class PostgresConfiguration {
@Bean
public DataSource dataSource(PostgresProperties config) {
- return new PostgresDataSourceProvider(config).get();
+ return new PostgresDataSourceProvider(config).getDataSource();
}
@Bean
diff --git a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresDataSourceProvider.java b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresDataSourceProvider.java
index 0372116579..09716c43c9 100644
--- a/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresDataSourceProvider.java
+++ b/postgres-persistence/src/main/java/com/netflix/conductor/postgres/config/PostgresDataSourceProvider.java
@@ -17,14 +17,13 @@
import com.zaxxer.hikari.HikariDataSource;
import java.nio.file.Paths;
import java.util.concurrent.ThreadFactory;
-import javax.inject.Provider;
import javax.sql.DataSource;
import org.flywaydb.core.Flyway;
import org.flywaydb.core.api.configuration.FluentConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PostgresDataSourceProvider implements Provider {
+public class PostgresDataSourceProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(PostgresDataSourceProvider.class);
@@ -34,8 +33,7 @@ public PostgresDataSourceProvider(PostgresProperties properties) {
this.properties = properties;
}
- @Override
- public DataSource get() {
+ public DataSource getDataSource() {
HikariDataSource dataSource = null;
try {
dataSource = new HikariDataSource(createConfiguration());
diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/jedis/RedisSentinelJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/jedis/RedisSentinelJedisProvider.java
index 1fca46074e..bb4e632349 100644
--- a/redis-persistence/src/main/java/com/netflix/conductor/redis/jedis/RedisSentinelJedisProvider.java
+++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/jedis/RedisSentinelJedisProvider.java
@@ -15,24 +15,21 @@
import com.netflix.conductor.redis.config.utils.RedisProperties;
import com.netflix.dyno.connectionpool.Host;
import com.netflix.dyno.connectionpool.HostSupplier;
+import java.util.HashSet;
+import java.util.Set;
+import javax.inject.Provider;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import redis.clients.jedis.JedisSentinelPool;
import redis.clients.jedis.commands.JedisCommands;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import java.util.HashSet;
-import java.util.Set;
-
@SuppressWarnings("rawtypes")
public class RedisSentinelJedisProvider implements Provider {
private static final Logger LOGGER = LoggerFactory.getLogger(RedisSentinelJedisProvider.class);
private final JedisSentinel jedisSentinel;
- @Inject
public RedisSentinelJedisProvider(HostSupplier hostSupplier, RedisProperties properties) {
GenericObjectPoolConfig genericObjectPoolConfig = new GenericObjectPoolConfig();
genericObjectPoolConfig.setMinIdle(5);
diff --git a/server/build.gradle b/server/build.gradle
index fb8c2983c8..5f666b8c12 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -16,7 +16,6 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-log4j2'
-
implementation 'org.apache.logging.log4j:log4j-web'
}
diff --git a/test-harness/.gitignore b/test-harness/.gitignore
deleted file mode 100644
index ae3c172604..0000000000
--- a/test-harness/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ExclusiveJoinEndToEndSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ExclusiveJoinEndToEndSpec.groovy
deleted file mode 100644
index 626c261931..0000000000
--- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/ExclusiveJoinEndToEndSpec.groovy
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.netflix.conductor.test.integration
-
-import com.netflix.archaius.guice.ArchaiusModule
-import com.netflix.archaius.test.TestPropertyOverride
-import com.netflix.conductor.bootstrap.BootstrapModule
-import com.netflix.conductor.common.metadata.tasks.TaskResult
-import com.netflix.conductor.common.metadata.workflow.StartWorkflowRequest
-import com.netflix.conductor.common.metadata.workflow.WorkflowDef
-import com.netflix.conductor.common.run.Workflow
-import com.netflix.conductor.tests.integration.model.TaskWrapper
-import com.netflix.conductor.tests.utils.EmbeddedTestElasticSearch
-import com.netflix.conductor.tests.utils.IntegrationTestModule
-import com.netflix.conductor.tests.utils.JsonUtils
-import com.netflix.conductor.tests.utils.TestJettyServer
-import com.netflix.governator.guice.test.ModulesForTesting
-import spock.lang.Specification
-
-import javax.inject.Inject
-
-@ModulesForTesting([BootstrapModule.class, IntegrationTestModule.class, ArchaiusModule.class])
-//These settings can be moved to the Integration Module or to a properties file if they end up repeating in each of the test cases
-@TestPropertyOverride(["workflow.elasticsearch.embedded.port=9205",
- "workflow.elasticsearch.url=localhost:9305",
- "workflow.decider.locking.enabled=false",
- "EC2_REGION=us-east-1",
- "EC2_AVAILABILITY_ZONE=us-east-1c",
- "workflow.elasticsearch.index.name=conductor",
- "workflow.namespace.prefix=integration-test",
- "db=memory"
-])
-class ExclusiveJoinEndToEndSpec extends Specification {
-
- //This ensures that the embedded elastic search is started
- @Inject
- EmbeddedTestElasticSearch embeddedTestElasticSearch
- //This ensures that the jetty server is started
- @Inject
- TestJettyServer jettyServer
-
- def taskClient = TestJettyServer.getTaskClient()
- def workflowClient = TestJettyServer.getWorkflowClient()
- def metadataClient = TestJettyServer.getMetaDataClient()
-
- def CONDUCTOR_WORKFLOW_DEF_NAME = "ExclusiveJoinTestWorkflow"
-
- def setup() {
- registerWorkflowDefinitions()
- }
-
- def cleanup() {
- unRegisterWorkflowDefinitions()
- }
-
- def registerWorkflowDefinitions() {
- TaskWrapper taskWrapper = JsonUtils.fromJson("integration/scenarios/legacy/ExclusiveJoinTaskDef.json", TaskWrapper.class)
- metadataClient.registerTaskDefs(taskWrapper.getTaskDefs())
-
- WorkflowDef conductorWorkflowDef = JsonUtils.fromJson("integration/scenarios/legacy/ExclusiveJoinWorkflowDef.json",
- WorkflowDef.class)
- metadataClient.registerWorkflowDef(conductorWorkflowDef)
- }
-
- def unRegisterWorkflowDefinitions() {
- WorkflowDef conductorWorkflowDef = JsonUtils.fromJson("integration/scenarios/legacy/ExclusiveJoinWorkflowDef.json",
- WorkflowDef.class)
- metadataClient.unregisterWorkflowDef(conductorWorkflowDef.getName(), conductorWorkflowDef.getVersion())
- }
-
- def setTaskResult(String workflowInstanceId, String taskId, TaskResult.Status status,
- Map output) {
- TaskResult taskResult = new TaskResult();
- taskResult.setTaskId(taskId)
- taskResult.setWorkflowInstanceId(workflowInstanceId)
- taskResult.setStatus(status)
- taskResult.setOutputData(output)
- return taskResult
- }
-
-
- def "Test that the default decision is run"() {
- given: "The input parameter required to make decision_1 is null to ensure that the default decision is run"
- def inputParameters = ["decision_1": "null"]
-
- and: "A new workflow is started based on the input parameters"
- def startWorkflowRequest = new StartWorkflowRequest()
- .withName(CONDUCTOR_WORKFLOW_DEF_NAME)
- .withInput(inputParameters)
- .withVersion(1)
-
- and: "The workflow is started"
- String wfInstanceId = workflowClient.startWorkflow(startWorkflowRequest)
-
- and: "Get the pending taskId "
- String taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task1").getTaskId()
-
- and: "Then update the task to be completed"
- TaskResult taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, ["taskReferenceName": "task1"])
- taskClient.updateTask(taskResult)
-
- when: "Get the workflow that was updated with the task1 and get the output of the exclusiveJoin"
- Workflow workflow = workflowClient.getWorkflow(wfInstanceId, true)
- String taskReferenceName = workflow.getTaskByRefName("exclusiveJoin")
- .getOutputData()
- .get("taskReferenceName")
- .toString()
-
- then: "Ensure that the output data of exclusiveJoin taskReference is the task that was completed"
- taskReferenceName == "task1"
- Workflow.WorkflowStatus.COMPLETED == workflow.getStatus()
- }
-
- def "Test when the one decision is true and the other is decision null"() {
- given:
- def inputParameters = ["decision_1": "true", "decision_2": "null"]
-
- and: "A new workflow is started based on the input parameters"
- def startWorkflowRequest = new StartWorkflowRequest()
- .withName(CONDUCTOR_WORKFLOW_DEF_NAME)
- .withInput(inputParameters)
- .withVersion(1)
-
- and: "The workflow is started"
- def wfInstanceId = workflowClient.startWorkflow(startWorkflowRequest)
-
- and: "Get the pending taskId task1"
- def taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task1")
- .getTaskId()
-
- and: "Then update the task to be completed"
- def taskOutput = ["taskReferenceName": "task1"]
- def taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- and: "Get the pending taskId task2"
- taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task2")
- .getTaskId()
-
- and: "Then update the task to be completed"
- taskOutput.put("taskReferenceName", "task2")
- taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- when: "Get the workflow that was updated with the task2 and get the output of the exclusiveJoin"
- Workflow workflow = workflowClient.getWorkflow(wfInstanceId, true)
- String taskReferenceName = workflow.getTaskByRefName("exclusiveJoin")
- .getOutputData()
- .get("taskReferenceName")
- .toString()
-
- then: "Ensure that the output data of exclusiveJoin taskReference is the task that was completed"
- taskReferenceName == "task2"
- Workflow.WorkflowStatus.COMPLETED == workflow.getStatus()
- }
-
- def "Test when both the decisions, decision_1 and decision_2 are true"() {
- given: "The input parameters for the workflow to ensure that both the decisions are true"
- def inputParameters = ["decision_1": "true", "decision_2": "true"]
-
- and: "A new workflow is started based on the input parameters"
- def startWorkflowRequest = new StartWorkflowRequest()
- .withName(CONDUCTOR_WORKFLOW_DEF_NAME)
- .withInput(inputParameters)
- .withVersion(1)
-
- and: "The workflow is started"
- def wfInstanceId = workflowClient.startWorkflow(startWorkflowRequest)
-
- and: "Get the pending taskId task1"
- def taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task1")
- .getTaskId()
-
- and: "Then update the task to be completed"
- def taskOutput = ["taskReferenceName": "task1"]
- def taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- and: "Get the pending taskId task2"
- taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task2")
- .getTaskId()
-
- and: "Then update the task2 to be completed"
- taskOutput.put("taskReferenceName", "task2")
- taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- and: "Get the pending taskId task3"
- taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task3")
- .getTaskId()
-
- and: "Then update the task2 to be completed"
- taskOutput.put("taskReferenceName", "task3")
- taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- when: "Get the workflow that was updated with the task3 and get the output of the exclusiveJoin"
- Workflow workflow = workflowClient.getWorkflow(wfInstanceId, true)
- String taskReferenceName = workflow.getTaskByRefName("exclusiveJoin")
- .getOutputData()
- .get("taskReferenceName")
- .toString()
-
- then: "Ensure that the output data of exclusiveJoin taskReference is the task that was completed"
- taskReferenceName == "task3"
- Workflow.WorkflowStatus.COMPLETED == workflow.getStatus()
- }
-
- def "Test when decision_1 is false and decision_3 is default"() {
- given:
- def inputParameters = ["decision_1": "false", "decision_3": "null"]
-
- and: "A new workflow is started based on the input parameters"
- def startWorkflowRequest = new StartWorkflowRequest()
- .withName(CONDUCTOR_WORKFLOW_DEF_NAME)
- .withInput(inputParameters)
- .withVersion(1)
-
- and: "The workflow is started"
- def wfInstanceId = workflowClient.startWorkflow(startWorkflowRequest)
-
- and: "Get the pending taskId task1"
- def taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task1")
- .getTaskId()
-
- and: "Then update the task to be completed"
- def taskOutput = ["taskReferenceName": "task1"]
- def taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- and: "Get the pending taskId task4"
- taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task4")
- .getTaskId()
-
- and: "Then update the task4 to be completed"
- taskOutput.put("taskReferenceName", "task4")
- taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- when: "Get the workflow that was updated with the task4 and get the output of the exclusiveJoin"
- Workflow workflow = workflowClient.getWorkflow(wfInstanceId, true)
- String taskReferenceName = workflow.getTaskByRefName("exclusiveJoin")
- .getOutputData()
- .get("taskReferenceName")
- .toString()
-
- then: "Ensure that the output data of exclusiveJoin taskReference is the task that was completed"
- taskReferenceName == "task4"
- Workflow.WorkflowStatus.COMPLETED == workflow.getStatus()
- }
-
- def "Test when decision_1 is false and decision_3 is true"() {
- given:
- def inputParameters = ["decision_1": "false", "decision_3": "true"]
-
- and: "A new workflow is started based on the input parameters"
- def startWorkflowRequest = new StartWorkflowRequest()
- .withName(CONDUCTOR_WORKFLOW_DEF_NAME)
- .withInput(inputParameters)
- .withVersion(1)
-
- and: "The workflow is started"
- def wfInstanceId = workflowClient.startWorkflow(startWorkflowRequest)
-
- and: "Get the pending taskId task1"
- def taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task1")
- .getTaskId()
-
- and: "Then update the task to be completed"
- def taskOutput = ["taskReferenceName": "task1"]
- def taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- and: "Get the pending taskId task4"
- taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task4")
- .getTaskId()
-
- and: "Then update the task4 to be completed"
- taskOutput.put("taskReferenceName", "task4")
- taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- and: "Get the pending taskId task5"
- taskId = taskClient.getPendingTaskForWorkflow(wfInstanceId, "task5")
- .getTaskId()
-
- and: "Then update the task4 to be completed"
- taskOutput.put("taskReferenceName", "task5")
- taskResult = setTaskResult(wfInstanceId, taskId, TaskResult.Status.COMPLETED, taskOutput)
- taskClient.updateTask(taskResult)
-
- when: "Get the workflow that was updated with the task5 and get the output of the exclusiveJoin"
- Workflow workflow = workflowClient.getWorkflow(wfInstanceId, true)
- String taskReferenceName = workflow.getTaskByRefName("exclusiveJoin")
- .getOutputData()
- .get("taskReferenceName")
- .toString()
-
- then: "Ensure that the output data of exclusiveJoin taskReference is the task that was completed"
- taskReferenceName == "task5"
- Workflow.WorkflowStatus.COMPLETED == workflow.getStatus()
-
- }
-
-
-}
diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/JsonJQTransformTaskSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/JsonJQTransformTaskSpec.groovy
deleted file mode 100644
index ac1165615f..0000000000
--- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/JsonJQTransformTaskSpec.groovy
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.netflix.conductor.test.integration
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.netflix.archaius.guice.ArchaiusModule
-import com.netflix.conductor.common.metadata.tasks.Task
-import com.netflix.conductor.common.run.Workflow
-import com.netflix.conductor.common.utils.JsonMapperProvider
-import com.netflix.conductor.contribs.json.JsonJqTransform
-import com.netflix.conductor.core.execution.WorkflowExecutor
-import com.netflix.conductor.service.ExecutionService
-import com.netflix.conductor.test.util.WorkflowTestUtil
-import com.netflix.conductor.tests.utils.TestModule
-import com.netflix.governator.guice.test.ModulesForTesting
-import spock.lang.Shared
-import spock.lang.Specification
-
-import javax.inject.Inject
-
-@ModulesForTesting([TestModule.class, ArchaiusModule.class])
-class JsonJQTransformTaskSpec extends Specification {
-
- @Inject
- ExecutionService workflowExecutionService
-
- @Inject
- WorkflowExecutor workflowExecutor
-
- @Inject
- WorkflowTestUtil workflowTestUtil
-
- @Shared
- ObjectMapper objectMapper = new JsonMapperProvider().get()
-
- @Shared
- def JSON_JQ_TRANSFORM_WF = 'test_json_jq_transform_wf'
-
- def setup() {
- // We do this to register the JSON JQ TRANSFORM task type as a system task since it's in the contrib module
- new JsonJqTransform(objectMapper)
-
- workflowTestUtil.registerWorkflows(
- 'simple_json_jq_transform_integration_test.json',
- )
- }
-
- def cleanup() {
- workflowTestUtil.clearWorkflows()
- }
-
- /**
- * Given the following input JSON
- * {
- * "in1": {
- * "array": [ "a", "b" ]
- * },
- * "in2": {
- * "array": [ "c", "d" ]
- * }
- * }
- * expect the workflow task to transform to following result:
- * {
- * out: [ "a", "b", "c", "d" ]
- * }
- */
- def "Test workflow with json jq transform task succeeds"() {
- given: "workflow input"
- def workflowInput = new HashMap()
- workflowInput['in1'] = new HashMap()
- workflowInput['in1']['array'] = ["a", "b"]
- workflowInput['in2'] = new HashMap()
- workflowInput['in2']['array'] = ["c", "d"]
-
- when: "workflow which has the json jq transform task has started"
- def workflowInstanceId = workflowExecutor.startWorkflow(JSON_JQ_TRANSFORM_WF, 1,
- '', workflowInput, null, null, null)
-
- then:"verify that the workflow and task are completed with expected output"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.COMPLETED
- tasks.size() == 1
- tasks[0].status == Task.Status.COMPLETED
- tasks[0].taskType == 'JSON_JQ_TRANSFORM'
- tasks[0].outputData as String == "[result:[out:[a, b, c, d]], resultList:[[out:[a, b, c, d]]]]"
- }
- }
-
- /**
- * Given the following input JSON
- * {
- * "in1": "a",
- * "in2": "b"
- * }
- * using the same query from the success test, jq will try to get in1['array']
- * and fail since 'in1' is a string
- */
- def "Test workflow with json jq transform task fails"() {
- given: "workflow input"
- def workflowInput = new HashMap()
- workflowInput['in1'] = "a"
- workflowInput['in2'] = "b"
-
- when: "workflow which has the json jq transform task has started"
- def workflowInstanceId = workflowExecutor.startWorkflow(JSON_JQ_TRANSFORM_WF, 1,
- '', workflowInput, null, null, null)
-
- then:"verify that the workflow and task failed with expected error"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.FAILED
- tasks.size() == 1
- tasks[0].status == Task.Status.FAILED
- tasks[0].taskType == 'JSON_JQ_TRANSFORM'
- tasks[0].reasonForIncompletion as String == "Cannot index string with string \"array\""
- }
- }
-
-}
diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/LambdaAndTerminateSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/LambdaAndTerminateSpec.groovy
deleted file mode 100644
index 9310aa5c04..0000000000
--- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/LambdaAndTerminateSpec.groovy
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.netflix.conductor.test.integration
-
-import com.netflix.conductor.common.metadata.tasks.Task
-import com.netflix.conductor.common.metadata.tasks.TaskResult
-import com.netflix.conductor.common.run.Workflow
-import com.netflix.conductor.core.execution.WorkflowExecutor
-import com.netflix.conductor.service.ExecutionService
-import com.netflix.conductor.test.util.WorkflowTestUtil
-import com.netflix.conductor.tests.utils.TestModule
-import com.netflix.governator.guice.test.ModulesForTesting
-import spock.lang.Shared
-import spock.lang.Specification
-
-import javax.inject.Inject
-
-@ModulesForTesting([TestModule.class])
-class LambdaAndTerminateSpec extends Specification {
-
- @Inject
- ExecutionService workflowExecutionService
-
- @Inject
- WorkflowExecutor workflowExecutor
-
- @Inject
- WorkflowTestUtil workflowTestUtil
-
- @Shared
- def WORKFLOW_WITH_TERMINATE_TASK = 'test_terminate_task_wf'
-
- @Shared
- def WORKFLOW_WITH_TERMINATE_TASK_FAILED = 'test_terminate_task_failed_wf'
-
- @Shared
- def WORKFLOW_WITH_LAMBDA_TASK = 'test_lambda_wf'
-
- @Shared
- def PARENT_WORKFLOW_WITH_TERMINATE_TASK = 'test_terminate_task_parent_wf'
-
- @Shared
- def SUBWORKFLOW_FOR_TERMINATE_TEST = 'test_terminate_task_sub_wf'
-
- def setup() {
- workflowTestUtil.registerWorkflows(
- 'failure_workflow_for_terminate_task_workflow.json',
- 'terminate_task_completed_workflow_integration_test.json',
- 'terminate_task_failed_workflow_integration.json',
- 'simple_lambda_workflow_integration_test.json',
- 'terminate_task_parent_workflow.json',
- 'terminate_task_sub_workflow.json'
- )
- }
-
- def cleanup() {
- workflowTestUtil.clearWorkflows()
- }
-
- def "Test workflow with a terminate task when the status is completed"() {
- given: "workflow input"
- def workflowInput = new HashMap()
- workflowInput['a'] = 1
-
- when: "Start the workflow which has the terminate task"
- def workflowInstanceId = workflowExecutor.startWorkflow(WORKFLOW_WITH_TERMINATE_TASK, 1,
- '', workflowInput, null, null, null)
-
- then: "Ensure that the workflow has started and the first task is in scheduled state"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.COMPLETED
- tasks.size() == 2
- tasks[0].status == Task.Status.COMPLETED
- tasks[0].taskType == 'LAMBDA'
- tasks[1].status == Task.Status.COMPLETED
- tasks[1].taskType == 'TERMINATE'
- }
- }
-
- def "Test workflow with a terminate task when the status is failed"() {
- given: "workflow input"
- def workflowInput = new HashMap()
- workflowInput['a'] = 1
-
- when: "Start the workflow which has the terminate task"
- def workflowInstanceId = workflowExecutor.startWorkflow(WORKFLOW_WITH_TERMINATE_TASK_FAILED, 1,
- '', workflowInput, null, null, null)
-
- then:"Verify that the workflow has failed"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.FAILED
- tasks.size() == 2
- tasks[0].status == Task.Status.COMPLETED
- tasks[0].taskType == 'LAMBDA'
- tasks[1].status == Task.Status.COMPLETED
- tasks[1].taskType == 'TERMINATE'
- output
- def failedWorkflowId = output['conductor.failure_workflow'] as String
- with(workflowExecutionService.getExecutionStatus(failedWorkflowId, true)) {
- status == Workflow.WorkflowStatus.COMPLETED
- input['workflowId'] == workflowInstanceId
- tasks.size() == 1
- tasks[0].taskType == 'LAMBDA'
- }
- }
- }
-
- def "Test workflow with a terminate task when the workflow has a subworkflow"() {
- given: "workflow input"
- def workflowInput = new HashMap()
- workflowInput['a'] = 1
-
- when: "Start the workflow which has the terminate task"
- def workflowInstanceId = workflowExecutor.startWorkflow(PARENT_WORKFLOW_WITH_TERMINATE_TASK, 1,
- '', workflowInput, null, null, null)
-
- then: "verify that the workflow has started and the tasks are as expected"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.RUNNING
- tasks.size() == 6
- tasks[0].status == Task.Status.COMPLETED
- tasks[0].taskType == 'FORK'
- tasks[1].status == Task.Status.COMPLETED
- tasks[1].taskType == 'LAMBDA'
- tasks[1].referenceTaskName == 'lambdaTask1'
- tasks[2].status == Task.Status.COMPLETED
- tasks[2].taskType == 'LAMBDA'
- tasks[2].referenceTaskName == 'lambdaTask2'
- tasks[3].status == Task.Status.IN_PROGRESS
- tasks[3].taskType == 'JOIN'
- tasks[4].status == Task.Status.SCHEDULED || tasks[4].status == Task.Status.IN_PROGRESS
- tasks[4].taskType == 'SUB_WORKFLOW'
- tasks[5].status == Task.Status.IN_PROGRESS
- tasks[5].taskType == 'WAIT'
- }
-
- when: "Complete the WAIT task that should cause the TERMINATE task to execute"
- def waitTask = workflowExecutionService.getExecutionStatus(workflowInstanceId, true).tasks[5]
- waitTask.status = Task.Status.COMPLETED
- workflowExecutor.updateTask(new TaskResult(waitTask))
-
- then:"Verify that the workflow has completed and the SUB_WORKFLOW is not still IN_PROGRESS (should be SKIPPED)"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.COMPLETED
- tasks.size() == 7
- tasks[0].status == Task.Status.COMPLETED
- tasks[0].taskType == 'FORK'
- tasks[1].status == Task.Status.COMPLETED
- tasks[1].taskType == 'LAMBDA'
- tasks[1].referenceTaskName == 'lambdaTask1'
- tasks[2].status == Task.Status.COMPLETED
- tasks[2].taskType == 'LAMBDA'
- tasks[2].referenceTaskName == 'lambdaTask2'
- tasks[3].status == Task.Status.SKIPPED
- tasks[3].taskType == 'JOIN'
- tasks[4].status == Task.Status.SKIPPED
- tasks[4].taskType == 'SUB_WORKFLOW'
- tasks[5].status == Task.Status.COMPLETED
- tasks[5].taskType == 'WAIT'
- tasks[6].status == Task.Status.COMPLETED
- tasks[6].taskType == 'TERMINATE'
- }
- }
-
- def "Test workflow with lambda task"() {
- given: "workflow input"
- def workflowInput = new HashMap()
- workflowInput['a'] = 1
-
- when: "Start the workflow which has the terminate task"
- def workflowInstanceId = workflowExecutor.startWorkflow(WORKFLOW_WITH_LAMBDA_TASK, 1,
- '', workflowInput, null, null, null)
-
- then:"verify that the task is completed"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.COMPLETED
- tasks.size() == 1
- tasks[0].status == Task.Status.COMPLETED
- tasks[0].taskType == 'LAMBDA'
- tasks[0].outputData as String == "[result:[testvalue:true]]"
- }
- }
-
-}
diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/TaskResiliencySpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/TaskResiliencySpec.groovy
deleted file mode 100644
index 2707e1d289..0000000000
--- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/TaskResiliencySpec.groovy
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-package com.netflix.conductor.test.integration
-
-import com.netflix.conductor.common.metadata.tasks.Task
-import com.netflix.conductor.common.run.Workflow
-import com.netflix.conductor.core.execution.WorkflowExecutor
-import com.netflix.conductor.core.execution.WorkflowRepairService
-import com.netflix.conductor.dao.QueueDAO
-import com.netflix.conductor.service.ExecutionService
-import com.netflix.conductor.test.util.MockQueueDAOModule
-import com.netflix.conductor.test.util.WorkflowTestUtil
-import spock.guice.UseModules
-import spock.lang.Shared
-import spock.lang.Specification
-
-import javax.inject.Inject
-
-import static com.netflix.conductor.test.util.WorkflowTestUtil.verifyPolledAndAcknowledgedTask
-
-@UseModules(MockQueueDAOModule)
-class TaskResiliencySpec extends Specification {
-
- @Inject
- ExecutionService workflowExecutionService
-
- @Inject
- WorkflowExecutor workflowExecutor
-
- @Inject
- WorkflowTestUtil workflowTestUtil
-
- @Inject
- WorkflowRepairService workflowRepairService
-
- @Inject
- QueueDAO queueDAO
-
- @Shared
- def SIMPLE_TWO_TASK_WORKFLOW = 'integration_test_wf'
-
- def setup() {
- workflowTestUtil.taskDefinitions()
- workflowTestUtil.registerWorkflows(
- 'simple_workflow_1_integration_test.json'
- )
- }
-
- def cleanup() {
- workflowTestUtil.clearWorkflows()
- }
-
- def "Verify that a workflow recovers and completes on schedule task failure from queue push failure"() {
- when: "Start a simple workflow"
- def workflowInstanceId = workflowExecutor.startWorkflow(SIMPLE_TWO_TASK_WORKFLOW, 1,
- '', [:], null, null, null)
-
- then: "Retrieve the workflow"
- def workflow = workflowExecutionService.getExecutionStatus(workflowInstanceId, true)
- workflow.status == Workflow.WorkflowStatus.RUNNING
- workflow.tasks.size() == 1
- workflow.tasks[0].taskType == 'integration_task_1'
- workflow.tasks[0].status == Task.Status.SCHEDULED
- def taskId = workflow.tasks[0].taskId
-
- // Simulate queue push failure when creating a new task, after completing first task
- when: "The first task 'integration_task_1' is polled and completed"
- def task1Try1 = workflowTestUtil.pollAndCompleteTask('integration_task_1', 'task1.integration.worker')
-
- then: "Verify that the task was polled and acknowledged"
- 1 * queueDAO.pop(_, 1, _) >> Collections.singletonList(taskId)
- 1 * queueDAO.ack(*_) >> true
- 1 * queueDAO.push(*_) >> { throw new IllegalStateException("Queue push failed from Spy") }
- verifyPolledAndAcknowledgedTask(task1Try1)
-
- and: "Ensure that the next task is SCHEDULED even after failing to push taskId message to queue"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.RUNNING
- tasks.size() == 2
- tasks[0].taskType == 'integration_task_1'
- tasks[0].status == Task.Status.COMPLETED
- tasks[1].taskType == 'integration_task_2'
- tasks[1].status == Task.Status.SCHEDULED
- }
-
- when: "The second task 'integration_task_2' is polled for"
- def task1Try2 = workflowTestUtil.pollAndCompleteTask('integration_task_2', 'task2.integration.worker')
-
- then: "Verify that the task was not polled, and the taskId doesn't exist in the queue"
- task1Try2[0] == null
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.RUNNING
- tasks.size() == 2
- tasks[0].taskType == 'integration_task_1'
- tasks[0].status == Task.Status.COMPLETED
- tasks[1].taskType == 'integration_task_2'
- tasks[1].status == Task.Status.SCHEDULED
- def currentTaskId = tasks[1].getTaskId()
- queueDAO.containsMessage("integration_task_2", currentTaskId) == false
- }
-
- when: "Running a repair and decide on the workflow"
- workflowRepairService.verifyAndRepairWorkflow(workflowInstanceId, true)
- workflowExecutor.decide(workflowInstanceId)
- task1Try2 = workflowTestUtil.pollAndCompleteTask('integration_task_2', 'task2.integration.worker')
-
- then: "verify that the next scheduled task can be polled and executed successfully"
- with(workflowExecutionService.getExecutionStatus(workflowInstanceId, true)) {
- status == Workflow.WorkflowStatus.COMPLETED
- tasks.size() == 2
- tasks[1].taskType == 'integration_task_2'
- tasks[1].status == Task.Status.COMPLETED
- }
- }
-}
diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/util/MockQueueDAOModule.java b/test-harness/src/test/groovy/com/netflix/conductor/test/util/MockQueueDAOModule.java
deleted file mode 100644
index 33626ae7e3..0000000000
--- a/test-harness/src/test/groovy/com/netflix/conductor/test/util/MockQueueDAOModule.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2020 Netflix, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-package com.netflix.conductor.test.util;
-
-import com.netflix.conductor.core.execution.WorkflowExecutorModule;
-import com.netflix.conductor.dao.QueueDAO;
-import com.netflix.conductor.dao.dynomite.queue.DynoQueueDAO;
-import com.netflix.conductor.jedis.JedisMock;
-import com.netflix.conductor.tests.utils.TestModule;
-import com.netflix.dyno.connectionpool.Host;
-import com.netflix.dyno.queues.ShardSupplier;
-import com.netflix.dyno.queues.redis.RedisQueues;
-import redis.clients.jedis.commands.JedisCommands;
-import spock.mock.DetachedMockFactory;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Creates a Spock "Spy"'ed QueueDAO Guice injection, that can be used in integration testing.
- */
-public class MockQueueDAOModule extends TestModule {
- @Override
- public void configureQueueDAO() {
- DetachedMockFactory detachedMockFactory = new DetachedMockFactory();
-
- JedisCommands jedisMock = new JedisMock();
- ShardSupplier shardSupplier = new ShardSupplier() {
- @Override
- public Set getQueueShards() {
- return new HashSet<>(Collections.singletonList("a"));
- }
-
- @Override
- public String getCurrentShard() {
- return "a";
- }
-
- @Override
- public String getShardForHost(Host host) {
- return "a";
- }
- };
- RedisQueues redisQueues = new RedisQueues(jedisMock, jedisMock, "mockedQueues", shardSupplier, 60000, 120000);
- DynoQueueDAO dynoQueueDAO = new DynoQueueDAO(redisQueues);
-
- bind(QueueDAO.class).toInstance(detachedMockFactory.Spy(dynoQueueDAO));
-
- install(new WorkflowExecutorModule());
- }
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF.json b/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF.json
deleted file mode 100644
index 846fee0766..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF.json
+++ /dev/null
@@ -1,532 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1576296413208,
- "updateTime": 1576296413383,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "1e2ab6e4-27d4-4cd1-8ddf-bbc9bb12e67d",
- "tasks": [{
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "xxx"
- },
- "referenceTaskName": "conditional",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296413347,
- "startTime": 1576296413347,
- "endTime": 1576296413358,
- "updateTime": 1576296413358,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "1e2ab6e4-27d4-4cd1-8ddf-bbc9bb12e67d",
- "workflowType": "ConditionalTaskWF",
- "taskId": "e2298255-705c-4cd0-b278-df2147d5ee0f",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["xxx"]
- },
- "workflowTask": {
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "junit_task_10",
- "status": "SCHEDULED",
- "inputData": {
- "tp10": "workflow.input.param2"
- },
- "referenceTaskName": "t10",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "junit_task_10",
- "scheduledTime": 1576296413349,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "1e2ab6e4-27d4-4cd1-8ddf-bbc9bb12e67d",
- "workflowType": "ConditionalTaskWF",
- "taskId": "243ea389-1b4d-4940-9776-6b7803fac541",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": true
- },
- "loopOverTask": false
- }],
- "input": {
- "param1": "xxx",
- "param2": "two"
- },
- "output": {},
- "workflowType": "ConditionalTaskWF",
- "version": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "schemaVersion": 2,
- "taskToDomain": {},
- "failedReferenceTaskNames": [],
- "workflowDefinition": {
- "updateTime": 1576296413181,
- "name": "ConditionalTaskWF",
- "description": "ConditionalTaskWF",
- "version": 1,
- "tasks": [{
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "finalcondition",
- "taskReferenceName": "finalCase",
- "inputParameters": {
- "finalCase": "${workflow.input.finalCase}"
- },
- "type": "DECISION",
- "caseValueParam": "finalCase",
- "decisionCases": {
- "notify": [{
- "name": "junit_task_4",
- "taskReferenceName": "junit_task_4",
- "inputParameters": {},
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412911,
- "createdBy": "junit_app",
- "name": "junit_task_4",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "inputParameters": ["param1", "param2"],
- "outputParameters": {},
- "schemaVersion": 2,
- "restartable": true,
- "workflowStatusListenerEnabled": false
- },
- "priority": 0,
- "startTime": 1576296413208,
- "workflowName": "ConditionalTaskWF",
- "workflowVersion": 1
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF2.json b/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF2.json
deleted file mode 100644
index 7852dca5d1..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF2.json
+++ /dev/null
@@ -1,659 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1576296446321,
- "updateTime": 1576296446341,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "029b1b00-b786-4a72-a78c-75bed65451f9",
- "tasks": [{
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "nested"
- },
- "referenceTaskName": "conditional",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296446325,
- "startTime": 1576296446325,
- "endTime": 1576296446329,
- "updateTime": 1576296446329,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "029b1b00-b786-4a72-a78c-75bed65451f9",
- "workflowType": "ConditionalTaskWF",
- "taskId": "c56f5323-bd2b-4acc-8ec1-ab073671ebfd",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["nested"]
- },
- "workflowTask": {
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "one"
- },
- "referenceTaskName": "nestedCondition",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296446326,
- "startTime": 1576296446326,
- "endTime": 1576296446329,
- "updateTime": 1576296446329,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "029b1b00-b786-4a72-a78c-75bed65451f9",
- "workflowType": "ConditionalTaskWF",
- "taskId": "98507ad1-5570-45ab-8e5c-f25005403e0f",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["one"]
- },
- "workflowTask": {
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "nested",
- "p2": "one"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 3,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1576296446327,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "029b1b00-b786-4a72-a78c-75bed65451f9",
- "workflowType": "ConditionalTaskWF",
- "taskId": "aba452f9-00d0-4f2c-ba40-b367dde9c315",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": true
- },
- "loopOverTask": false
- }],
- "input": {
- "param1": "nested",
- "param2": "one"
- },
- "output": {},
- "workflowType": "ConditionalTaskWF",
- "version": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "schemaVersion": 2,
- "taskToDomain": {},
- "failedReferenceTaskNames": [],
- "workflowDefinition": {
- "updateTime": 1576296413181,
- "name": "ConditionalTaskWF",
- "description": "ConditionalTaskWF",
- "version": 1,
- "tasks": [{
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "finalcondition",
- "taskReferenceName": "finalCase",
- "inputParameters": {
- "finalCase": "${workflow.input.finalCase}"
- },
- "type": "DECISION",
- "caseValueParam": "finalCase",
- "decisionCases": {
- "notify": [{
- "name": "junit_task_4",
- "taskReferenceName": "junit_task_4",
- "inputParameters": {},
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412911,
- "createdBy": "junit_app",
- "name": "junit_task_4",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "inputParameters": ["param1", "param2"],
- "outputParameters": {},
- "schemaVersion": 2,
- "restartable": true,
- "workflowStatusListenerEnabled": false
- },
- "priority": 0,
- "startTime": 1576296446321,
- "workflowName": "ConditionalTaskWF",
- "workflowVersion": 1
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF3.json b/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF3.json
deleted file mode 100644
index 0f17444dc7..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF3.json
+++ /dev/null
@@ -1,657 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1576296465907,
- "updateTime": 1576296465924,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "edbe3f4d-9436-4b91-ba0d-14c382390df1",
- "tasks": [{
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "nested"
- },
- "referenceTaskName": "conditional",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296465911,
- "startTime": 1576296465911,
- "endTime": 1576296465913,
- "updateTime": 1576296465913,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "edbe3f4d-9436-4b91-ba0d-14c382390df1",
- "workflowType": "ConditionalTaskWF",
- "taskId": "f4066358-374f-4e55-af29-fc0ae3bb5fc5",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["nested"]
- },
- "workflowTask": {
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "two"
- },
- "referenceTaskName": "nestedCondition",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296465911,
- "startTime": 1576296465911,
- "endTime": 1576296465913,
- "updateTime": 1576296465913,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "edbe3f4d-9436-4b91-ba0d-14c382390df1",
- "workflowType": "ConditionalTaskWF",
- "taskId": "5516952d-ad75-45c2-ab5d-8a61bd1f91cc",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["two"]
- },
- "workflowTask": {
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "junit_task_2",
- "status": "SCHEDULED",
- "inputData": {
- "tp1": "nested"
- },
- "referenceTaskName": "t2",
- "retryCount": 0,
- "seq": 3,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "junit_task_2",
- "scheduledTime": 1576296465912,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "edbe3f4d-9436-4b91-ba0d-14c382390df1",
- "workflowType": "ConditionalTaskWF",
- "taskId": "eeaceed5-9816-4c78-81dc-aa42868863ec",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": true
- },
- "loopOverTask": false
- }],
- "input": {
- "param1": "nested",
- "param2": "two"
- },
- "output": {},
- "workflowType": "ConditionalTaskWF",
- "version": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "schemaVersion": 2,
- "taskToDomain": {},
- "failedReferenceTaskNames": [],
- "workflowDefinition": {
- "updateTime": 1576296413181,
- "name": "ConditionalTaskWF",
- "description": "ConditionalTaskWF",
- "version": 1,
- "tasks": [{
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "finalcondition",
- "taskReferenceName": "finalCase",
- "inputParameters": {
- "finalCase": "${workflow.input.finalCase}"
- },
- "type": "DECISION",
- "caseValueParam": "finalCase",
- "decisionCases": {
- "notify": [{
- "name": "junit_task_4",
- "taskReferenceName": "junit_task_4",
- "inputParameters": {},
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412911,
- "createdBy": "junit_app",
- "name": "junit_task_4",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "inputParameters": ["param1", "param2"],
- "outputParameters": {},
- "schemaVersion": 2,
- "restartable": true,
- "workflowStatusListenerEnabled": false
- },
- "priority": 0,
- "startTime": 1576296465907,
- "workflowName": "ConditionalTaskWF",
- "workflowVersion": 1
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF4.json b/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF4.json
deleted file mode 100644
index bc4cfe9d2e..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/ConditionalTaskWF4.json
+++ /dev/null
@@ -1,533 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1576296484061,
- "updateTime": 1576296484108,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "3416f2ab-94d3-4fc3-a6e2-10f8aa3fd579",
- "tasks": [{
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "three"
- },
- "referenceTaskName": "conditional",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296484067,
- "startTime": 1576296484067,
- "endTime": 1576296484068,
- "updateTime": 1576296484068,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "3416f2ab-94d3-4fc3-a6e2-10f8aa3fd579",
- "workflowType": "ConditionalTaskWF",
- "taskId": "c4662bfd-92c8-40c9-b109-4992f46aec34",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["three"]
- },
- "workflowTask": {
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "junit_task_3",
- "status": "SCHEDULED",
- "inputData": {
- "tp3": "workflow.input.param2"
- },
- "referenceTaskName": "t3",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "testCaseStatements: 1576296413186",
- "pollCount": 0,
- "taskDefName": "junit_task_3",
- "scheduledTime": 1576296484067,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "3416f2ab-94d3-4fc3-a6e2-10f8aa3fd579",
- "workflowType": "ConditionalTaskWF",
- "taskId": "e513dadd-3e8a-4e78-bc99-457c0159a0b1",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": true
- },
- "loopOverTask": false
- }],
- "input": {
- "finalCase": "notify",
- "param1": "three",
- "param2": "two"
- },
- "output": {},
- "workflowType": "ConditionalTaskWF",
- "version": 1,
- "correlationId": "testCaseStatements: 1576296413186",
- "schemaVersion": 2,
- "taskToDomain": {},
- "failedReferenceTaskNames": [],
- "workflowDefinition": {
- "updateTime": 1576296413181,
- "name": "ConditionalTaskWF",
- "description": "ConditionalTaskWF",
- "version": 1,
- "tasks": [{
- "name": "conditional",
- "taskReferenceName": "conditional",
- "inputParameters": {
- "case": "${workflow.input.param1}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "nested": [{
- "name": "nestedCondition",
- "taskReferenceName": "nestedCondition",
- "inputParameters": {
- "case": "${workflow.input.param2}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "one": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412909,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "two": [{
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "${workflow.input.param1}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "three": [{
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "tp3": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412910,
- "createdBy": "junit_app",
- "name": "junit_task_3",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "tp10": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412921,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "finalcondition",
- "taskReferenceName": "finalCase",
- "inputParameters": {
- "finalCase": "${workflow.input.finalCase}"
- },
- "type": "DECISION",
- "caseValueParam": "finalCase",
- "decisionCases": {
- "notify": [{
- "name": "junit_task_4",
- "taskReferenceName": "junit_task_4",
- "inputParameters": {},
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296412911,
- "createdBy": "junit_app",
- "name": "junit_task_4",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "inputParameters": ["param1", "param2"],
- "outputParameters": {},
- "schemaVersion": 2,
- "restartable": true,
- "workflowStatusListenerEnabled": false
- },
- "priority": 0,
- "startTime": 1576296484061,
- "workflowName": "ConditionalTaskWF",
- "workflowVersion": 1
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/DecisionWorkflow.json b/test-harness/src/test/resources/integration/scenarios/legacy/DecisionWorkflow.json
deleted file mode 100644
index 099c254f74..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/DecisionWorkflow.json
+++ /dev/null
@@ -1,417 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1576296928786,
- "updateTime": 1576296929041,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "2390bd4d-96de-47a5-82c2-21125b0d8040",
- "tasks": [{
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "c"
- },
- "referenceTaskName": "decisionTask",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "decision",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296928955,
- "startTime": 1576296928955,
- "endTime": 1576296928982,
- "updateTime": 1576296928982,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "2390bd4d-96de-47a5-82c2-21125b0d8040",
- "workflowType": "DecisionWorkflow",
- "taskId": "166b7778-98ae-43d8-a4f7-0b7348228e62",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["c"]
- },
- "workflowTask": {
- "name": "decisionTask",
- "taskReferenceName": "decisionTask",
- "inputParameters": {
- "case": "${workflow.input.case}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "c": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927431,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927432,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_5",
- "taskReferenceName": "t5",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927434,
- "createdBy": "junit_app",
- "name": "junit_task_5",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1",
- "p2": "p2"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "decision",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1576296928961,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "2390bd4d-96de-47a5-82c2-21125b0d8040",
- "workflowType": "DecisionWorkflow",
- "taskId": "c495e6ea-6088-4b7e-b932-1dfb5fecf756",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927431,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": true
- },
- "loopOverTask": false
- }],
- "input": {
- "param1": "p1",
- "case": "c",
- "param2": "p2"
- },
- "output": {},
- "workflowType": "DecisionWorkflow",
- "version": 1,
- "correlationId": "decision",
- "schemaVersion": 2,
- "taskToDomain": {},
- "failedReferenceTaskNames": [],
- "workflowDefinition": {
- "updateTime": 1576296928656,
- "name": "DecisionWorkflow",
- "description": "DecisionWorkflow",
- "version": 1,
- "tasks": [{
- "name": "decisionTask",
- "taskReferenceName": "decisionTask",
- "inputParameters": {
- "case": "${workflow.input.case}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "c": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927431,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927432,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_5",
- "taskReferenceName": "t5",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927434,
- "createdBy": "junit_app",
- "name": "junit_task_5",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296927468,
- "createdBy": "junit_app",
- "name": "junit_task_20",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "inputParameters": [],
- "outputParameters": {},
- "schemaVersion": 2,
- "restartable": true,
- "workflowStatusListenerEnabled": false
- },
- "priority": 0,
- "startTime": 1576296928786,
- "workflowName": "DecisionWorkflow",
- "workflowVersion": 1
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_1.json b/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_1.json
deleted file mode 100644
index 3658f0e2d4..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_1.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534983505157,
- "updateTime": 1534983505166,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "HTTP",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "http0__1",
- "iteration": 1,
- "retryCount": 0,
- "seq": 2,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "http0",
- "scheduledTime": 1534983505160,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505160,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_1",
- "taskId": "feb6c6c2-0974-4e78-b4df-df4389c46aea",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "http0__1",
- "taskReferenceName": "http0__1",
- "iteration": 1,
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },{
- "taskType": "DO_WHILE",
- "status": "IN_PROGRESS",
- "referenceTaskName": "loopTask",
- "iteration": 1,
- "retryCount": 0,
- "seq": 1,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "DO_WHILE",
- "scheduledTime": 1534983505159,
- "startTime": 1534983505161,
- "endTime": 1534983505164,
- "updateTime": 1534983505164,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_1",
- "taskId": "3e66a03d-08ef-4e71-8588-49d6c82bc75d",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "loopTask",
- "iteration": 1,
- "name": "loopTask",
- "type": "DO_WHILE",
- "loopCondition": "if ($.loopTask['iteration'] < 1 ) { true;} else {false;} ",
- "loopOver": [
- {
- "name": "http0",
- "taskReferenceName": "http0",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- },{
- "name": "fork",
- "taskReferenceName": "fork",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "http1",
- "taskReferenceName": "http1",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "http2",
- "taskReferenceName": "http2",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- }
- ]
- ]
- },
- {
- "name": "join",
- "taskReferenceName": "join",
- "type": "JOIN",
- "inputData": {
- "joinOn": [
- "http1",
- "http2"
- ]
- }
- }
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 2
- }
- ],
- "workflowType": "DoWhileTest_1",
- "version": 1,
- "correlationId": "looptask",
- "schemaVersion": 1,
- "startTime": 1534983505157
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_2.json b/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_2.json
deleted file mode 100644
index 65f1f6d254..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_2.json
+++ /dev/null
@@ -1,227 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534983505157,
- "updateTime": 1534983505166,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "HTTP",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "http0__1",
- "iteration": 1,
- "retryCount": 0,
- "seq": 2,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "http0",
- "scheduledTime": 1534983505160,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505160,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_2",
- "taskId": "feb6c6c2-0974-4e78-b4df-df4389c46aea",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "http0__1",
- "taskReferenceName": "http0__1",
- "iteration": 1,
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },{
- "taskType": "DO_WHILE",
- "status": "IN_PROGRESS",
- "referenceTaskName": "loopTask",
- "iteration": 1,
- "retryCount": 0,
- "seq": 1,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "DO_WHILE",
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_2",
- "taskId": "3e66a03d-08ef-4e71-8588-49d6c82bc75d",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "loopTask",
- "iteration": 1,
- "name": "loopTask",
- "type": "DO_WHILE",
- "loopCondition": "if ($.loopTask['iteration'] < 2 ) { true;} else {false;} ",
- "loopOver": [
- {
- "name": "http0",
- "taskReferenceName": "http0",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- },{
- "name": "fork",
- "taskReferenceName": "fork",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "http1",
- "taskReferenceName": "http1",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "http2",
- "taskReferenceName": "http2",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- }
- ]
- ]
- },
- {
- "name": "join",
- "taskReferenceName": "join",
- "type": "JOIN",
- "inputData": {
- "joinOn": [
- "http1",
- "http2"
- ]
- }
- }
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 2
- },{
- "taskType": "HTTP",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "http3__1",
- "iteration": 1,
- "retryCount": 0,
- "seq": 2,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "http0",
- "scheduledTime": 1534983505160,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505160,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_2",
- "taskId": "feb6c6c2-0974-4e78-b4df-df4389c46aea",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "http3__1",
- "taskReferenceName": "http3__1",
- "iteration": 1,
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "DO_WHILE",
- "status": "IN_PROGRESS",
- "referenceTaskName": "loopTask2",
- "iteration": 2,
- "retryCount": 0,
- "seq": 11,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "DO_WHILE",
- "scheduledTime": 1534983505159,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_2",
- "taskId": "3e66a03d-08ef-4e71-8588-49d6c82bc75d",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "loopTask2",
- "iteration": 1,
- "name": "loopTask2",
- "type": "DO_WHILE",
- "loopCondition": "if ($.loopTask2['iteration'] < 1 ) { true;} else {false;} ",
- "loopOver": [
- {
- "name": "http3__1",
- "taskReferenceName": "http3__1",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- }
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 2
- }
- ],
- "workflowType": "DoWhileTest_2",
- "version": 1,
- "correlationId": "looptask",
- "schemaVersion": 1,
- "startTime": 1534983505157
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_3.json b/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_3.json
deleted file mode 100644
index 650b12c47d..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/DoWhileTest_3.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534983505157,
- "updateTime": 1534983505166,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "input": {
- "value": "2"
- },
- "tasks": [
- {
- "taskType": "HTTP",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "http0__1",
- "iteration": 1,
- "retryCount": 0,
- "seq": 2,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "http0",
- "scheduledTime": 1534983505160,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505160,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_3",
- "taskId": "feb6c6c2-0974-4e78-b4df-df4389c46aea",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "http0__1",
- "taskReferenceName": "http0__1",
- "iteration": 1,
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },{
- "taskType": "DO_WHILE",
- "status": "IN_PROGRESS",
- "referenceTaskName": "loopTask",
- "inputParameters": {
- "value": "${workflow.input.loop}"
- },
- "iteration": 1,
- "retryCount": 0,
- "seq": 1,
- "correlationId": "looptest",
- "pollCount": 0,
- "taskDefName": "DO_WHILE",
- "scheduledTime": 1534983505159,
- "startTime": 1534983505161,
- "endTime": 1534983505164,
- "updateTime": 1534983505164,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DoWhileTest_3",
- "taskId": "3e66a03d-08ef-4e71-8588-49d6c82bc75d",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "loopTask",
- "iteration": 1,
- "name": "loopTask",
- "type": "DO_WHILE",
- "loopCondition": "if ($.loopTask['iteration'] < $.value) { true; } else { false; }",
- "loopOver": [
- {
- "name": "http0",
- "taskReferenceName": "http0",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- },{
- "name": "fork",
- "taskReferenceName": "fork",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "http1",
- "taskReferenceName": "http1",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "http2",
- "taskReferenceName": "http2",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "HTTP",
- "startDelay": 0,
- "optional": false
- }
- ]
- ]
- },
- {
- "name": "join",
- "taskReferenceName": "join",
- "type": "JOIN",
- "inputData": {
- "joinOn": [
- "http1",
- "http2"
- ]
- }
- }
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 2
- }
- ],
- "workflowType": "DoWhileTest_3",
- "version": 1,
- "correlationId": "looptask",
- "schemaVersion": 1,
- "startTime": 1534983505157
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/DynamicFanInOutTest.json b/test-harness/src/test/resources/integration/scenarios/legacy/DynamicFanInOutTest.json
deleted file mode 100644
index 3d507dc716..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/DynamicFanInOutTest.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534990883111,
- "updateTime": 1534990883246,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "dt1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "dynfanouttest1",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534990883143,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534990883143,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DynamicFanInOutTest",
- "taskId": "d2c21507-a553-465b-82ce-1eedc86f3d1d",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "dt1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "workflowType": "DynamicFanInOutTest",
- "version": 1,
- "correlationId": "dynfanouttest1",
- "schemaVersion": 1,
- "startTime": 1534990883111
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/DynamicFanInOutTestLegacy.json b/test-harness/src/test/resources/integration/scenarios/legacy/DynamicFanInOutTestLegacy.json
deleted file mode 100644
index 18ded7557d..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/DynamicFanInOutTestLegacy.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534985656537,
- "updateTime": 1534985656670,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "dt1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "dynfanouttest1",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534985656568,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534985656568,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "DynamicFanInOutTestLegacy",
- "taskId": "e04365be-93c3-4e36-ad05-664e0e6a27c3",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "dt1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "workflowType": "DynamicFanInOutTestLegacy",
- "version": 1,
- "correlationId": "dynfanouttest1",
- "schemaVersion": 1,
- "startTime": 1534985656537
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/ExclusiveJoinTaskDef.json b/test-harness/src/test/resources/integration/scenarios/legacy/ExclusiveJoinTaskDef.json
deleted file mode 100644
index e8f46ce743..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/ExclusiveJoinTaskDef.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "taskDefs": [
- {
- "name": "TASK_1",
- "ownerEmail": "test@harness.com"
- },
- {
- "name": "TASK_2",
- "ownerEmail": "test@harness.com"
- },
- {
- "name": "TASK_3",
- "ownerEmail": "test@harness.com"
- },
- {
- "name": "TASK_4",
- "ownerEmail": "test@harness.com"
- },
- {
- "name": "TASK_5",
- "ownerEmail": "test@harness.com"
- }
- ]
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/ExclusiveJoinWorkflowDef.json b/test-harness/src/test/resources/integration/scenarios/legacy/ExclusiveJoinWorkflowDef.json
deleted file mode 100644
index d02f07e614..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/ExclusiveJoinWorkflowDef.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "name": "ExclusiveJoinTestWorkflow",
- "description": "Exclusive Join Test Workflow",
- "version": 1,
- "ownerEmail": "test@harness.com",
- "tasks": [
- {
- "name": "TASK_1",
- "taskReferenceName": "task1",
- "inputParameters": {
- "payload": "${workflow.input.payload}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "decide_task",
- "taskReferenceName": "decision1",
- "inputParameters": {
- "decision_1": "${workflow.input.decision_1}"
- },
- "type": "DECISION",
- "caseValueParam": "decision_1",
- "decisionCases": {
- "true": [
- {
- "name": "TASK_2",
- "taskReferenceName": "task2",
- "inputParameters": {
- "payload": "${task1.output.payload}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "decide_task",
- "taskReferenceName": "decision2",
- "inputParameters": {
- "decision_2": "${workflow.input.decision_2}"
- },
- "type": "DECISION",
- "caseValueParam": "decision_2",
- "decisionCases": {
- "true": [
- {
- "name": "TASK_3",
- "taskReferenceName": "task3",
- "inputParameters": {
- "payload": "${task2.output.payload}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- }
- }
- ],
- "false": [
- {
- "name": "TASK_4",
- "taskReferenceName": "task4",
- "inputParameters": {
- "payload": "${task1.output.payload}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "decide_task",
- "taskReferenceName": "decision3",
- "inputParameters": {
- "decision_3": "${workflow.input.decision_3}"
- },
- "type": "DECISION",
- "caseValueParam": "decision_3",
- "decisionCases": {
- "true": [
- {
- "name": "TASK_5",
- "taskReferenceName": "task5",
- "inputParameters": {
- "payload": "${task4.output.payload}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- }
- }
- ]
- }
- },
- {
- "name": "exclusive_join",
- "taskReferenceName": "exclusiveJoin",
- "type": "EXCLUSIVE_JOIN",
- "joinOn": [
- "task3",
- "task5"
- ],
- "defaultExclusiveJoinTask": [
- "task2",
- "task4",
- "task1"
- ]
- }
- ],
- "schemaVersion": 2
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutNestedTest.json b/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutNestedTest.json
deleted file mode 100644
index f06396a4dc..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutNestedTest.json
+++ /dev/null
@@ -1,685 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534984145445,
- "updateTime": 1534984145695,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "FORK",
- "status": "COMPLETED",
- "referenceTaskName": "fork1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "FORK",
- "scheduledTime": 1534984145532,
- "startTime": 1534984145540,
- "endTime": 1534984145687,
- "updateTime": 1534984145687,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "8e4c840b-f7ab-48e6-a882-a0fa5611223b",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "fork1",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_11",
- "taskReferenceName": "t11",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "fork2",
- "taskReferenceName": "fork2",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_12",
- "taskReferenceName": "t12",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_14",
- "taskReferenceName": "t14",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "junit_task_13",
- "taskReferenceName": "t13",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "Decision",
- "taskReferenceName": "d1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "a": [
- {
- "name": "junit_task_16",
- "taskReferenceName": "t16",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_19",
- "taskReferenceName": "t19",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "b": [
- {
- "name": "junit_task_17",
- "taskReferenceName": "t17",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- },
- "defaultCase": [
- {
- "name": "junit_task_18",
- "taskReferenceName": "t18",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "startDelay": 0,
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- {
- "taskReferenceName": "join2",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t14",
- "t20"
- ],
- "optional": false
- }
- ],
- [
- {
- "taskReferenceName": "sw1",
- "type": "SUB_WORKFLOW",
- "startDelay": 0,
- "subWorkflowParam": {
- "name": "junit_test_wf"
- },
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 8
- },
- {
- "taskType": "junit_task_11",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null,
- "case": "a"
- },
- "referenceTaskName": "t11",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "junit_task_11",
- "scheduledTime": 1534984145537,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534984145537,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "dbce7428-23c8-4b02-a7e4-cf2f1629c44f",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_11",
- "taskReferenceName": "t11",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "FORK",
- "status": "COMPLETED",
- "referenceTaskName": "fork2",
- "retryCount": 0,
- "seq": 3,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "FORK",
- "scheduledTime": 1534984145538,
- "startTime": 1534984145541,
- "endTime": 1534984145688,
- "updateTime": 1534984145688,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "49aea6d0-0073-404a-b8a5-f49ea5d51b63",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "fork2",
- "taskReferenceName": "fork2",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_12",
- "taskReferenceName": "t12",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_14",
- "taskReferenceName": "t14",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "junit_task_13",
- "taskReferenceName": "t13",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "Decision",
- "taskReferenceName": "d1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "a": [
- {
- "name": "junit_task_16",
- "taskReferenceName": "t16",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_19",
- "taskReferenceName": "t19",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "b": [
- {
- "name": "junit_task_17",
- "taskReferenceName": "t17",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- },
- "defaultCase": [
- {
- "name": "junit_task_18",
- "taskReferenceName": "t18",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "startDelay": 0,
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 3
- },
- {
- "taskType": "junit_task_12",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null,
- "case": "a"
- },
- "referenceTaskName": "t12",
- "retryCount": 0,
- "seq": 4,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "junit_task_12",
- "scheduledTime": 1534984145538,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534984145538,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "cdef48f5-39d5-4341-85f2-b72984f1dd46",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_12",
- "taskReferenceName": "t12",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "junit_task_13",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null,
- "case": "a"
- },
- "referenceTaskName": "t13",
- "retryCount": 0,
- "seq": 5,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "junit_task_13",
- "scheduledTime": 1534984145539,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534984145539,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "f304e4ec-effd-46e5-a2f3-854afe2b4fc6",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_13",
- "taskReferenceName": "t13",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "SUB_WORKFLOW",
- "status": "IN_PROGRESS",
- "inputData": {
- "workflowInput": {},
- "subWorkflowId": "a1fd729d-ad38-4159-a788-4bd07f60e911",
- "subWorkflowName": "junit_test_wf",
- "subWorkflowVersion": 1
- },
- "referenceTaskName": "sw1",
- "retryCount": 0,
- "seq": 6,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "SUB_WORKFLOW",
- "scheduledTime": 1534984145539,
- "startTime": 1534984145541,
- "endTime": 1534984145527,
- "updateTime": 1534984145669,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "bc62166d-1fb2-4cc9-9d94-52da4d88bd19",
- "callbackAfterSeconds": 0,
- "outputData": {
- "subWorkflowId": "a1fd729d-ad38-4159-a788-4bd07f60e911"
- },
- "workflowTask": {
- "taskReferenceName": "sw1",
- "type": "SUB_WORKFLOW",
- "startDelay": 0,
- "subWorkflowParam": {
- "name": "junit_test_wf"
- },
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 2
- },
- {
- "taskType": "JOIN",
- "status": "IN_PROGRESS",
- "inputData": {
- "joinOn": [
- "t11",
- "join2",
- "sw1"
- ]
- },
- "referenceTaskName": "join1",
- "retryCount": 0,
- "seq": 7,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "JOIN",
- "scheduledTime": 1534984145686,
- "startTime": 1534984145687,
- "endTime": 1534984145685,
- "updateTime": 1534984145687,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "3dccf1fe-4653-4e04-b7a5-f21a2a723da8",
- "callbackAfterSeconds": 0,
- "outputData": {
- "t11": {}
- },
- "workflowTask": {
- "taskReferenceName": "join1",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t11",
- "join2",
- "sw1"
- ],
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 1
- },
- {
- "taskType": "JOIN",
- "status": "IN_PROGRESS",
- "inputData": {
- "joinOn": [
- "t14",
- "t20"
- ]
- },
- "referenceTaskName": "join2",
- "retryCount": 0,
- "seq": 8,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "JOIN",
- "scheduledTime": 1534984145687,
- "startTime": 1534984145687,
- "endTime": 1534984145686,
- "updateTime": 1534984145687,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "b371077b-b382-4e19-80b8-6d6540752793",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "join2",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t14",
- "t20"
- ],
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "case": "a"
- },
- "workflowType": "FanInOutNestedTest",
- "version": 1,
- "correlationId": "fork_join_nested_test",
- "schemaVersion": 1,
- "startTime": 1534984145445
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutTest.json b/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutTest.json
deleted file mode 100644
index 952f375daf..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutTest.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534983505157,
- "updateTime": 1534983505166,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "FORK",
- "status": "COMPLETED",
- "referenceTaskName": "fanouttask",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "FORK",
- "scheduledTime": 1534983505159,
- "startTime": 1534983505161,
- "endTime": 1534983505164,
- "updateTime": 1534983505164,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest",
- "taskId": "aa40aee3-4e9d-4cbc-8298-37d39883fec5",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "fanouttask",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 2
- },
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534983505160,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505160,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest",
- "taskId": "feb6c6c2-0974-4e78-b4df-df4389c46aea",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "junit_task_2",
- "status": "SCHEDULED",
- "inputData": {
- "tp1": null
- },
- "referenceTaskName": "t2",
- "retryCount": 0,
- "seq": 3,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "junit_task_2",
- "scheduledTime": 1534983505160,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505160,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest",
- "taskId": "36ee8037-e378-4649-92ca-3655c4e2ba75",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "JOIN",
- "status": "IN_PROGRESS",
- "inputData": {
- "joinOn": [
- "t3",
- "t2"
- ]
- },
- "referenceTaskName": "fanouttask_join",
- "retryCount": 0,
- "seq": 4,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "JOIN",
- "scheduledTime": 1534983505164,
- "startTime": 1534983505164,
- "endTime": 1534983505163,
- "updateTime": 1534983505164,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest",
- "taskId": "e681e9ce-b902-4931-9759-3ec5df88ddd0",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "fanouttask_join",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t3",
- "t2"
- ],
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 0
- }
- ],
- "workflowType": "FanInOutTest",
- "version": 1,
- "correlationId": "fanouttest",
- "schemaVersion": 1,
- "startTime": 1534983505157
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutTest_2.json b/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutTest_2.json
deleted file mode 100644
index 992fb60820..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/FanInOutTest_2.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534990432158,
- "updateTime": 1534990432327,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "FORK",
- "status": "COMPLETED",
- "referenceTaskName": "fanouttask",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "FORK",
- "scheduledTime": 1534990432193,
- "startTime": 1534990432201,
- "endTime": 1534990432325,
- "updateTime": 1534990432325,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest_2",
- "taskId": "1a7aa928-4159-447a-b9a8-2722a1da1031",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "fanouttask",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_0_RT_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_0_RT_3",
- "taskReferenceName": "t3",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "junit_task_0_RT_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 8
- },
- {
- "taskType": "junit_task_0_RT_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "junit_task_0_RT_1",
- "scheduledTime": 1534990432200,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534990432200,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest_2",
- "taskId": "7933d420-53df-450f-bf38-950c90835b0e",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_0_RT_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "junit_task_0_RT_2",
- "status": "SCHEDULED",
- "inputData": {
- "tp1": null
- },
- "referenceTaskName": "t2",
- "retryCount": 0,
- "seq": 3,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "junit_task_0_RT_2",
- "scheduledTime": 1534990432200,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534990432200,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest_2",
- "taskId": "9028683d-6604-49a8-b803-e1d9f924c474",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_0_RT_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "tp1": "workflow.input.param1"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "JOIN",
- "status": "IN_PROGRESS",
- "inputData": {
- "joinOn": [
- "t3",
- "t2"
- ]
- },
- "referenceTaskName": "fanouttask_join",
- "retryCount": 0,
- "seq": 4,
- "correlationId": "fanouttest",
- "pollCount": 0,
- "taskDefName": "JOIN",
- "scheduledTime": 1534990432324,
- "startTime": 1534990432325,
- "endTime": 1534990432323,
- "updateTime": 1534990432325,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutTest_2",
- "taskId": "94140a15-875a-4f39-9573-3e2f6960f557",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "fanouttask_join",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t3",
- "t2"
- ],
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 1
- }
- ],
- "workflowType": "FanInOutTest_2",
- "version": 1,
- "correlationId": "fanouttest",
- "schemaVersion": 1,
- "startTime": 1534990432158
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/ForkConditionalTest.json b/test-harness/src/test/resources/integration/scenarios/legacy/ForkConditionalTest.json
deleted file mode 100644
index eb6900a432..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/ForkConditionalTest.json
+++ /dev/null
@@ -1,839 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1576296875548,
- "updateTime": 1576296876416,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "adf3e854-4b36-4abf-8b0e-02acaed9e9f9",
- "tasks": [{
- "taskType": "FORK",
- "status": "COMPLETED",
- "inputData": {},
- "referenceTaskName": "forkTask",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "forkjoin_conditional",
- "pollCount": 0,
- "taskDefName": "FORK",
- "scheduledTime": 1576296876075,
- "startTime": 1576296876075,
- "endTime": 1576296876317,
- "updateTime": 1576296876317,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "adf3e854-4b36-4abf-8b0e-02acaed9e9f9",
- "workflowType": "ForkConditionalTest",
- "taskId": "d6b4be5a-0c22-4649-b7fe-cd017aadfb31",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "forkTask",
- "taskReferenceName": "forkTask",
- "inputParameters": {},
- "type": "FORK_JOIN",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [
- [{
- "name": "decisionTask",
- "taskReferenceName": "decisionTask",
- "inputParameters": {
- "case": "${workflow.input.case}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "c": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875167,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875168,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_5",
- "taskReferenceName": "t5",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875171,
- "createdBy": "junit_app",
- "name": "junit_task_5",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875200,
- "createdBy": "junit_app",
- "name": "junit_task_20",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875183,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- ],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "hasChildren": "true",
- "case": "c"
- },
- "referenceTaskName": "decisionTask",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "forkjoin_conditional",
- "pollCount": 0,
- "taskDefName": "DECISION",
- "scheduledTime": 1576296876267,
- "startTime": 1576296876267,
- "endTime": 1576296876292,
- "updateTime": 1576296876292,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "adf3e854-4b36-4abf-8b0e-02acaed9e9f9",
- "workflowType": "ForkConditionalTest",
- "taskId": "2936cbf0-9fc3-4d8e-8545-fcedafc3efaa",
- "callbackAfterSeconds": 0,
- "outputData": {
- "caseOutput": ["c"]
- },
- "workflowTask": {
- "name": "decisionTask",
- "taskReferenceName": "decisionTask",
- "inputParameters": {
- "case": "${workflow.input.case}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "c": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875167,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875168,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_5",
- "taskReferenceName": "t5",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875171,
- "createdBy": "junit_app",
- "name": "junit_task_5",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }, {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1",
- "p2": "p2"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 3,
- "correlationId": "forkjoin_conditional",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1576296876270,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "adf3e854-4b36-4abf-8b0e-02acaed9e9f9",
- "workflowType": "ForkConditionalTest",
- "taskId": "3732b3cb-eb43-4dfc-b36b-2ee76fffa5f9",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875167,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": true
- },
- "loopOverTask": false
- }, {
- "taskType": "junit_task_10",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1",
- "p2": "p2"
- },
- "referenceTaskName": "t10",
- "retryCount": 0,
- "seq": 4,
- "correlationId": "forkjoin_conditional",
- "pollCount": 0,
- "taskDefName": "junit_task_10",
- "scheduledTime": 1576296876280,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "adf3e854-4b36-4abf-8b0e-02acaed9e9f9",
- "workflowType": "ForkConditionalTest",
- "taskId": "77e5f3b6-245f-4c29-92a0-25a4c1bd435c",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875183,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": true
- },
- "loopOverTask": false
- }, {
- "taskType": "JOIN",
- "status": "IN_PROGRESS",
- "inputData": {
- "joinOn": ["t20", "t10"]
- },
- "referenceTaskName": "joinTask",
- "retryCount": 0,
- "seq": 5,
- "correlationId": "forkjoin_conditional",
- "pollCount": 0,
- "taskDefName": "JOIN",
- "scheduledTime": 1576296876373,
- "startTime": 1576296876373,
- "endTime": 0,
- "updateTime": 1576296876418,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "adf3e854-4b36-4abf-8b0e-02acaed9e9f9",
- "workflowType": "ForkConditionalTest",
- "taskId": "fe030a8e-0bac-4482-aa09-f643dcdd45d7",
- "callbackAfterSeconds": 0,
- "outputData": {},
- "workflowTask": {
- "name": "joinTask",
- "taskReferenceName": "joinTask",
- "inputParameters": {},
- "type": "JOIN",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": ["t20", "t10"],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- },
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 0,
- "workflowPriority": 0,
- "iteration": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 0,
- "taskDefinition": {
- "present": false
- },
- "loopOverTask": false
- }],
- "input": {
- "param1": "p1",
- "case": "c",
- "param2": "p2"
- },
- "output": {},
- "workflowType": "ForkConditionalTest",
- "version": 1,
- "correlationId": "forkjoin_conditional",
- "schemaVersion": 2,
- "taskToDomain": {},
- "failedReferenceTaskNames": [],
- "workflowDefinition": {
- "updateTime": 1576296875333,
- "name": "ForkConditionalTest",
- "description": "ForkConditionalTest",
- "version": 1,
- "tasks": [{
- "name": "forkTask",
- "taskReferenceName": "forkTask",
- "inputParameters": {},
- "type": "FORK_JOIN",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [
- [{
- "name": "decisionTask",
- "taskReferenceName": "decisionTask",
- "inputParameters": {
- "case": "${workflow.input.case}"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "c": [{
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875167,
- "createdBy": "junit_app",
- "name": "junit_task_1",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_2",
- "taskReferenceName": "t2",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875168,
- "createdBy": "junit_app",
- "name": "junit_task_2",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- },
- "defaultCase": [{
- "name": "junit_task_5",
- "taskReferenceName": "t5",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875171,
- "createdBy": "junit_app",
- "name": "junit_task_5",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875200,
- "createdBy": "junit_app",
- "name": "junit_task_20",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- [{
- "name": "junit_task_10",
- "taskReferenceName": "t10",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "taskDefinition": {
- "createTime": 1576296875183,
- "createdBy": "junit_app",
- "name": "junit_task_10",
- "retryCount": 1,
- "timeoutSeconds": 120,
- "inputKeys": [],
- "outputKeys": [],
- "timeoutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 60,
- "responseTimeoutSeconds": 3600,
- "inputTemplate": {},
- "rateLimitPerFrequency": 0,
- "rateLimitFrequencyInSeconds": 1
- },
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }]
- ],
- "startDelay": 0,
- "joinOn": [],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }, {
- "name": "joinTask",
- "taskReferenceName": "joinTask",
- "inputParameters": {},
- "type": "JOIN",
- "decisionCases": {},
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "joinOn": ["t20", "t10"],
- "optional": false,
- "defaultExclusiveJoinTask": [],
- "asyncComplete": false,
- "loopOver": []
- }],
- "inputParameters": [],
- "outputParameters": {},
- "schemaVersion": 2,
- "restartable": true,
- "workflowStatusListenerEnabled": false
- },
- "priority": 0,
- "startTime": 1576296875548,
- "workflowName": "ForkConditionalTest",
- "workflowVersion": 1
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/RTOWF.json b/test-harness/src/test/resources/integration/scenarios/legacy/RTOWF.json
deleted file mode 100644
index 0c7e5e1082..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/RTOWF.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534986389370,
- "updateTime": 1534986389594,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "task_rt",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "task_rt_t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_1",
- "pollCount": 0,
- "taskDefName": "task_rt",
- "scheduledTime": 1534986389470,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534986389470,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 10,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "RTOWF",
- "taskId": "225c5461-b21b-4934-8b09-65c24a3daeda",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "task_rt",
- "taskReferenceName": "task_rt_t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "RTOWF",
- "version": 1,
- "correlationId": "unit_test_1",
- "schemaVersion": 2,
- "startTime": 1534986389370
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/WorkflowWithSubWorkflow.json b/test-harness/src/test/resources/integration/scenarios/legacy/WorkflowWithSubWorkflow.json
deleted file mode 100644
index 09af345b62..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/WorkflowWithSubWorkflow.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534989930597,
- "updateTime": 1534989930779,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_5",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "param 1 value",
- "p2": null
- },
- "referenceTaskName": "a1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "test",
- "pollCount": 0,
- "taskDefName": "junit_task_5",
- "scheduledTime": 1534989930669,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534989930669,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "WorkflowWithSubWorkflow",
- "taskId": "9d704f3e-3814-4e60-8592-a4e2aec81e50",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_5",
- "taskReferenceName": "a1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "wfName": "junit_test_wf",
- "param3": "param 2 value",
- "param1": "param 1 value"
- },
- "workflowType": "WorkflowWithSubWorkflow",
- "version": 1,
- "correlationId": "test",
- "schemaVersion": 2,
- "startTime": 1534989930597
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/concurrentWorkflowExecutions.json b/test-harness/src/test/resources/integration/scenarios/legacy/concurrentWorkflowExecutions.json
deleted file mode 100644
index bf14efed98..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/concurrentWorkflowExecutions.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535058398369,
- "updateTime": 1535058398372,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_concurrrent",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1535058398371,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535058398371,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf",
- "taskId": "39f2ccac-e449-4eab-87ba-cb85ba817a3c",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf",
- "version": 1,
- "correlationId": "unit_test_concurrrent",
- "schemaVersion": 2,
- "startTime": 1535058398369
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/empty_workflow.json b/test-harness/src/test/resources/integration/scenarios/legacy/empty_workflow.json
deleted file mode 100644
index ab11ffa4b1..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/empty_workflow.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534983504822,
- "updateTime": 1534983504841,
- "status": "COMPLETED",
- "endTime": 1534983504841,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "empty_workflow",
- "version": 1,
- "correlationId": "testWorkflowWithNoTasks",
- "reasonForIncompletion": "No tasks found to be executed",
- "schemaVersion": 2,
- "startTime": 1534983504822
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/forkJoinNested.json b/test-harness/src/test/resources/integration/scenarios/legacy/forkJoinNested.json
deleted file mode 100644
index 4248674eaf..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/forkJoinNested.json
+++ /dev/null
@@ -1,628 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535070652209,
- "updateTime": 1535070652424,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "FORK",
- "status": "COMPLETED",
- "referenceTaskName": "fork1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "FORK",
- "scheduledTime": 1535070652273,
- "startTime": 1535070652282,
- "endTime": 1535070652416,
- "updateTime": 1535070652416,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "7154b7b6-cf9e-45b4-a81f-f9faa349845c",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "fork1",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_11",
- "taskReferenceName": "t11",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "fork2",
- "taskReferenceName": "fork2",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_12",
- "taskReferenceName": "t12",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_14",
- "taskReferenceName": "t14",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "junit_task_13",
- "taskReferenceName": "t13",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "Decision",
- "taskReferenceName": "d1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "a": [
- {
- "name": "junit_task_16",
- "taskReferenceName": "t16",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_19",
- "taskReferenceName": "t19",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "b": [
- {
- "name": "junit_task_17",
- "taskReferenceName": "t17",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- },
- "defaultCase": [
- {
- "name": "junit_task_18",
- "taskReferenceName": "t18",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "startDelay": 0,
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- {
- "taskReferenceName": "join2",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t14",
- "t20"
- ],
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 9
- },
- {
- "taskType": "junit_task_11",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null,
- "case": "a"
- },
- "referenceTaskName": "t11",
- "retryCount": 0,
- "seq": 2,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "junit_task_11",
- "scheduledTime": 1535070652279,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535070652279,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "f56e4de5-1331-478b-bee5-055703cd47c8",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_11",
- "taskReferenceName": "t11",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "FORK",
- "status": "COMPLETED",
- "referenceTaskName": "fork2",
- "retryCount": 0,
- "seq": 3,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "FORK",
- "scheduledTime": 1535070652280,
- "startTime": 1535070652283,
- "endTime": 1535070652417,
- "updateTime": 1535070652417,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "dada5cfc-e8ab-4b14-97d6-5115af8fdb4c",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "fork2",
- "taskReferenceName": "fork2",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name": "junit_task_12",
- "taskReferenceName": "t12",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_14",
- "taskReferenceName": "t14",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- [
- {
- "name": "junit_task_13",
- "taskReferenceName": "t13",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "Decision",
- "taskReferenceName": "d1",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "a": [
- {
- "name": "junit_task_16",
- "taskReferenceName": "t16",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_19",
- "taskReferenceName": "t19",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "b": [
- {
- "name": "junit_task_17",
- "taskReferenceName": "t17",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ]
- },
- "defaultCase": [
- {
- "name": "junit_task_18",
- "taskReferenceName": "t18",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- {
- "name": "junit_task_20",
- "taskReferenceName": "t20",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- }
- ],
- "startDelay": 0,
- "optional": false
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 3
- },
- {
- "taskType": "junit_task_12",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null,
- "case": "a"
- },
- "referenceTaskName": "t12",
- "retryCount": 0,
- "seq": 4,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "junit_task_12",
- "scheduledTime": 1535070652280,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535070652280,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "72262faf-8ce6-4d2d-9bff-d7c4a549db54",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_12",
- "taskReferenceName": "t12",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "junit_task_13",
- "status": "SCHEDULED",
- "inputData": {
- "p1": null,
- "p2": null,
- "case": "a"
- },
- "referenceTaskName": "t13",
- "retryCount": 0,
- "seq": 5,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "junit_task_13",
- "scheduledTime": 1535070652280,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535070652281,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "53163269-212d-4670-9586-8cd9dfd096db",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_13",
- "taskReferenceName": "t13",
- "inputParameters": {
- "p1": "workflow.input.param1",
- "p2": "workflow.input.param2",
- "case": "workflow.input.case"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "JOIN",
- "status": "IN_PROGRESS",
- "inputData": {
- "joinOn": [
- "t11",
- "join2"
- ]
- },
- "referenceTaskName": "join1",
- "retryCount": 0,
- "seq": 7,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "JOIN",
- "scheduledTime": 1535070652415,
- "startTime": 1535070652416,
- "endTime": 1535070652415,
- "updateTime": 1535070652416,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "d39443cc-d531-4612-9eb0-f1b4c2c1aa29",
- "callbackAfterSeconds": 0,
- "outputData": {
- "t11": {}
- },
- "workflowTask": {
- "taskReferenceName": "join1",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t11",
- "join2"
- ],
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 1
- },
- {
- "taskType": "JOIN",
- "status": "IN_PROGRESS",
- "inputData": {
- "joinOn": [
- "t14",
- "t20"
- ]
- },
- "referenceTaskName": "join2",
- "retryCount": 0,
- "seq": 8,
- "correlationId": "fork_join_nested_test",
- "pollCount": 0,
- "taskDefName": "JOIN",
- "scheduledTime": 1535070652416,
- "startTime": 1535070652416,
- "endTime": 1535070652415,
- "updateTime": 1535070652416,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "FanInOutNestedTest",
- "taskId": "7696c0e4-5112-497f-a61f-6a24317a4d8a",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "join2",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "t14",
- "t20"
- ],
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "case": "a"
- },
- "workflowType": "FanInOutNestedTest",
- "version": 1,
- "correlationId": "fork_join_nested_test",
- "schemaVersion": 1,
- "startTime": 1535070652209
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf.json b/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf.json
deleted file mode 100644
index 87390f515b..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534901322631,
- "updateTime": 1534901322800,
- "createdBy": null,
- "updatedBy": null,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "parentWorkflowId": null,
- "parentWorkflowTaskId": null,
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_126654816802294",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534901322699,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534901322699,
- "startDelayInSeconds": 0,
- "retriedTaskId": null,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf",
- "taskId": "7456b2cb-a9dc-4a35-8b52-4c9e914d3073",
- "reasonForIncompletion": null,
- "callbackAfterSeconds": 0,
- "workerId": null,
- "outputData": {},
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "description": null,
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "dynamicTaskNameParam": null,
- "caseValueParam": null,
- "caseExpression": null,
- "decisionCases": {},
- "dynamicForkJoinTasksParam": null,
- "dynamicForkTasksParam": null,
- "dynamicForkTasksInputParamName": null,
- "defaultCase": [],
- "forkTasks": [],
- "startDelay": 0,
- "subWorkflowParam": null,
- "joinOn": [],
- "sink": null,
- "optional": false,
- "rateLimited": null
- },
- "domain": null,
- "inputMessage": null,
- "outputMessage": null,
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "output": {},
- "workflowType": "junit_test_wf",
- "version": 1,
- "correlationId": "unit_test_126654816802294",
- "reRunFromWorkflowId": null,
- "reasonForIncompletion": null,
- "schemaVersion": 2,
- "event": null,
- "taskToDomain": {},
- "failedReferenceTaskNames": [],
- "startTime": 1534901322631
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf3.json b/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf3.json
deleted file mode 100644
index 2d1f2cdca0..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf3.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534990090639,
- "updateTime": 1534990090810,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_122addfc0-354a-4e99-b756-e34d72ea1f97",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534990090709,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534990090709,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf3",
- "taskId": "7f53def1-835a-4aa5-ae9a-7b6052e657b1",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf3",
- "version": 1,
- "correlationId": "unit_test_122addfc0-354a-4e99-b756-e34d72ea1f97",
- "schemaVersion": 2,
- "startTime": 1534990090639
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf_non_restartable.json b/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf_non_restartable.json
deleted file mode 100644
index 48d70f9c2b..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf_non_restartable.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534990253433,
- "updateTime": 1534990253667,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_180b692c7-691a-4edb-a0a6-8b65cc76f9a0",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534990253540,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534990253540,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf_non_restartable",
- "taskId": "37fc37f7-729c-4b22-9b8c-a23d68149ed2",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf_non_restartable",
- "version": 1,
- "correlationId": "unit_test_180b692c7-691a-4edb-a0a6-8b65cc76f9a0",
- "schemaVersion": 2,
- "startTime": 1534990253433
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf_sw.json b/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf_sw.json
deleted file mode 100644
index cc2627adde..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/junit_test_wf_sw.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534986608565,
- "updateTime": 1534986608739,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_3",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_sw",
- "pollCount": 0,
- "taskDefName": "junit_task_3",
- "scheduledTime": 1534986608637,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534986608637,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf_sw",
- "taskId": "6ecc0e58-adb3-408b-b815-0762eb572488",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_3",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf_sw",
- "version": 1,
- "correlationId": "unit_test_sw",
- "schemaVersion": 2,
- "startTime": 1534986608565
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/longRunningWf.json b/test-harness/src/test/resources/integration/scenarios/legacy/longRunningWf.json
deleted file mode 100644
index 08a65eb266..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/longRunningWf.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534990739242,
- "updateTime": 1534990739413,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_1",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534990739311,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534990739311,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "longRunningWf",
- "taskId": "0fefb562-dbef-4cec-bec8-a5e72be5cfef",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "longRunningWf",
- "version": 1,
- "correlationId": "unit_test_1",
- "schemaVersion": 2,
- "startTime": 1534990739242
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/optional_task_wf.json b/test-harness/src/test/resources/integration/scenarios/legacy/optional_task_wf.json
deleted file mode 100644
index 3382c866ef..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/optional_task_wf.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535063868376,
- "updateTime": 1535063868556,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "045ec0b9-5f79-446b-9832-82918ec047aa",
- "tasks": [
- {
- "taskType": "task_optional",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "task_optional_t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_1d2488fa6-a508-49d5-9a88-82335a7d43fa",
- "pollCount": 0,
- "taskDefName": "task_optional",
- "scheduledTime": 1535063868452,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535063868452,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "045ec0b9-5f79-446b-9832-82918ec047aa",
- "workflowType": "optional_task_wf",
- "taskId": "80362582-3e22-4b5d-8635-6cc9c2824adf",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "task_optional",
- "taskReferenceName": "task_optional_t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": true
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "optional_task_wf",
- "version": 1,
- "correlationId": "unit_test_1d2488fa6-a508-49d5-9a88-82335a7d43fa",
- "schemaVersion": 2,
- "startTime": 1535063868376
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/retry.json b/test-harness/src/test/resources/integration/scenarios/legacy/retry.json
deleted file mode 100644
index 34f01eab2f..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/retry.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535063868376,
- "updateTime": 1535063868556,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "045ec0b9-5f79-446b-9832-82918ec047aa",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_1d2488fa6-a508-49d5-9a88-82335a7d43fa",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1535063868452,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535063868452,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "045ec0b9-5f79-446b-9832-82918ec047aa",
- "workflowType": "junit_test_wf",
- "taskId": "80362582-3e22-4b5d-8635-6cc9c2824adf",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf",
- "version": 1,
- "correlationId": "unit_test_1d2488fa6-a508-49d5-9a88-82335a7d43fa",
- "schemaVersion": 2,
- "startTime": 1535063868376
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowFailureWithTerminalError.json b/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowFailureWithTerminalError.json
deleted file mode 100644
index b88a711691..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowFailureWithTerminalError.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535068496317,
- "updateTime": 1535068496495,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_1",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1535068496389,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535068496389,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf",
- "taskId": "94c952ad-10c8-4b04-a236-586f57f44a0a",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "queueWaitTime": 0,
- "taskStatus": "SCHEDULED"
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf",
- "version": 1,
- "correlationId": "unit_test_1",
- "schemaVersion": 2,
- "startTime": 1535068496317
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowWithTaskSpecificDomain.json b/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowWithTaskSpecificDomain.json
deleted file mode 100644
index d0ccd59237..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowWithTaskSpecificDomain.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535067958883,
- "updateTime": 1535067959010,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_3",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_sw",
- "pollCount": 0,
- "taskDefName": "junit_task_3",
- "scheduledTime": 1535067959000,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535067959000,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf_sw",
- "taskId": "3ebec7c7-ba78-4983-85d4-3081886cd7f7",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_3",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "domain": "domain1",
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf_sw",
- "version": 1,
- "correlationId": "unit_test_sw",
- "schemaVersion": 2,
- "taskToDomain": {
- "junit_task_3": "domain1",
- "junit_task_2": "domain1"
- },
- "startTime": 1535067958883
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowWithTasksInOneDomain.json b/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowWithTasksInOneDomain.json
deleted file mode 100644
index 26180163f6..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/simpleWorkflowWithTasksInOneDomain.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535067060792,
- "updateTime": 1535067060906,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_3",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_sw",
- "pollCount": 0,
- "taskDefName": "junit_task_3",
- "scheduledTime": 1535067060896,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535067060896,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf_sw",
- "taskId": "06e596e1-dc12-4bd0-937c-dfde77bacbcf",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_3",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "domain": "domain11",
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf_sw",
- "version": 1,
- "correlationId": "unit_test_sw",
- "schemaVersion": 2,
- "taskToDomain": {
- "*": "domain11,, domain12"
- },
- "startTime": 1535067060792
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/template_kafka_workflow.json b/test-harness/src/test/resources/integration/scenarios/legacy/template_kafka_workflow.json
deleted file mode 100644
index 0783e05ef1..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/template_kafka_workflow.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534983505050,
- "updateTime": 1534983505131,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "KAFKA_PUBLISH",
- "status": "SCHEDULED",
- "inputData": {
- "kafka_request": {
- "topic": "test_kafka_topic",
- "bootStrapServers": "localhost:9092",
- "value": {
- "requestDetails": {
- "key1": "value1",
- "key2": 42
- },
- "outputPath": "s3://bucket/outputPath",
- "inputPaths": [
- "file://path1",
- "file://path2"
- ]
- }
- }
- },
- "referenceTaskName": "t0",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "testTaskDefTemplate",
- "pollCount": 0,
- "taskDefName": "templated_kafka_task",
- "scheduledTime": 1534983505121,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505121,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "template_kafka_workflow",
- "taskId": "9dea4567-0240-4eab-bde8-99f4535ea3fd",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "templated_kafka_task",
- "taskReferenceName": "t0",
- "type": "KAFKA_PUBLISH",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "path1": "file://path1",
- "path2": "file://path2",
- "requestDetails": {
- "key1": "value1",
- "key2": 42
- },
- "outputPath": "s3://bucket/outputPath"
- },
- "workflowType": "template_kafka_workflow",
- "version": 1,
- "correlationId": "testTaskDefTemplate",
- "schemaVersion": 2,
- "startTime": 1534983505050
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/template_workflow.json b/test-harness/src/test/resources/integration/scenarios/legacy/template_workflow.json
deleted file mode 100644
index 0a06e7bd0f..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/template_workflow.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534983505050,
- "updateTime": 1534983505131,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "templated_task",
- "status": "SCHEDULED",
- "inputData": {
- "http_request": {
- "method": "GET",
- "vipStack": "test_stack",
- "body": {
- "requestDetails": {
- "key1": "value1",
- "key2": 42
- },
- "outputPath": "s3://bucket/outputPath",
- "inputPaths": [
- "file://path1",
- "file://path2"
- ]
- },
- "uri": "/get/something"
- }
- },
- "referenceTaskName": "t0",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "testTaskDefTemplate",
- "pollCount": 0,
- "taskDefName": "templated_task",
- "scheduledTime": 1534983505121,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534983505121,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "template_workflow",
- "taskId": "9dea4567-0240-4eab-bde8-99f4535ea3fc",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "templated_task",
- "taskReferenceName": "t0",
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "path1": "file://path1",
- "path2": "file://path2",
- "requestDetails": {
- "key1": "value1",
- "key2": 42
- },
- "outputPath": "s3://bucket/outputPath"
- },
- "workflowType": "template_workflow",
- "version": 1,
- "correlationId": "testTaskDefTemplate",
- "schemaVersion": 2,
- "startTime": 1534983505050
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/test_event.json b/test-harness/src/test/resources/integration/scenarios/legacy/test_event.json
deleted file mode 100644
index 26b0730e7f..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/test_event.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534988786979,
- "updateTime": 1534988787169,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "EVENT",
- "status": "COMPLETED",
- "inputData": {
- "sink": "conductor"
- },
- "referenceTaskName": "wait0",
- "retryCount": 0,
- "seq": 1,
- "pollCount": 0,
- "taskDefName": "eventX",
- "scheduledTime": 1534988787043,
- "startTime": 1534988787051,
- "endTime": 1534988787169,
- "updateTime": 1534988787169,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_event",
- "taskId": "4f39b091-03c5-469c-970f-1c2addec1571",
- "callbackAfterSeconds": 0,
- "outputData": {
- "event_produced": "conductor:test_event:wait0",
- "sink": "conductor",
- "workflowType": "test_event",
- "correlationId": null,
- "workflowVersion": 1,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID"
- },
- "workflowTask": {
- "name": "eventX",
- "taskReferenceName": "wait0",
- "inputParameters": {
- "sink": "conductor"
- },
- "type": "EVENT",
- "startDelay": 0,
- "sink": "conductor",
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 8
- },
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 2,
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1534988787163,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1534988787163,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_event",
- "taskId": "2d482701-9cae-4576-ab2c-91e096b5ed1c",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "output": {
- "event_produced": "conductor:test_event:wait0",
- "sink": "conductor",
- "workflowType": "test_event",
- "correlationId": null,
- "workflowVersion": 1,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID"
- },
- "workflowType": "test_event",
- "version": 1,
- "schemaVersion": 2,
- "startTime": 1534988786979
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/test_execution_times_wf.json b/test-harness/src/test/resources/integration/scenarios/legacy/test_execution_times_wf.json
deleted file mode 100644
index df048e6e27..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/test_execution_times_wf.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
- "ownerApp": "junit_app",
- "status": "RUNNING",
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "DECISION",
- "status": "COMPLETED",
- "inputData": {
- "case": "a"
- },
- "referenceTaskName": "decision1",
- "retryCount": 0,
- "seq": 1,
- "pollCount": 0,
- "taskDefName": "decision1",
- "startDelayInSeconds": 0,
- "scheduledTime": 1534990536269,
- "startTime": 1534990536275,
- "endTime": 1534990536389,
- "updateTime": 1534990536389,
- "retried": false,
- "executed": true,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_execution_times_wf",
- "taskId": "8f65b5f2-da29-417f-a211-c86a9031d63a",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "decision1",
- "taskReferenceName": "decision1",
- "inputParameters": {
- "case": "a"
- },
- "type": "DECISION",
- "caseValueParam": "case",
- "decisionCases": {
- "a": [
- {
- "name": "forktask1",
- "taskReferenceName": "forktask1",
- "inputParameters": { },
- "type": "FORK_JOIN",
- "forkTasks":[
- [
- {
- "name":"junit_task_1",
- "taskReferenceName":"task2",
- "inputParameters":{
- "http_request":{
- "uri":"https://httpstat.us/200?sleep=300",
- "method":"GET"
- }
- },
- "type":"SIMPLE"
- }
- ],
- [
- {
- "name":"junit_task_1",
- "taskReferenceName":"task3",
- "inputParameters":{
- "http_request":{
- "uri":"https://httpstat.us/200?sleep=300",
- "method":"GET"
- }
- },
- "type":"SIMPLE"
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- {
- "name":"jointask",
- "taskReferenceName":"jointask",
- "inputParameters":{ },
- "type":"JOIN",
- "joinOn":[
- "task2",
- "task3"
- ]
- }
- ]
- },
- "defaultCase": [
- {
- "name":"junit_task_1",
- "taskReferenceName":"task1",
- "inputParameters":{
- "http_request":{
- "uri":"https://httpstat.us/200?sleep=300",
- "method":"GET"
- }
- },
- "type":"SIMPLE"
- }
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 6
- },
- {
- "taskType": "FORK",
- "status": "COMPLETED",
- "referenceTaskName": "forktask1",
- "retryCount": 0,
- "seq": 2,
- "pollCount": 0,
- "taskDefName": "forktask1",
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "scheduledTime": 1534990536289,
- "startTime": 1534990536295,
- "endTime": 1534990536409,
- "updateTime": 1534990536409,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_execution_times_wf",
- "taskId": "0d9eaabb-23a2-4942-a130-65448f40d34d",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "taskReferenceName": "forktask1",
- "type": "FORK_JOIN",
- "forkTasks": [
- [
- {
- "name":"junit_task_1",
- "taskReferenceName":"task2",
- "inputParameters":{
- "http_request":{
- "uri":"https://httpstat.us/200?sleep=300",
- "method":"GET"
- }
- },
- "type":"SIMPLE"
- }
- ],
- [
- {
- "name":"junit_task_1",
- "taskReferenceName":"task3",
- "inputParameters":{
- "http_request":{
- "uri":"https://httpstat.us/200?sleep=300",
- "method":"GET"
- }
- },
- "type":"SIMPLE"
- }
- ]
- ],
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "COMPLETED",
- "queueWaitTime": 0
- },
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": { },
- "referenceTaskName": "task2",
- "retryCount": 0,
- "seq": 1,
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "startDelayInSeconds": 0,
- "scheduledTime": 1534990536309,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_execution_times_wf",
- "taskId": "06e596e1-dc12-4bd0-937c-dfde77bacaaa",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "task2",
- "inputParameters": { },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": { },
- "referenceTaskName": "task3",
- "retryCount": 0,
- "seq": 1,
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "startDelayInSeconds": 0,
- "scheduledTime": 1534990536329,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_execution_times_wf",
- "taskId": "06e596e1-dc12-4bd0-937c-dfde77bacbcf",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_2",
- "taskReferenceName": "task3",
- "inputParameters": { },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- },
- {
- "taskType": "JOIN",
- "status": "COMPLETED",
- "inputData": {
- "joinOn": [
- "task2",
- "task3"
- ]
- },
- "referenceTaskName": "jointask",
- "retryCount": 0,
- "seq": 7,
- "pollCount": 0,
- "taskDefName": "jointask",
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "scheduledTime": 1534990536349,
- "startTime": 1534990536355,
- "endTime": 1534990536469,
- "updateTime": 1534990536469,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_execution_times_wf",
- "taskId": "d39443cc-d531-4612-9eb0-f1b4c2c1aa29",
- "callbackAfterSeconds": 0,
- "outputData": { },
- "workflowTask": {
- "taskReferenceName": "jointask",
- "type": "JOIN",
- "startDelay": 0,
- "joinOn": [
- "task2",
- "task3"
- ],
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 1
- }
- ],
- "workflowType": "test_execution_times_wf",
- "version": 1,
- "schemaVersion": 2
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/test_lambda_wf.json b/test-harness/src/test/resources/integration/scenarios/legacy/test_lambda_wf.json
deleted file mode 100644
index 7ca7094aa4..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/test_lambda_wf.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534988907130,
- "updateTime": 1534988907297,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "LAMBDA",
- "status": "SCHEDULED",
- "inputData": {
- "input": {"a":1},
- "scriptExpression": "if ($.input.a==1){return {testvalue: true}} else{return {testvalue: false} }"
- },
- "referenceTaskName": "lambda0",
- "retryCount": 0,
- "seq": 1,
- "pollCount": 0,
- "taskDefName": "lambda",
- "scheduledTime": 1534988907192,
- "startTime": 1534988907200,
- "endTime": 1534988907186,
- "updateTime": 1534988907200,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_lambda_wf",
- "taskId": "22052711-1039-4888-935a-5d0efa8bcccc",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "lambda",
- "taskReferenceName": "lambda0",
- "type": "LAMBDA",
- "startDelay": 0,
- "inputParameters": {
- "input": "${workflow.input}"
- },
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 8
- }
- ],
- "workflowType": "test_lambda_wf",
- "version": 1,
- "schemaVersion": 2,
- "startTime": 1534988907130
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/test_wait.json b/test-harness/src/test/resources/integration/scenarios/legacy/test_wait.json
deleted file mode 100644
index 9a74441969..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/test_wait.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534988907130,
- "updateTime": 1534988907297,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "WAIT",
- "status": "IN_PROGRESS",
- "referenceTaskName": "wait0",
- "retryCount": 0,
- "seq": 1,
- "pollCount": 0,
- "taskDefName": "wait",
- "scheduledTime": 1534988907192,
- "startTime": 1534988907200,
- "endTime": 1534988907186,
- "updateTime": 1534988907200,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_wait",
- "taskId": "22052711-1039-4888-935a-5d0efa8b5bbf",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "wait",
- "taskReferenceName": "wait0",
- "type": "WAIT",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 8
- }
- ],
- "workflowType": "test_wait",
- "version": 1,
- "schemaVersion": 2,
- "startTime": 1534988907130
-}
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/test_wait_timeout.json b/test-harness/src/test/resources/integration/scenarios/legacy/test_wait_timeout.json
deleted file mode 100644
index c55cc4ab01..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/test_wait_timeout.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1534988907130,
- "updateTime": 1534988907297,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "WAIT",
- "status": "IN_PROGRESS",
- "referenceTaskName": "wait0",
- "retryCount": 0,
- "seq": 1,
- "pollCount": 0,
- "taskDefName": "waitTimeout",
- "scheduledTime": 1534988907192,
- "startTime": 1534988907200,
- "endTime": 1534988907186,
- "updateTime": 1534988907200,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 0,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "test_wait",
- "taskId": "22052711-1039-4888-935a-5d0efa8b5bbf",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "waitTimeout",
- "taskReferenceName": "wait0",
- "type": "WAIT",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "IN_PROGRESS",
- "queueWaitTime": 8
- }
- ],
- "workflowType": "test_wait_timeout",
- "version": 1,
- "schemaVersion": 2,
- "startTime": 1534988907130
-}
\ No newline at end of file
diff --git a/test-harness/src/test/resources/integration/scenarios/legacy/timeout.json b/test-harness/src/test/resources/integration/scenarios/legacy/timeout.json
deleted file mode 100644
index 66298f0c9b..0000000000
--- a/test-harness/src/test/resources/integration/scenarios/legacy/timeout.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "ownerApp": "junit_app",
- "createTime": 1535068128051,
- "updateTime": 1535068128223,
- "status": "RUNNING",
- "endTime": 0,
- "workflowId": "WORKFLOW_INSTANCE_ID",
- "tasks": [
- {
- "taskType": "junit_task_1",
- "status": "SCHEDULED",
- "inputData": {
- "p1": "p1 value",
- "p2": "p2 value"
- },
- "referenceTaskName": "t1",
- "retryCount": 0,
- "seq": 1,
- "correlationId": "unit_test_175105d0e-55a2-4bb0-bbf7-06e119de34fe",
- "pollCount": 0,
- "taskDefName": "junit_task_1",
- "scheduledTime": 1535068128120,
- "startTime": 0,
- "endTime": 0,
- "updateTime": 1535068128120,
- "startDelayInSeconds": 0,
- "retried": false,
- "executed": false,
- "callbackFromWorker": true,
- "responseTimeoutSeconds": 3600,
- "workflowInstanceId": "WORKFLOW_INSTANCE_ID",
- "workflowType": "junit_test_wf",
- "taskId": "9b9c93d2-fe29-4a75-8771-d8e71f3cde84",
- "callbackAfterSeconds": 0,
- "workflowTask": {
- "name": "junit_task_1",
- "taskReferenceName": "t1",
- "inputParameters": {
- "p1": "${workflow.input.param1}",
- "p2": "${workflow.input.param2}"
- },
- "type": "SIMPLE",
- "startDelay": 0,
- "optional": false
- },
- "rateLimitPerSecond": 0,
- "taskStatus": "SCHEDULED",
- "queueWaitTime": 0
- }
- ],
- "input": {
- "failureWfName": "FanInOutTest",
- "param1": "p1 value",
- "param2": "p2 value"
- },
- "workflowType": "junit_test_wf",
- "version": 1,
- "correlationId": "unit_test_175105d0e-55a2-4bb0-bbf7-06e119de34fe",
- "schemaVersion": 2,
- "startTime": 1535068128051
-}
diff --git a/test-harness/src/test/resources/log4j.properties b/test-harness/src/test/resources/log4j.properties
deleted file mode 100644
index 95a6ab7d6c..0000000000
--- a/test-harness/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2019 Netflix, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Set root logger level to WARN and its only appender to A1.
-log4j.rootLogger=WARN, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-log4j.logger.ch.vorburger=error
-log4j.logger.ch.vorburger.mariadb4j.DB=info
-log4j.logger.com.zaxxer.hikari=error
diff --git a/zookeeper-lock/build.gradle b/zookeeper-lock/build.gradle
index 92da549d3f..2d0d02466b 100644
--- a/zookeeper-lock/build.gradle
+++ b/zookeeper-lock/build.gradle
@@ -3,7 +3,6 @@ dependencies {
implementation project(':conductor-core')
implementation 'org.springframework.boot:spring-boot-starter'
- implementation "javax.inject:javax.inject:1"
implementation "org.apache.commons:commons-lang3"
implementation "org.apache.curator:curator-recipes:${revCuratorRecipes}"
diff --git a/zookeeper-lock/src/test/java/com/netflix/conductor/zookeeper/lock/ZookeeperLockTest.java b/zookeeper-lock/src/test/java/com/netflix/conductor/zookeeper/lock/ZookeeperLockTest.java
index 369ce26bb7..d67719fc55 100644
--- a/zookeeper-lock/src/test/java/com/netflix/conductor/zookeeper/lock/ZookeeperLockTest.java
+++ b/zookeeper-lock/src/test/java/com/netflix/conductor/zookeeper/lock/ZookeeperLockTest.java
@@ -17,21 +17,15 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import com.netflix.conductor.core.config.ConductorProperties;
import com.netflix.conductor.core.sync.Lock;
import com.netflix.conductor.service.ExecutionLockService;
import com.netflix.conductor.zookeeper.config.ZookeeperProperties;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import javax.inject.Provider;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.test.TestingServer;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +36,6 @@ public class ZookeeperLockTest {
TestingServer zkServer;
ZookeeperProperties properties;
- Provider mockProvider;
@Before
public void setUp() throws Exception {
@@ -109,35 +102,6 @@ public void testZkLock() throws InterruptedException {
worker3.join();
}
- @Ignore
- public void testExecutionLockService() throws Exception {
- int numLocks = 10;
- int contentionFactor = 4;
- int numThreads = 10;
- List locksIDs = new ArrayList<>(numLocks * 2 ^ (contentionFactor - 1));
- for (int i = 0; i < numLocks; i++) {
- locksIDs.add("testlock-" + i);
- }
- for (int i = 0; i < contentionFactor; i++) {
- locksIDs.addAll(locksIDs);
- }
- List workers = new ArrayList<>(numThreads);
- ExecutionLockService executionLock = new ExecutionLockService(new ConductorProperties(), mockProvider);
- for (int i = 0; i < numThreads; i++) {
- List workerLockIDs = new ArrayList<>(locksIDs);
- Collections.shuffle(workerLockIDs);
- MultiLockWorker lockWorker = new MultiLockWorker(executionLock, workerLockIDs);
- lockWorker.start();
- workers.add(lockWorker);
- }
- for (int i = 0; i < numThreads; i++) {
- for (MultiLockWorker worker : workers) {
- worker.join();
- assertTrue(worker.isFinishedSuccessfully());
- }
- }
- }
-
private static class Worker extends Thread {
private final Lock lock;