From 58374a11765080f77ab0c14460abe0425aac79a6 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Sat, 27 Apr 2024 01:09:36 +0200
Subject: [PATCH] JsonConverterTest @Isolated as it not suitable for any
 parallel test because the test changes global static JsonConverter settings

---
 .../thingsboard/server/common/adaptor/JsonConverter.java | 4 ++--
 .../server/common/adaptor/JsonConverterTest.java         | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java b/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java
index 72ae3a0871..7cfef02873 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java
@@ -590,11 +590,11 @@ public class JsonConverter {
         return GSON.fromJson(element, type);
     }
 
-    public static void setTypeCastEnabled(boolean enabled) {
+    static void setTypeCastEnabled(boolean enabled) {
         isTypeCastEnabled = enabled;
     }
 
-    public static void setMaxStringValueLength(int length) {
+    static void setMaxStringValueLength(int length) {
         maxStringValueLength = length;
     }
 
diff --git a/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java b/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java
index 61f0665a3a..04f911cdf9 100644
--- a/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java
+++ b/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java
@@ -17,12 +17,15 @@ package org.thingsboard.server.common.adaptor;
 
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import java.util.ArrayList;
 
+@Isolated("JsonConverter static settings being modified")
 public class JsonConverterTest {
 
     @BeforeEach
@@ -30,6 +33,12 @@ public class JsonConverterTest {
         JsonConverter.setTypeCastEnabled(true);
     }
 
+    @AfterEach
+    public void after() {
+        //restore default state for a static class
+        JsonConverter.setTypeCastEnabled(true);
+    }
+
     @Test
     public void testParseBigDecimalAsLong() {
         var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1E+1}"), 0L);