Include impacted changes for APPC-346,APPC-348

Issue-ID: APPC-347
Change-Id: I399bc2a1e0dfd481e103032a373bb80fce5baf41
Signed-off-by: Anand <ac204h@att.com>

5 files changed, 166 insertions, 137 deletions

diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
index 14c9e2df9..4b56ab7c7 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
@@ -1,32 +1,59 @@
-<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>
-		<parent>
-	    <groupId>org.onap.appc</groupId>
-	    <artifactId>appc-workflow-management</artifactId>
-	    <version>1.3.0-SNAPSHOT</version>
-	  </parent>
-  <artifactId>appc-workflow-management-api</artifactId>
-  <packaging>bundle</packaging>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  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
 
-  <name>appc-workflow-management-api</name>
-  <url>http://maven.apache.org</url>
+       http://www.apache.org/licenses/LICENSE-2.0
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+  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.
 
-  <dependencies>
-  	<dependency>
-  		<groupId>org.onap.appc</groupId>
-  		<artifactId>appc-data-access-lib</artifactId>
-  		<version>${project.version}</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.onap.appc</groupId>
-  		<artifactId>domain-model-lib</artifactId>
-  		<version>${project.version}</version>
-  	</dependency>
-  </dependencies>
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============LICENSE_END=========================================================
+  -->
+<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>
+    <parent>
+        <groupId>org.onap.appc</groupId>
+        <artifactId>appc-workflow-management</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>appc-workflow-management-api</artifactId>
+    <name>APPC Workflow Management API</name>
+    <packaging>bundle</packaging>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-data-access-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>domain-model-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
     <build>
         <plugins>
             <plugin>
