update sdc portal integration

[sdc.git] / test-apis-ci / src / main / java / org / openecomp / sdc / ci / tests / utils / rest / EcompUserRestUtils.java

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java
index 458aa4a..b3a25fd 100644 (file)
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java
@@ -20,13 +20,9 @@
 
 package org.openecomp.sdc.ci.tests.utils.rest;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.portalsdk.core.restful.domain.EcompRole;
-import org.openecomp.portalsdk.core.restful.domain.EcompUser;
+import com.google.gson.Gson;
+import org.onap.portalsdk.core.restful.domain.EcompRole;
+import org.onap.portalsdk.core.restful.domain.EcompUser;
 import org.openecomp.sdc.ci.tests.api.Urls;
 import org.openecomp.sdc.ci.tests.config.Config;
 import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
@@ -37,15 +33,16 @@ import org.openecomp.sdc.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.Gson;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class EcompUserRestUtils extends BaseRestUtils {
 
        static Gson gson = new Gson();
 
        static Logger logger = LoggerFactory.getLogger(EcompUserRestUtils.class.getName());
-       static String contentTypeHeaderData = "application/json";
-       static String acceptHeaderDate = "application/json";
        static String ecompUsername = "12345";
        static String ecompPassword = "12345";
 
@@ -58,9 +55,9 @@ public class EcompUserRestUtils extends BaseRestUtils {
        public static RestResponse pushUser(EcompUser ecompUser) throws IOException {
                Config config = Utils.getConfig();
 
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+               Map<String, String> headersMap = new HashMap<>();
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -84,9 +81,9 @@ public class EcompUserRestUtils extends BaseRestUtils {
        public static RestResponse editUser(String loginId, EcompUser ecompUser) throws IOException {
                Config config = Utils.getConfig();
 
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+               Map<String, String> headersMap = new HashMap<>();
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -110,9 +107,9 @@ public class EcompUserRestUtils extends BaseRestUtils {
        public static RestResponse getUser(String loginId) throws IOException {
                Config config = Utils.getConfig();
 
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+               Map<String, String> headersMap = new HashMap<>();
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -130,9 +127,9 @@ public class EcompUserRestUtils extends BaseRestUtils {
        public static RestResponse getAllUsers() throws IOException {
                Config config = Utils.getConfig();
 
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+               Map<String, String> headersMap = new HashMap<>();
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -150,9 +147,9 @@ public class EcompUserRestUtils extends BaseRestUtils {
        public static RestResponse getAllAvailableRoles() throws IOException {
                Config config = Utils.getConfig();
 
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+               Map<String, String> headersMap = new HashMap<>();
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -174,9 +171,9 @@ public class EcompUserRestUtils extends BaseRestUtils {
        public static RestResponse pushUserRoles(String loginId, List<EcompRole> roles) throws IOException {
                Config config = Utils.getConfig();
 
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+               Map<String, String> headersMap = new HashMap<>();
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -204,9 +201,9 @@ public class EcompUserRestUtils extends BaseRestUtils {
        public static RestResponse getUserRoles(String loginId) throws IOException {
                Config config = Utils.getConfig();
 
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderDate);
+               Map<String, String> headersMap = new HashMap<>();
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);