From 34b4aeac4933e825b3ea1149356fce8c10bc6f46 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Mon, 13 Dec 2021 15:52:48 +0200 Subject: [PATCH] added code defaults sql.remove_null_chars=true (same as thingsboard.yaml) to simplify test setup --- .../server/dao/sql/attributes/AttributeKvInsertRepository.java | 2 +- .../server/dao/sqlts/insert/AbstractInsertRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvInsertRepository.java index 84688be9c9..8390860826 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvInsertRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvInsertRepository.java @@ -56,7 +56,7 @@ public abstract class AttributeKvInsertRepository { @Autowired private TransactionTemplate transactionTemplate; - @Value("${sql.remove_null_chars}") + @Value("${sql.remove_null_chars:true}") private boolean removeNullChars; protected void saveOrUpdate(List entities) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/insert/AbstractInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/insert/AbstractInsertRepository.java index 77c59c5f21..490293860c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/insert/AbstractInsertRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/insert/AbstractInsertRepository.java @@ -29,7 +29,7 @@ public abstract class AbstractInsertRepository { private static final ThreadLocal PATTERN_THREAD_LOCAL = ThreadLocal.withInitial(() -> Pattern.compile(String.valueOf(Character.MIN_VALUE))); private static final String EMPTY_STR = ""; - @Value("${sql.remove_null_chars}") + @Value("${sql.remove_null_chars:true}") private boolean removeNullChars; @Autowired