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>

diff --git a/workflow-designer-be/.empty b/workflow-designer-be/.empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/workflow-designer-be/src/main/resources/application.properties b/workflow-designer-be/src/main/resources/application.properties
deleted file mode 100644 (file)
index b7cfc5a..0000000
--- 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 (file)
index 0000000..40b4bbb
--- /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 (file)
index 0000000..ea4edbc
--- /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
similarity index 100%
rename from workflow-bdd/.gitignore
rename to workflow/workflow-bdd/.gitignore

diff --git a/workflow-bdd/README.txt b/workflow/workflow-bdd/README.txt
similarity index 100%
rename from workflow-bdd/README.txt
rename to workflow/workflow-bdd/README.txt

diff --git a/workflow-bdd/config.json b/workflow/workflow-bdd/config.json
similarity index 100%
rename from workflow-bdd/config.json
rename to workflow/workflow-bdd/config.json

diff --git a/workflow-bdd/cucumber.js b/workflow/workflow-bdd/cucumber.js
similarity index 100%
rename from workflow-bdd/cucumber.js
rename to workflow/workflow-bdd/cucumber.js

diff --git a/workflow-bdd/features/Version_Create_Update.feature b/workflow/workflow-bdd/features/Version_Create_Update.feature
similarity index 100%
rename from workflow-bdd/features/Version_Create_Update.feature
rename to 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
similarity index 100%
rename from workflow-bdd/features/Version_State.feature
rename to 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
similarity index 100%
rename from workflow-bdd/features/Workflow_Create_Update.feature
rename to workflow/workflow-bdd/features/Workflow_Create_Update.feature

diff --git a/workflow-bdd/package.json b/workflow/workflow-bdd/package.json
similarity index 100%
rename from workflow-bdd/package.json
rename to workflow/workflow-bdd/package.json

diff --git a/workflow-bdd/plugins/README.md b/workflow/workflow-bdd/plugins/README.md
similarity index 100%
rename from workflow-bdd/plugins/README.md
rename to workflow/workflow-bdd/plugins/README.md

diff --git a/workflow-bdd/plugins/jsdoc_config.json b/workflow/workflow-bdd/plugins/jsdoc_config.json
similarity index 100%
rename from workflow-bdd/plugins/jsdoc_config.json
rename to workflow/workflow-bdd/plugins/jsdoc_config.json

diff --git a/workflow-bdd/plugins/reporter.js b/workflow/workflow-bdd/plugins/reporter.js
similarity index 100%
rename from workflow-bdd/plugins/reporter.js
rename to workflow/workflow-bdd/plugins/reporter.js

diff --git a/workflow-bdd/plugins/steps.js b/workflow/workflow-bdd/plugins/steps.js
similarity index 100%
rename from workflow-bdd/plugins/steps.js
rename to workflow/workflow-bdd/plugins/steps.js

diff --git a/workflow-bdd/pom.xml b/workflow/workflow-bdd/pom.xml
similarity index 100%
rename from workflow-bdd/pom.xml
rename to workflow/workflow-bdd/pom.xml

diff --git a/workflow-bdd/resources/json/createWorkflow.json b/workflow/workflow-bdd/resources/json/createWorkflow.json
similarity index 100%
rename from workflow-bdd/resources/json/createWorkflow.json
rename to workflow/workflow-bdd/resources/json/createWorkflow.json

diff --git a/workflow-bdd/stepDefinitions/Collaboration_Steps.js b/workflow/workflow-bdd/stepDefinitions/Collaboration_Steps.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/Collaboration_Steps.js
rename to workflow/workflow-bdd/stepDefinitions/Collaboration_Steps.js

diff --git a/workflow-bdd/stepDefinitions/General_Steps.js b/workflow/workflow-bdd/stepDefinitions/General_Steps.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/General_Steps.js
rename to workflow/workflow-bdd/stepDefinitions/General_Steps.js

diff --git a/workflow-bdd/stepDefinitions/InputData_steps.js b/workflow/workflow-bdd/stepDefinitions/InputData_steps.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/InputData_steps.js
rename to workflow/workflow-bdd/stepDefinitions/InputData_steps.js

