increase coverage - added getter and setter tests

increase coverage - added getter and setter tests

Change-Id: I6546636666d41229898bca1eeb1740aff04ec8c3
Issue-ID: DCAEGEN2-839
Signed-off-by: Betzer, Rony (rb844h) <rb844h@intl.att.com>

82 files changed, 1069 insertions, 26 deletions

diff --git a/pom.xml b/pom.xml
index 219cc7d..a493a1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,12 @@
 			<artifactId>janino</artifactId>
 			<version>3.0.6</version>
 		</dependency>
+        <dependency>
+            <groupId>com.google.code.bean-matchers</groupId>
+            <artifactId>bean-matchers</artifactId>
+            <version>0.11</version>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerAudit.java b/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerAudit.java
index f6e2c98..d4cc26d 100644
--- a/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerAudit.java
+++ b/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerAudit.java
@@ -18,6 +18,8 @@ public class OnapLoggerAudit extends OnapLoggerBase {
         logger = LoggerFactory.getLogger(this.getClass().getName());
    }
 
+   OnapLoggerAudit(){}
+
     public static OnapLoggerAudit getInstance() {
         return instanceLoggerAudit;
     }
diff --git a/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerBase.java b/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerBase.java
index 70d5973..5e8f841 100644
--- a/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerBase.java
+++ b/src/main/java/org/onap/sdc/common/onaplog/OnapLoggerBase.java
@@ -27,6 +27,8 @@ public abstract class OnapLoggerBase implements IOnapLogger {
         this.myMarker = marker;
     }
 
