diff --git a/sermant-backend/pom.xml b/sermant-backend/pom.xml index 1d7ce8ce47..1fcd440d70 100644 --- a/sermant-backend/pom.xml +++ b/sermant-backend/pom.xml @@ -217,7 +217,7 @@ spring-boot-maven-plugin ${spring.boot.version} - com.huawei.sermant.backend.NettyServerApplication + com.huaweicloud.sermant.backend.NettyServerApplication ${package.output.dir} @@ -240,7 +240,7 @@ spring-boot-maven-plugin ${spring.boot.version} - com.huawei.sermant.backend.NettyServerApplication + com.huaweicloud.sermant.backend.NettyServerApplication ${package.output.dir} diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/DataTypeTopicMapping.java b/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/DataTypeTopicMapping.java deleted file mode 100644 index 018a9355ba..0000000000 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/DataTypeTopicMapping.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.huawei.sermant.backend.common.conf; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -import java.util.HashMap; -import java.util.Map; - -@Data -@ConfigurationProperties( - prefix = "datatype.topic" -) -public class DataTypeTopicMapping { - private final Map mapping = new HashMap<>(); - - public String getTopicOfType(Integer type) { - return mapping.get(type); - } -} diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/HeartbeatEntity.java b/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/HeartbeatEntity.java deleted file mode 100644 index 0e691eb5b0..0000000000 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/HeartbeatEntity.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.huawei.sermant.backend.entity; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -/** - * 心跳请求数据 - * - * @author xuezechao - * @since 2022-02-28 - */ - -@Getter -@Setter -public class HeartbeatEntity { - - private String app; - - private String hostname; - - private long heartbeatVersion; - - private String pluginVersion; - - private long lastHeartbeat; - - private String pluginName; - - private String appType; - - private List ip; - - private String version; - - private String instanceId; -} diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/NettyServerApplication.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/NettyServerApplication.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/NettyServerApplication.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/NettyServerApplication.java index 0c1316bc51..4a0ac60c9a 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/NettyServerApplication.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/NettyServerApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend; +package com.huaweicloud.sermant.backend; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/cache/CollectorCache.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/CollectorCache.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/cache/CollectorCache.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/CollectorCache.java index 8c14e640ff..d4d9709c60 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/cache/CollectorCache.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/CollectorCache.java @@ -15,12 +15,12 @@ * */ -package com.huawei.sermant.backend.cache; +package com.huaweicloud.sermant.backend.cache; -import com.huawei.sermant.backend.entity.Consanguinity; -import com.huawei.sermant.backend.entity.Contract; -import com.huawei.sermant.backend.entity.ServerInfo; -import com.huawei.sermant.backend.entity.ServiceType; +import com.huaweicloud.sermant.backend.entity.Consanguinity; +import com.huaweicloud.sermant.backend.entity.Contract; +import com.huaweicloud.sermant.backend.entity.ServerInfo; +import com.huaweicloud.sermant.backend.entity.ServiceType; import com.alibaba.fastjson.JSONObject; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/cache/DeleteTimeoutData.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/DeleteTimeoutData.java similarity index 91% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/cache/DeleteTimeoutData.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/DeleteTimeoutData.java index c08d8d6fbf..65a1f6c5ed 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/cache/DeleteTimeoutData.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/DeleteTimeoutData.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.huawei.sermant.backend.cache; +package com.huaweicloud.sermant.backend.cache; -import com.huawei.sermant.backend.common.conf.VisibilityConfig; -import com.huawei.sermant.backend.entity.HeartbeatEntity; -import com.huawei.sermant.backend.entity.ServerInfo; +import com.huaweicloud.sermant.backend.common.conf.VisibilityConfig; +import com.huaweicloud.sermant.backend.entity.HeartbeatEntity; +import com.huaweicloud.sermant.backend.entity.ServerInfo; import java.util.Iterator; import java.util.Map; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/cache/HeartbeatCache.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/HeartbeatCache.java similarity index 88% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/cache/HeartbeatCache.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/HeartbeatCache.java index 1cd25ed683..8388faf032 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/cache/HeartbeatCache.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/cache/HeartbeatCache.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.huawei.sermant.backend.cache; +package com.huaweicloud.sermant.backend.cache; -import com.huawei.sermant.backend.entity.HeartbeatEntity; -import com.huawei.sermant.backend.entity.ServerInfo; +import com.huaweicloud.sermant.backend.entity.HeartbeatEntity; +import com.huaweicloud.sermant.backend.entity.ServerInfo; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/DataTypeTopicMapping.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/DataTypeTopicMapping.java new file mode 100644 index 0000000000..2ba88e66f7 --- /dev/null +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/DataTypeTopicMapping.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2021-2022 Huawei Technologies Co., Ltd. All rights reserved. + * + * 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 com.huaweicloud.sermant.backend.common.conf; + +import lombok.Data; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.util.HashMap; +import java.util.Map; + +/** + * web 配置 + * + * @author beetlemen + * @since 2021-12-08 + */ +@Data +@ConfigurationProperties( + prefix = "datatype.topic" +) +public class DataTypeTopicMapping { + private final Map mapping = new HashMap<>(); + + /** + * 获取topic类型 + * + * @param type 类型 + * @return topic + */ + public String getTopicOfType(Integer type) { + return mapping.get(type); + } +} diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/KafkaConf.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/KafkaConf.java similarity index 98% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/KafkaConf.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/KafkaConf.java index b4fa497ba9..a0c6ce5cdf 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/KafkaConf.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/KafkaConf.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.common.conf; +package com.huaweicloud.sermant.backend.common.conf; import lombok.Getter; import lombok.Setter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/VisibilityConfig.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/VisibilityConfig.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/VisibilityConfig.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/VisibilityConfig.java index 970386a3bd..421cec5bf7 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/VisibilityConfig.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/VisibilityConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.common.conf; +package com.huaweicloud.sermant.backend.common.conf; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/WebConfig.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/WebConfig.java similarity index 58% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/WebConfig.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/WebConfig.java index cb63368777..01696a422c 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/conf/WebConfig.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/conf/WebConfig.java @@ -1,4 +1,20 @@ -package com.huawei.sermant.backend.common.conf; +/* + * Copyright (C) 2021-2022 Huawei Technologies Co., Ltd. All rights reserved. + * + * 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 com.huaweicloud.sermant.backend.common.conf; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; @@ -6,6 +22,12 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +/** + * web 配置 + * + * @since 2021-12-17 + * @author xuezechao + */ @Configuration public class WebConfig implements WebMvcConfigurer { diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ErrorMsgParser.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ErrorMsgParser.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ErrorMsgParser.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ErrorMsgParser.java index 9c4d99547d..eaa22db4f0 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ErrorMsgParser.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ErrorMsgParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.common.exception; +package com.huaweicloud.sermant.backend.common.exception; /** * 错误信息处理器 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/KafkaTopicException.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/KafkaTopicException.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/KafkaTopicException.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/KafkaTopicException.java index 8af7af146e..c30ed1511c 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/KafkaTopicException.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/KafkaTopicException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.common.exception; +package com.huaweicloud.sermant.backend.common.exception; import java.util.Locale; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java index c3bad7c72c..5d2939c1f7 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/exception/ZookeeperDynamicConfigurationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.common.exception; +package com.huaweicloud.sermant.backend.common.exception; /** * zookeeper动态配置异常类 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/handler/BaseHandler.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/handler/BaseHandler.java similarity index 98% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/handler/BaseHandler.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/handler/BaseHandler.java index 15b8750abf..535de6271e 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/handler/BaseHandler.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/handler/BaseHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.common.handler; +package com.huaweicloud.sermant.backend.common.handler; import com.huawei.sermant.backend.pojo.Message; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/util/GzipUtils.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/util/GzipUtils.java similarity index 98% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/common/util/GzipUtils.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/util/GzipUtils.java index 512ffba517..4c7ddfea0e 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/common/util/GzipUtils.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/common/util/GzipUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.common.util; +package com.huaweicloud.sermant.backend.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/controller/VisibilityController.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/controller/VisibilityController.java similarity index 89% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/controller/VisibilityController.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/controller/VisibilityController.java index 8aca737ff9..952a36f836 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/controller/VisibilityController.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/controller/VisibilityController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.huawei.sermant.backend.controller; +package com.huaweicloud.sermant.backend.controller; -import com.huawei.sermant.backend.cache.CollectorCache; -import com.huawei.sermant.backend.entity.ServerInfo; +import com.huaweicloud.sermant.backend.cache.CollectorCache; +import com.huaweicloud.sermant.backend.entity.ServerInfo; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Address.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Address.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Address.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Address.java index 2c0a5d8fd3..a9a05c0560 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Address.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Address.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import lombok.Getter; import lombok.Setter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressScope.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressScope.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressScope.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressScope.java index 4db404e12d..30461882b5 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressScope.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; public enum AddressScope { /** diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressType.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressType.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressType.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressType.java index 6f0ecd7234..f29ce60f29 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AddressType.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AddressType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; public enum AddressType { /** diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AgentInfo.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AgentInfo.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AgentInfo.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AgentInfo.java index 186662504f..0ebf04a634 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/AgentInfo.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/AgentInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import lombok.Getter; import lombok.Setter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/BaseInfo.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/BaseInfo.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/BaseInfo.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/BaseInfo.java index e1cdbfef06..13e5f2cfcb 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/BaseInfo.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/BaseInfo.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; /** * 服务可见性基础信息 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Consanguinity.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Consanguinity.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Consanguinity.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Consanguinity.java index d5c79aceda..c794518039 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Consanguinity.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Consanguinity.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Contract.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Contract.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Contract.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Contract.java index 89a5b443fa..f740c95a08 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Contract.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Contract.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/HeartBeatResult.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/HeartBeatResult.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/HeartBeatResult.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/HeartBeatResult.java index 3fc26e62cd..2dadcc959c 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/HeartBeatResult.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/HeartBeatResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import java.util.List; import java.util.Map; diff --git a/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/HeartbeatEntity.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/HeartbeatEntity.java new file mode 100644 index 0000000000..b1420f51a6 --- /dev/null +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/HeartbeatEntity.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2021-2022 Huawei Technologies Co., Ltd. All rights reserved. + * + * 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 com.huaweicloud.sermant.backend.entity; + +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +/** + * 心跳请求数据 + * + * @author xuezechao + * @since 2022-02-28 + */ +@Getter +@Setter +public class HeartbeatEntity { + + private String app; + + private String hostname; + + private long heartbeatVersion; + + private String pluginVersion; + + private long lastHeartbeat; + + private String pluginName; + + private String appType; + + private List ip; + + private String version; + + private String instanceId; +} diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/MethodInfo.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/MethodInfo.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/MethodInfo.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/MethodInfo.java index 0925250513..8ab5b83aa9 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/MethodInfo.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/MethodInfo.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/MonitorItem.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/MonitorItem.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/MonitorItem.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/MonitorItem.java index 56e51eaec4..35a5082617 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/MonitorItem.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/MonitorItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import java.util.Map; import lombok.Getter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/OperateType.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/OperateType.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/OperateType.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/OperateType.java index 03f7737113..468f91ab9b 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/OperateType.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/OperateType.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; /** * 操作类型 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ParamInfo.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ParamInfo.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ParamInfo.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ParamInfo.java index e9d66ec1a5..da11f235ff 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ParamInfo.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ParamInfo.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; /** * 参数信息 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/PluginInfo.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/PluginInfo.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/PluginInfo.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/PluginInfo.java index 96c09ea53f..08d4cd453c 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/PluginInfo.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/PluginInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import lombok.Getter; import lombok.Setter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Protocol.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Protocol.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Protocol.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Protocol.java index 85ac0d8035..ee7f55dd0a 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Protocol.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Protocol.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; public enum Protocol { /** diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/PublishConfigEntity.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/PublishConfigEntity.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/PublishConfigEntity.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/PublishConfigEntity.java index 9086dd9708..edfc06dc85 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/PublishConfigEntity.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/PublishConfigEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import lombok.Getter; import lombok.Setter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/RegisterResult.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/RegisterResult.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/RegisterResult.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/RegisterResult.java index 26364ea132..011c04060b 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/RegisterResult.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/RegisterResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import lombok.Getter; import lombok.Setter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Result.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Result.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Result.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Result.java index bdcac74d13..699c1efe9c 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/Result.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import lombok.Getter; import lombok.Setter; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ServerInfo.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ServerInfo.java similarity index 98% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ServerInfo.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ServerInfo.java index 450ce2c1bb..5301dbfb00 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ServerInfo.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ServerInfo.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; import java.util.Date; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ServiceType.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ServiceType.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ServiceType.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ServiceType.java index 8ff5f7a4f5..6eec57f6e8 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/entity/ServiceType.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/entity/ServiceType.java @@ -15,7 +15,7 @@ * */ -package com.huawei.sermant.backend.entity; +package com.huaweicloud.sermant.backend.entity; /** * 服务类型 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/kafka/KafkaConsumerManager.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/kafka/KafkaConsumerManager.java similarity index 93% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/kafka/KafkaConsumerManager.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/kafka/KafkaConsumerManager.java index 6cae84ea39..45ebce3d20 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/kafka/KafkaConsumerManager.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/kafka/KafkaConsumerManager.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package com.huawei.sermant.backend.kafka; +package com.huaweicloud.sermant.backend.kafka; + +import com.huaweicloud.sermant.backend.common.conf.KafkaConf; +import com.huaweicloud.sermant.backend.common.exception.KafkaTopicException; -import com.huawei.sermant.backend.common.conf.KafkaConf; -import com.huawei.sermant.backend.common.exception.KafkaTopicException; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/kafka/KafkaProducerManager.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/kafka/KafkaProducerManager.java similarity index 93% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/kafka/KafkaProducerManager.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/kafka/KafkaProducerManager.java index 818480c0cc..56de3241a1 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/kafka/KafkaProducerManager.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/kafka/KafkaProducerManager.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.huawei.sermant.backend.kafka; +package com.huaweicloud.sermant.backend.kafka; -import com.huawei.sermant.backend.common.conf.KafkaConf; -import com.huawei.sermant.backend.common.exception.KafkaTopicException; +import com.huaweicloud.sermant.backend.common.conf.KafkaConf; +import com.huaweicloud.sermant.backend.common.exception.KafkaTopicException; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/server/HttpServer.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/HttpServer.java similarity index 87% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/server/HttpServer.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/HttpServer.java index 65fb3db3ca..31f1e01c3f 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/server/HttpServer.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/HttpServer.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package com.huawei.sermant.backend.server; - -import com.huawei.sermant.backend.cache.HeartbeatCache; -import com.huawei.sermant.backend.common.conf.KafkaConf; -import com.huawei.sermant.backend.entity.Address; -import com.huawei.sermant.backend.entity.AddressScope; -import com.huawei.sermant.backend.entity.AddressType; -import com.huawei.sermant.backend.entity.AgentInfo; -import com.huawei.sermant.backend.entity.HeartBeatResult; -import com.huawei.sermant.backend.entity.HeartbeatEntity; -import com.huawei.sermant.backend.entity.MonitorItem; -import com.huawei.sermant.backend.entity.Protocol; -import com.huawei.sermant.backend.entity.PublishConfigEntity; -import com.huawei.sermant.backend.entity.RegisterResult; -import com.huawei.sermant.backend.kafka.KafkaConsumerManager; -import com.huawei.sermant.backend.service.dynamicconfig.DynamicConfigurationFactoryServiceImpl; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; -import com.huawei.sermant.backend.service.dynamicconfig.utils.LabelGroupUtils; -import com.huawei.sermant.backend.util.DateUtil; -import com.huawei.sermant.backend.util.RandomUtil; -import com.huawei.sermant.backend.util.UuidUtil; +package com.huaweicloud.sermant.backend.server; + +import com.huaweicloud.sermant.backend.cache.HeartbeatCache; +import com.huaweicloud.sermant.backend.common.conf.KafkaConf; +import com.huaweicloud.sermant.backend.entity.Address; +import com.huaweicloud.sermant.backend.entity.AddressScope; +import com.huaweicloud.sermant.backend.entity.AddressType; +import com.huaweicloud.sermant.backend.entity.AgentInfo; +import com.huaweicloud.sermant.backend.entity.HeartBeatResult; +import com.huaweicloud.sermant.backend.entity.HeartbeatEntity; +import com.huaweicloud.sermant.backend.entity.MonitorItem; +import com.huaweicloud.sermant.backend.entity.Protocol; +import com.huaweicloud.sermant.backend.entity.PublishConfigEntity; +import com.huaweicloud.sermant.backend.entity.RegisterResult; +import com.huaweicloud.sermant.backend.kafka.KafkaConsumerManager; +import com.huaweicloud.sermant.backend.service.dynamicconfig.DynamicConfigurationFactoryServiceImpl; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; +import com.huaweicloud.sermant.backend.service.dynamicconfig.utils.LabelGroupUtils; +import com.huaweicloud.sermant.backend.util.DateUtil; +import com.huaweicloud.sermant.backend.util.RandomUtil; +import com.huaweicloud.sermant.backend.util.UuidUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/server/NettyServer.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/NettyServer.java similarity index 90% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/server/NettyServer.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/NettyServer.java index 2968ed0ea6..1662b1040a 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/server/NettyServer.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/NettyServer.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.huawei.sermant.backend.server; - -import com.huawei.sermant.backend.cache.DeleteTimeoutData; -import com.huawei.sermant.backend.common.conf.DataTypeTopicMapping; -import com.huawei.sermant.backend.common.conf.KafkaConf; -import com.huawei.sermant.backend.common.conf.VisibilityConfig; -import com.huawei.sermant.backend.common.exception.KafkaTopicException; -import com.huawei.sermant.backend.kafka.KafkaConsumerManager; -import com.huawei.sermant.backend.kafka.KafkaProducerManager; +package com.huaweicloud.sermant.backend.server; + +import com.huaweicloud.sermant.backend.cache.DeleteTimeoutData; +import com.huaweicloud.sermant.backend.common.conf.DataTypeTopicMapping; +import com.huaweicloud.sermant.backend.common.conf.KafkaConf; +import com.huaweicloud.sermant.backend.common.conf.VisibilityConfig; +import com.huaweicloud.sermant.backend.common.exception.KafkaTopicException; +import com.huaweicloud.sermant.backend.kafka.KafkaConsumerManager; +import com.huaweicloud.sermant.backend.kafka.KafkaProducerManager; import com.huawei.sermant.backend.pojo.Message; import io.netty.bootstrap.ServerBootstrap; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/server/ServerHandler.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/ServerHandler.java similarity index 91% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/server/ServerHandler.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/ServerHandler.java index 85afaf74ee..45a01387e0 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/server/ServerHandler.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/server/ServerHandler.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.huawei.sermant.backend.server; - -import com.huawei.sermant.backend.cache.CollectorCache; -import com.huawei.sermant.backend.cache.HeartbeatCache; -import com.huawei.sermant.backend.common.conf.DataTypeTopicMapping; -import com.huawei.sermant.backend.common.handler.BaseHandler; -import com.huawei.sermant.backend.common.util.GzipUtils; -import com.huawei.sermant.backend.entity.HeartbeatEntity; -import com.huawei.sermant.backend.entity.OperateType; -import com.huawei.sermant.backend.entity.ServerInfo; +package com.huaweicloud.sermant.backend.server; + +import com.huaweicloud.sermant.backend.cache.CollectorCache; +import com.huaweicloud.sermant.backend.cache.HeartbeatCache; +import com.huaweicloud.sermant.backend.common.conf.DataTypeTopicMapping; +import com.huaweicloud.sermant.backend.common.handler.BaseHandler; +import com.huaweicloud.sermant.backend.common.util.GzipUtils; +import com.huaweicloud.sermant.backend.entity.HeartbeatEntity; +import com.huaweicloud.sermant.backend.entity.OperateType; +import com.huaweicloud.sermant.backend.entity.ServerInfo; import com.huawei.sermant.backend.pojo.Message; import com.alibaba.fastjson.JSON; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/Config.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/Config.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/Config.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/Config.java index 99c370f639..2d981a65da 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/Config.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/Config.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig; +package com.huaweicloud.sermant.backend.service.dynamicconfig; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigType; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/DynamicConfigurationFactoryServiceImpl.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/DynamicConfigurationFactoryServiceImpl.java similarity index 72% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/DynamicConfigurationFactoryServiceImpl.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/DynamicConfigurationFactoryServiceImpl.java index a8c71c0c77..0f71de88a3 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/DynamicConfigurationFactoryServiceImpl.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/DynamicConfigurationFactoryServiceImpl.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig; - -import com.huawei.sermant.backend.service.dynamicconfig.kie.KieDynamicConfigurationServiceImpl; -import com.huawei.sermant.backend.service.dynamicconfig.nop.NopDynamicConfigurationService; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigType; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigurationFactoryService; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; -import com.huawei.sermant.backend.service.dynamicconfig.zookeeper.ZookeeperDynamicConfigurationService; +package com.huaweicloud.sermant.backend.service.dynamicconfig; + +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.KieDynamicConfigurationServiceImpl; +import com.huaweicloud.sermant.backend.service.dynamicconfig.nop.NopDynamicConfigurationService; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigType; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigurationFactoryService; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; +import com.huaweicloud.sermant.backend.service.dynamicconfig.zookeeper.ZookeeperDynamicConfigurationService; + import org.springframework.stereotype.Component; /** diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/KieDynamicConfigurationServiceImpl.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/KieDynamicConfigurationServiceImpl.java similarity index 91% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/KieDynamicConfigurationServiceImpl.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/KieDynamicConfigurationServiceImpl.java index d6d737fa46..f897e9312b 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/KieDynamicConfigurationServiceImpl.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/KieDynamicConfigurationServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie; -import com.huawei.sermant.backend.service.dynamicconfig.Config; -import com.huawei.sermant.backend.service.dynamicconfig.kie.listener.SubscriberManager; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigurationListener; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; -import com.huawei.sermant.backend.service.dynamicconfig.utils.LabelGroupUtils; +import com.huaweicloud.sermant.backend.service.dynamicconfig.Config; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.listener.SubscriberManager; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigurationListener; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; +import com.huaweicloud.sermant.backend.service.dynamicconfig.utils.LabelGroupUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/AbstractClient.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/AbstractClient.java similarity index 84% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/AbstractClient.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/AbstractClient.java index b488f5c7ed..da6ec04b42 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/AbstractClient.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/AbstractClient.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.http.DefaultHttpClient; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.http.HttpClient; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http.DefaultHttpClient; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http.HttpClient; /** * 抽象客户端 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/Client.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/Client.java similarity index 90% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/Client.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/Client.java index 91813a120c..dd927031ea 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/Client.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/Client.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client; /** * 客户端 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/ClientUrlManager.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/ClientUrlManager.java similarity index 89% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/ClientUrlManager.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/ClientUrlManager.java index a4ecca5c88..2213f8ff89 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/ClientUrlManager.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/ClientUrlManager.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client; -import com.huawei.sermant.backend.service.dynamicconfig.kie.selector.url.UrlSelector; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.selector.url.UrlSelector; import java.util.Arrays; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/DefaultHttpClient.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/DefaultHttpClient.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/DefaultHttpClient.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/DefaultHttpClient.java index 43fb846b10..81c06cc21b 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/DefaultHttpClient.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/DefaultHttpClient.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.http; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http; -import com.huawei.sermant.backend.service.dynamicconfig.kie.listener.SubscriberManager; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.listener.SubscriberManager; import com.alibaba.fastjson.JSONObject; @@ -51,7 +51,8 @@ * @author zhouss * @since 2021-11-17 */ -public class DefaultHttpClient implements com.huawei.sermant.backend.service.dynamicconfig.kie.client.http.HttpClient { +public class DefaultHttpClient implements + com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http.HttpClient { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultHttpClient.class); /** diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/HttpClient.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/HttpClient.java similarity index 93% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/HttpClient.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/HttpClient.java index 2d56185e7b..0b3c4179f3 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/HttpClient.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/HttpClient.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.http; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.Client; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.Client; import org.apache.http.client.config.RequestConfig; import java.util.Map; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/HttpResult.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/HttpResult.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/HttpResult.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/HttpResult.java index 83377a30dd..1c23617a57 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/http/HttpResult.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/http/HttpResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.http; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http; import org.apache.http.Header; import org.apache.http.HttpStatus; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieClient.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieClient.java similarity index 89% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieClient.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieClient.java index da835f3b17..0dd54521bc 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieClient.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieClient.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie; -import com.huawei.sermant.backend.service.dynamicconfig.Config; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.AbstractClient; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.ClientUrlManager; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.http.HttpClient; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.http.HttpResult; +import com.huaweicloud.sermant.backend.service.dynamicconfig.Config; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.AbstractClient; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.ClientUrlManager; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http.HttpClient; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http.HttpResult; import org.apache.http.HttpStatus; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieConfigEntity.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieConfigEntity.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieConfigEntity.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieConfigEntity.java index 3469965649..1facec22fc 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieConfigEntity.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieConfigEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie; import java.util.HashMap; import java.util.Map; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieListenerWrapper.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieListenerWrapper.java similarity index 85% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieListenerWrapper.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieListenerWrapper.java index 6def200719..4c020fb1b0 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieListenerWrapper.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieListenerWrapper.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie; + +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.listener.KvDataHolder; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.listener.SubscriberManager; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigChangeType; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigChangedEvent; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigurationListener; -import com.huawei.sermant.backend.service.dynamicconfig.kie.listener.KvDataHolder; -import com.huawei.sermant.backend.service.dynamicconfig.kie.listener.SubscriberManager; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigChangeType; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigChangedEvent; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigurationListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieRequest.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieRequest.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieRequest.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieRequest.java index e1e45ba74e..ff58cb4fb0 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieRequest.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie; import org.apache.http.client.config.RequestConfig; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieResponse.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieResponse.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieResponse.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieResponse.java index 90babf3bfc..e39512a5c5 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieResponse.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieSubscriber.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieSubscriber.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieSubscriber.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieSubscriber.java index a549594f40..c2565b2b54 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/KieSubscriber.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/KieSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie; /** * 增加是否为长请求判断 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/ResultHandler.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/ResultHandler.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/ResultHandler.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/ResultHandler.java index c3eba67ad0..6882195628 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/client/kie/ResultHandler.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/client/kie/ResultHandler.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.http.HttpResult; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.http.HttpResult; import com.alibaba.fastjson.JSONObject; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/constants/KieConstants.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/constants/KieConstants.java similarity index 92% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/constants/KieConstants.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/constants/KieConstants.java index 800e88b2de..a492f39c05 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/constants/KieConstants.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/constants/KieConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.constants; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.constants; /** * Kie配置常量 diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/listener/KvDataHolder.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/listener/KvDataHolder.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/listener/KvDataHolder.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/listener/KvDataHolder.java index f530346628..e3d360a024 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/listener/KvDataHolder.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/listener/KvDataHolder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.listener; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.listener; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie.KieConfigEntity; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie.KieResponse; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie.KieConfigEntity; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie.KieResponse; import java.util.HashMap; import java.util.Map; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/listener/SubscriberManager.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/listener/SubscriberManager.java similarity index 94% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/listener/SubscriberManager.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/listener/SubscriberManager.java index 7a08659434..f337be8cdc 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/listener/SubscriberManager.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/listener/SubscriberManager.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.listener; - -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.ClientUrlManager; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie.KieClient; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie.KieListenerWrapper; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie.KieRequest; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie.KieResponse; -import com.huawei.sermant.backend.service.dynamicconfig.kie.client.kie.KieSubscriber; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigurationListener; -import com.huawei.sermant.backend.service.dynamicconfig.utils.LabelGroupUtils; -import com.huawei.sermant.backend.util.BackendThreadFactory; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.listener; + +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.ClientUrlManager; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie.KieClient; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie.KieListenerWrapper; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie.KieRequest; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie.KieResponse; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.client.kie.KieSubscriber; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigurationListener; +import com.huaweicloud.sermant.backend.service.dynamicconfig.utils.LabelGroupUtils; +import com.huaweicloud.sermant.backend.util.BackendThreadFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.config.RequestConfig; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/SelectStrategy.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/SelectStrategy.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/SelectStrategy.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/SelectStrategy.java index 1411f29ef1..2b6c29a5ce 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/SelectStrategy.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/SelectStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.selector; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.selector; import java.util.List; import java.util.Random; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/Selector.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/Selector.java similarity index 93% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/Selector.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/Selector.java index f2a3707b4d..7b0b0d6d3f 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/Selector.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/Selector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.selector; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.selector; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/url/UrlSelector.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/url/UrlSelector.java similarity index 81% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/url/UrlSelector.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/url/UrlSelector.java index 5e87a21ffa..2e3eb78881 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/kie/selector/url/UrlSelector.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/kie/selector/url/UrlSelector.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.kie.selector.url; +package com.huaweicloud.sermant.backend.service.dynamicconfig.kie.selector.url; -import com.huawei.sermant.backend.service.dynamicconfig.kie.selector.SelectStrategy; -import com.huawei.sermant.backend.service.dynamicconfig.kie.selector.Selector; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.selector.SelectStrategy; +import com.huaweicloud.sermant.backend.service.dynamicconfig.kie.selector.Selector; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/nop/NopDynamicConfigurationService.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/nop/NopDynamicConfigurationService.java similarity index 86% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/nop/NopDynamicConfigurationService.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/nop/NopDynamicConfigurationService.java index 6cf7bc5f36..4b62aecb9c 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/nop/NopDynamicConfigurationService.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/nop/NopDynamicConfigurationService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.nop; +package com.huaweicloud.sermant.backend.service.dynamicconfig.nop; -import com.huawei.sermant.backend.service.dynamicconfig.Config; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigurationListener; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; +import com.huaweicloud.sermant.backend.service.dynamicconfig.Config; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigurationListener; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; /** * This class is for testing purpose only. diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigChangeType.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigChangeType.java similarity index 92% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigChangeType.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigChangeType.java index 61fdb35647..a4fc400d25 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigChangeType.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigChangeType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.service; +package com.huaweicloud.sermant.backend.service.dynamicconfig.service; /** * Config change event type diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigChangedEvent.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigChangedEvent.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigChangedEvent.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigChangedEvent.java index 1e8c9c14a0..b2808803f9 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigChangedEvent.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigChangedEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.service; +package com.huaweicloud.sermant.backend.service.dynamicconfig.service; import java.util.EventObject; import java.util.Objects; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigurationListener.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigurationListener.java similarity index 93% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigurationListener.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigurationListener.java index ca5076ea0e..541fbc2b61 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/ConfigurationListener.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/ConfigurationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.service; +package com.huaweicloud.sermant.backend.service.dynamicconfig.service; import java.util.EventListener; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigType.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigType.java similarity index 93% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigType.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigType.java index 75da5e906c..7761dcb3f9 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigType.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.service; +package com.huaweicloud.sermant.backend.service.dynamicconfig.service; /** * Enum for DynamicConfigType, diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigurationFactoryService.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigurationFactoryService.java similarity index 93% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigurationFactoryService.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigurationFactoryService.java index 56a0087912..2d27d90b78 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigurationFactoryService.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigurationFactoryService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.service; +package com.huaweicloud.sermant.backend.service.dynamicconfig.service; /** * diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigurationService.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigurationService.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigurationService.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigurationService.java index 149a8118b0..dfea05644f 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/service/DynamicConfigurationService.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/service/DynamicConfigurationService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.service; +package com.huaweicloud.sermant.backend.service.dynamicconfig.service; import java.util.List; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/utils/LabelGroupUtils.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/utils/LabelGroupUtils.java similarity index 98% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/utils/LabelGroupUtils.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/utils/LabelGroupUtils.java index 2ddb62bded..d4d94cac9a 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/utils/LabelGroupUtils.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/utils/LabelGroupUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.utils; +package com.huaweicloud.sermant.backend.service.dynamicconfig.utils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/zookeeper/ZookeeperDynamicConfigurationService.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/zookeeper/ZookeeperDynamicConfigurationService.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/zookeeper/ZookeeperDynamicConfigurationService.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/zookeeper/ZookeeperDynamicConfigurationService.java index c8adbceb2a..753e9c5ccc 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/service/dynamicconfig/zookeeper/ZookeeperDynamicConfigurationService.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/service/dynamicconfig/zookeeper/ZookeeperDynamicConfigurationService.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package com.huawei.sermant.backend.service.dynamicconfig.zookeeper; - -import com.huawei.sermant.backend.common.exception.ZookeeperDynamicConfigurationException; -import com.huawei.sermant.backend.service.dynamicconfig.Config; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigChangeType; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigChangedEvent; -import com.huawei.sermant.backend.service.dynamicconfig.service.ConfigurationListener; -import com.huawei.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; +package com.huaweicloud.sermant.backend.service.dynamicconfig.zookeeper; + +import com.huaweicloud.sermant.backend.common.exception.ZookeeperDynamicConfigurationException; +import com.huaweicloud.sermant.backend.service.dynamicconfig.Config; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigChangeType; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigChangedEvent; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.ConfigurationListener; +import com.huaweicloud.sermant.backend.service.dynamicconfig.service.DynamicConfigurationService; + import org.apache.zookeeper.AddWatchMode; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/BackendThreadFactory.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/BackendThreadFactory.java similarity index 97% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/util/BackendThreadFactory.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/BackendThreadFactory.java index edde98285c..6516b3bddb 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/BackendThreadFactory.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/BackendThreadFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.util; +package com.huaweicloud.sermant.backend.util; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/DateUtil.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/DateUtil.java similarity index 95% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/util/DateUtil.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/DateUtil.java index 61d53270e4..9a1bcd3099 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/DateUtil.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/DateUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.util; +package com.huaweicloud.sermant.backend.util; import java.text.SimpleDateFormat; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/RandomUtil.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/RandomUtil.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/util/RandomUtil.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/RandomUtil.java index 66d016306b..8b23b58018 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/RandomUtil.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/RandomUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.util; +package com.huaweicloud.sermant.backend.util; import org.apache.commons.lang.RandomStringUtils; diff --git a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/UuidUtil.java b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/UuidUtil.java similarity index 96% rename from sermant-backend/src/main/java/com/huawei/sermant/backend/util/UuidUtil.java rename to sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/UuidUtil.java index 0b47a912ff..e46f397fdb 100644 --- a/sermant-backend/src/main/java/com/huawei/sermant/backend/util/UuidUtil.java +++ b/sermant-backend/src/main/java/com/huaweicloud/sermant/backend/util/UuidUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.huawei.sermant.backend.util; +package com.huaweicloud.sermant.backend.util; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/sermant-backend/src/test/java/com/huawei/sermant/backend/NettyServerTest.java b/sermant-backend/src/test/java/com/huaweicloud/sermant/backend/NettyServerTest.java similarity index 91% rename from sermant-backend/src/test/java/com/huawei/sermant/backend/NettyServerTest.java rename to sermant-backend/src/test/java/com/huaweicloud/sermant/backend/NettyServerTest.java index bf1bde8367..d469cee650 100644 --- a/sermant-backend/src/test/java/com/huawei/sermant/backend/NettyServerTest.java +++ b/sermant-backend/src/test/java/com/huaweicloud/sermant/backend/NettyServerTest.java @@ -1,10 +1,10 @@ -package com.huawei.sermant.backend; +package com.huaweicloud.sermant.backend; import static org.mockito.Mockito.mock; -import com.huawei.sermant.backend.common.conf.DataTypeTopicMapping; +import com.huaweicloud.sermant.backend.common.conf.DataTypeTopicMapping; import com.huawei.sermant.backend.pojo.Message; -import com.huawei.sermant.backend.server.ServerHandler; +import com.huaweicloud.sermant.backend.server.ServerHandler; import io.netty.channel.embedded.EmbeddedChannel;