Fix unit tests

Add asserts where required, fix tiny issues.

Replace getters-setters with Lombok annotations.

Change-Id: Icb1a20f400fd8732a3d0ae23b8fe88bc693df1f5
Issue-ID: SDC-2853
Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>

1 files changed, 5 insertions, 13 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java
index 9687a4084a..70bfd60751 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java
@@ -21,28 +21,20 @@
 package org.openecomp.sdc.be.impl;
 
 import com.google.gson.Gson;
+import lombok.Getter;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
 @Component("servletUtils")
+@Getter
 public class ServletUtils {
     @Resource
     private ComponentsUtils componentsUtils;
-    private Gson gson = new Gson();
-    @Resource
-    private UserBusinessLogic adminManager;
-
-    public ComponentsUtils getComponentsUtils() {
-        return componentsUtils;
-    }
 
-    public Gson getGson() {
-        return gson;
-    }
+    private Gson gson = new Gson();
 
-    public UserBusinessLogic getUserAdmin() {
-        return adminManager;
-    }
+    @Resource
+    private UserBusinessLogic userAdmin;
 }