From 88fd74cdf4c1010301af7de38a9df9f0ff9a7a1c Mon Sep 17 00:00:00 2001 From: Carpenter Lee Date: Mon, 21 Jan 2019 13:02:52 +0800 Subject: [PATCH] Rename dashboard package name from com.taobao to com.alibaba (#435) Signed-off-by: Carpenter Lee --- sentinel-dashboard/pom.xml | 2 +- .../dashboard/DashboardApplication.java | 2 +- .../client/CommandFailedException.java | 2 +- .../client/CommandNotFoundException.java | 2 +- .../dashboard/client/SentinelApiClient.java | 79 +++++++++---------- .../sentinel/dashboard/config/WebConfig.java | 2 +- .../dashboard/controller/AppController.java | 12 +-- .../controller/AuthorityRuleController.java | 12 +-- .../controller/DegradeController.java | 12 +-- .../dashboard/controller/DemoController.java | 2 +- .../controller/FlowControllerV1.java | 12 +-- .../controller/MachineRegistryController.java | 10 +-- .../controller/MetricController.java | 10 +-- .../controller/ParamFlowRuleController.java | 20 ++--- .../controller/ResourceController.java | 10 +-- .../controller/SystemController.java | 12 +-- .../cluster/ClusterAssignController.java | 12 +-- .../cluster/ClusterConfigController.java | 30 +++---- .../controller/v2/FlowControllerV2.java | 12 +-- .../datasource/entity/ApplicationEntity.java | 4 +- .../datasource/entity/MachineEntity.java | 4 +- .../datasource/entity/MetricEntity.java | 2 +- .../entity/MetricPositionEntity.java | 2 +- .../datasource/entity/SentinelVersion.java | 2 +- .../entity/rule/AbstractRuleEntity.java | 2 +- .../entity/rule/AuthorityRuleEntity.java | 2 +- .../entity/rule/DegradeRuleEntity.java | 2 +- .../entity/rule/FlowRuleEntity.java | 2 +- .../entity/rule/ParamFlowRuleEntity.java | 2 +- .../datasource/entity/rule/RuleEntity.java | 2 +- .../entity/rule/SystemRuleEntity.java | 2 +- .../sentinel/dashboard/discovery/AppInfo.java | 2 +- .../dashboard/discovery/AppManagement.java | 2 +- .../dashboard/discovery/MachineDiscovery.java | 2 +- .../dashboard/discovery/MachineInfo.java | 2 +- .../discovery/SimpleMachineDiscovery.java | 2 +- .../dashboard/domain/ResourceTreeNode.java | 2 +- .../csp/sentinel/dashboard/domain/Result.java | 2 +- .../cluster/ClusterAppAssignResultVO.java | 2 +- .../cluster/ClusterAppFullAssignRequest.java | 4 +- .../ClusterAppSingleServerAssignRequest.java | 4 +- .../domain/cluster/ClusterClientInfoVO.java | 2 +- .../domain/cluster/ClusterGroupEntity.java | 2 +- .../domain/cluster/ClusterStateSingleVO.java | 2 +- .../cluster/ConnectionDescriptorVO.java | 2 +- .../domain/cluster/ConnectionGroupVO.java | 2 +- .../cluster/config/ClusterClientConfig.java | 2 +- .../cluster/config/ServerFlowConfig.java | 2 +- .../cluster/config/ServerTransportConfig.java | 2 +- .../cluster/request/ClusterAppAssignMap.java | 2 +- .../request/ClusterClientModifyRequest.java | 4 +- .../cluster/request/ClusterModifyRequest.java | 2 +- .../request/ClusterServerModifyRequest.java | 6 +- .../state/AppClusterClientStateWrapVO.java | 2 +- .../state/AppClusterServerStateWrapVO.java | 2 +- .../cluster/state/ClusterClientStateVO.java | 4 +- .../cluster/state/ClusterRequestLimitVO.java | 2 +- .../cluster/state/ClusterServerStateVO.java | 8 +- .../state/ClusterStateSimpleEntity.java | 2 +- .../state/ClusterUniversalStatePairVO.java | 2 +- .../state/ClusterUniversalStateVO.java | 2 +- .../dashboard/domain/vo/MachineInfoVo.java | 6 +- .../dashboard/domain/vo/MetricVo.java | 4 +- .../dashboard/domain/vo/ResourceVo.java | 4 +- .../dashboard/metric/MetricFetcher.java | 12 +-- .../metric/InMemoryMetricsRepository.java | 4 +- .../repository/metric/MetricsRepository.java | 2 +- .../rule/InMemAuthorityRuleStore.java | 5 +- .../rule/InMemDegradeRuleStore.java | 5 +- .../repository/rule/InMemFlowRuleStore.java | 4 +- .../rule/InMemParamFlowRuleStore.java | 4 +- .../repository/rule/InMemSystemRuleStore.java | 5 +- .../rule/InMemoryRuleRepositoryAdapter.java | 7 +- .../repository/rule/RuleRepository.java | 4 +- .../dashboard/rule/DynamicRuleProvider.java | 2 +- .../dashboard/rule/DynamicRulePublisher.java | 2 +- .../dashboard/rule/FlowRuleApiProvider.java | 13 +-- .../dashboard/rule/FlowRuleApiPublisher.java | 12 +-- .../service/ClusterAssignService.java | 6 +- .../service/ClusterAssignServiceImpl.java | 19 +++-- .../service/ClusterConfigService.java | 32 ++++---- .../sentinel/dashboard/util/AsyncUtils.java | 2 +- .../dashboard/util/ClusterEntityUtils.java | 16 ++-- .../sentinel/dashboard/util/MachineUtils.java | 5 +- .../sentinel/dashboard/util/RuleUtils.java | 2 +- .../sentinel/dashboard/util/VersionUtils.java | 4 +- .../dashboard/discovery/AppInfoTest.java | 2 +- .../rule/nacos/FlowRuleNacosProvider.java | 6 +- .../rule/nacos/FlowRuleNacosPublisher.java | 6 +- .../dashboard/rule/nacos/NacosConfig.java | 4 +- .../dashboard/rule/nacos/NacosConfigUtil.java | 2 +- 91 files changed, 281 insertions(+), 281 deletions(-) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/DashboardApplication.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/client/CommandFailedException.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/client/CommandNotFoundException.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/client/SentinelApiClient.java (89%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/config/WebConfig.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/AppController.java (87%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/AuthorityRuleController.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/DegradeController.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/DemoController.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/FlowControllerV1.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/MachineRegistryController.java (89%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/MetricController.java (95%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/ParamFlowRuleController.java (93%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/ResourceController.java (91%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/SystemController.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java (90%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java (89%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java (95%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/MachineEntity.java (95%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/MetricEntity.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java (92%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/discovery/AppInfo.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/discovery/AppManagement.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/discovery/MachineDiscovery.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/discovery/MachineInfo.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/ResourceTreeNode.java (99%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/Result.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java (91%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java (91%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java (95%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java (92%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java (92%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java (92%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java (89%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java (90%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java (93%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/vo/MetricVo.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/domain/vo/ResourceVo.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/metric/MetricFetcher.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/metric/MetricsRepository.java (96%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java (87%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java (87%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java (91%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java (91%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java (87%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java (94%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/repository/rule/RuleRepository.java (93%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/DynamicRuleProvider.java (93%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/DynamicRulePublisher.java (95%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java (84%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java (81%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/service/ClusterAssignService.java (88%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java (93%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/service/ClusterConfigService.java (86%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/util/AsyncUtils.java (97%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/util/ClusterEntityUtils.java (89%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/util/MachineUtils.java (95%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/util/RuleUtils.java (98%) rename sentinel-dashboard/src/main/java/com/{taobao => alibaba}/csp/sentinel/dashboard/util/VersionUtils.java (94%) rename sentinel-dashboard/src/test/java/com/{taobao => alibaba}/csp/sentinel/dashboard/discovery/AppInfoTest.java (96%) rename sentinel-dashboard/src/test/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosProvider.java (88%) rename sentinel-dashboard/src/test/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosPublisher.java (88%) rename sentinel-dashboard/src/test/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/nacos/NacosConfig.java (91%) rename sentinel-dashboard/src/test/java/com/{taobao => alibaba}/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java (96%) diff --git a/sentinel-dashboard/pom.xml b/sentinel-dashboard/pom.xml index 7d8bcdaa..7e68b520 100755 --- a/sentinel-dashboard/pom.xml +++ b/sentinel-dashboard/pom.xml @@ -120,7 +120,7 @@ spring-boot-maven-plugin true - com.taobao.csp.sentinel.dashboard.DashboardApplication + com.alibaba.csp.sentinel.dashboard.DashboardApplication diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/DashboardApplication.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/DashboardApplication.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java index a56c0ac0..f7486462 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/DashboardApplication.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard; +package com.alibaba.csp.sentinel.dashboard; import com.alibaba.csp.sentinel.init.InitExecutor; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/CommandFailedException.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/CommandFailedException.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java index 337c0c95..76b6aeb1 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/CommandFailedException.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.client; +package com.alibaba.csp.sentinel.dashboard.client; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/CommandNotFoundException.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/CommandNotFoundException.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java index 3914a9e1..0db95680 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/CommandNotFoundException.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.client; +package com.alibaba.csp.sentinel.dashboard.client; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/SentinelApiClient.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java similarity index 89% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/SentinelApiClient.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java index 6a512099..4d5ccdab 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/client/SentinelApiClient.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.client; +package com.alibaba.csp.sentinel.dashboard.client; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import com.alibaba.csp.sentinel.command.CommandConstants; import com.alibaba.csp.sentinel.config.SentinelConfig; import com.alibaba.csp.sentinel.command.vo.NodeVo; +import com.alibaba.csp.sentinel.dashboard.util.AsyncUtils; import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule; import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; import com.alibaba.csp.sentinel.slots.system.SystemRule; @@ -39,18 +40,18 @@ import com.alibaba.csp.sentinel.util.AssertUtil; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.fastjson.JSON; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterStateSimpleEntity; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; -import com.taobao.csp.sentinel.dashboard.util.RuleUtils; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterStateSimpleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; +import com.alibaba.csp.sentinel.dashboard.util.RuleUtils; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; @@ -65,8 +66,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import static com.taobao.csp.sentinel.dashboard.util.AsyncUtils.*; - /** * Communicate with Sentinel client. * @@ -327,7 +326,7 @@ public class SentinelApiClient { ); } catch (Exception e) { logger.error("Error when fetching parameter flow rules", e); - return newFailedFuture(e); + return AsyncUtils.newFailedFuture(e); } } @@ -482,7 +481,7 @@ public class SentinelApiClient { return CompletableFuture.completedFuture(null); } if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { String data = JSON.toJSONString( @@ -499,12 +498,12 @@ public class SentinelApiClient { return CompletableFuture.completedFuture(null); } else { logger.warn("Push parameter flow rules to client failed: " + e); - return newFailedFuture(new RuntimeException(e)); + return AsyncUtils.newFailedFuture(new RuntimeException(e)); } }); } catch (Exception ex) { logger.warn("Error when setting parameter flow rule", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } @@ -512,7 +511,7 @@ public class SentinelApiClient { public CompletableFuture fetchClusterMode(String app, String ip, int port) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -522,13 +521,13 @@ public class SentinelApiClient { .thenApply(r -> JSON.parseObject(r, ClusterStateSimpleEntity.class)); } catch (Exception ex) { logger.warn("Error when fetching cluster mode", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } public CompletableFuture modifyClusterMode(String app, String ip, int port, int mode) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -541,18 +540,18 @@ public class SentinelApiClient { return CompletableFuture.completedFuture(null); } else { logger.warn("Error when modifying cluster mode: " + e); - return newFailedFuture(new RuntimeException(e)); + return AsyncUtils.newFailedFuture(new RuntimeException(e)); } }); } catch (Exception ex) { logger.warn("Error when modifying cluster mode", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } public CompletableFuture fetchClusterClientInfoAndConfig(String app, String ip, int port) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -562,13 +561,13 @@ public class SentinelApiClient { .thenApply(r -> JSON.parseObject(r, ClusterClientInfoVO.class)); } catch (Exception ex) { logger.warn("Error when fetching cluster client config", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } public CompletableFuture modifyClusterClientConfig(String app, String ip, int port, ClusterClientConfig config) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -581,18 +580,18 @@ public class SentinelApiClient { return CompletableFuture.completedFuture(null); } else { logger.warn("Error when modifying cluster client config: " + e); - return newFailedFuture(new RuntimeException(e)); + return AsyncUtils.newFailedFuture(new RuntimeException(e)); } }); } catch (Exception ex) { logger.warn("Error when modifying cluster client config", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } public CompletableFuture modifyClusterServerFlowConfig(String app, String ip, int port, ServerFlowConfig config) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -605,18 +604,18 @@ public class SentinelApiClient { return CompletableFuture.completedFuture(null); } else { logger.warn("Error when modifying cluster server flow config: " + e); - return newFailedFuture(new RuntimeException(e)); + return AsyncUtils.newFailedFuture(new RuntimeException(e)); } }); } catch (Exception ex) { logger.warn("Error when modifying cluster server flow config", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } public CompletableFuture modifyClusterServerTransportConfig(String app, String ip, int port, ServerTransportConfig config) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -630,18 +629,18 @@ public class SentinelApiClient { return CompletableFuture.completedFuture(null); } else { logger.warn("Error when modifying cluster server transport config: " + e); - return newFailedFuture(new RuntimeException(e)); + return AsyncUtils.newFailedFuture(new RuntimeException(e)); } }); } catch (Exception ex) { logger.warn("Error when modifying cluster server transport config", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } public CompletableFuture modifyClusterServerNamespaceSet(String app, String ip, int port, Set set) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -654,18 +653,18 @@ public class SentinelApiClient { return CompletableFuture.completedFuture(null); } else { logger.warn("Error when modifying cluster server NamespaceSet: " + e); - return newFailedFuture(new RuntimeException(e)); + return AsyncUtils.newFailedFuture(new RuntimeException(e)); } }); } catch (Exception ex) { logger.warn("Error when modifying cluster server NamespaceSet", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } public CompletableFuture fetchClusterServerBasicInfo(String app, String ip, int port) { if (StringUtil.isBlank(ip) || port <= 0) { - return newFailedFuture(new IllegalArgumentException("Invalid parameter")); + return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter")); } try { URIBuilder uriBuilder = new URIBuilder(); @@ -675,7 +674,7 @@ public class SentinelApiClient { .thenApply(r -> JSON.parseObject(r, ClusterServerStateVO.class)); } catch (Exception ex) { logger.warn("Error when fetching cluster sever all config and basic info", ex); - return newFailedFuture(ex); + return AsyncUtils.newFailedFuture(ex); } } } diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/config/WebConfig.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/WebConfig.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/config/WebConfig.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/WebConfig.java index 6fa051f0..d507d584 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/config/WebConfig.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/WebConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.config; +package com.alibaba.csp.sentinel.dashboard.config; import javax.servlet.Filter; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AppController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AppController.java similarity index 87% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AppController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AppController.java index 25e45373..03f6d5dd 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AppController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AppController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.ArrayList; import java.util.Collections; @@ -22,11 +22,11 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import com.taobao.csp.sentinel.dashboard.discovery.AppInfo; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.domain.vo.MachineInfoVo; +import com.alibaba.csp.sentinel.dashboard.discovery.AppInfo; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.domain.vo.MachineInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AuthorityRuleController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AuthorityRuleController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java index 1f28e9ba..f76ec34b 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/AuthorityRuleController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.slots.block.RuleConstant; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.repository.rule.RuleRepository; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DegradeController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DegradeController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java index ef50d2b4..79818e77 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DegradeController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.slots.block.RuleConstant; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.repository.rule.InMemDegradeRuleStore; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemDegradeRuleStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DemoController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DemoController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java index a30ea440..91ae6712 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/DemoController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/FlowControllerV1.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/FlowControllerV1.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java index 94ac3e55..23bdfee7 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/FlowControllerV1.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MachineRegistryController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java similarity index 89% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MachineRegistryController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java index e55f111f..fc84e733 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MachineRegistryController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.Date; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.discovery.MachineDiscovery; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineDiscovery; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MetricController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MetricController.java similarity index 95% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MetricController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MetricController.java index 9de26680..ab90c0fc 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/MetricController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MetricController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.ArrayList; import java.util.Collections; @@ -24,8 +24,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.repository.metric.MetricsRepository; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.metric.MetricsRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,8 +36,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; -import com.taobao.csp.sentinel.dashboard.domain.vo.MetricVo; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; +import com.alibaba.csp.sentinel.dashboard.domain.vo.MetricVo; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ParamFlowRuleController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java similarity index 93% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ParamFlowRuleController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java index dfe2cfba..9d962eae 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ParamFlowRuleController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; @@ -21,18 +21,18 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.slots.block.RuleConstant; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.client.CommandNotFoundException; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.datasource.entity.SentinelVersion; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.repository.rule.RuleRepository; -import com.taobao.csp.sentinel.dashboard.util.VersionUtils; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; +import com.alibaba.csp.sentinel.dashboard.util.VersionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ResourceController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ResourceController.java similarity index 91% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ResourceController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ResourceController.java index 3189923f..f1a9a9df 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/ResourceController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ResourceController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.List; import java.util.stream.Collectors; @@ -21,10 +21,10 @@ import java.util.stream.Collectors; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.csp.sentinel.command.vo.NodeVo; -import com.taobao.csp.sentinel.dashboard.domain.ResourceTreeNode; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.domain.vo.ResourceVo; +import com.alibaba.csp.sentinel.dashboard.domain.ResourceTreeNode; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.domain.vo.ResourceVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/SystemController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/SystemController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java index 437b2e4e..f496a74b 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/SystemController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller; +package com.alibaba.csp.sentinel.dashboard.controller; import java.util.Date; import java.util.List; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.domain.Result; -import com.taobao.csp.sentinel.dashboard.repository.rule.InMemSystemRuleStore; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemSystemRuleStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java similarity index 90% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java index 491386ce..dc2e14f5 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller.cluster; +package com.alibaba.csp.sentinel.dashboard.controller.cluster; import java.util.Collections; import java.util.Set; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppFullAssignRequest; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppSingleServerAssignRequest; -import com.taobao.csp.sentinel.dashboard.service.ClusterAssignService; -import com.taobao.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppFullAssignRequest; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppSingleServerAssignRequest; +import com.alibaba.csp.sentinel.dashboard.service.ClusterAssignService; +import com.alibaba.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java similarity index 89% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java index bcbb3b65..e9b9aed0 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller.cluster; +package com.alibaba.csp.sentinel.dashboard.controller.cluster; import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; import com.alibaba.csp.sentinel.cluster.ClusterStateManager; +import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.taobao.csp.sentinel.dashboard.client.CommandNotFoundException; -import com.taobao.csp.sentinel.dashboard.datasource.entity.SentinelVersion; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterModifyRequest; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; -import com.taobao.csp.sentinel.dashboard.service.ClusterConfigService; -import com.taobao.csp.sentinel.dashboard.util.ClusterEntityUtils; -import com.taobao.csp.sentinel.dashboard.util.VersionUtils; -import com.taobao.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterModifyRequest; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; +import com.alibaba.csp.sentinel.dashboard.service.ClusterConfigService; +import com.alibaba.csp.sentinel.dashboard.util.ClusterEntityUtils; +import com.alibaba.csp.sentinel.dashboard.util.VersionUtils; +import com.alibaba.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java similarity index 95% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java index fb9ecb49..30ae0ba9 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.controller.v2; +package com.alibaba.csp.sentinel.dashboard.controller.v2; import java.util.Date; import java.util.List; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; -import com.taobao.csp.sentinel.dashboard.rule.DynamicRuleProvider; -import com.taobao.csp.sentinel.dashboard.rule.DynamicRulePublisher; -import com.taobao.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; +import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; +import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; +import com.alibaba.csp.sentinel.dashboard.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java index 19dc4a3f..edaee180 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity; +package com.alibaba.csp.sentinel.dashboard.datasource.entity; import java.util.Date; -import com.taobao.csp.sentinel.dashboard.discovery.AppInfo; +import com.alibaba.csp.sentinel.dashboard.discovery.AppInfo; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MachineEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MachineEntity.java similarity index 95% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MachineEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MachineEntity.java index 682e4c78..677e549b 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MachineEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MachineEntity.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity; +package com.alibaba.csp.sentinel.dashboard.datasource.entity; import java.util.Date; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MetricEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MetricEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java index fd3314f6..f08a41a6 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MetricEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity; +package com.alibaba.csp.sentinel.dashboard.datasource.entity; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java index 47fd7d33..2be29eb8 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity; +package com.alibaba.csp.sentinel.dashboard.datasource.entity; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java index f1ebfe04..7fc105ee 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity; +package com.alibaba.csp.sentinel.dashboard.datasource.entity; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java index 7d84eaf7..1f5eaa23 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; +package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java index 6c98d8c1..92496201 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; +package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule; import com.alibaba.csp.sentinel.util.AssertUtil; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java index 07898526..f77d6080 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; +package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java index eb2eced9..65e9acc1 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; +package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java index 3924f1fd..5cb845ba 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; +package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; import java.util.List; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java similarity index 92% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java index eeeb5728..0f22ec53 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; +package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java index 61998038..1c6e3bfd 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.datasource.entity.rule; +package com.alibaba.csp.sentinel.dashboard.datasource.entity.rule; import java.util.Date; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/AppInfo.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfo.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/AppInfo.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfo.java index ff9a5262..b5290306 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/AppInfo.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.discovery; +package com.alibaba.csp.sentinel.dashboard.discovery; import java.util.HashSet; import java.util.Optional; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/AppManagement.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppManagement.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/AppManagement.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppManagement.java index 8002c659..89b7481c 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/AppManagement.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppManagement.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.discovery; +package com.alibaba.csp.sentinel.dashboard.discovery; import java.util.List; import java.util.Set; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/MachineDiscovery.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineDiscovery.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/MachineDiscovery.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineDiscovery.java index 792bf451..88cdbd5e 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/MachineDiscovery.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineDiscovery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.discovery; +package com.alibaba.csp.sentinel.dashboard.discovery; import java.util.List; import java.util.Set; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/MachineInfo.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineInfo.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/MachineInfo.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineInfo.java index 51d2ef95..c4ba88c3 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/MachineInfo.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.discovery; +package com.alibaba.csp.sentinel.dashboard.discovery; import java.util.Date; import java.util.Objects; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java index 1148664f..b0f1f63b 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.discovery; +package com.alibaba.csp.sentinel.dashboard.discovery; import java.util.ArrayList; import java.util.HashSet; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/ResourceTreeNode.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/ResourceTreeNode.java similarity index 99% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/ResourceTreeNode.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/ResourceTreeNode.java index 8011ff8b..fa2e7ca9 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/ResourceTreeNode.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/ResourceTreeNode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain; +package com.alibaba.csp.sentinel.dashboard.domain; import java.util.ArrayList; import java.util.HashMap; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/Result.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/Result.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/Result.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/Result.java index 23d8d84d..2dbf476f 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/Result.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/Result.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain; +package com.alibaba.csp.sentinel.dashboard.domain; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java index 4d684628..b7b48ccf 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; import java.util.Set; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java similarity index 91% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java index d4590ff5..96a3dc93 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; import java.util.List; import java.util.Set; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java similarity index 91% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java index db935032..f9d9bbc0 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; import java.util.Set; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java index 1bff214c..a9437e76 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java index dcbf46f4..eef25521 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; import java.util.HashSet; import java.util.Set; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java index 0013fa56..7678c519 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java similarity index 95% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java index 415aaf6f..71d9e74d 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; /** diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java index 5618c883..af3aa906 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster; +package com.alibaba.csp.sentinel.dashboard.domain.cluster; import java.util.List; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java index 61304798..2cd6bb3b 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.config; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.config; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java index cc62c5c2..3390ea14 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.config; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.config; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java index 698da2e6..58fe12a7 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.config; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.config; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java index 047ef383..3dbf96b1 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.request; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; import java.util.Set; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java similarity index 92% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java index 9c7a28b6..e6ff5610 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.request; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java similarity index 92% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java index 59220749..9f855ef7 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.request; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java similarity index 92% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java index 0d647940..9389f693 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.request; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.request; import java.util.Set; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java index ba642c2c..4076d23b 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java index 1d7b06c8..ed39e7bc 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java similarity index 89% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java index f0ca39b4..ac61b0b9 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java index ba0d0995..6c5da420 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java similarity index 90% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java index e751696b..bb4166de 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; import java.util.List; import java.util.Set; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java index 0ccf5e63..c5537aab 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java index 428915ca..11276560 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java index 78fa7ba3..3e9a787d 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.cluster.state; +package com.alibaba.csp.sentinel.dashboard.domain.cluster.state; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java similarity index 93% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java index 835237e1..1c7ef854 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.vo; +package com.alibaba.csp.sentinel.dashboard.domain.vo; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.taobao.csp.sentinel.dashboard.discovery.MachineDiscovery; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineDiscovery; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MetricVo.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MetricVo.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MetricVo.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MetricVo.java index 460580c6..af64941e 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/MetricVo.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MetricVo.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.vo; +package com.alibaba.csp.sentinel.dashboard.domain.vo; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/ResourceVo.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/ResourceVo.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/ResourceVo.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/ResourceVo.java index a5fb302e..a8ffe24e 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/domain/vo/ResourceVo.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/ResourceVo.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.domain.vo; +package com.alibaba.csp.sentinel.dashboard.domain.vo; import java.util.ArrayList; import java.util.List; import com.alibaba.csp.sentinel.command.vo.NodeVo; -import com.taobao.csp.sentinel.dashboard.domain.ResourceTreeNode; +import com.alibaba.csp.sentinel.dashboard.domain.ResourceTreeNode; /** * @author leyou diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/metric/MetricFetcher.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/metric/MetricFetcher.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/metric/MetricFetcher.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/metric/MetricFetcher.java index 369d0353..0941e549 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/metric/MetricFetcher.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/metric/MetricFetcher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.metric; +package com.alibaba.csp.sentinel.dashboard.metric; import java.net.ConnectException; import java.net.SocketTimeoutException; @@ -36,14 +36,14 @@ import java.util.concurrent.atomic.AtomicLong; import com.alibaba.csp.sentinel.concurrent.NamedThreadFactory; import com.alibaba.csp.sentinel.config.SentinelConfig; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.node.metric.MetricNode; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.repository.metric.MetricsRepository; -import com.taobao.csp.sentinel.dashboard.util.MachineUtils; +import com.alibaba.csp.sentinel.dashboard.repository.metric.MetricsRepository; +import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.concurrent.FutureCallback; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java index c52403b4..d10ecf2c 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.metric; +package com.alibaba.csp.sentinel.dashboard.repository.metric; import java.util.ArrayList; import java.util.HashMap; @@ -24,9 +24,9 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.MetricEntity; import org.springframework.stereotype.Component; /** diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/metric/MetricsRepository.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java similarity index 96% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/metric/MetricsRepository.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java index 5840dd3f..f54cc209 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/metric/MetricsRepository.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.metric; +package com.alibaba.csp.sentinel.dashboard.repository.metric; import java.util.List; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java similarity index 87% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java index e04f0b86..bbeb8889 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.rule; +package com.alibaba.csp.sentinel.dashboard.repository.rule; import java.util.concurrent.atomic.AtomicLong; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; + import org.springframework.stereotype.Component; /** diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java similarity index 87% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java index 13bb02b7..0b9bf7e1 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.rule; +package com.alibaba.csp.sentinel.dashboard.repository.rule; import java.util.concurrent.atomic.AtomicLong; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; + import org.springframework.stereotype.Component; /** diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java similarity index 91% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java index 84742111..c5a2a347 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.rule; +package com.alibaba.csp.sentinel.dashboard.repository.rule; import java.util.concurrent.atomic.AtomicLong; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import com.alibaba.csp.sentinel.slots.block.flow.ClusterFlowConfig; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import org.springframework.stereotype.Component; /** diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java similarity index 91% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java index cf848e5e..5a82f138 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.rule; +package com.alibaba.csp.sentinel.dashboard.repository.rule; import java.util.concurrent.atomic.AtomicLong; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowClusterConfig; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; import org.springframework.stereotype.Component; /** diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java similarity index 87% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java index f1cb7f4b..8d3949b4 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.rule; +package com.alibaba.csp.sentinel.dashboard.repository.rule; import java.util.concurrent.atomic.AtomicLong; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; + import org.springframework.stereotype.Component; /** diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java index 0901426a..c6fdeed3 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.rule; +package com.alibaba.csp.sentinel.dashboard.repository.rule; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.RuleEntity; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.util.AssertUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.RuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; - /** * @author leyou */ diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/RuleRepository.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/RuleRepository.java similarity index 93% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/RuleRepository.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/RuleRepository.java index 6cd3f792..266c2fab 100755 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/repository/rule/RuleRepository.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/RuleRepository.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.repository.rule; +package com.alibaba.csp.sentinel.dashboard.repository.rule; import java.util.List; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; /** * Interface to store and find rules. diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/DynamicRuleProvider.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java similarity index 93% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/DynamicRuleProvider.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java index 20a1e937..7ee38ad1 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/DynamicRuleProvider.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule; +package com.alibaba.csp.sentinel.dashboard.rule; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/DynamicRulePublisher.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java similarity index 95% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/DynamicRulePublisher.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java index 007bb863..940d76af 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/DynamicRulePublisher.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule; +package com.alibaba.csp.sentinel.dashboard.rule; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java similarity index 84% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java index 57c2dc04..cf5d9b2a 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java @@ -13,19 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule; +package com.alibaba.csp.sentinel.dashboard.rule; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.util.MachineUtils; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java similarity index 81% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java index e8656c88..2f653798 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule; +package com.alibaba.csp.sentinel.dashboard.rule; import java.util.List; import java.util.Set; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; -import com.taobao.csp.sentinel.dashboard.util.MachineUtils; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterAssignService.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java similarity index 88% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterAssignService.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java index 3b2a1edf..79a796ed 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterAssignService.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.service; +package com.alibaba.csp.sentinel.dashboard.service; import java.util.List; import java.util.Set; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java similarity index 93% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java index c7ebda82..5ed1af12 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.service; +package com.alibaba.csp.sentinel.dashboard.service; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -29,14 +28,14 @@ import com.alibaba.csp.sentinel.cluster.ClusterStateManager; import com.alibaba.csp.sentinel.util.AssertUtil; import com.alibaba.csp.sentinel.util.function.Tuple2; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; -import com.taobao.csp.sentinel.dashboard.util.MachineUtils; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterAppAssignResultVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterAppAssignMap; +import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterConfigService.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java similarity index 86% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterConfigService.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java index 0e91c617..fe52ee9c 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/service/ClusterConfigService.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.service; +package com.alibaba.csp.sentinel.dashboard.service; import java.util.ArrayList; import java.util.List; @@ -22,23 +22,23 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import com.alibaba.csp.sentinel.cluster.ClusterStateManager; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.discovery.AppInfo; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; +import com.alibaba.csp.sentinel.dashboard.util.AsyncUtils; +import com.alibaba.csp.sentinel.dashboard.util.ClusterEntityUtils; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.client.SentinelApiClient; -import com.taobao.csp.sentinel.dashboard.discovery.AppInfo; -import com.taobao.csp.sentinel.dashboard.discovery.AppManagement; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.request.ClusterServerModifyRequest; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; -import com.taobao.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; -import com.taobao.csp.sentinel.dashboard.util.AsyncUtils; -import com.taobao.csp.sentinel.dashboard.util.ClusterEntityUtils; -import com.taobao.csp.sentinel.dashboard.util.MachineUtils; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.request.ClusterClientModifyRequest; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStateVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig; +import com.alibaba.csp.sentinel.dashboard.util.MachineUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/AsyncUtils.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java similarity index 97% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/AsyncUtils.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java index 20563b61..9881cdac 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/AsyncUtils.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.util; +package com.alibaba.csp.sentinel.dashboard.util; import java.util.List; import java.util.Objects; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/ClusterEntityUtils.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java similarity index 89% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/ClusterEntityUtils.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java index 06f291ba..f36bf296 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/ClusterEntityUtils.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.util; +package com.alibaba.csp.sentinel.dashboard.util; import java.util.ArrayList; import java.util.HashMap; @@ -23,13 +23,13 @@ import java.util.Map; import com.alibaba.csp.sentinel.cluster.ClusterStateManager; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; -import com.taobao.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; -import com.taobao.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterGroupEntity; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.ConnectionGroupVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterClientStateWrapVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.AppClusterServerStateWrapVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterClientStateVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO; +import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterUniversalStatePairVO; /** * @author Eric Zhao diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/MachineUtils.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java similarity index 95% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/MachineUtils.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java index b7836287..1bfbe91d 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/MachineUtils.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.util; +package com.alibaba.csp.sentinel.dashboard.util; import java.util.Optional; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.csp.sentinel.util.function.Tuple2; -import com.taobao.csp.sentinel.dashboard.discovery.MachineInfo; - /** * @author Eric Zhao */ diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/RuleUtils.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/RuleUtils.java similarity index 98% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/RuleUtils.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/RuleUtils.java index e38586c5..8761c048 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/RuleUtils.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/RuleUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.util; +package com.alibaba.csp.sentinel.dashboard.util; import java.util.List; diff --git a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/VersionUtils.java b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java similarity index 94% rename from sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/VersionUtils.java rename to sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java index 3316c328..ad7b6265 100644 --- a/sentinel-dashboard/src/main/java/com/taobao/csp/sentinel/dashboard/util/VersionUtils.java +++ b/sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.util; +package com.alibaba.csp.sentinel.dashboard.util; import java.util.Optional; import com.alibaba.csp.sentinel.util.StringUtil; -import com.taobao.csp.sentinel.dashboard.datasource.entity.SentinelVersion; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; /** * Util class for parsing version. diff --git a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/discovery/AppInfoTest.java b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfoTest.java similarity index 96% rename from sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/discovery/AppInfoTest.java rename to sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfoTest.java index a92c8053..34539f26 100644 --- a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/discovery/AppInfoTest.java +++ b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfoTest.java @@ -1,4 +1,4 @@ -package com.taobao.csp.sentinel.dashboard.discovery; +package com.alibaba.csp.sentinel.dashboard.discovery; import java.util.ConcurrentModificationException; import java.util.Set; diff --git a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosProvider.java b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosProvider.java similarity index 88% rename from sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosProvider.java rename to sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosProvider.java index 0c5fe27e..3f9a3fd3 100644 --- a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosProvider.java +++ b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosProvider.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule.nacos; +package com.alibaba.csp.sentinel.dashboard.rule.nacos; import java.util.ArrayList; import java.util.List; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.nacos.api.config.ConfigService; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.rule.DynamicRuleProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosPublisher.java b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosPublisher.java similarity index 88% rename from sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosPublisher.java rename to sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosPublisher.java index 4b3bf840..8297dec2 100644 --- a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosPublisher.java +++ b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/FlowRuleNacosPublisher.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule.nacos; +package com.alibaba.csp.sentinel.dashboard.rule.nacos; import java.util.List; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.AssertUtil; import com.alibaba.nacos.api.config.ConfigService; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; -import com.taobao.csp.sentinel.dashboard.rule.DynamicRulePublisher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/NacosConfig.java b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfig.java similarity index 91% rename from sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/NacosConfig.java rename to sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfig.java index 146b8697..7cdc980d 100644 --- a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/NacosConfig.java +++ b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfig.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule.nacos; +package com.alibaba.csp.sentinel.dashboard.rule.nacos; import java.util.List; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.api.config.ConfigFactory; import com.alibaba.nacos.api.config.ConfigService; -import com.taobao.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java similarity index 96% rename from sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java rename to sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java index 312d63fd..0c666313 100644 --- a/sentinel-dashboard/src/test/java/com/taobao/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java +++ b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.taobao.csp.sentinel.dashboard.rule.nacos; +package com.alibaba.csp.sentinel.dashboard.rule.nacos; /** * @author Eric Zhao