diff options
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans')
13 files changed, 271 insertions, 105 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java index a9f7f7a880..777c945e82 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java @@ -7,9 +7,9 @@ * 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. @@ -31,11 +31,11 @@ public class CloudConfiguration { /** * Gets the value of the aicNodeClli property. - * + * * @return * possible object is * {@link String } - * + * */ public String getAicNodeClli() { return aicNodeClli; @@ -43,11 +43,11 @@ public class CloudConfiguration { /** * Sets the value of the aicNodeClli property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setAicNodeClli(String value) { this.aicNodeClli = value; @@ -55,11 +55,11 @@ public class CloudConfiguration { /** * Gets the value of the tenantId property. - * + * * @return * possible object is * {@link String } - * + * */ public String getTenantId() { return tenantId; @@ -67,16 +67,16 @@ public class CloudConfiguration { /** * Sets the value of the tenantId property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setTenantId(String value) { this.tenantId = value; } - + public String getLcpCloudRegionId() { return lcpCloudRegionId; @@ -85,6 +85,12 @@ public class CloudConfiguration { public void setLcpCloudRegionId(String lcpCloudRegionId) { this.lcpCloudRegionId = lcpCloudRegionId; } - + + @Override + public String toString() { + return "CloudConfiguration [aicNodeClli=" + aicNodeClli + ", tenantId=" + + tenantId + ", lcpCloudRegionId=" + lcpCloudRegionId + "]"; + } + } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/InstanceReferences.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/InstanceReferences.java index fd5c73f97f..8f453c832d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/InstanceReferences.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/InstanceReferences.java @@ -7,9 +7,9 @@ * 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. @@ -24,7 +24,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; @JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT) public class InstanceReferences { - + protected String serviceInstanceId; protected String serviceInstanceName; protected String vnfInstanceId; @@ -35,8 +35,9 @@ public class InstanceReferences { protected String volumeGroupInstanceName; protected String networkInstanceId; protected String networkInstanceName; - - + protected String requestorId; + + public String getServiceInstanceId() { return serviceInstanceId; } @@ -97,7 +98,12 @@ public class InstanceReferences { public void setNetworkInstanceName(String networkInstanceName) { this.networkInstanceName = networkInstanceName; } - + public String getRequestorId() { + return requestorId; + } + public void setRequestorId(String requestorId) { + this.requestorId = requestorId; + } } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java index e361b1db32..f542d63da9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java @@ -7,9 +7,9 @@ * 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. @@ -19,10 +19,10 @@ */ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2016.03.30 at 02:48:23 PM CDT +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2016.03.30 at 02:48:23 PM CDT // @@ -38,11 +38,16 @@ public class ModelInfo { protected String modelCustomizationName; protected String modelInvariantId; protected ModelType modelType; + //v2 protected String modelNameVersionId; protected String modelName; protected String modelVersion; - - + protected String modelCustomizationUuid; + //v3 + protected String modelVersionId; + protected String modelCustomizationId; + + public String getModelCustomizationName() { return modelCustomizationName; } @@ -79,6 +84,34 @@ public class ModelInfo { public void setModelInvariantId(String modelInvariantId) { this.modelInvariantId = modelInvariantId; } - + public String getModelCustomizationUuid() { + return modelCustomizationUuid; + } + public void setModelCustomizationUuid(String modelCustomizationUuid) { + this.modelCustomizationUuid = modelCustomizationUuid; + } + public String getModelVersionId() { + return modelVersionId; + } + public void setModelVersionId(String modelVersionId) { + this.modelVersionId = modelVersionId; + } + public String getModelCustomizationId() { + return modelCustomizationId; + } + public void setModelCustomizationId(String modelCustomizationId) { + this.modelCustomizationId = modelCustomizationId; + } + @Override + public String toString() { + return "ModelInfo [modelCustomizationName=" + modelCustomizationName + + ", modelInvariantId=" + modelInvariantId + ", modelType=" + + modelType + ", modelNameVersionId=" + modelNameVersionId + + ", modelName=" + modelName + ", modelVersion=" + modelVersion + + ", modelCustomizationUuid=" + modelCustomizationUuid + + ", modelVersionId=" + modelVersionId + + ", modelCustomizationId=" + modelCustomizationId + "]"; + } + -} +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/PolicyException.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/PolicyException.java index 4d336c460a..5aed50ee5f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/PolicyException.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/PolicyException.java @@ -41,7 +41,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="policyException"> * <complexContent> - * <extension base="{http://ecomp.att.com/mso/request/types/v1}exceptionType"> + * <extension base="{http://org.openecomp/mso/request/types/v1}exceptionType"> * </extension> * </complexContent> * </complexType> diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java index 1244d3b567..b60d4b6fdb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java @@ -7,9 +7,9 @@ * 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. @@ -21,7 +21,7 @@ package org.openecomp.mso.apihandlerinfra.serviceinstancebeans; public class RelatedInstanceList { - + protected RelatedInstance relatedInstance; public RelatedInstance getRelatedInstance() { @@ -32,6 +32,11 @@ public class RelatedInstanceList { this.relatedInstance = relatedInstance; } + @Override + public String toString() { + return "RelatedInstanceList [relatedInstance=" + relatedInstance + "]"; + } + + - } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java index de6cbb7978..bb1fa3b8a5 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java @@ -7,9 +7,9 @@ * 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. @@ -20,6 +20,8 @@ package org.openecomp.mso.apihandlerinfra.serviceinstancebeans; +import java.util.Arrays; + import org.codehaus.jackson.map.annotate.JsonRootName; import org.codehaus.jackson.map.annotate.JsonSerialize; @@ -36,11 +38,11 @@ public class RequestDetails { /** * Gets the value of the serviceInfo property. - * + * * @return * possible object is * {@link ModelInfo } - * + * */ public ModelInfo getModelInfo() { return modelInfo; @@ -48,11 +50,11 @@ public class RequestDetails { /** * Sets the value of the serviceInfo property. - * + * * @param value * allowed object is * {@link ModelInfo } - * + * */ public void setModelInfo(ModelInfo value) { this.modelInfo = value; @@ -60,11 +62,11 @@ public class RequestDetails { /** * Gets the value of the requestInfo property. - * + * * @return * possible object is * {@link RequestInfo } - * + * */ public RequestInfo getRequestInfo() { return requestInfo; @@ -72,11 +74,11 @@ public class RequestDetails { /** * Sets the value of the requestInfo property. - * + * * @param value * allowed object is * {@link RequestInfo } - * + * */ public void setRequestInfo(RequestInfo value) { this.requestInfo = value; @@ -84,11 +86,11 @@ public class RequestDetails { /** * Gets the value of the subscriberInfo property. - * + * * @return * possible object is * {@link SubscriberInfo } - * + * */ public SubscriberInfo getSubscriberInfo() { return subscriberInfo; @@ -96,11 +98,11 @@ public class RequestDetails { /** * Sets the value of the subscriberInfo property. - * + * * @param value * allowed object is * {@link SubscriberInfo } - * + * */ public void setSubscriberInfo(SubscriberInfo value) { this.subscriberInfo = value; @@ -108,11 +110,11 @@ public class RequestDetails { /** * Gets the value of the cloudConfiguration property. - * + * * @return * possible object is * {@link CloudConfiguration } - * + * */ public CloudConfiguration getCloudConfiguration() { return cloudConfiguration; @@ -120,11 +122,11 @@ public class RequestDetails { /** * Sets the value of the cloudConfiguration property. - * + * * @param value * allowed object is * {@link CloudConfiguration } - * + * */ public void setCloudConfiguration(CloudConfiguration value) { this.cloudConfiguration = value; @@ -132,11 +134,11 @@ public class RequestDetails { /** * Gets the value of the requestParameters property. - * + * * @return * possible object is * {@link RequestParameters } - * + * */ public RequestParameters getRequestParameters() { return requestParameters; @@ -144,11 +146,11 @@ public class RequestDetails { /** * Sets the value of the requestParameters property. - * + * * @param value * allowed object is * {@link RequestParameters } - * + * */ public void setRequestParameters(RequestParameters value) { this.requestParameters = value; @@ -162,4 +164,13 @@ public class RequestDetails { this.relatedInstanceList = relatedInstanceList; } + @Override + public String toString() { + return "RequestDetails [modelInfo=" + modelInfo + ", requestInfo=" + + requestInfo + ", relatedInstanceList=" + + Arrays.toString(relatedInstanceList) + ", subscriberInfo=" + + subscriberInfo + ", cloudConfiguration=" + cloudConfiguration + + ", requestParameters=" + requestParameters + "]"; + } + } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestError.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestError.java index 3a27238670..db2f1654a1 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestError.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestError.java @@ -45,8 +45,8 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <choice> - * <element name="policyException" type="{http://ecomp.att.com/mso/request/types/v1}policyException"/> - * <element name="serviceException" type="{http://ecomp.att.com/mso/request/types/v1}serviceException"/> + * <element name="policyException" type="{http://org.openecomp/mso/request/types/v1}policyException"/> + * <element name="serviceException" type="{http://org.openecomp/mso/request/types/v1}serviceException"/> * </choice> * </sequence> * </restriction> diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java index e5f3167c1f..69c0dfc53d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java @@ -7,9 +7,9 @@ * 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. @@ -21,6 +21,7 @@ package org.openecomp.mso.apihandlerinfra.serviceinstancebeans; import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; @JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT) public class RequestInfo { @@ -33,15 +34,17 @@ public class RequestInfo { protected Integer orderVersion; protected String source; protected String instanceName; + @JsonSerialize(include=Inclusion.ALWAYS) protected boolean suppressRollback; + protected String requestorId; /** * Gets the value of the callbackUrl property. - * + * * @return * possible object is * {@link String } - * + * */ public String getCallbackUrl() { return callbackUrl; @@ -49,11 +52,11 @@ public class RequestInfo { /** * Sets the value of the callbackUrl property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setCallbackUrl(String value) { this.callbackUrl = value; @@ -61,11 +64,11 @@ public class RequestInfo { /** * Gets the value of the correlator property. - * + * * @return * possible object is * {@link String } - * + * */ public String getCorrelator() { return correlator; @@ -73,11 +76,11 @@ public class RequestInfo { /** * Sets the value of the correlator property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setCorrelator(String value) { this.correlator = value; @@ -85,11 +88,11 @@ public class RequestInfo { /** * Gets the value of the orderNumber property. - * + * * @return * possible object is * {@link String } - * + * */ public String getOrderNumber() { return orderNumber; @@ -97,11 +100,11 @@ public class RequestInfo { /** * Sets the value of the orderNumber property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setOrderNumber(String value) { this.orderNumber = value; @@ -109,11 +112,11 @@ public class RequestInfo { /** * Gets the value of the orderVersion property. - * + * * @return * possible object is * {@link Integer } - * + * */ public Integer getOrderVersion() { return orderVersion; @@ -121,11 +124,11 @@ public class RequestInfo { /** * Sets the value of the orderVersion property. - * + * * @param value * allowed object is * {@link Integer } - * + * */ public void setOrderVersion(Integer value) { this.orderVersion = value; @@ -133,11 +136,11 @@ public class RequestInfo { /** * Gets the value of the source property. - * + * * @return * possible object is * {@link String } - * + * */ public String getSource() { return source; @@ -145,11 +148,11 @@ public class RequestInfo { /** * Sets the value of the source property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setSource(String value) { this.source = value; @@ -179,13 +182,36 @@ public class RequestInfo { this.productFamilyId = productFamilyId; } - public boolean isSuppressRollback() { + /** + * Required for Marshalers to send the fields. + * @return + */ + public boolean getSuppressRollback() { return suppressRollback; } public void setSuppressRollback(boolean suppressRollback) { this.suppressRollback = suppressRollback; } - + + public String getRequestorId() { + return requestorId; + } + + public void setRequestorId(String requestorId) { + this.requestorId = requestorId; + } + + @Override + public String toString() { + return "RequestInfo [billingAccountNumber=" + billingAccountNumber + + ", callbackUrl=" + callbackUrl + ", correlator=" + correlator + + ", orderNumber=" + orderNumber + ", productFamilyId=" + + productFamilyId + ", orderVersion=" + orderVersion + + ", source=" + source + ", instanceName=" + instanceName + + ", suppressRollback=" + suppressRollback + ", requestorId=" + + requestorId + "]"; + } + } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java index 1a8204055e..dee0649184 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java @@ -7,9 +7,9 @@ * 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. @@ -25,13 +25,25 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; + +import org.openecomp.mso.apihandlerinfra.MsoRequest; @JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT) public class RequestParameters { private String subscriptionServiceType; private List<Map<String, String>> userParams = new ArrayList<>(); + @JsonSerialize(include=Inclusion.ALWAYS) + private boolean aLaCarte = false; + @JsonIgnore + private boolean isALaCarteSet = false; + @JsonSerialize(include=Inclusion.ALWAYS) + private boolean autoBuildVfModules = false; + @JsonSerialize(include=Inclusion.ALWAYS) + private boolean cascadeDelete = false; public String getSubscriptionServiceType() { @@ -42,6 +54,24 @@ public class RequestParameters { this.subscriptionServiceType = subscriptionServiceType; } + public boolean getALaCarte() { + return aLaCarte; + } + + public void setaLaCarte(boolean aLaCarte) { + this.aLaCarte = aLaCarte; + this.isALaCarteSet = true; + } + + //returns true if aLaCarte param came in on request + public boolean isALaCarteSet() { + return isALaCarteSet; + } + + public boolean isaLaCarte() { + return aLaCarte; + } + public List<Map<String, String>> getUserParams() { return userParams; } @@ -50,5 +80,40 @@ public class RequestParameters { this.userParams = userParams; } + public String getUserParamValue(String name){ + if(userParams!=null){ + for(Map<String, String> param:userParams){ + if(param.get("name").equals(name)){ + return param.get("value"); + } + } + } + return null; + } + + public boolean getAutoBuildVfModules() { + return autoBuildVfModules; + } + + public void setAutoBuildVfModules(boolean autoBuildVfModules) { + this.autoBuildVfModules = autoBuildVfModules; + } + + public boolean getCascadeDelete() { + return cascadeDelete; + } + + public void setCascadeDelete(boolean cascadeDelete) { + this.cascadeDelete = cascadeDelete; + } + + @Override + public String toString() { + return "RequestParameters [subscriptionServiceType=" + + subscriptionServiceType + ", userParams=" + userParams + + ", aLaCarte=" + aLaCarte + ", autoBuildVfModules=" + + autoBuildVfModules + "]"; + } + -} +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java index a9bf5e873f..89e8075836 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java @@ -7,9 +7,9 @@ * 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. @@ -31,8 +31,8 @@ public class RequestStatus { protected String statusMessage; protected Integer percentProgress; protected String finishTime; - - + + public String getRequestState() { return requestState; } @@ -57,5 +57,4 @@ public class RequestStatus { public void setFinishTime(String finishTime) { this.finishTime = finishTime; } - -} +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceException.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceException.java index f207e96cb5..b3c01d0d0e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceException.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceException.java @@ -41,7 +41,7 @@ import javax.xml.bind.annotation.XmlType; * <pre> * <complexType name="serviceException"> * <complexContent> - * <extension base="{http://ecomp.att.com/mso/request/types/v1}exceptionType"> + * <extension base="{http://org.openecomp/mso/request/types/v1}exceptionType"> * </extension> * </complexContent> * </complexType> diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceInstancesRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceInstancesRequest.java index 30903b9649..2281f2ee72 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceInstancesRequest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ServiceInstancesRequest.java @@ -7,9 +7,9 @@ * 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. @@ -78,6 +78,15 @@ public class ServiceInstancesRequest { public void setVfModuleInstanceId(String vfModuleInstanceId) { this.vfModuleInstanceId = vfModuleInstanceId; } - -} + @Override + public String toString() { + return "ServiceInstancesRequest [requestDetails=" + requestDetails + + ", serviceInstanceId=" + serviceInstanceId + + ", vnfInstanceId=" + vnfInstanceId + ", networkInstanceId=" + + networkInstanceId + ", volumeGroupInstanceId=" + + volumeGroupInstanceId + ", vfModuleInstanceId=" + + vfModuleInstanceId + "]"; + } + +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java index bf7a044b28..97fc4968bb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java @@ -7,9 +7,9 @@ * 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. @@ -30,11 +30,11 @@ public class SubscriberInfo { /** * Gets the value of the globalSubscriberId property. - * + * * @return * possible object is * {@link String } - * + * */ public String getGlobalSubscriberId() { return globalSubscriberId; @@ -42,11 +42,11 @@ public class SubscriberInfo { /** * Sets the value of the globalSubscriberId property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setGlobalSubscriberId(String value) { this.globalSubscriberId = value; @@ -54,11 +54,11 @@ public class SubscriberInfo { /** * Gets the value of the subscriberName property. - * + * * @return * possible object is * {@link String } - * + * */ public String getSubscriberName() { return subscriberName; @@ -66,14 +66,20 @@ public class SubscriberInfo { /** * Sets the value of the subscriberName property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setSubscriberName(String value) { this.subscriberName = value; } + @Override + public String toString() { + return "SubscriberInfo [globalSubscriberId=" + globalSubscriberId + + ", subscriberName=" + subscriberName + "]"; + } + } |