From d14466459d70cbef19caa7aa1ea6c127583f6c04 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Mon, 13 Oct 2025 16:35:57 +0300
Subject: [PATCH] refactoring

---
 .../service/ai/AiChatModelServiceImpl.java      | 17 ++++++-----------
 .../server/common/data/StringUtils.java         |  7 +++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java
index 29d4a148fd..c1829cbf84 100644
--- a/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java
@@ -32,6 +32,8 @@ import org.thingsboard.server.common.data.ai.model.chat.Langchain4jChatModelConf
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.common.data.StringUtils.escapeControlChars;
+
 @Service
 @RequiredArgsConstructor
 class AiChatModelServiceImpl implements AiChatModelService {
@@ -50,7 +52,7 @@ class AiChatModelServiceImpl implements AiChatModelService {
 
     private ChatRequest prepareGithubChatRequest(ChatRequest chatRequest) {
         List<ChatMessage> messages = chatRequest.messages().stream()
-                        .map(this::escapeIfUserMessage)
+                        .map(this::prepareUserMessage)
                         .collect(Collectors.toList());
 
         return ChatRequest.builder()
@@ -59,10 +61,10 @@ class AiChatModelServiceImpl implements AiChatModelService {
                 .build();
     }
 
-    private ChatMessage escapeIfUserMessage(ChatMessage message) {
+    private ChatMessage prepareUserMessage(ChatMessage message) {
         if (message instanceof UserMessage userMessage) {
             List<Content> newContents = userMessage.contents().stream()
-                    .map(this::escapeContent)
+                    .map(this::prepareContent)
                     .collect(Collectors.toList());
 
             return UserMessage.from(newContents);
@@ -70,18 +72,11 @@ class AiChatModelServiceImpl implements AiChatModelService {
         return message;
     }
 
-    private Content escapeContent(Content content) {
+    private Content prepareContent(Content content) {
         if (content instanceof TextContent txt) {
             return new TextContent(escapeControlChars(txt.text()));
         }
         return content;
     }
 
-    private String escapeControlChars(String text) {
-        return text
-                .replace("\n", "\\n")
-                .replace("\r", "\\r")
-                .replace("\t", "\\t");
-    }
-
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
index cbc881d72f..2b8b631027 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
@@ -275,4 +275,11 @@ public class StringUtils {
         return result;
     }
 
+    public static String escapeControlChars(String text) {
+        return text
+                .replace("\n", "\\n")
+                .replace("\r", "\\r")
+                .replace("\t", "\\t");
+    }
+
 }