summaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorrama-huawei <rama.subba.reddy.s@huawei.com>2017-09-27 15:20:21 +0530
committerrama-huawei <rama.subba.reddy.s@huawei.com>2017-09-27 15:21:03 +0530
commit280651d755c7f8892eae7f8f07d8efabba1531af (patch)
treecf81aec9a974b129596471d1f33e6bb6600da5bc /bpmn
parent00f6a9c613096e3d4623b8e8486992be727d92da (diff)
Removed unused variables
Issue-Id:SO-118 Change-Id: I3f749777618e506efe4b83314e45574455639f7b Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java10
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java3
2 files changed, 3 insertions, 10 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java
index 99024490a3..fa4633f03f 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java
@@ -22,8 +22,6 @@ import org.openecomp.aai.domain.yang.Pservers;
import org.openecomp.mso.bpmn.core.PropertyConfiguration;
import org.openecomp.mso.client.aai.entities.CustomQuery;
import org.openecomp.mso.client.aai.entities.Results;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.properties.MsoPropertiesFactory;
import org.springframework.stereotype.Service;
import com.fasterxml.jackson.core.JsonParseException;
@@ -36,15 +34,10 @@ public class AAIRestClientImpl implements AAIRestClient {
private final WebTarget webTarget;
- private static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
-
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.GENERAL);
-
private static final String ENDPOINT_VERSION = "v10";
private static final String ENDPOINT_GET_ALL = ENDPOINT_VERSION + "/cloud-infrastructure/pservers";
private static final String ENDPOINT_GET_ALL_VNFS = ENDPOINT_VERSION + "/network/generic-vnfs";
private static final String ENDPOINT_CUSTOM_QUERY = ENDPOINT_VERSION + "/query";
- private static final String PSERVER_BY_VNF_QUERY = "g.V().has('aai-node-type', 'generic-vnf').has('vnf-name','USAUTOUFTIL2001UJDM02').out('runsOnPserver').has('aai-node-type', 'pserver')";
private static final String PSERVER_VNF_QUERY = "pservers-fromVnf";
private static final String GENERIC_VNF_PATH = ENDPOINT_VERSION + "/network/generic-vnfs/generic-vnf";
private static final String SERVICE_TOPOLOGY_BY_SERVICE_INSTANCE_ID = "store(‘x’).union(__.in(‘subscribesTo’).has(‘aai-node-type’,’customer’).store(‘x’),__.out(‘uses’).has(‘aai-node-type’,’allotted-resource’).store(‘x’),__.in(‘hasInstance’).has(‘aai-node-type’,’generic-vnf’).store(‘x’).union("
@@ -72,7 +65,6 @@ public class AAIRestClientImpl implements AAIRestClient {
public AAIRestClientImpl(final String host) throws NoSuchAlgorithmException {
Logger logger = Logger.getLogger(getClass().getName());
Client client = this.getSSLClient();
- Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
webTarget = client.register(logger).register(new AAIClientResponseExceptionMapper()).target(host + "/aai");
}
@@ -87,7 +79,7 @@ public class AAIRestClientImpl implements AAIRestClient {
@Override
public List<Pserver> getPhysicalServerByVnfId(String vnfId, String transactionLoggingUuid)
throws JsonParseException, JsonMappingException, IOException {
- List<String> startNodes = new ArrayList<String>();
+ List<String> startNodes = new ArrayList<>();
startNodes.add("network/generic-vnfs/generic-vnf/" + vnfId);
String jsonInput = webTarget.register(AAIQueryObjectMapperProvider.class).path(ENDPOINT_CUSTOM_QUERY)
.queryParam("format", "resource").request().header("X-FromAppId", "MSO")
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java
index 6317be9408..facc14504d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/vcpe/workflow/WorkflowAsyncVcpeResource.java
@@ -19,7 +19,8 @@ import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;
*/
@Path("/async")
public class WorkflowAsyncVcpeResource extends WorkflowAsyncResource {
-
+
+ @Override
protected ProcessEngineServices getProcessEngineServices() {
return pes4junit.orElse(ProcessEngines.getProcessEngine("vcpe"));
}