diff --git a/config/src/main/java/com/alibaba/nacos/config/server/aspect/CapacityManagementAspect.java b/config/src/main/java/com/alibaba/nacos/config/server/aspect/CapacityManagementAspect.java index fc509f362ee..9f8c7e1860e 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/aspect/CapacityManagementAspect.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/aspect/CapacityManagementAspect.java @@ -23,7 +23,7 @@ import com.alibaba.nacos.config.server.service.repository.PersistService; import com.alibaba.nacos.config.server.service.capacity.CapacityService; import com.alibaba.nacos.config.server.utils.PropertyUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java index 3276c835644..94848ad8e65 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java @@ -22,7 +22,7 @@ import com.alibaba.nacos.auth.parser.ResourceParser; import com.alibaba.nacos.common.utils.ReflectUtils; import com.alibaba.nacos.common.utils.NamespaceUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java index 301195999a6..9654f33a796 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java @@ -22,7 +22,7 @@ import com.alibaba.nacos.config.server.service.repository.embedded.DatabaseOperate; import com.alibaba.nacos.config.server.service.repository.embedded.EmbeddedStoragePersistServiceImpl; import com.alibaba.nacos.config.server.service.sql.EmbeddedStorageContextUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Conditional; import org.springframework.stereotype.Component; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java index 1660710bb88..ff13b545efd 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java @@ -22,7 +22,7 @@ import com.alibaba.nacos.config.server.service.repository.embedded.DatabaseOperate; import com.alibaba.nacos.config.server.service.repository.embedded.EmbeddedStoragePersistServiceImpl; import com.alibaba.nacos.config.server.service.sql.EmbeddedStorageContextUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Conditional; import org.springframework.stereotype.Component; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java index 283df29e007..84db2d70def 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java @@ -21,7 +21,7 @@ import com.alibaba.nacos.config.server.service.repository.PaginationHelper; import com.alibaba.nacos.config.server.service.repository.extrnal.ExternalStoragePersistServiceImpl; import com.alibaba.nacos.config.server.utils.LogUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Conditional; import org.springframework.jdbc.CannotGetJdbcConnectionException; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java index a8337db2b4a..793f21cdbc4 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java @@ -21,7 +21,7 @@ import com.alibaba.nacos.config.server.service.repository.PaginationHelper; import com.alibaba.nacos.config.server.service.repository.extrnal.ExternalStoragePersistServiceImpl; import com.alibaba.nacos.config.server.utils.LogUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Conditional; import org.springframework.jdbc.CannotGetJdbcConnectionException; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/CapacityController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/CapacityController.java index 0d170fba0fd..10b2b58c0fa 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/CapacityController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/CapacityController.java @@ -20,7 +20,7 @@ import com.alibaba.nacos.config.server.constant.Constants; import com.alibaba.nacos.config.server.model.capacity.Capacity; import com.alibaba.nacos.config.server.service.capacity.CapacityService; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ClientMetricsController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ClientMetricsController.java index 6c9f11ed8d5..0922f7520c1 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ClientMetricsController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ClientMetricsController.java @@ -34,7 +34,7 @@ import com.alibaba.nacos.core.utils.GenericType; import com.alibaba.nacos.core.utils.Loggers; import com.alibaba.nacos.sys.env.EnvUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java index 8138fc3d18d..ebba18ae4d4 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/CommunicationController.java @@ -26,7 +26,7 @@ import com.alibaba.nacos.config.server.utils.GroupKey2; import com.alibaba.nacos.core.remote.Connection; import com.alibaba.nacos.core.remote.ConnectionManager; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java index f52106edd9f..743d5145f95 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java @@ -22,6 +22,7 @@ import com.alibaba.nacos.auth.common.ActionTypes; import com.alibaba.nacos.common.model.RestResult; import com.alibaba.nacos.common.model.RestResultUtils; +import com.alibaba.nacos.common.utils.DateFormatUtils; import com.alibaba.nacos.common.utils.MapUtil; import com.alibaba.nacos.common.utils.NamespaceUtil; import com.alibaba.nacos.config.server.auth.ConfigResourceParser; @@ -51,8 +52,7 @@ import com.alibaba.nacos.config.server.utils.YamlParserUtil; import com.alibaba.nacos.config.server.utils.ZipUtils; import com.alibaba.nacos.sys.utils.InetUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateFormatUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigOpsController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigOpsController.java index 516b165525d..6adda6b7f17 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigOpsController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigOpsController.java @@ -32,7 +32,7 @@ import com.alibaba.nacos.config.server.utils.PropertyUtil; import com.alibaba.nacos.core.utils.WebUtils; import com.alibaba.nacos.sys.utils.ApplicationUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java index c0dc7e3b573..2e01ffeadd2 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java @@ -34,7 +34,7 @@ import com.alibaba.nacos.config.server.utils.Protocol; import com.alibaba.nacos.config.server.utils.RequestUtil; import com.alibaba.nacos.config.server.utils.TimeUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/HistoryController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/HistoryController.java index b08220edcd8..ec1b0eb02fb 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/HistoryController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/HistoryController.java @@ -24,7 +24,7 @@ import com.alibaba.nacos.config.server.model.ConfigHistoryInfo; import com.alibaba.nacos.config.server.model.Page; import com.alibaba.nacos.config.server.service.repository.PersistService; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ListenerController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ListenerController.java index db487fd87aa..11316736271 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/controller/ListenerController.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/controller/ListenerController.java @@ -21,7 +21,7 @@ import com.alibaba.nacos.config.server.model.SampleResult; import com.alibaba.nacos.config.server.service.ConfigSubService; import com.alibaba.nacos.config.server.utils.GroupKey2; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/model/event/ConfigDataChangeEvent.java b/config/src/main/java/com/alibaba/nacos/config/server/model/event/ConfigDataChangeEvent.java index 3d816932a8f..1d3269e5849 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/model/event/ConfigDataChangeEvent.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/model/event/ConfigDataChangeEvent.java @@ -17,7 +17,7 @@ package com.alibaba.nacos.config.server.model.event; import com.alibaba.nacos.common.notify.Event; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; /** * ConfigDataChangeEvent. diff --git a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigPublishRequestHandler.java b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigPublishRequestHandler.java index 562bf7790a4..b70decb98c6 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigPublishRequestHandler.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigPublishRequestHandler.java @@ -37,7 +37,7 @@ import com.alibaba.nacos.core.remote.control.TpsControl; import com.alibaba.nacos.core.utils.Loggers; import com.alibaba.nacos.sys.utils.InetUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Component; import java.sql.Timestamp; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java index 0426039c238..9a189b069bf 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java @@ -38,7 +38,7 @@ import com.alibaba.nacos.core.remote.RequestHandler; import com.alibaba.nacos.core.remote.control.TpsControl; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Component; import java.io.File; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigRemoveRequestHandler.java b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigRemoveRequestHandler.java index 02c85f709bb..189094a8373 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigRemoveRequestHandler.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigRemoveRequestHandler.java @@ -32,7 +32,7 @@ import com.alibaba.nacos.core.remote.RequestHandler; import com.alibaba.nacos.core.remote.control.TpsControl; import com.alibaba.nacos.core.utils.Loggers; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Component; import java.sql.Timestamp; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/AggrWhitelist.java b/config/src/main/java/com/alibaba/nacos/config/server/service/AggrWhitelist.java index 7afc72ad3d1..c5126121d09 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/AggrWhitelist.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/AggrWhitelist.java @@ -19,7 +19,7 @@ import com.alibaba.nacos.common.utils.IoUtils; import com.alibaba.nacos.config.server.utils.RegexParser; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Service; import java.io.StringReader; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/ClientIpWhiteList.java b/config/src/main/java/com/alibaba/nacos/config/server/service/ClientIpWhiteList.java index 03dbf151811..911a60e0439 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/ClientIpWhiteList.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/ClientIpWhiteList.java @@ -18,7 +18,7 @@ import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.config.server.model.AclInfo; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigCacheService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigCacheService.java index d8eaaac0a44..9f1d89b59d6 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigCacheService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigCacheService.java @@ -27,7 +27,7 @@ import com.alibaba.nacos.config.server.utils.GroupKey; import com.alibaba.nacos.config.server.utils.GroupKey2; import com.alibaba.nacos.config.server.utils.PropertyUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigSubService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigSubService.java index 22004a6684c..7e8d8d39680 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigSubService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigSubService.java @@ -26,7 +26,7 @@ import com.alibaba.nacos.core.cluster.Member; import com.alibaba.nacos.core.cluster.ServerMemberManager; import com.alibaba.nacos.sys.env.EnvUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java index c00486da008..f42225a0933 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java @@ -29,7 +29,7 @@ import com.alibaba.nacos.config.server.utils.LogUtil; import com.alibaba.nacos.config.server.utils.MD5Util; import com.alibaba.nacos.config.server.utils.RequestUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Service; import javax.servlet.AsyncContext; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/SwitchService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/SwitchService.java index 5c6b958606f..2692ca24b4f 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/SwitchService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/SwitchService.java @@ -19,7 +19,7 @@ import com.alibaba.nacos.common.utils.IoUtils; import com.alibaba.nacos.config.server.utils.LogUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Service; import java.io.IOException; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/CapacityService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/CapacityService.java index a844e6a77eb..92c6b5e68f8 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/CapacityService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/CapacityService.java @@ -26,7 +26,7 @@ import com.alibaba.nacos.config.server.utils.PropertyUtil; import com.alibaba.nacos.config.server.utils.TimeUtils; import com.google.common.base.Stopwatch; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java index c6c373ccd90..f8175468a48 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java @@ -25,7 +25,7 @@ import com.alibaba.nacos.sys.env.EnvUtil; import com.alibaba.nacos.sys.utils.DiskUtils; import com.zaxxer.hikari.HikariDataSource; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.support.TransactionTemplate; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/processor/DumpProcessor.java b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/processor/DumpProcessor.java index 74c799788e4..d07c9d8dc7c 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/processor/DumpProcessor.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/processor/DumpProcessor.java @@ -27,7 +27,7 @@ import com.alibaba.nacos.config.server.service.dump.task.DumpTask; import com.alibaba.nacos.config.server.service.repository.PersistService; import com.alibaba.nacos.config.server.utils.GroupKey2; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import java.util.Objects; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeTaskProcessor.java b/config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeTaskProcessor.java index b69ba16271e..4e42595f783 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeTaskProcessor.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeTaskProcessor.java @@ -29,7 +29,7 @@ import com.alibaba.nacos.config.server.utils.ContentUtils; import com.alibaba.nacos.config.server.utils.TimeUtils; import com.alibaba.nacos.sys.utils.InetUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java index 8bd16c29ec2..8f2ba68d881 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java @@ -42,7 +42,7 @@ import com.alibaba.nacos.core.cluster.ServerMemberManager; import com.alibaba.nacos.sys.env.EnvUtil; import com.alibaba.nacos.sys.utils.InetUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java index a7f54d7a8d0..88667129a2b 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java @@ -51,7 +51,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.context.annotation.Conditional; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; @@ -2508,7 +2508,7 @@ public Map batchInsertOrUpdate(List configInfoLis addConfigInfo(srcIp, srcUser, configInfo2Save, time, configAdvanceInfo, notify, callFinally); succCount++; } catch (Throwable e) { - if (!StringUtils.contains(e.toString(), "DuplicateKeyException")) { + if (!e.toString().contains("DuplicateKeyException")) { throw new NacosException(NacosException.SERVER_ERROR, e); } // uniqueness constraint conflict diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/StandaloneDatabaseOperateImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/StandaloneDatabaseOperateImpl.java index d918f0e89e2..54f5ea8d9b9 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/StandaloneDatabaseOperateImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/StandaloneDatabaseOperateImpl.java @@ -18,6 +18,7 @@ import com.alibaba.nacos.common.model.RestResult; import com.alibaba.nacos.common.model.RestResultUtils; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.config.server.configuration.ConditionStandaloneEmbedStorage; import com.alibaba.nacos.config.server.service.datasource.DataSourceService; @@ -25,7 +26,6 @@ import com.alibaba.nacos.config.server.service.sql.ModifyRequest; import com.alibaba.nacos.config.server.utils.LogUtil; import com.alibaba.nacos.sys.utils.DiskUtils; -import org.apache.commons.lang3.BooleanUtils; import org.springframework.context.annotation.Conditional; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; @@ -117,8 +117,11 @@ public CompletableFuture> dataImport(File file) { } } CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join(); - return RestResult.builder() - .withCode(BooleanUtils.and(results.toArray(new Boolean[0])) ? 200 : 500).withData("").build(); + int code = 500; + if (!CollectionUtils.isEmpty(results)) { + code = (!results.stream().anyMatch(Boolean.FALSE::equals)) ? 200 : 500; + } + return RestResult.builder().withCode(code).withData("").build(); } catch (Throwable ex) { LogUtil.DEFAULT_LOG.error("An exception occurred when external data was imported into Derby : ", ex); return RestResultUtils.failed(ex.getMessage()); diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java index 4545a9b61cc..c8694b2b64e 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java @@ -45,7 +45,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.context.annotation.Conditional; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataIntegrityViolationException; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java index b6ff0c7d0a9..84d1ced3b06 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/trace/ConfigTraceService.java @@ -21,7 +21,7 @@ import com.alibaba.nacos.config.server.monitor.MetricsMonitor; import com.alibaba.nacos.config.server.utils.LogUtil; import com.alibaba.nacos.sys.utils.InetUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.springframework.stereotype.Service; import java.util.concurrent.TimeUnit; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/DiskUtil.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/DiskUtil.java index 3491416ab71..e7a8fbdee9b 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/DiskUtil.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/DiskUtil.java @@ -21,7 +21,7 @@ import com.alibaba.nacos.config.server.constant.Constants; import com.alibaba.nacos.sys.env.EnvUtil; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import java.io.File; import java.io.FileInputStream; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey.java index 772cf8d3c13..93b932adc85 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.config.server.utils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; /** * Synthesize dataId+groupId form. Escape reserved characters in dataId and groupId. diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey2.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey2.java index bea8b95eb1d..694fc043857 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey2.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey2.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.config.server.utils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; /** * Group key util. diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/MD5Util.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/MD5Util.java index 8c2612ab9bd..e864c58bf5e 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/MD5Util.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/MD5Util.java @@ -19,7 +19,7 @@ import com.alibaba.nacos.config.server.constant.Constants; import com.alibaba.nacos.config.server.service.ConfigCacheService; import com.alibaba.nacos.core.utils.StringPool; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java index cf4ba1c72ec..de0b51d1610 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java @@ -19,7 +19,7 @@ import java.util.Map; import com.alibaba.nacos.api.exception.NacosException; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; /** * Parameter validity check util. diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java index 0e954c9ed6d..e591cbc4efa 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java @@ -16,8 +16,6 @@ package com.alibaba.nacos.config.server.utils; -import org.apache.commons.lang3.CharUtils; - /** * Generic classes for wildcard characters, decisions, and standard canonical transformations that can be supported by * ConfigCenter. @@ -44,7 +42,7 @@ public static String regexFormat(String regex) { result.append("^"); for (int i = 0; i < regex.length(); i++) { char ch = regex.charAt(i); - if (CharUtils.isAsciiAlphanumeric(ch) || CharUtils.isAsciiNumeric(ch)) { + if (isAsciiAlphanumeric(ch)) { result.append(ch); } else if (ch == '*') { result.append(".*"); @@ -73,4 +71,20 @@ public static boolean containsWildcard(String regex) { return (regex.contains("?") || regex.contains("*")); } + private static Boolean isAsciiAlphanumeric(final char ch) { + return isAsciiAlphaUpper(ch) || isAsciiAlphaLower(ch) || isAsciiNumeric(ch); + } + + private static Boolean isAsciiNumeric(final char ch) { + return ch >= '0' && ch <= '9'; + } + + private static Boolean isAsciiAlphaUpper(final char ch) { + return ch >= 'A' && ch <= 'Z'; + } + + private static Boolean isAsciiAlphaLower(final char ch) { + return ch >= 'a' && ch <= 'z'; + } + } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/RequestUtil.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/RequestUtil.java index f8a9782c099..047010d1949 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/RequestUtil.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/RequestUtil.java @@ -18,7 +18,7 @@ import com.alibaba.nacos.api.common.Constants; import com.alibaba.nacos.auth.model.User; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import javax.servlet.http.HttpServletRequest; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/SystemConfig.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/SystemConfig.java index ab242cceda9..0f6b7f75293 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/SystemConfig.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/SystemConfig.java @@ -17,7 +17,7 @@ package com.alibaba.nacos.config.server.utils; import com.alibaba.nacos.common.utils.InternetAddressUtil; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java index f1b5542f531..26e2d9bef01 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.config.server.utils; -import org.apache.commons.lang3.time.FastDateFormat; +import com.alibaba.nacos.common.utils.DateFormatUtils; import java.sql.Timestamp; import java.util.Calendar; @@ -28,6 +28,8 @@ */ public class TimeUtils { + private static final String YYYYMMMDDHHMMSS = "yyyy-MM-dd HH:mm:ss"; + public static Timestamp getCurrentTime() { return new Timestamp(System.currentTimeMillis()); } @@ -35,7 +37,6 @@ public static Timestamp getCurrentTime() { public static String getCurrentTimeStr() { Calendar c = Calendar.getInstance(); c.setTimeInMillis(System.currentTimeMillis()); - FastDateFormat format = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss"); - return format.format(c.getTime()); + return DateFormatUtils.format(c.getTime(), YYYYMMMDDHHMMSS); } }