moved DataValidationException to data package

thingsboard · Jan 22, 2025 · abbccce · abbccce
1 parent 38b2812
commit abbccce
Show file tree

Hide file tree

Showing 30 changed files with 42 additions and 42 deletions.
diff --git a/...in/java/org/thingsboard/mqtt/broker/actors/client/service/connect/ConnectServiceImpl.java b/...in/java/org/thingsboard/mqtt/broker/actors/client/service/connect/ConnectServiceImpl.java
@@ -45,8 +45,8 @@
 import org.thingsboard.mqtt.broker.common.data.SessionInfo;
 import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.util.ThingsBoardExecutors;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.exception.ConnectionValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.exception.MqttException;
 import org.thingsboard.mqtt.broker.queue.cluster.ServiceInfoProvider;
 import org.thingsboard.mqtt.broker.service.limits.RateLimitService;

diff --git a/...n/java/org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttPublishHandler.java b/...n/java/org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttPublishHandler.java
@@ -33,7 +33,7 @@
 import org.thingsboard.mqtt.broker.actors.client.state.OrderedProcessingQueue;
 import org.thingsboard.mqtt.broker.common.data.MqttQoS;
 import org.thingsboard.mqtt.broker.common.util.ThingsBoardExecutors;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.exception.FullMsgQueueException;
 import org.thingsboard.mqtt.broker.exception.MqttException;
 import org.thingsboard.mqtt.broker.exception.NotSupportedQoSLevelException;

diff --git a/...java/org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttSubscribeHandler.java b/...java/org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttSubscribeHandler.java
@@ -25,15 +25,15 @@
 import org.thingsboard.mqtt.broker.actors.client.messages.mqtt.MqttSubscribeMsg;
 import org.thingsboard.mqtt.broker.actors.client.service.subscription.ClientSubscriptionService;
 import org.thingsboard.mqtt.broker.common.data.ApplicationSharedSubscription;
+import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.ClientType;
-import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.data.mqtt.MsgExpiryResult;
 import org.thingsboard.mqtt.broker.common.data.subscription.TopicSubscription;
 import org.thingsboard.mqtt.broker.common.data.util.CallbackUtil;
-import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
+import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.dao.client.application.ApplicationSharedSubscriptionService;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.topic.TopicValidationService;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.service.auth.AuthorizationRuleService;
 import org.thingsboard.mqtt.broker.service.limits.RateLimitService;
 import org.thingsboard.mqtt.broker.service.mqtt.MqttMessageGenerator;

diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/controller/BaseController.java b/application/src/main/java/org/thingsboard/mqtt/broker/controller/BaseController.java
@@ -27,6 +27,7 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.UnauthorizedClient;
 import org.thingsboard.mqtt.broker.common.data.User;
 import org.thingsboard.mqtt.broker.common.data.exception.ThingsboardErrorCode;
@@ -35,14 +36,13 @@
 import org.thingsboard.mqtt.broker.common.data.page.SortOrder;
 import org.thingsboard.mqtt.broker.common.data.page.TimePageLink;
 import org.thingsboard.mqtt.broker.common.data.security.MqttClientCredentials;
-import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.dao.client.MqttClientCredentialsService;
 import org.thingsboard.mqtt.broker.dao.client.unauthorized.UnauthorizedClientService;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.exception.IncorrectParameterException;
 import org.thingsboard.mqtt.broker.dao.user.UserService;
 import org.thingsboard.mqtt.broker.dto.RetainedMsgDto;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.exception.ThingsboardErrorResponseHandler;
 import org.thingsboard.mqtt.broker.queue.TbQueueAdmin;
 import org.thingsboard.mqtt.broker.service.mqtt.client.cleanup.ClientSessionCleanUpService;

diff --git a/...va/org/thingsboard/mqtt/broker/service/security/auth/rest/RestAuthenticationProvider.java b/...va/org/thingsboard/mqtt/broker/service/security/auth/rest/RestAuthenticationProvider.java
@@ -30,8 +30,8 @@
 import org.thingsboard.mqtt.broker.common.data.security.UserCredentials;
 import org.thingsboard.mqtt.broker.common.data.security.model.SecuritySettings;
 import org.thingsboard.mqtt.broker.common.data.security.model.UserPasswordPolicy;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.user.UserService;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.service.security.exception.UserPasswordNotValidException;
 import org.thingsboard.mqtt.broker.service.security.model.SecurityUser;
 import org.thingsboard.mqtt.broker.service.security.model.UserPrincipal;

