aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpriyanshu <pagarwal@amdocs.com>2018-07-16 19:25:05 +0530
committerpriyanshu <pagarwal@amdocs.com>2018-07-16 19:25:07 +0530
commit7e78cd19bbb2b0730fafc0b328a71c69f5730e16 (patch)
tree24b4b72ef67f64304bfee867076517c37896db5b
parent39c01dd3ccb69f53d2e9350994e25f6e64412aa4 (diff)
Workflow Docker containers
1. Implemented workflow init container. 2. Implemented workflow backend container. 3. Added a placeholder for frontend module container. 4. Modifiled directory structure and POM files. 5. Added a ReadMe with sample commands to detail how to run the containers. Change-Id: Ib110fcc104ce72ff28fce514a1475a032cc2d82b Issue-ID: SDC-1482 Signed-off-by: priyanshu <pagarwal@amdocs.com> Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com> Signed-off-by: priyanshu <pagarwal@amdocs.com>
-rw-r--r--workflow-designer-be/.empty0
-rw-r--r--workflow-designer-be/src/main/resources/application.properties7
-rw-r--r--workflow/README.md29
-rw-r--r--workflow/pom.xml103
-rw-r--r--workflow/workflow-bdd/.gitignore (renamed from workflow-bdd/.gitignore)0
-rw-r--r--workflow/workflow-bdd/README.txt (renamed from workflow-bdd/README.txt)0
-rw-r--r--workflow/workflow-bdd/config.json (renamed from workflow-bdd/config.json)0
-rw-r--r--workflow/workflow-bdd/cucumber.js (renamed from workflow-bdd/cucumber.js)0
-rw-r--r--workflow/workflow-bdd/features/Version_Create_Update.feature (renamed from workflow-bdd/features/Version_Create_Update.feature)0
-rw-r--r--workflow/workflow-bdd/features/Version_State.feature (renamed from workflow-bdd/features/Version_State.feature)0
-rw-r--r--workflow/workflow-bdd/features/Workflow_Create_Update.feature (renamed from workflow-bdd/features/Workflow_Create_Update.feature)0
-rw-r--r--workflow/workflow-bdd/package.json (renamed from workflow-bdd/package.json)0
-rw-r--r--workflow/workflow-bdd/plugins/README.md (renamed from workflow-bdd/plugins/README.md)0
-rw-r--r--workflow/workflow-bdd/plugins/jsdoc_config.json (renamed from workflow-bdd/plugins/jsdoc_config.json)0
-rw-r--r--workflow/workflow-bdd/plugins/reporter.js (renamed from workflow-bdd/plugins/reporter.js)0
-rw-r--r--workflow/workflow-bdd/plugins/steps.js (renamed from workflow-bdd/plugins/steps.js)0
-rw-r--r--workflow/workflow-bdd/pom.xml (renamed from workflow-bdd/pom.xml)0
-rw-r--r--workflow/workflow-bdd/resources/json/createWorkflow.json (renamed from workflow-bdd/resources/json/createWorkflow.json)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/Collaboration_Steps.js (renamed from workflow-bdd/stepDefinitions/Collaboration_Steps.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/General_Steps.js (renamed from workflow-bdd/stepDefinitions/General_Steps.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/InputData_steps.js (renamed from workflow-bdd/stepDefinitions/InputData_steps.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js (renamed from workflow-bdd/stepDefinitions/InterfaceOperationSteps.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/Item_steps.js (renamed from workflow-bdd/stepDefinitions/Item_steps.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/REST_Steps.js (renamed from workflow-bdd/stepDefinitions/REST_Steps.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/Utils.js (renamed from workflow-bdd/stepDefinitions/Utils.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/Workflow_Steps.js (renamed from workflow-bdd/stepDefinitions/Workflow_Steps.js)0
-rw-r--r--workflow/workflow-bdd/stepDefinitions/world.js (renamed from workflow-bdd/stepDefinitions/world.js)0
-rw-r--r--workflow/workflow-designer-be/pom.xml (renamed from workflow-designer-be/pom.xml)138
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/SpringBootWebApplication.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/SpringBootWebApplication.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/RestConstants.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/RestConstants.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java)6
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java)28
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/exceptionshandlers/CustomizedResponseEntityExceptionHandler.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/exceptionshandlers/CustomizedResponseEntityExceptionHandler.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/CollectionWrapper.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/CollectionWrapper.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionRequestDto.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionRequestDto.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionStateDto.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionStateDto.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/ArtifactRepository.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/ArtifactRepository.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/UniqueValueRepository.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/UniqueValueRepository.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/ArtifactEntity.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/ArtifactEntity.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/UniqueValueEntity.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/UniqueValueEntity.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/Workflow.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/Workflow.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowProperty.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowProperty.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersion.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersion.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersionState.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersionState.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ZusammenConfig.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ZusammenConfig.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowManager.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowManager.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java)2
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/EntityNotFoundException.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/EntityNotFoundException.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/InvalidArtifactException.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/InvalidArtifactException.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/UniqueValueViolationException.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/UniqueValueViolationException.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionCreationException.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionCreationException.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java)6
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionStateModificationException.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionStateModificationException.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/CollaborationConfiguration.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/CollaborationConfiguration.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java)20
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapper.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapper.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapper.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapper.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapper.java (renamed from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapper.java)0
-rw-r--r--workflow/workflow-designer-be/src/main/resources/application.properties10
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/RestPath.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/RestPath.java)0
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/TestUtil.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/TestUtil.java)0
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowControllerTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowControllerTest.java)0
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowVersionControllerTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowVersionControllerTest.java)0
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryTest.java)0
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/UniqueValueServiceTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/UniqueValueServiceTest.java)0
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java)2
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java)2
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java)2
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java)2
-rw-r--r--workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapperTest.java (renamed from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapperTest.java)0
-rw-r--r--workflow/workflow-designer-init/pom.xml45
-rw-r--r--workflow/workflow-designer-init/src/main/docker/Dockerfile10
-rw-r--r--workflow/workflow-designer-init/src/main/docker/create_workflow_db.cql125
-rw-r--r--workflow/workflow-designer-init/src/main/docker/start.sh18
-rw-r--r--workflow/workflow-designer-ui/pom.xml34
-rw-r--r--worklfow-designer-ui/.empty0
81 files changed, 499 insertions, 90 deletions
diff --git a/workflow-designer-be/.empty b/workflow-designer-be/.empty
deleted file mode 100644
index e69de29b..00000000
--- a/workflow-designer-be/.empty
+++ /dev/null
diff --git a/workflow-designer-be/src/main/resources/application.properties b/workflow-designer-be/src/main/resources/application.properties
deleted file mode 100644
index b7cfc5aa..00000000
--- a/workflow-designer-be/src/main/resources/application.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-server.servlet.context-path=/wf
-server.port=8080
-
-#CASSANDRA
-spring.data.cassandra.contact-points=localhost
-spring.data.cassandra.keyspace-name=workflow
-spring.data.cassandra.port=9042 \ No newline at end of file
diff --git a/workflow/README.md b/workflow/README.md
new file mode 100644
index 00000000..40b4bbb2
--- /dev/null
+++ b/workflow/README.md
@@ -0,0 +1,29 @@
+# Steps to run the Workflow application on Docker
+
+## 1. Initialize Workflow Database
+
+`docker run -d -e CS_HOST={HOST} -e CS_PORT={PORT} -e CS_USER={USER} -e CS_PASSWORD={PASSWORD} {INIT_IMAGE}`
+
+This is done only once to initialize the DB schema.
+
+**Example**
+
+`docker run -d -e CS_HOST=10.247.41.19 -e CS_USER=test -e CS_PASSWORD=secret -e CS_PORT=9160 onap/workflow-init:latest`
+
+## 2. Start Backend
+
+`docker run -d -e JAVA_OPTIONS={JAVA_OPTIONS} -e CS_HOSTS={COMMA_SEPARATED_HOSTS} -e CS_PORT={PORT}
+-e CS_USER={USER} -e CS_PASSWORD={PASSWORD} -p {HOST_PORT}:{APPLICATION_PORT} {BACKEND_IMAGE}`
+
+or, if Cassandra authentication is not required
+
+`docker run -d -e JAVA_OPTIONS={JAVA_OPTIONS} -e CS_HOSTS={COMMA_SEPARATED_HOSTS} -e CS_PORT={PORT}
+-e CS_AUTHENTICATE=false -p {HOST_PORT}:{APPLICATION_PORT} {BACKEND_IMAGE}`
+
+The server listens on 8080 by default, but it is possible to change the application port by passing
+`-e SERVER_PORT={PORT}` to Docker _run_ command.
+
+**Example**
+
+`docker run -d -e JAVA_OPTIONS="-Xmx128m -Xms128m -Xss1m" -e CS_HOSTS=10.247.41.19,10.247.41.20
+-e CS_PORT=9042 -e CS_AUTHENTICATE=false -p 8080:8080 onap/workflow-backend:latest` \ No newline at end of file
diff --git a/workflow/pom.xml b/workflow/pom.xml
new file mode 100644
index 00000000..ea4edbcf
--- /dev/null
+++ b/workflow/pom.xml
@@ -0,0 +1,103 @@
+<project
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.onap.sdc.workflow_designer</groupId>
+ <artifactId>workflow-designer-parent</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <onap.version>1.3.0-SNAPSHOT</onap.version>
+ <mvn.docker.version>0.23.0</mvn.docker.version>
+ <docker.optimize>true</docker.optimize>
+ <docker.username>docker</docker.username>
+ <docker.password>docker</docker.password>
+ <nexus.registry>nexus3.onap.org:10001</nexus.registry>
+ <nexus.proxy>https://nexus.onap.org</nexus.proxy>
+ <sitePath>/content/sites/site/org/onap/sdc/workflow/${project.version}</sitePath>
+ </properties>
+
+ <modules>
+ <module>workflow-designer-init</module>
+ <module>workflow-designer-be</module>
+ <module>workflow-designer-ui</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${mvn.docker.version}</version>
+ <configuration>
+ <verbose>false</verbose>
+ <registry>${nexus.registry}</registry>
+ <authConfig>
+ <pull>
+ <username>${docker.username}</username>
+ <password>${docker.password}</password>
+ </pull>
+ </authConfig>
+ </configuration>
+ <executions>
+ <execution>
+ <id>docker-build</id>
+ <phase>install</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>push-images</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>Release Repository</name>
+ <url>${nexus.proxy}/content/repositories/releases/</url>
+ </repository>
+ <repository>
+ <id>ecomp-snapshots</id>
+ <name>Snapshots Repository</name>
+ <url>${nexus.proxy}/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>ecomp-public</id>
+ <name>Public Repository</name>
+ <url>${nexus.proxy}/content/repositories/public/</url>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>Release Repository</name>
+ <url>${nexus.proxy}/content/repositories/releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>Snapshot Repository</name>
+ <url>${nexus.proxy}/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <site>
+ <id>ecomp-site</id>
+ <url>dav:${nexus.proxy}${sitePath}</url>
+ </site>
+ </distributionManagement>
+
+</project> \ No newline at end of file
diff --git a/workflow-bdd/.gitignore b/workflow/workflow-bdd/.gitignore
index 316e3984..316e3984 100644
--- a/workflow-bdd/.gitignore
+++ b/workflow/workflow-bdd/.gitignore
diff --git a/workflow-bdd/README.txt b/workflow/workflow-bdd/README.txt
index 35250ed3..35250ed3 100644
--- a/workflow-bdd/README.txt
+++ b/workflow/workflow-bdd/README.txt
diff --git a/workflow-bdd/config.json b/workflow/workflow-bdd/config.json
index 260f2859..260f2859 100644
--- a/workflow-bdd/config.json
+++ b/workflow/workflow-bdd/config.json
diff --git a/workflow-bdd/cucumber.js b/workflow/workflow-bdd/cucumber.js
index 4ade9b1c..4ade9b1c 100644
--- a/workflow-bdd/cucumber.js
+++ b/workflow/workflow-bdd/cucumber.js
diff --git a/workflow-bdd/features/Version_Create_Update.feature b/workflow/workflow-bdd/features/Version_Create_Update.feature
index 2cb05804..2cb05804 100644
--- a/workflow-bdd/features/Version_Create_Update.feature
+++ b/workflow/workflow-bdd/features/Version_Create_Update.feature
diff --git a/workflow-bdd/features/Version_State.feature b/workflow/workflow-bdd/features/Version_State.feature
index 8c1e13fd..8c1e13fd 100644
--- a/workflow-bdd/features/Version_State.feature
+++ b/workflow/workflow-bdd/features/Version_State.feature
diff --git a/workflow-bdd/features/Workflow_Create_Update.feature b/workflow/workflow-bdd/features/Workflow_Create_Update.feature
index 04a64bf8..04a64bf8 100644
--- a/workflow-bdd/features/Workflow_Create_Update.feature
+++ b/workflow/workflow-bdd/features/Workflow_Create_Update.feature
diff --git a/workflow-bdd/package.json b/workflow/workflow-bdd/package.json
index e8841bc3..e8841bc3 100644
--- a/workflow-bdd/package.json
+++ b/workflow/workflow-bdd/package.json
diff --git a/workflow-bdd/plugins/README.md b/workflow/workflow-bdd/plugins/README.md
index 956fe772..956fe772 100644
--- a/workflow-bdd/plugins/README.md
+++ b/workflow/workflow-bdd/plugins/README.md
diff --git a/workflow-bdd/plugins/jsdoc_config.json b/workflow/workflow-bdd/plugins/jsdoc_config.json
index a5a608e8..a5a608e8 100644
--- a/workflow-bdd/plugins/jsdoc_config.json
+++ b/workflow/workflow-bdd/plugins/jsdoc_config.json
diff --git a/workflow-bdd/plugins/reporter.js b/workflow/workflow-bdd/plugins/reporter.js
index 8913789c..8913789c 100644
--- a/workflow-bdd/plugins/reporter.js
+++ b/workflow/workflow-bdd/plugins/reporter.js
diff --git a/workflow-bdd/plugins/steps.js b/workflow/workflow-bdd/plugins/steps.js
index 2faa7efb..2faa7efb 100644
--- a/workflow-bdd/plugins/steps.js
+++ b/workflow/workflow-bdd/plugins/steps.js
diff --git a/workflow-bdd/pom.xml b/workflow/workflow-bdd/pom.xml
index 3502451c..3502451c 100644
--- a/workflow-bdd/pom.xml
+++ b/workflow/workflow-bdd/pom.xml
diff --git a/workflow-bdd/resources/json/createWorkflow.json b/workflow/workflow-bdd/resources/json/createWorkflow.json
index 074899e9..074899e9 100644
--- a/workflow-bdd/resources/json/createWorkflow.json
+++ b/workflow/workflow-bdd/resources/json/createWorkflow.json
diff --git a/workflow-bdd/stepDefinitions/Collaboration_Steps.js b/workflow/workflow-bdd/stepDefinitions/Collaboration_Steps.js
index c4de7583..c4de7583 100644
--- a/workflow-bdd/stepDefinitions/Collaboration_Steps.js
+++ b/workflow/workflow-bdd/stepDefinitions/Collaboration_Steps.js
diff --git a/workflow-bdd/stepDefinitions/General_Steps.js b/workflow/workflow-bdd/stepDefinitions/General_Steps.js
index 0550e415..0550e415 100644
--- a/workflow-bdd/stepDefinitions/General_Steps.js
+++ b/workflow/workflow-bdd/stepDefinitions/General_Steps.js
diff --git a/workflow-bdd/stepDefinitions/InputData_steps.js b/workflow/workflow-bdd/stepDefinitions/InputData_steps.js
index 73695d0e..73695d0e 100644
--- a/workflow-bdd/stepDefinitions/InputData_steps.js
+++ b/workflow/workflow-bdd/stepDefinitions/InputData_steps.js
diff --git a/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js b/workflow/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js
index 4c00debc..4c00debc 100644
--- a/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js
+++ b/workflow/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js
diff --git a/workflow-bdd/stepDefinitions/Item_steps.js b/workflow/workflow-bdd/stepDefinitions/Item_steps.js
index 3ff7f20f..3ff7f20f 100644
--- a/workflow-bdd/stepDefinitions/Item_steps.js
+++ b/workflow/workflow-bdd/stepDefinitions/Item_steps.js
diff --git a/workflow-bdd/stepDefinitions/REST_Steps.js b/workflow/workflow-bdd/stepDefinitions/REST_Steps.js
index c3844124..c3844124 100644
--- a/workflow-bdd/stepDefinitions/REST_Steps.js
+++ b/workflow/workflow-bdd/stepDefinitions/REST_Steps.js
diff --git a/workflow-bdd/stepDefinitions/Utils.js b/workflow/workflow-bdd/stepDefinitions/Utils.js
index 6f8a7a5c..6f8a7a5c 100644
--- a/workflow-bdd/stepDefinitions/Utils.js
+++ b/workflow/workflow-bdd/stepDefinitions/Utils.js
diff --git a/workflow-bdd/stepDefinitions/Workflow_Steps.js b/workflow/workflow-bdd/stepDefinitions/Workflow_Steps.js
index 59c95d89..59c95d89 100644
--- a/workflow-bdd/stepDefinitions/Workflow_Steps.js
+++ b/workflow/workflow-bdd/stepDefinitions/Workflow_Steps.js
diff --git a/workflow-bdd/stepDefinitions/world.js b/workflow/workflow-bdd/stepDefinitions/world.js
index cf749e66..cf749e66 100644
--- a/workflow-bdd/stepDefinitions/world.js
+++ b/workflow/workflow-bdd/stepDefinitions/world.js
diff --git a/workflow-designer-be/pom.xml b/workflow/workflow-designer-be/pom.xml
index 37f4d80d..b76dc467 100644
--- a/workflow-designer-be/pom.xml
+++ b/workflow/workflow-designer-be/pom.xml
@@ -2,25 +2,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.sdc.workflow</groupId>
- <artifactId>workflow-be</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <artifactId>workflow-designer-be</artifactId>
+
<parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.0.2.RELEASE</version>
+ <groupId>org.onap.sdc.workflow_designer</groupId>
+ <artifactId>workflow-designer-parent</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <onap.version>1.3.0-SNAPSHOT</onap.version>
- <org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
- <org.projectlombok.version>1.18.0</org.projectlombok.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
+ <mapstruct.version>1.2.0.Final</mapstruct.version>
+ <lombok.version>1.18.0</lombok.version>
+ <springfox.version>2.8.0</springfox.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -36,41 +49,29 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${org.projectlombok.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
+ <scope>runtime</scope>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
-
-
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
- <version>2.8.0</version>
- <scope>compile</scope>
+ <version>${springfox.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
- <version>2.8.0</version>
- <scope>compile</scope>
+ <version>${springfox.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
@@ -103,38 +104,79 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId>
- <version>${org.mapstruct.version}</version>
+ <version>${mapstruct.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <annotationProcessorPaths>
- <path>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct-processor</artifactId>
- <version>${org.mapstruct.version}</version>
- </path>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>onap/workflow-backend</name>
+ <build>
+ <tags>
+ <tag>${project.version}</tag>
+ </tags>
+ <from>openjdk:8-jdk-alpine</from>
+ <user>root</user>
+ <assembly>
+ <descriptorRef>artifact</descriptorRef>
+ <targetDir>/</targetDir>
+ </assembly>
+ <entryPoint>java ${JAVA_OPTIONS} -jar /${project.build.finalName}.jar</entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/SpringBootWebApplication.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/SpringBootWebApplication.java
index b7e3b345..b7e3b345 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/SpringBootWebApplication.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/SpringBootWebApplication.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/RestConstants.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/RestConstants.java
index 8f02be0f..8f02be0f 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/RestConstants.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/RestConstants.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
index bb4320cc..b224e84b 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
@@ -42,14 +42,14 @@ public class WorkflowController {
@PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
@ApiOperation("Create workflow")
public ResponseEntity<Workflow> create(@RequestBody Workflow workflow,
- @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @RequestHeader(USER_ID_HEADER_PARAM) String user) {
return new ResponseEntity<>(workflowManager.create(workflow), HttpStatus.CREATED);
}
@GetMapping(path = "/{workflowId}")
@ApiOperation("Get workflow")
public Workflow get(@PathVariable("workflowId") String workflowId,
- @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @RequestHeader(USER_ID_HEADER_PARAM) String user) {
Workflow workflow = new Workflow();
workflow.setId(workflowId);
return workflowManager.get(workflow);
@@ -58,7 +58,7 @@ public class WorkflowController {
@PutMapping(path = "/{workflowId}", consumes = MediaType.APPLICATION_JSON_VALUE)
@ApiOperation("Update workflow")
public Workflow update(@RequestBody Workflow workflow, @PathVariable("workflowId") String workflowId,
- @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @RequestHeader(USER_ID_HEADER_PARAM) String user) {
workflow.setId(workflowId);
workflowManager.update(workflow);
return workflow;
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
index 6214f1bb..6ae8e34d 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
@@ -38,21 +38,21 @@ public class WorkflowVersionController {
@Autowired
public WorkflowVersionController(
- @Qualifier("workflowVersionManager") WorkflowVersionManager workflowVersionManager) {
+ @Qualifier("workflowVersionManager") WorkflowVersionManager workflowVersionManager) {
this.workflowVersionManager = workflowVersionManager;
}
@GetMapping
@ApiOperation("List workflow versions")
public CollectionWrapper<WorkflowVersion> list(@PathVariable("workflowId") String workflowId,
- @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @RequestHeader(USER_ID_HEADER_PARAM) String user) {
return new CollectionWrapper<>(workflowVersionManager.list(workflowId));
}
@PostMapping
@ApiOperation("Create workflow version")
public ResponseEntity<WorkflowVersion> create(@RequestBody VersionRequestDto versionRequest,
- @PathVariable("workflowId") String workflowId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("workflowId") String workflowId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
WorkflowVersion createdVersion = workflowVersionManager.create(workflowId, versionRequest);
return new ResponseEntity<>(createdVersion, HttpStatus.CREATED);
@@ -61,14 +61,14 @@ public class WorkflowVersionController {
@GetMapping("/{versionId}")
@ApiOperation("Get workflow version")
public WorkflowVersion get(@PathVariable("workflowId") String workflowId,
- @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
return workflowVersionManager.get(workflowId, versionId);
}
@PutMapping("/{versionId}")
@ApiOperation("Update workflow version")
public void update(@RequestBody WorkflowVersion version, @PathVariable("workflowId") String workflowId,
- @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
version.setId(versionId);
workflowVersionManager.update(workflowId, version);
}
@@ -76,15 +76,15 @@ public class WorkflowVersionController {
@GetMapping("/{versionId}/state")
@ApiOperation("Get workflow version state")
public VersionStateDto getState(@PathVariable("workflowId") String workflowId,
- @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
return new VersionStateDto(workflowVersionManager.getState(workflowId, versionId));
}
@PostMapping("/{versionId}/state")
@ApiOperation("Update workflow version state")
public VersionStateDto updateState(@RequestBody VersionStateDto state,
- @PathVariable("workflowId") String workflowId, @PathVariable("versionId") String versionId,
- @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("workflowId") String workflowId, @PathVariable("versionId") String versionId,
+ @RequestHeader(USER_ID_HEADER_PARAM) String user) {
workflowVersionManager.updateState(workflowId, versionId, state.getName());
return new VersionStateDto(state.getName());
}
@@ -92,26 +92,26 @@ public class WorkflowVersionController {
@PutMapping("/{versionId}/artifact")
@ApiOperation("Create/update artifact of a version")
public void uploadArtifact(@RequestBody MultipartFile fileToUpload, @PathVariable("workflowId") String workflowId,
- @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
workflowVersionManager.uploadArtifact(workflowId, versionId, fileToUpload);
}
@GetMapping("/{versionId}/artifact")
@ApiOperation("Download workflow version artifact")
public ResponseEntity<Resource> getArtifact(@PathVariable("workflowId") String workflowId,
- @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
ArtifactEntity artifact = workflowVersionManager.getArtifact(workflowId, versionId);
return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + artifact.getFileName())
- .contentType(MediaType.APPLICATION_OCTET_STREAM)
- .body(new InputStreamResource(artifact.getArtifactData()));
+ .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + artifact.getFileName())
+ .contentType(MediaType.APPLICATION_OCTET_STREAM)
+ .body(new InputStreamResource(artifact.getArtifactData()));
}
@DeleteMapping("/{versionId}/artifact")
@ApiOperation("Delete workflow version artifact")
public void deleteArtifact(@PathVariable("workflowId") String workflowId,
- @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+ @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
workflowVersionManager.deleteArtifact(workflowId, versionId);
}
}
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/exceptionshandlers/CustomizedResponseEntityExceptionHandler.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/exceptionshandlers/CustomizedResponseEntityExceptionHandler.java
index 68fd41a5..68fd41a5 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/exceptionshandlers/CustomizedResponseEntityExceptionHandler.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/exceptionshandlers/CustomizedResponseEntityExceptionHandler.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/CollectionWrapper.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/CollectionWrapper.java
index 653b0dcf..653b0dcf 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/CollectionWrapper.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/CollectionWrapper.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionRequestDto.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionRequestDto.java
index 92ac3a73..92ac3a73 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionRequestDto.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionRequestDto.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionStateDto.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionStateDto.java
index 5963a2bf..5963a2bf 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionStateDto.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionStateDto.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/ArtifactRepository.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/ArtifactRepository.java
index a473f166..a473f166 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/ArtifactRepository.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/ArtifactRepository.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/UniqueValueRepository.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/UniqueValueRepository.java
index d374a404..d374a404 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/UniqueValueRepository.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/UniqueValueRepository.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java
index 9a449f0d..9a449f0d 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/ArtifactEntity.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/ArtifactEntity.java
index 8f24ecc9..8f24ecc9 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/ArtifactEntity.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/ArtifactEntity.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/UniqueValueEntity.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/UniqueValueEntity.java
index 925ec5cb..925ec5cb 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/UniqueValueEntity.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/UniqueValueEntity.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/Workflow.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/Workflow.java
index 8c66d820..8c66d820 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/Workflow.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/Workflow.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowProperty.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowProperty.java
index 6c2d804d..6c2d804d 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowProperty.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowProperty.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersion.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersion.java
index db0999b6..db0999b6 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersion.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersion.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersionState.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersionState.java
index 9414fa17..9414fa17 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersionState.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersionState.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java
index 5105114f..5105114f 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ZusammenConfig.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ZusammenConfig.java
index 092c3464..092c3464 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ZusammenConfig.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ZusammenConfig.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java
index 07d8eee7..07d8eee7 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java
index a9acb816..a9acb816 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowManager.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowManager.java
index 01c0b053..01c0b053 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowManager.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowManager.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java
index 30234526..8b4b8949 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java
@@ -27,4 +27,4 @@ public interface WorkflowVersionManager {
void deleteArtifact(String workflowId, String versionId);
void uploadArtifact(String workflowId, String versionId, MultipartFile artifact);
-}
+} \ No newline at end of file
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/EntityNotFoundException.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/EntityNotFoundException.java
index 1ed3df5a..1ed3df5a 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/EntityNotFoundException.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/EntityNotFoundException.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/InvalidArtifactException.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/InvalidArtifactException.java
index 89c5fd5f..89c5fd5f 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/InvalidArtifactException.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/InvalidArtifactException.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/UniqueValueViolationException.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/UniqueValueViolationException.java
index 82c97f94..82c97f94 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/UniqueValueViolationException.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/UniqueValueViolationException.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionCreationException.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionCreationException.java
index af01c68f..af01c68f 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionCreationException.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionCreationException.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java
index 64ab6103..ff1bf89b 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java
@@ -4,7 +4,7 @@ public class VersionModificationException extends RuntimeException {
public VersionModificationException(String workflowId, String versionId) {
super(String.format(
- "Error while trying to modify version %s of workflow %s: Version is CERTIFIED and can not be edited",
- versionId, workflowId));
+ "Error while trying to modify version %s of workflow %s: Version is CERTIFIED and can not be edited",
+ versionId, workflowId));
}
-}
+} \ No newline at end of file
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionStateModificationException.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionStateModificationException.java
index 6c4606db..6c4606db 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionStateModificationException.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionStateModificationException.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/CollaborationConfiguration.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/CollaborationConfiguration.java
index 2a4cd5aa..2a4cd5aa 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/CollaborationConfiguration.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/CollaborationConfiguration.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java
index 8ac5025a..8ac5025a 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java
index d559f025..cdfddf34 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java
@@ -41,7 +41,7 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
@Autowired
public WorkflowVersionManagerImpl(VersioningManager versioningManager, ArtifactRepository artifactRepository,
- VersionMapper versionMapper, VersionStateMapper versionStateMapper) {
+ VersionMapper versionMapper, VersionStateMapper versionStateMapper) {
this.versioningManager = versioningManager;
this.artifactRepository = artifactRepository;
this.versionMapper = versionMapper;
@@ -51,7 +51,7 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
@Override
public Collection<WorkflowVersion> list(String workflowId) {
return versioningManager.list(workflowId).stream().map(versionMapper::versionToWorkflowVersion)
- .collect(Collectors.toList());
+ .collect(Collectors.toList());
}
@Override
@@ -86,7 +86,7 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
public void update(String workflowId, WorkflowVersion workflowVersion) {
Version retrievedVersion = getVersion(workflowId, workflowVersion.getId());
if (WorkflowVersionState.CERTIFIED
- .equals(versionStateMapper.versionStatusToWorkflowVersionState(retrievedVersion.getStatus()))) {
+ .equals(versionStateMapper.versionStatusToWorkflowVersionState(retrievedVersion.getStatus()))) {
throw new VersionModificationException(workflowId, workflowVersion.getId());
}
@@ -107,7 +107,7 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
public void updateState(String workflowId, String versionId, WorkflowVersionState state) {
Version retrievedVersion = getVersion(workflowId, versionId);
WorkflowVersionState retrievedState =
- versionStateMapper.versionStatusToWorkflowVersionState(retrievedVersion.getStatus());
+ versionStateMapper.versionStatusToWorkflowVersionState(retrievedVersion.getStatus());
if (WorkflowVersionState.CERTIFIED.equals(retrievedState) || retrievedState.equals(state)) {
throw new VersionStateModificationException(workflowId, versionId, retrievedState, state);
}
@@ -115,20 +115,20 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
retrievedVersion.setStatus(versionStateMapper.workflowVersionStateToVersionStatus(state));
versioningManager.updateVersion(workflowId, retrievedVersion);
versioningManager.publish(workflowId, retrievedVersion,
- String.format("Update version state from %s to %s", retrievedState.name(), state.name()));
+ String.format("Update version state from %s to %s", retrievedState.name(), state.name()));
}
@Override
public void uploadArtifact(String workflowId, String versionId, MultipartFile artifact) {
Version retrievedVersion = getVersion(workflowId, versionId);
if (WorkflowVersionState.CERTIFIED
- .equals(versionStateMapper.versionStatusToWorkflowVersionState(retrievedVersion.getStatus()))) {
+ .equals(versionStateMapper.versionStatusToWorkflowVersionState(retrievedVersion.getStatus()))) {
throw new VersionModificationException(workflowId, versionId);
}
try (InputStream artifactData = artifact.getInputStream()) {
ArtifactEntity artifactEntity =
- new ArtifactEntity(StringUtils.cleanPath(artifact.getOriginalFilename()), artifactData);
+ new ArtifactEntity(StringUtils.cleanPath(artifact.getOriginalFilename()), artifactData);
artifactRepository.update(workflowId, versionId, artifactEntity);
versioningManager.publish(workflowId, new Version(versionId), "Update Artifact");
@@ -143,7 +143,7 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
Optional<ArtifactEntity> artifactOptional = artifactRepository.get(workflowId, versionId);
if (!artifactOptional.isPresent()) {
throw new EntityNotFoundException(
- String.format("Artifact for workflow id %S version id %S was not found", workflowId, versionId));
+ String.format("Artifact for workflow id %S version id %S was not found", workflowId, versionId));
}
return artifactOptional.get();
}
@@ -161,7 +161,7 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
private void validateVersionExistAndCertified(String workflowId, List<Version> versions, String versionId) {
Version baseVersion = findVersion(versions, versionId).orElseThrow(
- () -> new EntityNotFoundException(String.format(VERSION_NOT_EXIST_MSG, versionId, workflowId)));
+ () -> new EntityNotFoundException(String.format(VERSION_NOT_EXIST_MSG, versionId, workflowId)));
if (!Certified.equals(baseVersion.getStatus())) {
throw new VersionCreationException(workflowId, versionId);
@@ -183,4 +183,4 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager {
private static Optional<Version> findVersion(List<Version> versions, String versionId) {
return versions.stream().filter(version -> versionId.equals(version.getId())).findFirst();
}
-}
+} \ No newline at end of file
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapper.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapper.java
index bcf89661..bcf89661 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapper.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapper.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapper.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapper.java
index 0c2f5391..0c2f5391 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapper.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapper.java
diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapper.java b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapper.java
index 34327ce7..34327ce7 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapper.java
+++ b/workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapper.java
diff --git a/workflow/workflow-designer-be/src/main/resources/application.properties b/workflow/workflow-designer-be/src/main/resources/application.properties
new file mode 100644
index 00000000..ab4930b5
--- /dev/null
+++ b/workflow/workflow-designer-be/src/main/resources/application.properties
@@ -0,0 +1,10 @@
+server.servlet.context-path=/wf
+server.port=${SERVER_PORT:8080}
+
+#CASSANDRA
+spring.data.cassandra.contact-points=${CS_HOSTS}
+spring.data.cassandra.keyspace-name=workflow
+spring.data.cassandra.port=${CS_PORT:9042}
+spring.data.cassandra.username=${CS_USER:}
+spring.data.cassandra.password=${CS_PASSWORD:}
+zusammen.cassandra.isAuthenticate=${CS_AUTHENTICATE:true} \ No newline at end of file
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/RestPath.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/RestPath.java
index 266ca91b..266ca91b 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/RestPath.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/RestPath.java
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/TestUtil.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/TestUtil.java
index 47ce060b..47ce060b 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/TestUtil.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/TestUtil.java
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowControllerTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowControllerTest.java
index 69b25b01..69b25b01 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowControllerTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowControllerTest.java
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowVersionControllerTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowVersionControllerTest.java
index 75b132ad..75b132ad 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowVersionControllerTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowVersionControllerTest.java
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryTest.java
index 4bec8b97..4bec8b97 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryTest.java
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/UniqueValueServiceTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/UniqueValueServiceTest.java
index 4911060a..4911060a 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/UniqueValueServiceTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/UniqueValueServiceTest.java
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
index 3e228759..17037d9b 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
@@ -116,4 +116,4 @@ public class WorkflowManagerImplTest {
workflowManager.update(createWorkflow(1, true));
}
-}
+} \ No newline at end of file
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java
index ae69b280..144db81e 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java
@@ -255,4 +255,4 @@ public class WorkflowVersionManagerImplTest {
}
}
-}
+} \ No newline at end of file
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java
index b778de47..d9790355 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java
@@ -77,4 +77,4 @@ public class VersionMapperTest {
return workflowVersion;
}
-}
+} \ No newline at end of file
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java
index 59d16289..070c433e 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java
@@ -72,4 +72,4 @@ public class VersionStateMapperTest {
versionStateMapper.workflowVersionStateToVersionStatus(WorkflowVersionState.DRAFT);
assertEquals(VersionStatus.Draft, mappedVersionStatus);
}
-}
+} \ No newline at end of file
diff --git a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapperTest.java b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapperTest.java
index 55802cc0..55802cc0 100644
--- a/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapperTest.java
+++ b/workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapperTest.java
diff --git a/workflow/workflow-designer-init/pom.xml b/workflow/workflow-designer-init/pom.xml
new file mode 100644
index 00000000..7f926e86
--- /dev/null
+++ b/workflow/workflow-designer-init/pom.xml
@@ -0,0 +1,45 @@
+<project
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>workflow-designer-init</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.onap.sdc.workflow_designer</groupId>
+ <artifactId>workflow-designer-parent</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>onap/workflow-init</name>
+ <build>
+ <tags>
+ <tag>${project.version}</tag>
+ </tags>
+ <dockerFile>Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project> \ No newline at end of file
diff --git a/workflow/workflow-designer-init/src/main/docker/Dockerfile b/workflow/workflow-designer-init/src/main/docker/Dockerfile
new file mode 100644
index 00000000..75e7efdc
--- /dev/null
+++ b/workflow/workflow-designer-init/src/main/docker/Dockerfile
@@ -0,0 +1,10 @@
+FROM alpine:3.7
+
+RUN apk add --no-cache 'python<3' py-pip && pip install cqlsh==4.0.1
+
+COPY create_workflow_db.cql .
+COPY start.sh .
+
+RUN chmod 744 start.sh
+
+ENTRYPOINT ["./start.sh"] \ No newline at end of file
diff --git a/workflow/workflow-designer-init/src/main/docker/create_workflow_db.cql b/workflow/workflow-designer-init/src/main/docker/create_workflow_db.cql
new file mode 100644
index 00000000..c6c1f15e
--- /dev/null
+++ b/workflow/workflow-designer-init/src/main/docker/create_workflow_db.cql
@@ -0,0 +1,125 @@
+CREATE KEYSPACE IF NOT EXISTS WORKFLOW
+WITH DURABLE_WRITES = TRUE
+AND REPLICATION = {
+ 'class' : 'SimpleStrategy',
+ 'replication_factor' : 1
+};
+
+USE WORKFLOW;
+
+CREATE TABLE IF NOT EXISTS UNIQUE_VALUE (
+ TYPE TEXT,
+ VALUE TEXT,
+ PRIMARY KEY (( TYPE, VALUE ))
+);
+
+CREATE KEYSPACE IF NOT EXISTS ZUSAMMEN_WORKFLOW
+WITH REPLICATION = {
+ 'class' : 'SimpleStrategy',
+ 'replication_factor' : 1
+};
+
+USE ZUSAMMEN_WORKFLOW;
+
+CREATE TABLE IF NOT EXISTS ITEM (
+ ITEM_ID TEXT PRIMARY KEY,
+ ITEM_INFO TEXT,
+ CREATION_TIME TIMESTAMP,
+ MODIFICATION_TIME TIMESTAMP
+);
+
+CREATE TABLE IF NOT EXISTS VERSION (
+ SPACE TEXT,
+ ITEM_ID TEXT,
+ VERSION_ID TEXT,
+ BASE_VERSION_ID TEXT,
+ INFO TEXT,
+ RELATIONS TEXT,
+ CREATION_TIME TIMESTAMP,
+ MODIFICATION_TIME TIMESTAMP,
+ PRIMARY KEY (( SPACE, ITEM_ID ), VERSION_ID)
+);
+
+CREATE TABLE IF NOT EXISTS VERSION_ELEMENTS (
+ SPACE TEXT,
+ ITEM_ID TEXT,
+ VERSION_ID TEXT,
+ REVISION_ID TEXT,
+ ELEMENT_IDS MAP<TEXT, TEXT>,
+ DIRTY_ELEMENT_IDS SET<TEXT>,
+ STAGE_ELEMENT_IDS SET<TEXT>,
+ CONFLICT_ELEMENT_IDS SET<TEXT>,
+ PUBLISH_TIME TIMESTAMP,
+ USER TEXT,
+ MESSAGE TEXT,
+ PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID ), REVISION_ID)
+);
+
+CREATE TABLE IF NOT EXISTS ELEMENT_NAMESPACE (
+ ITEM_ID TEXT,
+ ELEMENT_ID TEXT,
+ NAMESPACE TEXT,
+ PRIMARY KEY (( ITEM_ID, ELEMENT_ID ))
+);
+
+CREATE TABLE IF NOT EXISTS ELEMENT (
+ SPACE TEXT,
+ ITEM_ID TEXT,
+ VERSION_ID TEXT,
+ ELEMENT_ID TEXT,
+ REVISION_ID TEXT,
+ PARENT_ID TEXT,
+ NAMESPACE TEXT,
+ INFO TEXT,
+ RELATIONS TEXT,
+ DATA BLOB,
+ SEARCHABLE_DATA BLOB,
+ VISUALIZATION BLOB,
+ SUB_ELEMENT_IDS SET<TEXT>,
+ ELEMENT_HASH TEXT,
+ PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID, ELEMENT_ID ), REVISION_ID)
+);
+
+CREATE TABLE IF NOT EXISTS ELEMENT_SYNCHRONIZATION_STATE (
+ SPACE TEXT,
+ ITEM_ID TEXT,
+ VERSION_ID TEXT,
+ ELEMENT_ID TEXT,
+ REVISION_ID TEXT,
+ PUBLISH_TIME TIMESTAMP,
+ DIRTY BOOLEAN,
+ PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID ), ELEMENT_ID, REVISION_ID)
+);
+
+CREATE TABLE IF NOT EXISTS ELEMENT_STAGE (
+ SPACE TEXT,
+ ITEM_ID TEXT,
+ VERSION_ID TEXT,
+ ELEMENT_ID TEXT,
+ PARENT_ID TEXT,
+ NAMESPACE TEXT,
+ INFO TEXT,
+ RELATIONS TEXT,
+ DATA BLOB,
+ SEARCHABLE_DATA BLOB,
+ VISUALIZATION BLOB,
+ SUB_ELEMENT_IDS SET<TEXT>,
+ ELEMENT_HASH TEXT,
+ PUBLISH_TIME TIMESTAMP,
+ ACTION TEXT,
+ CONFLICTED BOOLEAN,
+ CONFLICT_DEPENDENT_IDS SET<TEXT>,
+ PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID, ELEMENT_ID ))
+);
+
+CREATE TABLE IF NOT EXISTS VERSION_STAGE (
+ SPACE TEXT,
+ ITEM_ID TEXT,
+ VERSION_ID TEXT,
+ BASE_VERSION_ID TEXT,
+ CREATION_TIME TIMESTAMP,
+ MODIFICATION_TIME TIMESTAMP,
+ PUBLISH_TIME TIMESTAMP,
+ ACTION TEXT,
+ PRIMARY KEY (( SPACE, ITEM_ID ), VERSION_ID)
+); \ No newline at end of file
diff --git a/workflow/workflow-designer-init/src/main/docker/start.sh b/workflow/workflow-designer-init/src/main/docker/start.sh
new file mode 100644
index 00000000..ac89d6c0
--- /dev/null
+++ b/workflow/workflow-designer-init/src/main/docker/start.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [[ -z "${CS_USER}" ]]; then
+ echo "CS_USER environment variable must be set"
+ exit 1
+fi
+
+if [[ -z "${CS_PASSWORD}" ]]; then
+ echo "CS_PASSWORD environment variable must be set"
+ exit 1
+fi
+
+if [[ -z "${CS_HOST}" ]]; then
+ echo "CS_HOST environment variable must be set"
+ exit 1
+fi
+
+cqlsh -u ${CS_USER} -p ${CS_PASSWORD} -f /create_workflow_db.cql ${CS_HOST} ${CS_PORT}
diff --git a/workflow/workflow-designer-ui/pom.xml b/workflow/workflow-designer-ui/pom.xml
new file mode 100644
index 00000000..652aec65
--- /dev/null
+++ b/workflow/workflow-designer-ui/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright © 2016-2018 European Support Limited
+ ~
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>workflow-designer-ui</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.onap.sdc.workflow_designer</groupId>
+ <artifactId>workflow-designer-parent</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
+
+</project>
+
diff --git a/worklfow-designer-ui/.empty b/worklfow-designer-ui/.empty
deleted file mode 100644
index e69de29b..00000000
--- a/worklfow-designer-ui/.empty
+++ /dev/null