summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2021-03-25 20:51:48 +0000
committerVasyl Razinkov <vasyl.razinkov@est.tech>2021-03-25 20:52:52 +0000
commit714493fb9588598b969711bf761f301ba8ebe286 (patch)
treefa10ba6312784131ec708ba592b8d58088045c9b /openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api
parenta45577d6d9e5a67ea8313b760b5180c974fc63d7 (diff)
Improve test coverage
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I88e5bf627510b72322d061df5d34bc3600c47eb5 Issue-ID: SDC-3428
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api')
-rw-r--r--openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java59
-rw-r--r--openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java67
-rw-r--r--openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java59
-rw-r--r--openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java67
4 files changed, 28 insertions, 224 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java
index d47ec10f2c..e66d0525aa 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java
@@ -23,17 +23,19 @@ import com.datastax.driver.mapping.annotations.Table;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.nio.ByteBuffer;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.common.errors.SdcRuntimeException;
import org.openecomp.sdc.versioning.dao.types.Version;
+@Getter
+@Setter
+@NoArgsConstructor
@Table(keyspace = "dox", name = "vsp_enriched_service_artifact")
public class EnrichedServiceArtifactEntity implements ServiceElementEntity {
- private static final String ENTITY_TYPE;
-
- static {
- ENTITY_TYPE = "Vendor Software Product Service artifact";
- }
+ private static final String ENTITY_TYPE = "Vendor Software Product Service artifact";
@PartitionKey
@Column(name = "vsp_id")
@@ -48,15 +50,6 @@ public class EnrichedServiceArtifactEntity implements ServiceElementEntity {
public ByteBuffer contentData;
/**
- * Every entity class must have a default constructor according to
- * <a href="http://docs.datastax.com/en/developer/java-driver/2.1/manual/object_mapper/creating/">
- * Definition of mapped classes</a>.
- */
- public EnrichedServiceArtifactEntity() {
- // Don't delete! Default constructor is required by DataStax driver
- }
-
- /**
* Instantiates a new Enriched service artifact entity.
*
* @param entity the entity
@@ -82,44 +75,6 @@ public class EnrichedServiceArtifactEntity implements ServiceElementEntity {
return getId();
}
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public Version getVersion() {
- return version;
- }
-
- @Override
- public void setVersion(Version version) {
- this.version = version;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public ByteBuffer getContentData() {
- return contentData;
- }
-
- public void setContentData(ByteBuffer contentData) {
- this.contentData = contentData;
- }
-
public ServiceArtifact getServiceArtifact() {
ServiceArtifact serviceArtifact = new ServiceArtifact();
serviceArtifact.setName(this.getName());
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java
index 8301df73c7..508e5f6a4e 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java
@@ -23,17 +23,19 @@ import com.datastax.driver.mapping.annotations.Table;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.nio.ByteBuffer;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.common.errors.SdcRuntimeException;
import org.openecomp.sdc.versioning.dao.types.Version;
+@Getter
+@Setter
+@NoArgsConstructor
@Table(keyspace = "dox", name = "vsp_enriched_service_template")
public class EnrichedServiceTemplateEntity implements ServiceElementEntity {
- private static final String ENTITY_TYPE;
-
- static {
- ENTITY_TYPE = "Vendor Software Product Service model";
- }
+ private static final String ENTITY_TYPE = "Vendor Software Product Service model";
@PartitionKey
@Column(name = "vsp_id")
@@ -50,15 +52,6 @@ public class EnrichedServiceTemplateEntity implements ServiceElementEntity {
private String baseName;
/**
- * Every entity class must have a default constructor according to
- * <a href="http://docs.datastax.com/en/developer/java-driver/2.1/manual/object_mapper/creating/">
- * Definition of mapped classes</a>.
- */
- public EnrichedServiceTemplateEntity() {
- // Don't delete! Default constructor is required by DataStax driver
- }
-
- /**
* Instantiates a new Enriched service template entity.
*
* @param entity the entity
@@ -75,14 +68,6 @@ public class EnrichedServiceTemplateEntity implements ServiceElementEntity {
}
}
- public String getBaseName() {
- return baseName;
- }
-
- public void setBaseName(String baseName) {
- this.baseName = baseName;
- }
-
@Override
public String getEntityType() {
return ENTITY_TYPE;
@@ -93,44 +78,6 @@ public class EnrichedServiceTemplateEntity implements ServiceElementEntity {
return getId();
}
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public Version getVersion() {
- return version;
- }
-
- @Override
- public void setVersion(Version version) {
- this.version = version;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public ByteBuffer getContentData() {
- return contentData;
- }
-
- public void setContentData(ByteBuffer contentData) {
- this.contentData = contentData;
- }
-
public ServiceTemplate getServiceTemplate() {
ServiceTemplate serviceTemplate = new ServiceTemplate();
serviceTemplate.setName(getName());
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java
index bfab42f8ee..8cba3b82cc 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java
@@ -23,17 +23,19 @@ import com.datastax.driver.mapping.annotations.Table;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.nio.ByteBuffer;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.common.errors.SdcRuntimeException;
import org.openecomp.sdc.versioning.dao.types.Version;
+@Getter
+@Setter
+@NoArgsConstructor
@Table(keyspace = "dox", name = "vsp_service_artifact")
public class ServiceArtifactEntity implements ServiceElementEntity {
- private static final String ENTITY_TYPE;
-
- static {
- ENTITY_TYPE = "Vendor Software Product Service artifact";
- }
+ private static final String ENTITY_TYPE = "Vendor Software Product Service artifact";
@PartitionKey
@Column(name = "vsp_id")
@@ -48,15 +50,6 @@ public class ServiceArtifactEntity implements ServiceElementEntity {
public ByteBuffer contentData;
/**
- * Every entity class must have a default constructor according to
- * <a href="http://docs.datastax.com/en/developer/java-driver/2.1/manual/object_mapper/creating/">
- * Definition of mapped classes</a>.
- */
- public ServiceArtifactEntity() {
- // Don't delete! Default constructor is required by DataStax driver
- }
-
- /**
* Instantiates a new Service artifact entity.
*
* @param entity the entity
@@ -82,44 +75,6 @@ public class ServiceArtifactEntity implements ServiceElementEntity {
return getId();
}
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public Version getVersion() {
- return version;
- }
-
- @Override
- public void setVersion(Version version) {
- this.version = version;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public ByteBuffer getContentData() {
- return contentData;
- }
-
- public void setContentData(ByteBuffer contentData) {
- this.contentData = contentData;
- }
-
public ServiceArtifact getServiceArtifact() {
ServiceArtifact serviceArtifact = new ServiceArtifact();
serviceArtifact.setName(this.getName());
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java
index 48b539ec5f..57fa235675 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java
@@ -23,17 +23,19 @@ import com.datastax.driver.mapping.annotations.Table;
import com.google.common.io.ByteStreams;
import java.io.IOException;
import java.nio.ByteBuffer;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.common.errors.SdcRuntimeException;
import org.openecomp.sdc.versioning.dao.types.Version;
+@Getter
+@Setter
+@NoArgsConstructor
@Table(keyspace = "dox", name = "vsp_service_template")
public class ServiceTemplateEntity implements ServiceElementEntity {
- private static final String ENTITY_TYPE;
-
- static {
- ENTITY_TYPE = "Vendor Software Product Service model";
- }
+ private static final String ENTITY_TYPE = "Vendor Software Product Service model";
@PartitionKey
@Column(name = "vsp_id")
@@ -50,15 +52,6 @@ public class ServiceTemplateEntity implements ServiceElementEntity {
private String baseName;
/**
- * Every entity class must have a default constructor according to
- * <a href="http://docs.datastax.com/en/developer/java-driver/2.1/manual/object_mapper/creating/">
- * Definition of mapped classes</a>.
- */
- public ServiceTemplateEntity() {
- // Don't delete! Default constructor is required by DataStax driver
- }
-
- /**
* Instantiates a new Service template entity.
*
* @param entity the entity
@@ -75,14 +68,6 @@ public class ServiceTemplateEntity implements ServiceElementEntity {
}
}
- public String getBaseName() {
- return baseName;
- }
-
- public void setBaseName(String baseName) {
- this.baseName = baseName;
- }
-
@Override
public String getEntityType() {
return ENTITY_TYPE;
@@ -93,44 +78,6 @@ public class ServiceTemplateEntity implements ServiceElementEntity {
return getId();
}
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public Version getVersion() {
- return version;
- }
-
- @Override
- public void setVersion(Version version) {
- this.version = version;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public ByteBuffer getContentData() {
- return contentData;
- }
-
- public void setContentData(ByteBuffer contentData) {
- this.contentData = contentData;
- }
-
public ServiceTemplate getServiceTemplate() {
ServiceTemplate serviceTemplate = new ServiceTemplate();
serviceTemplate.setName(getName());