diff --git a/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js b/workflow/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/InterfaceOperationSteps.js
rename to workflow/workflow-bdd/stepDefinitions/InterfaceOperationSteps.js

diff --git a/workflow-bdd/stepDefinitions/Item_steps.js b/workflow/workflow-bdd/stepDefinitions/Item_steps.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/Item_steps.js
rename to workflow/workflow-bdd/stepDefinitions/Item_steps.js

diff --git a/workflow-bdd/stepDefinitions/REST_Steps.js b/workflow/workflow-bdd/stepDefinitions/REST_Steps.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/REST_Steps.js
rename to workflow/workflow-bdd/stepDefinitions/REST_Steps.js

diff --git a/workflow-bdd/stepDefinitions/Utils.js b/workflow/workflow-bdd/stepDefinitions/Utils.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/Utils.js
rename to workflow/workflow-bdd/stepDefinitions/Utils.js

diff --git a/workflow-bdd/stepDefinitions/Workflow_Steps.js b/workflow/workflow-bdd/stepDefinitions/Workflow_Steps.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/Workflow_Steps.js
rename to workflow/workflow-bdd/stepDefinitions/Workflow_Steps.js

diff --git a/workflow-bdd/stepDefinitions/world.js b/workflow/workflow-bdd/stepDefinitions/world.js
similarity index 100%
rename from workflow-bdd/stepDefinitions/world.js
rename to workflow/workflow-bdd/stepDefinitions/world.js

diff --git a/workflow-designer-be/pom.xml b/workflow/workflow-designer-be/pom.xml
similarity index 52%
rename from workflow-designer-be/pom.xml
rename to workflow/workflow-designer-be/pom.xml
index 37f4d80..b76dc46 100644 (file)
--- 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/SpringBootWebApplication.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/RestConstants.java
rename to 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
similarity index 93%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
rename to workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java
index bb4320c..b224e84 100644 (file)
--- 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
similarity index 76%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
rename to workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java
index 6214f1b..6ae8e34 100644 (file)
--- 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/exceptionshandlers/CustomizedResponseEntityExceptionHandler.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/CollectionWrapper.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionRequestDto.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/types/VersionStateDto.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/ArtifactRepository.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/UniqueValueRepository.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/ArtifactEntity.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/UniqueValueEntity.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/Workflow.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowProperty.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersion.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/types/WorkflowVersionState.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ZusammenConfig.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowManager.java
rename to 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
similarity index 99%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java
rename to workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/WorkflowVersionManager.java
index 3023452..8b4b894 100644 (file)
--- 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/EntityNotFoundException.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/InvalidArtifactException.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/UniqueValueViolationException.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionCreationException.java
rename to 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
similarity index 59%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java
rename to workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionModificationException.java
index 64ab610..ff1bf89 100644 (file)
--- 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/exceptions/VersionStateModificationException.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/CollaborationConfiguration.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java
rename to 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
similarity index 89%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java
rename to workflow/workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java
index d559f02..cdfddf3 100644 (file)
--- 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapper.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapper.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapper.java
rename to 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 (file)
index 0000000..ab4930b
--- /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
similarity index 100%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/RestPath.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/TestUtil.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowControllerTest.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/WorkflowVersionControllerTest.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryTest.java
rename to 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
similarity index 100%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/UniqueValueServiceTest.java
rename to 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
similarity index 99%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
rename to workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImplTest.java
index 3e22875..17037d9 100644 (file)
--- 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
similarity index 99%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java
rename to workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImplTest.java
index ae69b28..144db81 100644 (file)
--- 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
similarity index 99%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java
rename to workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionMapperTest.java
index b778de4..d979035 100644 (file)
--- 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
similarity index 99%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java
rename to workflow/workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/VersionStateMapperTest.java
index 59d1628..070c433 100644 (file)
--- 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
similarity index 100%
rename from workflow-designer-be/src/test/java/org/onap/sdc/workflow/services/impl/mappers/WorkflowMapperTest.java
rename to 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 (file)
index 0000000..7f926e8
--- /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 (file)
index 0000000..75e7efd
--- /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 (file)
index 0000000..c6c1f15
--- /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 (file)
index 0000000..ac89d6c
--- /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 (file)
index 0000000..652aec6
--- /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 (file)
index e69de29..0000000