Added asserts where required, add tests.
Replaced getters-setters with Lombok annotations.
Fixed incorect SUT in the tests.
Removed default constructors used only for tests.
Change-Id: I9be29d9c0d891039952178a3c3e1c3a2062d1382
Issue-ID: SDC-2856
Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
package org.openecomp.sdc.be.info;
+import lombok.Getter;
+import lombok.Setter;
import org.openecomp.sdc.be.model.ArtifactDefinition;
+@Getter
+@Setter
public class ArtifactDefinitionInfo {
private String uniqueId;
private String artifactVersion;
private String artifactUUID;
- ArtifactDefinitionInfo() {
- }
-
public ArtifactDefinitionInfo(ArtifactDefinition artifactDefinition) {
uniqueId = artifactDefinition.getUniqueId();
artifactName = artifactDefinition.getArtifactName();
artifactVersion = artifactDefinition.getArtifactVersion();
artifactUUID = artifactDefinition.getArtifactUUID();
}
-
- public String getUniqueId() {
- return uniqueId;
- }
-
- public void setUniqueId(String uniqueId) {
- this.uniqueId = uniqueId;
- }
-
- public String getArtifactName() {
- return artifactName;
- }
-
- public void setArtifactName(String artifactName) {
- this.artifactName = artifactName;
- }
-
- public String getArtifactDisplayName() {
- return artifactDisplayName;
- }
-
- public void setArtifactDisplayName(String artifactDisplayName) {
- this.artifactDisplayName = artifactDisplayName;
- }
-
- public String getArtifactVersion() {
- return artifactVersion;
- }
-
- public void setArtifactVersion(String artifactVersion) {
- this.artifactVersion = artifactVersion;
- }
-
- public String getArtifactUUID() {
- return artifactUUID;
- }
-
- public void setArtifactUUID(String artifactUUID) {
- this.artifactUUID = artifactUUID;
- }
-
}
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import fj.data.Either;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import lombok.Setter;
import org.openecomp.sdc.be.config.BeEcompErrorManager;
import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig;
import org.openecomp.sdc.be.config.ConfigurationManager;
import java.util.Map;
import java.util.Set;
+@Getter
+@Setter
+@NoArgsConstructor
public class ArtifactTemplateInfo {
private static final Logger log = Logger.getLogger(ArtifactTemplateInfo.class);
private static final Gson gson = new Gson();
private String type;
private String fileName;
private String env;
- private boolean isBase;
+ private boolean base;
private String groupName;
private String description;
private List<ArtifactTemplateInfo> relatedArtifactsInfo;
- public ArtifactTemplateInfo() {}
-
public ArtifactTemplateInfo(String type, String fileName, String env, List<ArtifactTemplateInfo> relatedArtifactsInfo) {
this.type = type;
this.fileName = fileName;
this.relatedArtifactsInfo = relatedArtifactsInfo;
}
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- public String getEnv() {
- return env;
- }
-
- public void setEnv(String env) {
- this.env = env;
- }
-
- public List<ArtifactTemplateInfo> getRelatedArtifactsInfo() {
- return relatedArtifactsInfo;
- }
-
- public void setRelatedArtifactsInfo(List<ArtifactTemplateInfo> relatedArtifactsInfo) {
- this.relatedArtifactsInfo = relatedArtifactsInfo;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public boolean isBase() {
- return isBase;
- }
-
- public void setBase(boolean isBase) {
- this.isBase = isBase;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- @Override
- public String toString() {
- return "ArtifactTemplateInfo [type=" + type + ", fileName=" + fileName + ", env=" + env + ", isBase=" + isBase + ", groupName=" + groupName + ", description=" + description + ", relatedArtifactsInfo=" + relatedArtifactsInfo + "]";
- }
-
public static Either<ArtifactTemplateInfo, ResponseFormat> createArtifactTemplateInfoFromJson(ComponentsUtils componentsUtils, String type, Map<String, Object> o, List<ArtifactTemplateInfo> createdArtifactTemplateInfoList,
ArtifactTemplateInfo parentArtifact) {
String content = gson.toJson(o);
}
public static int compareByGroupName(ArtifactTemplateInfo art1, ArtifactTemplateInfo art2) {
- return art1.isBase ? (art2.isBase ? 0 : -1) : (art2.isBase ? 1 : 0);
+ return art1.isBase() ? (art2.isBase() ? 0 : -1) : (art2.isBase() ? 1 : 0);
}
-
}
package org.openecomp.sdc.be.info;
+import lombok.Getter;
+import lombok.Setter;
import org.openecomp.sdc.be.model.ArtifactType;
import java.util.List;
+@Getter
+@Setter
public class ArtifactTypesInfo {
-
- Integer heatDefaultTimeout = 60;
- List<ArtifactType> artifactTypes;
-
- public List<ArtifactType> getArtifactTypes() {
- return artifactTypes;
- }
-
- public void setArtifactTypes(List<ArtifactType> artifactTypes) {
- this.artifactTypes = artifactTypes;
- }
-
- public Integer getHeatDefaultTimeout() {
- return heatDefaultTimeout;
- }
-
- public void setHeatDefaultTimeout(Integer heatDefaultTimeout) {
- this.heatDefaultTimeout = heatDefaultTimeout;
- }
-
+ private Integer heatDefaultTimeout = 60;
+ private List<ArtifactType> artifactTypes;
}
package org.openecomp.sdc.be.info;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
import org.openecomp.sdc.be.model.ComponentInstance;
import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
+@Getter
+@Setter
+@AllArgsConstructor
public class CreateAndAssotiateInfo {
private ComponentInstance node;
private RequirementCapabilityRelDef associate;
-
- CreateAndAssotiateInfo() {}
-
- public CreateAndAssotiateInfo(ComponentInstance node, RequirementCapabilityRelDef associate) {
- this.node = node;
- this.associate = associate;
- }
-
- public ComponentInstance getNode() {
- return node;
- }
-
- public void setNode(ComponentInstance node) {
- this.node = node;
- }
-
- public RequirementCapabilityRelDef getAssociate() {
- return associate;
- }
-
- public void setAssociate(RequirementCapabilityRelDef associate) {
- this.associate = associate;
- }
-
}
package org.openecomp.sdc.be.info;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
import org.openecomp.sdc.common.log.wrappers.Logger;
import java.util.Arrays;
import java.util.Optional;
+@Getter
+@AllArgsConstructor
public enum DistributionStatus {
DEPLOYED("Deployed", "DEPLOYED");
private static final Logger log = Logger.getLogger(DistributionStatus.class);
- DistributionStatus(String name, String auditingStatus) {
- this.name = name;
- this.auditingStatus = auditingStatus;
- }
-
- public String getName() {
- return name;
- }
-
- public String getAuditingStatus() {
- return auditingStatus;
- }
-
public static DistributionStatus getStatusByAuditingStatusName(String auditingStatus) {
Optional<DistributionStatus> distributionStatus = Arrays.stream(values())
.filter(value -> value.getAuditingStatus().equals(auditingStatus)).findAny();
// it should be replaced by some exception handling. Keeping it only for the purpose of backward compatibility
return distributionStatus.orElse(null);
}
-
}
package org.openecomp.sdc.be.info;
+import lombok.Getter;
+import lombok.Setter;
import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
+@Getter
+@Setter
public class DistributionStatusInfo {
private String omfComponentID;
private String status;
private String errorReason;
- DistributionStatusInfo() {
- }
-
public DistributionStatusInfo(AuditingGenericEvent distributionStatusEvent) {
super();
omfComponentID = String.valueOf(distributionStatusEvent.getFields().get(AuditingFieldsKey.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName()));
this.url = url;
this.status = status;
}
-
- public String getOmfComponentID() {
- return omfComponentID;
- }
-
- public void setOmfComponentID(String omfComponentID) {
- this.omfComponentID = omfComponentID;
- }
-
- public String getTimestamp() {
- return timestamp;
- }
-
- public void setTimestamp(String timestamp) {
- this.timestamp = timestamp;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getErrorReason() {
- return errorReason;
- }
-
- public void setErrorReason(String errorReason) {
- this.errorReason = errorReason;
- }
-
}
package org.openecomp.sdc.be.info;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public class DistributionStatusListResponse {
-
- private List<DistributionStatusInfo> distribStatusInfoList;
-
- public List<DistributionStatusInfo> getDistributionStatusList() {
- return distribStatusInfoList;
- }
-
- public void setDistributionStatusList(List<DistributionStatusInfo> distribStatusInfoList) {
- this.distribStatusInfoList = distribStatusInfoList;
- }
-
+ private List<DistributionStatusInfo> distributionStatusList;
}
package org.openecomp.sdc.be.info;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
public class DistributionStatusOfServiceInfo {
private String distributionID;
private String timestamp;
private String userId;
private String deployementStatus;
-
- public DistributionStatusOfServiceInfo() {}
-
- public DistributionStatusOfServiceInfo(String distributionID, String timestamp, String userId, String deploymentStatus) {
- super();
- this.distributionID = distributionID;
- this.timestamp = timestamp;
- this.userId = userId;
- this.deployementStatus = deploymentStatus;
- }
-
- public String getDistributionID() {
- return distributionID;
- }
-
- public void setDistributionID(String distributionID) {
- this.distributionID = distributionID;
- }
-
- public String getTimestamp() {
- return timestamp;
- }
-
- public void setTimestamp(String timestamp) {
- this.timestamp = timestamp;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getDeployementStatus() {
- return deployementStatus;
- }
-
- public void setDeployementStatus(String deployementStatus) {
- this.deployementStatus = deployementStatus;
- }
-
}
package org.openecomp.sdc.be.info;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public class DistributionStatusOfServiceListResponce {
-
- private List<DistributionStatusOfServiceInfo> distribStatusOfServiceInfoList;
-
- public List<DistributionStatusOfServiceInfo> getDistributionStatusOfServiceList() {
- return distribStatusOfServiceInfoList;
- }
-
- public void setDistributionStatusOfServiceList(List<DistributionStatusOfServiceInfo> distribStatusOfServiceInfoList) {
- this.distribStatusOfServiceInfoList = distribStatusOfServiceInfoList;
- }
-
+ private List<DistributionStatusOfServiceInfo> distributionStatusOfServiceList;
}
package org.openecomp.sdc.be.info;
import java.util.Set;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
+@AllArgsConstructor
public class GenericArtifactQueryInfo {
-
private Set<String> fields;
private String parentId;
private String artifactUniqueId;
-
- public GenericArtifactQueryInfo() {
- }
-
- public GenericArtifactQueryInfo(Set<String> fields, String parentId, String artifactUniqueId) {
- this.fields = fields;
- this.parentId = parentId;
- this.artifactUniqueId = artifactUniqueId;
- }
-
- public void setFields(Set<String> fields) {
- this.fields = fields;
- }
-
- public void setParentId(String parentId) {
- this.parentId = parentId;
- }
-
- public void setArtifactUniqueId(String artifactUniqueId) {
- this.artifactUniqueId = artifactUniqueId;
- }
-
- public Set<String> getFields() {
- return fields;
- }
-
- public String getParentId() {
- return parentId;
- }
-
- public String getArtifactUniqueId() {
- return artifactUniqueId;
- }
}
*/
package org.openecomp.sdc.be.info;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
import org.openecomp.sdc.be.model.GroupDefinition;
import org.openecomp.sdc.be.model.GroupInstance;
import org.openecomp.sdc.be.model.GroupProperty;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+@Getter
+@Setter
public class GroupDefinitionInfo {
private String name;
// artifacts - list of artifact uid. All artifacts in the group must already
// be uploaded to the VF
+ @Getter(AccessLevel.NONE)
+ @Setter(AccessLevel.NONE)
private List<ArtifactDefinitionInfo> artifacts;
private Map<String, String> members;
+ @Getter(AccessLevel.NONE)
+ @Setter(AccessLevel.NONE)
private List<? extends GroupProperty> properties;
- public GroupDefinitionInfo() {}
-
public GroupDefinitionInfo(GroupDefinition other) {
this.setName(other.getName());
this.setDescription(other.getDescription());
this.setProperties(other.convertToGroupInstancesProperties());
}
- public String getInvariantUUID() {
- return invariantUUID;
- }
-
- public void setInvariantUUID(String invariantUUID) {
- this.invariantUUID = invariantUUID;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getUniqueId() {
- return uniqueId;
- }
-
- public void setUniqueId(String uniqueId) {
- this.uniqueId = uniqueId;
- }
-
- public String getGroupUUID() {
- return groupUUID;
- }
-
- public void setGroupUUID(String groupUUID) {
- this.groupUUID = groupUUID;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getCustomizationUUID() {
- return customizationUUID;
- }
-
- public void setCustomizationUUID(String customizationUUID) {
- this.customizationUUID = customizationUUID;
- }
-
- public Boolean getIsBase() {
- return isBase;
- }
-
- public void setIsBase(Boolean isBase) {
- this.isBase = isBase;
- }
-
public List<ArtifactDefinitionInfo> getArtifacts() {
return (artifacts==null) ? null : new ArrayList<>(artifacts);
}
- public void setArtifacts(List<ArtifactDefinitionInfo> artifacts) {
- this.artifacts = (artifacts==null) ? null : new ArrayList<>(artifacts);
- }
-
public List<GroupProperty> getProperties() {
return (properties==null) ? null : new ArrayList<>(properties);
}
- public void setProperties(List<? extends GroupProperty> properties) {
- this.properties = (properties==null) ? null : new ArrayList<>(properties);
- }
-
- public String getGroupInstanceUniqueId() {
- return groupInstanceUniqueId;
- }
-
- public void setGroupInstanceUniqueId(String groupInstanceUniqueId) {
- this.groupInstanceUniqueId = groupInstanceUniqueId;
- }
-
- public Map<String, String> getMembers() {
- return members;
+ public void setArtifacts(List<ArtifactDefinitionInfo> artifacts) {
+ this.artifacts = (artifacts==null) ? null : new ArrayList<>(artifacts);
}
- public void setMembers(Map<String, String> members) {
- this.members = members;
+ public void setProperties(List<? extends GroupProperty> properties) {
+ this.properties = (properties==null) ? null : new ArrayList<>(properties);
}
@Override
public String toString() {
return "GroupDefinitionInfo [" + super.toString() + ", isBase=" + isBase + ", artifacts=" + artifacts + "]";
}
-
}
package org.openecomp.sdc.be.info;
-public class GroupTemplateInfo {
- String groupName;
- boolean isBase;
- ArtifactTemplateInfo artifactTemplateInfo;
-
- public GroupTemplateInfo() {}
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public boolean isBase() {
- return isBase;
- }
-
- public void setBase(boolean isBase) {
- this.isBase = isBase;
- }
-
- public ArtifactTemplateInfo getArtifactTemplateInfo() {
- return artifactTemplateInfo;
- }
-
- public void setArtifactTemplateInfo(ArtifactTemplateInfo artifactTemplateInfo) {
- this.artifactTemplateInfo = artifactTemplateInfo;
- }
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
+public class GroupTemplateInfo {
+ private String groupName;
+ private boolean base;
+ private ArtifactTemplateInfo artifactTemplateInfo;
}
package org.openecomp.sdc.be.info;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.openecomp.sdc.be.model.ArtifactDefinition;
public class MergedArtifactInfo {
+ @Getter @Setter(AccessLevel.NONE)
private List<ArtifactDefinition> createdArtifact;
+ @Getter @Setter
private ArtifactTemplateInfo jsonArtifactTemplate;
- private Set<String> parsetArtifactsNames;
-
- public List<ArtifactDefinition> getCreatedArtifact() {
- return createdArtifact;
- }
+ private Set<String> parsedArtifactsNames;
public void setCreatedArtifact(List<ArtifactDefinition> createdArtifact) {
this.createdArtifact = createdArtifact;
- parsetArtifactsNames = new HashSet<>();
- parsetArtifactsNames.add(jsonArtifactTemplate.getFileName());
+ parsedArtifactsNames = new HashSet<>();
+ parsedArtifactsNames.add(jsonArtifactTemplate.getFileName());
List<ArtifactTemplateInfo> relatedGroupTemplateList = jsonArtifactTemplate.getRelatedArtifactsInfo();
if (relatedGroupTemplateList != null && !relatedGroupTemplateList.isEmpty()) {
- this.createArtifactsGroupSet(relatedGroupTemplateList, parsetArtifactsNames);
+ this.createArtifactsGroupSet(relatedGroupTemplateList, parsedArtifactsNames);
}
}
- public ArtifactTemplateInfo getJsonArtifactTemplate() {
- return jsonArtifactTemplate;
- }
-
- public void setJsonArtifactTemplate(ArtifactTemplateInfo jsonArtifactTemplate) {
- this.jsonArtifactTemplate = jsonArtifactTemplate;
- }
-
public List<ArtifactTemplateInfo> getListToAssociateArtifactToGroup() {
List<ArtifactTemplateInfo> resList = new ArrayList<>();
List<ArtifactTemplateInfo> relatedArtifacts = jsonArtifactTemplate.getRelatedArtifactsInfo();
List<ArtifactDefinition> resList = new ArrayList<>();
for (ArtifactDefinition artifactDefinition : createdArtifact) {
boolean isDissotiate = true;
- if(parsetArtifactsNames.contains(artifactDefinition.getArtifactName())){
+ if(parsedArtifactsNames.contains(artifactDefinition.getArtifactName())){
isDissotiate = false;
}else{
if (artifactDefinition.getGeneratedFromId() != null && !artifactDefinition.getGeneratedFromId().isEmpty()){
Optional<ArtifactDefinition> op = createdArtifact.stream().filter(p -> p.getUniqueId().equals(artifactDefinition.getGeneratedFromId())).findAny();
if(op.isPresent()){
ArtifactDefinition generatedFromArt = op.get();
- if(parsetArtifactsNames.contains(generatedFromArt.getArtifactName())){
+ if(parsedArtifactsNames.contains(generatedFromArt.getArtifactName())){
isDissotiate = false;
}
}
}
}
}
-
}
*/
package org.openecomp.sdc.be.info;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
import org.openecomp.sdc.be.model.ArtifactDefinition;
import java.util.List;
import java.util.Map;
+@Getter
+@Setter
+@AllArgsConstructor
public class NodeTypeInfoToUpdateArtifacts {
-
private String nodeName;
private Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle;
-
- NodeTypeInfoToUpdateArtifacts() {}
-
- public NodeTypeInfoToUpdateArtifacts(String nodeName,
- Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle) {
- super();
- this.nodeName = nodeName;
- this.nodeTypesArtifactsToHandle = nodeTypesArtifactsToHandle;
- }
-
- public String getNodeName() {
- return nodeName;
- }
-
- public void setNodeName(String nodeName) {
- this.nodeName = nodeName;
- }
-
- public Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> getNodeTypesArtifactsToHandle() {
- return nodeTypesArtifactsToHandle;
- }
-
- public void setNodeTypesArtifactsToHandle(
- Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle) {
- this.nodeTypesArtifactsToHandle = nodeTypesArtifactsToHandle;
- }
-
-
}
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.openecomp.sdc.common.log.wrappers.Logger;
import java.io.IOException;
+@Getter
+@Setter
public final class OperationalEnvInfo {
@JsonIgnore
private static ObjectMapper objectMapper = new ObjectMapper();
@JsonProperty("relationship-list")
private RelationshipList relationships;
- public String getOperationalEnvId() {
- return operationalEnvId;
- }
-
- public void setOperationalEnvId(String operationalEnvId) {
- this.operationalEnvId = operationalEnvId;
- }
-
- public String getOperationalEnvName() {
- return operationalEnvName;
- }
-
- public void setOperationalEnvName(String operationalEnvName) {
- this.operationalEnvName = operationalEnvName;
- }
-
- public String getOperationalEnvType() {
- return operationalEnvType;
- }
-
- public void setOperationalEnvType(String operationalEnvType) {
- this.operationalEnvType = operationalEnvType;
- }
-
- public String getOperationalEnvStatus() {
- return operationalEnvStatus;
- }
-
- public void setOperationalEnvStatus(String operationalEnvStatus) {
- this.operationalEnvStatus = operationalEnvStatus;
- }
-
- public String getTenantContext() {
- return tenantContext;
- }
-
- public void setTenantContext(String tenantContext) {
- this.tenantContext = tenantContext;
- }
-
- public String getWorkloadContext() {
- return workloadContext;
- }
-
- public void setWorkloadContext(String workloadContext) {
- this.workloadContext = workloadContext;
- }
-
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- public void setResourceVersion(String resourceVersion) {
- this.resourceVersion = resourceVersion;
- }
-
- public RelationshipList getRelationships() {
- return relationships;
- }
-
- public void setRelationships(RelationshipList relationships) {
- this.relationships = relationships;
- }
-
@Override
public String toString() {
try {
public static OperationalEnvInfo createFromJson(String json) throws IOException {
return objectMapper.readValue(json, OperationalEnvInfo.class);
}
-
}
package org.openecomp.sdc.be.info;
import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public final class RelatedToProperty {
@JsonProperty("property-key")
@JsonProperty("property-value")
private String propertyValue;
-
- public String getPropertyKey() {
- return propertyKey;
- }
-
- public void setPropertyKey(String propertyKey) {
- this.propertyKey = propertyKey;
- }
-
- public String getPropertyValue() {
- return propertyValue;
- }
-
- public void setPropertyValue(String propertyValue) {
- this.propertyValue = propertyValue;
- }
}
import java.util.ArrayList;
import java.util.List;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public final class Relationship {
@JsonProperty("related-to")
private String relatedLink;
@JsonProperty("relationship-data")
+ @Getter(AccessLevel.NONE)
private List<RelationshipData> relationshipData;
@JsonProperty("related-to-property")
+ @Getter(AccessLevel.NONE)
private List<RelatedToProperty> relatedToProperty;
- public String getRelatedTo() {
- return relatedTo;
- }
-
- public void setRelatedTo(String relatedTo) {
- this.relatedTo = relatedTo;
- }
-
- public String getRelatedLink() {
- return relatedLink;
- }
-
- public void setRelatedLink(String relatedLink) {
- this.relatedLink = relatedLink;
- }
-
public List<RelationshipData> getRelationshipData() {
if(relationshipData == null) {
relationshipData = new ArrayList<>();
return relationshipData;
}
- public void setRelationshipData(List<RelationshipData> relationshipData) {
- this.relationshipData = relationshipData;
- }
-
- public String getRelationshipLabel() {
- return relationshipLabel;
- }
-
- public void setRelationshipLabel(String relationshipLabel) {
- this.relationshipLabel = relationshipLabel;
- }
-
public List<RelatedToProperty> getRelatedToProperty() {
if(relatedToProperty == null) {
relatedToProperty = new ArrayList<>();
}
return relatedToProperty;
}
-
- public void setRelatedToProperty(List<RelatedToProperty> relatedToProperty) {
- this.relatedToProperty = relatedToProperty;
- }
}
package org.openecomp.sdc.be.info;
import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public final class RelationshipData {
@JsonProperty("relationship-key")
@JsonProperty("relationship-value")
private String relationshipValue;
-
- public void setRelationshipKey(String relationshipKey) {
- this.relationshipKey = relationshipKey;
- }
-
- public String getRelationshipKey() {
- return this.relationshipKey;
- }
-
- public void setRelationshipValue(String relationshipValue) {
- this.relationshipValue = relationshipValue;
- }
-
- public String getRelationshipValue() {
- return this.relationshipValue;
- }
}
import java.util.ArrayList;
import java.util.List;
+import lombok.Setter;
+@Setter
public class RelationshipList {
private List<Relationship> relationship;
}
return relationship;
}
-
- public void setRelationship(List<Relationship> relationship) {
- this.relationship = relationship;
- }
-
}
package org.openecomp.sdc.be.info;
-import com.google.common.annotations.VisibleForTesting;
-
import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
+@AllArgsConstructor
public class ServiceInfo {
-
private String name;
private List<ServiceVersionInfo> versions;
-
- @VisibleForTesting
- ServiceInfo() {
- }
-
- public ServiceInfo(String serviceName, List<ServiceVersionInfo> list) {
- this.name = serviceName;
- this.versions = list;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public List<ServiceVersionInfo> getVersions() {
- return versions;
- }
-
- public void setVersions(List<ServiceVersionInfo> versions) {
- this.versions = versions;
- }
-
}
package org.openecomp.sdc.be.info;
-import com.google.common.annotations.VisibleForTesting;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public class ServiceVersionInfo {
-
private String version;
private String url;
- @VisibleForTesting
- ServiceVersionInfo() {}
-
public ServiceVersionInfo(String serviceName, String serviceVersion, String context) {
super();
this.version = serviceVersion;
sb.append("services/").append(serviceName).append("/").append(serviceVersion);
url = sb.toString();
}
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String serviceVersion) {
- this.version = serviceVersion;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
}
package org.openecomp.sdc.be.info;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public class ServicesWrapper {
private List<ServiceInfo> services;
-
- public List<ServiceInfo> getServices() {
- return services;
- }
-
- public void setServices(List<ServiceInfo> services) {
- this.services = services;
- }
}
package org.openecomp.sdc.be.info;
-public class ServletJsonResponse {
-
- String source;
- String description;
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getSource() {
- return source;
- }
-
- public void setSource(String source) {
- this.source = source;
- }
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
+public class ServletJsonResponse {
+ private String source;
+ private String description;
}
package org.openecomp.sdc.be.info;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public class ToscaNodeTypeInfo {
private String nodeName;
private List<ToscaNodeTypeInterface> interfaces;
private String iconPath;
- public String getNodeName() {
- return nodeName;
- }
-
- public void setNodeName(String nodeName) {
- this.nodeName = nodeName;
- }
-
- public String getTemplateVersion() {
- return templateVersion;
- }
-
- public void setTemplateVersion(String templateVersion) {
- this.templateVersion = templateVersion;
- }
-
- public List<ToscaNodeTypeInterface> getInterfaces() {
- return interfaces;
- }
-
- public void setInterfaces(List<ToscaNodeTypeInterface> interfaces) {
- this.interfaces = interfaces;
- }
-
- public String getIconPath() {
- return iconPath;
- }
-
- public void setIconPath(String iconPath) {
- this.iconPath = iconPath;
- }
-
@Override
public String toString() {
return "ToscaNodeTypeInfo [nodeName=" + nodeName + ", templateVersion=" + templateVersion + ", interfaces=" + interfaces + ", iconPath=" + iconPath + "]";
}
-
}
package org.openecomp.sdc.be.info;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
public class ToscaNodeTypeInterface {
-
- List<String> scripts;
-
- public List<String> getScripts() {
- return scripts;
- }
-
- public void setScripts(List<String> scripts) {
- this.scripts = scripts;
- }
-
+ private List<String> scripts;
}
import org.mockito.junit.MockitoJUnitRunner;
import org.openecomp.sdc.be.model.ArtifactDefinition;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
private static final byte[] PAYLOAD_DATA = "Test".getBytes();
private static final String NAME = "Name";
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(ArtifactDefinitionInfo.class, hasValidGettersAndSetters());
- }
-
@Test
public void testCtor() {
Mockito.when(artifactDefinition.getPayloadData()).thenReturn(PAYLOAD_DATA);
assertThat(artifactDefinitionInfo.getArtifactUUID(), is(UUID));
}
-
-
}
\ No newline at end of file
assertThat(artifactTemplateInfo.getEnv(), is(ENV));
assertThat(artifactTemplateInfo.getRelatedArtifactsInfo(), is(artifactsInfo));
}
-
}
\ No newline at end of file
import org.openecomp.sdc.be.model.ComponentInstance;
import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
public class CreateAndAssotiateInfoTest {
-
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(CreateAndAssotiateInfo.class, hasValidGettersAndSetters());
- }
-
@Test
public void shouldTestWhetherTheDefaultConstructorCorrectlySetAllFields() {
ComponentInstance componentInstance = new ComponentInstance();
Assert.assertThat(createAndAssociateInfo.getAssociate(), is(requirementCapabilityRelDef));
Assert.assertThat(createAndAssociateInfo.getNode(), is(componentInstance));
}
-
-
}
\ No newline at end of file
import java.util.HashMap;
import java.util.Map;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
public class DistributionStatusInfoTest {
private static final String AUDIT_STATUS = "AUDIT_STATUS";
private static final String AUDIT_DESC = "AUDIT_DESC";
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(DistributionStatusInfo.class, hasValidGettersAndSetters());
- }
-
@Test
public void testCtorWithAuditingGenericEvent() {
AuditingGenericEvent distributionStatusEvent = createAuditingGenericEvent();
distributionStatusEvent.setFields(fields);
return distributionStatusEvent;
}
-
}
\ No newline at end of file
return new DistributionStatusOfServiceInfo();
}
- @Test
- public void testCtor() throws Exception {
- new DistributionStatusOfServiceInfo("","","","");
- }
-
-
- @Test
- public void testGetDistributionID() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getDistributionID();
- }
-
-
- @Test
- public void testSetDistributionID() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String distributionID = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setDistributionID(distributionID);
- }
-
-
- @Test
- public void testGetTimestamp() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getTimestamp();
- }
-
-
- @Test
- public void testSetTimestamp() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String timestamp = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setTimestamp(timestamp);
- }
-
-
- @Test
- public void testGetUserId() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getUserId();
- }
-
-
- @Test
- public void testSetUserId() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String userId = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setUserId(userId);
- }
-
-
- @Test
- public void testGetDeployementStatus() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String result;
-
- // default test
- testSubject = createTestSubject();
- result = testSubject.getDeployementStatus();
- }
-
-
- @Test
- public void testSetDeployementStatus() throws Exception {
- DistributionStatusOfServiceInfo testSubject;
- String deployementStatus = "";
-
- // default test
- testSubject = createTestSubject();
- testSubject.setDeployementStatus(deployementStatus);
- }
-
-
@Test
public void shouldHaveValidDefaultConstructor() {
assertThat(DistributionStatusOfServiceInfo.class, hasValidBeanConstructor());
assertThat(distributionStatusOfServiceInfo.getUserId(), is(USER_ID));
assertThat(distributionStatusOfServiceInfo.getDeployementStatus(), is(STATUS));
}
-
-
}
\ No newline at end of file
import java.util.Collections;
import java.util.Set;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
private static final String PARENT_ID = "parentId";
private static final Set<String> FIELDS = Collections.emptySet();
- @Test
- public void shouldHaveValidDefaultConstructor() {
- assertThat(GenericArtifactQueryInfo.class, hasValidBeanConstructor());
- }
-
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(GenericArtifactQueryInfo.class, hasValidGettersAndSetters());
- }
-
@Test
public void shouldTestConstructorCorrectlySetFields(){
GenericArtifactQueryInfo genericArtifactQueryInfo = new GenericArtifactQueryInfo(FIELDS, PARENT_ID,
*/
package org.openecomp.sdc.be.info;
-import com.google.code.beanmatchers.BeanMatchers;
import org.junit.Test;
import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
import org.openecomp.sdc.be.model.GroupDefinition;
import org.openecomp.sdc.be.model.GroupInstance;
import java.util.ArrayList;
import java.util.List;
+import org.openecomp.sdc.be.model.GroupProperty;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.matchesPattern;
private static final String DESC = "DESC";
private static final String NAME = "NAME";
- @Test
- public void shouldHaveValidDefaultConstructor() {
- assertThat(GroupDefinitionInfo.class, hasValidBeanConstructor());
- }
-
@Test
public void testShouldConstructObjectFromGroupDefinition() {
GroupDefinition groupDefinition = createGroupDefinition();
}
@Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(GroupDefinitionInfo.class, BeanMatchers.hasValidGettersAndSettersExcluding("artifacts", "properties"));
+ public void testValidGetterSetterArtifacts() {
+ GroupDefinition groupDefinition = new GroupDefinition();
+ GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo(groupDefinition);
+ groupDefinitionInfo.setArtifacts(null);
+ assertThat(groupDefinitionInfo.getArtifacts(), nullValue());
+
+ List<ArtifactDefinitionInfo> artifacts = new ArrayList<>();
+ groupDefinitionInfo.setArtifacts(artifacts);
+ assertThat(groupDefinitionInfo.getArtifacts(), not(sameInstance(artifacts)));
+ }
+
+ @Test
+ public void testValidGetterSetterProperties() {
+ GroupDefinition groupDefinition = new GroupDefinition();
+ GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo(groupDefinition);
+ groupDefinitionInfo.setProperties(null);
+ assertThat(groupDefinitionInfo.getProperties(), nullValue());
+
+ List<GroupProperty> properties = new ArrayList<>();
+ groupDefinitionInfo.setProperties(properties);
+ assertThat(groupDefinitionInfo.getProperties(), not(sameInstance(properties)));
}
@Test
public void testToString() {
- GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo();
+ GroupDefinition groupDefinition = new GroupDefinition();
+ ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+ GroupDefinitionInfo groupDefinitionInfo = new GroupDefinitionInfo(groupDefinition);
List<ArtifactDefinitionInfo> artifacts = new ArrayList<>();
- ArtifactDefinitionInfo artifactDefinitionInfo = new ArtifactDefinitionInfo();
+ ArtifactDefinitionInfo artifactDefinitionInfo = new ArtifactDefinitionInfo(artifactDefinition);
artifactDefinitionInfo.setArtifactName(ARTIFACT_NAME);
artifacts.add(artifactDefinitionInfo);
groupDefinitionInfo.setArtifacts(artifacts);
groupInstanceDataDefinition.setGroupUUID(GROUP_UUID);
return groupInstanceDataDefinition;
}
-
}
\ No newline at end of file
@Test
public void shouldHaveValidDefaultConstructor() {
- assertThat(DistributionStatusOfServiceListResponce.class, hasValidBeanConstructor());
+ assertThat(GroupTemplateInfo.class, hasValidBeanConstructor());
}
@Test
import java.util.List;
import java.util.Map;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
private static final Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> NODE_TYPES_ARTIFACTS_TO_HANDLE = Collections
.emptyMap();
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(NodeTypeInfoToUpdateArtifacts.class, hasValidGettersAndSetters());
- }
-
@Test
public void shouldConstructCorrectObject() {
NodeTypeInfoToUpdateArtifacts nodeTypeInfoToUpdateArtifacts = new NodeTypeInfoToUpdateArtifacts(NAME,
*/
package org.openecomp.sdc.be.info;
+import java.util.List;
import org.junit.Test;
import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
public class RelationshipListTest {
assertThat(RelationshipList.class, hasValidGettersAndSetters());
}
+ @Test
+ public void testNonDefaultGetter() {
+ RelationshipList relationshipList = new RelationshipList();
+ assertThat(relationshipList.getRelationship(), notNullValue());
+ assertThat(relationshipList.getRelationship(), instanceOf(List.class));
+ }
}
\ No newline at end of file
*/
package org.openecomp.sdc.be.info;
+import java.util.List;
import org.junit.Test;
import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
public class RelationshipTest {
assertThat(Relationship.class, hasValidBeanConstructor());
}
+ @Test
+ public void testNonDefaultPropertyGetter() {
+ Relationship relationship = new Relationship();
+ assertThat(relationship.getRelatedToProperty(), notNullValue());
+ assertThat(relationship.getRelatedToProperty(), instanceOf(List.class));
+ }
+
+ @Test
+ public void testNonDefaultRelationshipDataGetter() {
+ Relationship relationship = new Relationship();
+ assertThat(relationship.getRelationshipData(), notNullValue());
+ assertThat(relationship.getRelationshipData(), instanceOf(List.class));
+ }
}
\ No newline at end of file
import java.util.Collections;
import java.util.List;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
private static final String NAME = "NAME";
private static final List<ServiceVersionInfo> SERVICE_VERSION_INFOS = Collections.emptyList();
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(ServiceInfo.class, hasValidGettersAndSetters());
- }
-
@Test
public void shouldConstructCorrectObject() {
ServiceInfo serviceInfo = new ServiceInfo(NAME, SERVICE_VERSION_INFOS);
import org.junit.Test;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
private static final String CONTEXT = "http://localhost:1000/";
private static final String URL = "http://localhost:1000/services/NAME/VERSION";
- @Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(ServiceVersionInfo.class, hasValidGettersAndSetters());
- }
-
@Test
public void shouldConstructCorrectObject() {
ServiceVersionInfo serviceVersionInfo = new ServiceVersionInfo(NAME, VERSION, CONTEXT);
@Test
public void shouldHaveValidDefaultConstructor() {
- assertThat(ServiceInfo.class, hasValidBeanConstructor());
+ assertThat(ServicesWrapper.class, hasValidBeanConstructor());
}
}
\ No newline at end of file
@Test
public void shouldHaveValidDefaultConstructor() {
- assertThat(ServiceInfo.class, hasValidBeanConstructor());
+ assertThat(ServletJsonResponse.class, hasValidBeanConstructor());
}
}
\ No newline at end of file
@Test
public void shouldHaveValidDefaultConstructor() {
- assertThat(ServiceInfo.class, hasValidBeanConstructor());
+ assertThat(ToscaNodeTypeInfo.class, hasValidBeanConstructor());
}
@Test
public void allPropertiesShouldBeRepresentedInToStringOutput() {
assertThat(ToscaNodeTypeInfo.class, BeanMatchers.hasValidBeanToString());
}
-
}
\ No newline at end of file
Code Review / sdc.git / commitdiff