2 files changed, 22 insertions, 21 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java
index 7bff3d5b77..703533d8af 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java
@@ -19,10 +19,15 @@
  */
 package org.openecomp.sdcrests.wrappers;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+@Getter
+@Setter
 public class GenericCollectionWrapper<T> implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -47,22 +52,6 @@ public class GenericCollectionWrapper<T> implements Serializable {
         }
     }
 
-    public List<T> getResults() {
-        return results;
-    }
-
-    public void setResults(List<T> results) {
-        this.results = results;
-    }
-
-    public int getListCount() {
-        return listCount;
-    }
-
-    public void setListCount(int listCount) {
-        this.listCount = listCount;
-    }
-
     /**
      * Add boolean.
      *
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java
index 86d0257eeb..231c834294 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java
@@ -19,16 +19,28 @@
  */
 package org.openecomp.sdcrests.wrappers;
 
+import org.junit.jupiter.api.Test;
 
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import java.util.LinkedList;
+import java.util.List;
 
 public class GenericCollectionWrapperTest {
 
     @Test
-    public void shouldHaveValidGettersAndSetters() {
-        assertThat(GenericCollectionWrapper.class, hasValidGettersAndSetters());
+    public void addTest() {
+        GenericCollectionWrapper wrapper = new GenericCollectionWrapper(new LinkedList());
+        assertTrue(wrapper.add("test"));
+        assertEquals(1, wrapper.getResults().size());
+        assertEquals(1, wrapper.getListCount());
+
+        List<Integer> list = new LinkedList<>();
+        list.add(1);
+        GenericCollectionWrapper wrapper2 = new GenericCollectionWrapper(list);
+        assertTrue(wrapper2.add("test"));
+        assertEquals(2, wrapper2.getResults().size());
+        assertEquals(2, wrapper2.getListCount());
     }
 }
\ No newline at end of file