From e11b5ffedd381f94a11f8f1e02df2cf62ad4aed6 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Fri, 11 Nov 2022 12:33:16 +0200
Subject: [PATCH] refactoring

---
 .../thingsboard/server/msa/AbstractContainerTest.java  |  2 --
 .../org/thingsboard/server/msa/TestRestClient.java     | 10 +++++-----
 .../server/msa/connectivity/MqttGatewayClientTest.java |  1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java
index d647a6d927..a148d7d138 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java
@@ -19,7 +19,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
@@ -40,7 +39,6 @@ import java.util.Random;
 public abstract class AbstractContainerTest {
     protected static long timeoutMultiplier = 1;
     protected ObjectMapper mapper = new ObjectMapper();
-    protected JsonParser jsonParser = new JsonParser();
     private static final ContainerTestSuite containerTestSuite = ContainerTestSuite.getInstance();
     protected static TestRestClient testRestClient;
 
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
index a83913f842..713205e228 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
@@ -51,7 +51,7 @@ import static org.thingsboard.server.common.data.StringUtils.isEmpty;
 
 public class TestRestClient {
     private static final String JWT_TOKEN_HEADER_PARAM = "X-Authorization";
-    private final String baseURL;
+    private static final String CONTENT_TYPE_HEADER = "Content-Type";
     private final RequestSpecification requestSpec;
     private String token;
     private String refreshToken;
@@ -59,12 +59,11 @@ public class TestRestClient {
     public TestRestClient(String url) {
         RestAssured.filters(new RequestLoggingFilter(), new ResponseLoggingFilter());
 
-        baseURL = url;
-        requestSpec = given().baseUri(baseURL)
+        requestSpec = given().baseUri(url)
                 .contentType(ContentType.JSON)
                 .config(RestAssuredConfig.config()
                         .headerConfig(HeaderConfig.headerConfig()
-                                .overwriteHeadersWithName(JWT_TOKEN_HEADER_PARAM)));
+                                .overwriteHeadersWithName(JWT_TOKEN_HEADER_PARAM, CONTENT_TYPE_HEADER)));
 
         if (url.matches("^(https)://.*$")) {
             requestSpec.relaxedHTTPSValidation();
@@ -76,7 +75,8 @@ public class TestRestClient {
         loginRequest.put("username", username);
         loginRequest.put("password", password);
 
-        JsonPath jsonPath = given().relaxedHTTPSValidation().body(loginRequest).post(baseURL + "/api/auth/login")
+        JsonPath jsonPath = given().spec(requestSpec).body(loginRequest)
+                .post( "/api/auth/login")
                 .getBody().jsonPath();
         token = jsonPath.get("token");
         refreshToken = jsonPath.get("refreshToken");
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java
index c97214e18c..84b2dd7253 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java
@@ -72,6 +72,7 @@ public class MqttGatewayClientTest extends AbstractContainerTest {
     private MqttClient mqttClient;
     private Device createdDevice;
     private MqttMessageListener listener;
+    private JsonParser jsonParser = new JsonParser();
 
     @BeforeMethod
     public void createGateway() throws Exception {