aboutsummaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2018-07-30 15:56:09 -0400
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2018-07-31 11:09:25 -0400
commit5a6a6de6f1a26a1897e4917a0df613e25a24eb70 (patch)
tree59a968f27b4b603aacc9d5e7b51fb598aeec5321 /mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler
parentb6dc38501f3b746426b42d9de4cc883d894149e8 (diff)
Containerization feature of SO
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler')
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java252
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java60
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java59
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java66
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java58
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java133
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java102
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java300
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/Track.java49
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java96
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java254
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java93
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java71
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ErrorNumbers.java73
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/LSInputImpl.java119
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/PathResourceResolver.java64
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java84
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java61
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientParamater.java242
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ResponseHandler.java194
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java48
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/XMLValidator.java103
-rw-r--r--mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/package-info.java25
23 files changed, 0 insertions, 2606 deletions
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java
deleted file mode 100644
index e4db35bcca..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/BpmnRequest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-import org.openecomp.mso.apihandler.common.CommonConstants;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonRootName;
-
-/**
- * JavaBean JSON class for a "bpmnRequest" which contains the JSON payload that
- * will be passed to the Camunda process
- */
-@JsonPropertyOrder({CommonConstants.REQUEST_ID_VARIABLE,
- CommonConstants.IS_BASE_VF_MODULE_VARIABLE, CommonConstants.RECIPE_TIMEOUT_VARIABLE,
- CommonConstants.REQUEST_ACTION_VARIABLE, CommonConstants.SERVICE_INSTANCE_ID_VARIABLE,
- CommonConstants.VNF_ID_VARIABLE, CommonConstants.VF_MODULE_ID_VARIABLE,
- CommonConstants.VOLUME_GROUP_ID_VARIABLE, CommonConstants.NETWORK_ID_VARIABLE,
- CommonConstants.SERVICE_TYPE_VARIABLE, CommonConstants.VNF_TYPE_VARIABLE,
- CommonConstants.VF_MODULE_TYPE_VARIABLE, CommonConstants.NETWORK_TYPE_VARIABLE,
- CommonConstants.REQUEST_DETAILS_VARIABLE})
-@JsonRootName(CommonConstants.CAMUNDA_ROOT_INPUT)
-public class BpmnRequest {
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- private CamundaInput host;
-
- @JsonProperty(CommonConstants.REQUEST_ID_VARIABLE)
- private CamundaInput requestId;
-
- @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
- private CamundaBooleanInput isBaseVfModule;
-
- @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
- private CamundaIntegerInput recipeTimeout;
-
- @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
- private CamundaInput requestAction;
-
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
- private CamundaInput serviceInstanceId;
-
- @JsonProperty(CommonConstants.VNF_ID_VARIABLE)
- private CamundaInput vnfId;
-
- @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
- private CamundaInput vfModuleId;
-
- @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
- private CamundaInput volumeGroupId;
-
- @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
- private CamundaInput networkId;
-
- @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
- private CamundaInput serviceType;
-
- @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
- private CamundaInput vnfType;
-
- @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
- private CamundaInput vfModuleType;
-
- @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
- private CamundaInput networkType;
-
- @JsonProperty(CommonConstants.REQUEST_DETAILS_VARIABLE)
- private CamundaInput requestDetails;
-
- public BpmnRequest() {
- /* Empty constructor */
-
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- public CamundaInput getHost() {
- return host;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- public void setHost(CamundaInput host) {
- this.host = host;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_VARIABLE)
- public CamundaInput getRequestId() {
- return requestId;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_VARIABLE)
- public void setRequestId(CamundaInput requestId) {
- this.requestId = requestId;
- }
-
- @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
- public CamundaBooleanInput getIsBaseVfModule() {
- return isBaseVfModule;
- }
-
- @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
- public void setIsBaseVfModule(CamundaBooleanInput isBaseVfModule) {
- this.isBaseVfModule = isBaseVfModule;
- }
-
- @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
- public CamundaIntegerInput getRecipeTimeout() {
- return recipeTimeout;
- }
-
- @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
- public void setRecipeTimeout(CamundaIntegerInput recipeTimeout) {
- this.recipeTimeout = recipeTimeout;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
- public CamundaInput getRequestAction() {
- return requestAction;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
- public void setRequestAction(CamundaInput requestAction) {
- this.requestAction = requestAction;
- }
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
- public CamundaInput getServiceInstanceId() {
- return serviceInstanceId;
- }
-
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
- public void setServiceInstanceId(CamundaInput serviceInstanceId) {
- this.serviceInstanceId = serviceInstanceId;
- }
-
- @JsonProperty(CommonConstants.VNF_ID_VARIABLE)
- public CamundaInput getVnfId() {
- return vnfId;
- }
-
- @JsonProperty(CommonConstants.VNF_ID_VARIABLE)
- public void setVnfId(CamundaInput vnfId) {
- this.vnfId = vnfId;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
- public CamundaInput getVfModuleId() {
- return vfModuleId;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
- public void setVfModuleId(CamundaInput vfModuleId) {
- this.vfModuleId = vfModuleId;
- }
-
- @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
- public CamundaInput getVolumeGroupId() {
- return volumeGroupId;
- }
-
- @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
- public void setVolumeGroupId(CamundaInput volumeGroupId) {
- this.volumeGroupId = volumeGroupId;
- }
-
- @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
- public CamundaInput getNetworkId() {
- return networkId;
- }
-
- @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
- public void setNetworkId(CamundaInput networkId) {
- this.networkId = networkId;
- }
-
- @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
- public CamundaInput getServiceType() {
- return serviceType;
- }
-
- @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
- public void setServiceType(CamundaInput serviceType) {
- this.serviceType = serviceType;
- }
-
- @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
- public CamundaInput getVnfType() {
- return vnfType;
- }
-
- @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
- public void setVnfType(CamundaInput vnfType) {
- this.vnfType = vnfType;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
- public CamundaInput getVfModuleType() {
- return vfModuleType;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
- public void setVfModuleType(CamundaInput vfModuleType) {
- this.vfModuleType = vfModuleType;
- }
-
- @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
- public CamundaInput getNetworkType() {
- return networkType;
- }
-
- @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
- public void setNetworkType(CamundaInput networkType) {
- this.networkType = networkType;
- }
-
- @JsonProperty(CommonConstants.REQUEST_DETAILS_VARIABLE)
- public CamundaInput getRequestDetails() {
- return requestDetails;
- }
-
- @JsonProperty(CommonConstants.REQUEST_DETAILS_VARIABLE)
- public void setRequestDetails(CamundaInput requestDetails) {
- this.requestDetails = requestDetails;
- }
-
-
-
-
- @Override
- public String toString() {
-
- return "BpmnRequest";
- }
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java
deleted file mode 100644
index 07b72f0678..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-import org.openecomp.mso.apihandler.common.CommonConstants;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that
- * will be passed to the Camunda process
- */
-
-
-public class CamundaBooleanInput {
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- private boolean value;
- @JsonProperty(CommonConstants.CAMUNDA_TYPE)
- private final String type = "Boolean";
-
-
- public CamundaBooleanInput() {
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public boolean getValue() {
- return value;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public void setValue(boolean value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "CamundaInput [value=" + value + ", type=" + type + "]";
- }
-
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java
deleted file mode 100644
index e93e6c1c15..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-import org.openecomp.mso.apihandler.common.CommonConstants;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that
- * will be passed to the Camunda process
- */
-public class CamundaBpmnRequestInput {
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- private BpmnRequest value;
- @JsonProperty(CommonConstants.CAMUNDA_TYPE)
- private final String type = "String";
-
-
- public CamundaBpmnRequestInput() {
- /* Empty constructor */
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public BpmnRequest getValue() {
- return value;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public void setValue(BpmnRequest value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "CamundaInput [value=" + value + ", type=" + type + "]";
- }
-
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java
deleted file mode 100644
index 07a3fa4a76..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-
-import org.openecomp.mso.apihandler.common.CommonConstants;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that
- * will be passed to the Camunda process
- *
- */
-
-
-public class CamundaInput {
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- private String value;
- @JsonProperty(CommonConstants.CAMUNDA_TYPE)
- private final String type = "String";
-
-
- public CamundaInput() {
- /* Empty constructor */
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public String getValue() {
- return value;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "CamundaInput [value=" + value + ", type=" + type + "]";
- }
-
-
-
-
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java
deleted file mode 100644
index 9a1bbca77a..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-import org.openecomp.mso.apihandler.common.CommonConstants;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * JavaBean JSON class for a "gMyServiceInput" which contains the xml payload that
- * will be passed to the Camunda process
- */
-public class CamundaIntegerInput {
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- private int value;
- @JsonProperty(CommonConstants.CAMUNDA_TYPE)
- private final String type = "Integer";
-
-
- public CamundaIntegerInput() {
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public int getValue() {
- return value;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_VALUE)
- public void setValue(int value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "CamundaInput [value=" + Integer.toString(value) + ", type=" + type + "]";
- }
-
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java
deleted file mode 100644
index 60a9efe9b6..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaRequest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-
-
-import org.openecomp.mso.apihandler.common.CommonConstants;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonRootName;
-
-/**
- * JavaBean JSON class for a "variables" which contains the xml payload that
- * will be passed to the Camunda process
- *
- */
-@JsonPropertyOrder({ CommonConstants.CAMUNDA_SERVICE_INPUT, CommonConstants.CAMUNDA_HOST,
- CommonConstants.SCHEMA_VERSION_HEADER, CommonConstants.REQUEST_ID_HEADER, CommonConstants.SERVICE_INSTANCE_ID_HEADER,
- CommonConstants. REQUEST_TIMEOUT_HEADER, CommonConstants.CAMUNDA_SERVICE_INPUT})
-@JsonRootName(CommonConstants.CAMUNDA_ROOT_INPUT)
-public class CamundaRequest {
-
- @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
- private CamundaInput serviceInput;
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- private CamundaInput host;
-
- @JsonProperty(CommonConstants.SCHEMA_VERSION_HEADER)
- private CamundaInput schema;
-
- @JsonProperty(CommonConstants.REQUEST_ID_HEADER)
- private CamundaInput reqid;
-
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_HEADER)
- private CamundaInput svcid;
-
- @JsonProperty(CommonConstants.REQUEST_TIMEOUT_HEADER)
- private CamundaInput timeout;
-
- public CamundaRequest() {
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
- public CamundaInput getServiceInput() {
- return serviceInput;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
- public void setServiceInput(CamundaInput serviceInput) {
- this.serviceInput = serviceInput;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- public CamundaInput getHost() {
- return host;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- public void setHost(CamundaInput host) {
- this.host = host;
- }
-
- @JsonProperty(CommonConstants.SCHEMA_VERSION_HEADER)
- public CamundaInput getSchema() {
- return schema;
- }
-
- @JsonProperty(CommonConstants.SCHEMA_VERSION_HEADER)
- public void setSchema(CamundaInput schema) {
- this.schema = schema;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_HEADER)
- public CamundaInput getReqid() {
- return reqid;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_HEADER)
- public void setReqid(CamundaInput reqid) {
- this.reqid = reqid;
- }
-
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_HEADER)
- public CamundaInput getSvcid() {
- return svcid;
- }
-
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_HEADER)
- public void setSvcid(CamundaInput svcid) {
- this.svcid = svcid;
- }
-
-
- @JsonProperty(CommonConstants.REQUEST_TIMEOUT_HEADER)
- public CamundaInput getTimeout() {
- return timeout;
- }
-
- @JsonProperty(CommonConstants.REQUEST_TIMEOUT_HEADER)
- public void setTimeout(CamundaInput timeout) {
- this.timeout = timeout;
- }
-
-
-
- @Override
- public String toString() {
- return "CamundaRequest [serviceInput=" + serviceInput + ", host="
- + host + ", schema=" + schema + ", reqid=" + reqid + ", svcid="
- + svcid + ", timeout=" + timeout + "]";
- }
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java
deleted file mode 100644
index 64b7d86b59..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
-
-// This class must be 100% JSON-compatible with the BPMN WorkflowResponse class.
-// TODO: BPMN and the API-H should use a common class.
-
-/**
- * A synchronous response from a workflow.
- */
-@JsonRootName(value = "WorkflowResponse")
-public class CamundaResponse {
-
- @JsonProperty("processInstanceId")
- private String processInstanceId;
-
- @JsonProperty("messageCode")
- private int messageCode;
-
- @JsonProperty("message")
- private String message;
-
- @JsonProperty("variables")
- private Map<String,String> variables;
-
- @JsonProperty("content")
- private String content;
-
- public String getProcessInstanceId() {
- return processInstanceId;
- }
-
- public void setProcessInstanceId(String processInstanceId) {
- this.processInstanceId = processInstanceId;
- }
-
- public int getMessageCode() {
- return messageCode;
- }
-
- public void setMessageCode(int messageCode) {
- this.messageCode = messageCode;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public Map<String,String> getVariables() {
- return variables;
- }
-
- public void setVariables(Map<String,String> variables) {
- this.variables = variables;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "["
- + "processInstanceId=" + processInstanceId
- + ",messageCode=" + messageCode
- + ",message=" + message
- + ",variables=" + variables
- + ",content=" + content
- + "]";
- }
-} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java
deleted file mode 100644
index 9f30e67897..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-import org.openecomp.mso.apihandler.common.CommonConstants;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonRootName;
-
-/**
- * JavaBean JSON class for a "variables" which contains the JSON payload that
- * will be passed to the Camunda process
- */
-@JsonPropertyOrder({CommonConstants.CAMUNDA_SERVICE_INPUT, CommonConstants.REQUEST_ID_VARIABLE,
- CommonConstants.REQUEST_ID_HEADER,
- CommonConstants.IS_BASE_VF_MODULE_VARIABLE, CommonConstants.RECIPE_TIMEOUT_VARIABLE,
- CommonConstants.REQUEST_ACTION_VARIABLE, CommonConstants.SERVICE_INSTANCE_ID_VARIABLE,
- CommonConstants.CORRELATION_ID, CommonConstants.VNF_ID_VARIABLE, CommonConstants.VF_MODULE_ID_VARIABLE,
- CommonConstants.VOLUME_GROUP_ID_VARIABLE, CommonConstants.NETWORK_ID_VARIABLE,
- CommonConstants.CONFIGURATION_ID_VARIABLE, CommonConstants.SERVICE_TYPE_VARIABLE,
- CommonConstants.VNF_TYPE_VARIABLE, CommonConstants.VF_MODULE_TYPE_VARIABLE,
- CommonConstants.NETWORK_TYPE_VARIABLE, CommonConstants.CAMUNDA_SERVICE_INPUT,
- CommonConstants.CAMUNDA_SERVICE_INPUT, CommonConstants.RECIPE_PARAMS})
-@JsonRootName(CommonConstants.CAMUNDA_ROOT_INPUT)
-public class CamundaVIDRequest {
-
- @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
- private CamundaInput serviceInput;
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- private CamundaInput host;
-
- @JsonProperty(CommonConstants.REQUEST_ID_VARIABLE)
- private CamundaInput requestId;
-
- @JsonProperty(CommonConstants.REQUEST_ID_HEADER)
- private CamundaInput msoRequestId;
-
- @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
- private CamundaBooleanInput isBaseVfModule;
-
- @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
- private CamundaIntegerInput recipeTimeout;
-
- @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
- private CamundaInput requestAction;
-
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
- private CamundaInput serviceInstanceId;
-
- @JsonProperty(CommonConstants.CORRELATION_ID)
- private CamundaInput correlationId;
-
- @JsonProperty(CommonConstants.VNF_ID_VARIABLE)
- private CamundaInput vnfId;
-
- @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
- private CamundaInput vfModuleId;
-
- @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
- private CamundaInput volumeGroupId;
-
- @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
- private CamundaInput networkId;
-
- @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE)
- private CamundaInput configurationId;
-
- @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
- private CamundaInput serviceType;
-
- @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
- private CamundaInput vnfType;
-
- @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
- private CamundaInput vfModuleType;
-
- @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
- private CamundaInput networkType;
-
- @JsonProperty(CommonConstants.RECIPE_PARAMS)
- private CamundaInput recipeParams;
-
- @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
- public CamundaInput getServiceInput() {
- return serviceInput;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
- public void setServiceInput(CamundaInput serviceInput) {
- this.serviceInput = serviceInput;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- public CamundaInput getHost() {
- return host;
- }
-
- @JsonProperty(CommonConstants.CAMUNDA_HOST)
- public void setHost(CamundaInput host) {
- this.host = host;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_VARIABLE)
- public CamundaInput getRequestId() {
- return requestId;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_VARIABLE)
- public void setRequestId(CamundaInput requestId) {
- this.requestId = requestId;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_HEADER)
- public CamundaInput getMsoRequestId() {
- return msoRequestId;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ID_HEADER)
- public void setMsoRequestId(CamundaInput msoRequestIdp) {
- this.msoRequestId = msoRequestIdp;
- }
-
- @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
- public CamundaBooleanInput getIsBaseVfModule() {
- return isBaseVfModule;
- }
-
- @JsonProperty(CommonConstants.IS_BASE_VF_MODULE_VARIABLE)
- public void setIsBaseVfModule(CamundaBooleanInput isBaseVfModule) {
- this.isBaseVfModule = isBaseVfModule;
- }
-
- @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
- public CamundaIntegerInput getRecipeTimeout() {
- return recipeTimeout;
- }
-
- @JsonProperty(CommonConstants.RECIPE_TIMEOUT_VARIABLE)
- public void setRecipeTimeout(CamundaIntegerInput recipeTimeout) {
- this.recipeTimeout = recipeTimeout;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
- public CamundaInput getRequestAction() {
- return requestAction;
- }
-
- @JsonProperty(CommonConstants.REQUEST_ACTION_VARIABLE)
- public void setRequestAction(CamundaInput requestAction) {
- this.requestAction = requestAction;
- }
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
- public CamundaInput getServiceInstanceId() {
- return serviceInstanceId;
- }
-
- @JsonProperty(CommonConstants.SERVICE_INSTANCE_ID_VARIABLE)
- public void setServiceInstanceId(CamundaInput serviceInstanceId) {
- this.serviceInstanceId = serviceInstanceId;
- }
-
- @JsonProperty(CommonConstants.CORRELATION_ID)
- public CamundaInput getCorrelationId() {
- return correlationId;
- }
-
- @JsonProperty(CommonConstants.CORRELATION_ID)
- public void setCorrelationId(CamundaInput correlationId) {
- this.correlationId = correlationId;
- }
-
- @JsonProperty(CommonConstants.VNF_ID_VARIABLE)
- public CamundaInput getVnfId() {
- return vnfId;
- }
-
- @JsonProperty(CommonConstants.VNF_ID_VARIABLE)
- public void setVnfId(CamundaInput vnfId) {
- this.vnfId = vnfId;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
- public CamundaInput getVfModuleId() {
- return vfModuleId;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_ID_VARIABLE)
- public void setVfModuleId(CamundaInput vfModuleId) {
- this.vfModuleId = vfModuleId;
- }
-
- @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
- public CamundaInput getVolumeGroupId() {
- return volumeGroupId;
- }
-
- @JsonProperty(CommonConstants.VOLUME_GROUP_ID_VARIABLE)
- public void setVolumeGroupId(CamundaInput volumeGroupId) {
- this.volumeGroupId = volumeGroupId;
- }
-
- @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
- public CamundaInput getNetworkId() {
- return networkId;
- }
-
- @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
- public void setNetworkId(CamundaInput networkId) {
- this.networkId = networkId;
- }
-
- @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE)
- public CamundaInput getConfigurationId() {
- return configurationId;
- }
-
- @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE)
- public void setConfigurationId(CamundaInput configurationId) {
- this.configurationId = configurationId;
- }
-
- @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
- public CamundaInput getServiceType() {
- return serviceType;
- }
-
- @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
- public void setServiceType(CamundaInput serviceType) {
- this.serviceType = serviceType;
- }
-
- @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
- public CamundaInput getVnfType() {
- return vnfType;
- }
-
- @JsonProperty(CommonConstants.VNF_TYPE_VARIABLE)
- public void setVnfType(CamundaInput vnfType) {
- this.vnfType = vnfType;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
- public CamundaInput getVfModuleType() {
- return vfModuleType;
- }
-
- @JsonProperty(CommonConstants.VF_MODULE_TYPE_VARIABLE)
- public void setVfModuleType(CamundaInput vfModuleType) {
- this.vfModuleType = vfModuleType;
- }
-
- @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
- public CamundaInput getNetworkType() {
- return networkType;
- }
-
- @JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
- public void setNetworkType(CamundaInput networkType) {
- this.networkType = networkType;
- }
-
- @JsonProperty(CommonConstants.RECIPE_PARAMS)
- public CamundaInput getRecipeParams() {
- return recipeParams;
- }
-
- @JsonProperty(CommonConstants.RECIPE_PARAMS)
- public void setRecipeParams(CamundaInput recipeParams) {
- this.recipeParams = recipeParams;
- }
-
- @Override
- public String toString() {
- //return "CamundaRequest [requestId=" + + ", host="
- // + host + ", schema=" + schema + ", reqid=" + reqid + ", svcid="
- // + svcid + ", timeout=" + timeout + "]";
- return "CamundaRequest";
- }
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/Track.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/Track.java
deleted file mode 100644
index e1928ebc76..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/Track.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.camundabeans;
-
-public class Track {
-
- String title;
- String singer;
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getSinger() {
- return singer;
- }
-
- public void setSinger(String singer) {
- this.singer = singer;
- }
-
- @Override
- public String toString() {
- return "Track [title=" + title + ", singer=" + singer + "]";
- }
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java
deleted file mode 100644
index 85fe52f24c..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-import java.io.IOException;
-
-import javax.ws.rs.core.MediaType;
-import javax.xml.bind.DatatypeConverter;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-
-import org.openecomp.mso.logger.MsoLogger;
-
-public class BPELRestClient extends RequestClient {
-
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.APIH);
-
- public BPELRestClient () {
- super (CommonConstants.BPEL);
- }
-
- @Override
- public HttpResponse post (String bpelReqXML,
- String requestId,
- String requestTimeout,
- String schemaVersion,
- String serviceInstanceId,
- String action) throws ClientProtocolException, IOException {
- String encryptedCredentials;
- HttpPost post = new HttpPost (url);
- msoLogger.debug ("BPEL url is: " + url);
- StringEntity input = new StringEntity (bpelReqXML);
- input.setContentType (MediaType.TEXT_XML);
- if (props != null) {
- encryptedCredentials = props.getProperty (CommonConstants.BPEL_AUTH,null);
- if (encryptedCredentials != null) {
- String userCredentials = getEncryptedPropValue (encryptedCredentials,
- CommonConstants.DEFAULT_BPEL_AUTH,
- CommonConstants.ENCRYPTION_KEY);
- if (userCredentials != null) {
- post.addHeader ("Authorization",
- "Basic " + DatatypeConverter.printBase64Binary (userCredentials.getBytes ()));
- }
- }
- }
- post.addHeader (CommonConstants.REQUEST_ID_HEADER, requestId);
- post.addHeader (CommonConstants.REQUEST_TIMEOUT_HEADER, requestTimeout);
- post.addHeader (CommonConstants.SCHEMA_VERSION_HEADER, schemaVersion);
- if (serviceInstanceId != null) {
- post.addHeader (CommonConstants.SERVICE_INSTANCE_ID_HEADER, serviceInstanceId);
- }
- if (action != null) {
- post.addHeader (CommonConstants.ACTION_HEADER, action);
- }
- post.setEntity (input);
- HttpResponse response = client.execute (post);
- msoLogger.debug ("bpel response " + response);
- return response;
- }
-
- @Override
- public HttpResponse post (String bpelReqXML) {
- return null;
- }
-
- @Override
- public HttpResponse post(RequestClientParamater params) {
- return null;
- }
-
- @Override
- public HttpResponse get() {
- return null;
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java
deleted file mode 100644
index c0cfdf9bec..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-import java.io.IOException;
-
-import javax.xml.bind.DatatypeConverter;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.openecomp.mso.apihandler.camundabeans.CamundaBooleanInput;
-import org.openecomp.mso.apihandler.camundabeans.CamundaInput;
-import org.openecomp.mso.apihandler.camundabeans.CamundaIntegerInput;
-import org.openecomp.mso.apihandler.camundabeans.CamundaRequest;
-import org.openecomp.mso.apihandler.camundabeans.CamundaVIDRequest;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-
-public class CamundaClient extends RequestClient{
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH);
- private static final String CAMUNDA_URL_MESAGE = "Camunda url is: ";
-
- public CamundaClient() {
- super(CommonConstants.CAMUNDA);
- }
-
-
- @Override
- public HttpResponse post(String camundaReqXML, String requestId,
- String requestTimeout, String schemaVersion, String serviceInstanceId, String action) throws IOException {
- HttpPost post = new HttpPost(url);
- msoLogger.debug(CAMUNDA_URL_MESAGE + url);
- String jsonReq = wrapRequest(camundaReqXML, requestId, serviceInstanceId, requestTimeout, schemaVersion);
-
- StringEntity input = new StringEntity(jsonReq);
- input.setContentType(CommonConstants.CONTENT_TYPE_JSON);
-
- String encryptedCredentials;
- if(props!=null){
- encryptedCredentials = props.getProperty(CommonConstants.CAMUNDA_AUTH,null);
- if(encryptedCredentials != null){
- String userCredentials = getEncryptedPropValue(encryptedCredentials, CommonConstants.DEFAULT_BPEL_AUTH, CommonConstants.ENCRYPTION_KEY);
- if(userCredentials != null){
- post.addHeader("Authorization", "Basic " + DatatypeConverter
- .printBase64Binary(userCredentials.getBytes()));
- }
- }
- }
-
- post.setEntity(input);
- return client.execute(post);
- }
-
- @Override
- public HttpResponse post(String jsonReq) throws IOException {
- HttpPost post = new HttpPost(url);
- msoLogger.debug(CAMUNDA_URL_MESAGE + url);
-
- StringEntity input = new StringEntity(jsonReq);
- input.setContentType(CommonConstants.CONTENT_TYPE_JSON);
-
- String encryptedCredentials;
- if(props!=null){
- encryptedCredentials = props.getProperty(CommonConstants.CAMUNDA_AUTH,null);
- if(encryptedCredentials != null){
- String userCredentials = getEncryptedPropValue(encryptedCredentials, CommonConstants.DEFAULT_BPEL_AUTH, CommonConstants.ENCRYPTION_KEY);
- if(userCredentials != null){
- post.addHeader("Authorization", "Basic " + DatatypeConverter
- .printBase64Binary(userCredentials.getBytes()));
- }
- }
- }
-
- post.setEntity(input);
-
- return client.execute(post);
- }
-
- @Override
- public HttpResponse post(RequestClientParamater params) throws IOException {
- HttpPost post = new HttpPost(url);
- msoLogger.debug(CAMUNDA_URL_MESAGE + url);
- String jsonReq = wrapVIDRequest(params);
-
- StringEntity input = new StringEntity(jsonReq);
- input.setContentType(CommonConstants.CONTENT_TYPE_JSON);
- String encryptedCredentials;
- if(props!=null){
- encryptedCredentials = props.getProperty(CommonConstants.CAMUNDA_AUTH,null);
- if(encryptedCredentials != null){
- String userCredentials = getEncryptedPropValue(encryptedCredentials, CommonConstants.DEFAULT_BPEL_AUTH, CommonConstants.ENCRYPTION_KEY);
- if(userCredentials != null){
- post.addHeader("Authorization", "Basic " + DatatypeConverter
- .printBase64Binary(userCredentials.getBytes()));
- }
- }
- }
- post.setEntity(input);
- return client.execute(post);
- }
-
- @Override
- public HttpResponse get() {
- return null;
- }
-
- private String wrapRequest(String reqXML, String requestId, String serviceInstanceId, String requestTimeout, String schemaVersion){
- String jsonReq = null;
- if(reqXML == null){
- reqXML ="";
- }
- if(requestTimeout == null){
- requestTimeout ="";
- }
- if(schemaVersion == null){
- schemaVersion = "";
- }
- try{
- CamundaRequest camundaRequest = new CamundaRequest();
- CamundaInput camundaInput = new CamundaInput();
- CamundaInput host = new CamundaInput();
- CamundaInput schema = new CamundaInput();
- CamundaInput reqid = new CamundaInput();
- CamundaInput svcid = new CamundaInput();
- CamundaInput timeout = new CamundaInput();
- camundaInput.setValue(reqXML);
- host.setValue(parseURL());
- schema.setValue(schemaVersion);
- reqid.setValue(requestId);
- svcid.setValue(serviceInstanceId);
- timeout.setValue(requestTimeout);
- camundaRequest.setServiceInput(camundaInput);
- camundaRequest.setHost(host);
- camundaRequest.setReqid(reqid);
- camundaRequest.setSvcid(svcid);
- camundaRequest.setSchema(schema);
- camundaRequest.setTimeout(timeout);
- ObjectMapper mapper = new ObjectMapper();
- mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
-
- jsonReq = mapper.writeValueAsString(camundaRequest);
- msoLogger.debug("request body is " + jsonReq);
- }catch(Exception e){
- msoLogger.error(MessageEnum.APIH_WARP_REQUEST, "Camunda", "wrapRequest", MsoLogger.ErrorCode.BusinessProcesssError, "Error in APIH Warp request", e);
- }
- return jsonReq;
- }
-
- private String wrapVIDRequest(RequestClientParamater requestClientParamater) {
- String jsonReq = null;
- try{
- CamundaVIDRequest camundaRequest = new CamundaVIDRequest();
- CamundaInput serviceInput = new CamundaInput();
- CamundaInput host = new CamundaInput();
- CamundaInput requestIdInput= new CamundaInput();
- CamundaBooleanInput isBaseVfModuleInput = new CamundaBooleanInput();
- CamundaIntegerInput recipeTimeoutInput = new CamundaIntegerInput();
- CamundaInput requestActionInput = new CamundaInput();
- CamundaInput serviceInstanceIdInput = new CamundaInput();
- CamundaInput correlationIdInput = new CamundaInput();
- CamundaInput vnfIdInput = new CamundaInput();
- CamundaInput vfModuleIdInput = new CamundaInput();
- CamundaInput volumeGroupIdInput = new CamundaInput();
- CamundaInput networkIdInput = new CamundaInput();
- CamundaInput configurationIdInput = new CamundaInput();
- CamundaInput serviceTypeInput = new CamundaInput();
- CamundaInput vnfTypeInput = new CamundaInput();
- CamundaInput vfModuleTypeInput = new CamundaInput();
- CamundaInput networkTypeInput = new CamundaInput();
- CamundaInput recipeParamsInput = new CamundaInput();
- host.setValue(parseURL());
- requestIdInput.setValue(StringUtils.defaultString(requestClientParamater.getRequestId()));
- isBaseVfModuleInput.setValue(requestClientParamater.isBaseVfModule());
- recipeTimeoutInput.setValue(requestClientParamater.getRecipeTimeout());
- requestActionInput.setValue(StringUtils.defaultString(requestClientParamater.getRequestAction()));
- serviceInstanceIdInput.setValue(StringUtils.defaultString(requestClientParamater.getServiceInstanceId()));
- correlationIdInput.setValue(StringUtils.defaultString(requestClientParamater.getCorrelationId()));
- vnfIdInput.setValue(StringUtils.defaultString(requestClientParamater.getVnfId()));
- vfModuleIdInput.setValue(StringUtils.defaultString(requestClientParamater.getVfModuleId()));
- volumeGroupIdInput.setValue(StringUtils.defaultString(requestClientParamater.getVolumeGroupId()));
- networkIdInput.setValue(StringUtils.defaultString(requestClientParamater.getNetworkId()));
- configurationIdInput.setValue(StringUtils.defaultString(requestClientParamater.getConfigurationId()));
- serviceTypeInput.setValue(StringUtils.defaultString(requestClientParamater.getServiceType()));
- vnfTypeInput.setValue(StringUtils.defaultString(requestClientParamater.getVnfType()));
- vfModuleTypeInput.setValue(StringUtils.defaultString(requestClientParamater.getVfModuleType()));
- networkTypeInput.setValue(StringUtils.defaultString(requestClientParamater.getNetworkType()));
- recipeParamsInput.setValue(requestClientParamater.getRecipeParamXsd());
- serviceInput.setValue(StringUtils.defaultString(requestClientParamater.getRequestDetails()));
- camundaRequest.setServiceInput(serviceInput);
- camundaRequest.setHost(host);
- camundaRequest.setRequestId(requestIdInput);
- camundaRequest.setMsoRequestId(requestIdInput);
- camundaRequest.setIsBaseVfModule(isBaseVfModuleInput);
- camundaRequest.setRecipeTimeout(recipeTimeoutInput);
- camundaRequest.setRequestAction(requestActionInput);
- camundaRequest.setServiceInstanceId(serviceInstanceIdInput);
- camundaRequest.setCorrelationId(correlationIdInput);
- camundaRequest.setVnfId(vnfIdInput);
- camundaRequest.setVfModuleId(vfModuleIdInput);
- camundaRequest.setVolumeGroupId(volumeGroupIdInput);
- camundaRequest.setNetworkId(networkIdInput);
- camundaRequest.setConfigurationId(configurationIdInput);
- camundaRequest.setServiceType(serviceTypeInput);
- camundaRequest.setVnfType(vnfTypeInput);
- camundaRequest.setVfModuleType(vfModuleTypeInput);
- camundaRequest.setNetworkType(networkTypeInput);
- camundaRequest.setRecipeParams(recipeParamsInput);
- ObjectMapper mapper = new ObjectMapper();
- mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
-
- jsonReq = mapper.writeValueAsString(camundaRequest);
- msoLogger.debug("request body is " + jsonReq);
- }catch(Exception e){
- msoLogger.error(MessageEnum.APIH_WARP_REQUEST, "Camunda", "wrapVIDRequest", MsoLogger.ErrorCode.BusinessProcesssError, "Error in APIH Warp request", e);
- }
- return jsonReq;
- }
-
- private String parseURL(){
- String[] parts = url.split(":");
- String host = "";
- if(parts.length>=2){
- host = parts[1];
- if(host.length()>2){
- host = host.substring(2);
- }
- }
- return host;
- }
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
deleted file mode 100644
index cbbbff3dff..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-import java.io.IOException;
-
-import javax.xml.bind.DatatypeConverter;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.openecomp.mso.logger.MsoLogger;
-
-public class CamundaTaskClient extends RequestClient{
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH);
-
- public CamundaTaskClient() {
- super(CommonConstants.CAMUNDATASK);
- }
-
- @Override
- public HttpResponse post(String jsonReq) throws IOException{
- HttpPost post = new HttpPost(url);
- msoLogger.debug("Camunda Task url is: "+ url);
-
- StringEntity input = new StringEntity(jsonReq);
- input.setContentType(CommonConstants.CONTENT_TYPE_JSON);
-
- String encryptedCredentials;
- if(props!=null){
- encryptedCredentials = props.getProperty(CommonConstants.CAMUNDA_AUTH,null);
- if(encryptedCredentials != null){
- String userCredentials = getEncryptedPropValue(encryptedCredentials, CommonConstants.DEFAULT_BPEL_AUTH, CommonConstants.ENCRYPTION_KEY);
- if(userCredentials != null){
- post.addHeader("Authorization", "Basic " + DatatypeConverter
- .printBase64Binary(userCredentials.getBytes()));
- }
- }
- }
-
- post.setEntity(input);
- return client.execute(post);
- }
-
- @Override
- public HttpResponse post(String camundaReqXML, String requestId,
- String requestTimeout, String schemaVersion, String serviceInstanceId, String action) {
- throw new UnsupportedOperationException("Method not supported.");
- }
-
- @Override
- public HttpResponse post(RequestClientParamater params) {
- throw new UnsupportedOperationException("Method not supported.");
- }
-
- @Override
- public HttpResponse get() throws IOException {
- HttpGet get = new HttpGet(url);
- msoLogger.debug("Camunda Task url is: "+ url);
- String encryptedCredentials;
- if(props!=null){
- encryptedCredentials = props.getProperty(CommonConstants.CAMUNDA_AUTH,null);
- if(encryptedCredentials != null){
- String userCredentials = getEncryptedPropValue(encryptedCredentials, CommonConstants.DEFAULT_BPEL_AUTH, CommonConstants.ENCRYPTION_KEY);
- if(userCredentials != null){
- get.addHeader("Authorization", "Basic " + new String(DatatypeConverter
- .printBase64Binary(userCredentials.getBytes())));
- }
- }
- }
- return client.execute(get);
- }
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java
deleted file mode 100644
index daa411a963..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-
-public final class CommonConstants {
-
- public static final String DEFAULT_BPEL_AUTH = "admin:admin";
- public static final String ENCRYPTION_KEY = "aa3871669d893c7fb8abbcda31b88b4f";
- public static final String REQUEST_ID_HEADER = "mso-request-id";
- public static final String REQUEST_TIMEOUT_HEADER = "mso-service-request-timeout";
- public static final String SCHEMA_VERSION_HEADER = "mso-schema-version";
- public static final String SERVICE_INSTANCE_ID_HEADER = "mso-service-instance-id";
- public static final String ACTION_HEADER = "mso-action";
- public static final String CAMUNDA_SERVICE_INPUT = "bpmnRequest";
- public static final String CAMUNDA_ROOT_INPUT = "variables";
- public static final String CONTENT_TYPE_JSON= "application/json";
- public static final String CAMUNDA_TYPE = "type";
- public static final String CAMUNDA_VALUE = "value";
- public static final String CAMUNDA_URL = "camundaURL";
- public static final String CAMUNDA_AUTH = "camundaAuth";
- public static final String BPEL_SEARCH_STR = "active-bpel";
- public static final String TASK_SEARCH_STR = "task";
- public static final String BPEL_URL = "bpelURL";
- public static final String BPEL_AUTH = "bpelAuth";
- public static final int BPEL = 0;
- public static final int CAMUNDA = 1;
- public static final int CAMUNDATASK = 2;
- public static final String CAMUNDA_HOST = "host";
- public static final String REQUEST_ID_VARIABLE = "requestId";
- public static final String IS_BASE_VF_MODULE_VARIABLE = "isBaseVfModule";
- public static final String RECIPE_TIMEOUT_VARIABLE = "recipeTimeout";
- public static final String REQUEST_ACTION_VARIABLE = "requestAction";
- public static final String SERVICE_INSTANCE_ID_VARIABLE = "serviceInstanceId";
- public static final String CORRELATION_ID = "correlationId";
- public static final String VNF_ID_VARIABLE = "vnfId";
- public static final String VF_MODULE_ID_VARIABLE = "vfModuleId";
- public static final String VOLUME_GROUP_ID_VARIABLE = "volumeGroupId";
- public static final String NETWORK_ID_VARIABLE = "networkId";
- public static final String CONFIGURATION_ID_VARIABLE = "configurationId";
- public static final String SERVICE_TYPE_VARIABLE = "serviceType";
- public static final String VNF_TYPE_VARIABLE = "vnfType";
- public static final String VF_MODULE_TYPE_VARIABLE = "vfModuleType";
- public static final String NETWORK_TYPE_VARIABLE = "networkType";
- public static final String REQUEST_DETAILS_VARIABLE = "requestDetails";
- public static final String ALACARTE_ORCHESTRATION = "mso.infra.default.alacarte.orchestrationUri";
- public static final String ALACARTE_RECIPE_TIMEOUT = "mso.infra.default.alacarte.recipeTimeout";
- public static final String RECIPE_PARAMS = "recipeParams";
-
- private CommonConstants () {
- // prevent creating an instance of this class
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ErrorNumbers.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ErrorNumbers.java
deleted file mode 100644
index 2cafef3253..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ErrorNumbers.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-public final class ErrorNumbers {
-
- private ErrorNumbers() {
- }
-
- public static final String REQUEST_FAILED_SCHEMA_VALIDATION = "1000";
- public static final String RECIPE_DOES_NOT_EXIST = "1010";
- public static final String VFMODULE_TYPE_DOES_NOT_EXIST = "1011";
- public static final String SERVICE_PARAMETERS_FAILED_SCHEMA_VALIDATION = "1020";
- public static final String LOCKED_SAME_SERVICE_TYPE_AND_REQUEST_ACTION = "1030";
- public static final String LOCKED_CANCEL_ON_REQUEST_IN_PROGRESS = "1031";
- public static final String LOCKED_REQUEST_IN_PROGRESS_TIMEOUT = "1032";
- public static final String LOCKED_NOT_ALLOWED_FOR_REQUEST_IN_PROGRESS = "1033";
- public static final String WITHDRAW_AFTER_COMPLETE = "1034";
- public static final String COMPLETE_AFTER_WITHDRAW = "1035"; // NOT USED
- public static final String REQUEST_PREVIOUSLY_COMPLETED = "1036";
- public static final String CANNOT_RETRY_FINAL_ACTIVATION = "1037";
- public static final String PREVIOUSLY_COMPLETED_WITH_DIFF_ORDER_VERSION = "1038";
- public static final String LOCKED_DIFFERENT_REQUEST_ACTION = "1040";
- public static final String LOCKED_DIFF_REQUEST_ACTION_SAME_SERVICE_INSTANCE_ID = "1041";
- public static final String REQUEST_TIMED_OUT = "1050";
-
- public static final String DISCONNECT_ALREADY_COMPLETE = "1100";
- public static final String CANCEL_ALREADY_COMPLETE = "1110";
-
- public static final String LOCKED_CREATE_ON_THE_SAME_VNF_NAME_IN_PROGRESS = "1400";
- public static final String LOCKED_SAME_ACTION_AND_VNF_ID = "1410";
-
- public static final String ERROR_FROM_BPEL = "2000";
- public static final String NO_COMMUNICATION_TO_BPEL = "2010";
- public static final String NO_RESPONSE_FROM_BPEL = "2020";
-
- public static final String COULD_NOT_WRITE_TO_REQUESTS_DB = "4000";
- public static final String NO_COMMUNICATION_TO_REQUESTS_DB = "4010";
- public static final String NO_COMMUNICATION_TO_CATALOG_DB = "4020";
- public static final String ERROR_FROM_CATALOG_DB = "4030";
-
- public static final String ERROR_FROM_SDNC = "5300";
- public static final String NO_COMMUNICATION_TO_SDNC = "5310";
- public static final String NO_RESPONSE_FROM_SDNC = "5320";
-
- public static final String NO_COMMUNICATION_TO_SDNC_ADAPTER = "7000";
- public static final String NO_RESPONSE_FROM_SDNC_ADAPTER = "7010";
- public static final String ERROR_FROM_SDNC_ADAPTER = "7020";
-
- public static final String SVC_GENERAL_SERVICE_ERROR = "SVC0001";
- public static final String SVC_BAD_PARAMETER = "SVC0002";
- public static final String SVC_NO_SERVER_RESOURCES = "SVC1000";
- public static final String SVC_DETAILED_SERVICE_ERROR = "SVC2000";
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/LSInputImpl.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/LSInputImpl.java
deleted file mode 100644
index b39b5347ee..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/LSInputImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.w3c.dom.ls.LSInput;
-
-public class LSInputImpl implements LSInput {
-
- protected String fPublicId;
- protected String fSystemId;
- protected String fBaseSystemId;
- protected InputStream fByteStream;
- protected Reader fCharStream;
- protected String fData;
- protected String fEncoding;
- protected boolean fCertifiedText;
-
- @Override
- public InputStream getByteStream () {
- return fByteStream;
- }
-
- @Override
- public void setByteStream (InputStream byteStream) {
- fByteStream = byteStream;
- }
-
- @Override
- public Reader getCharacterStream () {
- return fCharStream;
- }
-
- @Override
- public void setCharacterStream (Reader characterStream) {
- fCharStream = characterStream;
- }
-
- @Override
- public String getStringData () {
- return fData;
- }
-
- @Override
- public void setStringData (String stringData) {
- fData = stringData;
- }
-
- @Override
- public String getEncoding () {
- return fEncoding;
- }
-
- @Override
- public void setEncoding (String encoding) {
- fEncoding = encoding;
- }
-
- @Override
- public String getPublicId () {
- return fPublicId;
- }
-
- @Override
- public void setPublicId (String publicId) {
- fPublicId = publicId;
- }
-
- @Override
- public String getSystemId () {
- return fSystemId;
- }
-
- @Override
- public void setSystemId (String systemId) {
- fSystemId = systemId;
- }
-
- @Override
- public String getBaseURI () {
- return fBaseSystemId;
- }
-
- @Override
- public void setBaseURI (String baseURI) {
- fBaseSystemId = baseURI;
- }
-
- @Override
- public boolean getCertifiedText () {
- return fCertifiedText;
- }
-
- @Override
- public void setCertifiedText (boolean certifiedText) {
- fCertifiedText = certifiedText;
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/PathResourceResolver.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/PathResourceResolver.java
deleted file mode 100644
index c8c1ef08c9..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/PathResourceResolver.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSResourceResolver;
-
-import org.openecomp.mso.logger.MsoLogger;
-
-public class PathResourceResolver implements LSResourceResolver {
-
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH);
-
- private String path;
-
- public PathResourceResolver(String path) {
-
- this.path = path;
- }
-
- @Override
- public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
-
- LSInputImpl input = new LSInputImpl();
-
- InputStream stream = null;
- try {
- stream = new FileInputStream(path + systemId);
- } catch (FileNotFoundException e) {
- msoLogger.debug ("Could not resolve resource based on file: " + path + systemId, e);
- }
-
- input.setPublicId(publicId);
- input.setSystemId(systemId);
- input.setBaseURI(baseURI);
- input.setCharacterStream(new InputStreamReader(stream));
-
- return input;
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
deleted file mode 100644
index 66369a8b69..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.properties.MsoJavaProperties;
-import org.openecomp.mso.utils.CryptoUtils;
-
-public abstract class RequestClient {
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH);
- protected MsoJavaProperties props;
- protected String url;
- protected HttpClient client;
- private int type;
-
- public RequestClient(int type){
- this.type = type;
- }
-
- public void setProps(MsoJavaProperties props) {
- this.props = props;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getUrl() {
- return url;
- }
-
- public int getType(){
- return type;
- }
-
- public HttpClient getClient() {
- return client;
- }
-
- public void setClient(HttpClient client) {
- this.client = client;
- }
-
- public abstract HttpResponse post(String request, String requestId, String requestTimeout, String schemaVersion, String serviceInstanceId, String action) throws IOException;
-
- public abstract HttpResponse post(String request) throws IOException;
-
- public abstract HttpResponse post(RequestClientParamater params) throws IOException;
-
- public abstract HttpResponse get() throws IOException;
-
- protected String getEncryptedPropValue (String prop, String defaultValue, String encryptionKey) {
- try {
- return CryptoUtils.decrypt(prop, encryptionKey);
- }
- catch (GeneralSecurityException e) {
- msoLogger.debug("Security exception", e);
- }
- return defaultValue;
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java
deleted file mode 100644
index 8f919861dc..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-
-import org.apache.http.impl.client.DefaultHttpClient;
-
-import org.openecomp.mso.properties.MsoJavaProperties;
-
-public class RequestClientFactory {
-
- private RequestClientFactory() {
- }
-
- //based on URI, returns BPEL, CamundaTask or Camunda client
- public static RequestClient getRequestClient(String orchestrationURI, MsoJavaProperties props) throws IllegalStateException{
- RequestClient retClient;
- if(props ==null){
- throw new IllegalStateException("properties is null");
- }
- String url;
- if(orchestrationURI.contains(CommonConstants.BPEL_SEARCH_STR)){
- url = props.getProperty(CommonConstants.BPEL_URL,null) + orchestrationURI;
- retClient= new BPELRestClient();
-
- }else if(orchestrationURI.contains(CommonConstants.TASK_SEARCH_STR)){
- url = props.getProperty(CommonConstants.CAMUNDA_URL,null) + orchestrationURI;
- retClient = new CamundaTaskClient();
- }
- else{
- url = props.getProperty(CommonConstants.CAMUNDA_URL,null) + orchestrationURI;
- retClient = new CamundaClient();
- }
- retClient.setClient(new DefaultHttpClient());
- retClient.setProps(props);
- retClient.setUrl(url);
- return retClient;
-
- }
-
-
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientParamater.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientParamater.java
deleted file mode 100644
index 4db69199da..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientParamater.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-public class RequestClientParamater {
-
- private String requestId;
- private boolean isBaseVfModule;
- private int recipeTimeout;
- private String requestAction;
- private String serviceInstanceId;
- private String correlationId;
- private String vnfId;
- private String vfModuleId;
- private String volumeGroupId;
- private String networkId;
- private String configurationId;
- private String serviceType;
- private String vnfType;
- private String vfModuleType;
- private String networkType;
- private String requestDetails;
- private String recipeParamXsd;
-
- private RequestClientParamater(Builder builder) {
- requestId = builder.requestId;
- isBaseVfModule = builder.isBaseVfModule;
- recipeTimeout = builder.recipeTimeout;
- requestAction = builder.requestAction;
- serviceInstanceId = builder.serviceInstanceId;
- correlationId = builder.correlationId;
- vnfId = builder.vnfId;
- vfModuleId = builder.vfModuleId;
- volumeGroupId = builder.volumeGroupId;
- networkId = builder.networkId;
- configurationId = builder.configurationId;
- serviceType = builder.serviceType;
- vnfType = builder.vnfType;
- vfModuleType = builder.vfModuleType;
- networkType = builder.networkType;
- requestDetails = builder.requestDetails;
- recipeParamXsd = builder.recipeParamXsd;
- }
-
- public String getRequestId() {
- return requestId;
- }
-
- public boolean isBaseVfModule() {
- return isBaseVfModule;
- }
-
- public int getRecipeTimeout() {
- return recipeTimeout;
- }
-
- public String getRequestAction() {
- return requestAction;
- }
-
- public String getServiceInstanceId() {
- return serviceInstanceId;
- }
-
- public String getCorrelationId() {
- return correlationId;
- }
-
- public String getVnfId() {
- return vnfId;
- }
-
- public String getVfModuleId() {
- return vfModuleId;
- }
-
- public String getVolumeGroupId() {
- return volumeGroupId;
- }
-
- public String getNetworkId() {
- return networkId;
- }
-
- public String getConfigurationId() {
- return configurationId;
- }
-
- public String getServiceType() {
- return serviceType;
- }
-
- public String getVnfType() {
- return vnfType;
- }
-
- public String getVfModuleType() {
- return vfModuleType;
- }
-
- public String getNetworkType() {
- return networkType;
- }
-
- public String getRequestDetails() {
- return requestDetails;
- }
-
- public String getRecipeParamXsd() {
- return recipeParamXsd;
- }
-
- public static class Builder {
- private String requestId;
- private boolean isBaseVfModule;
- private int recipeTimeout;
- private String requestAction;
- private String serviceInstanceId;
- private String correlationId;
- private String vnfId;
- private String vfModuleId;
- private String volumeGroupId;
- private String networkId;
- private String configurationId;
- private String serviceType;
- private String vnfType;
- private String vfModuleType;
- private String networkType;
- private String requestDetails;
- private String recipeParamXsd;
-
- public Builder setRequestId(String requestId) {
- this.requestId = requestId;
- return this;
- }
-
- public Builder setBaseVfModule(boolean baseVfModule) {
- isBaseVfModule = baseVfModule;
- return this;
- }
-
- public Builder setRecipeTimeout(int recipeTimeout) {
- this.recipeTimeout = recipeTimeout;
- return this;
- }
-
- public Builder setRequestAction(String requestAction) {
- this.requestAction = requestAction;
- return this;
- }
-
- public Builder setServiceInstanceId(String serviceInstanceId) {
- this.serviceInstanceId = serviceInstanceId;
- return this;
- }
-
- public Builder setCorrelationId(String correlationId) {
- this.correlationId = correlationId;
- return this;
- }
-
- public Builder setVnfId(String vnfId) {
- this.vnfId = vnfId;
- return this;
- }
-
- public Builder setVfModuleId(String vfModuleId) {
- this.vfModuleId = vfModuleId;
- return this;
- }
-
- public Builder setVolumeGroupId(String volumeGroupId) {
- this.volumeGroupId = volumeGroupId;
- return this;
- }
-
- public Builder setNetworkId(String networkId) {
- this.networkId = networkId;
- return this;
- }
-
- public Builder setConfigurationId(String configurationId) {
- this.configurationId = configurationId;
- return this;
- }
-
- public Builder setServiceType(String serviceType) {
- this.serviceType = serviceType;
- return this;
- }
-
- public Builder setVnfType(String vnfType) {
- this.vnfType = vnfType;
- return this;
- }
-
- public Builder setVfModuleType(String vfModuleType) {
- this.vfModuleType = vfModuleType;
- return this;
- }
-
- public Builder setNetworkType(String networkType) {
- this.networkType = networkType;
- return this;
- }
-
- public Builder setRequestDetails(String requestDetails) {
- this.requestDetails = requestDetails;
- return this;
- }
-
- public Builder setRecipeParamXsd(String recipeParamXsd) {
- this.recipeParamXsd = recipeParamXsd;
- return this;
- }
-
- public RequestClientParamater build(){
- return new RequestClientParamater(this);
- }
- }
-
-
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ResponseHandler.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ResponseHandler.java
deleted file mode 100644
index a8b8984343..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ResponseHandler.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-
-import java.io.IOException;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.util.EntityUtils;
-import org.openecomp.mso.apihandler.camundabeans.CamundaResponse;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.utils.RootIgnoringObjectMapper;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class ResponseHandler {
-
- private CamundaResponse response;
- private int status;
- private String content = "";
- private HttpResponse httpResponse;
- private int type;
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH);
- private static final String RESPONSE_CONTENT_MSG = "response content is: ";
-
- public ResponseHandler(HttpResponse httpResponse, int type) {
- this.httpResponse = httpResponse;
- this.type=type;
- parseResponse();
- }
-
-
- private void parseResponse() {
- int statusCode = httpResponse.getStatusLine().getStatusCode();
- msoLogger.debug("Returned status is: " + statusCode);
- status = setStatus(statusCode);
- msoLogger.debug("Parsed status is: " + status);
- if(type==CommonConstants.CAMUNDA){
- parseCamunda();
- }else if(type==CommonConstants.CAMUNDATASK){
- parseCamundaTask();
- }else {
- parseBpel();
- }
-
- }
-
-
-
- @SuppressWarnings("unchecked")
- private void parseCamunda(){
- try{
- HttpEntity entity = httpResponse.getEntity();
- content = EntityUtils.toString(entity);
- } catch (IOException e) {
- msoLogger.debug("IOException getting Camunda response content", e);
- }
-
- ObjectMapper mapper = new RootIgnoringObjectMapper<CamundaResponse>(CamundaResponse.class);
-
- try {
- response = mapper.readValue(content, CamundaResponse.class);
- } catch (IOException e) {
- msoLogger.debug("IOException getting Camunda response content", e);
- }
- msoLogger.debug("json response is: " + content);
- if(response!=null){
- content = response.getContent();
- }
- msoLogger.debug(RESPONSE_CONTENT_MSG + content);
-
-
- if(status!=HttpStatus.SC_ACCEPTED){
- msoLogger.error(MessageEnum.APIH_ERROR_FROM_BPEL_SERVER, "Camunda", String.valueOf(status), content, "Camunda", "parseCamunda", MsoLogger.ErrorCode.BusinessProcesssError, "Error in APIH from Camunda");
- }
- }
-
- private void parseBpel(){
-
- HttpEntity bpelEntity = httpResponse.getEntity();
-
- try {
- if (bpelEntity!=null) {
- content = EntityUtils.toString(bpelEntity);
- msoLogger.debug(RESPONSE_CONTENT_MSG + content);
-
- }
- if(status!=HttpStatus.SC_ACCEPTED){
- msoLogger.error(MessageEnum.APIH_ERROR_FROM_BPEL_SERVER, "BPEL", String.valueOf(status), content, "BPEL", "parseBpel", MsoLogger.ErrorCode.BusinessProcesssError, "Error in APIH from BPEL");
- }
- }
- catch (IOException e) {
- msoLogger.debug("IOException getting BPEL response content", e);
- }
- }
-
- private void parseCamundaTask(){
-
- HttpEntity camundataskEntity = httpResponse.getEntity();
-
- try {
- if (camundataskEntity!=null) {
- content = EntityUtils.toString(camundataskEntity);
- msoLogger.debug(RESPONSE_CONTENT_MSG + content);
-
- }
- if(status!=HttpStatus.SC_NO_CONTENT && status != HttpStatus.SC_ACCEPTED){
- msoLogger.error(MessageEnum.APIH_ERROR_FROM_BPEL_SERVER, "CAMUNDATASK", String.valueOf(status), content, "CAMUNDATASK", "parseCamundaTask", MsoLogger.ErrorCode.BusinessProcesssError, "Error in APIH from Camunda Task");
- }
- }
- catch (IOException e) {
- msoLogger.debug("IOException getting Camunda Task response content", e);
- }
- }
-
- private int setStatus(int statusCode){
- int httpStatus;
- switch(statusCode) {
- case HttpStatus.SC_ACCEPTED:
- case HttpStatus.SC_OK:
- httpStatus = HttpStatus.SC_ACCEPTED;
- break;
- case HttpStatus.SC_BAD_REQUEST:
- httpStatus = HttpStatus.SC_BAD_REQUEST;
- break;
- case HttpStatus.SC_UNAUTHORIZED:
- case HttpStatus.SC_FORBIDDEN:
- httpStatus = HttpStatus.SC_INTERNAL_SERVER_ERROR;
- break;
- case HttpStatus.SC_NOT_FOUND:
- httpStatus = HttpStatus.SC_NOT_IMPLEMENTED;
- break;
- case HttpStatus.SC_INTERNAL_SERVER_ERROR:
- httpStatus = HttpStatus.SC_BAD_GATEWAY;
- break;
- case HttpStatus.SC_SERVICE_UNAVAILABLE:
- httpStatus = HttpStatus.SC_SERVICE_UNAVAILABLE;
- break;
- case HttpStatus.SC_NO_CONTENT:
- httpStatus = HttpStatus.SC_NO_CONTENT;
- break;
- default:
- httpStatus = HttpStatus.SC_INTERNAL_SERVER_ERROR;
- break;
- }
- return httpStatus;
- }
-
-
- public CamundaResponse getResponse() {
- return response;
- }
-
-
- public void setResponse(CamundaResponse response) {
- this.response = response;
- }
-
-
- public String getContent() {
- return content;
- }
-
-
- public void setContent(String content) {
- this.content = content;
- }
-
-
- public int getStatus() {
- return status;
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java
deleted file mode 100644
index 73bf020c21..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/ValidationException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-
-public class ValidationException extends Exception {
-
- /**
- * This class simply extends Exception (without addition additional functionality)
- * to provide an identifier for RequestsDB related exceptions on create, delete, query.
- *
- *
- **/
-
- private static final long serialVersionUID = 1L;
- private static final String VALIDATION_FAIL_MESSAGE = "No valid $ELEMENT is specified";
- private static final String INVALID_ELEMENT_MESSAGE = "$ELEMENT is not valid in the $VERSION version";
- private static final String ELEMENT_MESSAGE = "\\$ELEMENT";
-
- public ValidationException (String msg) {
- super (VALIDATION_FAIL_MESSAGE.replaceAll (ELEMENT_MESSAGE, msg));
- }
-
- public ValidationException (String msg, Exception cause) {
- super (VALIDATION_FAIL_MESSAGE.replaceAll (ELEMENT_MESSAGE, msg), cause);
- }
- public ValidationException(String msg, String version) {
- super(INVALID_ELEMENT_MESSAGE.replaceAll(ELEMENT_MESSAGE, msg).replaceAll("\\$VERSION", version));
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/XMLValidator.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/XMLValidator.java
deleted file mode 100644
index ebb1dd28cf..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/XMLValidator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.apihandler.common;
-
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import javax.xml.XMLConstants;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-import org.apache.commons.io.IOUtils;
-import org.xml.sax.SAXException;
-
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoAlarmLogger;
-import org.openecomp.mso.logger.MsoLogger;
-
-public class XMLValidator {
-
- private static String xsdsPath;
-
- static {
- String prefixMsoPropertiesPath = System.getProperty ("mso.config.path");
- if (prefixMsoPropertiesPath == null) {
- prefixMsoPropertiesPath = "";
- }
- xsdsPath = prefixMsoPropertiesPath + "xsds/";
- }
-
- private String stringXsd;
- private String errorMsg = null;
- private SchemaFactory factory;
- private Schema schema;
-
- private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.APIH);
- private static MsoAlarmLogger alarmLogger = new MsoAlarmLogger ();
-
- public XMLValidator (String xsdFile) {
-
- try (FileInputStream xsdStream = new FileInputStream (xsdsPath + xsdFile)) {
-
- stringXsd = IOUtils.toString (xsdStream);
-
- factory = SchemaFactory.newInstance (XMLConstants.W3C_XML_SCHEMA_NS_URI);
- factory.setResourceResolver (new PathResourceResolver (xsdsPath));
- factory.setFeature (XMLConstants.FEATURE_SECURE_PROCESSING, true);
-
- String quotedXsd = stringXsd.replaceAll ("&#34;", "\"");
- Source src = new StreamSource (new java.io.StringReader (quotedXsd));
- schema = factory.newSchema (src);
-
- } catch (IOException | SAXException e) {
- msoLogger.debug ("Cannot open file " + xsdsPath + xsdFile, e);
- errorMsg = "ErrorDetails: xsd file " + xsdFile + "could not be opened - " + e.getMessage ();
- }
- }
-
- // Returns null when XML valid, otherwise returns error details.
- public String isXmlValid (String stringXml) {
- try {
- if (errorMsg != null && !errorMsg.isEmpty ()) {
- return errorMsg;
- }
- Source src2 = new StreamSource (new java.io.StringReader (stringXml));
- Validator validator = schema.newValidator ();
- validator.validate (src2);
-
- } catch (IOException | SAXException e) {
- msoLogger.debug ("Exception: ", e);
- return "ErrorDetails: " + e.getMessage ();
-
- } catch (Exception e) {
- msoLogger.error (MessageEnum.APIH_CANNOT_READ_SCHEMA, "", "", MsoLogger.ErrorCode.SchemaError, "APIH cannot read schema file", e);
- alarmLogger.sendAlarm ("MsoConfigurationError", MsoAlarmLogger.CRITICAL, "Unable to read the schema file");
- return "ErrorDetails: " + "Unable to read the schema file";
- }
-
- return null;
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/package-info.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/package-info.java
deleted file mode 100644
index 7859412ead..0000000000
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Common classes for API Handlers.
- */
-package org.openecomp.mso.apihandler.common;
-