+    OnapLoggerBase(){}
+
     @Override
     public void log(LogLevel errorLevel, String className, String message, Object... args) {
         MDC.put("ClassName", className);
diff --git a/src/main/java/org/onap/sdc/common/onaplog/Stopwatch.java b/src/main/java/org/onap/sdc/common/onaplog/Stopwatch.java
index de56853..20582b9 100644
--- a/src/main/java/org/onap/sdc/common/onaplog/Stopwatch.java
+++ b/src/main/java/org/onap/sdc/common/onaplog/Stopwatch.java
@@ -11,10 +11,10 @@ import java.time.Duration;
 import java.time.LocalDateTime;
 
 /**
- * Created by dd4296 on 12/13/2017.
  * this is local implementation of the stopwatch class from EELF standard with the same interface
  * can be replaced if needed with EELF lib
  */
+
 public class Stopwatch implements IStopWatch {
 
     private static final Logger log = LoggerFactory.getLogger(Stopwatch.class.getName());
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponse.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponse.java
index 49248f9..e6bda39 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponse.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponse.java
@@ -30,4 +30,6 @@ public class CreateMcResponse {
 		this.vfcmt = vfcmt;
 		this.cdump = cdump;
 	}
+
+	CreateMcResponse(){}
 }
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/MessageResponse.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/MessageResponse.java
index e498097..df87ea5 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/MessageResponse.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/MessageResponse.java
@@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.restmodels;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class MessageResponse{
+public class MessageResponse {
 
 	@JsonProperty("errorResponse")
 	private String errorResponse;
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponent.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponent.java
index 09777a5..2372836 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponent.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponent.java
@@ -1,10 +1,10 @@
 package org.onap.sdc.dcae.composition.restmodels;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import org.onap.sdc.dcae.composition.restmodels.sdc.ResourceDetailed;
 import org.onap.sdc.dcae.composition.util.DcaeBeConstants;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
+import java.util.Objects;
+
 public class MonitoringComponent {
 
 	// VFCMT metadata
@@ -22,6 +22,11 @@ public class MonitoringComponent {
 	// The name of the vfi monitored by the VFCMT
 	private String vfiName;
 
+	// 1810 US436244 add invariantUuid, submittedUuid to MC data
+	private String invariantUUID;
+	private String submittedUuid;
+
+
 	public MonitoringComponent(ResourceDetailed mc, String vfiName) {
 		this.uuid = mc.getUuid();
 		this.name = mc.getName();
@@ -29,7 +34,12 @@ public class MonitoringComponent {
 		this.lastUpdaterUserId = mc.getLastUpdaterUserId();
 		this.description = mc.getDescription();
 		this.lifecycleState = mc.getLifecycleState();
-		this.status = DcaeBeConstants.LifecycleStateEnum.CERTIFIED == DcaeBeConstants.LifecycleStateEnum.findState(lifecycleState) ? "Submitted" : "Not Submitted";
+		this.invariantUUID = mc.getInvariantUUID();
+		this.status = "Not Submitted";
+		if(DcaeBeConstants.LifecycleStateEnum.CERTIFIED == DcaeBeConstants.LifecycleStateEnum.findState(lifecycleState)) {
+			this.submittedUuid = mc.getUuid();
+			this.status = "Submitted";
+		}
 		this.vfiName = vfiName;
 	}
 
@@ -73,6 +83,16 @@ public class MonitoringComponent {
 		return lifecycleState;
 	}
 
+	public String getSubmittedUuid() { return submittedUuid; }
+
+	public String getInvariantUUID() {
+		return invariantUUID;
+	}
+
+	public void setInvariantUUID(String invariantUUID) {
+		this.invariantUUID = invariantUUID;
+	}
+
 	public void setVfiName(String vfiName) {
 		this.vfiName = vfiName;
 	}
@@ -93,4 +113,51 @@ public class MonitoringComponent {
 		this.lifecycleState = lifecycleState;
 	}
 
+	public void setSubmittedUuid(String submittedUuid) { this.submittedUuid = submittedUuid; }
+
+	public void setStatus(String status) { this.status = status; }
+
+	public void setLastUpdaterUserId(String lastUpdaterUserId) {
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) {
+			return true;
+		}
+		if (null == obj || getClass() != obj.getClass()) {
+			return false;
+		}
+		MonitoringComponent other = (MonitoringComponent) obj;
+		return Objects.equals(status, other.status) && Objects.equals(vfiName, other.vfiName) && dataFieldsEqual(other);
+
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(uuid, name, version, lastUpdaterUserId, lifecycleState, status, vfiName, invariantUUID, submittedUuid);
+	}
+
+
+	private boolean resourceFieldsEqual(MonitoringComponent other) {
+		return Objects.equals(lastUpdaterUserId, other.lastUpdaterUserId) && Objects.equals(name, other.name) && Objects.equals(description, other.description);
+	}
+
+	private boolean lifecycleFieldsEqual(MonitoringComponent other) {
+		return Objects.equals(uuid, other.uuid) && Objects.equals(version, other.version) && Objects.equals(lifecycleState, other.lifecycleState);
+	}
+
+	private boolean additionalUuidFieldsEqual(MonitoringComponent other) {
+		return Objects.equals(invariantUUID, other.invariantUUID) && Objects.equals(submittedUuid, other.submittedUuid);
+	}
+
+	private boolean dataFieldsEqual(MonitoringComponent other) {
+		return resourceFieldsEqual(other) && lifecycleFieldsEqual(other) && additionalUuidFieldsEqual(other);
+	}
 }
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUID.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUID.java
index 19bf0b7..54bfa6d 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUID.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUID.java
@@ -11,6 +11,8 @@ public class ReferenceUUID {
         this.referenceUUID = referenceUUID;
     }
 
+    ReferenceUUID(){}
+
     public String getReferenceUUID() {
         return referenceUUID;
     }
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/VfcmtData.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/VfcmtData.java
index 6c7a65e..e0a038a 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/VfcmtData.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/VfcmtData.java
@@ -1,14 +1,14 @@
 package org.onap.sdc.dcae.composition.restmodels;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.onap.sdc.dcae.composition.restmodels.sdc.ResourceDetailed;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class VfcmtData extends MonitoringComponent {
 
 	private String flowType;
 	private String serviceUuid;
 
-	private String invariantUUID;
-
 	public VfcmtData(ResourceDetailed vfcmt) {
 		setUuid(vfcmt.getUuid());
 		setName(vfcmt.getName());
@@ -28,6 +28,8 @@ public class VfcmtData extends MonitoringComponent {
 		setServiceUuid(serviceUuid);
 	}
 
+	VfcmtData(){}
+
 	public String getFlowType() {
 		return flowType;
 	}
@@ -44,13 +46,4 @@ public class VfcmtData extends MonitoringComponent {
 		this.serviceUuid = serviceUuid;
 	}
 
-	public String getInvariantUUID() {
-		return invariantUUID;
-	}
-
-	public void setInvariantUUID(String invariantUUID) {
-		this.invariantUUID = invariantUUID;
-	}
-
-
 }
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequest.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequest.java
index eba446e..1c08a73 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequest.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequest.java
@@ -35,4 +35,6 @@ public class ApplyFilterRequest extends TranslateRequest {
 		super(vfcmtUuid, dcaeCompLabel, nid, configParam, notifyId, entryPhase, publishPhase);
 		this.filter = filter;
 	}
+
+	ApplyFilterRequest(){}
 }
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUI.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUI.java
index 667eb03..4b2139f 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUI.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUI.java
@@ -24,27 +24,45 @@ public class EventTypeDefinitionUI {
 				.collect(Collectors.toList());
 	}
 
+	EventTypeDefinitionUI(){}
+
 	public String getName() {
 		return name;
 	}
 
+	public void setName(String name) {
+		this.name = name;
+	}
 
 	public List<EventTypeDefinitionUI> getChildren() {
 		return children;
 	}
 
+	public void setChildren(List<EventTypeDefinitionUI> children) {
+		this.children = children;
+	}
 
 	public Boolean getIsRequired() {
 		return isRequired;
 	}
 
+	public void setIsRequired(Boolean isRequired) {
+		this.isRequired = isRequired;
+	}
 
 	public List<String> getRequiredChildren() {
 		return requiredChildren;
 	}
 
+	public void setRequiredChildren(List<String> requiredChildren) {
+		this.requiredChildren = requiredChildren;
+	}
 
 	public String getId() {
 		return id;
 	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
 }
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUI.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUI.java
index ed77144..56ac7d9 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUI.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUI.java
@@ -10,7 +10,9 @@ public class EventTypesByVersionUI {
 	
 	private String version;
 	private Set<String> eventTypes;
-	
+
+	EventTypesByVersionUI(){}
+
 	public EventTypesByVersionUI(String version, Set<String> eventTypes) {
 		super();
 		this.version = version;
@@ -24,5 +26,13 @@ public class EventTypesByVersionUI {
 	public Set<String> getEventTypes() {
 		return eventTypes;
 	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public void setEventTypes(Set<String> eventTypes) {
+		this.eventTypes = eventTypes;
+	}
 	
 }
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequest.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequest.java
index 985b53d..445f081 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequest.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequest.java
@@ -8,15 +8,6 @@ public class ImportPhaseRequest extends RuleEditorRequest {
 	private String eventType;
 	private MappingRulesResponse payload;
 
-//	public ImportPhaseRequest(String vfcmtUuid, String dcaeCompLabel, String nid, String configParam, String groupId, String phase, String version, String eventType) {
-//		super(vfcmtUuid, dcaeCompLabel, nid, configParam);
-//		this.groupId = groupId;
-//		this.phase = phase;
-//		// validation performed against selected VES version/eventType
-//		this.version = version;
-//		this.eventType = eventType;
-//	}
-
 	public String getGroupId() {
 		return groupId;
 	}
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventAction.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventAction.java
index e3ccd44..909e6c9 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventAction.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventAction.java
@@ -28,6 +28,10 @@ public class LogEventAction extends BaseAction {
 		return logEvent;
 	}
 
+	public void setLogEvent(LogEvent logEvent) {
+		this.logEvent = logEvent;
+	}
+
 	public String logTitle() {
 		return logEvent.title;
 	}
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextAction.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextAction.java
index 16d2a9a..97f3744 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextAction.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextAction.java
@@ -45,6 +45,10 @@ public class LogTextAction extends BaseAction {
 		return logText;
 	}
 
+	public void setLogText(LogText logText) {
+		this.logText = logText;
+	}
+
 	public String logName() {
 		return logText.name;
 	}
diff --git a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextAction.java b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextAction.java
index 5594d73..f765563 100644
--- a/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextAction.java
+++ b/src/main/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextAction.java
@@ -40,6 +40,10 @@ public class ReplaceTextAction extends UnaryFieldAction {
 		return replaceText;
 	}
 
+	public void setReplaceText(ReplaceText replaceText) {
+		this.replaceText = replaceText;
+	}
+
 	public String find() {
 		return replaceText.find;
 	}
diff --git a/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java b/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java
new file mode 100644
index 0000000..6488739
--- /dev/null
+++ b/src/test/java/org/onap/sdc/common/onaplog/OnapLoggerAuditTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.common.onaplog;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class OnapLoggerAuditTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(OnapLoggerAudit.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/AssignmentTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/AssignmentTest.java
new file mode 100644
index 0000000..354f921
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/AssignmentTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class AssignmentTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Assignment.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/CapabilityTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/CapabilityTest.java
new file mode 100644
index 0000000..7a3267d
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/CapabilityTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class CapabilityTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Capability.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/Capability_Test.java b/src/test/java/org/onap/sdc/dcae/composition/model/Capability_Test.java
new file mode 100644
index 0000000..6509665
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/Capability_Test.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class Capability_Test {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Capability_.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/Capability__Test.java b/src/test/java/org/onap/sdc/dcae/composition/model/Capability__Test.java
new file mode 100644
index 0000000..c0f1781
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/Capability__Test.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class Capability__Test {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Capability__.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/DataTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/DataTest.java
new file mode 100644
index 0000000..3ad2dc9
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/DataTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class DataTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Data.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/DcaeCapabilitiesStreamSubscribeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/DcaeCapabilitiesStreamSubscribeTest.java
new file mode 100644
index 0000000..02f8caf
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/DcaeCapabilitiesStreamSubscribeTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class DcaeCapabilitiesStreamSubscribeTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(DcaeCapabilitiesStreamSubscribe.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/FormatTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/FormatTest.java
new file mode 100644
index 0000000..2068c41
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/FormatTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class FormatTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Format.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/ModelDcaeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/ModelDcaeTest.java
new file mode 100644
index 0000000..07a77ae
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/ModelDcaeTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ModelDcaeTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ModelDcae.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/ModelTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/ModelTest.java
new file mode 100644
index 0000000..fdc9d71
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/ModelTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ModelTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Model.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/NodeFilterTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/NodeFilterTest.java
new file mode 100644
index 0000000..890bc98
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/NodeFilterTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class NodeFilterTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(NodeFilter.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/NodeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/NodeTest.java
new file mode 100644
index 0000000..836e6a8
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/NodeTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class NodeTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Node.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/PropertyTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/PropertyTest.java
new file mode 100644
index 0000000..3b15085
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/PropertyTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class PropertyTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Property.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/Property_Test.java b/src/test/java/org/onap/sdc/dcae/composition/model/Property_Test.java
new file mode 100644
index 0000000..d2ec1e3
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/Property_Test.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class Property_Test {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Property_.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/RelationshipTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/RelationshipTest.java
new file mode 100644
index 0000000..4a5ed0f
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/RelationshipTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class RelationshipTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Relationship.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/RequirementTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/RequirementTest.java
new file mode 100644
index 0000000..51d8fce
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/RequirementTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class RequirementTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Requirement.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/TypeTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/TypeTest.java
new file mode 100644
index 0000000..0027964
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/TypeTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class TypeTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Type.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/ValueTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/ValueTest.java
new file mode 100644
index 0000000..32ebcae
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/ValueTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ValueTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Value.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/model/VersionTest.java b/src/test/java/org/onap/sdc/dcae/composition/model/VersionTest.java
new file mode 100644
index 0000000..194fee0
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/model/VersionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.model;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class VersionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Version.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/AttachVFCMTServiceRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/AttachVFCMTServiceRequestTest.java
new file mode 100644
index 0000000..c0001fb
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/AttachVFCMTServiceRequestTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class AttachVFCMTServiceRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(AttachVFCMTServiceRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionRequestTest.java
new file mode 100644
index 0000000..c3ec5c1
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionRequestTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class CompositionRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(CompositionRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionTest.java
new file mode 100644
index 0000000..198990a
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CompositionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class CompositionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Composition.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponseTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponseTest.java
new file mode 100644
index 0000000..15fab6c
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateMcResponseTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class CreateMcResponseTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(CreateMcResponse.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateVFCMTRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateVFCMTRequestTest.java
new file mode 100644
index 0000000..4299cd0
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/CreateVFCMTRequestTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class CreateVFCMTRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(CreateVFCMTRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ImportVFCMTRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ImportVFCMTRequestTest.java
new file mode 100644
index 0000000..7582d7a
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ImportVFCMTRequestTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ImportVFCMTRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ImportVFCMTRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/MessageResponseTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MessageResponseTest.java
new file mode 100644
index 0000000..7fceb2a
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MessageResponseTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class MessageResponseTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(MessageResponse.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponentTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponentTest.java
new file mode 100644
index 0000000..5fecbd8
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/MonitoringComponentTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class MonitoringComponentTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(MonitoringComponent.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUIDTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUIDTest.java
new file mode 100644
index 0000000..60b653a
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ReferenceUUIDTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ReferenceUUIDTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ReferenceUUID.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/VfcmtDataTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/VfcmtDataTest.java
new file mode 100644
index 0000000..836f30a
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/VfcmtDataTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class VfcmtDataTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(VfcmtData.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/DcaeComponentCatalogTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/DcaeComponentCatalogTest.java
new file mode 100644
index 0000000..2f02550
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/canvas/DcaeComponentCatalogTest.java
@@ -0,0 +1,17 @@
+package org.onap.sdc.dcae.composition.restmodels.canvas;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+
+
+public class DcaeComponentCatalogTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(DcaeComponentCatalog.class, hasValidGettersAndSetters());
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/ComponentsInfoTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/ComponentsInfoTest.java
new file mode 100644
index 0000000..19a748b
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/ComponentsInfoTest.java
@@ -0,0 +1,15 @@
+package org.onap.sdc.dcae.composition.restmodels.health;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ComponentsInfoTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ComponentsInfo.class, hasValidGettersAndSetters());
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/HealthResponseTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/HealthResponseTest.java
new file mode 100644
index 0000000..c1616e3
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/health/HealthResponseTest.java
@@ -0,0 +1,15 @@
+package org.onap.sdc.dcae.composition.restmodels.health;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+
+public class HealthResponseTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(HealthResponse.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequestTest.java
new file mode 100644
index 0000000..dd88ada
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ApplyFilterRequestTest.java
@@ -0,0 +1,15 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+
+public class ApplyFilterRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ApplyFilterRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/BaseCopyActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/BaseCopyActionTest.java
new file mode 100644
index 0000000..e21875c
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/BaseCopyActionTest.java
@@ -0,0 +1,15 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+
+public class BaseCopyActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(BaseCopyAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionGroupTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionGroupTest.java
new file mode 100644
index 0000000..883e8c9
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionGroupTest.java
@@ -0,0 +1,15 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+
+public class ConditionGroupTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ConditionGroup.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionTest.java
new file mode 100644
index 0000000..191e10e
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ConditionTest.java
@@ -0,0 +1,15 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+
+public class ConditionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Condition.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUITest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUITest.java
new file mode 100644
index 0000000..28fd2c6
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypeDefinitionUITest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class EventTypeDefinitionUITest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(EventTypeDefinitionUI.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUITest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUITest.java
new file mode 100644
index 0000000..0b7a692
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/EventTypesByVersionUITest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class EventTypesByVersionUITest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(EventTypesByVersionUI.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/HpMetricActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/HpMetricActionTest.java
new file mode 100644
index 0000000..130e418
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/HpMetricActionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class HpMetricActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(HpMetricAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequestTest.java
new file mode 100644
index 0000000..45d7556
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ImportPhaseRequestTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ImportPhaseRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ImportPhaseRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventActionTest.java
new file mode 100644
index 0000000..d17085d
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogEventActionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class LogEventActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(LogEventAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextActionTest.java
new file mode 100644
index 0000000..b55138e
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/LogTextActionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class LogTextActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(LogTextAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextActionTest.java
new file mode 100644
index 0000000..2b6c9ee
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/ReplaceTextActionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ReplaceTextActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ReplaceTextAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/RuleEditorRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/RuleEditorRequestTest.java
new file mode 100644
index 0000000..b50309d
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/RuleEditorRequestTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class RuleEditorRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(RuleEditorRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/SchemaInfoTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/SchemaInfoTest.java
new file mode 100644
index 0000000..ece2dbc
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/SchemaInfoTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class SchemaInfoTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(SchemaInfo.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/StringTransformActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/StringTransformActionTest.java
new file mode 100644
index 0000000..f7f5a80
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/StringTransformActionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class StringTransformActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(StringTransformAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TopoSearchActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TopoSearchActionTest.java
new file mode 100644
index 0000000..f7dc312
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TopoSearchActionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class TopoSearchActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(TopoSearchAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TranslateRequestTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TranslateRequestTest.java
new file mode 100644
index 0000000..2a4b2b7
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/TranslateRequestTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class TranslateRequestTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(TranslateRequest.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/UnaryFieldActionTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/UnaryFieldActionTest.java
new file mode 100644
index 0000000..de827f9
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/ruleeditor/UnaryFieldActionTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.ruleeditor;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class UnaryFieldActionTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(UnaryFieldAction.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ArtifactTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ArtifactTest.java
new file mode 100644
index 0000000..19b5abb
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ArtifactTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ArtifactTest {
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Artifact.class, hasValidGettersAndSetters());
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DataTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DataTest.java
new file mode 100644
index 0000000..8c3ab0f
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DataTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class DataTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Data.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DcaeComponentsTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DcaeComponentsTest.java
new file mode 100644
index 0000000..7718f82
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/DcaeComponentsTest.java
@@ -0,0 +1,16 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+
+public class DcaeComponentsTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(DcaeComponents.class, hasValidGettersAndSetters());
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ElementTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ElementTest.java
new file mode 100644
index 0000000..73def57
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ElementTest.java
@@ -0,0 +1,15 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ElementTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Element.class, hasValidGettersAndSetters());
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ItemTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ItemTest.java
new file mode 100644
index 0000000..905a438
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ItemTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ItemTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Item.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ModelTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ModelTest.java
new file mode 100644
index 0000000..7c470b5
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ModelTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ModelTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Model.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceDetailedTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceDetailedTest.java
new file mode 100644
index 0000000..bb5719d
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceDetailedTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ResourceDetailedTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ResourceDetailed.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceInstanceTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceInstanceTest.java
new file mode 100644
index 0000000..0f702c9
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceInstanceTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ResourceInstanceTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ResourceInstance.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceTest.java
new file mode 100644
index 0000000..8a66ac9
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ResourceTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ResourceTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Resource.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceDetailedTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceDetailedTest.java
new file mode 100644
index 0000000..ec646c1
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceDetailedTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ServiceDetailedTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ServiceDetailed.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceTest.java b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceTest.java
new file mode 100644
index 0000000..c37919b
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/restmodels/sdc/ServiceTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.restmodels.sdc;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ServiceTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Service.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ArtifactTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ArtifactTest.java
new file mode 100644
index 0000000..0af27a5
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ArtifactTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.services;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ArtifactTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Artifact.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ModelTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ModelTest.java
new file mode 100644
index 0000000..14ac7a8
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ModelTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.services;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ModelTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Model.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ResourceTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ResourceTest.java
new file mode 100644
index 0000000..e1415f4
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ResourceTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.services;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ResourceTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Resource.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ServiceTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ServiceTest.java
new file mode 100644
index 0000000..c633743
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ServiceTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.services;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ServiceTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Service.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/services/ThinServiceTest.java b/src/test/java/org/onap/sdc/dcae/composition/services/ThinServiceTest.java
new file mode 100644
index 0000000..7c3d06e
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/services/ThinServiceTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.services;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class ThinServiceTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(ThinService.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/sdc/dcae/composition/vfcmt/VfcmtTest.java b/src/test/java/org/onap/sdc/dcae/composition/vfcmt/VfcmtTest.java
new file mode 100644
index 0000000..589fd64
--- /dev/null
+++ b/src/test/java/org/onap/sdc/dcae/composition/vfcmt/VfcmtTest.java
@@ -0,0 +1,14 @@
+package org.onap.sdc.dcae.composition.vfcmt;
+
+import org.junit.Test;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.*;
+
+public class VfcmtTest {
+
+	@Test
+	public void shouldHaveValidGettersAndSetters() {
+		assertThat(Vfcmt.class, hasValidGettersAndSetters());
+	}
+}
\ No newline at end of file