diff --git a/...ava/org/thingsboard/mqtt/broker/service/security/system/DefaultSystemSecurityService.java b/...ava/org/thingsboard/mqtt/broker/service/security/system/DefaultSystemSecurityService.java
@@ -34,16 +34,16 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.thingsboard.mqtt.broker.common.data.AdminSettings;
-import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.data.User;
 import org.thingsboard.mqtt.broker.common.data.security.UserCredentials;
 import org.thingsboard.mqtt.broker.common.data.security.model.SecuritySettings;
 import org.thingsboard.mqtt.broker.common.data.security.model.UserPasswordPolicy;
+import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.util.JacksonUtil;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.settings.AdminSettingsService;
 import org.thingsboard.mqtt.broker.dao.user.UserService;
 import org.thingsboard.mqtt.broker.dao.user.UserServiceImpl;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.service.security.exception.UserPasswordExpiredException;
 import org.thingsboard.mqtt.broker.util.MiscUtils;
 

diff --git a/.../main/java/org/thingsboard/mqtt/broker/service/security/system/SystemSecurityService.java b/.../main/java/org/thingsboard/mqtt/broker/service/security/system/SystemSecurityService.java
@@ -20,7 +20,7 @@
 import org.thingsboard.mqtt.broker.common.data.security.UserCredentials;
 import org.thingsboard.mqtt.broker.common.data.security.model.SecuritySettings;
 import org.thingsboard.mqtt.broker.common.data.security.model.UserPasswordPolicy;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 public interface SystemSecurityService {
 

diff --git a/...ava/org/thingsboard/mqtt/broker/actors/client/service/connect/ConnectServiceImplTest.java b/...ava/org/thingsboard/mqtt/broker/actors/client/service/connect/ConnectServiceImplTest.java
@@ -39,7 +39,7 @@
 import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.ClientType;
 import org.thingsboard.mqtt.broker.common.data.SessionInfo;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.queue.cluster.ServiceInfoProvider;
 import org.thingsboard.mqtt.broker.service.limits.RateLimitService;
 import org.thingsboard.mqtt.broker.service.mqtt.MqttMessageGenerator;

diff --git a/...va/org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttPublishHandlerTest.java b/...va/org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttPublishHandlerTest.java
@@ -33,7 +33,7 @@
 import org.thingsboard.mqtt.broker.actors.client.messages.mqtt.MqttPublishMsg;
 import org.thingsboard.mqtt.broker.actors.client.state.MqttMsgWrapper;
 import org.thingsboard.mqtt.broker.actors.client.state.PubResponseProcessingCtx;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.exception.MqttException;
 import org.thingsboard.mqtt.broker.service.analysis.ClientLogger;
 import org.thingsboard.mqtt.broker.service.mqtt.MqttMessageGenerator;

diff --git a/.../org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttSubscribeHandlerTest.java b/.../org/thingsboard/mqtt/broker/actors/client/service/handlers/MqttSubscribeHandlerTest.java
@@ -29,15 +29,15 @@
 import org.thingsboard.mqtt.broker.actors.client.messages.mqtt.MqttSubscribeMsg;
 import org.thingsboard.mqtt.broker.actors.client.service.subscription.ClientSubscriptionService;
 import org.thingsboard.mqtt.broker.common.data.ApplicationSharedSubscription;
+import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.ClientInfo;
 import org.thingsboard.mqtt.broker.common.data.ClientType;
 import org.thingsboard.mqtt.broker.common.data.SessionInfo;
 import org.thingsboard.mqtt.broker.common.data.subscription.SubscriptionOptions;
 import org.thingsboard.mqtt.broker.common.data.subscription.TopicSubscription;
-import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.dao.client.application.ApplicationSharedSubscriptionService;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.topic.TopicValidationService;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.service.auth.AuthorizationRuleService;
 import org.thingsboard.mqtt.broker.service.limits.RateLimitService;
 import org.thingsboard.mqtt.broker.service.mqtt.MqttMessageGenerator;

diff --git a/.../thingsboard/mqtt/broker/service/subscription/ClientSubscriptionAdminServiceImplTest.java b/.../thingsboard/mqtt/broker/service/subscription/ClientSubscriptionAdminServiceImplTest.java
@@ -32,9 +32,9 @@
 import org.thingsboard.mqtt.broker.common.data.exception.ThingsboardException;
 import org.thingsboard.mqtt.broker.common.data.subscription.TopicSubscription;
 import org.thingsboard.mqtt.broker.dao.client.application.ApplicationSharedSubscriptionService;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.service.DefaultTopicValidationService;
 import org.thingsboard.mqtt.broker.dto.SubscriptionInfoDto;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.service.mqtt.client.session.ClientSessionCache;
 import org.thingsboard.mqtt.broker.session.ClientMqttActorManager;
 

diff --git a/...ao/exception/DataValidationException.java → ...er/exception/DataValidationException.java b/...ao/exception/DataValidationException.java → ...er/exception/DataValidationException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.mqtt.broker.dao.exception;
+package org.thingsboard.mqtt.broker.exception;
 
 import java.io.Serial;
 

diff --git a/...rc/main/java/org/thingsboard/mqtt/broker/dao/client/MqttClientCredentialsServiceImpl.java b/...rc/main/java/org/thingsboard/mqtt/broker/dao/client/MqttClientCredentialsServiceImpl.java
@@ -40,10 +40,10 @@
 import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.util.JacksonUtil;
 import org.thingsboard.mqtt.broker.common.util.MqttClientCredentialsUtil;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.service.DataValidator;
 import org.thingsboard.mqtt.broker.dao.util.exception.DbExceptionUtil;
 import org.thingsboard.mqtt.broker.dao.util.protocol.ProtocolUtil;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../org/thingsboard/mqtt/broker/dao/client/application/ApplicationSessionCtxServiceImpl.java b/.../org/thingsboard/mqtt/broker/dao/client/application/ApplicationSessionCtxServiceImpl.java
@@ -21,7 +21,7 @@
 import org.springframework.stereotype.Service;
 import org.thingsboard.mqtt.broker.common.data.ApplicationSessionCtx;
 import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.Optional;
 

diff --git a/...ngsboard/mqtt/broker/dao/client/application/ApplicationSharedSubscriptionServiceImpl.java b/...ngsboard/mqtt/broker/dao/client/application/ApplicationSharedSubscriptionServiceImpl.java
@@ -21,12 +21,12 @@
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.stereotype.Service;
 import org.thingsboard.mqtt.broker.common.data.ApplicationSharedSubscription;
-import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.data.page.PageData;
 import org.thingsboard.mqtt.broker.common.data.page.PageLink;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.dao.service.DataValidator;
 import org.thingsboard.mqtt.broker.dao.util.exception.DbExceptionUtil;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.Optional;
 import java.util.UUID;

diff --git a/...va/org/thingsboard/mqtt/broker/dao/client/generic/GenericClientSessionCtxServiceImpl.java b/...va/org/thingsboard/mqtt/broker/dao/client/generic/GenericClientSessionCtxServiceImpl.java
@@ -23,7 +23,7 @@
 import org.thingsboard.mqtt.broker.common.data.GenericClientSessionCtx;
 import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.dao.client.GenericClientSessionCtxService;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.Collection;
 import java.util.Optional;

diff --git a/...va/org/thingsboard/mqtt/broker/dao/client/unauthorized/UnauthorizedClientServiceImpl.java b/...va/org/thingsboard/mqtt/broker/dao/client/unauthorized/UnauthorizedClientServiceImpl.java
@@ -21,12 +21,12 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.data.UnauthorizedClient;
 import org.thingsboard.mqtt.broker.common.data.client.unauthorized.UnauthorizedClientQuery;
 import org.thingsboard.mqtt.broker.common.data.page.PageData;
 import org.thingsboard.mqtt.broker.common.data.page.PageLink;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.Optional;
 

diff --git a/dao/src/main/java/org/thingsboard/mqtt/broker/dao/service/ConstraintValidator.java b/dao/src/main/java/org/thingsboard/mqtt/broker/dao/service/ConstraintValidator.java
@@ -33,7 +33,7 @@
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import org.thingsboard.mqtt.broker.common.data.validation.Length;
 import org.thingsboard.mqtt.broker.common.data.validation.NoXss;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.Collection;
 import java.util.Set;

diff --git a/dao/src/main/java/org/thingsboard/mqtt/broker/dao/service/DataValidator.java b/dao/src/main/java/org/thingsboard/mqtt/broker/dao/service/DataValidator.java
@@ -18,7 +18,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.mqtt.broker.common.data.BaseData;
 import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

diff --git a/dao/src/main/java/org/thingsboard/mqtt/broker/dao/service/DefaultTopicValidationService.java b/dao/src/main/java/org/thingsboard/mqtt/broker/dao/service/DefaultTopicValidationService.java
@@ -20,8 +20,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.topic.TopicValidationService;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import static org.thingsboard.mqtt.broker.common.data.BrokerConstants.MULTI_LEVEL_WILDCARD;
 import static org.thingsboard.mqtt.broker.common.data.BrokerConstants.SINGLE_LEVEL_WILDCARD;

diff --git a/dao/src/main/java/org/thingsboard/mqtt/broker/dao/settings/AdminSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/mqtt/broker/dao/settings/AdminSettingsServiceImpl.java
@@ -20,14 +20,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thingsboard.mqtt.broker.common.data.AdminSettings;
-import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
+import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.util.HostNameValidator;
 import org.thingsboard.mqtt.broker.common.util.JacksonUtil;
 import org.thingsboard.mqtt.broker.dao.client.connectivity.ConnectivityInfo;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.service.DataValidator;
 import org.thingsboard.mqtt.broker.dao.service.Validator;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.Map;
 import java.util.UUID;

diff --git a/dao/src/main/java/org/thingsboard/mqtt/broker/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/mqtt/broker/dao/user/UserServiceImpl.java
@@ -25,16 +25,16 @@
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.data.User;
 import org.thingsboard.mqtt.broker.common.data.page.PageData;
 import org.thingsboard.mqtt.broker.common.data.page.PageLink;
 import org.thingsboard.mqtt.broker.common.data.security.Authority;
 import org.thingsboard.mqtt.broker.common.data.security.UserCredentials;
+import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.util.JacksonUtil;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.exception.IncorrectParameterException;
 import org.thingsboard.mqtt.broker.dao.service.DataValidator;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/dao/src/main/java/org/thingsboard/mqtt/broker/dao/ws/WebSocketConnectionServiceImpl.java b/dao/src/main/java/org/thingsboard/mqtt/broker/dao/ws/WebSocketConnectionServiceImpl.java
@@ -21,23 +21,23 @@
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
+import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.dto.WebSocketConnectionDto;
 import org.thingsboard.mqtt.broker.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.mqtt.broker.common.data.exception.ThingsboardException;
 import org.thingsboard.mqtt.broker.common.data.page.PageData;
 import org.thingsboard.mqtt.broker.common.data.page.PageLink;
 import org.thingsboard.mqtt.broker.common.data.security.MqttClientCredentials;
+import org.thingsboard.mqtt.broker.common.data.util.StringUtils;
 import org.thingsboard.mqtt.broker.common.data.ws.SizeUnit;
 import org.thingsboard.mqtt.broker.common.data.ws.WebSocketConnection;
 import org.thingsboard.mqtt.broker.common.data.ws.WebSocketConnectionConfiguration;
-import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.dao.client.MqttClientCredentialsService;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.service.DataValidator;
 import org.thingsboard.mqtt.broker.dao.topic.TopicValidationService;
 import org.thingsboard.mqtt.broker.dao.user.UserService;
 import org.thingsboard.mqtt.broker.dao.util.exception.DbExceptionUtil;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/dao/src/main/java/org/thingsboard/mqtt/broker/dao/ws/WebSocketSubscriptionServiceImpl.java b/dao/src/main/java/org/thingsboard/mqtt/broker/dao/ws/WebSocketSubscriptionServiceImpl.java
@@ -18,12 +18,12 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.ws.WebSocketSubscription;
 import org.thingsboard.mqtt.broker.common.data.ws.WebSocketSubscriptionConfiguration;
-import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.service.DataValidator;
 import org.thingsboard.mqtt.broker.dao.topic.TopicValidationService;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...rg/thingsboard/mqtt/broker/dao/client/unauthorized/UnauthorizedClientServiceImplTest.java b/...rg/thingsboard/mqtt/broker/dao/client/unauthorized/UnauthorizedClientServiceImplTest.java
@@ -29,9 +29,9 @@
 import org.thingsboard.mqtt.broker.common.data.page.PageLink;
 import org.thingsboard.mqtt.broker.common.data.page.TimePageLink;
 import org.thingsboard.mqtt.broker.dao.DaoSqlTest;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.exception.IncorrectParameterException;
 import org.thingsboard.mqtt.broker.dao.service.AbstractServiceTest;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../test/java/org/thingsboard/mqtt/broker/dao/service/DefaultTopicValidationServiceTest.java b/.../test/java/org/thingsboard/mqtt/broker/dao/service/DefaultTopicValidationServiceTest.java
@@ -18,7 +18,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Random;

diff --git a/...c/test/java/org/thingsboard/mqtt/broker/dao/service/MqttClientCredentialsServiceTest.java b/...c/test/java/org/thingsboard/mqtt/broker/dao/service/MqttClientCredentialsServiceTest.java
@@ -41,8 +41,8 @@
 import org.thingsboard.mqtt.broker.common.util.MqttClientCredentialsUtil;
 import org.thingsboard.mqtt.broker.dao.DaoSqlTest;
 import org.thingsboard.mqtt.broker.dao.client.MqttClientCredentialsService;
-import org.thingsboard.mqtt.broker.dao.exception.DataValidationException;
 import org.thingsboard.mqtt.broker.dao.util.protocol.ProtocolUtil;
+import org.thingsboard.mqtt.broker.exception.DataValidationException;
 
 import java.util.ArrayList;
 import java.util.Collections;