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
new file mode 100644
index 0000000000..cbe7094715
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data;
+
+public class StringUtils {
+
+    public static boolean isEmpty(String source) {
+        return source == null || source.isEmpty();
+    }
+
+    public static boolean isNotEmpty(String source) {
+        return source != null && !source.isEmpty();
+    }
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEvent.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEvent.java
index 0e5bcbd015..a95949acbd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEvent.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEvent.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.event;
 
 import lombok.Data;
-import org.eclipse.leshan.core.util.StringUtils;
+import org.thingsboard.server.common.data.StringUtils;
 
 @Data
 public abstract class DebugEvent implements EventFilter {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java
index 59e6297a47..c9e9886c64 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.event;
 
 import lombok.Data;
-import org.eclipse.leshan.core.util.StringUtils;
+import org.thingsboard.server.common.data.StringUtils;
 
 @Data
 public class ErrorEventFilter implements EventFilter {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/LifeCycleEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/LifeCycleEventFilter.java
index 4936a83e3c..a871ccb106 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/LifeCycleEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/LifeCycleEventFilter.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.event;
 
 import lombok.Data;
-import org.eclipse.leshan.core.util.StringUtils;
+import org.thingsboard.server.common.data.StringUtils;
 
 @Data
 public class LifeCycleEventFilter implements EventFilter {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java
index 0d28ea27e9..9fad8b4bca 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.event;
 
 import lombok.Data;
-import org.eclipse.leshan.core.util.StringUtils;
+import org.thingsboard.server.common.data.StringUtils;
 
 @Data
 public class StatisticsEventFilter implements EventFilter {