diff options
| -rw-r--r-- | catalog-model/src/main/java/org/openecomp/sdc/be/model/catalog/CatalogComponent.java | 156 | ||||
| -rw-r--r-- | catalog-model/src/test/java/org/openecomp/sdc/be/model/catalog/CatalogComponentTest.java | 71 |
2 files changed, 78 insertions, 149 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/catalog/CatalogComponent.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/catalog/CatalogComponent.java index c6965489ec..8002939e80 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/catalog/CatalogComponent.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/catalog/CatalogComponent.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. @@ -22,15 +22,17 @@ package org.openecomp.sdc.be.model.catalog; import static java.util.Objects.requireNonNull; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Collections; import java.util.List; - +import lombok.Getter; +import lombok.Setter; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.model.category.CategoryDefinition; -import com.google.common.collect.ImmutableList; - +@Getter +@Setter public class CatalogComponent { private String version; @@ -51,140 +53,7 @@ public class CatalogComponent { private List<String> tags; private Boolean isHighestVersion; private String lastUpdaterUserId; - - private List<CategoryDefinition> categories; - - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - - public String getInvariantUUID() { - return invariantUUID; - } - - public void setInvariantUUID(String invariantUUID) { - this.invariantUUID = invariantUUID; - } - - public String getSystemName() { - return systemName; - } - - public void setSystemName(String systemName) { - this.systemName = systemName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - - public Boolean getIsHighestVersion() { - return isHighestVersion; - } - - public void setIsHighestVersion(Boolean isHighestVersion) { - this.isHighestVersion = isHighestVersion; - } - - public String getCategoryNormalizedName() { - return categoryNormalizedName; - } - - public void setCategoryNormalizedName(String categoryNormalizedName) { - this.categoryNormalizedName = categoryNormalizedName; - } - - public String getSubCategoryNormalizedName() { - return subCategoryNormalizedName; - } - - public void setSubCategoryNormalizedName(String subCategoryNormalizedName) { - this.subCategoryNormalizedName = subCategoryNormalizedName; - } - - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public long getLastUpdateDate() { - return lastUpdateDate; - } - - public void setLastUpdateDate(long lastUpdateDate) { - this.lastUpdateDate = lastUpdateDate; - } - - public void setVersion(String version) { - this.version = version; - } - - public void setComponentType(ComponentTypeEnum componentType) { - this.componentType = componentType; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public void setUniqueId(String uniqueId) { - this.uniqueId = uniqueId; - } - - public String getVersion() { - return version; - } - - public ComponentTypeEnum getComponentType() { - return componentType; - } - - public String getIcon() { - return icon; - } - - public String getUniqueId() { - return uniqueId; - } - - public String getLifecycleState() { - return lifecycleState; - } - - public void setLifecycleState(String lifecycleState) { - this.lifecycleState = lifecycleState; - } - - public String getDistributionStatus() { - return distributionStatus; - } - - public void setDistributionStatus(String distributionStatus) { - this.distributionStatus = distributionStatus; - } public List<String> getTags() { return tags == null ? Collections.emptyList() : ImmutableList.copyOf(tags); @@ -199,15 +68,4 @@ public class CatalogComponent { return categories == null ? Collections.emptyList() : ImmutableList.copyOf(categories); } - public void setCategories(List<CategoryDefinition> categories) { - this.categories = categories; - } - - public String getLastUpdaterUserId() { - return lastUpdaterUserId; - } - - public void setLastUpdaterUserId(String lastUpdaterUserId) { - this.lastUpdaterUserId = lastUpdaterUserId; - } } diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/catalog/CatalogComponentTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/catalog/CatalogComponentTest.java new file mode 100644 index 0000000000..8e98f1e716 --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/catalog/CatalogComponentTest.java @@ -0,0 +1,71 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2020, Nordix Foundation. 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.sdc.be.model.catalog; + +import java.util.ArrayList; +import java.util.List; +import org.junit.Assert; +import org.junit.Test; +import org.openecomp.sdc.be.model.category.CategoryDefinition; + +public class CatalogComponentTest { + + private CatalogComponent createTestSubject() { + return new CatalogComponent(); + } + + @Test + public void testGetTags() { + CatalogComponent testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getTags(); + Assert.assertNotNull(result); + Assert.assertEquals(result, new ArrayList<>()); + } + + @Test + public void testSetTags() { + CatalogComponent testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + testSubject.setTags(new ArrayList<>()); + result = testSubject.getTags(); + Assert.assertNotNull(result); + Assert.assertEquals(result, new ArrayList<>()); + } + + @Test + public void testGetCategories() { + CatalogComponent testSubject; + List<CategoryDefinition> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getCategories(); + Assert.assertNotNull(result); + Assert.assertEquals(result, new ArrayList<>()); + } +} |