@@ -36,7 +63,9 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>org.onap.appc.dao.objects,org.onap.appc.workflow,org.onap.appc.workflow.helper,org.onap.appc.workflow.objects</Export-Package>
+                        <Export-Package>
+                            org.onap.appc.dao.objects,org.onap.appc.workflow,org.onap.appc.workflow.helper,org.onap.appc.workflow.objects
+                        </Export-Package>
                         <!--<Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-access-lib,javax.json;scope=compile|runtime;inline=false</Embed-Dependency>-->
                         <!--<Embed-Transitive>true</Embed-Transitive>-->
                         <!--<Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*</Import-Package>-->
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/WorkFlowManager.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/WorkFlowManager.java
index c0cb8f48e..cd08bb933 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/WorkFlowManager.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/WorkFlowManager.java
@@ -29,22 +29,22 @@ import org.onap.appc.workflow.objects.WorkflowRequest;
 import org.onap.appc.workflow.objects.WorkflowResponse;
 
 public interface WorkFlowManager {
-	/**
-	 * Execute workflow and return response.
-	 * This method execute workflow with following steps.
-	 * Retrieve workflow(DG) details - module, version and mode  from database based on command and vnf Type from incoming request.
-	 * Execute workflow (DG) using SVC Logic Service reference
-	 * Return response of workflow (DG) to caller.
-	 * @param workflowRequest workflow execution request which contains vnfType, command, requestId, targetId, payload and (optional) confID;
-	 * @return Workflow Response which contains execution status and payload from DG if any
-	 */
-	WorkflowResponse  executeWorkflow(WorkflowRequest workflowRequest);
+    /**
+     * Execute workflow and return response.
+     * This method execute workflow with following steps.
+     * Retrieve workflow(DG) details - module, version and mode  from database based on command and vnf Type from incoming request.
+     * Execute workflow (DG) using SVC Logic Service reference
+     * Return response of workflow (DG) to caller.
+     * @param workflowRequest workflow execution request which contains vnfType, command, requestId, targetId, payload and (optional) confID;
+     * @return Workflow Response which contains execution status and payload from DG if any
+     */
+    WorkflowResponse  executeWorkflow(WorkflowRequest workflowRequest);
 
-	/**
-	 * Check if workflow (DG) exists in database
-	 * @param workflowQueryParams workflow request with command and vnf Type
-	 * @return WorkflowExistsOutput.mappingExist True if workflow mapping exists else False. WorkflowExistsOutput.dgExist True if DG workflow exists else False.
+    /**
+     * Check if workflow (DG) exists in database
+     * @param workflowQueryParams workflow request with command and vnf Type
+     * @return WorkflowExistsOutput.mappingExist True if workflow mapping exists else False. WorkflowExistsOutput.dgExist True if DG workflow exists else False.
      */
-	WorkflowExistsOutput workflowExists(WorkflowRequest workflowQueryParams);
+    WorkflowExistsOutput workflowExists(WorkflowRequest workflowQueryParams);
 
 }
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowExistsOutput.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowExistsOutput.java
index 37d33d286..5c40ad6b2 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowExistsOutput.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowExistsOutput.java
@@ -26,72 +26,72 @@ package org.onap.appc.workflow.objects;
 
 public class WorkflowExistsOutput {
 
-	private boolean mappingExist ;
-	private boolean dgExist;
-	private String workflowModule;
-	private String workflowName;
-	private String workflowVersion;
-
-
-	public WorkflowExistsOutput() {
-	}
-
-	public WorkflowExistsOutput(boolean mappingExist, boolean dgExist) {
-		this.mappingExist = mappingExist;
-		this.dgExist = dgExist;
-	}
-
-	public boolean isMappingExist() {
-		return mappingExist;
-	}
-
-	public void setMappingExist(boolean mappingExist) {
-		this.mappingExist = mappingExist;
-	}
-
-	public boolean isDgExist() {
-		return dgExist;
-	}
-
-	public void setDgExist(boolean dgExist) {
-		this.dgExist = dgExist;
-	}
-
-	public String getWorkflowName() {
-		return workflowName;
-	}
-
-	public void setWorkflowName(String workflowName) {
-		this.workflowName = workflowName;
-	}
-
-	public String getWorkflowVersion() {
-		return workflowVersion;
-	}
-
-	public void setWorkflowVersion(String workflowVersion) {
-		this.workflowVersion = workflowVersion;
-	}
-
-	public String getWorkflowModule() {
-		return workflowModule;
-	}
-
-	public void setWorkflowModule(String workflowModule) {
-		this.workflowModule = workflowModule;
-	}
-	public boolean exists(){
-		return mappingExist && dgExist;
-	}
-
-	@Override
-	public String toString() {
-		return "WorkflowExistsOutput{" +
-				"mappingExist=" + mappingExist +
-				", dgExist=" + dgExist +
-				", workflowModule='" + workflowModule + '\'' +
-				", workflowName='" + workflowName + '\'' +
-				", workflowVersion='" + workflowVersion + '\'' +
-				'}';
-	}
+    private boolean mappingExist ;
+    private boolean dgExist;
+    private String workflowModule;
+    private String workflowName;
+    private String workflowVersion;
+
+
+    public WorkflowExistsOutput() {
+    }
+
+    public WorkflowExistsOutput(boolean mappingExist, boolean dgExist) {
+        this.mappingExist = mappingExist;
+        this.dgExist = dgExist;
+    }
+
+    public boolean isMappingExist() {
+        return mappingExist;
+    }
+
+    public void setMappingExist(boolean mappingExist) {
+        this.mappingExist = mappingExist;
+    }
+
+    public boolean isDgExist() {
+        return dgExist;
+    }
+
+    public void setDgExist(boolean dgExist) {
+        this.dgExist = dgExist;
+    }
+
+    public String getWorkflowName() {
+        return workflowName;
+    }
+
+    public void setWorkflowName(String workflowName) {
+        this.workflowName = workflowName;
+    }
+
+    public String getWorkflowVersion() {
+        return workflowVersion;
+    }
+
+    public void setWorkflowVersion(String workflowVersion) {
+        this.workflowVersion = workflowVersion;
+    }
+
+    public String getWorkflowModule() {
+        return workflowModule;
+    }
+
+    public void setWorkflowModule(String workflowModule) {
+        this.workflowModule = workflowModule;
+    }
+    public boolean exists(){
+        return mappingExist && dgExist;
+    }
+
+    @Override
+    public String toString() {
+        return "WorkflowExistsOutput{" +
+                "mappingExist=" + mappingExist +
+                ", dgExist=" + dgExist +
+                ", workflowModule='" + workflowModule + '\'' +
+                ", workflowName='" + workflowName + '\'' +
+                ", workflowVersion='" + workflowVersion + '\'' +
+                '}';
+    }
 }
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowRequest.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowRequest.java
index 6cdbc7146..8b7d09d49 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowRequest.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowRequest.java
@@ -37,34 +37,34 @@ public class WorkflowRequest {
 
     public RequestContext getRequestContext() {
         return requestContext;
-	}
+    }
 
     public void setRequestContext(RequestContext requestContext) {
         this.requestContext = requestContext;
-	}
+    }
 
     public ResponseContext getResponseContext() {
         return responseContext;
-	}
+    }
 
     public void setResponseContext(ResponseContext responseContext) {
         this.responseContext = responseContext;
-	}
+    }
 
     public VNFContext getVnfContext() {
         return vnfContext;
-	}
+    }
 
     public void setVnfContext(VNFContext vnfContext) {
         this.vnfContext = vnfContext;
-	}
+    }
 
-	@Override
-	public String toString() {
-		return "WorkflowRequest{" +
+    @Override
+    public String toString() {
+        return "WorkflowRequest{" +
                 "requestContext=" + requestContext +
                 ", responseContext=" + responseContext +
                 ", vnfContext=" + vnfContext +
-				'}';
-	}
+                '}';
+    }
 }
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowResponse.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowResponse.java
index b787e941c..6f2a34855 100644
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowResponse.java
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/onap/appc/workflow/objects/WorkflowResponse.java
@@ -30,20 +30,20 @@ import org.onap.appc.domainmodel.lcm.ResponseContext;
 
 public class WorkflowResponse {
 
-	private ResponseContext responseContext;
-
-	public ResponseContext getResponseContext() {
-		return responseContext;
-	}
-
-	public void setResponseContext(ResponseContext responseContext) {
-		this.responseContext = responseContext;
-	}
-
-	@Override
-	public String toString() {
-		return "WorkflowResponse{" +
-				"responseContext=" + responseContext +
-				'}';
-	}
+    private ResponseContext responseContext;
+
+    public ResponseContext getResponseContext() {
+        return responseContext;
+    }
+
+    public void setResponseContext(ResponseContext responseContext) {
+        this.responseContext = responseContext;
+    }
+
+    @Override
+    public String toString() {
+        return "WorkflowResponse{" +
+                "responseContext=" + responseContext +
+                '}';
+    }
 }