diff options
Diffstat (limited to 'vid-automation/src/test/java/org/onap/vid/model/mso')
14 files changed, 4 insertions, 245 deletions
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java index 91dd3ff27..00372c043 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java @@ -14,9 +14,9 @@ import java.util.Map; public class ChangeManagementRequest { public static class MsoChangeManagementRequest { - public final static String SOFTWARE_UPDATE = "inPlaceSoftwareUpdate"; + public static final String SOFTWARE_UPDATE = "inPlaceSoftwareUpdate"; public static final String REPLACE = "replace"; - public final static String CONFIG_UPDATE = "applyUpdatedConfig"; + public static final String CONFIG_UPDATE = "applyUpdatedConfig"; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java deleted file mode 100644 index 29fa931d5..000000000 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.onap.vid.model.mso; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -@JsonPropertyOrder({ - "status", - "entity" -}) - -/* -This is a brother of MsoResponseWrapper. I (Ittay) think it's better. -It is generic, immutable, and has some knowledge about RestObject. -The serialized "entity" field may be either String or nested object. - */ -public class MsoResponseWrapper2<T> implements MsoResponseWrapperInterface { - - final static ObjectMapper objectMapper = new ObjectMapper(); - - private final int status; - private final T entity; - private final String raw; - - public MsoResponseWrapper2(RestObject<T> msoResponse) { - this.status = msoResponse.getStatusCode(); - this.entity = msoResponse.get(); - this.raw = msoResponse.getRaw(); - } - - public MsoResponseWrapper2( - @JsonProperty(value = "status", required = true) int status, - @JsonProperty(value = "entity", required = true) T entity) { - this.status = status; - this.entity = entity; - this.raw = null; - } - - public int getStatus() { - return status; - } - - @Override - @org.codehaus.jackson.annotate.JsonIgnore - @com.fasterxml.jackson.annotation.JsonIgnore - public String getResponse() { - try { - return objectMapper.writeValueAsString(this); - } catch (JsonProcessingException e) { - return getEntity() != null ? getEntity().toString() : null; - } - } - - @JsonProperty - public Object getEntity() { - return entity != null ? entity : raw; - } - -} diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java deleted file mode 100644 index eb305d2df..000000000 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.onap.vid.model.mso; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public interface MsoResponseWrapperInterface { - @JsonProperty("entity") - Object getEntity(); - - @JsonProperty("status") - int getStatus(); - - @org.codehaus.jackson.annotate.JsonIgnore - @com.fasterxml.jackson.annotation.JsonIgnore - String getResponse(); -} diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java index 59e0e2f37..c51a91f65 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java @@ -1,7 +1,6 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class OperationalEnvironment { @@ -29,7 +28,6 @@ public class OperationalEnvironment { this.relationshipList = relationshipList; } - @JsonProperty("operational-environment-id") public String getOperationalEnvironmentId() { return operationalEnvironmentId; } @@ -38,7 +36,6 @@ public class OperationalEnvironment { this.operationalEnvironmentId = operationalEnvironmentId; } - @JsonProperty("operational-environment-name") public String getOperationalEnvironmentName() { return operationalEnvironmentName; } @@ -47,7 +44,6 @@ public class OperationalEnvironment { this.operationalEnvironmentName = operationalEnvironmentName; } - @JsonProperty("operational-environment-type") public String getOperationalEnvironmentType() { return operationalEnvironmentType; } @@ -56,7 +52,6 @@ public class OperationalEnvironment { this.operationalEnvironmentType = operationalEnvironmentType; } - @JsonProperty("operational-environment-status") public String getOperationalEnvironmentStatus() { return operationalEnvironmentStatus; } @@ -65,7 +60,6 @@ public class OperationalEnvironment { this.operationalEnvironmentStatus = operationalEnvironmentStatus; } - @JsonProperty("tenant-context") public String getTenantContext() { return tenantContext; } @@ -74,7 +68,6 @@ public class OperationalEnvironment { this.tenantContext = tenantContext; } - @JsonProperty("workload-context") public String getWorkloadContext() { return workloadContext; } @@ -83,7 +76,6 @@ public class OperationalEnvironment { this.workloadContext = workloadContext; } - @JsonProperty("resource-version") public String getResourceVersion() { return resourceVersion; } @@ -92,7 +84,6 @@ public class OperationalEnvironment { this.resourceVersion = resourceVersion; } - @JsonProperty("relationship-list") public RelationshipList getRelationshipList() { return relationshipList; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java index 1ff84d3a3..c063b9971 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java @@ -1,19 +1,16 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) public class OperationalEnvironmentList { - @JsonProperty("operational-environment") public List<OperationalEnvironment> getOperationalEnvironment() { return operationalEnvironment; } - @JsonProperty("operational-environment") public void setOperationalEnvironment(List<OperationalEnvironment> operationalEnvironment) { this.operationalEnvironment = operationalEnvironment; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java index 60fff94ab..e16c9db34 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java @@ -1,8 +1,6 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - public class RelatedToProperty { public String getPropertyKey() { @@ -25,11 +23,9 @@ public class RelatedToProperty { } - @JsonProperty("property-key") public String propertyKey; - @JsonProperty("property-value") public String propertyValue; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java index a8f0f22de..b83cd626d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java @@ -1,22 +1,16 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.List; public class Relationship { - @JsonProperty("related-to") public String relatedTo; - @JsonProperty("related-link") public String relatedLink; - @JsonProperty("relationship-data") public List<RelationshipData> relationshipData; - @JsonProperty("related-to-property") public List<RelatedToProperty> relatedToProperty; diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java index 1e6ad2a19..aa81be72d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java @@ -1,30 +1,22 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - public class RelationshipData { - @JsonProperty("relationship-key") public String getRelationshipKey() { return relationshipKey; } - @JsonProperty("relationship-key") public void setRelationshipKey(String relationshipKey) { this.relationshipKey = relationshipKey; } - @JsonProperty("relationship-value") public String getRelationshipValue() { return relationshipValue; } - @JsonProperty("relationship-value") public void setRelationshipValue(String relationshipValue) { this.relationshipValue = relationshipValue; } - @JsonProperty("relationship-key") public String relationshipKey; - @JsonProperty("relationship-value") public String relationshipValue; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java index 56a077d5a..599a2b2bc 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java @@ -1,23 +1,18 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.List; public class RelationshipList { - @JsonProperty("relationship") public List<Relationship> getRelationship() { return relationship; } - @JsonProperty("relationship") public void setRelationship(List<Relationship> relationship) { this.relationship = relationship; } - @JsonProperty("relationship") public List<Relationship> relationship; diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java index d25acbd21..a1e476914 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java @@ -6,7 +6,6 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.HashMap; import java.util.Map; @@ -16,7 +15,6 @@ import java.util.Map; * */ @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "billingAccountNumber", "callbackUrl", diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java index d3574d7b5..9706f0d5d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java @@ -6,14 +6,12 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "subscriptionServiceType", "userParams" diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java deleted file mode 100644 index b91ea410a..000000000 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java +++ /dev/null @@ -1,123 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * VID - * ================================================================================ - * 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.onap.vid.model.mso; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.MoreObjects; - -import javax.ws.rs.core.Response; -import java.text.DateFormat; -import java.text.SimpleDateFormat; - -/** - * The Class RestObject. - * - * @param <T> the generic type - */ -public class RestObject<T> { - - final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS"); - - final static ObjectMapper objectMapper = new ObjectMapper(); - - /** - * Generic version of the RestObject class. - * - */ - // T stands for "Type" - private T t; - - // The string source of t, if available - private String rawT; - - /** The status code. */ - private int statusCode= 0; - - public RestObject() { - } - - public RestObject(Response cres, Class<?> tClass) { - - String rawEntity = null; - try { - cres.bufferEntity(); - rawEntity = cres.readEntity(String.class); - T t = (T) objectMapper.readValue(rawEntity, tClass); - this.set(t); - } - catch ( Exception e ) { - try { - this.setRaw(rawEntity); - } catch (Exception e2) { - } - } - - int status = cres.getStatus(); - this.setStatusCode (status); - } - - - /** - * Sets the. - * - * @param t the t - */ - public void set(T t) { this.t = t; } - - /** - * Gets the. - * - * @return the t - */ - public T get() { return t; } - - /** - * Sets the status code. - * - * @param v the new status code - */ - public void setStatusCode(int v) { this.statusCode = v; } - - /** - * Gets the status code. - * - * @return the status code - */ - public int getStatusCode() { return this.statusCode; } - - public String getRaw() { - return rawT; - } - - public void setRaw(String rawT) { - this.rawT = rawT; - } - - @Override - public String toString() { - return MoreObjects.toStringHelper(this) - .add("t", t) - .add("rawT", rawT) - .add("statusCode", statusCode) - .toString(); - } -} - diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java index 67cded838..80976f37d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java @@ -6,7 +6,6 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.HashMap; import java.util.Map; @@ -16,7 +15,6 @@ import java.util.Map; * */ @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "globalSubscriberId", "subscriberCommonSiteId", diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java index 384e45631..0459b5a28 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java @@ -6,12 +6,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.HashMap; import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "name", "value" |