diff --git a/README-zh.md b/README-zh.md index b246aa18..a08d3b9e 100644 --- a/README-zh.md +++ b/README-zh.md @@ -109,7 +109,7 @@ Example 列表： [RocketMQ Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md) -[Seata Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/seata-example/readme-zh.md) +[Fescar Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/fescar-example/readme-zh.md) [Alibaba Cloud OSS Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/oss-example/readme-zh.md) @@ -139,4 +139,4 @@ spring-cloud-alibaba@googlegroups.com，欢迎通过此邮件列表讨论与 spr ### 钉钉群 -![DingQR](https://cdn.nlark.com/lark/0/2018/png/54319/1544667717958-b3022f21-3357-4270-836d-4064e7ac728c.png) +![DingQR](https://img.alicdn.com/tfs/TB1fr81ba61gK0jSZFlXXXDKFXa-892-1213.jpg) diff --git a/Roadmap-zh.md b/Roadmap-zh.md index 73559795..b22e59ac 100644 --- a/Roadmap-zh.md +++ b/Roadmap-zh.md @@ -25,7 +25,7 @@ Apache RocketMQ™ 基于 Java 的高性能、高吞吐量的分布式消息和 Apache Dubbo™ 是一款高性能 Java RPC 框架。 -**Seata** +**Fescar** 阿里巴巴开源产品，一个易于使用的高性能微服务分布式事务解决方案。 diff --git a/Roadmap.md b/Roadmap.md index 32722c70..490789e1 100644 --- a/Roadmap.md +++ b/Roadmap.md @@ -28,7 +28,7 @@ Apache RocketMQ™ is an open source distributed messaging and streaming data pl Apache Dubbo™ is a high-performance, Java based open source RPC framework. -**Seata** +**Fescar** A distributed transaction solution with high performance and ease of use for microservices architecture. diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java deleted file mode 100644 index 87b60108..00000000 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.cloud.dubbo.http.matcher; - -import java.util.Collection; -import java.util.Iterator; - -/** - * Abstract {@link HttpRequestMatcher} implementation - * - * @author Rossen Stoyanchev - * @author Mercy - */ -public abstract class AbstractHttpRequestMatcher implements HttpRequestMatcher { - - /** - * Return the discrete items a request condition is composed of. - *

For example URL patterns, HTTP request methods, param expressions, etc. - * - * @return a collection of objects, never {@code null} - */ - protected abstract Collection getContent(); - - /** - * The notation to use when printing discrete items of content. - *

For example {@code " || "} for URL patterns or {@code " && "} - * for param expressions. - */ - protected abstract String getToStringInfix(); - - @Override - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (other == null || getClass() != other.getClass()) { - return false; - } - return getContent().equals(((AbstractHttpRequestMatcher)other).getContent()); - } - - @Override - public int hashCode() { - return getContent().hashCode(); - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder("["); - for (Iterator iterator = getContent().iterator(); iterator.hasNext(); ) { - Object expression = iterator.next(); - builder.append(expression.toString()); - if (iterator.hasNext()) { - builder.append(getToStringInfix()); - } - } - builder.append("]"); - return builder.toString(); - } -} diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java deleted file mode 100644 index 942ed31a..00000000 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.alibaba.cloud.nacos.ribbon; - -import com.alibaba.nacos.api.naming.pojo.Instance; -import com.alibaba.nacos.client.naming.core.Balancer; - -import java.util.List; - -/** - * @author itmuch.com - */ -public class ExtendBalancer extends Balancer { - /** - * 根据权重，随机选择实例 - * - * @param instances 实例列表 - * @return 选择的实例 - */ - public static Instance getHostByRandomWeight2(List instances) { - return getHostByRandomWeight(instances); - } -} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java deleted file mode 100644 index e60e2323..00000000 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.cloud.sentinel.datasource.config; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -import org.springframework.core.env.Environment; - -import com.alibaba.cloud.sentinel.datasource.RuleType; -import com.alibaba.csp.sentinel.adapter.gateway.common.api.GatewayApiDefinitionManager; -import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayRuleManager; -import com.alibaba.csp.sentinel.datasource.AbstractDataSource; -import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager; -import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager; -import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; -import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager; -import com.alibaba.csp.sentinel.slots.system.SystemRuleManager; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -/** - * Abstract class Using by {@link DataSourcePropertiesConfiguration} - * - * @author Jim - */ -public class AbstractDataSourceProperties { - - @NotEmpty - private String dataType = "json"; - @NotNull - private RuleType ruleType; - private String converterClass; - @JsonIgnore - private final String factoryBeanName; - @JsonIgnore - private Environment env; - - public AbstractDataSourceProperties(String factoryBeanName) { - this.factoryBeanName = factoryBeanName; - } - - public String getDataType() { - return dataType; - } - - public void setDataType(String dataType) { - this.dataType = dataType; - } - - public RuleType getRuleType() { - return ruleType; - } - - public void setRuleType(RuleType ruleType) { - this.ruleType = ruleType; - } - - public String getConverterClass() { - return converterClass; - } - - public void setConverterClass(String converterClass) { - this.converterClass = converterClass; - } - - public String getFactoryBeanName() { - return factoryBeanName; - } - - protected Environment getEnv() { - return env; - } - - public void setEnv(Environment env) { - this.env = env; - } - - public void preCheck(String dataSourceName) { - - } - - public void postRegister(AbstractDataSource dataSource) { - switch (this.getRuleType()) { - case FLOW: - FlowRuleManager.register2Property(dataSource.getProperty()); - break; - case DEGRADE: - DegradeRuleManager.register2Property(dataSource.getProperty()); - break; - case PARAM_FLOW: - ParamFlowRuleManager.register2Property(dataSource.getProperty()); - break; - case SYSTEM: - SystemRuleManager.register2Property(dataSource.getProperty()); - break; - case AUTHORITY: - AuthorityRuleManager.register2Property(dataSource.getProperty()); - break; - case GW_FLOW: - GatewayRuleManager.register2Property(dataSource.getProperty()); - break; - case GW_API_GROUP: - GatewayApiDefinitionManager.register2Property(dataSource.getProperty()); - break; - default: - break; - } - } -} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java deleted file mode 100644 index a0b3ff65..00000000 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.cloud.sentinel.datasource.factorybean; - -import java.io.File; -import java.nio.charset.Charset; - -import org.springframework.beans.factory.FactoryBean; - -import com.alibaba.csp.sentinel.datasource.Converter; -import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource; - -/** - * A {@link FactoryBean} for creating {@link FileRefreshableDataSource} instance. - * - * @author Jim - * @see FileRefreshableDataSource - */ -public class FileRefreshableDataSourceFactoryBean - implements FactoryBean { - - private String file; - private String charset; - private long recommendRefreshMs; - private int bufSize; - private Converter converter; - - @Override - public FileRefreshableDataSource getObject() throws Exception { - return new FileRefreshableDataSource(new File(file), converter, - recommendRefreshMs, bufSize, Charset.forName(charset)); - } - - @Override - public Class getObjectType() { - return FileRefreshableDataSource.class; - } - - public String getFile() { - return file; - } - - public void setFile(String file) { - this.file = file; - } - - public String getCharset() { - return charset; - } - - public void setCharset(String charset) { - this.charset = charset; - } - - public long getRecommendRefreshMs() { - return recommendRefreshMs; - } - - public void setRecommendRefreshMs(long recommendRefreshMs) { - this.recommendRefreshMs = recommendRefreshMs; - } - - public int getBufSize() { - return bufSize; - } - - public void setBufSize(int bufSize) { - this.bufSize = bufSize; - } - - public Converter getConverter() { - return converter; - } - - public void setConverter(Converter converter) { - this.converter = converter; - } -} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java deleted file mode 100644 index d2939d25..00000000 --- a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java +++ /dev/null @@ -1,231 +0,0 @@ -///* -// * Copyright (C) 2018 the original author or authors. -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// -//package com.alibaba.cloud.sentinel.datasource; -// -//import com.alibaba.cloud.sentinel.datasource.config.ApolloDataSourceProperties; -//import com.alibaba.cloud.sentinel.datasource.config.DataSourcePropertiesConfiguration; -//import com.alibaba.cloud.sentinel.datasource.config.FileDataSourceProperties; -//import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties; -//import com.alibaba.cloud.sentinel.datasource.config.ZookeeperDataSourceProperties; -// -//import static org.junit.Assert.assertEquals; -//import static org.junit.Assert.assertNotNull; -//import static org.junit.Assert.assertNull; -// -//import org.junit.Test; -// -///** -// * @author Jim -// */ -//public class DataSourcePropertiesConfigurationTests { -// -// @Test -// public void testFileAttr() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); -// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, -// dataSourcePropertiesConfiguration.getValidField().size()); -// assertNull("DataSourcePropertiesConfiguration valid properties was not null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// -// FileDataSourceProperties fileDataSourceProperties = buildFileProperties(); -// -// dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties); -// -// assertEquals( -// "DataSourcePropertiesConfiguration valid field size was wrong after set file attribute", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration file properties was null after set file attribute", -// dataSourcePropertiesConfiguration.getFile()); -// assertNotNull( -// "DataSourcePropertiesConfiguration valid properties was null after set file attribute", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testNacosAttr() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); -// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, -// dataSourcePropertiesConfiguration.getValidField().size()); -// assertNull("DataSourcePropertiesConfiguration valid properties was not null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// -// NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties(); -// -// dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties); -// -// assertEquals( -// "DataSourcePropertiesConfiguration valid field size was wrong after set nacos attribute", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration nacos properties was null after set nacos attribute", -// dataSourcePropertiesConfiguration.getNacos()); -// assertNotNull( -// "DataSourcePropertiesConfiguration valid properties was null after set nacos attribute", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testZKAttr() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); -// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, -// dataSourcePropertiesConfiguration.getValidField().size()); -// assertNull("DataSourcePropertiesConfiguration valid properties was not null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// -// ZookeeperDataSourceProperties zookeeperDataSourceProperties = buildZKProperties(); -// -// dataSourcePropertiesConfiguration.setZk(zookeeperDataSourceProperties); -// -// assertEquals( -// "DataSourcePropertiesConfiguration valid field size was wrong after set zk attribute", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration zk properties was null after set zk attribute", -// dataSourcePropertiesConfiguration.getZk()); -// assertNotNull( -// "DataSourcePropertiesConfiguration valid properties was null after set zk attribute", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testApolloAttr() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); -// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, -// dataSourcePropertiesConfiguration.getValidField().size()); -// assertNull("DataSourcePropertiesConfiguration valid properties was not null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// -// ApolloDataSourceProperties apolloDataSourceProperties = buildApolloProperties(); -// -// dataSourcePropertiesConfiguration.setApollo(apolloDataSourceProperties); -// -// assertEquals( -// "DataSourcePropertiesConfiguration valid field size was wrong after set apollo attribute", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration apollo properties was null after set apollo attribute", -// dataSourcePropertiesConfiguration.getApollo()); -// assertNotNull( -// "DataSourcePropertiesConfiguration valid properties was null after set apollo attribute", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testMultiAttr() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); -// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, -// dataSourcePropertiesConfiguration.getValidField().size()); -// assertNull("DataSourcePropertiesConfiguration valid properties was not null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// -// FileDataSourceProperties fileDataSourceProperties = buildFileProperties(); -// NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties(); -// -// dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties); -// dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties); -// -// assertEquals( -// "DataSourcePropertiesConfiguration valid field size was wrong after set file and nacos attribute", -// 2, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNull( -// "DataSourcePropertiesConfiguration valid properties was not null after set file and nacos attribute", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testFileConstructor() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( -// buildFileProperties()); -// assertEquals( -// "DataSourcePropertiesConfiguration file constructor valid field size was wrong", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration file constructor valid properties was null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testNacosConstructor() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( -// buildNacosProperties()); -// assertEquals( -// "DataSourcePropertiesConfiguration nacos constructor valid field size was wrong", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration nacos constructor valid properties was null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testApolloConstructor() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( -// buildApolloProperties()); -// assertEquals( -// "DataSourcePropertiesConfiguration apollo constructor valid field size was wrong", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration apollo constructor valid properties was null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// @Test -// public void testZKConstructor() { -// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( -// buildZKProperties()); -// assertEquals( -// "DataSourcePropertiesConfiguration zk constructor valid field size was wrong", -// 1, dataSourcePropertiesConfiguration.getValidField().size()); -// assertNotNull( -// "DataSourcePropertiesConfiguration zk constructor valid properties was null", -// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); -// } -// -// private FileDataSourceProperties buildFileProperties() { -// FileDataSourceProperties fileDataSourceProperties = new FileDataSourceProperties(); -// -// fileDataSourceProperties.setFile("/tmp/test.json"); -// fileDataSourceProperties.setBufSize(1024); -// fileDataSourceProperties.setRecommendRefreshMs(2000); -// return fileDataSourceProperties; -// } -// -// private NacosDataSourceProperties buildNacosProperties() { -// NacosDataSourceProperties nacosDataSourceProperties = new NacosDataSourceProperties(); -// nacosDataSourceProperties.setServerAddr("127.0.0.1:8848"); -// nacosDataSourceProperties.setDataId("sentinel"); -// nacosDataSourceProperties.setGroupId("custom-group"); -// return nacosDataSourceProperties; -// } -// -// private ApolloDataSourceProperties buildApolloProperties() { -// ApolloDataSourceProperties apolloDataSourceProperties = new ApolloDataSourceProperties(); -// apolloDataSourceProperties.setFlowRulesKey("test-key"); -// apolloDataSourceProperties.setDefaultFlowRuleValue("dft-val"); -// apolloDataSourceProperties.setNamespaceName("namespace"); -// return apolloDataSourceProperties; -// } -// -// private ZookeeperDataSourceProperties buildZKProperties() { -// ZookeeperDataSourceProperties zookeeperDataSourceProperties = new ZookeeperDataSourceProperties(); -// -// zookeeperDataSourceProperties.setServerAddr("localhost:2181"); -// zookeeperDataSourceProperties.setPath("/path"); -// return zookeeperDataSourceProperties; -// } -// -//} diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java deleted file mode 100644 index a50a7d11..00000000 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2018 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.cloud.sentinel.endpoint; - -import com.alibaba.csp.sentinel.datasource.AbstractDataSource; -import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider; -import com.alibaba.csp.sentinel.transport.HeartbeatSender; -import com.alibaba.csp.sentinel.transport.config.TransportConfig; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.HealthIndicator; -import org.springframework.boot.actuate.health.Status; -import com.alibaba.cloud.sentinel.SentinelProperties; -import org.springframework.util.StringUtils; - -import java.util.HashMap; -import java.util.Map; - -/** - * A {@link HealthIndicator} for Sentinel, which checks the status of - * Sentinel Dashboard and DataSource. - * - *

- * Check the status of Sentinel Dashboard by sending a heartbeat message to it. - * If return true, it's OK. - * - * Check the status of Sentinel DataSource by calling loadConfig method of {@link AbstractDataSource}. - * If no Exception thrown, it's OK. - * - * If Dashboard and DataSource are both OK, the health status is UP. - *

- * - *

- * Note: - * If Sentinel isn't enabled, the health status is up. - * If Sentinel Dashboard isn't configured, it's OK and mark the status of Dashboard with UNKNOWN. - * More informations are provided in details. - *

- * - * @author cdfive - */ -public class SentinelHealthIndicator extends AbstractHealthIndicator { - - private DefaultListableBeanFactory beanFactory; - - private SentinelProperties sentinelProperties; - - public SentinelHealthIndicator(DefaultListableBeanFactory beanFactory, SentinelProperties sentinelProperties) { - this.beanFactory = beanFactory; - this.sentinelProperties = sentinelProperties; - } - - @Override - protected void doHealthCheck(Health.Builder builder) throws Exception { - Map detailMap = new HashMap<>(); - - // If sentinel isn't enabled, set the status up and set the enabled to false in detail - if (!sentinelProperties.isEnabled()) { - detailMap.put("enabled", false); - builder.up().withDetails(detailMap); - return; - } - - detailMap.put("enabled", true); - - // Check health of Dashboard - boolean dashboardUp = true; - String consoleServer = TransportConfig.getConsoleServer(); - if (StringUtils.isEmpty(consoleServer)) { - // If Dashboard isn't configured, it's OK and mark the status of Dashboard with UNKNOWN. - detailMap.put("dashboard", new Status(Status.UNKNOWN.getCode(), "dashboard isn't configured")); - } else { - // If Dashboard is configured, send a heartbeat message to it and check the result - HeartbeatSender heartbeatSender = HeartbeatSenderProvider.getHeartbeatSender(); - boolean result = heartbeatSender.sendHeartbeat(); - if (result) { - detailMap.put("dashboard", Status.UP); - } else { - // If failed to send heartbeat message, means that the Dashboard is DOWN - dashboardUp = false; - detailMap.put("dashboard", new Status(Status.DOWN.getCode(), consoleServer + " can't be connected")); - } - } - - // Check health of DataSource - boolean dataSourceUp = true; - Map dataSourceDetailMap = new HashMap<>(); - detailMap.put("dataSource", dataSourceDetailMap); - - // Get all DataSources and each call loadConfig to check if it's OK - // If no Exception thrown, it's OK - // Note: - // Even if the dynamic config center is down, the loadConfig() might return successfully - // e.g. for Nacos client, it might retrieve from the local cache) - // But in most circumstances it's okay - Map dataSourceMap = beanFactory.getBeansOfType(AbstractDataSource.class); - for (Map.Entry dataSourceMapEntry : dataSourceMap.entrySet()) { - String dataSourceBeanName = dataSourceMapEntry.getKey(); - AbstractDataSource dataSource = dataSourceMapEntry.getValue(); - try { - dataSource.loadConfig(); - dataSourceDetailMap.put(dataSourceBeanName, Status.UP); - } catch (Exception e) { - // If one DataSource failed to loadConfig, means that the DataSource is DOWN - dataSourceUp = false; - dataSourceDetailMap.put(dataSourceBeanName, new Status(Status.DOWN.getCode(), e.getMessage())); - } - } - - // If Dashboard and DataSource are both OK, the health status is UP - if (dashboardUp && dataSourceUp) { - builder.up().withDetails(detailMap); - } else { - builder.down().withDetails(detailMap); - } - } -} diff --git a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java deleted file mode 100644 index 21854467..00000000 --- a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2018 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.cloud.sentinel.endpoint; - -import com.alibaba.csp.sentinel.config.SentinelConfig; -import com.alibaba.csp.sentinel.datasource.AbstractDataSource; -import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource; -import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider; -import com.alibaba.csp.sentinel.transport.HeartbeatSender; -import com.alibaba.csp.sentinel.transport.config.TransportConfig; -import org.junit.Before; -import org.junit.Test; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; -import com.alibaba.cloud.sentinel.SentinelProperties; -import org.springframework.util.ReflectionUtils; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -/** - * Test cases for {@link SentinelHealthIndicator}. - * - * @author cdfive - */ -public class SentinelHealthIndicatorTests { - - private SentinelHealthIndicator sentinelHealthIndicator; - - private DefaultListableBeanFactory beanFactory; - - private SentinelProperties sentinelProperties; - - private HeartbeatSender heartbeatSender; - - @Before - public void setUp() { - beanFactory = mock(DefaultListableBeanFactory.class); - sentinelProperties = mock(SentinelProperties.class); - sentinelHealthIndicator = new SentinelHealthIndicator(beanFactory, sentinelProperties); - - SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, ""); - - heartbeatSender = mock(HeartbeatSender.class); - Field heartbeatSenderField = ReflectionUtils.findField(HeartbeatSenderProvider.class, "heartbeatSender"); - heartbeatSenderField.setAccessible(true); - ReflectionUtils.setField(heartbeatSenderField, null, heartbeatSender); - } - - @Test - public void testSentinelNotEnabled() { - when(sentinelProperties.isEnabled()).thenReturn(false); - - Health health = sentinelHealthIndicator.health(); - - assertThat(health.getStatus()).isEqualTo(Status.UP); - assertThat(health.getDetails().get("enabled")).isEqualTo(false); - } - - @Test - public void testSentinelDashboardNotConfigured() { - when(sentinelProperties.isEnabled()).thenReturn(true); - - Health health = sentinelHealthIndicator.health(); - - assertThat(health.getStatus()).isEqualTo(Status.UP); - assertThat(health.getDetails().get("dashboard")).isEqualTo(Status.UNKNOWN); - } - - @Test - public void testSentinelDashboardConfiguredSuccess() throws Exception { - when(sentinelProperties.isEnabled()).thenReturn(true); - SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); - when(heartbeatSender.sendHeartbeat()).thenReturn(true); - - Health health = sentinelHealthIndicator.health(); - - assertThat(health.getStatus()).isEqualTo(Status.UP); - } - - @Test - public void testSentinelDashboardConfiguredFailed() throws Exception { - when(sentinelProperties.isEnabled()).thenReturn(true); - SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); - when(heartbeatSender.sendHeartbeat()).thenReturn(false); - - - Health health = sentinelHealthIndicator.health(); - - assertThat(health.getStatus()).isEqualTo(Status.DOWN); - assertThat(health.getDetails().get("dashboard")).isEqualTo(new Status(Status.DOWN.getCode(), "localhost:8080 can't be connected")); - } - - @Test - public void testSentinelDataSourceSuccess() throws Exception { - when(sentinelProperties.isEnabled()).thenReturn(true); - SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); - when(heartbeatSender.sendHeartbeat()).thenReturn(true); - - Map dataSourceMap = new HashMap<>(); - - FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class); - dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1); - - FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class); - dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2); - - when(beanFactory.getBeansOfType(AbstractDataSource.class)).thenReturn(dataSourceMap); - - Health health = sentinelHealthIndicator.health(); - - assertThat(health.getStatus()).isEqualTo(Status.UP); - Map dataSourceDetailMap = (Map) health.getDetails().get("dataSource"); - assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource")).isEqualTo(Status.UP); - assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource")).isEqualTo(Status.UP); - } - - @Test - public void testSentinelDataSourceFailed() throws Exception { - when(sentinelProperties.isEnabled()).thenReturn(true); - SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); - when(heartbeatSender.sendHeartbeat()).thenReturn(true); - - Map dataSourceMap = new HashMap<>(); - - FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class); - dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1); - - FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class); - when(fileDataSource2.loadConfig()).thenThrow(new RuntimeException("fileDataSource2 error")); - dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2); - - when(beanFactory.getBeansOfType(AbstractDataSource.class)).thenReturn(dataSourceMap); - - Health health = sentinelHealthIndicator.health(); - - assertThat(health.getStatus()).isEqualTo(Status.DOWN); - Map dataSourceDetailMap = (Map) health.getDetails().get("dataSource"); - assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource")).isEqualTo(Status.UP); - assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource")).isEqualTo(new Status(Status.DOWN.getCode(), "fileDataSource2 error")); - } -} diff --git a/alibaba-spring-cloud-starter/pom.xml b/alibaba-spring-cloud-starter/pom.xml deleted file mode 100644 index 4da374c5..00000000 --- a/alibaba-spring-cloud-starter/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - - com.alibaba.cloud - spring-cloud-alibaba - 0.9.1.BUILD-SNAPSHOT - ../pom.xml - - alibaba-spring-cloud-starter - pom - Alibaba Spring Cloud Starters - Alibaba Spring Cloud Starters - - alibaba-nacos-config-spring-cloud-starter - alibaba-nacos-config-server-spring-cloud-starter - alibaba-nacos-discovery-spring-cloud-starter - alibaba-sentinel-spring-cloud-starter - alibaba-seata-spring-cloud-starter - rocketmq-spring-cloud-starter-stream - rocketmq-spring-cloud-starter-bus - dubbo-spring-cloud-starter - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index bb0f17c2..2bd3102b 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,8 @@ flystar32@163.com - fangjian0423 fangjian fangjian0423@gmail.com - Alibaba - https://github.com/fangjian0423 xiaolongzuo @@ -93,26 +90,26 @@ - alibaba-spring-cloud-dependencies - alibaba-sentinel-spring-cloud - alibaba-sentinel-datasource-spring-cloud - alibaba-sentinel-gateway-spring-cloud - alibaba-nacos-config-spring-cloud - alibaba-nacos-discovery-spring-cloud - alibaba-seata-spring-cloud - rocketmq-spring-cloud-stream-binder - alibaba-nacos-config-server-spring-cloud - alibaba-dubbo-spring-cloud - alicloud-context-spring-cloud + spring-cloud-alibaba-dependencies + spring-cloud-alibaba-sentinel + spring-cloud-alibaba-sentinel-datasource + spring-cloud-alibaba-sentinel-gateway + spring-cloud-alibaba-nacos-config + spring-cloud-alibaba-nacos-discovery + spring-cloud-alibaba-seata + spring-cloud-stream-binder-rocketmq + spring-cloud-alibaba-nacos-config-server + spring-cloud-alibaba-dubbo + spring-cloud-alicloud-context spring-cloud-alibaba-examples spring-cloud-alibaba-docs - alibaba-spring-cloud-starter - alicloud-spring-cloud-starter - alicloud-oss-spring-cloud - alicloud-acm-spring-cloud - alicloud-ans-spring-cloud - alicloud-schedulerx-spring-cloud - alicloud-sms-spring-cloud + spring-cloud-starter-alibaba + spring-cloud-starter-alicloud + spring-cloud-alicloud-oss + spring-cloud-alicloud-acm + spring-cloud-alicloud-ans + spring-cloud-alicloud-schedulerx + spring-cloud-alicloud-sms spring-cloud-alibaba-coverage @@ -130,7 +127,7 @@ com.alibaba.cloud - alibaba-spring-cloud-dependencies + spring-cloud-alibaba-dependencies ${project.version} pom import diff --git a/spring-cloud-alibaba-coverage/pom.xml b/spring-cloud-alibaba-coverage/pom.xml index 0791ad71..589a50f5 100644 --- a/spring-cloud-alibaba-coverage/pom.xml +++ b/spring-cloud-alibaba-coverage/pom.xml @@ -18,52 +18,52 @@ com.alibaba.cloud - alibaba-dubbo-spring-cloud + spring-cloud-alibaba-dubbo ${spring.cloud.alibaba.version} com.alibaba.cloud - alibaba-nacos-config-spring-cloud + spring-cloud-alibaba-nacos-config ${spring.cloud.alibaba.version} com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud + spring-cloud-alibaba-nacos-discovery ${spring.cloud.alibaba.version} com.alibaba.cloud - alibaba-sentinel-spring-cloud + spring-cloud-alibaba-sentinel ${spring.cloud.alibaba.version} com.alibaba.cloud - alibaba-sentinel-datasource-spring-cloud + spring-cloud-alibaba-sentinel-datasource ${spring.cloud.alibaba.version} com.alibaba.cloud - alicloud-acm-spring-cloud + spring-cloud-alicloud-acm ${spring.cloud.alibaba.version} com.alibaba.cloud - alicloud-ans-spring-cloud + spring-cloud-alicloud-ans ${spring.cloud.alibaba.version} com.alibaba.cloud - alicloud-context-spring-cloud + spring-cloud-alicloud-context ${spring.cloud.alibaba.version} com.alibaba.cloud - rocketmq-spring-cloud-stream-binder + spring-cloud-stream-binder-rocketmq ${spring.cloud.alibaba.version} com.alibaba.cloud - alibaba-seata-spring-cloud + spring-cloud-alibaba-seata ${spring.cloud.alibaba.version} diff --git a/alibaba-spring-cloud-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml similarity index 88% rename from alibaba-spring-cloud-dependencies/pom.xml rename to spring-cloud-alibaba-dependencies/pom.xml index 1bd5c9c8..57b7ed10 100644 --- a/alibaba-spring-cloud-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -11,16 +11,16 @@ com.alibaba.cloud - alibaba-spring-cloud-dependencies + spring-cloud-alibaba-dependencies 0.9.1.BUILD-SNAPSHOT pom - Alibaba Spring Cloud Dependencies - BOM for Spring Cloud Alibaba Dependencies + Spring Cloud Alibaba Dependencies + Spring Cloud Alibaba Dependencies 1.6.2 3.1.0 - 0.5.2 + 0.7.1 1.1.1 0.8.0 1.0.9 @@ -210,7 +210,7 @@ io.seata - seata-spring + seata-all ${seata.version} @@ -259,156 +259,156 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud + spring-cloud-alibaba-sentinel ${project.version} com.alibaba.cloud - alibaba-sentinel-datasource-spring-cloud + spring-cloud-alibaba-sentinel-datasource ${project.version} com.alibaba.cloud - alibaba-sentinel-gateway-spring-cloud + spring-cloud-alibaba-sentinel-gateway ${project.version} com.alibaba.cloud - alicloud-oss-spring-cloud + spring-cloud-alicloud-oss ${project.version} com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud + spring-cloud-alibaba-nacos-discovery ${project.version} com.alibaba.cloud - alibaba-nacos-config-spring-cloud + spring-cloud-alibaba-nacos-config ${project.version} com.alibaba.cloud - alibaba-nacos-config-server-spring-cloud + spring-cloud-alibaba-nacos-config-server ${project.version} com.alibaba.cloud - alibaba-seata-spring-cloud + spring-cloud-alibaba-seata ${project.version} com.alibaba.cloud - alicloud-acm-spring-cloud + spring-cloud-alicloud-acm ${project.version} com.alibaba.cloud - alicloud-ans-spring-cloud + spring-cloud-alicloud-ans ${project.version} com.alibaba.cloud - alicloud-schedulerx-spring-cloud + spring-cloud-alicloud-schedulerx ${project.version} com.alibaba.cloud - alicloud-sms-spring-cloud + spring-cloud-alicloud-sms ${project.version} com.alibaba.cloud - alicloud-context-spring-cloud + spring-cloud-alicloud-context ${project.version} com.alibaba.cloud - rocketmq-spring-cloud-stream-binder + spring-cloud-stream-binder-rocketmq ${project.version} com.alibaba.cloud - alibaba-dubbo-spring-cloud + spring-cloud-alibaba-dubbo ${project.version} com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel ${project.version} com.alibaba.cloud - alicloud-oss-spring-cloud-starter + spring-cloud-starter-alicloud-oss ${project.version} com.alibaba.cloud - alibaba-seata-spring-cloud-starter + spring-cloud-starter-alibaba-seata ${project.version} com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery ${project.version} com.alibaba.cloud - alibaba-nacos-config-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-config ${project.version} com.alibaba.cloud - alibaba-nacos-config-server-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-config-server ${project.version} com.alibaba.cloud - alicloud-ans-spring-cloud-starter + spring-cloud-starter-alicloud-ans ${project.version} com.alibaba.cloud - alicloud-acm-spring-cloud-starter + spring-cloud-starter-alicloud-acm ${project.version} com.alibaba.cloud - alicloud-schedulerx-spring-cloud-starter + spring-cloud-starter-alicloud-schedulerx ${project.version} com.alibaba.cloud - rocketmq-spring-cloud-starter-stream + spring-cloud-starter-stream-rocketmq ${project.version} com.alibaba.cloud - rocketmq-spring-cloud-starter-bus + spring-cloud-starter-bus-rocketmq ${project.version} com.alibaba.cloud - alicloud-sms-spring-cloud-starter + spring-cloud-starter-alicloud-sms ${project.version} com.alibaba.cloud - dubbo-spring-cloud-starter + spring-cloud-starter-dubbo ${project.version} diff --git a/spring-cloud-alibaba-docs/pom.xml b/spring-cloud-alibaba-docs/pom.xml index 2e2925fa..af8b12c9 100644 --- a/spring-cloud-alibaba-docs/pom.xml +++ b/spring-cloud-alibaba-docs/pom.xml @@ -9,7 +9,6 @@ 4.0.0 - com.alibaba.cloud spring-cloud-alibaba-docs Spring Cloud Alibaba Documentation pom diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/acm.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/acm.adoc index 1de933a1..03e90861 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/acm.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/acm.adoc @@ -6,12 +6,12 @@ Spring Cloud AliCloud ACM 是 Config Server 和 Client 的替代方案，客户 === 如何引入 Spring Cloud AliCloud ACM -如果要在您的项目中引入 ACM，使用 group ID 为 `org.springframework.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-acm` 的 starter。 +如果要在您的项目中引入 ACM，使用 group ID 为 `com.alibaba.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-acm` 的 starter。 [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-acm ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/ans.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/ans.adoc index 53fbf28f..8e43cdf6 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/ans.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/ans.adoc @@ -4,12 +4,12 @@ ANS（Application Naming Service） 是隶属于阿里云 EDAS 产品的组件 === 如何引入 Spring Cloud AliCloud ANS -如果要在您的项目中引入 ANS，使用 group ID 为 `org.springframework.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-ans` 的 starter。 +如果要在您的项目中引入 ANS，使用 group ID 为 `com.alibaba.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-ans` 的 starter。 [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-ans ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc index 32e8c6a4..dca74840 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc @@ -28,12 +28,12 @@ NOTE: 注意dataid是以 properties(默认的文件扩展名方式)为扩展名 ===== 客户端使用方式 -如果要在您的项目中使用 Nacos 来实现应用的外部化配置，使用 group ID 为 `org.springframework.cloud` 和 artifact ID 为 `spring-cloud-starter-alibaba-nacos-config` 的 starter。 +如果要在您的项目中使用 Nacos 来实现应用的外部化配置，使用 group ID 为 `com.alibaba.cloud` 和 artifact ID 为 `spring-cloud-starter-alibaba-nacos-config` 的 starter。 [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-discovery.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-discovery.adoc index 08c7d0ba..825b6694 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-discovery.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-discovery.adoc @@ -11,12 +11,12 @@ Discovery Starter 也将服务实例自身的一些元数据信息-例如 host ==== 如何引入 Nacos Discovery Starter -如果要在您的项目中使用 Nacos 来实现服务发现，使用 group ID 为 `org.springframework.cloud` 和 artifact ID 为 `spring-cloud-starter-alibaba-nacos-discovery` 的 starter。 +如果要在您的项目中使用 Nacos 来实现服务发现，使用 group ID 为 `com.alibaba.cloud` 和 artifact ID 为 `spring-cloud-starter-alibaba-nacos-discovery` 的 starter。 [source,xml,indent=0] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery ---- @@ -82,7 +82,7 @@ Discovery Starter 也将服务实例自身的一些元数据信息-例如 host - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/oss.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/oss.adoc index 4d025df1..c18adea5 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/oss.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/oss.adoc @@ -9,7 +9,7 @@ OSS（Object Storage Service）是阿里云的一款对象存储服务产品， [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-oss ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq.adoc index 557fe2e5..8c328533 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq.adoc @@ -121,7 +121,7 @@ messageChannel.send(MessageBuilder.withPayload("simple msg").build()); ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-stream-binder-rocketmq ``` @@ -130,7 +130,7 @@ messageChannel.send(MessageBuilder.withPayload("simple msg").build()); ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-stream-rocketmq ``` diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc index 12796181..d26983d0 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc @@ -4,12 +4,12 @@ SchedulerX（分布式任务调度） 是隶属于阿里云EDAS产品的组件 === 如何引入 Spring Cloud AliCloud SchedulerX -如果要在您的项目中引入 SchedulerX，使用 group ID 为 `org.springframework.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-schedulerX` 的 starter。 +如果要在您的项目中引入 SchedulerX，使用 group ID 为 `com.alibaba.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-schedulerX` 的 starter。 [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-schedulerX ---- @@ -75,7 +75,7 @@ public class SimpleTask implements ScxSimpleJobProcessor { [source,text] ---- Job分组：测试——***-*-*-**** -Job处理接口：com.alibaba.cloud.examples.SimpleTask +Job处理接口：SimpleTask 类型：简单Job单机版 定时表达式：默认选项——0 * * * * ? Job描述：无 diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc index fa6e2bba..79ef08e8 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc @@ -18,7 +18,7 @@ https://github.com/alibaba/Sentinel[Sentinel] 具有以下特征: ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel ``` @@ -193,7 +193,7 @@ spring.cloud.sentinel.datasource.ds1.file.rule-type=flow #spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json #spring.cloud.sentinel.datasource.ds1.file.data-type=custom -#spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter +#spring.cloud.sentinel.datasource.ds1.file.converter-class=JsonFlowRuleListConverter #spring.cloud.sentinel.datasource.ds1.file.rule-type=flow spring.cloud.sentinel.datasource.ds2.nacos.server-addr=localhost:8848 @@ -219,7 +219,7 @@ NOTE: d1, ds2, ds3, ds4 是 `ReadableDataSource` 的名字，可随意编写。 每种数据源都有两个共同的配置项： `data-type`、 `converter-class` 以及 `rule-type`。 -`data-type` 配置项表示 `Converter` 类型，Spring Cloud Alibaba Sentinel 默认提供两种内置的值，分别是 `json` 和 `xml` (不填默认是json)。 如果不想使用内置的 `json` 或 `xml` 这两种 `Converter`，可以填写 `custom` 表示自定义 `Converter`，然后再配置 `converter-class` 配置项，该配置项需要写类的全路径名(比如 `spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter`)。 +`data-type` 配置项表示 `Converter` 类型，Spring Cloud Alibaba Sentinel 默认提供两种内置的值，分别是 `json` 和 `xml` (不填默认是json)。 如果不想使用内置的 `json` 或 `xml` 这两种 `Converter`，可以填写 `custom` 表示自定义 `Converter`，然后再配置 `converter-class` 配置项，该配置项需要写类的全路径名(比如 `spring.cloud.sentinel.datasource.ds1.file.converter-class=JsonFlowRuleListConverter`)。 `rule-type` 配置表示该数据源中的规则属于哪种类型的规则(`flow`，`degrade`，`authority`，`system`, `param-flow`)。 diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sms.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sms.adoc index 8e9086f2..e5af0329 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sms.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sms.adoc @@ -4,12 +4,12 @@ === 如何引入 Spring Cloud AliCloud SMS -如果要在您的项目中引入 SMS，使用 group ID 为 `org.springframework.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-sms` 的 starter。 +如果要在您的项目中引入 SMS，使用 group ID 为 `com.alibaba.cloud` 和 artifact ID 为 `spring-cloud-starter-alicloud-sms` 的 starter。 [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-sms ---- @@ -181,7 +181,7 @@ spring.cloud.alicloud.sms.report-queue-name=Alicom-Queue-********-SmsReport */ @Component public class SmsReportMessageListener - implements org.springframework.cloud.alicloud.sms.SmsReportMessageListener { + implements SmsReportMessageListener { @Override public boolean dealMessage(Message message) { @@ -217,7 +217,7 @@ spring.cloud.alicloud.sms.up-queue-name=Alicom-Queue-********-SmsUp */ @Component public class SmsUpMessageListener - implements org.springframework.cloud.alicloud.sms.SmsUpMessageListener { + implements SmsUpMessageListener { @Override public boolean dealMessage(Message message) { diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/acm.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/acm.adoc index 6c31d073..42ed6ceb 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/acm.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/acm.adoc @@ -6,12 +6,12 @@ Spring Cloud Alibaba Cloud ACM is an alternative solution for Config Server and === How to Introduce Spring Cloud Alibaba Cloud ACM -If you want to use ACM in your project, please use the starter with the group ID as `org.springframework.cloud` and the artifact ID as `spring-cloud-starter-alicloud-acm`. +If you want to use ACM in your project, please use the starter with the group ID as `com.alibaba.cloud` and the artifact ID as `spring-cloud-starter-alicloud-acm`. [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-acm ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/ans.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/ans.adoc index 4728bc11..e9c025b5 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/ans.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/ans.adoc @@ -4,12 +4,12 @@ ANS(Application Naming Service) is a component of EDAS. Spring Cloud Alibaba Cl === How to Introduce Spring Cloud Alibaba Cloud ANS -If you want to use ANS in your project, please use the starter with the group ID as `org.springframework.cloud` and the artifact ID as `spring-cloud-starter-alicloud-ans`. +If you want to use ANS in your project, please use the starter with the group ID as `com.alibaba.cloud` and the artifact ID as `spring-cloud-starter-alicloud-ans`. [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-ans ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-config.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-config.adoc index e1d5be46..b610cf4b 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-config.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-config.adoc @@ -28,12 +28,12 @@ NOTE: The default file extension of dataid is properties. ===== Usage on the Client -If you want to use Nacos to manage externalized configurations for your applications, please use the starter with the group ID as `org.springframework.cloud` and the artifact ID as `spring-cloud-starter-alibaba-nacos-config`. +If you want to use Nacos to manage externalized configurations for your applications, please use the starter with the group ID as `com.alibaba.cloud` and the artifact ID as `spring-cloud-starter-alibaba-nacos-config`. [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-discovery.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-discovery.adoc index 65e26897..16bb6acc 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-discovery.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-discovery.adoc @@ -11,12 +11,12 @@ Discovery Starter registers some of the metadata of the service instance, such a ==== How to Introduce Nacos Discovery Starter -please use the starter with the group ID as `org.springframework.cloud` and the artifact ID as `spring-cloud-starter-alibaba-nacos-discovery`. +please use the starter with the group ID as `com.alibaba.cloud` and the artifact ID as `spring-cloud-starter-alibaba-nacos-discovery`. [source,xml,indent=0] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery ---- @@ -82,7 +82,7 @@ The following sample illustrates how to register a service to Nacos. - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/oss.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/oss.adoc index 75a98e7b..7a59c11c 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/oss.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/oss.adoc @@ -26,7 +26,7 @@ Next we need to introduce Spring Cloud Alibaba Cloud OSS Starter. [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-oss ---- diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/rocketmq.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/rocketmq.adoc index b147b87d..48d7f750 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/rocketmq.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/rocketmq.adoc @@ -120,7 +120,7 @@ For using the Spring Cloud Alibaba RocketMQ Binder, you just need to add it to y ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-stream-binder-rocketmq ``` @@ -129,7 +129,7 @@ Alternatively, you can also use the Spring Cloud Stream RocketMQ Starter: ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-stream-rocketmq ``` diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc index 8b2f466c..38c79c50 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc @@ -4,12 +4,12 @@ SchedulerX（Distributed job scheduling） is a component of EDAS, an Alibaba Cl === How to Introduce Spring Cloud Alibaba Cloud SchedulerX -If you want to use SchedulerX in your project, please use the starter with the group ID as `org.springframework.cloud` and the artifact ID as `spring-cloud-starter-alicloud-schedulerX`. +If you want to use SchedulerX in your project, please use the starter with the group ID as `com.alibaba.cloud` and the artifact ID as `spring-cloud-starter-alicloud-schedulerX`. [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-schedulerX ---- @@ -75,7 +75,7 @@ Go to the https://edas.console.aliyun.com/#/edasSchedulerXJob?regionNo=cn-test[S [source,text] ---- Job Group： Test——***-*-*-**** -Job process interface：com.alibaba.cloud.examples.SimpleTask +Job process interface：SimpleTask Type： Simple Single-Server Job Quartz Cron Expression： Default Option——0 * * * * ? Job Description： Empty diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc index bedae880..da1a4f2d 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc @@ -14,7 +14,7 @@ https://github.com/alibaba/Sentinel[Sentinel] has the following features: ### How to Use Sentinel -If you want to use Sentinel in your project, please use the starter with the group ID as `org.springframework.cloud` and the artifact ID as `spring-cloud-starter-alibaba-sentinel`. +If you want to use Sentinel in your project, please use the starter with the group ID as `com.alibaba.cloud` and the artifact ID as `spring-cloud-starter-alibaba-sentinel`. ```xml @@ -195,7 +195,7 @@ spring.cloud.sentinel.datasource.ds1.file.rule-type=flow #spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json #spring.cloud.sentinel.datasource.ds1.file.data-type=custom -#spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter +#spring.cloud.sentinel.datasource.ds1.file.converter-class=JsonFlowRuleListConverter #spring.cloud.sentinel.datasource.ds1.file.rule-type=flow spring.cloud.sentinel.datasource.ds2.nacos.server-addr=localhost:8848 diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/sms.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/sms.adoc index 0bc1f758..1bc6129d 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/sms.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/sms.adoc @@ -6,12 +6,12 @@ Spring Cloud AliCloud SMS provide an easier-to-use API for quick access to Aliba === 如何引入 Spring Cloud AliCloud SMS -If you want to use SMS in your project, please use the starter with the group ID as `org.springframework.cloud` and the artifact ID as `spring-cloud-starter-alicloud-sms`. +If you want to use SMS in your project, please use the starter with the group ID as `com.alibaba.cloud` and the artifact ID as `spring-cloud-starter-alicloud-sms`. [source,xml] ---- - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-sms ---- @@ -165,7 +165,7 @@ spring.cloud.alicloud.sms.report-queue-name=Alicom-Queue-********-SmsReport ---- @Component public class SmsReportMessageListener - implements org.springframework.cloud.alicloud.sms.SmsReportMessageListener { + implements SmsReportMessageListener { @Override public boolean dealMessage(Message message) { @@ -195,7 +195,7 @@ spring.cloud.alicloud.sms.up-queue-name=Alicom-Queue-********-SmsUp ---- @Component public class SmsUpMessageListener - implements org.springframework.cloud.alicloud.sms.SmsUpMessageListener { + implements SmsUpMessageListener { @Override public boolean dealMessage(Message message) { diff --git a/alibaba-dubbo-spring-cloud/README.md b/spring-cloud-alibaba-dubbo/README.md similarity index 100% rename from alibaba-dubbo-spring-cloud/README.md rename to spring-cloud-alibaba-dubbo/README.md diff --git a/alibaba-dubbo-spring-cloud/README_CN.md b/spring-cloud-alibaba-dubbo/README_CN.md similarity index 100% rename from alibaba-dubbo-spring-cloud/README_CN.md rename to spring-cloud-alibaba-dubbo/README_CN.md diff --git a/alibaba-dubbo-spring-cloud/pom.xml b/spring-cloud-alibaba-dubbo/pom.xml similarity index 97% rename from alibaba-dubbo-spring-cloud/pom.xml rename to spring-cloud-alibaba-dubbo/pom.xml index 3335af70..36a9f4ac 100644 --- a/alibaba-dubbo-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-dubbo/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - alibaba-dubbo-spring-cloud - Alibaba Dubbo Spring Cloud + spring-cloud-alibaba-dubbo + Spring Cloud Alibaba Dubbo 2.7.1 @@ -143,7 +143,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery true diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java similarity index 97% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java index c2474aa5..5447c2b2 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java @@ -26,8 +26,8 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.event.ApplicationStartedEvent; import com.alibaba.cloud.dubbo.annotation.DubboTransported; -import com.alibaba.cloud.dubbo.loadbalancer.DubboMetadataInitializerInterceptor; -import com.alibaba.cloud.dubbo.loadbalancer.DubboTransporterInterceptor; +import com.alibaba.cloud.dubbo.client.loadbalancer.DubboMetadataInitializerInterceptor; +import com.alibaba.cloud.dubbo.client.loadbalancer.DubboTransporterInterceptor; import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; import com.alibaba.cloud.dubbo.metadata.resolver.DubboTransportedAttributesResolver; import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java similarity index 99% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java index 2f740f7c..9f956e05 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java @@ -16,18 +16,21 @@ */ package com.alibaba.cloud.dubbo.autoconfigure; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; import com.alibaba.cloud.dubbo.openfeign.TargeterBeanPostProcessor; import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory; import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory; + +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME; + /** * Dubbo Feign Auto-{@link Configuration Configuration} * diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java similarity index 99% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java index b2db5dcc..00af57ae 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java @@ -16,16 +16,18 @@ */ package com.alibaba.cloud.dubbo.autoconfigure; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.cloud.dubbo.env.DubboCloudProperties; import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory; import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory; import com.alibaba.cloud.dubbo.service.parameter.PathVariableServiceParameterResolver; import com.alibaba.cloud.dubbo.service.parameter.RequestBodyServiceParameterResolver; import com.alibaba.cloud.dubbo.service.parameter.RequestHeaderServiceParameterResolver; import com.alibaba.cloud.dubbo.service.parameter.RequestParamServiceParameterResolver; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import com.alibaba.cloud.dubbo.env.DubboCloudProperties; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java index b4e3e33f..66429440 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java @@ -27,8 +27,8 @@ import org.springframework.util.StringUtils; import java.util.Map; -import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL; import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getSubProperties; +import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL; /** * Missing {@link SpringCloudRegistry} Property {@link Condition} diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponse.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponse.java similarity index 97% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponse.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponse.java index 36bd7622..c1458ed6 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponse.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponse.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.cloud.dubbo.loadbalancer; +package com.alibaba.cloud.dubbo.client.loadbalancer; import org.apache.dubbo.rpc.service.GenericException; import org.springframework.http.HttpHeaders; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponseFactory.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java similarity index 98% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponseFactory.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java index 77ed0c21..c503ac91 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponseFactory.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.cloud.dubbo.loadbalancer; +package com.alibaba.cloud.dubbo.client.loadbalancer; import org.apache.dubbo.rpc.service.GenericException; import com.alibaba.cloud.dubbo.http.converter.HttpMessageConverterHolder; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboHttpOutputMessage.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboHttpOutputMessage.java similarity index 96% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboHttpOutputMessage.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboHttpOutputMessage.java index 40f60333..63457902 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboHttpOutputMessage.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboHttpOutputMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.cloud.dubbo.loadbalancer; +package com.alibaba.cloud.dubbo.client.loadbalancer; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpOutputMessage; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboMetadataInitializerInterceptor.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java similarity index 97% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboMetadataInitializerInterceptor.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java index 70f12d0f..7abf5143 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboMetadataInitializerInterceptor.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.cloud.dubbo.loadbalancer; +package com.alibaba.cloud.dubbo.client.loadbalancer; import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; import org.springframework.http.HttpRequest; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboTransporterInterceptor.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboTransporterInterceptor.java similarity index 99% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboTransporterInterceptor.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboTransporterInterceptor.java index e106e99f..bec422ed 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/loadbalancer/DubboTransporterInterceptor.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/client/loadbalancer/DubboTransporterInterceptor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.cloud.dubbo.loadbalancer; +package com.alibaba.cloud.dubbo.client.loadbalancer; import org.apache.dubbo.rpc.service.GenericException; import org.apache.dubbo.rpc.service.GenericService; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/HttpServerRequest.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/HttpServerRequest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/HttpServerRequest.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/HttpServerRequest.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java new file mode 100644 index 00000000..4bc1c281 --- /dev/null +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.cloud.dubbo.http.matcher; + +import java.util.Collection; +import java.util.Iterator; + +/** + * Abstract {@link HttpRequestMatcher} implementation + * + * @author Rossen Stoyanchev + * @author Mercy + */ +public abstract class AbstractHttpRequestMatcher implements HttpRequestMatcher { + + /** + * Return the discrete items a request condition is composed of. + *

+ * For example URL patterns, HTTP request methods, param expressions, etc. + * + * @return a collection of objects, never {@code null} + */ + protected abstract Collection getContent(); + + /** + * The notation to use when printing discrete items of content. + *

+ * For example {@code " || "} for URL patterns or {@code " && "} for param + * expressions. + */ + protected abstract String getToStringInfix(); + + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (other == null || getClass() != other.getClass()) { + return false; + } + return getContent().equals(((AbstractHttpRequestMatcher) other).getContent()); + } + + @Override + public int hashCode() { + return getContent().hashCode(); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder("["); + for (Iterator iterator = getContent().iterator(); iterator.hasNext();) { + Object expression = iterator.next(); + builder.append(expression.toString()); + if (iterator.hasNext()) { + builder.append(getToStringInfix()); + } + } + builder.append("]"); + return builder.toString(); + } +} diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java similarity index 97% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java index 0865e500..b83a02b0 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java @@ -18,7 +18,6 @@ package com.alibaba.cloud.dubbo.http.matcher; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; -import org.springframework.util.CollectionUtils; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpUtils.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpUtils.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpUtils.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/util/HttpUtils.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java index 7446265b..e14855df 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java @@ -54,8 +54,6 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import static com.alibaba.cloud.dubbo.env.DubboCloudProperties.ALL_DUBBO_SERVICES; -import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder; import static java.lang.String.format; import static java.lang.String.valueOf; import static java.util.Collections.emptyList; @@ -65,6 +63,8 @@ import static java.util.Collections.unmodifiableMap; import static java.util.Collections.unmodifiableSet; import static org.apache.dubbo.common.Constants.APPLICATION_KEY; import static org.apache.dubbo.common.Constants.VERSION_KEY; +import static com.alibaba.cloud.dubbo.env.DubboCloudProperties.ALL_DUBBO_SERVICES; +import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder; import static org.springframework.util.CollectionUtils.isEmpty; import static org.springframework.util.StringUtils.hasText; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java similarity index 99% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java index fa138295..9bf740c1 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java @@ -171,7 +171,7 @@ public class DubboServiceBeanMetadataResolver implements BeanClassLoaderAware, S String configKey = methodMetadata.configKey(); Method feignContractMethod = getMatchedFeignContractMethod(targetType, feignContractMethods, configKey); RestMethodMetadata metadata = new RestMethodMetadata(methodMetadata); - metadata.setMethod(new com.alibaba.cloud.dubbo.metadata.MethodMetadata (feignContractMethod)); + metadata.setMethod(new com.alibaba.cloud.dubbo.metadata.MethodMetadata(feignContractMethod)); return metadata; } diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java similarity index 99% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java index 9d80dea1..289ffb33 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java @@ -16,16 +16,18 @@ */ package com.alibaba.cloud.dubbo.openfeign; +import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory; +import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.config.BeanPostProcessor; import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; -import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory; -import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory; + import org.springframework.core.env.Environment; -import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME; import static java.lang.reflect.Proxy.newProxyInstance; +import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME; import static org.springframework.util.ClassUtils.getUserClass; import static org.springframework.util.ClassUtils.isPresent; import static org.springframework.util.ClassUtils.resolveClassName; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataService.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataService.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataService.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataService.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java similarity index 53% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java index f6ccbd63..8b6b1d6b 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java @@ -16,67 +16,67 @@ */ package com.alibaba.cloud.dubbo.service.parameter; +import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME; +import static org.springframework.util.ClassUtils.resolveClassName; + import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.convert.ConversionService; import org.springframework.format.support.DefaultFormattingConversionService; -import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME; -import static org.springframework.util.ClassUtils.resolveClassName; - /** * Abstract {@link DubboGenericServiceParameterResolver} implementation * * @author Mercy */ -public abstract class AbstractDubboGenericServiceParameterResolver implements DubboGenericServiceParameterResolver, - BeanClassLoaderAware { +public abstract class AbstractDubboGenericServiceParameterResolver + implements DubboGenericServiceParameterResolver, BeanClassLoaderAware { - private int order; + private int order; - @Autowired(required = false) - @Qualifier(CONVERSION_SERVICE_BEAN_NAME) - private ConversionService conversionService = new DefaultFormattingConversionService(); + @Autowired(required = false) + @Qualifier(CONVERSION_SERVICE_BEAN_NAME) + private ConversionService conversionService = new DefaultFormattingConversionService(); - private ClassLoader classLoader; + private ClassLoader classLoader; - public ConversionService getConversionService() { - return conversionService; - } + public ConversionService getConversionService() { + return conversionService; + } - public void setConversionService(ConversionService conversionService) { - this.conversionService = conversionService; - } + public void setConversionService(ConversionService conversionService) { + this.conversionService = conversionService; + } - public ClassLoader getClassLoader() { - return classLoader; - } + public ClassLoader getClassLoader() { + return classLoader; + } - @Override - public void setBeanClassLoader(ClassLoader classLoader) { - this.classLoader = classLoader; - } + @Override + public void setBeanClassLoader(ClassLoader classLoader) { + this.classLoader = classLoader; + } - public void setOrder(int order) { - this.order = order; - } + public void setOrder(int order) { + this.order = order; + } - @Override - public int getOrder() { - return order; - } + @Override + public int getOrder() { + return order; + } - protected Class resolveClass(String className) { - return resolveClassName(className, classLoader); - } + protected Class resolveClass(String className) { + return resolveClassName(className, classLoader); + } - protected Object resolveValue(Object parameterValue, String parameterType) { - Class targetType = resolveClass(parameterType); - return resolveValue(parameterValue, targetType); - } + protected Object resolveValue(Object parameterValue, String parameterType) { + Class targetType = resolveClass(parameterType); + return resolveValue(parameterValue, targetType); + } - protected Object resolveValue(Object parameterValue, Class parameterType) { - return conversionService.convert(parameterValue, parameterType); - } + protected Object resolveValue(Object parameterValue, Class parameterType) { + return conversionService.convert(parameterValue, parameterType); + } } diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java similarity index 99% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java index a2095551..1700c303 100644 --- a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java @@ -16,9 +16,10 @@ */ package com.alibaba.cloud.dubbo.service.parameter; +import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata; + import org.apache.dubbo.rpc.service.GenericService; import com.alibaba.cloud.dubbo.http.HttpServerRequest; -import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata; import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata; import org.springframework.core.Ordered; diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java diff --git a/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/util/JSONUtils.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/util/JSONUtils.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/util/JSONUtils.java rename to spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/util/JSONUtils.java diff --git a/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory b/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory rename to spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory diff --git a/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties b/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties rename to spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties diff --git a/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories similarity index 100% rename from alibaba-dubbo-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java similarity index 86% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java index 3a0d31e2..5bdb881b 100644 --- a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java +++ b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java @@ -25,13 +25,13 @@ import org.junit.Test; */ public abstract class AbstractHttpRequestMatcherTest { - @Test - public abstract void testEqualsAndHashCode(); + @Test + public abstract void testEqualsAndHashCode(); - @Test - public abstract void testGetContent(); + @Test + public abstract void testGetContent(); - @Test - public abstract void testGetToStringInfix(); + @Test + public abstract void testGetToStringInfix(); } diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java similarity index 98% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java index 939f6015..38146434 100644 --- a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java +++ b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java @@ -21,8 +21,6 @@ import org.junit.Test; import org.springframework.mock.http.client.MockClientHttpRequest; import java.net.URI; -import java.util.List; -import java.util.Map; /** * {@link HttpRequestParamsMatcher} Test diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java b/spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java rename to spring-cloud-alibaba-dubbo/src/test/java/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java diff --git a/alibaba-dubbo-spring-cloud/src/test/resources/application.yaml b/spring-cloud-alibaba-dubbo/src/test/resources/application.yaml similarity index 100% rename from alibaba-dubbo-spring-cloud/src/test/resources/application.yaml rename to spring-cloud-alibaba-dubbo/src/test/resources/application.yaml diff --git a/alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml b/spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml similarity index 94% rename from alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml rename to spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml index 6038ad7b..9b1aad42 100644 --- a/alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml @@ -1,6 +1,6 @@ spring: application: - name: alibaba-dubbo-spring-cloud + name: spring-cloud-alibaba-dubbo cloud: nacos: discovery: diff --git a/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml b/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml index 2d656938..8b18a688 100644 --- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml +++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml @@ -14,12 +14,16 @@ com.alibaba.cloud - alicloud-acm-spring-cloud-starter + spring-cloud-starter-alicloud-acm org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-actuator + diff --git a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java index 5fff5016..16f3ef09 100644 --- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java +++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java @@ -27,8 +27,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableDiscoveryClient public class AcmApplication { - public static void main(String[] args) { - SpringApplication.run(AcmApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(AcmApplication.class, args); + } } diff --git a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java index ca39827c..5508b881 100644 --- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java +++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java @@ -19,6 +19,7 @@ package com.alibaba.cloud.examples; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -26,16 +27,17 @@ import org.springframework.web.bind.annotation.RestController; * @author xiaolongzuo */ @RestController +@RefreshScope public class EchoController { - private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class); - @Value("${user.id}") - private String userId; + @Value("${user.id}") + private String userId; - @RequestMapping(value = "/") - public String echo() { - LOGGER.info("User id is " + userId); - return userId; - } + @RequestMapping(value = "/") + public String echo() { + LOGGER.info("User id is " + userId); + return userId; + } } diff --git a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/resources/bootstrap.properties b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/resources/bootstrap.properties index 40947c21..e6169cab 100644 --- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/resources/bootstrap.properties +++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/resources/bootstrap.properties @@ -1,4 +1,5 @@ spring.application.name=acm-local server.port=18089 spring.cloud.alicloud.acm.server-list=127.0.0.1 -spring.cloud.alicloud.acm.server-port=8080 \ No newline at end of file +spring.cloud.alicloud.acm.server-port=8080 +management.endpoints.web.exposure.include=* \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml index 71ddd175..4f27f00e 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alicloud-ans-spring-cloud-starter + spring-cloud-starter-alicloud-ans org.springframework.cloud diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java index 456e60e9..4a22d36c 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java @@ -24,11 +24,11 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @author xiaolongzuo */ @SpringBootApplication -@EnableFeignClients(basePackages = {"com.alibaba.cloud.examples"}) +@EnableFeignClients(basePackages = { "com.alibaba.cloud.examples" }) public class ConsumerApplication { - public static void main(String[] args) { - SpringApplication.run(ConsumerApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ConsumerApplication.class, args); + } } diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java index 9b0e7e0f..fb462f09 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam; @FeignClient(value = "ans-provider") public interface EchoService { - @RequestMapping(path = "echo/{str}") - String echo(@RequestParam("str") String param); + @RequestMapping(path = "echo/{str}") + String echo(@RequestParam("str") String param); } diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java index dd862b0a..45018514 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java @@ -29,18 +29,18 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class HomeController { - private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class); - @Autowired - private EchoService echoService; + @Autowired + private EchoService echoService; - @RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json") - public String home() { - LOGGER.info("-----------------consumer调用开始-----------------"); - String param = "Nice to meet you."; - LOGGER.info("消费者传递参数：" + param); - String result = echoService.echo(param); - LOGGER.info("收到提供者响应：" + result); - return param + "
" + result; - } + @RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json") + public String home() { + LOGGER.info("-----------------consumer调用开始-----------------"); + String param = "Nice to meet you."; + LOGGER.info("消费者传递参数：" + param); + String result = echoService.echo(param); + LOGGER.info("收到提供者响应：" + result); + return param + "
" + result; + } } diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml index ee90de17..42b19550 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alicloud-ans-spring-cloud-starter + spring-cloud-starter-alicloud-ans org.springframework.boot diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java index bb8b8d5b..1d674cbe 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java @@ -30,14 +30,14 @@ import org.springframework.web.client.RestTemplate; @EnableDiscoveryClient public class ConsumerApplication { - @Bean - @LoadBalanced - public RestTemplate restTemplate() { - return new RestTemplate(); - } + @Bean + @LoadBalanced + public RestTemplate restTemplate() { + return new RestTemplate(); + } - public static void main(String[] args) { - SpringApplication.run(ConsumerApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ConsumerApplication.class, args); + } } diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java index ecae59ea..d7ccafb2 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java @@ -30,18 +30,19 @@ import org.springframework.web.client.RestTemplate; @RestController public class HomeController { - private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(HomeController.class); - @Autowired - private RestTemplate restTemplate; + @Autowired + private RestTemplate restTemplate; - @RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json") - public String home() { - LOGGER.info("-----------------consumer调用开始-----------------"); - String param = "Nice to meet you."; - LOGGER.info("消费者传递参数：" + param); - String result = restTemplate.getForObject("http://ans-provider/echo/" + param, String.class); - LOGGER.info("收到提供者响应：" + result); - return param + "
" + result; - } + @RequestMapping(value = "/", method = RequestMethod.GET, produces = "application/json") + public String home() { + LOGGER.info("-----------------consumer调用开始-----------------"); + String param = "Nice to meet you."; + LOGGER.info("消费者传递参数：" + param); + String result = restTemplate.getForObject("http://ans-provider/echo/" + param, + String.class); + LOGGER.info("收到提供者响应：" + result); + return param + "
" + result; + } } diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml index d4ba010d..378e663c 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alicloud-ans-spring-cloud-starter + spring-cloud-starter-alicloud-ans org.springframework.boot diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java index 839f43be..30bc0998 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java +++ b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java @@ -29,14 +29,14 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class EchoController { - private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(EchoController.class); - @RequestMapping(value = "/echo/{str}", method = RequestMethod.GET, produces = "application/json") - public String echo(@PathVariable String str) { - LOGGER.info("-----------收到消费者请求-----------"); - LOGGER.info("收到消费者传递的参数：" + str); - String result = "Nice to meet you, too."; - LOGGER.info("提供者返回结果：" + result); - return result; - } + @RequestMapping(value = "/echo/{str}", method = RequestMethod.GET, produces = "application/json") + public String echo(@PathVariable String str) { + LOGGER.info("-----------收到消费者请求-----------"); + LOGGER.info("收到消费者传递的参数：" + str); + String result = "Nice to meet you, too."; + LOGGER.info("提供者返回结果：" + result); + return result; + } } diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java index 651828d0..97c5592e 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java +++ b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java @@ -27,8 +27,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableDiscoveryClient public class ProviderApplication { - public static void main(String[] args) { - SpringApplication.run(ProviderApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ProviderApplication.class, args); + } } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java deleted file mode 100644 index 52879437..00000000 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java +++ /dev/null @@ -1,251 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.cloud.dubbo.bootstrap; - -import org.apache.dubbo.config.annotation.Reference; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; -import com.alibaba.cloud.dubbo.annotation.DubboTransported; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.client.RestTemplate; - -import java.util.HashMap; -import java.util.Map; - -import com.alibaba.cloud.dubbo.service.RestService; -import com.alibaba.cloud.dubbo.service.User; -import com.alibaba.cloud.dubbo.service.UserService; - -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; - -/** - * Dubbo Spring Cloud Consumer Bootstrap - */ -@EnableDiscoveryClient -@EnableAutoConfiguration -@EnableFeignClients -public class DubboSpringCloudConsumerBootstrap { - - @Reference - private UserService userService; - - @Reference(version = "1.0.0", protocol = "dubbo") - private RestService restService; - - @Autowired - @Lazy - private FeignRestService feignRestService; - - @Autowired - @Lazy - private DubboFeignRestService dubboFeignRestService; - - @Value("${provider.application.name}") - private String providerApplicationName; - - @Autowired - @LoadBalanced - private RestTemplate restTemplate; - - @FeignClient("${provider.application.name}") - public interface FeignRestService { - - @GetMapping(value = "/param") - String param(@RequestParam("param") String param); - - @PostMapping("/params") - public String params(@RequestParam("b") String b, @RequestParam("a") int a); - - @PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE) - User requestBody(@RequestParam("param") String param, @RequestBody Map data); - - @GetMapping("/headers") - public String headers(@RequestHeader("h2") String header2, - @RequestHeader("h") String header, - @RequestParam("v") Integer value); - - @GetMapping("/path-variables/{p1}/{p2}") - public String pathVariables(@PathVariable("p2") String path2, - @PathVariable("p1") String path1, - @RequestParam("v") String param); - } - - @FeignClient("${provider.application.name}") - @DubboTransported(protocol = "dubbo") - public interface DubboFeignRestService { - - @GetMapping(value = "/param") - String param(@RequestParam("param") String param); - - @PostMapping("/params") - String params(@RequestParam("b") String paramB, @RequestParam("a") int paramA); - - @PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE) - User requestBody(@RequestParam("param") String param, @RequestBody Map data); - - @GetMapping("/headers") - public String headers(@RequestHeader("h2") String header2, - @RequestParam("v") Integer value, - @RequestHeader("h") String header); - - @GetMapping("/path-variables/{p1}/{p2}") - public String pathVariables(@RequestParam("v") String param, - @PathVariable("p2") String path2, - @PathVariable("p1") String path1); - } - - @Bean - public ApplicationRunner userServiceRunner() { - return new ApplicationRunner() { - @Override - public void run(ApplicationArguments arguments) throws Exception { - - User user = new User(); - user.setId(1L); - user.setName("小马哥"); - user.setAge(33); - - // save User - System.out.printf("UserService.save(%s) : %s\n", user, userService.save(user)); - - // find all Users - System.out.printf("UserService.findAll() : %s\n", user, userService.findAll()); - - // remove User - System.out.printf("UserService.remove(%d) : %s\n", user.getId(), userService.remove(user.getId())); - - } - }; - } - - @Bean - public ApplicationRunner callRunner() { - return new ApplicationRunner() { - @Override - public void run(ApplicationArguments arguments) throws Exception { - - // To call /path-variables - DubboSpringCloudConsumerBootstrap.this.callPathVariables(); - - // To call /headers - DubboSpringCloudConsumerBootstrap.this.callHeaders(); - - // To call /param - DubboSpringCloudConsumerBootstrap.this.callParam(); - - // To call /params - DubboSpringCloudConsumerBootstrap.this.callParams(); - - // To call /request/body/map - DubboSpringCloudConsumerBootstrap.this.callRequestBodyMap(); - - } - }; - } - - private void callPathVariables() { - // Dubbo Service call - System.out.println(restService.pathVariables("a", "b", "c")); - // Spring Cloud Open Feign REST Call (Dubbo Transported) - System.out.println(dubboFeignRestService.pathVariables("c", "b", "a")); - // Spring Cloud Open Feign REST Call - System.out.println(feignRestService.pathVariables("b", "a", "c")); - - // RestTemplate call - System.out.println(restTemplate.getForEntity("http://" + providerApplicationName + "//path-variables/{p1}/{p2}?v=c", String.class, "a", "b")); - } - - private void callHeaders() { - // Dubbo Service call - System.out.println(restService.headers("a", "b", 10)); - // Spring Cloud Open Feign REST Call (Dubbo Transported) - System.out.println(dubboFeignRestService.headers("b", 10, "a")); - // Spring Cloud Open Feign REST Call - System.out.println(feignRestService.headers("b", "a", 10)); - } - - private void callParam() { - // Dubbo Service call - System.out.println(restService.param("mercyblitz")); - // Spring Cloud Open Feign REST Call (Dubbo Transported) - System.out.println(dubboFeignRestService.param("mercyblitz")); - // Spring Cloud Open Feign REST Call - System.out.println(feignRestService.param("mercyblitz")); - } - - private void callParams() { - // Dubbo Service call - System.out.println(restService.params(1, "1")); - // Spring Cloud Open Feign REST Call (Dubbo Transported) - System.out.println(dubboFeignRestService.params("1", 1)); - // Spring Cloud Open Feign REST Call - System.out.println(feignRestService.params("1", 1)); - - // RestTemplate call - System.out.println(restTemplate.getForEntity("http://" + providerApplicationName + "/param?param=小马哥", String.class)); - } - - private void callRequestBodyMap() { - - Map data = new HashMap<>(); - data.put("id", 1); - data.put("name", "小马哥"); - data.put("age", 33); - - // Dubbo Service call - System.out.println(restService.requestBodyMap(data, "Hello,World")); - // Spring Cloud Open Feign REST Call (Dubbo Transported) - System.out.println(dubboFeignRestService.requestBody("Hello,World", data)); -// Spring Cloud Open Feign REST Call - System.out.println(feignRestService.requestBody("Hello,World", data)); - - // RestTemplate call - System.out.println(restTemplate.postForObject("http://" + providerApplicationName + "/request/body/map?param=小马哥", data, User.class)); - } - - @Bean - @LoadBalanced - @DubboTransported - public RestTemplate restTemplate() { - return new RestTemplate(); - } - - public static void main(String[] args) { - new SpringApplicationBuilder(DubboSpringCloudConsumerBootstrap.class) - .properties("spring.profiles.active=nacos") - .run(args); - } -} - - - diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java deleted file mode 100644 index 806d7a52..00000000 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.cloud.dubbo.service; - -import org.apache.dubbo.config.annotation.Service; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import java.util.HashMap; -import java.util.Map; - -import com.alibaba.cloud.dubbo.service.RestService; -import com.alibaba.cloud.dubbo.service.User; - -import static com.alibaba.cloud.dubbo.util.LoggerUtils.log; -import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE; - -/** - * Default {@link RestService} - * - * @author Mercy - */ -@Service(version = "1.0.0", protocol = {"dubbo", "rest"}) -@Path("/") -public class StandardRestService implements RestService { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Override - @Path("param") - @GET - public String param(@QueryParam("param") String param) { - log("/param", param); - return param; - } - - @Override - @Path("params") - @POST - public String params(@QueryParam("a") int a, @QueryParam("b") String b) { - log("/params", a + b); - return a + b; - } - - @Override - @Path("headers") - @GET - public String headers(@HeaderParam("h") String header, - @HeaderParam("h2") String header2, - @QueryParam("v") - Integer param) { - String result = header + " , " + header2 + " , " + param; - log("/headers", result); - return result; - } - - @Override - @Path("path-variables/{p1}/{p2}") - @GET - public String pathVariables(@PathParam("p1") String path1, - @PathParam("p2") String path2, - @QueryParam("v") String param) { - String result = path1 + " , " + path2 + " , " + param; - log("/path-variables", result); - return result; - } - - // @CookieParam does not support : https://github.com/OpenFeign/feign/issues/913 - // @CookieValue also does not support - - @Override - @Path("form") - @POST - public String form(@FormParam("f") String form) { - return String.valueOf(form); - } - - @Override - @Path("request/body/map") - @POST - @Produces(APPLICATION_JSON_VALUE) - public User requestBodyMap(Map data, @QueryParam("param") String param) { - User user = new User(); - user.setId(((Integer) data.get("id")).longValue()); - user.setName((String) data.get("name")); - user.setAge((Integer) data.get("age")); - log("/request/body/map", param); - return user; - } - - @Path("request/body/user") - @POST - @Override - @Consumes(MediaType.APPLICATION_JSON) - public Map requestBodyUser(User user) { - Map map = new HashMap<>(); - map.put("id", user.getId()); - map.put("name", user.getName()); - map.put("age", user.getAge()); - return map; - } -} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java deleted file mode 100644 index aa5ff539..00000000 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.cloud.dubbo.service; - -import org.apache.dubbo.config.annotation.Service; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; - -import com.alibaba.cloud.dubbo.service.RestService; -import com.alibaba.cloud.dubbo.service.User; - -import static com.alibaba.cloud.dubbo.util.LoggerUtils.log; - -/** - * Spring MVC {@link RestService} - * - * @author Mercy - */ -@Service(version = "1.0.0") -@RestController -public class SpringRestService implements RestService { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Override - @GetMapping(value = "/param") - public String param(@RequestParam String param) { - log("/param", param); - return param; - } - - @Override - @PostMapping("/params") - public String params(@RequestParam int a, @RequestParam String b) { - log("/params", a + b); - return a + b; - } - - @Override - @GetMapping("/headers") - public String headers(@RequestHeader("h") String header, - @RequestHeader("h2") String header2, - @RequestParam("v") Integer param) { - String result = header + " , " + header2 + " , " + param; - log("/headers", result); - return result; - } - - @Override - @GetMapping("/path-variables/{p1}/{p2}") - public String pathVariables(@PathVariable("p1") String path1, - @PathVariable("p2") String path2, - @RequestParam("v") String param) { - String result = path1 + " , " + path2 + " , " + param; - log("/path-variables", result); - return result; - } - - @Override - @PostMapping("/form") - public String form(@RequestParam("f") String form) { - return String.valueOf(form); - } - - @Override - @PostMapping(value = "/request/body/map", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) - public User requestBodyMap(@RequestBody Map data, @RequestParam("param") String param) { - User user = new User(); - user.setId(((Integer) data.get("id")).longValue()); - user.setName((String) data.get("name")); - user.setAge((Integer) data.get("age")); - log("/request/body/map", param); - return user; - } - - @PostMapping(value = "/request/body/user", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - @Override - public Map requestBodyUser(@RequestBody User user) { - Map map = new HashMap<>(); - map.put("id", user.getId()); - map.put("name", user.getName()); - map.put("age", user.getAge()); - return map; - } - -} - diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java deleted file mode 100644 index b486e940..00000000 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.alibaba.cloud.dubbo.gateway; - -import org.apache.dubbo.rpc.service.GenericException; -import org.apache.dubbo.rpc.service.GenericService; - -import com.alibaba.cloud.dubbo.http.MutableHttpServerRequest; -import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata; -import com.alibaba.cloud.dubbo.metadata.RequestMetadata; -import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata; -import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; -import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext; -import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory; -import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpRequest; -import org.springframework.util.AntPathMatcher; -import org.springframework.util.PathMatcher; -import org.springframework.util.StreamUtils; -import org.springframework.web.servlet.HttpServletBean; -import org.springframework.web.util.UriComponents; - -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import static org.apache.commons.lang3.StringUtils.substringAfter; -import static org.apache.commons.lang3.StringUtils.substringBetween; -import static org.springframework.web.util.UriComponentsBuilder.fromUriString; - -@WebServlet(urlPatterns = "/dsc/*") -public class DubboGatewayServlet extends HttpServletBean { - - private final DubboServiceMetadataRepository repository; - - private final DubboGenericServiceFactory serviceFactory; - - private final DubboGenericServiceExecutionContextFactory contextFactory; - - private final PathMatcher pathMatcher = new AntPathMatcher(); - - private final Map dubboTranslatedAttributes = new HashMap<>(); - - public DubboGatewayServlet(DubboServiceMetadataRepository repository, - DubboGenericServiceFactory serviceFactory, - DubboGenericServiceExecutionContextFactory contextFactory) { - this.repository = repository; - this.serviceFactory = serviceFactory; - this.contextFactory = contextFactory; - dubboTranslatedAttributes.put("protocol", "dubbo"); - dubboTranslatedAttributes.put("cluster", "failover"); - } - - private String resolveServiceName(HttpServletRequest request) { - - // /g/{app-name}/{rest-path} - String requestURI = request.getRequestURI(); - // /g/ - String servletPath = request.getServletPath(); - - String part = substringAfter(requestURI, servletPath); - - String serviceName = substringBetween(part, "/", "/"); - - return serviceName; - } - - @Override - public void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - - String serviceName = resolveServiceName(request); - - String restPath = substringAfter(request.getRequestURI(), serviceName); - - // 初始化 serviceName 的 REST 请求元数据 - repository.initialize(serviceName); - // 将 HttpServletRequest 转化为 RequestMetadata - RequestMetadata clientMetadata = buildRequestMetadata(request, restPath); - - DubboRestServiceMetadata dubboRestServiceMetadata = repository.get(serviceName, clientMetadata); - - if (dubboRestServiceMetadata == null) { - // if DubboServiceMetadata is not found, executes next - throw new ServletException("DubboServiceMetadata can't be found!"); - } - - RestMethodMetadata dubboRestMethodMetadata = dubboRestServiceMetadata.getRestMethodMetadata(); - - GenericService genericService = serviceFactory.create(dubboRestServiceMetadata, dubboTranslatedAttributes); - - // TODO: Get the Request Body from HttpServletRequest - byte[] body = getRequestBody(request); - - MutableHttpServerRequest httpServerRequest = new MutableHttpServerRequest(new HttpRequestAdapter(request), body); - - DubboGenericServiceExecutionContext context = contextFactory.create(dubboRestMethodMetadata, httpServerRequest); - - Object result = null; - GenericException exception = null; - - try { - result = genericService.$invoke(context.getMethodName(), context.getParameterTypes(), context.getParameters()); - } catch (GenericException e) { - exception = e; - } - response.getWriter().println(result); - } - - private byte[] getRequestBody(HttpServletRequest request) throws IOException { - ServletInputStream inputStream = request.getInputStream(); - return StreamUtils.copyToByteArray(inputStream); - } - - private static class HttpRequestAdapter implements HttpRequest { - - private final HttpServletRequest request; - - private HttpRequestAdapter(HttpServletRequest request) { - this.request = request; - } - - @Override - public String getMethodValue() { - return request.getMethod(); - } - - @Override - public URI getURI() { - try { - return new URI(request.getRequestURL().toString() + "?" + request.getQueryString()); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - throw new RuntimeException(); - } - - @Override - public HttpHeaders getHeaders() { - return new HttpHeaders(); - } - } - - private RequestMetadata buildRequestMetadata(HttpServletRequest request, String restPath) { - UriComponents uriComponents = fromUriString(request.getRequestURI()).build(true); - RequestMetadata requestMetadata = new RequestMetadata(); - requestMetadata.setPath(restPath); - requestMetadata.setMethod(request.getMethod()); - requestMetadata.setParams(getParams(request)); - requestMetadata.setHeaders(getHeaders(request)); - return requestMetadata; - } - - private Map> getHeaders(HttpServletRequest request) { - Map> map = new LinkedHashMap<>(); - Enumeration headerNames = request.getHeaderNames(); - while (headerNames.hasMoreElements()) { - String headerName = headerNames.nextElement(); - Enumeration headerValues = request.getHeaders(headerName); - map.put(headerName, Collections.list(headerValues)); - } - return map; - } - - private Map> getParams(HttpServletRequest request) { - Map> map = new LinkedHashMap<>(); - for (Map.Entry entry : request.getParameterMap().entrySet()) { - map.put(entry.getKey(), Arrays.asList(entry.getValue())); - } - return map; - } -} diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml index 4a7f96ef..1f796717 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml @@ -23,7 +23,7 @@ com.alibaba.cloud - alibaba-nacos-config-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-config diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme-zh.md b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme-zh.md index 390b567e..b0fe443c 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme-zh.md @@ -15,7 +15,7 @@ 1. 首先，修改 pom.xml 文件，引入 Nacos Config Starter。 - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme.md b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme.md index 702a5107..ede9a328 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme.md @@ -15,7 +15,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl 1. Add dependency spring-cloud-starter-alibaba-nacos-config in the pom.xml file in your Spring Cloud project. - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java index 69851e5f..0417ce7e 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java @@ -87,7 +87,6 @@ class SampleController { @Value("${user.name}") String userName; - @Value("${user.age:25}") int age; diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml index 769342d0..c405cf5b 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml @@ -22,7 +22,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery @@ -42,7 +42,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java index 29d44bee..9be8af45 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java @@ -1,12 +1,7 @@ package com.alibaba.cloud.examples; -import com.alibaba.cloud.examples.ConsumerApplication.EchoService; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; - -import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -18,10 +13,14 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.client.RestTemplate; +import com.alibaba.cloud.examples.ConsumerApplication.EchoService; +import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; + /** * @author xiaojing */ -@SpringCloudApplication +@SpringBootApplication +@EnableDiscoveryClient @EnableFeignClients public class ConsumerApplication { diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java index 75b5deed..6a6d81d4 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java @@ -1,7 +1,5 @@ package com.alibaba.cloud.examples; -import com.alibaba.cloud.examples.ConsumerApplication.EchoService; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.web.bind.annotation.PathVariable; @@ -11,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; +import com.alibaba.cloud.examples.ConsumerApplication.EchoService; + /** * @author xiaojing */ diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml index 2fd7861b..b534ee8b 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml @@ -22,7 +22,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml index 13b92c40..8cbd8768 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml @@ -22,7 +22,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java index e8ab1383..0d6056cc 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.alibaba.cloud.examples; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java deleted file mode 100644 index 99665a37..00000000 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.alibaba.cloud.examples; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - -/** - * @author JevonYang - */ -@SpringBootApplication -@EnableDiscoveryClient -public class NacosDiscoverySpringConfigApplication { - - public static void main(String[] args) { - SpringApplication.run(NacosDiscoverySpringConfigApplication.class, args); - } - -} diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigClientApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigClientApplication.java new file mode 100644 index 00000000..4968266c --- /dev/null +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigClientApplication.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.cloud.examples; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +/** + * @author JevonYang + */ +@SpringBootApplication +@EnableDiscoveryClient +public class SpringCloudConfigClientApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringCloudConfigClientApplication.class, args); + } + +} \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml index fe887a9d..fe7516fc 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml @@ -28,7 +28,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java index 0789b5e5..680ab2ec 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java @@ -29,8 +29,8 @@ import org.springframework.cloud.config.server.EnableConfigServer; @EnableConfigServer public class SpringCloudConfigServerApplication { - public static void main(String[] args) { - SpringApplication.run(SpringCloudConfigServerApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringCloudConfigServerApplication.class, args); + } -} +} \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml index 4f694a0b..c3cf8324 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml @@ -19,7 +19,7 @@ nacos-discovery-consumer-example nacos-discovery-provider-example - nacos-discovery-spring-cloud-config-client nacos-discovery-spring-cloud-config-server + nacos-discovery-spring-cloud-config-client diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md index ed607a46..e9225519 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md @@ -15,7 +15,7 @@ 1. 首先，修改 pom.xml 文件，引入 Nacos Discovery Starter。 - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md index da81f49b..cff28427 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md @@ -14,7 +14,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl 1. Add dependency spring-cloud-starter-alibaba-nacos-discovery in the pom.xml file in your Spring Cloud project. - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml index c460e966..79b4867b 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml @@ -23,7 +23,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml index 03701a4d..8153d629 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml @@ -22,7 +22,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme-zh.md b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme-zh.md index 6fc875fe..c1099c81 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme-zh.md @@ -17,7 +17,7 @@ ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme.md b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme.md index 07e717b4..8616a703 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/readme.md @@ -17,7 +17,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/oss-example/pom.xml b/spring-cloud-alibaba-examples/oss-example/pom.xml index bb10248b..53309e10 100644 --- a/spring-cloud-alibaba-examples/oss-example/pom.xml +++ b/spring-cloud-alibaba-examples/oss-example/pom.xml @@ -22,7 +22,7 @@ com.alibaba.cloud - alicloud-oss-spring-cloud-starter + spring-cloud-starter-alicloud-oss diff --git a/spring-cloud-alibaba-examples/oss-example/readme-zh.md b/spring-cloud-alibaba-examples/oss-example/readme-zh.md index bc491e1b..4385636f 100644 --- a/spring-cloud-alibaba-examples/oss-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/oss-example/readme-zh.md @@ -16,7 +16,7 @@ 1. 修改 pom.xml 文件，引入 alicloud-oss starter。 - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-oss diff --git a/spring-cloud-alibaba-examples/oss-example/readme.md b/spring-cloud-alibaba-examples/oss-example/readme.md index 3e5fe291..76e7f899 100644 --- a/spring-cloud-alibaba-examples/oss-example/readme.md +++ b/spring-cloud-alibaba-examples/oss-example/readme.md @@ -16,7 +16,7 @@ Before we start the demo, let's learn how to connect OSS to a Spring Cloud appli 1. Add dependency spring-cloud-starter-alicloud-oss in the pom.xml file in your Spring Cloud project. - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-oss diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java index 4231a7f2..9dd6907f 100644 --- a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java +++ b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java @@ -1,6 +1,7 @@ package com.alibaba.cloud.examples; -import com.aliyun.oss.OSS; +import java.net.URISyntaxException; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -8,7 +9,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import java.net.URISyntaxException; +import com.aliyun.oss.OSS; /** * OSS Application @@ -18,32 +19,33 @@ import java.net.URISyntaxException; @SpringBootApplication public class OssApplication { - public static final String BUCKET_NAME = "spring-cloud-alibaba"; + public static final String BUCKET_NAME = "spring-cloud-alibaba-test"; - public static void main(String[] args) throws URISyntaxException { - SpringApplication.run(OssApplication.class, args); - } + public static void main(String[] args) throws URISyntaxException { + SpringApplication.run(OssApplication.class, args); + } - @Bean - public AppRunner appRunner() { - return new AppRunner(); - } + @Bean + public AppRunner appRunner() { + return new AppRunner(); + } - class AppRunner implements ApplicationRunner { - @Autowired - private OSS ossClient; + class AppRunner implements ApplicationRunner { + @Autowired + private OSS ossClient; - @Override - public void run(ApplicationArguments args) throws Exception { - try { - if (!ossClient.doesBucketExist(BUCKET_NAME)) { - ossClient.createBucket(BUCKET_NAME); - } - } catch (Exception e) { - System.err.println("oss handle bucket error: " + e.getMessage()); - System.exit(-1); - } - } - } + @Override + public void run(ApplicationArguments args) throws Exception { + try { + if (!ossClient.doesBucketExist(BUCKET_NAME)) { + ossClient.createBucket(BUCKET_NAME); + } + } + catch (Exception e) { + System.err.println("oss handle bucket error: " + e.getMessage()); + System.exit(-1); + } + } + } } diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java index 8131d6b6..c1c9d261 100644 --- a/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java +++ b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java @@ -1,8 +1,7 @@ package com.alibaba.cloud.examples; -import com.aliyun.oss.OSS; -import com.aliyun.oss.common.utils.IOUtils; -import com.aliyun.oss.model.OSSObject; +import java.nio.charset.Charset; + import org.apache.commons.codec.CharEncoding; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -11,7 +10,9 @@ import org.springframework.util.StreamUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.nio.charset.Charset; +import com.aliyun.oss.OSS; +import com.aliyun.oss.common.utils.IOUtils; +import com.aliyun.oss.model.OSSObject; /** * OSS Controller @@ -21,45 +22,49 @@ import java.nio.charset.Charset; @RestController public class OssController { - @Autowired - private OSS ossClient; + @Autowired + private OSS ossClient; - @Value("oss://" + OssApplication.BUCKET_NAME + "/oss-test.json") - private Resource file; + @Value("oss://" + OssApplication.BUCKET_NAME + "/oss-test.json") + private Resource file; - @GetMapping("/upload") - public String upload() { - try { - ossClient.putObject(OssApplication.BUCKET_NAME, "oss-test.json", this - .getClass().getClassLoader().getResourceAsStream("oss-test.json")); - } catch (Exception e) { - e.printStackTrace(); - return "upload fail: " + e.getMessage(); - } - return "upload success"; - } + @GetMapping("/upload") + public String upload() { + try { + ossClient.putObject(OssApplication.BUCKET_NAME, "oss-test.json", this + .getClass().getClassLoader().getResourceAsStream("oss-test.json")); + } + catch (Exception e) { + e.printStackTrace(); + return "upload fail: " + e.getMessage(); + } + return "upload success"; + } - @GetMapping("/file-resource") - public String fileResource() { - try { - return "get file resource success. content: " + StreamUtils.copyToString( - file.getInputStream(), Charset.forName(CharEncoding.UTF_8)); - } catch (Exception e) { - e.printStackTrace(); - return "get resource fail: " + e.getMessage(); - } - } + @GetMapping("/file-resource") + public String fileResource() { + try { + return "get file resource success. content: " + StreamUtils.copyToString( + file.getInputStream(), Charset.forName(CharEncoding.UTF_8)); + } + catch (Exception e) { + e.printStackTrace(); + return "get resource fail: " + e.getMessage(); + } + } - @GetMapping("/download") - public String download() { - try { - OSSObject ossObject = ossClient.getObject(OssApplication.BUCKET_NAME, "oss-test.json"); - return "download success, content: " + IOUtils - .readStreamAsString(ossObject.getObjectContent(), CharEncoding.UTF_8); - } catch (Exception e) { - e.printStackTrace(); - return "download fail: " + e.getMessage(); - } - } + @GetMapping("/download") + public String download() { + try { + OSSObject ossObject = ossClient.getObject(OssApplication.BUCKET_NAME, + "oss-test.json"); + return "download success, content: " + IOUtils + .readStreamAsString(ossObject.getObjectContent(), CharEncoding.UTF_8); + } + catch (Exception e) { + e.printStackTrace(); + return "download fail: " + e.getMessage(); + } + } } diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml index ad1b98b6..4e9a155e 100644 --- a/spring-cloud-alibaba-examples/pom.xml +++ b/spring-cloud-alibaba-examples/pom.xml @@ -10,7 +10,6 @@ 4.0.0 - spring-cloud-alibaba-examples pom Spring Cloud Alibaba Examples @@ -39,9 +38,9 @@ rocketmq-example/rocketmq-consume-example rocketmq-example/rocketmq-produce-example sms-example - rocketmq-spring-cloud-bus-example + spring-cloud-bus-rocketmq-example schedulerx-example/schedulerx-simple-task-example - dubbo-spring-cloud-alibaba-examples + spring-cloud-alibaba-dubbo-examples diff --git a/spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md b/spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md index 50af1a27..ec27f69e 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md @@ -40,7 +40,7 @@ Binding 在消息中间件与应用程序提供的 Provider 和 Consumer 之间 ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-stream-rocketmq ``` diff --git a/spring-cloud-alibaba-examples/rocketmq-example/readme.md b/spring-cloud-alibaba-examples/rocketmq-example/readme.md index 688a6156..dc9490c6 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/readme.md +++ b/spring-cloud-alibaba-examples/rocketmq-example/readme.md @@ -36,7 +36,7 @@ Before we start the demo, let's learn how to Integration with RocketMQ Binder to ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-stream-rocketmq ``` diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml index e11c2199..b2f4be9e 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml @@ -19,7 +19,7 @@ com.alibaba.cloud - rocketmq-spring-cloud-starter-stream + spring-cloud-starter-stream-rocketmq diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java index 89e69a66..78dbf120 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java @@ -24,15 +24,15 @@ public class Foo { this.id = id; } - public String getBar() { - return bar; - } + public String getBar() { + return bar; + } - public void setBar(String bar) { - this.bar = bar; - } + public void setBar(String bar) { + this.bar = bar; + } - @Override + @Override public String toString() { return "Foo{" + "id=" + id + ", bar='" + bar + '\'' + '}'; } diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java index caf9f357..ddfcdbd5 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java @@ -1,7 +1,5 @@ package com.alibaba.cloud.examples; -import com.alibaba.cloud.examples.RocketMQConsumerApplication.MySink; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -13,6 +11,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.core.ParameterizedTypeReference; import org.springframework.messaging.SubscribableChannel; +import com.alibaba.cloud.examples.RocketMQConsumerApplication.MySink; + /** * @author Jim */ diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml index 54757414..f3b93f86 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml @@ -19,7 +19,7 @@ com.alibaba.cloud - rocketmq-spring-cloud-starter-stream + spring-cloud-starter-stream-rocketmq diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java index 89e69a66..78dbf120 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java @@ -24,15 +24,15 @@ public class Foo { this.id = id; } - public String getBar() { - return bar; - } + public String getBar() { + return bar; + } - public void setBar(String bar) { - this.bar = bar; - } + public void setBar(String bar) { + this.bar = bar; + } - @Override + @Override public String toString() { return "Foo{" + "id=" + id + ", bar='" + bar + '\'' + '}'; } diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java index 3f8034b2..6a7ac9d4 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java @@ -1,7 +1,5 @@ package com.alibaba.cloud.examples; -import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -12,6 +10,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.MessageBuilder; +import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource; + /** * @author Jim */ @@ -81,7 +81,7 @@ public class RocketMQProduceApplication { } } else if (this.bindingName.equals("output3")) { - int count = 50; + int count = 20; for (int index = 1; index <= count; index++) { String msgContent = "pullMsg-" + index; mySource.output3() diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java index 70ce1f51..79fec70e 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java @@ -3,8 +3,6 @@ package com.alibaba.cloud.examples; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource; - import org.apache.rocketmq.common.message.MessageConst; import org.apache.rocketmq.spring.support.RocketMQHeaders; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +12,8 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; import org.springframework.util.MimeTypeUtils; +import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource; + /** * @author Jim */ diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml index 89d5f6f9..7ac813f4 100644 --- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml +++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alicloud-schedulerx-spring-cloud-starter + spring-cloud-starter-alicloud-schedulerx org.springframework.boot diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md index 0760f3ea..91b07a2e 100644 --- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md @@ -25,7 +25,7 @@ SchedulerX 是阿里中间件团队开发的一款分布式任务调度产品。 6. 进入[SchedulerX任务列表](https://edas.console.aliyun.com/#/edasSchedulerXJob?regionNo=cn-test)页面，选择上方"测试"区域，点击右上角"新建Job"，创建一个Job，即如下所示。 Job分组：测试——111-1-1-1111 - Job处理接口：com.alibaba.cloud.examples.SimpleTask + Job处理接口：SimpleTask 类型：简单Job单机版 定时表达式：默认选项——0 * * * * ? Job描述：无 diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml index 3939427b..e62f4f78 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alibaba-seata-spring-cloud-starter + spring-cloud-starter-alibaba-seata org.springframework.boot diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java index bd9654b7..46c2e33a 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java +++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java @@ -17,8 +17,6 @@ package com.alibaba.cloud.examples; import java.util.Random; -import io.seata.core.context.RootContext; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; @@ -26,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import io.seata.core.context.RootContext; + /** * @author xiaojing */ diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java index 2b01844d..f22071bb 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java +++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java @@ -17,15 +17,16 @@ package com.alibaba.cloud.examples; import java.sql.SQLException; -import com.alibaba.druid.pool.DruidDataSource; - -import io.seata.rm.datasource.DataSourceProxy; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; +import com.alibaba.druid.pool.DruidDataSource; + +import io.seata.rm.datasource.DataSourceProxy; + /** * @author xiaojing */ @@ -51,7 +52,8 @@ public class DatabaseConfiguration { String password = environment.getProperty("mysql.user.password"); DruidDataSource druidDataSource = new DruidDataSource(); - druidDataSource.setUrl("jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC"); + druidDataSource.setUrl( + "jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC"); druidDataSource.setUsername(userName); druidDataSource.setPassword(password); druidDataSource.setDriverClassName("com.mysql.jdbc.Driver"); diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/file.conf b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/file.conf index b49739a1..fd3d304f 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/file.conf +++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/file.conf @@ -19,16 +19,12 @@ transport { #auto default pin or 8 worker-thread-size = 8 } -} -store { - # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions - max-branch-session-size = 16384 - # globe session size , if exceeded throws exceptions - max-global-session-size = 512 - # file buffer size , if exceeded allocate new buffer - file-write-buffer-cache-size = 16384 - # when recover batch read size - session.reload.read_size = 100 + shutdown { + # when destroy server, wait seconds + wait = 3 + } + serialization = "seata" + compressor = "none" } service { #vgroup->rgroup @@ -39,6 +35,9 @@ service { enableDegrade = false #disable disable = false + #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent + max.commit.retry.timeout = "-1" + max.rollback.retry.timeout = "-1" } client { async.commit.buffer.limit = 10000 @@ -46,4 +45,18 @@ client { retry.internal = 10 retry.times = 30 } + report.retry.count = 5 +} +transaction { + undo.data.validation = true + undo.log.serialization = "jackson" +} + +## metrics settings +metrics { + enabled = false + registry-type = "compact" + # multi exporters use comma divided + exporter-list = "prometheus" + exporter-prometheus-port = 9898 } \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/registry.conf b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/registry.conf index 31bcace5..6dbeb22b 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/registry.conf +++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/registry.conf @@ -1,5 +1,5 @@ registry { - # file 、nacos 、eureka、redis、zk、consul + # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa type = "file" nacos { @@ -8,7 +8,7 @@ registry { cluster = "default" } eureka { - serviceUrl = "http://localhost:1001/eureka" + serviceUrl = "http://localhost:8761/eureka" application = "default" weight = "1" } @@ -26,13 +26,26 @@ registry { cluster = "default" serverAddr = "127.0.0.1:8500" } + etcd3 { + cluster = "default" + serverAddr = "http://localhost:2379" + } + sofa { + serverAddr = "127.0.0.1:9603" + application = "default" + region = "DEFAULT_ZONE" + datacenter = "DefaultDataCenter" + cluster = "default" + group = "SEATA_GROUP" + addressWaitTime = "3000" + } file { name = "file.conf" } } config { - # file、nacos 、apollo、zk + # file、nacos 、apollo、zk、consul、etcd3 type = "file" nacos { @@ -40,8 +53,11 @@ config { namespace = "public" cluster = "default" } + consul { + serverAddr = "127.0.0.1:8500" + } apollo { - app.id = "fescar-server" + app.id = "seata-server" apollo.meta = "http://192.168.1.204:8801" } zk { @@ -49,6 +65,9 @@ config { session.timeout = 6000 connect.timeout = 2000 } + etcd3 { + serverAddr = "http://localhost:2379" + } file { name = "file.conf" } diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml index 165e8d9d..fbe5f508 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alibaba-seata-spring-cloud-starter + spring-cloud-starter-alibaba-seata org.springframework.cloud @@ -34,7 +34,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java index d1cf3bb8..c377706f 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java @@ -16,11 +16,6 @@ package com.alibaba.cloud.examples; -import com.alibaba.cloud.examples.BusinessApplication.OrderService; -import com.alibaba.cloud.examples.BusinessApplication.StorageService; - -import io.seata.spring.annotation.GlobalTransactional; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpEntity; @@ -34,6 +29,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; +import com.alibaba.cloud.examples.BusinessApplication.OrderService; +import com.alibaba.cloud.examples.BusinessApplication.StorageService; + +import io.seata.spring.annotation.GlobalTransactional; + /** * @author xiaojing */ @@ -60,7 +60,7 @@ public class HomeController { } @GlobalTransactional(timeoutMills = 300000, name = "spring-cloud-demo-tx") - @RequestMapping(value = "/seata/rest", method = RequestMethod.GET, produces = "application/json") + @RequestMapping(value = "/fescar/rest", method = RequestMethod.GET, produces = "application/json") public String rest() { String result = restTemplate.getForObject( @@ -96,7 +96,7 @@ public class HomeController { } @GlobalTransactional(timeoutMills = 300000, name = "spring-cloud-demo-tx") - @RequestMapping(value = "/seata/feign", method = RequestMethod.GET, produces = "application/json") + @RequestMapping(value = "/fescar/feign", method = RequestMethod.GET, produces = "application/json") public String feign() { String result = storageService.storage(COMMODITY_CODE, ORDER_COUNT); diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties index 75ed9290..1832ce6f 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties @@ -5,4 +5,4 @@ spring.application.name=business-service #feign.hystrix.enabled=true #feign.sentinel.enabled=true -logging.level.io.seata=debug \ No newline at end of file +logging.level.com.alibaba.fescar=debug \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/file.conf b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/file.conf index cb1ab8bb..a766d498 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/file.conf +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/file.conf @@ -19,36 +19,12 @@ transport { #auto default pin or 8 worker-thread-size = 8 } -} -## transaction log store -store { - ## store mode: file、db - mode = "file" - - ## file store - file { - dir = "sessionStore" - - # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions - max-branch-session-size = 16384 - # globe session size , if exceeded throws exceptions - max-global-session-size = 512 - # file buffer size , if exceeded allocate new buffer - file-write-buffer-cache-size = 16384 - # when recover batch read size - session.reload.read_size = 100 - # async, sync - flush-disk-mode = async + shutdown { + # when destroy server, wait seconds + wait = 3 } - - ## database store - db { - driver_class = "" - url = "" - user = "" - password = "" - } - + serialization = "seata" + compressor = "none" } service { #vgroup->rgroup @@ -59,6 +35,9 @@ service { enableDegrade = false #disable disable = false + #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent + max.commit.retry.timeout = "-1" + max.rollback.retry.timeout = "-1" } client { async.commit.buffer.limit = 10000 @@ -66,4 +45,18 @@ client { retry.internal = 10 retry.times = 30 } + report.retry.count = 5 +} +transaction { + undo.data.validation = true + undo.log.serialization = "jackson" +} + +## metrics settings +metrics { + enabled = false + registry-type = "compact" + # multi exporters use comma divided + exporter-list = "prometheus" + exporter-prometheus-port = 9898 } \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/registry.conf b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/registry.conf index 7d71afaa..6dbeb22b 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/registry.conf +++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/registry.conf @@ -8,7 +8,7 @@ registry { cluster = "default" } eureka { - serviceUrl = "http://localhost:1001/eureka" + serviceUrl = "http://localhost:8761/eureka" application = "default" weight = "1" } @@ -45,7 +45,7 @@ registry { } config { - # file、nacos 、apollo、zk + # file、nacos 、apollo、zk、consul、etcd3 type = "file" nacos { @@ -53,6 +53,9 @@ config { namespace = "public" cluster = "default" } + consul { + serverAddr = "127.0.0.1:8500" + } apollo { app.id = "seata-server" apollo.meta = "http://192.168.1.204:8801" @@ -62,7 +65,10 @@ config { session.timeout = 6000 connect.timeout = 2000 } + etcd3 { + serverAddr = "http://localhost:2379" + } file { name = "file.conf" } -} \ No newline at end of file +} diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml index baee8a37..5d4119ad 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alibaba-seata-spring-cloud-starter + spring-cloud-starter-alibaba-seata org.springframework.boot diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java index b9808246..e3a260e2 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java +++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java @@ -24,6 +24,7 @@ import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; import com.alibaba.druid.pool.DruidDataSource; + import io.seata.rm.datasource.DataSourceProxy; /** diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java index ce231648..3060a7b7 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java +++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java @@ -16,7 +16,10 @@ package com.alibaba.cloud.examples; -import io.seata.core.context.RootContext; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Random; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,10 +38,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Random; +import io.seata.core.context.RootContext; /** * @author xiaojing diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/file.conf b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/file.conf index 7213edea..536cc785 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/file.conf +++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/file.conf @@ -19,36 +19,12 @@ transport { #auto default pin or 8 worker-thread-size = 8 } -} -## transaction log store -store { - ## store mode: file、db - mode = "file" - - ## file store - file { - dir = "sessionStore" - - # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions - max-branch-session-size = 16384 - # globe session size , if exceeded throws exceptions - max-global-session-size = 512 - # file buffer size , if exceeded allocate new buffer - file-write-buffer-cache-size = 16384 - # when recover batch read size - session.reload.read_size = 100 - # async, sync - flush-disk-mode = async + shutdown { + # when destroy server, wait seconds + wait = 3 } - - ## database store - db { - driver_class = "" - url = "" - user = "" - password = "" - } - + serialization = "seata" + compressor = "none" } service { #vgroup->rgroup @@ -59,6 +35,9 @@ service { enableDegrade = false #disable disable = false + #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent + max.commit.retry.timeout = "-1" + max.rollback.retry.timeout = "-1" } client { async.commit.buffer.limit = 10000 @@ -66,4 +45,18 @@ client { retry.internal = 10 retry.times = 30 } + report.retry.count = 5 +} +transaction { + undo.data.validation = true + undo.log.serialization = "jackson" +} + +## metrics settings +metrics { + enabled = false + registry-type = "compact" + # multi exporters use comma divided + exporter-list = "prometheus" + exporter-prometheus-port = 9898 } \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/registry.conf b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/registry.conf index 7d71afaa..6dbeb22b 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/registry.conf +++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/registry.conf @@ -8,7 +8,7 @@ registry { cluster = "default" } eureka { - serviceUrl = "http://localhost:1001/eureka" + serviceUrl = "http://localhost:8761/eureka" application = "default" weight = "1" } @@ -45,7 +45,7 @@ registry { } config { - # file、nacos 、apollo、zk + # file、nacos 、apollo、zk、consul、etcd3 type = "file" nacos { @@ -53,6 +53,9 @@ config { namespace = "public" cluster = "default" } + consul { + serverAddr = "127.0.0.1:8500" + } apollo { app.id = "seata-server" apollo.meta = "http://192.168.1.204:8801" @@ -62,7 +65,10 @@ config { session.timeout = 6000 connect.timeout = 2000 } + etcd3 { + serverAddr = "http://localhost:2379" + } file { name = "file.conf" } -} \ No newline at end of file +} diff --git a/spring-cloud-alibaba-examples/seata-example/readme-zh.md b/spring-cloud-alibaba-examples/seata-example/readme-zh.md index b54c4da7..25a09668 100644 --- a/spring-cloud-alibaba-examples/seata-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/seata-example/readme-zh.md @@ -50,6 +50,7 @@ CREATE TABLE `undo_log` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `branch_id` bigint(20) NOT NULL, `xid` varchar(100) NOT NULL, + `context` varchar(128) NOT NULL, `rollback_info` longblob NOT NULL, `log_status` int(11) NOT NULL, `log_created` datetime NOT NULL, @@ -101,13 +102,13 @@ CREATE TABLE `account_tbl` ( 进入解压之后的 bin 目录，执行如下命令来启动 ```$shell -sh seata-server.sh $LISTEN_PORT $MODE(file or db) +sh seata-server.sh -p $LISTEN_PORT -m $MODE(file or db) ``` 在这个示例中，采用如下命令来启动 Seata Server ```$shell -sh seata-server.sh 8091 file +sh seata-server.sh -p 8091 -m file ``` **注意** 如果你修改了endpoint且注册中心使用默认file类型，那么记得需要在各个示例工程中的 `file.conf` 文件中，修改 grouplist 的值(当registry.conf 中registry.type 或 config.type 为file 时会读取内部的file节点中的文件名，若type不为file将直接从配置类型的对应元数据的注册配置中心读取数据)，推荐大家使用 nacos 作为配置注册中心。 @@ -120,16 +121,16 @@ sh seata-server.sh 8091 file 启动示例后，通过 HTTP 的 GET 方法访问如下两个 URL，可以分别验证在 `business-service` 中 通过 RestTemplate 和 FeignClient 调用其他服务的场景。 ```$xslt -http://127.0.0.1:18081/seata/feign +http://127.0.0.1:18081/fescar/feign -http://127.0.0.1:18081/seata/rest +http://127.0.0.1:18081/fescar/rest ``` ## 如何验证分布式事务成功？ ### Xid 信息是否成功传递 -在 `account-server`、`order-service` 和 `storage-service` 三个 服务的 Controller 中，第一个执行的逻辑都是输出 RootContext 中的 Xid 信息，如果看到都输出了正确的 Xid 信息，即每次都发生变化，且同一次调用中所有服务的 Xid 都一致。则表明 Seata 的 Xid 的传递和还原是正常的。 +在 `account-server`、`order-service` 和 `storage-service` 三个 服务的 Controller 中，第一个执行的逻辑都是输出 RootContext 中的 Xid 信息，如果看到都输出了正确的 Xid 信息，即每次都发生变化，且同一次调用中所有服务的 Xid 都一致。则表明 Fescar 的 Xid 的传递和还原是正常的。 ### 数据库中数据是否一致 diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml index 0ae44a05..20b7c270 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud - alibaba-seata-spring-cloud-starter + spring-cloud-starter-alibaba-seata org.springframework.boot diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java index fd029e06..b862b26a 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java @@ -18,15 +18,16 @@ package com.alibaba.cloud.examples; import java.sql.SQLException; -import com.alibaba.druid.pool.DruidDataSource; -import io.seata.rm.datasource.DataSourceProxy; - import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; +import com.alibaba.druid.pool.DruidDataSource; + +import io.seata.rm.datasource.DataSourceProxy; + /** * @author xiaojing */ @@ -52,7 +53,8 @@ public class DatabaseConfiguration { String password = environment.getProperty("mysql.user.password"); DruidDataSource druidDataSource = new DruidDataSource(); - druidDataSource.setUrl("jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC"); + druidDataSource.setUrl( + "jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC"); druidDataSource.setUsername(userName); druidDataSource.setPassword(password); druidDataSource.setDriverClassName("com.mysql.jdbc.Driver"); diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java index 23c41209..44092bdf 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java @@ -16,8 +16,6 @@ package com.alibaba.cloud.examples; -import io.seata.core.context.RootContext; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; @@ -26,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import io.seata.core.context.RootContext; + /** * @author xiaojing */ diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/file.conf b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/file.conf index 4699d684..90cb0ede 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/file.conf +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/file.conf @@ -19,36 +19,12 @@ transport { #auto default pin or 8 worker-thread-size = 8 } -} -## transaction log store -store { - ## store mode: file、db - mode = "file" - - ## file store - file { - dir = "sessionStore" - - # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions - max-branch-session-size = 16384 - # globe session size , if exceeded throws exceptions - max-global-session-size = 512 - # file buffer size , if exceeded allocate new buffer - file-write-buffer-cache-size = 16384 - # when recover batch read size - session.reload.read_size = 100 - # async, sync - flush-disk-mode = async + shutdown { + # when destroy server, wait seconds + wait = 3 } - - ## database store - db { - driver_class = "" - url = "" - user = "" - password = "" - } - + serialization = "seata" + compressor = "none" } service { #vgroup->rgroup @@ -59,6 +35,9 @@ service { enableDegrade = false #disable disable = false + #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent + max.commit.retry.timeout = "-1" + max.rollback.retry.timeout = "-1" } client { async.commit.buffer.limit = 10000 @@ -66,4 +45,18 @@ client { retry.internal = 10 retry.times = 30 } + report.retry.count = 5 +} +transaction { + undo.data.validation = true + undo.log.serialization = "jackson" +} + +## metrics settings +metrics { + enabled = false + registry-type = "compact" + # multi exporters use comma divided + exporter-list = "prometheus" + exporter-prometheus-port = 9898 } \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/registry.conf b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/registry.conf index 7d71afaa..6dbeb22b 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/registry.conf +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/registry.conf @@ -8,7 +8,7 @@ registry { cluster = "default" } eureka { - serviceUrl = "http://localhost:1001/eureka" + serviceUrl = "http://localhost:8761/eureka" application = "default" weight = "1" } @@ -45,7 +45,7 @@ registry { } config { - # file、nacos 、apollo、zk + # file、nacos 、apollo、zk、consul、etcd3 type = "file" nacos { @@ -53,6 +53,9 @@ config { namespace = "public" cluster = "default" } + consul { + serverAddr = "127.0.0.1:8500" + } apollo { app.id = "seata-server" apollo.meta = "http://192.168.1.204:8801" @@ -62,7 +65,10 @@ config { session.timeout = 6000 connect.timeout = 2000 } + etcd3 { + serverAddr = "http://localhost:2379" + } file { name = "file.conf" } -} \ No newline at end of file +} diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml index cd802d1c..011989ab 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml @@ -19,7 +19,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md index eb9ca2e0..b95a97d2 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md @@ -15,7 +15,7 @@ Before we start the demo, let's learn how to connect Sentinel to a Spring Cloud 1. Add dependency spring-cloud-starter-alibaba-sentinel in the pom.xml file in your Spring Cloud project. - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java index 76c6c25a..1551bedb 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java @@ -1,9 +1,9 @@ package com.alibaba.cloud.examples; -import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; +import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import com.alibaba.csp.sentinel.slots.block.BlockException; /** diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java index b0c15104..7dea70ee 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java @@ -2,10 +2,10 @@ package com.alibaba.cloud.examples; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; import org.springframework.context.annotation.Bean; import org.springframework.web.client.RestTemplate; +import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; import com.alibaba.csp.sentinel.datasource.Converter; /** diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java index 68f8a2d9..9d8f41ad 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java @@ -24,15 +24,15 @@ public class TestController { } @RequestMapping(value = "/aa", method = RequestMethod.GET) - @SentinelResource("aa") + @SentinelResource("aa") public String aa(int b, int a) { return "Hello test"; } - @RequestMapping(value = "/test", method = RequestMethod.GET) - public String test1() { - return "Hello test"; - } + @RequestMapping(value = "/test", method = RequestMethod.GET) + public String test1() { + return "Hello test"; + } @RequestMapping(value = "/template", method = RequestMethod.GET) public String client() { diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md index 47844f26..44e7da89 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md @@ -66,7 +66,7 @@ Provider端在application.properties文件中定义dubbo相关的配置，比如 `sentinel-dubbo-api`模块中定义了FooService服务，内容如下： - package com.alibaba.cloud.examples.FooService; + package FooService; public interface FooService { String hello(String name); } @@ -93,7 +93,7 @@ Consumer端在服务调用之前，先定义限流规则。 `sentinel-dubbo-api`模块中定义了FooService服务，内容如下： - package com.alibaba.cloud.examples.FooService; + package FooService; public interface FooService { String hello(String name); } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md index 8cbb24c6..4686e1b1 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md @@ -18,7 +18,7 @@ Before we start the demo, let's learn how to connect Sentinel with Dubbo to a Sp 1. Add dependency spring-cloud-starter-alibaba-sentinel and dubbo-spring-boot-starter in the pom.xml file in your Spring Cloud project. - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel @@ -64,7 +64,7 @@ Define some configs of dubbo in `application.properties` in provider side, like `sentinel-dubbo-api` define a service named FooService: - package com.alibaba.cloud.examples.FooService; + package FooService; public interface FooService { String hello(String name); } @@ -91,7 +91,7 @@ We will configure flow control rules before service invocation in consumer side. `sentinel-dubbo-api` define a service named FooService: - package com.alibaba.cloud.examples.FooService; + package FooService; public interface FooService { String hello(String name); } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml index fe786d28..0c3dea0a 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - + com.alibaba.cloud sentinel-dubbo-api jar api for sentinel dubbo example diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java index fca02cfc..65f71bb8 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java @@ -5,6 +5,6 @@ package com.alibaba.cloud.examples; */ public interface FooService { - String hello(String name); + String hello(String name); } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml index 9f63b868..6bd4f98a 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml @@ -19,7 +19,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java index d8a6d404..bb62527f 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java @@ -27,8 +27,7 @@ public class SentinelDubboConsumerApp { public static void main(String[] args) { FlowRule flowRule = new FlowRule(); - flowRule.setResource( - "com.alibaba.cloud.examples.FooService:hello(java.lang.String)"); + flowRule.setResource("com.alibaba.cloud.examples.FooService:hello(java.lang.String)"); flowRule.setCount(10); flowRule.setGrade(RuleConstant.FLOW_GRADE_QPS); flowRule.setLimitApp("default"); diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml index 6e9792f9..c4cbb8d1 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml @@ -19,7 +19,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml index e7a264e7..f52460e4 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml @@ -20,7 +20,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel @@ -40,7 +40,7 @@ com.alibaba.cloud - alibaba-sentinel-gateway-spring-cloud + spring-cloud-alibaba-sentinel-gateway diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java index 552ea04c..6ccf9130 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java @@ -16,16 +16,17 @@ package com.alibaba.cloud.examples; -import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler; +import static org.springframework.web.reactive.function.BodyInserters.fromObject; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Mono; -import static org.springframework.web.reactive.function.BodyInserters.fromObject; +import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler; + +import reactor.core.publisher.Mono; /** * @author Jim @@ -33,16 +34,17 @@ import static org.springframework.web.reactive.function.BodyInserters.fromObject @Configuration public class MySCGConfiguration { - @Bean - public BlockRequestHandler blockRequestHandler() { - return new BlockRequestHandler() { - @Override - public Mono handleRequest(ServerWebExchange exchange, Throwable t) { - return ServerResponse.status(444) - .contentType(MediaType.APPLICATION_JSON_UTF8) - .body(fromObject("SCS Sentinel block")); - } - }; - } + @Bean + public BlockRequestHandler blockRequestHandler() { + return new BlockRequestHandler() { + @Override + public Mono handleRequest(ServerWebExchange exchange, + Throwable t) { + return ServerResponse.status(444) + .contentType(MediaType.APPLICATION_JSON_UTF8) + .body(fromObject("SCS Sentinel block")); + } + }; + } } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/RulesWebFluxController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/RulesWebFluxController.java index fccd58bf..8e2f4efc 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/RulesWebFluxController.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/RulesWebFluxController.java @@ -19,6 +19,9 @@ package com.alibaba.cloud.examples; import java.util.List; import java.util.Set; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + import com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiDefinition; import com.alibaba.csp.sentinel.adapter.gateway.common.api.GatewayApiDefinitionManager; import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayFlowRule; @@ -26,8 +29,6 @@ import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayRuleManager; import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; /** @@ -36,19 +37,19 @@ import reactor.core.publisher.Mono; @RestController public class RulesWebFluxController { - @GetMapping("/api") - public Mono> apiRules() { - return Mono.just(GatewayApiDefinitionManager.getApiDefinitions()); - } + @GetMapping("/api") + public Mono> apiRules() { + return Mono.just(GatewayApiDefinitionManager.getApiDefinitions()); + } - @GetMapping("/gateway") - public Mono> apiGateway() { - return Mono.just(GatewayRuleManager.getRules()); - } + @GetMapping("/gateway") + public Mono> apiGateway() { + return Mono.just(GatewayRuleManager.getRules()); + } - @GetMapping("/flow") - public Mono> apiFlow() { - return Mono.just(FlowRuleManager.getRules()); - } + @GetMapping("/flow") + public Mono> apiFlow() { + return Mono.just(FlowRuleManager.getRules()); + } } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java index 64da9790..137c6e91 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java @@ -25,9 +25,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class SentinelSpringCloudGatewayApplication { - public static void main(String[] args) { - //GatewayCallbackManager.setRequestOriginParser(s -> "123"); - SpringApplication.run(SentinelSpringCloudGatewayApplication.class, args); - } + public static void main(String[] args) { + // GatewayCallbackManager.setRequestOriginParser(s -> "123"); + SpringApplication.run(SentinelSpringCloudGatewayApplication.class, args); + } } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml index a69ba6cc..72190745 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml @@ -20,7 +20,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java index 32b008bf..2ad86f69 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java @@ -37,6 +37,13 @@ public class SentinelWebFluxController { .transform(new SentinelReactorTransformer<>("mono")); } + @GetMapping("/test") + public Mono test() { + return Mono.just("simple string") + // transform the publisher here. + .transform(new SentinelReactorTransformer<>("test")); + } + @GetMapping("/flux") public Flux flux() { return Flux.fromArray(new String[] { "a", "b", "c" }) @@ -44,11 +51,4 @@ public class SentinelWebFluxController { .transform(new SentinelReactorTransformer<>("flux")); } - @GetMapping("/test") - public Flux test() { - return Flux.fromArray(new String[] { "test" }) - // transform the publisher here. - .transform(new SentinelReactorTransformer<>("test")); - } - } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/resources/application.properties index e9750c02..3bbd4f37 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/resources/application.properties +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.application.name=sentinel-example +spring.application.name=sentinel-webflux-example server.port=18084 management.endpoints.web.exposure.include=* spring.cloud.sentinel.transport.dashboard=localhost:8080 diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml index d1d62c85..61374f72 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml @@ -20,7 +20,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel @@ -40,7 +40,7 @@ com.alibaba.cloud - alibaba-sentinel-gateway-spring-cloud + spring-cloud-alibaba-sentinel-gateway diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java index 1477ba31..4c2243c6 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java @@ -27,8 +27,8 @@ import org.springframework.cloud.netflix.zuul.EnableZuulProxy; @EnableZuulProxy public class SentinelZuulApplication { - public static void main(String[] args) { - SpringApplication.run(SentinelZuulApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SentinelZuulApplication.class, args); + } } diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java index 168ec000..7393707e 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java @@ -18,49 +18,51 @@ package com.alibaba.cloud.examples; import javax.servlet.http.HttpServletRequest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.RequestOriginParser; import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.BlockResponse; import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - /** * @author Jim */ @Configuration public class ZuulConfiguration { - @Bean - public ZuulBlockFallbackProvider zuulBlockFallbackProvider1() { - return new ZuulBlockFallbackProvider() { - @Override - public String getRoute() { - return "*"; - } + @Bean + public ZuulBlockFallbackProvider zuulBlockFallbackProvider1() { + return new ZuulBlockFallbackProvider() { + @Override + public String getRoute() { + return "*"; + } - @Override - public BlockResponse fallbackResponse(String route, Throwable cause) { - if (route.equals("my-service3")) { - return new BlockResponse(433, "Sentinel Block3", route); - } else if (route.equals("my-service4")) { - return new BlockResponse(444, "my-service4", route); - } else { - return new BlockResponse(499, "Sentinel Block 499", route); - } - } - }; - } + @Override + public BlockResponse fallbackResponse(String route, Throwable cause) { + if (route.equals("my-service3")) { + return new BlockResponse(433, "Sentinel Block3", route); + } + else if (route.equals("my-service4")) { + return new BlockResponse(444, "my-service4", route); + } + else { + return new BlockResponse(499, "Sentinel Block 499", route); + } + } + }; + } - @Bean - public RequestOriginParser requestOriginParser() { - return new RequestOriginParser() { + @Bean + public RequestOriginParser requestOriginParser() { + return new RequestOriginParser() { - @Override - public String parseOrigin(HttpServletRequest request) { - return "123"; - } - }; - } + @Override + public String parseOrigin(HttpServletRequest request) { + return "123"; + } + }; + } } diff --git a/spring-cloud-alibaba-examples/sms-example/pom.xml b/spring-cloud-alibaba-examples/sms-example/pom.xml index bd32a704..97eb0f23 100644 --- a/spring-cloud-alibaba-examples/sms-example/pom.xml +++ b/spring-cloud-alibaba-examples/sms-example/pom.xml @@ -32,7 +32,7 @@ com.alibaba.cloud - alicloud-sms-spring-cloud-starter + spring-cloud-starter-alicloud-sms diff --git a/spring-cloud-alibaba-examples/sms-example/readme-zh.md b/spring-cloud-alibaba-examples/sms-example/readme-zh.md index 9c99b1a4..69076551 100644 --- a/spring-cloud-alibaba-examples/sms-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/sms-example/readme-zh.md @@ -18,7 +18,7 @@ ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alicloud-sms ``` @@ -234,7 +234,7 @@ public QuerySendDetailsResponse querySendDetailsResponse( */ @Component public class SmsReportMessageListener - implements org.springframework.cloud.alicloud.sms.SmsReportMessageListener { + implements SmsReportMessageListener { @Override public boolean dealMessage(Message message) { @@ -251,7 +251,7 @@ public QuerySendDetailsResponse querySendDetailsResponse( 发送状态的回执消息如下所示： ```plain -com.alibaba.cloud.examples.SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F-2-1682D84D9AD-20000000A,MessageMD5:C6AFEE0EE560BBC3380252337AC36985,RequestID:5C349CCEB8C115CCF344A3EB,MessageBody:"{"send_time":"2019-01-08 20:51:40","report_time":"2019-01-08 20:51:47","success":true,"err_msg":"用户接收成功","err_code":"DELIVERED","phone_number":"152********","sms_size":"1","biz_id":"667618746951900475^0","out_id":"edasTraceId"}",ReceiptHandle:"1-ODU4OTkzNDYwMi0xNTQ2OTUxOTM3LTItOA==",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:51:47 CST 2019",FirstDequeueTime:"Tue Jan 08 20:51:47 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:17 CST 2019",Priority:"8" +SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F-2-1682D84D9AD-20000000A,MessageMD5:C6AFEE0EE560BBC3380252337AC36985,RequestID:5C349CCEB8C115CCF344A3EB,MessageBody:"{"send_time":"2019-01-08 20:51:40","report_time":"2019-01-08 20:51:47","success":true,"err_msg":"用户接收成功","err_code":"DELIVERED","phone_number":"152********","sms_size":"1","biz_id":"667618746951900475^0","out_id":"edasTraceId"}",ReceiptHandle:"1-ODU4OTkzNDYwMi0xNTQ2OTUxOTM3LTItOA==",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:51:47 CST 2019",FirstDequeueTime:"Tue Jan 08 20:51:47 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:17 CST 2019",Priority:"8" ``` ### 上行短信消息 @@ -273,7 +273,7 @@ com.alibaba.cloud.examples.SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F- */ @Component public class SmsUpMessageListener - implements org.springframework.cloud.alicloud.sms.SmsUpMessageListener { + implements SmsUpMessageListener { @Override public boolean dealMessage(Message message) { @@ -290,7 +290,7 @@ com.alibaba.cloud.examples.SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F- 短信成功恢复后，上行短信消息 SmsUpMessageListener 回调后的信息如下所示： ```plain -com.alibaba.cloud.examples.SmsUpMessageListener; MessageID:BF030215BA85BB41-1-1682D85425F-400000003,MessageMD5:D1AF5C2D7410EF190532CBF8E17FE2B7,RequestID:5C349CEE36AF628D2A847D50,MessageBody:"{"dest_code":"2493559","send_time":"2019-01-08 20:52:14","sign_name":"【企业级分布式应用服务】","sequence_id":568585703,"phone_number":"152********","content":"5279"}",ReceiptHandle:"1-MTcxNzk4NjkxODctMTU0Njk1MTk2NC0xLTg=",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:52:14 CST 2019",FirstDequeueTime:"Tue Jan 08 20:52:14 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:44 CST 2019",Priority:"8" +SmsUpMessageListener; MessageID:BF030215BA85BB41-1-1682D85425F-400000003,MessageMD5:D1AF5C2D7410EF190532CBF8E17FE2B7,RequestID:5C349CEE36AF628D2A847D50,MessageBody:"{"dest_code":"2493559","send_time":"2019-01-08 20:52:14","sign_name":"【企业级分布式应用服务】","sequence_id":568585703,"phone_number":"152********","content":"5279"}",ReceiptHandle:"1-MTcxNzk4NjkxODctMTU0Njk1MTk2NC0xLTg=",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:52:14 CST 2019",FirstDequeueTime:"Tue Jan 08 20:52:14 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:44 CST 2019",Priority:"8" ``` ## 查看 Endpoint 信息 diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsApplication.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsApplication.java similarity index 90% rename from spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsApplication.java rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsApplication.java index db770488..07c0d68f 100644 --- a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsApplication.java +++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsApplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.cloud.examples; +package com.alibaba.cloud.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class SmsApplication { - public static void main(String[] args) throws Exception{ + public static void main(String[] args) throws Exception { SpringApplication.run(SmsApplication.class, args); } } \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsController.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsController.java similarity index 90% rename from spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsController.java rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsController.java index 194ba6d8..b34862ce 100644 --- a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsController.java +++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsController.java @@ -1,17 +1,23 @@ -package com.alibaba.cloud.examples; +package com.alibaba.cloud.example; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import com.alibaba.alicloud.sms.ISmsService; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import com.alibaba.alicloud.sms.ISmsService; + import com.aliyun.mns.model.Message; -import com.aliyuncs.dysmsapi.model.v20170525.*; +import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsResponse; +import com.aliyuncs.dysmsapi.model.v20170525.SendBatchSmsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.SendBatchSmsResponse; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.http.MethodType; @@ -28,7 +34,7 @@ public class SmsController { private SmsReportMessageListener smsReportMessageListener; @GetMapping("/report-queue.do") - public String getSmsReportQueuename(){ + public String getSmsReportQueuename() { return environment.getProperty("spring.cloud.alicloud.sms.up-queue-name"); } diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsReportMessageListener.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsReportMessageListener.java similarity index 95% rename from spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsReportMessageListener.java rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsReportMessageListener.java index 688645fc..a94b6bcc 100644 --- a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsReportMessageListener.java +++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsReportMessageListener.java @@ -1,11 +1,12 @@ -package com.alibaba.cloud.examples; - -import com.aliyun.mns.model.Message; -import org.springframework.stereotype.Component; +package com.alibaba.cloud.example; import java.util.LinkedList; import java.util.List; +import org.springframework.stereotype.Component; + +import com.aliyun.mns.model.Message; + /** * @author 如果需要监听短信是否被对方成功接收，只需实现这个接口并初始化一个 Spring Bean 即可。 */ diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsUpMessageListener.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsUpMessageListener.java similarity index 93% rename from spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsUpMessageListener.java rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsUpMessageListener.java index 7f743564..df8e971e 100644 --- a/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsUpMessageListener.java +++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/example/SmsUpMessageListener.java @@ -1,4 +1,4 @@ -package com.alibaba.cloud.examples; +package com.alibaba.cloud.example; import org.springframework.stereotype.Component; diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties index 74deeecc..4464cfe9 100644 --- a/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties +++ b/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties @@ -5,6 +5,5 @@ spring.cloud.alicloud.access-key=***** spring.cloud.alicloud.secret-key=****** spring.cloud.alicloud.sms.report-queue-name=***** spring.cloud.alicloud.sms.up-queue-name=***** - #config endpoint management.endpoints.web.exposure.include=* \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md similarity index 93% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md index 2c2a7746..30c2d3a6 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md @@ -15,7 +15,7 @@ public interface EchoService { ``` 为了确保契约的一致性，推荐的做法是将 Dubbo 服务接口打包在第二方或者第三方的 artifact（jar）中，如以上接口就存放在 - artifact [dubbo-spring-cloud-sample-api](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/tree/master/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api) 之中。 + artifact [spring-cloud-dubbo-sample-api](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/tree/master/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api) 之中。 对于服务提供方而言，不仅通过依赖 artifact 的形式引入 Dubbo 服务接口，而且需要将其实现。对应的服务消费端，同样地需要依赖该 artifact， 并以接口调用的方式执行远程方法。接下来进一步讨论怎样实现 Dubbo 服务提供方和消费方。 @@ -33,8 +33,8 @@ Dubbo Spring Cloud 必要的依赖： - com.alibaba.cloud - dubbo-spring-cloud-sample-api + org.springframework.cloud + spring-cloud-dubbo-sample-api ${project.version} @@ -47,23 +47,23 @@ Dubbo Spring Cloud 必要的依赖： com.alibaba.cloud - dubbo-spring-cloud-starter + spring-cloud-starter-dubbo com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery ``` 以上依赖 artifact 说明如下： -- `dubbo-spring-cloud-sample-api` : 提供 `EchoService` 接口的 artifact +- `spring-cloud-dubbo-sample-api` : 提供 `EchoService` 接口的 artifact - `spring-boot-actuator` : Spring Boot Production-Ready artifact，间接引入 `spring-boot` artifact -- `dubbo-spring-cloud-starter` : Dubbo Spring Cloud Starter `artifact`，间接引入 `dubbo-spring-boot-starter` 等 artifact -- `alibaba-nacos-discovery-spring-cloud-starter` : Nacos Spring Cloud 服务注册与发现 `artifact` +- `spring-cloud-starter-dubbo` : Dubbo Spring Cloud Starter `artifact`，间接引入 `dubbo-spring-boot-starter` 等 artifact +- `spring-cloud-starter-alibaba-nacos-discovery` : Nacos Spring Cloud 服务注册与发现 `artifact` 值得注意的是，以上 artifact 未指定版本(version)，因此，还需显示地声明 `` : @@ -216,8 +216,8 @@ public class DubboSpringCloudServerBootstrap { - com.alibaba.cloud - dubbo-spring-cloud-sample-api + org.springframework.cloud + spring-cloud-dubbo-sample-api ${project.version} @@ -235,13 +235,13 @@ public class DubboSpringCloudServerBootstrap { com.alibaba.cloud - dubbo-spring-cloud-starter + spring-cloud-starter-dubbo com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery ``` @@ -341,7 +341,7 @@ HTTP 响应为： ## 模块说明 -- [dubbo-spring-cloud-sample-api](dubbo-spring-cloud-sample-api)：API 模块，存放 Dubbo 服务接口和模型定义 +- [spring-cloud-dubbo-sample-api](spring-cloud-dubbo-sample-api)：API 模块，存放 Dubbo 服务接口和模型定义 - [spring-cloud-dubbo-provider-web-sample](spring-cloud-dubbo-provider-web-sample)：Dubbo Spring Cloud 服务提供方示例（Web 应用） - [spring-cloud-dubbo-provider-sample](spring-cloud-dubbo-provider-sample)：Dubbo Spring Cloud 服务提供方示例（非 Web 应用） - [spring-cloud-dubbo-consumer-sample](spring-cloud-dubbo-consumer-sample)：Dubbo Spring Cloud 服务消费方示例 diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml similarity index 76% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml index 6360f51c..66a1b5bf 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml @@ -5,25 +5,25 @@ org.springframework.cloud spring-cloud-build - 2.1.6.RELEASE + 2.1.3.RELEASE 4.0.0 com.alibaba.cloud - dubbo-spring-cloud-alibaba-examples + spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT - Dubbo Spring Cloud Alibaba Examples + Spring Cloud Alibaba Dubbo Examples pom - dubbo-spring-cloud-sample-api - dubbo-spring-cloud-server-sample - dubbo-spring-cloud-client-sample - dubbo-spring-cloud-provider-sample - dubbo-spring-cloud-consumer-sample - dubbo-spring-cloud-provider-web-sample - dubbo-spring-cloud-servlet-gateway-sample + spring-cloud-dubbo-sample-api + spring-cloud-dubbo-server-sample + spring-cloud-dubbo-client-sample + spring-cloud-dubbo-provider-sample + spring-cloud-dubbo-consumer-sample + spring-cloud-dubbo-provider-web-sample + spring-cloud-dubbo-servlet-gateway-sample @@ -50,7 +50,7 @@ com.alibaba.cloud - alibaba-spring-cloud-dependencies + spring-cloud-alibaba-dependencies ${project.version} pom import @@ -91,6 +91,14 @@ true + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml similarity index 91% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml index 3f65c152..adc03a2f 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml @@ -5,14 +5,14 @@ org.springframework.cloud spring-cloud-build - 2.1.6.RELEASE + 2.1.3.RELEASE 4.0.0 com.alibaba.cloud - dubbo-spring-cloud-client-sample - Dubbo Spring Cloud Client Sample + spring-cloud-dubbo-client-sample + Spring Cloud Dubbo Client Sample 0.9.1.BUILD-SNAPSHOT @@ -32,7 +32,7 @@ com.alibaba.cloud - dubbo-spring-cloud-sample-api + spring-cloud-dubbo-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java similarity index 83% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java index b5733c70..fdf38eb1 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java @@ -16,16 +16,15 @@ */ package com.alibaba.cloud.dubbo.bootstrap; -import com.alibaba.cloud.dubbo.service.EchoService; - import org.apache.dubbo.config.annotation.Reference; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import com.alibaba.cloud.dubbo.service.EchoService; + /** * Dubbo Spring Cloud Client Bootstrap */ @@ -34,15 +33,15 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class DubboSpringCloudClientBootstrap { - @Reference - private EchoService echoService; + @Reference + private EchoService echoService; - @GetMapping("/echo") - public String echo(String message) { - return echoService.echo(message); - } + @GetMapping("/echo") + public String echo(String message) { + return echoService.echo(message); + } - public static void main(String[] args) { - SpringApplication.run(DubboSpringCloudClientBootstrap.class); - } + public static void main(String[] args) { + SpringApplication.run(DubboSpringCloudClientBootstrap.class); + } } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/resources/bootstrap.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/resources/bootstrap.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml similarity index 89% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml index dd7f17ed..cb575169 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml @@ -4,15 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.alibaba.cloud - dubbo-spring-cloud-alibaba-examples + spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - com.alibaba.cloud - dubbo-spring-cloud-consumer-sample - Dubbo Spring Cloud Consumer Sample + spring-cloud-dubbo-consumer-sample + Spring Cloud Dubbo Consumer Sample @@ -41,14 +40,14 @@ com.alibaba.cloud - dubbo-spring-cloud-sample-api + spring-cloud-dubbo-sample-api ${project.version} com.alibaba.cloud - dubbo-spring-cloud-starter + spring-cloud-starter-dubbo @@ -56,7 +55,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java new file mode 100644 index 00000000..809ebc7d --- /dev/null +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java @@ -0,0 +1,245 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.cloud.dubbo.bootstrap; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.dubbo.config.annotation.Reference; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.client.RestTemplate; + +import com.alibaba.cloud.dubbo.annotation.DubboTransported; +import com.alibaba.cloud.dubbo.service.RestService; +import com.alibaba.cloud.dubbo.service.User; +import com.alibaba.cloud.dubbo.service.UserService; + +/** + * Dubbo Spring Cloud Consumer Bootstrap + */ +@EnableDiscoveryClient +@EnableAutoConfiguration +@EnableFeignClients +public class DubboSpringCloudConsumerBootstrap { + + @Reference + private UserService userService; + + @Reference(version = "1.0.0", protocol = "dubbo") + private RestService restService; + + @Autowired + @Lazy + private FeignRestService feignRestService; + + @Autowired + @Lazy + private DubboFeignRestService dubboFeignRestService; + + @Value("${provider.application.name}") + private String providerApplicationName; + + @Autowired + @LoadBalanced + private RestTemplate restTemplate; + + @FeignClient("${provider.application.name}") + public interface FeignRestService { + + @GetMapping(value = "/param") + String param(@RequestParam("param") String param); + + @PostMapping("/params") + public String params(@RequestParam("b") String b, @RequestParam("a") int a); + + @PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE) + User requestBody(@RequestParam("param") String param, + @RequestBody Map data); + + @GetMapping("/headers") + public String headers(@RequestHeader("h2") String header2, + @RequestHeader("h") String header, @RequestParam("v") Integer value); + + @GetMapping("/path-variables/{p1}/{p2}") + public String pathVariables(@PathVariable("p2") String path2, + @PathVariable("p1") String path1, @RequestParam("v") String param); + } + + @FeignClient("${provider.application.name}") + @DubboTransported(protocol = "dubbo") + public interface DubboFeignRestService { + + @GetMapping(value = "/param") + String param(@RequestParam("param") String param); + + @PostMapping("/params") + String params(@RequestParam("b") String paramB, @RequestParam("a") int paramA); + + @PostMapping(value = "/request/body/map", produces = APPLICATION_JSON_UTF8_VALUE) + User requestBody(@RequestParam("param") String param, + @RequestBody Map data); + + @GetMapping("/headers") + public String headers(@RequestHeader("h2") String header2, + @RequestParam("v") Integer value, @RequestHeader("h") String header); + + @GetMapping("/path-variables/{p1}/{p2}") + public String pathVariables(@RequestParam("v") String param, + @PathVariable("p2") String path2, @PathVariable("p1") String path1); + } + + @Bean + public ApplicationRunner userServiceRunner() { + return arguments -> { + + User user = new User(); + user.setId(1L); + user.setName("小马哥"); + user.setAge(33); + + // save User + System.out.printf("UserService.save(%s) : %s\n", user, + userService.save(user)); + + // find all Users + System.out.printf("UserService.findAll() : %s\n", user, + userService.findAll()); + + // remove User + System.out.printf("UserService.remove(%d) : %s\n", user.getId(), + userService.remove(user.getId())); + + }; + } + + @Bean + public ApplicationRunner callRunner() { + return arguments -> { + + // To call /path-variables + callPathVariables(); + + // To call /headers + callHeaders(); + + // To call /param + callParam(); + + // To call /params + callParams(); + + // To call /request/body/map + callRequestBodyMap(); + + }; + } + + private void callPathVariables() { + // Dubbo Service call + System.out.println(restService.pathVariables("a", "b", "c")); + // Spring Cloud Open Feign REST Call (Dubbo Transported) + System.out.println(dubboFeignRestService.pathVariables("c", "b", "a")); + // Spring Cloud Open Feign REST Call + System.out.println(feignRestService.pathVariables("b", "a", "c")); + + // RestTemplate call + System.out.println(restTemplate.getForEntity( + "http://" + providerApplicationName + "//path-variables/{p1}/{p2}?v=c", + String.class, "a", "b")); + } + + private void callHeaders() { + // Dubbo Service call + System.out.println(restService.headers("a", "b", 10)); + // Spring Cloud Open Feign REST Call (Dubbo Transported) + System.out.println(dubboFeignRestService.headers("b", 10, "a")); + // Spring Cloud Open Feign REST Call + System.out.println(feignRestService.headers("b", "a", 10)); + } + + private void callParam() { + // Dubbo Service call + System.out.println(restService.param("mercyblitz")); + // Spring Cloud Open Feign REST Call (Dubbo Transported) + System.out.println(dubboFeignRestService.param("mercyblitz")); + // Spring Cloud Open Feign REST Call + System.out.println(feignRestService.param("mercyblitz")); + } + + private void callParams() { + // Dubbo Service call + System.out.println(restService.params(1, "1")); + // Spring Cloud Open Feign REST Call (Dubbo Transported) + System.out.println(dubboFeignRestService.params("1", 1)); + // Spring Cloud Open Feign REST Call + System.out.println(feignRestService.params("1", 1)); + + // RestTemplate call + System.out.println(restTemplate.getForEntity( + "http://" + providerApplicationName + "/param?param=小马哥", String.class)); + } + + private void callRequestBodyMap() { + + Map data = new HashMap<>(); + data.put("id", 1); + data.put("name", "小马哥"); + data.put("age", 33); + + // Dubbo Service call + System.out.println(restService.requestBodyMap(data, "Hello,World")); + // Spring Cloud Open Feign REST Call (Dubbo Transported) + System.out.println(dubboFeignRestService.requestBody("Hello,World", data)); + // Spring Cloud Open Feign REST Call + System.out.println(feignRestService.requestBody("Hello,World", data)); + + // RestTemplate call + System.out.println(restTemplate.postForObject( + "http://" + providerApplicationName + "/request/body/map?param=小马哥", data, + User.class)); + } + + @Bean + @LoadBalanced + @DubboTransported + public RestTemplate restTemplate() { + return new RestTemplate(); + } + + public static void main(String[] args) { + new SpringApplicationBuilder(DubboSpringCloudConsumerBootstrap.class) + .properties("spring.profiles.active=nacos").run(args); + } +} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/application.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/application.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml similarity index 91% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml index 5800ae14..47de4040 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml @@ -4,15 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.alibaba.cloud - dubbo-spring-cloud-alibaba-examples + spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - com.alibaba.cloud - dubbo-spring-cloud-provider-sample - Dubbo Spring Cloud Provider Sample + spring-cloud-dubbo-provider-sample + Spring Cloud Dubbo Provider Sample @@ -38,14 +37,14 @@ com.alibaba.cloud - dubbo-spring-cloud-sample-api + spring-cloud-dubbo-sample-api ${project.version} com.alibaba.cloud - dubbo-spring-cloud-starter + spring-cloud-starter-dubbo @@ -53,7 +52,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java similarity index 82% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java index acf54d61..94b4b750 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java @@ -28,13 +28,9 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableAutoConfiguration public class DubboSpringCloudProviderBootstrap { - public static void main(String[] args) { - new SpringApplicationBuilder(DubboSpringCloudProviderBootstrap.class) - .properties("spring.profiles.active=nacos") - .web(WebApplicationType.NONE) - .run(args); - } + public static void main(String[] args) { + new SpringApplicationBuilder(DubboSpringCloudProviderBootstrap.class) + .properties("spring.profiles.active=nacos").web(WebApplicationType.NONE) + .run(args); + } } - - - diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java similarity index 69% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java index 44ba03ba..d254196d 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java @@ -16,14 +16,11 @@ */ package com.alibaba.cloud.dubbo.service; -import org.apache.dubbo.config.annotation.Service; - import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.alibaba.cloud.dubbo.service.User; -import com.alibaba.cloud.dubbo.service.UserService; +import org.apache.dubbo.config.annotation.Service; /** * In-Memory {@link UserService} implementation @@ -31,20 +28,20 @@ import com.alibaba.cloud.dubbo.service.UserService; @Service(protocol = "dubbo") public class InMemoryUserService implements UserService { - private Map usersRepository = new HashMap<>(); + private Map usersRepository = new HashMap<>(); - @Override - public boolean save(User user) { - return usersRepository.put(user.getId(), user) == null; - } + @Override + public boolean save(User user) { + return usersRepository.put(user.getId(), user) == null; + } - @Override - public boolean remove(Long userId) { - return usersRepository.remove(userId) != null; - } + @Override + public boolean remove(Long userId) { + return usersRepository.remove(userId) != null; + } - @Override - public Collection findAll() { - return usersRepository.values(); - } + @Override + public Collection findAll() { + return usersRepository.values(); + } } diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java new file mode 100644 index 00000000..e30a4cb3 --- /dev/null +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.cloud.dubbo.service; + +import static com.alibaba.cloud.dubbo.util.LoggerUtils.log; +import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE; + +import java.util.HashMap; +import java.util.Map; + +import javax.ws.rs.Consumes; +import javax.ws.rs.FormParam; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.apache.dubbo.config.annotation.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Default {@link RestService} + * + * @author Mercy + */ +@Service(version = "1.0.0", protocol = { "dubbo", "rest" }) +@Path("/") +public class StandardRestService implements RestService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + @Path("param") + @GET + public String param(@QueryParam("param") String param) { + log("/param", param); + return param; + } + + @Override + @Path("params") + @POST + public String params(@QueryParam("a") int a, @QueryParam("b") String b) { + log("/params", a + b); + return a + b; + } + + @Override + @Path("headers") + @GET + public String headers(@HeaderParam("h") String header, + @HeaderParam("h2") String header2, @QueryParam("v") Integer param) { + String result = header + " , " + header2 + " , " + param; + log("/headers", result); + return result; + } + + @Override + @Path("path-variables/{p1}/{p2}") + @GET + public String pathVariables(@PathParam("p1") String path1, + @PathParam("p2") String path2, @QueryParam("v") String param) { + String result = path1 + " , " + path2 + " , " + param; + log("/path-variables", result); + return result; + } + + // @CookieParam does not support : https://github.com/OpenFeign/feign/issues/913 + // @CookieValue also does not support + + @Override + @Path("form") + @POST + public String form(@FormParam("f") String form) { + return String.valueOf(form); + } + + @Override + @Path("request/body/map") + @POST + @Produces(APPLICATION_JSON_VALUE) + public User requestBodyMap(Map data, + @QueryParam("param") String param) { + User user = new User(); + user.setId(((Integer) data.get("id")).longValue()); + user.setName((String) data.get("name")); + user.setAge((Integer) data.get("age")); + log("/request/body/map", param); + return user; + } + + @Path("request/body/user") + @POST + @Override + @Consumes(MediaType.APPLICATION_JSON) + public Map requestBodyUser(User user) { + Map map = new HashMap<>(); + map.put("id", user.getId()); + map.put("name", user.getName()); + map.put("age", user.getAge()); + return map; + } +} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/application.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/application.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml similarity index 88% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml index 9fef98f3..648c064e 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml @@ -4,15 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.alibaba.cloud - dubbo-spring-cloud-alibaba-examples + spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - com.alibaba.cloud - dubbo-spring-cloud-provider-web-sample - Dubbo Spring Cloud Provider Web Sample + spring-cloud-dubbo-provider-web-sample + Spring Cloud Dubbo Provider Web Sample @@ -30,14 +29,14 @@ com.alibaba.cloud - dubbo-spring-cloud-sample-api + spring-cloud-dubbo-sample-api ${project.version} com.alibaba.cloud - dubbo-spring-cloud-starter + spring-cloud-starter-dubbo @@ -46,7 +45,7 @@ com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java similarity index 84% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java index 2f093be3..18f859af 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java @@ -27,9 +27,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableAutoConfiguration public class DubboSpringCloudWebProviderBootstrap { - public static void main(String[] args) { - new SpringApplicationBuilder(DubboSpringCloudWebProviderBootstrap.class) - .properties("spring.profiles.active=nacos") - .run(args); - } + public static void main(String[] args) { + new SpringApplicationBuilder(DubboSpringCloudWebProviderBootstrap.class) + .properties("spring.profiles.active=nacos").run(args); + } } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java similarity index 69% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java index 44ba03ba..d254196d 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java @@ -16,14 +16,11 @@ */ package com.alibaba.cloud.dubbo.service; -import org.apache.dubbo.config.annotation.Service; - import java.util.Collection; import java.util.HashMap; import java.util.Map; -import com.alibaba.cloud.dubbo.service.User; -import com.alibaba.cloud.dubbo.service.UserService; +import org.apache.dubbo.config.annotation.Service; /** * In-Memory {@link UserService} implementation @@ -31,20 +28,20 @@ import com.alibaba.cloud.dubbo.service.UserService; @Service(protocol = "dubbo") public class InMemoryUserService implements UserService { - private Map usersRepository = new HashMap<>(); + private Map usersRepository = new HashMap<>(); - @Override - public boolean save(User user) { - return usersRepository.put(user.getId(), user) == null; - } + @Override + public boolean save(User user) { + return usersRepository.put(user.getId(), user) == null; + } - @Override - public boolean remove(Long userId) { - return usersRepository.remove(userId) != null; - } + @Override + public boolean remove(Long userId) { + return usersRepository.remove(userId) != null; + } - @Override - public Collection findAll() { - return usersRepository.values(); - } + @Override + public Collection findAll() { + return usersRepository.values(); + } } diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java new file mode 100644 index 00000000..cdbefcd8 --- /dev/null +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.cloud.dubbo.service; + +import static com.alibaba.cloud.dubbo.util.LoggerUtils.log; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.dubbo.config.annotation.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * Spring MVC {@link RestService} + * + * @author Mercy + */ +@Service(version = "1.0.0") +@RestController +public class SpringRestService implements RestService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + @GetMapping(value = "/param") + public String param(@RequestParam String param) { + log("/param", param); + return param; + } + + @Override + @PostMapping("/params") + public String params(@RequestParam int a, @RequestParam String b) { + log("/params", a + b); + return a + b; + } + + @Override + @GetMapping("/headers") + public String headers(@RequestHeader("h") String header, + @RequestHeader("h2") String header2, @RequestParam("v") Integer param) { + String result = header + " , " + header2 + " , " + param; + log("/headers", result); + return result; + } + + @Override + @GetMapping("/path-variables/{p1}/{p2}") + public String pathVariables(@PathVariable("p1") String path1, + @PathVariable("p2") String path2, @RequestParam("v") String param) { + String result = path1 + " , " + path2 + " , " + param; + log("/path-variables", result); + return result; + } + + @Override + @PostMapping("/form") + public String form(@RequestParam("f") String form) { + return String.valueOf(form); + } + + @Override + @PostMapping(value = "/request/body/map", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public User requestBodyMap(@RequestBody Map data, + @RequestParam("param") String param) { + User user = new User(); + user.setId(((Integer) data.get("id")).longValue()); + user.setName((String) data.get("name")); + user.setAge((Integer) data.get("age")); + log("/request/body/map", param); + return user; + } + + @PostMapping(value = "/request/body/user", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + @Override + public Map requestBodyUser(@RequestBody User user) { + Map map = new HashMap<>(); + map.put("id", user.getId()); + map.put("name", user.getName()); + map.put("age", user.getAge()); + return map; + } + +} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/application.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/application.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/bootstrap.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/bootstrap.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml similarity index 84% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml index 2ec3e0e3..6ed389d1 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - dubbo-spring-cloud-alibaba-examples com.alibaba.cloud + spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT 4.0.0 com.alibaba.cloud - dubbo-spring-cloud-sample-api - Dubbo Spring Cloud Sample API + spring-cloud-dubbo-sample-api + Spring Cloud Dubbo Sample API diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java similarity index 96% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java index 3d640327..d9fb9eb2 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java @@ -21,5 +21,5 @@ package com.alibaba.cloud.dubbo.service; */ public interface EchoService { - String echo(String message); + String echo(String message); } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java similarity index 74% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java index 0c3126a4..1bfe4b91 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java @@ -25,17 +25,17 @@ import java.util.Map; */ public interface RestService { - String param(String param); + String param(String param); - String params(int a, String b); + String params(int a, String b); - String headers(String header, String header2, Integer param); + String headers(String header, String header2, Integer param); - String pathVariables(String path1, String path2, String param); + String pathVariables(String path1, String path2, String param); - String form(String form); + String form(String form); - User requestBodyMap(Map data, String param); + User requestBodyMap(Map data, String param); - Map requestBodyUser(User user); + Map requestBodyUser(User user); } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java similarity index 61% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java index a6747953..14055cd3 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java @@ -25,42 +25,38 @@ import java.io.Serializable; */ public class User implements Serializable { - private Long id; + private Long id; - private String name; + private String name; - private Integer age; + private Integer age; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public Integer getAge() { - return age; - } + public Integer getAge() { + return age; + } - public void setAge(Integer age) { - this.age = age; - } + public void setAge(Integer age) { + this.age = age; + } - @Override - public String toString() { - return "User{" + - "id=" + id + - ", name='" + name + '\'' + - ", age=" + age + - '}'; - } + @Override + public String toString() { + return "User{" + "id=" + id + ", name='" + name + '\'' + ", age=" + age + '}'; + } } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java similarity index 91% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java index 4e969e53..81df4787 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java @@ -25,9 +25,9 @@ import java.util.Collection; */ public interface UserService { - boolean save(User user); + boolean save(User user); - boolean remove(Long userId); + boolean remove(Long userId); - Collection findAll(); + Collection findAll(); } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java similarity index 64% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java index f3fb50f5..31c9af2c 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java @@ -25,17 +25,17 @@ import org.slf4j.LoggerFactory; */ public abstract class LoggerUtils { - private static final Logger logger = LoggerFactory.getLogger(LoggerUtils.class); + private static final Logger logger = LoggerFactory.getLogger(LoggerUtils.class); - public static void log(String url, Object result) { - String message = String.format("The client[%s] uses '%s' protocol to call %s : %s", - RpcContext.getContext().getRemoteHostName(), - RpcContext.getContext().getUrl() == null ? "N/A" : RpcContext.getContext().getUrl().getProtocol(), - url, - result - ); - if (logger.isInfoEnabled()) { - logger.info(message); - } - } + public static void log(String url, Object result) { + String message = String + .format("The client[%s] uses '%s' protocol to call %s : %s", + RpcContext.getContext().getRemoteHostName(), + RpcContext.getContext().getUrl() == null ? "N/A" + : RpcContext.getContext().getUrl().getProtocol(), + url, result); + if (logger.isInfoEnabled()) { + logger.info(message); + } + } } diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml similarity index 90% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml index 92b15bb9..c829aaf7 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml @@ -5,15 +5,15 @@ org.springframework.cloud spring-cloud-build - 2.1.6.RELEASE + 2.1.3.RELEASE 4.0.0 - + com.alibaba.cloud - dubbo-spring-cloud-server-sample - Dubbo Spring Cloud Server Sample + spring-cloud-dubbo-server-sample + Spring Cloud Dubbo Server Sample 0.9.1.BUILD-SNAPSHOT @@ -34,7 +34,7 @@ com.alibaba.cloud - dubbo-spring-cloud-sample-api + spring-cloud-dubbo-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java similarity index 85% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java index 2a0ea1d7..8a7661ae 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java @@ -16,14 +16,13 @@ */ package com.alibaba.cloud.dubbo.bootstrap; -import com.alibaba.cloud.dubbo.service.EchoService; - import org.apache.dubbo.config.annotation.Service; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import com.alibaba.cloud.dubbo.service.EchoService; + /** * Dubbo Spring Cloud Server Bootstrap */ @@ -31,16 +30,16 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableAutoConfiguration public class DubboSpringCloudServerBootstrap { - public static void main(String[] args) { - SpringApplication.run(DubboSpringCloudServerBootstrap.class); - } + public static void main(String[] args) { + SpringApplication.run(DubboSpringCloudServerBootstrap.class); + } } @Service class EchoServiceImpl implements EchoService { - @Override - public String echo(String message) { - return "[echo] Hello, " + message; - } + @Override + public String echo(String message) { + return "[echo] Hello, " + message; + } } \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/resources/bootstrap.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/resources/bootstrap.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml similarity index 74% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml index 874fdfe0..eae78ce1 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml @@ -3,16 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - dubbo-spring-cloud-alibaba-examples com.alibaba.cloud + spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - com.alibaba.cloud - dubbo-spring-cloud-servlet-gateway-sample - Dubbo Spring Cloud Servlet Gateway Sample + spring-cloud-dubbo-servlet-gateway-sample + Spring Cloud Dubbo Servlet Gateway Sample @@ -21,28 +20,28 @@ spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-actuator + + com.alibaba.cloud - dubbo-spring-cloud-sample-api + spring-cloud-dubbo-sample-api ${project.version} com.alibaba.cloud - dubbo-spring-cloud-starter + spring-cloud-starter-dubbo com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud-starter - - - - org.springframework.boot - spring-boot-actuator + spring-cloud-starter-alibaba-nacos-discovery diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java similarity index 74% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java index 2d5e7ea7..6eecaf1a 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java @@ -15,9 +15,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @ServletComponentScan(basePackages = "com.alibaba.cloud.dubbo.gateway") public class DubboSpringCloudServletGatewayBootstrap { - public static void main(String[] args) { - new SpringApplicationBuilder(DubboSpringCloudServletGatewayBootstrap.class) - .properties("spring.profiles.active=nacos") - .run(args); - } + public static void main(String[] args) { + new SpringApplicationBuilder(DubboSpringCloudServletGatewayBootstrap.class) + .properties("spring.profiles.active=nacos").run(args); + } } diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java new file mode 100644 index 00000000..5ca9451f --- /dev/null +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java @@ -0,0 +1,194 @@ +package com.alibaba.cloud.dubbo.gateway; + +import static org.apache.commons.lang3.StringUtils.substringAfter; +import static org.apache.commons.lang3.StringUtils.substringBetween; +import static org.springframework.web.util.UriComponentsBuilder.fromUriString; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.dubbo.rpc.service.GenericException; +import org.apache.dubbo.rpc.service.GenericService; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpRequest; +import org.springframework.util.AntPathMatcher; +import org.springframework.util.PathMatcher; +import org.springframework.util.StreamUtils; +import org.springframework.web.servlet.HttpServletBean; +import org.springframework.web.util.UriComponents; + +import com.alibaba.cloud.dubbo.http.MutableHttpServerRequest; +import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata; +import com.alibaba.cloud.dubbo.metadata.RequestMetadata; +import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata; +import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; +import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext; +import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory; +import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory; + +@WebServlet(urlPatterns = "/dsc/*") +public class DubboGatewayServlet extends HttpServletBean { + + private final DubboServiceMetadataRepository repository; + + private final DubboGenericServiceFactory serviceFactory; + + private final DubboGenericServiceExecutionContextFactory contextFactory; + + private final PathMatcher pathMatcher = new AntPathMatcher(); + + private final Map dubboTranslatedAttributes = new HashMap<>(); + + public DubboGatewayServlet(DubboServiceMetadataRepository repository, + DubboGenericServiceFactory serviceFactory, + DubboGenericServiceExecutionContextFactory contextFactory) { + this.repository = repository; + this.serviceFactory = serviceFactory; + this.contextFactory = contextFactory; + dubboTranslatedAttributes.put("protocol", "dubbo"); + dubboTranslatedAttributes.put("cluster", "failover"); + } + + private String resolveServiceName(HttpServletRequest request) { + + // /g/{app-name}/{rest-path} + String requestURI = request.getRequestURI(); + // /g/ + String servletPath = request.getServletPath(); + + String part = substringAfter(requestURI, servletPath); + + String serviceName = substringBetween(part, "/", "/"); + + return serviceName; + } + + @Override + public void service(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + + String serviceName = resolveServiceName(request); + + String restPath = substringAfter(request.getRequestURI(), serviceName); + + // 初始化 serviceName 的 REST 请求元数据 + repository.initialize(serviceName); + // 将 HttpServletRequest 转化为 RequestMetadata + RequestMetadata clientMetadata = buildRequestMetadata(request, restPath); + + DubboRestServiceMetadata dubboRestServiceMetadata = repository.get(serviceName, + clientMetadata); + + if (dubboRestServiceMetadata == null) { + // if DubboServiceMetadata is not found, executes next + throw new ServletException("DubboServiceMetadata can't be found!"); + } + + RestMethodMetadata dubboRestMethodMetadata = dubboRestServiceMetadata + .getRestMethodMetadata(); + + GenericService genericService = serviceFactory.create(dubboRestServiceMetadata, + dubboTranslatedAttributes); + + // TODO: Get the Request Body from HttpServletRequest + byte[] body = getRequestBody(request); + + MutableHttpServerRequest httpServerRequest = new MutableHttpServerRequest( + new HttpRequestAdapter(request), body); + + DubboGenericServiceExecutionContext context = contextFactory + .create(dubboRestMethodMetadata, httpServerRequest); + + Object result = null; + GenericException exception = null; + + try { + result = genericService.$invoke(context.getMethodName(), + context.getParameterTypes(), context.getParameters()); + } + catch (GenericException e) { + exception = e; + } + response.getWriter().println(result); + } + + private byte[] getRequestBody(HttpServletRequest request) throws IOException { + ServletInputStream inputStream = request.getInputStream(); + return StreamUtils.copyToByteArray(inputStream); + } + + private static class HttpRequestAdapter implements HttpRequest { + + private final HttpServletRequest request; + + private HttpRequestAdapter(HttpServletRequest request) { + this.request = request; + } + + @Override + public String getMethodValue() { + return request.getMethod(); + } + + @Override + public URI getURI() { + try { + return new URI(request.getRequestURL().toString() + "?" + + request.getQueryString()); + } + catch (URISyntaxException e) { + e.printStackTrace(); + } + throw new RuntimeException(); + } + + @Override + public HttpHeaders getHeaders() { + return new HttpHeaders(); + } + } + + private RequestMetadata buildRequestMetadata(HttpServletRequest request, + String restPath) { + UriComponents uriComponents = fromUriString(request.getRequestURI()).build(true); + RequestMetadata requestMetadata = new RequestMetadata(); + requestMetadata.setPath(restPath); + requestMetadata.setMethod(request.getMethod()); + requestMetadata.setParams(getParams(request)); + requestMetadata.setHeaders(getHeaders(request)); + return requestMetadata; + } + + private Map> getHeaders(HttpServletRequest request) { + Map> map = new LinkedHashMap<>(); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String headerName = headerNames.nextElement(); + Enumeration headerValues = request.getHeaders(headerName); + map.put(headerName, Collections.list(headerValues)); + } + return map; + } + + private Map> getParams(HttpServletRequest request) { + Map> map = new LinkedHashMap<>(); + for (Map.Entry entry : request.getParameterMap().entrySet()) { + map.put(entry.getKey(), Arrays.asList(entry.getValue())); + } + return map; + } +} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/application.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/application.yaml diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/bootstrap.yaml similarity index 100% rename from spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml rename to spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/bootstrap.yaml diff --git a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml similarity index 87% rename from spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/pom.xml rename to spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml index 885fc028..62e2580a 100644 --- a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml @@ -10,16 +10,15 @@ 4.0.0 - com.alibaba.cloud - rocketmq-spring-cloud-bus-example - RocketMQ Spring Cloud Bus Example + spring-cloud-bus-rocketmq-example + Spring Cloud Bus RocketMQ Example com.alibaba.cloud - rocketmq-spring-cloud-starter-bus + spring-cloud-starter-bus-rocketmq diff --git a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java similarity index 100% rename from spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java rename to spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java diff --git a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java similarity index 68% rename from spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java rename to spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java index 1e23e2bf..2c9dae87 100644 --- a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java +++ b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java @@ -24,31 +24,28 @@ package com.alibaba.cloud.examples.rocketmq; */ public class User { - private Long id; + private Long id; - private String name; + private String name; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - @Override - public String toString() { - return "User{" + - "id=" + id + - ", name='" + name + '\'' + - '}'; - } + @Override + public String toString() { + return "User{" + "id=" + id + ", name='" + name + '\'' + '}'; + } } diff --git a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java similarity index 72% rename from spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java rename to spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java index dc830630..9979e190 100644 --- a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java +++ b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java @@ -26,22 +26,22 @@ import org.springframework.cloud.bus.event.RemoteApplicationEvent; */ public class UserRemoteApplicationEvent extends RemoteApplicationEvent { - private User user; + private User user; - public UserRemoteApplicationEvent() { - } + public UserRemoteApplicationEvent() { + } - public UserRemoteApplicationEvent(Object source, User user, String originService, - String destinationService) { - super(source, originService, destinationService); - this.user = user; - } + public UserRemoteApplicationEvent(Object source, User user, String originService, + String destinationService) { + super(source, originService, destinationService); + this.user = user; + } - public void setUser(User user) { - this.user = user; - } + public void setUser(User user) { + this.user = user; + } - public User getUser() { - return user; - } + public User getUser() { + return user; + } } diff --git a/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/resources/bootstrap.properties b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/resources/bootstrap.properties rename to spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/resources/bootstrap.properties diff --git a/alibaba-nacos-config-server-spring-cloud/pom.xml b/spring-cloud-alibaba-nacos-config-server/pom.xml similarity index 94% rename from alibaba-nacos-config-server-spring-cloud/pom.xml rename to spring-cloud-alibaba-nacos-config-server/pom.xml index f0eb806f..9c9c33c2 100644 --- a/alibaba-nacos-config-server-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-nacos-config-server/pom.xml @@ -10,9 +10,8 @@ 4.0.0 - com.alibaba.cloud - alibaba-nacos-config-server-spring-cloud - Alibaba Nacos Config Server Spring Cloud + spring-cloud-alibaba-nacos-config-server + Spring Cloud Alibaba Nacos Config Server diff --git a/alibaba-nacos-config-server-spring-cloud/src/main/java/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java b/spring-cloud-alibaba-nacos-config-server/src/main/java/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java similarity index 99% rename from alibaba-nacos-config-server-spring-cloud/src/main/java/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java rename to spring-cloud-alibaba-nacos-config-server/src/main/java/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java index 32a63872..884a3cff 100644 --- a/alibaba-nacos-config-server-spring-cloud/src/main/java/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-config-server/src/main/java/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java @@ -16,10 +16,9 @@ */ package com.alibaba.cloud.nacos.config.server; -import com.alibaba.cloud.nacos.config.server.environment.NacosEnvironmentRepository; - import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import com.alibaba.cloud.nacos.config.server.environment.NacosEnvironmentRepository; import org.springframework.cloud.config.server.EnableConfigServer; import org.springframework.cloud.config.server.config.ConfigServerAutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/alibaba-nacos-config-server-spring-cloud/src/main/java/com/alibaba/cloud/nacos/config/server/environment/NacosEnvironmentRepository.java b/spring-cloud-alibaba-nacos-config-server/src/main/java/com/alibaba/cloud/nacos/config/server/environment/NacosEnvironmentRepository.java similarity index 100% rename from alibaba-nacos-config-server-spring-cloud/src/main/java/com/alibaba/cloud/nacos/config/server/environment/NacosEnvironmentRepository.java rename to spring-cloud-alibaba-nacos-config-server/src/main/java/com/alibaba/cloud/nacos/config/server/environment/NacosEnvironmentRepository.java diff --git a/alibaba-nacos-config-server-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-nacos-config-server/src/main/resources/META-INF/spring.factories similarity index 100% rename from alibaba-nacos-config-server-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-nacos-config-server/src/main/resources/META-INF/spring.factories diff --git a/alibaba-nacos-config-server-spring-cloud/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java b/spring-cloud-alibaba-nacos-config-server/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java similarity index 100% rename from alibaba-nacos-config-server-spring-cloud/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java rename to spring-cloud-alibaba-nacos-config-server/src/test/java/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java diff --git a/alibaba-nacos-config-server-spring-cloud/src/test/resources/application.properties b/spring-cloud-alibaba-nacos-config-server/src/test/resources/application.properties similarity index 100% rename from alibaba-nacos-config-server-spring-cloud/src/test/resources/application.properties rename to spring-cloud-alibaba-nacos-config-server/src/test/resources/application.properties diff --git a/alibaba-nacos-config-spring-cloud/pom.xml b/spring-cloud-alibaba-nacos-config/pom.xml similarity index 96% rename from alibaba-nacos-config-spring-cloud/pom.xml rename to spring-cloud-alibaba-nacos-config/pom.xml index e9c7fb59..26115f00 100644 --- a/alibaba-nacos-config-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-nacos-config/pom.xml @@ -9,9 +9,8 @@ 4.0.0 - com.alibaba.cloud - alibaba-nacos-config-spring-cloud - Alibaba Nacos Config Spring Cloud + spring-cloud-alibaba-nacos-config + Spring Cloud Alibaba Nacos Config diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java index d5411ece..cab15a4e 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java @@ -16,16 +16,16 @@ package com.alibaba.cloud.nacos; -import com.alibaba.cloud.nacos.refresh.NacosContextRefresher; -import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; -import com.alibaba.cloud.nacos.refresh.NacosRefreshProperties; - import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.nacos.refresh.NacosContextRefresher; +import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; +import com.alibaba.cloud.nacos.refresh.NacosRefreshProperties; + /** * @author juven.xuxb */ diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java index 668e4b75..081464cd 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java @@ -16,13 +16,13 @@ package com.alibaba.cloud.nacos; -import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator; + /** * @author xiaojing */ diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java index aff2daf6..82ab1fac 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java @@ -16,17 +16,6 @@ package com.alibaba.cloud.nacos; -import com.alibaba.nacos.api.NacosFactory; -import com.alibaba.nacos.api.config.ConfigService; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.context.properties.ConfigurationProperties; - -import java.util.List; -import java.util.Objects; -import java.util.Properties; - import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY; import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME; import static com.alibaba.nacos.api.PropertyKeyConst.CONTEXT_PATH; @@ -37,6 +26,17 @@ import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE; import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY; import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR; +import java.util.List; +import java.util.Objects; +import java.util.Properties; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import com.alibaba.nacos.api.NacosFactory; +import com.alibaba.nacos.api.config.ConfigService; + /** * nacos properties * diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java similarity index 99% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java index 942e7e8c..ea011b00 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java @@ -16,7 +16,6 @@ package com.alibaba.cloud.nacos; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java index 5e95e325..d932f2b3 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java @@ -16,11 +16,11 @@ package com.alibaba.cloud.nacos.client; -import org.springframework.core.env.MapPropertySource; - import java.util.Date; import java.util.Map; +import org.springframework.core.env.MapPropertySource; + /** * @author xiaojing * @author pbting diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java index e82fd05e..e10c9a30 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java @@ -16,9 +16,12 @@ package com.alibaba.cloud.nacos.client; -import com.alibaba.cloud.nacos.NacosPropertySourceRepository; -import com.alibaba.nacos.api.config.ConfigService; -import com.alibaba.nacos.api.exception.NacosException; +import java.io.StringReader; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,12 +29,9 @@ import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.io.ByteArrayResource; import org.springframework.util.StringUtils; -import java.io.StringReader; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; +import com.alibaba.cloud.nacos.NacosPropertySourceRepository; +import com.alibaba.nacos.api.config.ConfigService; +import com.alibaba.nacos.api.exception.NacosException; /** * @author xiaojing diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java index 06fd8039..51541602 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java @@ -16,10 +16,8 @@ package com.alibaba.cloud.nacos.client; -import com.alibaba.cloud.nacos.NacosConfigProperties; -import com.alibaba.cloud.nacos.NacosPropertySourceRepository; -import com.alibaba.cloud.nacos.refresh.NacosContextRefresher; -import com.alibaba.nacos.api.config.ConfigService; +import java.util.Arrays; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,8 +28,10 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; import org.springframework.util.StringUtils; -import java.util.Arrays; -import java.util.List; +import com.alibaba.cloud.nacos.NacosConfigProperties; +import com.alibaba.cloud.nacos.NacosPropertySourceRepository; +import com.alibaba.cloud.nacos.refresh.NacosContextRefresher; +import com.alibaba.nacos.api.config.ConfigService; /** * @author xiaojing diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java similarity index 94% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java index 7fc3c185..f01458d4 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java @@ -17,8 +17,8 @@ package com.alibaba.cloud.nacos.diagnostics.analyzer; /** - * A {@code NacosConnectionFailureException} is thrown when the application fails to connect - * to Nacos Server. + * A {@code NacosConnectionFailureException} is thrown when the application fails to + * connect to Nacos Server. * * @author juven.xuxb */ @@ -35,7 +35,7 @@ public class NacosConnectionFailureException extends RuntimeException { } public NacosConnectionFailureException(String domain, String port, String message, - Throwable cause) { + Throwable cause) { super(message, cause); this.domain = domain; this.port = port; diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java index 14fda698..e42a5421 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java @@ -16,9 +16,6 @@ package com.alibaba.cloud.nacos.endpoint; -import org.springframework.boot.actuate.endpoint.annotation.Endpoint; -import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -26,6 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.springframework.boot.actuate.endpoint.annotation.Endpoint; +import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; + import com.alibaba.cloud.nacos.NacosConfigProperties; import com.alibaba.cloud.nacos.NacosPropertySourceRepository; import com.alibaba.cloud.nacos.client.NacosPropertySource; diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java index fcc09964..2ebeeb5e 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java @@ -16,9 +16,6 @@ package com.alibaba.cloud.nacos.endpoint; -import com.alibaba.cloud.nacos.NacosConfigProperties; -import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; @@ -28,6 +25,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; +import com.alibaba.cloud.nacos.NacosConfigProperties; +import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; + /** * @author xiaojing */ diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java similarity index 99% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java index 6408875d..4954378c 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java @@ -16,16 +16,17 @@ package com.alibaba.cloud.nacos.endpoint; -import com.alibaba.cloud.nacos.NacosConfigProperties; -import com.alibaba.cloud.nacos.NacosPropertySourceRepository; -import com.alibaba.cloud.nacos.client.NacosPropertySource; -import com.alibaba.nacos.api.config.ConfigService; +import java.util.ArrayList; +import java.util.List; + import org.springframework.boot.actuate.health.AbstractHealthIndicator; import org.springframework.boot.actuate.health.Health; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.List; +import com.alibaba.cloud.nacos.NacosConfigProperties; +import com.alibaba.cloud.nacos.NacosPropertySourceRepository; +import com.alibaba.cloud.nacos.client.NacosPropertySource; +import com.alibaba.nacos.api.config.ConfigService; /** * @author xiaojing diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java index 0cf6b34f..7512b283 100644 --- a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java @@ -16,11 +16,15 @@ package com.alibaba.cloud.nacos.refresh; -import com.alibaba.cloud.nacos.NacosPropertySourceRepository; -import com.alibaba.cloud.nacos.client.NacosPropertySource; -import com.alibaba.nacos.api.config.ConfigService; -import com.alibaba.nacos.api.config.listener.Listener; -import com.alibaba.nacos.api.exception.NacosException; +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executor; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,15 +35,11 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; import org.springframework.util.StringUtils; -import java.io.UnsupportedEncodingException; -import java.math.BigInteger; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executor; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; +import com.alibaba.cloud.nacos.NacosPropertySourceRepository; +import com.alibaba.cloud.nacos.client.NacosPropertySource; +import com.alibaba.nacos.api.config.ConfigService; +import com.alibaba.nacos.api.config.listener.Listener; +import com.alibaba.nacos.api.exception.NacosException; /** * On application start up, NacosContextRefresher add nacos listeners to all application diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java diff --git a/alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java rename to spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java diff --git a/alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/spring.factories similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/spring.factories diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java rename to spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java index 0aa133ff..46760321 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java +++ b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java @@ -22,10 +22,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator; -import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; -import com.alibaba.nacos.client.config.NacosConfigService; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,6 +39,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator; +import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; +import com.alibaba.nacos.client.config.NacosConfigService; + /** * @author xiaojing */ diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java similarity index 99% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java rename to spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java index e0f4e132..1f80136c 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java +++ b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java @@ -165,7 +165,6 @@ public class NacosConfigurationTests { properties.getServerAddr()); } - private void checkoutNacosConfigNamespace() { assertEquals("NacosConfigProperties namespace is wrong", "test-namespace", properties.getNamespace()); diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java similarity index 100% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java rename to spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java index 53691e13..e4806e66 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java +++ b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java @@ -21,9 +21,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; -import com.alibaba.nacos.client.config.NacosConfigService; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,6 +38,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; +import com.alibaba.nacos.client.config.NacosConfigService; + /** * @author xiaojing */ diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java similarity index 84% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java rename to spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java index 37204654..78b5c13a 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java +++ b/spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java @@ -21,14 +21,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; import java.util.Map; -import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration; -import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration; -import com.alibaba.cloud.nacos.NacosConfigProperties; -import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; -import com.alibaba.nacos.client.config.NacosConfigService; - +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; @@ -38,12 +35,19 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.health.Health.Builder; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration; +import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration; +import com.alibaba.cloud.nacos.NacosConfigProperties; +import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; +import com.alibaba.nacos.client.config.NacosConfigService; + /** * @author xiaojing */ @@ -94,31 +98,31 @@ public class NacosConfigEndpointTests { public void contextLoads() throws Exception { checkoutEndpoint(); - //checkoutAcmHealthIndicator(); + checkoutAcmHealthIndicator(); } - //private void checkoutAcmHealthIndicator() { - // try { - // Builder builder = new Builder(); - // - // NacosConfigHealthIndicator healthIndicator = new NacosConfigHealthIndicator( - // properties, properties.configServiceInstance()); - // healthIndicator.doHealthCheck(builder); - // - // Builder builder1 = new Builder(); - // List dataIds = new ArrayList<>(); - // dataIds.add("test-name.properties"); - // builder1.up().withDetail("dataIds", dataIds); - // - // Assert.assertTrue(builder.build().equals(builder1.build())); - // - // } - // catch (Exception ignoreE) { - // - // } - // - //} + private void checkoutAcmHealthIndicator() { + try { + Builder builder = new Builder(); + + NacosConfigHealthIndicator healthIndicator = new NacosConfigHealthIndicator( + properties, properties.configServiceInstance()); + healthIndicator.doHealthCheck(builder); + + Builder builder1 = new Builder(); + List dataIds = new ArrayList<>(); + dataIds.add("test-name.properties"); + builder1.up().withDetail("dataIds", dataIds); + + Assert.assertTrue(builder.build().equals(builder1.build())); + + } + catch (Exception ignoreE) { + + } + + } private void checkoutEndpoint() throws Exception { NacosConfigEndpoint endpoint = new NacosConfigEndpoint(properties, diff --git a/alibaba-nacos-discovery-spring-cloud/pom.xml b/spring-cloud-alibaba-nacos-discovery/pom.xml similarity index 96% rename from alibaba-nacos-discovery-spring-cloud/pom.xml rename to spring-cloud-alibaba-nacos-discovery/pom.xml index ea38b7c3..edcd04c2 100644 --- a/alibaba-nacos-discovery-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-nacos-discovery/pom.xml @@ -9,9 +9,8 @@ 4.0.0 - com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud - Alibaba Nacos Discovery Spring Cloud + spring-cloud-alibaba-nacos-discovery + Spring Cloud Alibaba Nacos Discovery diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java index c83dcb24..d576b879 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java @@ -16,13 +16,13 @@ package com.alibaba.cloud.nacos; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) @ConditionalOnProperty(value = "spring.cloud.nacos.discovery.enabled", matchIfMissing = true) diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java index 4158db50..180f1fa8 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java @@ -16,10 +16,6 @@ package com.alibaba.cloud.nacos; -import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration; -import com.alibaba.cloud.nacos.registry.NacosRegistration; -import com.alibaba.cloud.nacos.registry.NacosServiceRegistry; - import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -31,6 +27,10 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration; +import com.alibaba.cloud.nacos.registry.NacosRegistration; +import com.alibaba.cloud.nacos.registry.NacosServiceRegistry; + /** * @author xiaojing * @author Mercy diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java similarity index 94% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java index 59f6c4e8..f6cb2506 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java @@ -16,13 +16,27 @@ package com.alibaba.cloud.nacos; -import com.alibaba.nacos.api.NacosFactory; -import com.alibaba.nacos.api.naming.NamingMaintainFactory; -import com.alibaba.nacos.api.naming.NamingMaintainService; -import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.api.naming.PreservedMetadataKeys; -import com.alibaba.nacos.client.naming.NacosNamingMaintainService; -import com.alibaba.nacos.client.naming.utils.UtilAndComs; +import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY; +import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME; +import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT; +import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT_PORT; +import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE; +import static com.alibaba.nacos.api.PropertyKeyConst.NAMING_LOAD_CACHE_AT_START; +import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY; +import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR; + +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; + +import javax.annotation.PostConstruct; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,14 +45,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.core.env.Environment; import org.springframework.util.StringUtils; -import javax.annotation.PostConstruct; -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.*; -import static com.alibaba.nacos.api.PropertyKeyConst.*; +import com.alibaba.nacos.api.NacosFactory; +import com.alibaba.nacos.api.naming.NamingMaintainFactory; +import com.alibaba.nacos.api.naming.NamingMaintainService; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.api.naming.PreservedMetadataKeys; +import com.alibaba.nacos.client.naming.utils.UtilAndComs; /** * @author dungu.zpf diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java index 3870ac1c..407a1560 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java @@ -16,12 +16,12 @@ package com.alibaba.cloud.nacos; -import org.springframework.cloud.client.DefaultServiceInstance; -import org.springframework.cloud.client.ServiceInstance; - import java.net.URI; import java.util.Map; +import org.springframework.cloud.client.DefaultServiceInstance; +import org.springframework.cloud.client.ServiceInstance; + /** * @author xiaojing */ diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java similarity index 96% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java index 42b964f9..941a2319 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java @@ -16,16 +16,21 @@ package com.alibaba.cloud.nacos.discovery; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.cloud.nacos.NacosServiceInstance; -import com.alibaba.nacos.api.naming.pojo.Instance; -import com.alibaba.nacos.api.naming.pojo.ListView; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; -import java.util.*; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.cloud.nacos.NacosServiceInstance; +import com.alibaba.nacos.api.naming.pojo.Instance; +import com.alibaba.nacos.api.naming.pojo.ListView; /** * @author xiaojing diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java index abcd947e..8de3bbae 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java @@ -16,9 +16,6 @@ package com.alibaba.cloud.nacos.discovery; -import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; - import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -28,6 +25,9 @@ import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAu import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; + /** * @author xiaojing */ diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java index c0731f5e..d0c45a76 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java @@ -23,9 +23,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.nacos.api.naming.listener.EventListener; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.client.discovery.event.HeartbeatEvent; @@ -35,6 +32,9 @@ import org.springframework.context.SmartLifecycle; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.nacos.api.naming.listener.EventListener; + /** * @author xiaojing */ diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java index 3cc04ab7..0cccdcfd 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java @@ -16,6 +16,8 @@ package com.alibaba.cloud.nacos.discovery.configclient; +import javax.annotation.PostConstruct; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -23,8 +25,6 @@ import org.springframework.cloud.config.server.config.ConfigServerProperties; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; -import javax.annotation.PostConstruct; - import com.alibaba.cloud.nacos.NacosDiscoveryProperties; /** diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java similarity index 97% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java index 070ad93a..309439ae 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -22,8 +22,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; - import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java index 2422855e..6ea62bbb 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java @@ -21,15 +21,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.api.naming.pojo.ServiceInfo; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.api.naming.pojo.ServiceInfo; + /** * Endpoint for nacos discovery, get nacos properties and subscribed services * @author xiaojing diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java index 144bfe8b..efb4b0f8 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java @@ -16,9 +16,6 @@ package com.alibaba.cloud.nacos.endpoint; -import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; - import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -26,6 +23,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; + /** * @author xiaojing */ diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java similarity index 98% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java index 2c7b0eb1..d4e7903d 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java @@ -16,7 +16,11 @@ package com.alibaba.cloud.nacos.registry; -import com.alibaba.nacos.api.naming.PreservedMetadataKeys; +import java.net.URI; +import java.util.Map; + +import javax.annotation.PostConstruct; + import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.ManagementServerPortUtils; @@ -25,11 +29,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; import org.springframework.util.StringUtils; -import java.net.URI; -import java.util.Map; - -import javax.annotation.PostConstruct; - import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.nacos.api.naming.NamingService; diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java similarity index 99% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java index 9f6d51c5..6a88b1d1 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java @@ -18,15 +18,16 @@ package com.alibaba.cloud.nacos.registry; import java.util.List; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.api.naming.pojo.Instance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.util.StringUtils; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.api.naming.pojo.Instance; + /** * @author xiaojing * @author Mercy diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java index dcdc35e0..1e25ec47 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java @@ -16,13 +16,13 @@ package com.alibaba.cloud.nacos.ribbon; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE, ElementType.METHOD }) @ConditionalOnProperty(value = "ribbon.nacos.enabled", matchIfMissing = true) diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java new file mode 100644 index 00000000..06111263 --- /dev/null +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java @@ -0,0 +1,21 @@ +package com.alibaba.cloud.nacos.ribbon; + +import java.util.List; + +import com.alibaba.nacos.api.naming.pojo.Instance; +import com.alibaba.nacos.client.naming.core.Balancer; + +/** + * @author itmuch.com + */ +public class ExtendBalancer extends Balancer { + /** + * 根据权重，随机选择实例 + * + * @param instances 实例列表 + * @return 选择的实例 + */ + public static Instance getHostByRandomWeight2(List instances) { + return getHostByRandomWeight(instances); + } +} diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java similarity index 99% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java index 086f1667..86d56f24 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java @@ -16,13 +16,14 @@ package com.alibaba.cloud.nacos.ribbon; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.ServerList; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * integrated Ribbon by default diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRule.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRule.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRule.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRule.java diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServer.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServer.java similarity index 99% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServer.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServer.java index 6456fd4d..73d9579e 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServer.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServer.java @@ -16,11 +16,12 @@ package com.alibaba.cloud.nacos.ribbon; -import com.alibaba.nacos.api.naming.pojo.Instance; -import com.netflix.loadbalancer.Server; - import java.util.Map; +import com.alibaba.nacos.api.naming.pojo.Instance; + +import com.netflix.loadbalancer.Server; + /** * @author xiaojing * @author pbting diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java similarity index 99% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java index 2b4582c5..7da981a3 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java @@ -16,14 +16,15 @@ package com.alibaba.cloud.nacos.ribbon; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.nacos.api.naming.pojo.Instance; -import com.netflix.client.config.IClientConfig; -import com.netflix.loadbalancer.AbstractServerList; - import java.util.ArrayList; import java.util.List; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.nacos.api.naming.pojo.Instance; + +import com.netflix.client.config.IClientConfig; +import com.netflix.loadbalancer.AbstractServerList; + /** * @author xiaojing * @author renhaojun diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java rename to spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java index 7a6a1225..64a30167 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java @@ -16,8 +16,6 @@ package com.alibaba.cloud.nacos.ribbon; -import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; - import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -26,6 +24,8 @@ import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; + /** * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration * Auto-configuration} that sets up Ribbon for Nacos. diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java index 3b3e18cb..260f46ff 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java @@ -16,25 +16,25 @@ package com.alibaba.cloud.nacos; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; - -import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClient; -import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.api.naming.pojo.Instance; -import com.alibaba.nacos.api.naming.pojo.ListView; - -import org.junit.Test; -import org.springframework.cloud.client.ServiceInstance; - import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; + +import org.junit.Test; +import org.springframework.cloud.client.ServiceInstance; + +import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClient; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.api.naming.pojo.Instance; +import com.alibaba.nacos.api.naming.pojo.ListView; + /** * @author xiaojing */ diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java index 04a1d4aa..0486b851 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java @@ -16,19 +16,15 @@ package com.alibaba.cloud.nacos.registry; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + import java.net.Inet4Address; import java.net.InetAddress; import java.net.NetworkInterface; import java.util.Enumeration; -import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +36,10 @@ import org.springframework.cloud.commons.util.InetUtils; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; + /** * @author xiaojing */ diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java similarity index 97% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java index e7878822..2f0944eb 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java @@ -16,9 +16,9 @@ package com.alibaba.cloud.nacos.registry; -import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,9 +30,9 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; +import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; /** * @author xiaojing @@ -42,7 +42,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @SpringBootTest(classes = NacosAutoServiceRegistrationIpTests.TestConfig.class, properties = { "spring.application.name=myTestService1", "spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848", - "spring.cloud.nacos.discovery.ip=123.123.123.123" }, webEnvironment = RANDOM_PORT) + "spring.cloud.nacos.discovery.ip=123.123.123.123" }, webEnvironment = RANDOM_PORT) public class NacosAutoServiceRegistrationIpTests { @Autowired diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java similarity index 91% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java index 02d4b9e5..6fca25f8 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java @@ -16,12 +16,6 @@ package com.alibaba.cloud.nacos.registry; -import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; - -import static com.alibaba.cloud.nacos.registry.NacosRegistration.MANAGEMENT_CONTEXT_PATH; -import static com.alibaba.cloud.nacos.registry.NacosRegistration.MANAGEMENT_PORT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -36,6 +30,10 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; + /** * @author xiaojing */ @@ -71,11 +69,11 @@ public class NacosAutoServiceRegistrationManagementPortTests { private void checkoutNacosDiscoveryManagementData() { assertEquals("NacosDiscoveryProperties management port was wrong", "8888", - properties.getMetadata().get(MANAGEMENT_PORT)); + properties.getMetadata().get(NacosRegistration.MANAGEMENT_PORT)); assertEquals("NacosDiscoveryProperties management context path was wrong", "/test-context-path", - properties.getMetadata().get(MANAGEMENT_CONTEXT_PATH)); + properties.getMetadata().get(NacosRegistration.MANAGEMENT_CONTEXT_PATH)); } diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java similarity index 98% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java index cb7ea4e1..25483a82 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java @@ -16,13 +16,8 @@ package com.alibaba.cloud.nacos.registry; -import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import org.junit.Test; @@ -35,6 +30,10 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; + /** * @author xiaojing */ diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java index 41496482..6ffe53c1 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java @@ -16,12 +16,12 @@ package com.alibaba.cloud.nacos.registry; -import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; -import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; -import com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpoint; +import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,10 +35,10 @@ import org.springframework.cloud.commons.util.InetUtils; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; +import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; +import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; +import com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpoint; /** * @author xiaojing diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java similarity index 99% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java index 0506e0ad..2dd70b04 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java @@ -1,9 +1,7 @@ package com.alibaba.cloud.nacos.ribbon; -import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; +import static org.assertj.core.api.Assertions.assertThat; -import com.netflix.client.config.DefaultClientConfigImpl; -import com.netflix.client.config.IClientConfig; import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -14,7 +12,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.client.RestTemplate; -import static org.assertj.core.api.Assertions.assertThat; +import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; + +import com.netflix.client.config.DefaultClientConfigImpl; +import com.netflix.client.config.IClientConfig; /** * @author xiaojing diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java similarity index 93% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java index 1c8baeda..2732f2b4 100644 --- a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java @@ -16,25 +16,26 @@ package com.alibaba.cloud.nacos.ribbon; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import org.junit.Test; + import com.alibaba.cloud.nacos.NacosDiscoveryProperties; +import com.alibaba.cloud.nacos.test.NacosMockTest; import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.pojo.Instance; import com.netflix.client.config.IClientConfig; -import org.junit.Test; - -import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * @author xiaojing @@ -63,7 +64,8 @@ public class NacosServerListTests { public void testGetServers() throws Exception { ArrayList instances = new ArrayList<>(); - instances.add(serviceInstance("test-service", false, Collections.emptyMap())); + instances.add(NacosMockTest.serviceInstance("test-service", false, + Collections.emptyMap())); NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties.class); @@ -94,8 +96,8 @@ public class NacosServerListTests { map1.put("instanceNum", "1"); HashMap map2 = new HashMap<>(); map2.put("instanceNum", "2"); - instances.add(serviceInstance("test-service", false, map1)); - instances.add(serviceInstance("test-service", true, map2)); + instances.add(NacosMockTest.serviceInstance("test-service", false, map1)); + instances.add(NacosMockTest.serviceInstance("test-service", true, map2)); NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties.class); @@ -132,7 +134,7 @@ public class NacosServerListTests { HashMap map = new HashMap<>(); map.put("instanceNum", "1"); - instances.add(serviceInstance("test-service", true, map)); + instances.add(NacosMockTest.serviceInstance("test-service", true, map)); NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties.class); diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/test/CommonTestConfig.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/CommonTestConfig.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/test/CommonTestConfig.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/CommonTestConfig.java diff --git a/alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java similarity index 100% rename from alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java diff --git a/alibaba-seata-spring-cloud/pom.xml b/spring-cloud-alibaba-seata/pom.xml similarity index 94% rename from alibaba-seata-spring-cloud/pom.xml rename to spring-cloud-alibaba-seata/pom.xml index 75dfb063..4989d04e 100644 --- a/alibaba-seata-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-seata/pom.xml @@ -9,15 +9,14 @@ 4.0.0 - com.alibaba.cloud - alibaba-seata-spring-cloud - Alibaba Seata Spring Cloud + spring-cloud-alibaba-seata + Spring Cloud Alibaba Seata io.seata - seata-spring + seata-all @@ -28,7 +27,7 @@ com.alibaba.cloud - alibaba-sentinel-spring-cloud-starter + spring-cloud-starter-alibaba-sentinel provided true diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java index 4c28c58b..a26aa578 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java @@ -16,14 +16,14 @@ package com.alibaba.cloud.seata; -import io.seata.spring.annotation.GlobalTransactionScanner; - import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; +import io.seata.spring.annotation.GlobalTransactionScanner; + /** * @author xiaojing */ diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/SeataProperties.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/SeataProperties.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/SeataProperties.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/SeataProperties.java diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataBeanPostProcessor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataBeanPostProcessor.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataBeanPostProcessor.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataBeanPostProcessor.java diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataContextBeanPostProcessor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataContextBeanPostProcessor.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataContextBeanPostProcessor.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataContextBeanPostProcessor.java diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilder.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilder.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilder.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilder.java diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java similarity index 99% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java index 5dcd1320..9e486120 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java @@ -23,12 +23,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.util.StringUtils; + import feign.Client; import feign.Request; import feign.Response; import io.seata.core.context.RootContext; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.util.StringUtils; /** * @author xiaojing diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignContext.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignContext.java similarity index 99% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignContext.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignContext.java index 705bff8c..86b017f6 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignContext.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignContext.java @@ -19,9 +19,10 @@ package com.alibaba.cloud.seata.feign; import java.util.HashMap; import java.util.Map; -import feign.Client; import org.springframework.cloud.openfeign.FeignContext; +import feign.Client; + /** * * @author xiaojing diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java index 39e99852..374b8367 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java @@ -18,11 +18,11 @@ package com.alibaba.cloud.seata.feign; import org.springframework.beans.factory.BeanFactory; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; - -import feign.Client; import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; +import feign.Client; + /** * @author xiaojing */ diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java index 08c9d5a8..f226244a 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java @@ -16,11 +16,11 @@ package com.alibaba.cloud.seata.feign; -import feign.Retryer; -import feign.hystrix.HystrixFeign; import org.springframework.beans.factory.BeanFactory; import feign.Feign; +import feign.Retryer; +import feign.hystrix.HystrixFeign; /** * @author xiaojing diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java index 373bad1a..912e66c8 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java @@ -23,16 +23,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import io.seata.core.context.RootContext; import org.springframework.beans.factory.BeanFactory; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; +import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; +import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; +import org.springframework.util.StringUtils; import feign.Client; import feign.Request; import feign.Response; -import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; -import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; -import org.springframework.util.StringUtils; +import io.seata.core.context.RootContext; /** * @author xiaojing diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java similarity index 99% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java index 51d226eb..0f185c2a 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java @@ -18,9 +18,10 @@ package com.alibaba.cloud.seata.feign; import org.springframework.beans.factory.BeanFactory; +import com.alibaba.cloud.sentinel.feign.SentinelFeign; + import feign.Feign; import feign.Retryer; -import com.alibaba.cloud.sentinel.feign.SentinelFeign; /** * @author xiaojing diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java index b2494fba..0bff8173 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java @@ -17,11 +17,11 @@ package com.alibaba.cloud.seata.feign.hystrix; import java.util.concurrent.Callable; -import io.seata.core.context.RootContext; - import com.netflix.hystrix.strategy.HystrixPlugins; import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; +import io.seata.core.context.RootContext; + /** * @author xiaojing */ diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java similarity index 99% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java index ec5f7e2c..7dc05fde 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java @@ -31,17 +31,18 @@ package com.alibaba.cloud.seata.rest; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import javax.annotation.PostConstruct; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.web.client.RestTemplate; -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * @author xiaojing */ diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java index 97680aa0..d90f1255 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java @@ -18,8 +18,6 @@ package com.alibaba.cloud.seata.rest; import java.io.IOException; -import io.seata.core.context.RootContext; - import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; @@ -27,6 +25,8 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.support.HttpRequestWrapper; import org.springframework.util.StringUtils; +import io.seata.core.context.RootContext; + /** * @author xiaojing */ diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java index 6dab36cf..9f50352a 100644 --- a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java @@ -19,13 +19,13 @@ package com.alibaba.cloud.seata.web; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import io.seata.core.context.RootContext; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; +import io.seata.core.context.RootContext; + /** * @author xiaojing * diff --git a/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java similarity index 100% rename from alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java rename to spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java diff --git a/alibaba-seata-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-seata/src/main/resources/META-INF/spring.factories similarity index 100% rename from alibaba-seata-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-seata/src/main/resources/META-INF/spring.factories diff --git a/alibaba-sentinel-datasource-spring-cloud/pom.xml b/spring-cloud-alibaba-sentinel-datasource/pom.xml similarity index 96% rename from alibaba-sentinel-datasource-spring-cloud/pom.xml rename to spring-cloud-alibaba-sentinel-datasource/pom.xml index afacb9da..ad4b67a9 100644 --- a/alibaba-sentinel-datasource-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-sentinel-datasource/pom.xml @@ -9,9 +9,8 @@ 4.0.0 - com.alibaba.cloud - alibaba-sentinel-datasource-spring-cloud - Alibaba Sentinel DataSource Spring Cloud + spring-cloud-alibaba-sentinel-datasource + Spring Cloud Alibaba Sentinel DataSource diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/RuleType.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/RuleType.java similarity index 85% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/RuleType.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/RuleType.java index 202f91d3..4a376fd2 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/RuleType.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/RuleType.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -20,9 +19,9 @@ package com.alibaba.cloud.sentinel.datasource; import java.util.Arrays; import java.util.Optional; -import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties; import org.springframework.util.StringUtils; +import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties; import com.alibaba.csp.sentinel.slots.block.AbstractRule; import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule; import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule; diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java similarity index 54% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java index b762f23b..5240ba26 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java new file mode 100644 index 00000000..df89dbd9 --- /dev/null +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.cloud.sentinel.datasource.config; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +import org.springframework.core.env.Environment; + +import com.alibaba.cloud.sentinel.datasource.RuleType; +import com.alibaba.csp.sentinel.adapter.gateway.common.api.GatewayApiDefinitionManager; +import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayRuleManager; +import com.alibaba.csp.sentinel.datasource.AbstractDataSource; +import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager; +import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager; +import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; +import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager; +import com.alibaba.csp.sentinel.slots.system.SystemRuleManager; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +/** + * Abstract class Using by {@link DataSourcePropertiesConfiguration} + * + * @author Jim + */ +public class AbstractDataSourceProperties { + + @NotEmpty + private String dataType = "json"; + @NotNull + private RuleType ruleType; + private String converterClass; + @JsonIgnore + private final String factoryBeanName; + @JsonIgnore + private Environment env; + + public AbstractDataSourceProperties(String factoryBeanName) { + this.factoryBeanName = factoryBeanName; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public RuleType getRuleType() { + return ruleType; + } + + public void setRuleType(RuleType ruleType) { + this.ruleType = ruleType; + } + + public String getConverterClass() { + return converterClass; + } + + public void setConverterClass(String converterClass) { + this.converterClass = converterClass; + } + + public String getFactoryBeanName() { + return factoryBeanName; + } + + protected Environment getEnv() { + return env; + } + + public void setEnv(Environment env) { + this.env = env; + } + + public void preCheck(String dataSourceName) { + + } + + public void postRegister(AbstractDataSource dataSource) { + switch (this.getRuleType()) { + case FLOW: + FlowRuleManager.register2Property(dataSource.getProperty()); + break; + case DEGRADE: + DegradeRuleManager.register2Property(dataSource.getProperty()); + break; + case PARAM_FLOW: + ParamFlowRuleManager.register2Property(dataSource.getProperty()); + break; + case SYSTEM: + SystemRuleManager.register2Property(dataSource.getProperty()); + break; + case AUTHORITY: + AuthorityRuleManager.register2Property(dataSource.getProperty()); + break; + case GW_FLOW: + GatewayRuleManager.register2Property(dataSource.getProperty()); + break; + case GW_API_GROUP: + GatewayApiDefinitionManager.register2Property(dataSource.getProperty()); + break; + default: + break; + } + } +} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java similarity index 76% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java index 6a66e713..d67baf04 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java similarity index 86% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java index f922ebe3..12dde119 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java similarity index 82% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java index f5a6e99c..c8551c24 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -21,11 +20,11 @@ import java.io.IOException; import javax.validation.constraints.NotEmpty; -import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean; - import org.springframework.util.ResourceUtils; import org.springframework.util.StringUtils; +import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean; + /** * File Properties class Using by {@link DataSourcePropertiesConfiguration} and * {@link FileRefreshableDataSourceFactoryBean} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java similarity index 83% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java index 0cced95a..f8673d0b 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -19,10 +18,10 @@ package com.alibaba.cloud.sentinel.datasource.config; import javax.validation.constraints.NotEmpty; -import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean; - import org.springframework.util.StringUtils; +import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean; + /** * Nacos Properties class Using by {@link DataSourcePropertiesConfiguration} and * {@link NacosDataSourceFactoryBean} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java similarity index 79% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java index 03b1c024..4d1755bf 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,10 +16,10 @@ package com.alibaba.cloud.sentinel.datasource.config; -import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean; - import org.springframework.util.StringUtils; +import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean; + /** * Zookeeper Properties class Using by {@link DataSourcePropertiesConfiguration} and * {@link ZookeeperDataSourceFactoryBean} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java similarity index 71% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java index 4951af54..7ffd4ef7 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java similarity index 89% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java index 095297d8..1d8269d7 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java similarity index 72% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java index ec22d77e..770413c1 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java similarity index 79% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java index b83d48e7..47843e5c 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java new file mode 100644 index 00000000..0042134b --- /dev/null +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.cloud.sentinel.datasource.factorybean; + +import java.io.File; +import java.nio.charset.Charset; + +import org.springframework.beans.factory.FactoryBean; + +import com.alibaba.csp.sentinel.datasource.Converter; +import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource; + +/** + * A {@link FactoryBean} for creating {@link FileRefreshableDataSource} instance. + * + * @author Jim + * @see FileRefreshableDataSource + */ +public class FileRefreshableDataSourceFactoryBean + implements FactoryBean { + + private String file; + private String charset; + private long recommendRefreshMs; + private int bufSize; + private Converter converter; + + @Override + public FileRefreshableDataSource getObject() throws Exception { + return new FileRefreshableDataSource(new File(file), converter, + recommendRefreshMs, bufSize, Charset.forName(charset)); + } + + @Override + public Class getObjectType() { + return FileRefreshableDataSource.class; + } + + public String getFile() { + return file; + } + + public void setFile(String file) { + this.file = file; + } + + public String getCharset() { + return charset; + } + + public void setCharset(String charset) { + this.charset = charset; + } + + public long getRecommendRefreshMs() { + return recommendRefreshMs; + } + + public void setRecommendRefreshMs(long recommendRefreshMs) { + this.recommendRefreshMs = recommendRefreshMs; + } + + public int getBufSize() { + return bufSize; + } + + public void setBufSize(int bufSize) { + this.bufSize = bufSize; + } + + public Converter getConverter() { + return converter; + } + + public void setConverter(Converter converter) { + this.converter = converter; + } +} diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java similarity index 86% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java index 40596c54..da640f8e 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java similarity index 81% rename from alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java rename to spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java index c84473f7..5731d8f1 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright (C) 2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/resources/META-INF/sentinel-datasource.properties b/spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/main/resources/META-INF/sentinel-datasource.properties rename to spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java new file mode 100644 index 00000000..903bb377 --- /dev/null +++ b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java @@ -0,0 +1,250 @@ +/// * +// * Copyright (C) 2018 the original author or authors. +// * +// * Licensed under the Apache License, Version 2.0 (the "License"); +// * you may not use this file except in compliance with the License. +// * You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, software +// * distributed under the License is distributed on an "AS IS" BASIS, +// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// * See the License for the specific language governing permissions and +// * limitations under the License. +// */ +// +// package com.alibaba.cloud.sentinel.datasource; +// +// import static org.junit.Assert.assertEquals; +// import static org.junit.Assert.assertNotNull; +// import static org.junit.Assert.assertNull; +// +// import org.junit.Test; +// import ApolloDataSourceProperties; +// import DataSourcePropertiesConfiguration; +// import FileDataSourceProperties; +// import NacosDataSourceProperties; +// import ZookeeperDataSourceProperties; +// +/// ** +// * @author Jim +// */ +// public class DataSourcePropertiesConfigurationTests { +// +// @Test +// public void testFileAttr() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration(); +// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, +// dataSourcePropertiesConfiguration.getValidField().size()); +// assertNull("DataSourcePropertiesConfiguration valid properties was not null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// +// FileDataSourceProperties fileDataSourceProperties = buildFileProperties(); +// +// dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties); +// +// assertEquals( +// "DataSourcePropertiesConfiguration valid field size was wrong after set file +/// attribute", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration file properties was null after set file attribute", +// dataSourcePropertiesConfiguration.getFile()); +// assertNotNull( +// "DataSourcePropertiesConfiguration valid properties was null after set file attribute", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testNacosAttr() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration(); +// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, +// dataSourcePropertiesConfiguration.getValidField().size()); +// assertNull("DataSourcePropertiesConfiguration valid properties was not null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// +// NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties(); +// +// dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties); +// +// assertEquals( +// "DataSourcePropertiesConfiguration valid field size was wrong after set nacos +/// attribute", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration nacos properties was null after set nacos +/// attribute", +// dataSourcePropertiesConfiguration.getNacos()); +// assertNotNull( +// "DataSourcePropertiesConfiguration valid properties was null after set nacos +/// attribute", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testZKAttr() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration(); +// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, +// dataSourcePropertiesConfiguration.getValidField().size()); +// assertNull("DataSourcePropertiesConfiguration valid properties was not null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// +// ZookeeperDataSourceProperties zookeeperDataSourceProperties = buildZKProperties(); +// +// dataSourcePropertiesConfiguration.setZk(zookeeperDataSourceProperties); +// +// assertEquals( +// "DataSourcePropertiesConfiguration valid field size was wrong after set zk attribute", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration zk properties was null after set zk attribute", +// dataSourcePropertiesConfiguration.getZk()); +// assertNotNull( +// "DataSourcePropertiesConfiguration valid properties was null after set zk attribute", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testApolloAttr() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration(); +// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, +// dataSourcePropertiesConfiguration.getValidField().size()); +// assertNull("DataSourcePropertiesConfiguration valid properties was not null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// +// ApolloDataSourceProperties apolloDataSourceProperties = buildApolloProperties(); +// +// dataSourcePropertiesConfiguration.setApollo(apolloDataSourceProperties); +// +// assertEquals( +// "DataSourcePropertiesConfiguration valid field size was wrong after set apollo +/// attribute", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration apollo properties was null after set apollo +/// attribute", +// dataSourcePropertiesConfiguration.getApollo()); +// assertNotNull( +// "DataSourcePropertiesConfiguration valid properties was null after set apollo +/// attribute", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testMultiAttr() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration(); +// assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, +// dataSourcePropertiesConfiguration.getValidField().size()); +// assertNull("DataSourcePropertiesConfiguration valid properties was not null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// +// FileDataSourceProperties fileDataSourceProperties = buildFileProperties(); +// NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties(); +// +// dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties); +// dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties); +// +// assertEquals( +// "DataSourcePropertiesConfiguration valid field size was wrong after set file and nacos +/// attribute", +// 2, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNull( +// "DataSourcePropertiesConfiguration valid properties was not null after set file and +/// nacos attribute", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testFileConstructor() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration( +// buildFileProperties()); +// assertEquals( +// "DataSourcePropertiesConfiguration file constructor valid field size was wrong", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration file constructor valid properties was null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testNacosConstructor() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration( +// buildNacosProperties()); +// assertEquals( +// "DataSourcePropertiesConfiguration nacos constructor valid field size was wrong", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration nacos constructor valid properties was null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testApolloConstructor() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration( +// buildApolloProperties()); +// assertEquals( +// "DataSourcePropertiesConfiguration apollo constructor valid field size was wrong", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration apollo constructor valid properties was null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// @Test +// public void testZKConstructor() { +// DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new +/// DataSourcePropertiesConfiguration( +// buildZKProperties()); +// assertEquals( +// "DataSourcePropertiesConfiguration zk constructor valid field size was wrong", +// 1, dataSourcePropertiesConfiguration.getValidField().size()); +// assertNotNull( +// "DataSourcePropertiesConfiguration zk constructor valid properties was null", +// dataSourcePropertiesConfiguration.getValidDataSourceProperties()); +// } +// +// private FileDataSourceProperties buildFileProperties() { +// FileDataSourceProperties fileDataSourceProperties = new FileDataSourceProperties(); +// +// fileDataSourceProperties.setFile("/tmp/test.json"); +// fileDataSourceProperties.setBufSize(1024); +// fileDataSourceProperties.setRecommendRefreshMs(2000); +// return fileDataSourceProperties; +// } +// +// private NacosDataSourceProperties buildNacosProperties() { +// NacosDataSourceProperties nacosDataSourceProperties = new NacosDataSourceProperties(); +// nacosDataSourceProperties.setServerAddr("127.0.0.1:8848"); +// nacosDataSourceProperties.setDataId("sentinel"); +// nacosDataSourceProperties.setGroupId("custom-group"); +// return nacosDataSourceProperties; +// } +// +// private ApolloDataSourceProperties buildApolloProperties() { +// ApolloDataSourceProperties apolloDataSourceProperties = new +/// ApolloDataSourceProperties(); +// apolloDataSourceProperties.setFlowRulesKey("test-key"); +// apolloDataSourceProperties.setDefaultFlowRuleValue("dft-val"); +// apolloDataSourceProperties.setNamespaceName("namespace"); +// return apolloDataSourceProperties; +// } +// +// private ZookeeperDataSourceProperties buildZKProperties() { +// ZookeeperDataSourceProperties zookeeperDataSourceProperties = new +/// ZookeeperDataSourceProperties(); +// +// zookeeperDataSourceProperties.setServerAddr("localhost:2181"); +// zookeeperDataSourceProperties.setPath("/path"); +// return zookeeperDataSourceProperties; +// } +// +// } diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java similarity index 96% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java index 8292b57f..86384e6a 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java @@ -22,8 +22,7 @@ import static org.junit.Assert.assertNull; import java.io.IOException; import java.util.List; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Assert; import org.junit.Test; import org.springframework.util.ResourceUtils; import org.springframework.util.StringUtils; @@ -39,6 +38,9 @@ import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource; import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * @author Jim */ @@ -57,7 +59,7 @@ public class DataSourcePropertiesTests { apolloDataSourceProperties.getNamespaceName()); assertEquals("Apollo default data type was wrong", "json", apolloDataSourceProperties.getDataType()); - assertEquals("Apollo rule type was wrong", RuleType.DEGRADE, + Assert.assertEquals("Apollo rule type was wrong", RuleType.DEGRADE, apolloDataSourceProperties.getRuleType()); assertEquals("Apollo default flow value was wrong", "dft-val", apolloDataSourceProperties.getDefaultFlowRuleValue()); @@ -92,7 +94,7 @@ public class DataSourcePropertiesTests { zookeeperDataSourceProperties.getFactoryBeanName()); assertEquals("ZK custom converter class was wrong", "test.ConverterClass", zookeeperDataSourceProperties.getConverterClass()); - assertEquals("ZK rule type was wrong", RuleType.AUTHORITY, + Assert.assertEquals("ZK rule type was wrong", RuleType.AUTHORITY, zookeeperDataSourceProperties.getRuleType()); } @@ -114,7 +116,7 @@ public class DataSourcePropertiesTests { assertEquals("File factory bean was wrong", FileRefreshableDataSourceFactoryBean.class.getName(), fileDataSourceProperties.getFactoryBeanName()); - assertEquals("File rule type was wrong", RuleType.PARAM_FLOW, + Assert.assertEquals("File rule type was wrong", RuleType.PARAM_FLOW, fileDataSourceProperties.getRuleType()); } diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java similarity index 99% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java index 10f91dc5..5e49678e 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java @@ -23,19 +23,20 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.List; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; -import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.ResourceUtils; +import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource; import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * @author Jim */ diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java similarity index 94% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java index 2064ce81..6b3471f1 100644 --- a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java +++ b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java @@ -16,13 +16,14 @@ package com.alibaba.cloud.sentinel.datasource; -import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties; -import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean; - import static org.junit.Assert.assertEquals; +import org.junit.Assert; import org.junit.Test; +import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties; +import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean; + /** * @author Jim */ @@ -43,7 +44,7 @@ public class NacosDataSourcePropertiesTests { nacosDataSourceProperties.getDataId()); assertEquals("Nacos default data type was wrong", "xml", nacosDataSourceProperties.getDataType()); - assertEquals("Nacos rule type was wrong", RuleType.FLOW, + Assert.assertEquals("Nacos rule type was wrong", RuleType.FLOW, nacosDataSourceProperties.getRuleType()); assertEquals("Nacos default factory bean was wrong", NacosDataSourceFactoryBean.class.getName(), @@ -67,7 +68,7 @@ public class NacosDataSourcePropertiesTests { nacosDataSourceProperties.getEndpoint()); assertEquals("Nacos namespace was wrong", "namespace", nacosDataSourceProperties.getNamespace()); - assertEquals("Nacos rule type was wrong", RuleType.SYSTEM, + Assert.assertEquals("Nacos rule type was wrong", RuleType.SYSTEM, nacosDataSourceProperties.getRuleType()); } diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java b/spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java rename to spring-cloud-alibaba-sentinel-datasource/src/test/java/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorcontent.json b/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorcontent.json similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorcontent.json rename to spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorcontent.json diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorformat.json b/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorformat.json similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorformat.json rename to spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorformat.json diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.json b/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.json similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.json rename to spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.json diff --git a/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.xml b/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.xml similarity index 100% rename from alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.xml rename to spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.xml diff --git a/alibaba-sentinel-gateway-spring-cloud/README.md b/spring-cloud-alibaba-sentinel-gateway/README.md similarity index 98% rename from alibaba-sentinel-gateway-spring-cloud/README.md rename to spring-cloud-alibaba-sentinel-gateway/README.md index 8c8c4a02..d2dc9063 100755 --- a/alibaba-sentinel-gateway-spring-cloud/README.md +++ b/spring-cloud-alibaba-sentinel-gateway/README.md @@ -13,7 +13,7 @@ Sentinel can provide `ServiceId` level and `API Path` level flow control for spr ```xml - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-sentinel-gateway x.y.z diff --git a/alibaba-sentinel-gateway-spring-cloud/pom.xml b/spring-cloud-alibaba-sentinel-gateway/pom.xml similarity index 91% rename from alibaba-sentinel-gateway-spring-cloud/pom.xml rename to spring-cloud-alibaba-sentinel-gateway/pom.xml index 185c6258..fbdb5d71 100644 --- a/alibaba-sentinel-gateway-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-sentinel-gateway/pom.xml @@ -9,9 +9,8 @@ 4.0.0 - com.alibaba.cloud - alibaba-sentinel-gateway-spring-cloud - Alibaba Sentinel Gateway Spring Cloud + spring-cloud-alibaba-sentinel-gateway + Spring Cloud Alibaba Sentinel Gateway @@ -37,7 +36,7 @@ com.alibaba.cloud - alibaba-sentinel-datasource-spring-cloud + spring-cloud-alibaba-sentinel-datasource org.springframework.cloud diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java index aed4fa2b..3efd42ab 100644 --- a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java +++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java @@ -24,11 +24,11 @@ import java.util.Map.Entry; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter; -import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter; +import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter; import com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiDefinition; import com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiPathPredicateItem; import com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiPredicateGroupItem; diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java similarity index 99% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java index 46b5bb07..35ead382 100644 --- a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java +++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java @@ -18,6 +18,7 @@ package com.alibaba.cloud.sentinel.gateway.scg; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; + import com.alibaba.cloud.sentinel.gateway.ConfigConstants; import com.alibaba.cloud.sentinel.gateway.FallbackProperties; diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java index 9b5c4115..1a8e6835 100644 --- a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java +++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java @@ -32,8 +32,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.cloud.sentinel.gateway.ConfigConstants; -import com.alibaba.cloud.sentinel.gateway.FallbackProperties; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -45,6 +43,8 @@ import org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.reactive.result.view.ViewResolver; import org.springframework.web.server.ServerWebExchange; +import com.alibaba.cloud.sentinel.gateway.ConfigConstants; +import com.alibaba.cloud.sentinel.gateway.FallbackProperties; import com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants; import com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler; diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java index 0e6ca95b..12a866b4 100644 --- a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java +++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java @@ -28,10 +28,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.cloud.sentinel.gateway.ConfigConstants; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.sentinel.gateway.ConfigConstants; import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.RequestOriginParser; import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.ZuulGatewayCallbackManager; import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulErrorFilter; diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java rename to spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java index 709612a8..d690c252 100644 --- a/alibaba-sentinel-gateway-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java +++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java @@ -18,8 +18,8 @@ package com.alibaba.cloud.sentinel.gateway.zuul; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import com.alibaba.cloud.sentinel.gateway.ConfigConstants; +import com.alibaba.cloud.sentinel.gateway.ConfigConstants; import com.alibaba.csp.sentinel.adapter.gateway.zuul.constants.ZuulConstant; import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulErrorFilter; import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPostFilter; diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories similarity index 100% rename from alibaba-sentinel-gateway-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories diff --git a/alibaba-sentinel-spring-cloud/pom.xml b/spring-cloud-alibaba-sentinel/pom.xml similarity index 96% rename from alibaba-sentinel-spring-cloud/pom.xml rename to spring-cloud-alibaba-sentinel/pom.xml index b84b4124..5f2a2ada 100644 --- a/alibaba-sentinel-spring-cloud/pom.xml +++ b/spring-cloud-alibaba-sentinel/pom.xml @@ -9,9 +9,8 @@ 4.0.0 - com.alibaba.cloud - alibaba-sentinel-spring-cloud - Alibaba Sentinel Spring Cloud + spring-cloud-alibaba-sentinel + Spring Cloud Alibaba Sentinel @@ -102,7 +101,7 @@ com.alibaba.cloud - alibaba-sentinel-datasource-spring-cloud + spring-cloud-alibaba-sentinel-datasource diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelConstants.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelConstants.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelConstants.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelConstants.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java index 7390c508..8fab12bf 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java @@ -21,10 +21,10 @@ import java.util.Map; import java.util.TreeMap; import org.springframework.boot.context.properties.ConfigurationProperties; -import com.alibaba.cloud.sentinel.datasource.config.DataSourcePropertiesConfiguration; import org.springframework.core.Ordered; import org.springframework.validation.annotation.Validated; +import com.alibaba.cloud.sentinel.datasource.config.DataSourcePropertiesConfiguration; import com.alibaba.csp.sentinel.config.SentinelConfig; import com.alibaba.csp.sentinel.log.LogBase; import com.alibaba.csp.sentinel.transport.config.TransportConfig; diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java index 25fc3665..a3b435bd 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java @@ -25,15 +25,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.cloud.sentinel.SentinelProperties; -import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter; -import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.util.StringUtils; +import com.alibaba.cloud.sentinel.SentinelProperties; +import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter; +import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter; import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig; import com.alibaba.csp.sentinel.annotation.aspectj.SentinelResourceAspect; import com.alibaba.csp.sentinel.config.SentinelConfig; diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java index edd33c40..178060bf 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java @@ -28,8 +28,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor; import org.springframework.beans.factory.support.RootBeanDefinition; -import com.alibaba.cloud.sentinel.SentinelConstants; -import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; import org.springframework.context.ApplicationContext; import org.springframework.core.type.StandardMethodMetadata; import org.springframework.core.type.classreading.MethodMetadataReadingVisitor; @@ -40,6 +38,8 @@ import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; +import com.alibaba.cloud.sentinel.SentinelConstants; +import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; import com.alibaba.csp.sentinel.slots.block.BlockException; /** diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java index 47dbb6b1..6c7d3f1d 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java @@ -12,14 +12,14 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import com.alibaba.cloud.sentinel.SentinelProperties; -import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties; -import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter; -import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter; import org.springframework.core.env.Environment; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; +import com.alibaba.cloud.sentinel.SentinelProperties; +import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties; +import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter; +import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter; import com.alibaba.csp.sentinel.datasource.AbstractDataSource; import com.alibaba.csp.sentinel.datasource.ReadableDataSource; diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java index d79d223c..4594caef 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java @@ -21,14 +21,14 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URI; -import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; -import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.RestTemplate; +import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; +import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import com.alibaba.csp.sentinel.Entry; import com.alibaba.csp.sentinel.EntryType; import com.alibaba.csp.sentinel.SphU; diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java index 8710b836..3d523ebb 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java @@ -21,8 +21,8 @@ import java.util.Map; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; -import com.alibaba.cloud.sentinel.SentinelProperties; +import com.alibaba.cloud.sentinel.SentinelProperties; import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig; import com.alibaba.csp.sentinel.config.SentinelConfig; import com.alibaba.csp.sentinel.log.LogBase; diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java similarity index 92% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java index 9ac50f67..ded2f47c 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java @@ -23,9 +23,10 @@ import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.cloud.sentinel.SentinelProperties; import org.springframework.context.annotation.Bean; +import com.alibaba.cloud.sentinel.SentinelProperties; + /** * @author hengyunabc */ @@ -43,7 +44,9 @@ public class SentinelEndpointAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnEnabledHealthIndicator("sentinel") - public SentinelHealthIndicator sentinelHealthIndicator(DefaultListableBeanFactory beanFactory, SentinelProperties sentinelProperties) { + public SentinelHealthIndicator sentinelHealthIndicator( + DefaultListableBeanFactory beanFactory, + SentinelProperties sentinelProperties) { return new SentinelHealthIndicator(beanFactory, sentinelProperties); } } diff --git a/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java new file mode 100644 index 00000000..08864b8b --- /dev/null +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.cloud.sentinel.endpoint; + +import java.util.HashMap; +import java.util.Map; + +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.boot.actuate.health.AbstractHealthIndicator; +import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.actuate.health.Status; +import org.springframework.util.StringUtils; + +import com.alibaba.cloud.sentinel.SentinelProperties; +import com.alibaba.csp.sentinel.datasource.AbstractDataSource; +import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider; +import com.alibaba.csp.sentinel.transport.HeartbeatSender; +import com.alibaba.csp.sentinel.transport.config.TransportConfig; + +/** + * A {@link HealthIndicator} for Sentinel, which checks the status of Sentinel Dashboard + * and DataSource. + * + *

+ * Check the status of Sentinel Dashboard by sending a heartbeat message to it. If return + * true, it's OK. + * + * Check the status of Sentinel DataSource by calling loadConfig method of + * {@link AbstractDataSource}. If no Exception thrown, it's OK. + * + * If Dashboard and DataSource are both OK, the health status is UP. + *

+ * + *

+ * Note: If Sentinel isn't enabled, the health status is up. If Sentinel Dashboard isn't + * configured, it's OK and mark the status of Dashboard with UNKNOWN. More informations + * are provided in details. + *

+ * + * @author cdfive + */ +public class SentinelHealthIndicator extends AbstractHealthIndicator { + + private DefaultListableBeanFactory beanFactory; + + private SentinelProperties sentinelProperties; + + public SentinelHealthIndicator(DefaultListableBeanFactory beanFactory, + SentinelProperties sentinelProperties) { + this.beanFactory = beanFactory; + this.sentinelProperties = sentinelProperties; + } + + @Override + protected void doHealthCheck(Health.Builder builder) throws Exception { + Map detailMap = new HashMap<>(); + + // If sentinel isn't enabled, set the status up and set the enabled to false in + // detail + if (!sentinelProperties.isEnabled()) { + detailMap.put("enabled", false); + builder.up().withDetails(detailMap); + return; + } + + detailMap.put("enabled", true); + + // Check health of Dashboard + boolean dashboardUp = true; + String consoleServer = TransportConfig.getConsoleServer(); + if (StringUtils.isEmpty(consoleServer)) { + // If Dashboard isn't configured, it's OK and mark the status of Dashboard + // with UNKNOWN. + detailMap.put("dashboard", + new Status(Status.UNKNOWN.getCode(), "dashboard isn't configured")); + } + else { + // If Dashboard is configured, send a heartbeat message to it and check the + // result + HeartbeatSender heartbeatSender = HeartbeatSenderProvider + .getHeartbeatSender(); + boolean result = heartbeatSender.sendHeartbeat(); + if (result) { + detailMap.put("dashboard", Status.UP); + } + else { + // If failed to send heartbeat message, means that the Dashboard is DOWN + dashboardUp = false; + detailMap.put("dashboard", new Status(Status.DOWN.getCode(), + consoleServer + " can't be connected")); + } + } + + // Check health of DataSource + boolean dataSourceUp = true; + Map dataSourceDetailMap = new HashMap<>(); + detailMap.put("dataSource", dataSourceDetailMap); + + // Get all DataSources and each call loadConfig to check if it's OK + // If no Exception thrown, it's OK + // Note: + // Even if the dynamic config center is down, the loadConfig() might return + // successfully + // e.g. for Nacos client, it might retrieve from the local cache) + // But in most circumstances it's okay + Map dataSourceMap = beanFactory + .getBeansOfType(AbstractDataSource.class); + for (Map.Entry dataSourceMapEntry : dataSourceMap + .entrySet()) { + String dataSourceBeanName = dataSourceMapEntry.getKey(); + AbstractDataSource dataSource = dataSourceMapEntry.getValue(); + try { + dataSource.loadConfig(); + dataSourceDetailMap.put(dataSourceBeanName, Status.UP); + } + catch (Exception e) { + // If one DataSource failed to loadConfig, means that the DataSource is + // DOWN + dataSourceUp = false; + dataSourceDetailMap.put(dataSourceBeanName, + new Status(Status.DOWN.getCode(), e.getMessage())); + } + } + + // If Dashboard and DataSource are both OK, the health status is UP + if (dashboardUp && dataSourceUp) { + builder.up().withDetails(detailMap); + } + else { + builder.down().withDetails(detailMap); + } + } +} diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java diff --git a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java similarity index 99% rename from alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java rename to spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java index 05cb98a9..a38084e3 100644 --- a/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java @@ -16,13 +16,6 @@ package com.alibaba.cloud.sentinel.rest; -import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; -import com.alibaba.cloud.sentinel.custom.SentinelProtectInterceptor; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.client.AbstractClientHttpResponse; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -31,6 +24,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.client.AbstractClientHttpResponse; + +import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; +import com.alibaba.cloud.sentinel.custom.SentinelProtectInterceptor; + /** * Using by {@link SentinelRestTemplate} and {@link SentinelProtectInterceptor} * diff --git a/alibaba-sentinel-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/alibaba-sentinel-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories similarity index 100% rename from alibaba-sentinel-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories diff --git a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java similarity index 100% rename from alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java rename to spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java index 15383f41..bc60fa98 100644 --- a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java @@ -34,11 +34,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.servlet.FilterRegistrationBean; -import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; -import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration; -import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor; -import com.alibaba.cloud.sentinel.endpoint.SentinelEndpoint; -import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpRequest; @@ -50,6 +45,11 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; +import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration; +import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor; +import com.alibaba.cloud.sentinel.endpoint.SentinelEndpoint; +import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig; import com.alibaba.csp.sentinel.config.SentinelConfig; import com.alibaba.csp.sentinel.log.LogBase; diff --git a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java similarity index 99% rename from alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java rename to spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java index 09c886fa..ef8c67e3 100644 --- a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java @@ -16,29 +16,31 @@ package com.alibaba.cloud.sentinel; -import com.alibaba.csp.sentinel.adapter.servlet.callback.RequestOriginParser; -import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlBlockHandler; -import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlCleaner; -import com.alibaba.csp.sentinel.adapter.servlet.callback.WebCallbackManager; -import com.alibaba.csp.sentinel.adapter.servlet.util.FilterUtil; -import com.alibaba.csp.sentinel.slots.block.BlockException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration; +import com.alibaba.csp.sentinel.adapter.servlet.callback.RequestOriginParser; +import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlBlockHandler; +import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlCleaner; +import com.alibaba.csp.sentinel.adapter.servlet.callback.WebCallbackManager; +import com.alibaba.csp.sentinel.adapter.servlet.util.FilterUtil; +import com.alibaba.csp.sentinel.slots.block.BlockException; /** * @author Jim diff --git a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java similarity index 97% rename from alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java rename to spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java index b8331ba7..40446485 100644 --- a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java @@ -16,20 +16,21 @@ package com.alibaba.cloud.sentinel; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration; -import com.alibaba.cloud.sentinel.datasource.RuleType; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration; +import com.alibaba.cloud.sentinel.datasource.RuleType; /** * @author Jim @@ -52,7 +53,7 @@ import static org.junit.Assert.assertNull; "spring.cloud.sentinel.datasource.ds5.file.file=classpath: param-flow.json", "spring.cloud.sentinel.datasource.ds5.file.data-type=custom", - "spring.cloud.sentinel.datasource.ds5.file.converter-class=com.alibaba.cloud.sentinel.TestConverter", + "spring.cloud.sentinel.datasource.ds5.file.converter-class=TestConverter", "spring.cloud.sentinel.datasource.ds5.file.rule-type=param-flow" }) public class SentinelDataSourceTests { diff --git a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java similarity index 98% rename from alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java rename to spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java index 290c1c4e..92e17bea 100644 --- a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java @@ -16,9 +16,14 @@ package com.alibaba.cloud.sentinel; -import com.alibaba.csp.sentinel.slots.block.RuleConstant; -import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; -import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Arrays; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Bean; @@ -35,13 +39,10 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import java.util.Arrays; - -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; +import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration; +import com.alibaba.csp.sentinel.slots.block.RuleConstant; +import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; +import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager; /** * @author Jim @@ -93,7 +94,7 @@ public class SentinelFeignTests { rule4.setLimitApp("default"); rule4.setControlBehavior(RuleConstant.CONTROL_BEHAVIOR_DEFAULT); rule4.setStrategy(RuleConstant.STRATEGY_DIRECT); - FlowRuleManager.loadRules(Arrays.asList(rule1, rule2, rule3,rule4)); + FlowRuleManager.loadRules(Arrays.asList(rule1, rule2, rule3, rule4)); } @Test diff --git a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java similarity index 92% rename from alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java rename to spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java index 3b13d4d9..d05624fb 100644 --- a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java @@ -16,12 +16,10 @@ package com.alibaba.cloud.sentinel; -import com.alibaba.csp.sentinel.slots.block.BlockException; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; -import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; -import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor; -import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -30,7 +28,10 @@ import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.web.client.RestTemplate; -import static org.junit.Assert.assertEquals; +import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate; +import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor; +import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse; +import com.alibaba.csp.sentinel.slots.block.BlockException; /** * @author Jim @@ -85,10 +86,10 @@ public class SentinelRestTemplateTests { new AnnotationConfigApplicationContext(TestConfig9.class); } - @Test - public void testNormalWithoutParam() { - new AnnotationConfigApplicationContext(TestConfig10.class); - } + @Test + public void testNormalWithoutParam() { + new AnnotationConfigApplicationContext(TestConfig10.class); + } @Configuration public static class TestConfig1 { @@ -225,26 +226,26 @@ public class SentinelRestTemplateTests { } } - @Configuration - public static class TestConfig10 { - @Bean - SentinelBeanPostProcessor sentinelBeanPostProcessor( - ApplicationContext applicationContext) { - return new SentinelBeanPostProcessor(applicationContext); - } + @Configuration + public static class TestConfig10 { + @Bean + SentinelBeanPostProcessor sentinelBeanPostProcessor( + ApplicationContext applicationContext) { + return new SentinelBeanPostProcessor(applicationContext); + } - @Bean - @SentinelRestTemplate - RestTemplate restTemplate() { - return new RestTemplate(); - } + @Bean + @SentinelRestTemplate + RestTemplate restTemplate() { + return new RestTemplate(); + } - @Bean - @SentinelRestTemplate - RestTemplate restTemplate2() { - return new RestTemplate(); - } - } + @Bean + @SentinelRestTemplate + RestTemplate restTemplate2() { + return new RestTemplate(); + } + } public static class ExceptionUtil { public static SentinelClientHttpResponse handleException(HttpRequest request, diff --git a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java similarity index 99% rename from alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java rename to spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java index 771b3dc5..b17f45ae 100644 --- a/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java @@ -16,14 +16,15 @@ package com.alibaba.cloud.sentinel; -import com.alibaba.csp.sentinel.datasource.Converter; -import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; - import java.io.IOException; import java.util.List; +import com.alibaba.csp.sentinel.datasource.Converter; +import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * @author Jim */ diff --git a/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java new file mode 100644 index 00000000..b5586ce0 --- /dev/null +++ b/spring-cloud-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.cloud.sentinel.endpoint; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.actuate.health.Status; +import org.springframework.util.ReflectionUtils; + +import com.alibaba.cloud.sentinel.SentinelProperties; +import com.alibaba.csp.sentinel.config.SentinelConfig; +import com.alibaba.csp.sentinel.datasource.AbstractDataSource; +import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource; +import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider; +import com.alibaba.csp.sentinel.transport.HeartbeatSender; +import com.alibaba.csp.sentinel.transport.config.TransportConfig; + +/** + * Test cases for {@link SentinelHealthIndicator}. + * + * @author cdfive + */ +public class SentinelHealthIndicatorTests { + + private SentinelHealthIndicator sentinelHealthIndicator; + + private DefaultListableBeanFactory beanFactory; + + private SentinelProperties sentinelProperties; + + private HeartbeatSender heartbeatSender; + + @Before + public void setUp() { + beanFactory = mock(DefaultListableBeanFactory.class); + sentinelProperties = mock(SentinelProperties.class); + sentinelHealthIndicator = new SentinelHealthIndicator(beanFactory, + sentinelProperties); + + SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, ""); + + heartbeatSender = mock(HeartbeatSender.class); + Field heartbeatSenderField = ReflectionUtils + .findField(HeartbeatSenderProvider.class, "heartbeatSender"); + heartbeatSenderField.setAccessible(true); + ReflectionUtils.setField(heartbeatSenderField, null, heartbeatSender); + } + + @Test + public void testSentinelNotEnabled() { + when(sentinelProperties.isEnabled()).thenReturn(false); + + Health health = sentinelHealthIndicator.health(); + + assertThat(health.getStatus()).isEqualTo(Status.UP); + assertThat(health.getDetails().get("enabled")).isEqualTo(false); + } + + @Test + public void testSentinelDashboardNotConfigured() { + when(sentinelProperties.isEnabled()).thenReturn(true); + + Health health = sentinelHealthIndicator.health(); + + assertThat(health.getStatus()).isEqualTo(Status.UP); + assertThat(health.getDetails().get("dashboard")).isEqualTo(Status.UNKNOWN); + } + + @Test + public void testSentinelDashboardConfiguredSuccess() throws Exception { + when(sentinelProperties.isEnabled()).thenReturn(true); + SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); + when(heartbeatSender.sendHeartbeat()).thenReturn(true); + + Health health = sentinelHealthIndicator.health(); + + assertThat(health.getStatus()).isEqualTo(Status.UP); + } + + @Test + public void testSentinelDashboardConfiguredFailed() throws Exception { + when(sentinelProperties.isEnabled()).thenReturn(true); + SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); + when(heartbeatSender.sendHeartbeat()).thenReturn(false); + + Health health = sentinelHealthIndicator.health(); + + assertThat(health.getStatus()).isEqualTo(Status.DOWN); + assertThat(health.getDetails().get("dashboard")).isEqualTo( + new Status(Status.DOWN.getCode(), "localhost:8080 can't be connected")); + } + + @Test + public void testSentinelDataSourceSuccess() throws Exception { + when(sentinelProperties.isEnabled()).thenReturn(true); + SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); + when(heartbeatSender.sendHeartbeat()).thenReturn(true); + + Map dataSourceMap = new HashMap<>(); + + FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class); + dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1); + + FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class); + dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2); + + when(beanFactory.getBeansOfType(AbstractDataSource.class)) + .thenReturn(dataSourceMap); + + Health health = sentinelHealthIndicator.health(); + + assertThat(health.getStatus()).isEqualTo(Status.UP); + Map dataSourceDetailMap = (Map) health + .getDetails().get("dataSource"); + assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource")) + .isEqualTo(Status.UP); + assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource")) + .isEqualTo(Status.UP); + } + + @Test + public void testSentinelDataSourceFailed() throws Exception { + when(sentinelProperties.isEnabled()).thenReturn(true); + SentinelConfig.setConfig(TransportConfig.CONSOLE_SERVER, "localhost:8080"); + when(heartbeatSender.sendHeartbeat()).thenReturn(true); + + Map dataSourceMap = new HashMap<>(); + + FileRefreshableDataSource fileDataSource1 = mock(FileRefreshableDataSource.class); + dataSourceMap.put("ds1-sentinel-file-datasource", fileDataSource1); + + FileRefreshableDataSource fileDataSource2 = mock(FileRefreshableDataSource.class); + when(fileDataSource2.loadConfig()) + .thenThrow(new RuntimeException("fileDataSource2 error")); + dataSourceMap.put("ds2-sentinel-file-datasource", fileDataSource2); + + when(beanFactory.getBeansOfType(AbstractDataSource.class)) + .thenReturn(dataSourceMap); + + Health health = sentinelHealthIndicator.health(); + + assertThat(health.getStatus()).isEqualTo(Status.DOWN); + Map dataSourceDetailMap = (Map) health + .getDetails().get("dataSource"); + assertThat(dataSourceDetailMap.get("ds1-sentinel-file-datasource")) + .isEqualTo(Status.UP); + assertThat(dataSourceDetailMap.get("ds2-sentinel-file-datasource")) + .isEqualTo(new Status(Status.DOWN.getCode(), "fileDataSource2 error")); + } +} diff --git a/alibaba-sentinel-spring-cloud/src/test/resources/authority.json b/spring-cloud-alibaba-sentinel/src/test/resources/authority.json similarity index 100% rename from alibaba-sentinel-spring-cloud/src/test/resources/authority.json rename to spring-cloud-alibaba-sentinel/src/test/resources/authority.json diff --git a/alibaba-sentinel-spring-cloud/src/test/resources/degraderule.json b/spring-cloud-alibaba-sentinel/src/test/resources/degraderule.json similarity index 100% rename from alibaba-sentinel-spring-cloud/src/test/resources/degraderule.json rename to spring-cloud-alibaba-sentinel/src/test/resources/degraderule.json diff --git a/alibaba-sentinel-spring-cloud/src/test/resources/flowrule.json b/spring-cloud-alibaba-sentinel/src/test/resources/flowrule.json similarity index 100% rename from alibaba-sentinel-spring-cloud/src/test/resources/flowrule.json rename to spring-cloud-alibaba-sentinel/src/test/resources/flowrule.json diff --git a/alibaba-sentinel-spring-cloud/src/test/resources/param-flow.json b/spring-cloud-alibaba-sentinel/src/test/resources/param-flow.json similarity index 100% rename from alibaba-sentinel-spring-cloud/src/test/resources/param-flow.json rename to spring-cloud-alibaba-sentinel/src/test/resources/param-flow.json diff --git a/alibaba-sentinel-spring-cloud/src/test/resources/system.json b/spring-cloud-alibaba-sentinel/src/test/resources/system.json similarity index 100% rename from alibaba-sentinel-spring-cloud/src/test/resources/system.json rename to spring-cloud-alibaba-sentinel/src/test/resources/system.json diff --git a/alicloud-acm-spring-cloud/pom.xml b/spring-cloud-alicloud-acm/pom.xml similarity index 95% rename from alicloud-acm-spring-cloud/pom.xml rename to spring-cloud-alicloud-acm/pom.xml index 468a2e80..b9bbba73 100644 --- a/alicloud-acm-spring-cloud/pom.xml +++ b/spring-cloud-alicloud-acm/pom.xml @@ -3,21 +3,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT - alicloud-acm-spring-cloud - Alibaba Cloud ACM Spring Cloud + spring-cloud-alicloud-acm + Spring Cloud Alibaba Cloud ACM com.alibaba.cloud - alicloud-context-spring-cloud + spring-cloud-alicloud-context diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java similarity index 99% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java index 7541570a..4bb29694 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java @@ -18,15 +18,16 @@ package com.alibaba.alicloud.acm; import org.springframework.beans.BeansException; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import com.alibaba.alicloud.acm.refresh.AcmContextRefresher; -import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory; -import com.alibaba.alicloud.context.acm.AcmIntegrationProperties; import org.springframework.cloud.context.refresh.ContextRefresher; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.alicloud.acm.refresh.AcmContextRefresher; +import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory; +import com.alibaba.alicloud.context.acm.AcmIntegrationProperties; + import com.taobao.diamond.client.Diamond; /** diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java similarity index 99% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java index c6cd6ed9..e16d686c 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java @@ -16,14 +16,15 @@ package com.alibaba.alicloud.acm; -import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource; +import java.util.ArrayList; +import java.util.List; + import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.PropertySource; -import java.util.ArrayList; -import java.util.List; +import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource; /** * @author juven.xuxb, 5/17/16. diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java similarity index 100% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java index 461d1a85..caf7e62a 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java @@ -16,11 +16,11 @@ package com.alibaba.alicloud.acm.bootstrap; -import org.springframework.core.env.MapPropertySource; - import java.util.Date; import java.util.Map; +import org.springframework.core.env.MapPropertySource; + /** * @author juven.xuxb * @author xiaolongzuo diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java similarity index 99% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java index 2805d15c..5c45cfeb 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java @@ -16,14 +16,6 @@ package com.alibaba.alicloud.acm.bootstrap; -import com.alibaba.edas.acm.ConfigService; -import com.alibaba.edas.acm.exception.ConfigException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; -import org.springframework.core.io.ByteArrayResource; -import org.springframework.util.StringUtils; - import java.io.StringReader; import java.util.Date; import java.util.Enumeration; @@ -31,6 +23,15 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.io.ByteArrayResource; +import org.springframework.util.StringUtils; + +import com.alibaba.edas.acm.ConfigService; +import com.alibaba.edas.acm.exception.ConfigException; + /** * @author juven.xuxb * @author xiaolongzuo diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java similarity index 99% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java index d9295480..6f59f333 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java @@ -17,12 +17,13 @@ package com.alibaba.alicloud.acm.bootstrap; import org.springframework.beans.factory.annotation.Autowired; -import com.alibaba.alicloud.context.acm.AcmIntegrationProperties; import org.springframework.cloud.bootstrap.config.PropertySourceLocator; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; +import com.alibaba.alicloud.context.acm.AcmIntegrationProperties; + /** * @author juven.xuxb * @author xiaolongzuo diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java similarity index 99% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java index 79b9a0ee..172b058a 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java @@ -16,13 +16,6 @@ package com.alibaba.alicloud.acm.endpoint; -import org.springframework.boot.actuate.endpoint.annotation.Endpoint; -import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; -import com.alibaba.alicloud.acm.AcmPropertySourceRepository; -import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource; -import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory; -import com.alibaba.alicloud.context.acm.AcmProperties; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -30,6 +23,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.springframework.boot.actuate.endpoint.annotation.Endpoint; +import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; + +import com.alibaba.alicloud.acm.AcmPropertySourceRepository; +import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource; +import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory; +import com.alibaba.alicloud.context.acm.AcmProperties; + /** * Created on 01/10/2017. * diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java similarity index 99% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java index 3eb87912..e997b1ac 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java @@ -21,10 +21,11 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.condition.Conditi import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.context.annotation.Bean; + import com.alibaba.alicloud.acm.AcmPropertySourceRepository; import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory; import com.alibaba.alicloud.context.acm.AcmProperties; -import org.springframework.context.annotation.Bean; /** * @author xiaojing diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java similarity index 99% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java index 3101ca6b..d172baa4 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java @@ -16,16 +16,17 @@ package com.alibaba.alicloud.acm.endpoint; -import com.alibaba.edas.acm.ConfigService; +import java.util.ArrayList; +import java.util.List; + import org.springframework.boot.actuate.health.AbstractHealthIndicator; import org.springframework.boot.actuate.health.Health; +import org.springframework.util.StringUtils; + import com.alibaba.alicloud.acm.AcmPropertySourceRepository; import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource; import com.alibaba.alicloud.context.acm.AcmProperties; -import org.springframework.util.StringUtils; - -import java.util.ArrayList; -import java.util.List; +import com.alibaba.edas.acm.ConfigService; /** * @author leijuan diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java similarity index 100% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java index dfcec950..245d578e 100644 --- a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java +++ b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java @@ -16,15 +16,17 @@ package com.alibaba.alicloud.acm.refresh; -import com.alibaba.edas.acm.ConfigService; -import com.alibaba.edas.acm.listener.ConfigChangeListener; +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.boot.context.event.ApplicationReadyEvent; -import com.alibaba.alicloud.acm.AcmPropertySourceRepository; -import com.alibaba.alicloud.context.acm.AcmIntegrationProperties; import org.springframework.cloud.context.refresh.ContextRefresher; import org.springframework.cloud.endpoint.event.RefreshEvent; import org.springframework.context.ApplicationContext; @@ -32,12 +34,10 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; import org.springframework.util.StringUtils; -import java.io.UnsupportedEncodingException; -import java.math.BigInteger; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import com.alibaba.alicloud.acm.AcmPropertySourceRepository; +import com.alibaba.alicloud.context.acm.AcmIntegrationProperties; +import com.alibaba.edas.acm.ConfigService; +import com.alibaba.edas.acm.listener.ConfigChangeListener; /** * On application start up, AcmContextRefresher add diamond listeners to all application diff --git a/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java b/spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java similarity index 100% rename from alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java rename to spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java diff --git a/alicloud-acm-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alicloud-acm/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from alicloud-acm-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to spring-cloud-alicloud-acm/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/alicloud-acm-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories similarity index 100% rename from alicloud-acm-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories diff --git a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java similarity index 100% rename from alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java rename to spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java index 320aceef..038983d9 100644 --- a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java +++ b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java @@ -24,8 +24,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import com.alibaba.edas.acm.ConfigService; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,14 +36,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.test.context.junit4.SpringRunner; + import com.alibaba.alicloud.acm.bootstrap.AcmPropertySourceLocator; import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration; import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration; import com.alibaba.alicloud.context.acm.AcmIntegrationProperties; import com.alibaba.alicloud.context.acm.AcmProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.edas.acm.ConfigService; /** * @author xiaojing diff --git a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java similarity index 100% rename from alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java rename to spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java index 2ab13e59..52daad49 100644 --- a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java +++ b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java @@ -33,12 +33,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration; -import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration; +import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration; import com.alibaba.edas.acm.ConfigService; /** diff --git a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java similarity index 100% rename from alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java rename to spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java index cdc448b2..ba25f8db 100644 --- a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java +++ b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java @@ -16,11 +16,11 @@ package com.alibaba.alicloud.acm; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; + import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import com.alibaba.edas.acm.ConfigService; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,13 +33,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration; -import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringRunner; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; +import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration; +import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration; +import com.alibaba.edas.acm.ConfigService; /** * @author xiaojing diff --git a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java similarity index 100% rename from alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java rename to spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java index 1a58dfbc..36376ae9 100644 --- a/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java +++ b/spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java @@ -38,14 +38,14 @@ import org.springframework.boot.actuate.health.Health.Builder; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.junit4.SpringRunner; + import com.alibaba.alicloud.acm.AcmAutoConfiguration; import com.alibaba.alicloud.acm.AcmPropertySourceRepository; import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory; import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration; import com.alibaba.alicloud.context.acm.AcmProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.junit4.SpringRunner; - import com.alibaba.edas.acm.ConfigService; /** diff --git a/alicloud-ans-spring-cloud/pom.xml b/spring-cloud-alicloud-ans/pom.xml similarity index 95% rename from alicloud-ans-spring-cloud/pom.xml rename to spring-cloud-alicloud-ans/pom.xml index f4fba922..e6bf9917 100644 --- a/alicloud-ans-spring-cloud/pom.xml +++ b/spring-cloud-alicloud-ans/pom.xml @@ -9,9 +9,8 @@ 4.0.0 - com.alibaba.cloud - alicloud-ans-spring-cloud - Alibaba Cloud ANS Spring Cloud + spring-cloud-alicloud-ans + Spring Cloud Alibaba Cloud ANS @@ -32,7 +31,7 @@ com.alibaba.cloud - alicloud-context-spring-cloud + spring-cloud-alicloud-context @@ -142,4 +141,4 @@ - + \ No newline at end of file diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java similarity index 99% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java index 31831130..c86049e9 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java @@ -21,10 +21,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.alicloud.ans.registry.AnsAutoServiceRegistration; -import com.alibaba.alicloud.ans.registry.AnsRegistration; -import com.alibaba.alicloud.ans.registry.AnsServiceRegistry; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties; @@ -32,6 +28,11 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.alicloud.ans.registry.AnsAutoServiceRegistration; +import com.alibaba.alicloud.ans.registry.AnsRegistration; +import com.alibaba.alicloud.ans.registry.AnsServiceRegistry; +import com.alibaba.alicloud.context.ans.AnsProperties; + /** * @author xiaolongzuo */ diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java similarity index 94% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java index 4233ef74..7f7d34ab 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java @@ -16,13 +16,18 @@ package com.alibaba.alicloud.ans; -import com.alibaba.ans.core.NamingService; -import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; -import java.util.*; +import com.alibaba.ans.core.NamingService; +import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; /** * @author xiaolongzuo diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java similarity index 100% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsServiceInstance.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsServiceInstance.java similarity index 100% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsServiceInstance.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsServiceInstance.java diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java similarity index 100% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java similarity index 100% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java index f2d19fe6..d119791d 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java @@ -16,19 +16,19 @@ package com.alibaba.alicloud.ans.endpoint; -import com.alibaba.ans.core.NamingService; -import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; -import com.alibaba.alicloud.context.ans.AnsProperties; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.alibaba.alicloud.context.ans.AnsProperties; +import com.alibaba.ans.core.NamingService; +import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; /** * @author xiaolongzuo diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java similarity index 99% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java index 6766af26..befe6733 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java @@ -19,9 +19,10 @@ package com.alibaba.alicloud.ans.endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.context.annotation.Bean; +import com.alibaba.alicloud.context.ans.AnsProperties; + /** * @author xiaolongzuo */ diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java similarity index 100% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java similarity index 99% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java index 7da2bf79..8f738260 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java @@ -16,7 +16,11 @@ package com.alibaba.alicloud.ans.registry; -import com.alibaba.alicloud.context.ans.AnsProperties; +import java.net.URI; +import java.util.Map; + +import javax.annotation.PostConstruct; + import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.ManagementServerPortUtils; @@ -25,9 +29,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; import org.springframework.util.StringUtils; -import javax.annotation.PostConstruct; -import java.net.URI; -import java.util.Map; +import com.alibaba.alicloud.context.ans.AnsProperties; /** * @author xiaolongzuo diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java similarity index 100% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java index cf10d2cc..fda95738 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java @@ -16,17 +16,17 @@ package com.alibaba.alicloud.ans.registry; -import com.alibaba.ans.core.NamingService; -import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.client.serviceregistry.ServiceRegistry; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.alibaba.ans.core.NamingService; +import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor; /** * @author xiaolongzuo diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java similarity index 99% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java index 6131bba0..59ba3fa6 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java @@ -16,12 +16,13 @@ package com.alibaba.alicloud.ans.ribbon; -import com.netflix.client.config.IClientConfig; -import com.netflix.loadbalancer.ServerList; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.netflix.client.config.IClientConfig; +import com.netflix.loadbalancer.ServerList; + /** * @author xiaolongzuo * @author pbting diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java similarity index 99% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java index c764426f..5d36f51c 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.Map; import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; + import com.netflix.loadbalancer.Server; /** diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java similarity index 99% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java index 219beab6..b3f749f4 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java @@ -21,6 +21,7 @@ import java.util.List; import com.alibaba.ans.core.NamingService; import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; + import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.AbstractServerList; diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java similarity index 100% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java diff --git a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java similarity index 99% rename from alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java rename to spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java index c37e88b6..5c4ddb88 100644 --- a/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java +++ b/spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java @@ -19,12 +19,13 @@ package com.alibaba.alicloud.ans.ribbon; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.alicloud.ans.ConditionalOnAnsEnabled; import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration; import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.context.annotation.Configuration; +import com.alibaba.alicloud.ans.ConditionalOnAnsEnabled; + /** * @author xiaolongzuo */ diff --git a/alicloud-ans-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories similarity index 100% rename from alicloud-ans-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java similarity index 96% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java index 2e8433c4..009db660 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java @@ -16,7 +16,6 @@ package com.alibaba.alicloud.ans; -import static com.alibaba.alicloud.ans.test.AnsMockTest.hostInstance; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; @@ -34,6 +33,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.cloud.client.ServiceInstance; +import com.alibaba.alicloud.ans.test.AnsMockTest; import com.alibaba.ans.core.NamingService; import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; @@ -57,7 +57,7 @@ public class AnsDiscoveryClientTests { map.put("test-key", "test-value"); map.put("secure", "true"); - hosts.add(hostInstance(serviceName, false, host, port, map)); + hosts.add(AnsMockTest.hostInstance(serviceName, false, host, port, map)); PowerMockito.mockStatic(NamingService.class); when(NamingService.getHosts(eq(serviceName))).thenReturn(hosts); diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java similarity index 99% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java index ca961e6c..21c78b6b 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java @@ -26,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.ans.AnsAutoConfiguration; -import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.alicloud.ans.AnsAutoConfiguration; +import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; +import com.alibaba.alicloud.context.ans.AnsProperties; + /** * @author xiaojing */ diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java similarity index 99% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java index efb4dce1..ebfbf090 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java @@ -16,8 +16,8 @@ package com.alibaba.alicloud.ans.registry; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import java.net.Inet4Address; @@ -31,14 +31,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.ans.AnsAutoConfiguration; -import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.alicloud.ans.AnsAutoConfiguration; +import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; +import com.alibaba.alicloud.context.ans.AnsProperties; + /** * @author xiaojing */ diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java similarity index 99% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java index 4a965ba8..ed185a98 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java @@ -26,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.ans.AnsAutoConfiguration; -import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.alicloud.ans.AnsAutoConfiguration; +import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; +import com.alibaba.alicloud.context.ans.AnsProperties; + /** * @author xiaojing */ diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java similarity index 90% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java index 07c6da5f..0b2b2968 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java @@ -16,8 +16,6 @@ package com.alibaba.alicloud.ans.registry; -import static com.alibaba.alicloud.ans.registry.AnsRegistration.MANAGEMENT_CONTEXT_PATH; -import static com.alibaba.alicloud.ans.registry.AnsRegistration.MANAGEMENT_PORT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @@ -28,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.ans.AnsAutoConfiguration; -import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.alicloud.ans.AnsAutoConfiguration; +import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; +import com.alibaba.alicloud.context.ans.AnsProperties; + /** * @author xiaojing */ @@ -70,11 +69,11 @@ public class AnsAutoServiceRegistrationManagementPortTests { private void checkoutNacosDiscoveryManagementData() { assertEquals("AnsProperties management port was wrong", "8888", - properties.getClientMetadata().get(MANAGEMENT_PORT)); + properties.getClientMetadata().get(AnsRegistration.MANAGEMENT_PORT)); assertEquals("AnsProperties management context path was wrong", - "/test-context-path", - properties.getClientMetadata().get(MANAGEMENT_CONTEXT_PATH)); + "/test-context-path", properties.getClientMetadata() + .get(AnsRegistration.MANAGEMENT_CONTEXT_PATH)); } diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java similarity index 99% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java index 9e56be04..46ed81b2 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java @@ -26,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.ans.AnsAutoConfiguration; -import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.alicloud.ans.AnsAutoConfiguration; +import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; +import com.alibaba.alicloud.context.ans.AnsProperties; + /** * @author xiaojing */ diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java similarity index 100% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java index 0a6327a4..e44467fc 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java @@ -26,9 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.alibaba.ans.core.NamingService; -import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -36,15 +33,18 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; -import com.alibaba.alicloud.ans.AnsAutoConfiguration; -import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; -import com.alibaba.alicloud.ans.endpoint.AnsEndpoint; -import com.alibaba.alicloud.context.ans.AnsProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; +import com.alibaba.alicloud.ans.AnsAutoConfiguration; +import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; +import com.alibaba.alicloud.ans.endpoint.AnsEndpoint; +import com.alibaba.alicloud.context.ans.AnsProperties; +import com.alibaba.ans.core.NamingService; +import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; + /** * @author xiaojing */ diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java similarity index 99% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java index d10f540c..f5d1587e 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java @@ -16,14 +16,15 @@ package com.alibaba.alicloud.ans.ribbon; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import com.alibaba.alicloud.ans.AnsAutoConfiguration; -import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration; import org.springframework.context.annotation.Bean; @@ -31,12 +32,12 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; +import com.alibaba.alicloud.ans.AnsAutoConfiguration; +import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration; + import com.netflix.client.config.DefaultClientConfigImpl; import com.netflix.client.config.IClientConfig; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - /** * @author xiaojing */ diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java similarity index 88% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java index 4e1f690d..9d62610d 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java @@ -16,7 +16,6 @@ package com.alibaba.alicloud.ans.ribbon; -import static com.alibaba.alicloud.ans.test.AnsMockTest.hostInstance; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -29,12 +28,14 @@ import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import com.alibaba.alicloud.ans.test.AnsMockTest; import com.alibaba.ans.core.NamingService; import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; @@ -59,7 +60,7 @@ public class AnsServerListTests { AnsServerList serverList = new AnsServerList("test-service"); serverList.initWithNiwsConfig(clientConfig); List servers = serverList.getInitialListOfServers(); - assertThat(servers).isEmpty(); + Assertions.assertThat(servers).isEmpty(); } @Test @@ -67,7 +68,7 @@ public class AnsServerListTests { public void testGetServers() throws Exception { ArrayList hosts = new ArrayList<>(); - hosts.add(hostInstance("test-service", true, Collections.emptyMap())); + hosts.add(AnsMockTest.hostInstance("test-service", true, Collections.emptyMap())); PowerMockito.mockStatic(NamingService.class); when(NamingService.getHosts(anyString())).thenReturn(hosts); @@ -77,10 +78,10 @@ public class AnsServerListTests { AnsServerList serverList = new AnsServerList("test-service"); serverList.initWithNiwsConfig(clientConfig); List servers = serverList.getInitialListOfServers(); - assertThat(servers).hasSize(1); + Assertions.assertThat(servers).hasSize(1); servers = serverList.getUpdatedListOfServers(); - assertThat(servers).hasSize(1); + Assertions.assertThat(servers).hasSize(1); } @Test @@ -92,20 +93,19 @@ public class AnsServerListTests { map1.put("instanceNum", "1"); HashMap map2 = new HashMap<>(); map2.put("instanceNum", "2"); - hosts.add(hostInstance("test-service", false, map1)); - hosts.add(hostInstance("test-service", true, map2)); + hosts.add(AnsMockTest.hostInstance("test-service", false, map1)); + hosts.add(AnsMockTest.hostInstance("test-service", true, map2)); PowerMockito.mockStatic(NamingService.class); when(NamingService.getHosts(eq("test-service"))).thenReturn( hosts.stream().filter(Host::isValid).collect(Collectors.toList())); - IClientConfig clientConfig = mock(IClientConfig.class); when(clientConfig.getClientName()).thenReturn("test-service"); AnsServerList serverList = new AnsServerList("test-service"); serverList.initWithNiwsConfig(clientConfig); List servers = serverList.getInitialListOfServers(); - assertThat(servers).hasSize(1); + Assertions.assertThat(servers).hasSize(1); AnsServer ansServer = servers.get(0); Host host = ansServer.getHealthService(); @@ -123,7 +123,7 @@ public class AnsServerListTests { HashMap map = new HashMap<>(); map.put("instanceNum", "1"); - hosts.add(hostInstance("test-service", true, map)); + hosts.add(AnsMockTest.hostInstance("test-service", true, map)); PowerMockito.mockStatic(NamingService.class); when(NamingService.getHosts(eq("test-service"))).thenReturn( @@ -135,7 +135,7 @@ public class AnsServerListTests { serverList.initWithNiwsConfig(clientConfig); List servers = serverList.getUpdatedListOfServers(); - assertThat(servers).hasSize(1); + Assertions.assertThat(servers).hasSize(1); assertThat(servers.get(0).getHealthService().isValid()).isEqualTo(true); } diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java similarity index 94% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java index 40c5eaec..bef39ad7 100644 --- a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java +++ b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java @@ -16,7 +16,9 @@ package com.alibaba.alicloud.ans.ribbon; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; @@ -26,6 +28,7 @@ import java.util.List; import org.junit.Test; import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; + import com.netflix.loadbalancer.Server; /** diff --git a/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java b/spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java similarity index 100% rename from alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java rename to spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java diff --git a/alicloud-context-spring-cloud/pom.xml b/spring-cloud-alicloud-context/pom.xml similarity index 96% rename from alicloud-context-spring-cloud/pom.xml rename to spring-cloud-alicloud-context/pom.xml index 15a90883..59cbbc63 100644 --- a/alicloud-context-spring-cloud/pom.xml +++ b/spring-cloud-alicloud-context/pom.xml @@ -9,9 +9,8 @@ 4.0.0 - com.alibaba.cloud - alicloud-context-spring-cloud - AliCloud Context Spring Cloud + spring-cloud-alicloud-context + Spring Cloud AliCloud Context diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/AliCloudProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudProperties.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/AliCloudProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudProperties.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/Constants.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/Constants.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/Constants.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/Constants.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java index a8044ca4..0be77f62 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java @@ -22,17 +22,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.properties.EnableConfigurationProperties; - -import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration; -import com.alibaba.alicloud.context.edas.EdasProperties; -import com.alibaba.alicloud.context.AliCloudProperties; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.alibaba.alicloud.context.AliCloudProperties; +import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration; +import com.alibaba.alicloud.context.edas.EdasProperties; import com.alibaba.cloud.context.acm.AliCloudAcmInitializer; /** diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmIntegrationProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmIntegrationProperties.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmIntegrationProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmIntegrationProperties.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmProperties.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmProperties.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java index 84b3e395..6d028331 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java @@ -16,13 +16,12 @@ package com.alibaba.alicloud.context.ans; -import com.alibaba.alicloud.context.edas.EdasProperties; -import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener; -import com.alibaba.alicloud.context.AliCloudProperties; - import org.springframework.context.ApplicationContext; import org.springframework.context.event.ContextRefreshedEvent; +import com.alibaba.alicloud.context.AliCloudProperties; +import com.alibaba.alicloud.context.edas.EdasProperties; +import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener; import com.alibaba.cloud.context.ans.AliCloudAnsInitializer; import com.alibaba.cloud.context.edas.AliCloudEdasSdk; diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java index b4c4290c..56f8ebc9 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java @@ -19,11 +19,10 @@ package com.alibaba.alicloud.context.ans; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration; -import org.springframework.context.annotation.Configuration; - /** * @author xiaolongzuo */ diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsProperties.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/ans/AnsProperties.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java index 884d9771..61a8e1da 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java @@ -20,11 +20,11 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration; -import com.alibaba.alicloud.context.AliCloudProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration; +import com.alibaba.alicloud.context.AliCloudProperties; import com.alibaba.cloud.context.edas.AliCloudEdasSdk; import com.alibaba.cloud.context.edas.AliCloudEdasSdkFactory; diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/edas/EdasProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasProperties.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/edas/EdasProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasProperties.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/listener/AbstractOnceApplicationListener.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/listener/AbstractOnceApplicationListener.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/listener/AbstractOnceApplicationListener.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/listener/AbstractOnceApplicationListener.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java index 61a1f42a..e413edcf 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java @@ -1,13 +1,13 @@ package com.alibaba.alicloud.context.nacos; -import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener; -import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration; -import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; +import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener; +import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration; +import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; + /** * @author pbting */ diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java index c4cddfff..2abba6ee 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java @@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener; - import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration; import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java index bb1e1147..840783f8 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java @@ -21,14 +21,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration; -import com.alibaba.alicloud.context.AliCloudProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration; +import com.alibaba.alicloud.context.AliCloudProperties; import com.alibaba.cloud.context.AliCloudAuthorizationMode; + import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java index 06156682..a261e6ad 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import com.alibaba.cloud.context.AliCloudAuthorizationMode; + import com.aliyun.oss.ClientBuilderConfiguration; /** diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java similarity index 92% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java index e26a5e67..69504bb9 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java @@ -16,21 +16,21 @@ package com.alibaba.alicloud.context.scx; -import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration; -import com.alibaba.alicloud.context.edas.EdasProperties; -import com.alibaba.cloud.context.edas.AliCloudEdasSdk; -import com.alibaba.cloud.context.scx.AliCloudScxInitializer; -import com.alibaba.edas.schedulerx.SchedulerXClient; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.alibaba.alicloud.context.AliCloudProperties; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.alicloud.context.AliCloudProperties; +import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration; +import com.alibaba.alicloud.context.edas.EdasProperties; +import com.alibaba.cloud.context.edas.AliCloudEdasSdk; +import com.alibaba.cloud.context.scx.AliCloudScxInitializer; +import com.alibaba.edas.schedulerx.SchedulerXClient; + /** * @author xiaolongzuo */ @@ -44,8 +44,8 @@ public class ScxContextAutoConfiguration { @Bean(initMethod = "init") @ConditionalOnMissingBean public SchedulerXClient schedulerXClient(AliCloudProperties aliCloudProperties, - EdasProperties edasProperties, ScxProperties scxProperties, - AliCloudEdasSdk aliCloudEdasSdk) { + EdasProperties edasProperties, ScxProperties scxProperties, + AliCloudEdasSdk aliCloudEdasSdk) { return AliCloudScxInitializer.initialize(aliCloudProperties, edasProperties, scxProperties, aliCloudEdasSdk); } diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/scx/ScxProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxProperties.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/scx/ScxProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxProperties.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java index a9ec1db4..2a0c6b50 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java @@ -22,7 +22,6 @@ import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEven import com.alibaba.alicloud.context.Constants; import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener; - import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration; import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sms/SmsProperties.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsProperties.java similarity index 100% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sms/SmsProperties.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sms/SmsProperties.java diff --git a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java similarity index 99% rename from alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java rename to spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java index 07b038c8..c3e64a66 100644 --- a/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java +++ b/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java @@ -22,6 +22,7 @@ import java.util.List; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.context.annotation.Configuration; import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration; import com.alibaba.alicloud.context.acm.AcmProperties; @@ -32,9 +33,6 @@ import com.alibaba.alicloud.context.oss.OssContextAutoConfiguration; import com.alibaba.alicloud.context.oss.OssProperties; import com.alibaba.alicloud.context.scx.ScxContextAutoConfiguration; import com.alibaba.alicloud.context.scx.ScxProperties; - -import org.springframework.context.annotation.Configuration; - import com.alibaba.cloud.context.AliCloudServerMode; import com.alibaba.cloud.context.edas.AliCloudEdasSdk; import com.alibaba.cloud.context.statistics.StatisticsTask; diff --git a/alicloud-context-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alicloud-context/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from alicloud-context-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to spring-cloud-alicloud-context/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/alicloud-context-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories similarity index 100% rename from alicloud-context-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/AliCloudPropertiesTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/AliCloudPropertiesTests.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/AliCloudPropertiesTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/AliCloudPropertiesTests.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java similarity index 99% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java index 29f790ec..cbd4ff90 100644 --- a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java @@ -24,7 +24,6 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner; import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration; import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration; - import com.alibaba.cloud.context.AliCloudServerMode; /** diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java similarity index 99% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java index 1c80e09f..a60923be 100644 --- a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java @@ -19,6 +19,7 @@ package com.alibaba.alicloud.context.ans; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import org.junit.Test; + import com.alibaba.alicloud.context.BaseAliCloudSpringApplication; /** diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java similarity index 99% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java index da9db1c1..225acc7b 100644 --- a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java @@ -34,7 +34,6 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner; import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration; import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration; - import com.alibaba.cloud.context.AliCloudServerMode; /** diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java index 729d27f5..6b028f09 100644 --- a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java @@ -16,16 +16,16 @@ package com.alibaba.alicloud.context.nacos; -import com.alibaba.cloud.context.ans.AliCloudAnsInitializer; -import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import org.junit.BeforeClass; import org.junit.Test; import org.powermock.core.classloader.annotations.PrepareForTest; + import com.alibaba.alicloud.context.BaseAliCloudSpringApplication; import com.alibaba.alicloud.utils.ChangeOrderUtils; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import com.alibaba.cloud.context.ans.AliCloudAnsInitializer; +import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; /** * @author xiaolongzuo diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java index 3be573d3..58ceebd6 100644 --- a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java @@ -21,9 +21,9 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import org.junit.BeforeClass; import org.junit.Test; import org.powermock.core.classloader.annotations.PrepareForTest; + import com.alibaba.alicloud.context.BaseAliCloudSpringApplication; import com.alibaba.alicloud.utils.ChangeOrderUtils; - import com.alibaba.cloud.context.ans.AliCloudAnsInitializer; import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java similarity index 99% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java index 59aeacb8..abc88e33 100644 --- a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java @@ -22,10 +22,9 @@ import org.junit.BeforeClass; import org.junit.Test; import org.powermock.core.classloader.annotations.PrepareForTest; -import com.alibaba.alicloud.context.Constants; import com.alibaba.alicloud.context.BaseAliCloudSpringApplication; +import com.alibaba.alicloud.context.Constants; import com.alibaba.alicloud.utils.ChangeOrderUtils; - import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory; /** diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java similarity index 88% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java index 1fd1aab2..acc8201a 100644 --- a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java +++ b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java @@ -55,14 +55,10 @@ public class SmsPropertiesTests { "spring.cloud.alicloud.sms.read-timeout=30") .run(context -> { SmsProperties config = context.getBean(SmsProperties.class); - assertThat(config.getReportQueueName()) - .isEqualTo("q1"); - assertThat(config.getUpQueueName()) - .isEqualTo("q2"); - assertThat(config.getConnectTimeout()) - .isEqualTo("20"); - assertThat(config.getReadTimeout()) - .isEqualTo("30"); + assertThat(config.getReportQueueName()).isEqualTo("q1"); + assertThat(config.getUpQueueName()).isEqualTo("q2"); + assertThat(config.getConnectTimeout()).isEqualTo("20"); + assertThat(config.getReadTimeout()).isEqualTo("30"); }); } diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/utils/ChangeOrderUtils.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/utils/ChangeOrderUtils.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/utils/ChangeOrderUtils.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/utils/ChangeOrderUtils.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java b/spring-cloud-alicloud-context/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java rename to spring-cloud-alicloud-context/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java diff --git a/alicloud-context-spring-cloud/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java b/spring-cloud-alicloud-context/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java similarity index 100% rename from alicloud-context-spring-cloud/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java rename to spring-cloud-alicloud-context/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java diff --git a/alicloud-oss-spring-cloud/pom.xml b/spring-cloud-alicloud-oss/pom.xml similarity index 92% rename from alicloud-oss-spring-cloud/pom.xml rename to spring-cloud-alicloud-oss/pom.xml index 94843ef7..68d30b85 100644 --- a/alicloud-oss-spring-cloud/pom.xml +++ b/spring-cloud-alicloud-oss/pom.xml @@ -9,15 +9,14 @@ 4.0.0 - com.alibaba.cloud - alicloud-oss-spring-cloud - Alibaba Cloud OSS Spring Cloud + spring-cloud-alicloud-oss + Spring Cloud Alibaba Cloud OSS com.alibaba.cloud - alicloud-context-spring-cloud + spring-cloud-alicloud-context diff --git a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssApplicationListener.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssApplicationListener.java similarity index 100% rename from alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssApplicationListener.java rename to spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssApplicationListener.java diff --git a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java similarity index 89% rename from alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java rename to spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java index e1e35c22..0cbf049e 100644 --- a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java +++ b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java @@ -16,14 +16,16 @@ package com.alibaba.alicloud.oss; -import com.aliyun.oss.OSS; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import com.alibaba.alicloud.oss.resource.OssStorageProtocolResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.alicloud.oss.resource.OssStorageProtocolResolver; + +import com.aliyun.oss.OSS; + /** * OSS Auto {@link Configuration} * @@ -34,10 +36,10 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnProperty(name = OssConstants.ENABLED, havingValue = "true", matchIfMissing = true) public class OssAutoConfiguration { - @Bean - @ConditionalOnMissingBean - public OssStorageProtocolResolver ossStorageProtocolResolver() { - return new OssStorageProtocolResolver(); - } + @Bean + @ConditionalOnMissingBean + public OssStorageProtocolResolver ossStorageProtocolResolver() { + return new OssStorageProtocolResolver(); + } } diff --git a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssConstants.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssConstants.java similarity index 89% rename from alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssConstants.java rename to spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssConstants.java index 5dddcfa8..d018b892 100644 --- a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssConstants.java +++ b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/OssConstants.java @@ -23,7 +23,7 @@ package com.alibaba.alicloud.oss; */ public interface OssConstants { - String PREFIX = "spring.cloud.alibaba.oss"; - String ENABLED = PREFIX + ".enabled"; + String PREFIX = "spring.cloud.alibaba.oss"; + String ENABLED = PREFIX + ".enabled"; } diff --git a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java similarity index 51% rename from alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java rename to spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java index c1adf419..e7ef504d 100644 --- a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java +++ b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java @@ -16,16 +16,17 @@ package com.alibaba.alicloud.oss.endpoint; -import com.aliyun.oss.OSSClient; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.context.ApplicationContext; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.aliyun.oss.OSSClient; /** * Actuator {@link Endpoint} to expose OSS Meta Data @@ -35,37 +36,37 @@ import java.util.Map; @Endpoint(id = "oss") public class OssEndpoint { - @Autowired - private ApplicationContext applicationContext; + @Autowired + private ApplicationContext applicationContext; - @ReadOperation - public Map invoke() { - Map result = new HashMap<>(); + @ReadOperation + public Map invoke() { + Map result = new HashMap<>(); - Map ossClientMap = applicationContext - .getBeansOfType(OSSClient.class); + Map ossClientMap = applicationContext + .getBeansOfType(OSSClient.class); - int size = ossClientMap.size(); + int size = ossClientMap.size(); - List ossClientList = new ArrayList<>(); + List ossClientList = new ArrayList<>(); - ossClientMap.keySet().forEach(beanName -> { - Map ossProperties = new HashMap<>(); - OSSClient client = ossClientMap.get(beanName); - ossProperties.put("beanName", beanName); - ossProperties.put("endpoint", client.getEndpoint().toString()); - ossProperties.put("clientConfiguration", client.getClientConfiguration()); - ossProperties.put("credentials", - client.getCredentialsProvider().getCredentials()); - ossProperties.put("bucketList", client.listBuckets().stream() - .map(bucket -> bucket.getName()).toArray()); - ossClientList.add(ossProperties); - }); + ossClientMap.keySet().forEach(beanName -> { + Map ossProperties = new HashMap<>(); + OSSClient client = ossClientMap.get(beanName); + ossProperties.put("beanName", beanName); + ossProperties.put("endpoint", client.getEndpoint().toString()); + ossProperties.put("clientConfiguration", client.getClientConfiguration()); + ossProperties.put("credentials", + client.getCredentialsProvider().getCredentials()); + ossProperties.put("bucketList", client.listBuckets().stream() + .map(bucket -> bucket.getName()).toArray()); + ossClientList.add(ossProperties); + }); - result.put("size", size); - result.put("info", ossClientList); + result.put("size", size); + result.put("info", ossClientList); - return result; - } + return result; + } } diff --git a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java similarity index 100% rename from alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java rename to spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java diff --git a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageProtocolResolver.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageProtocolResolver.java similarity index 100% rename from alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageProtocolResolver.java rename to spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageProtocolResolver.java diff --git a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java similarity index 99% rename from alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java rename to spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java index 05379fc9..6137b2d5 100644 --- a/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java +++ b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java @@ -35,7 +35,8 @@ import com.aliyun.oss.model.OSSObject; /** * Implements {@link Resource} for reading and writing objects in Aliyun Object Storage - * Service (OSS). An instance of this class represents a handle to a bucket or an OSSObject. + * Service (OSS). An instance of this class represents a handle to a bucket or an + * OSSObject. * * @author Jim * @see OSS diff --git a/alicloud-oss-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-oss/src/main/resources/META-INF/spring.factories similarity index 100% rename from alicloud-oss-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alicloud-oss/src/main/resources/META-INF/spring.factories diff --git a/alicloud-schedulerx-spring-cloud/pom.xml b/spring-cloud-alicloud-schedulerx/pom.xml similarity index 93% rename from alicloud-schedulerx-spring-cloud/pom.xml rename to spring-cloud-alicloud-schedulerx/pom.xml index a9a52afc..df28db4a 100644 --- a/alicloud-schedulerx-spring-cloud/pom.xml +++ b/spring-cloud-alicloud-schedulerx/pom.xml @@ -8,13 +8,13 @@ 0.9.1.BUILD-SNAPSHOT 4.0.0 - alicloud-schedulerx-spring-cloud - Alibaba Cloud SchedulerX Spring Cloud + spring-cloud-alicloud-schedulerx + Spring Cloud Alibaba Cloud SchedulerX com.alibaba.cloud - alicloud-context-spring-cloud + spring-cloud-alicloud-context org.slf4j @@ -74,4 +74,4 @@ - + \ No newline at end of file diff --git a/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java b/spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java similarity index 100% rename from alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java rename to spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java diff --git a/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java b/spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java similarity index 58% rename from alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java rename to spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java index 7a44a5a6..2f173666 100644 --- a/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java +++ b/spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java @@ -16,43 +16,45 @@ package com.alibaba.alicloud.scx.endpoint; +import java.util.HashMap; +import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; + import com.alibaba.alicloud.context.edas.EdasProperties; import com.alibaba.alicloud.context.scx.ScxProperties; -import java.util.HashMap; -import java.util.Map; - /** * @author xiaolongzuo */ @Endpoint(id = "scx") public class ScxEndpoint { - private static final Logger LOGGER = LoggerFactory.getLogger(ScxEndpoint.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ScxEndpoint.class); - private ScxProperties scxProperties; + private ScxProperties scxProperties; - private EdasProperties edasProperties; + private EdasProperties edasProperties; - public ScxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) { - this.edasProperties = edasProperties; - this.scxProperties = scxProperties; - } + public ScxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) { + this.edasProperties = edasProperties; + this.scxProperties = scxProperties; + } - /** - * @return scx endpoint - */ - @ReadOperation - public Map invoke() { - Map scxEndpoint = new HashMap<>(); - LOGGER.info("SCX endpoint invoke, scxProperties is {}", scxProperties); - scxEndpoint.put("namespace", edasProperties == null ? "" : edasProperties.getNamespace()); - scxEndpoint.put("scxProperties", scxProperties); - return scxEndpoint; - } + /** + * @return scx endpoint + */ + @ReadOperation + public Map invoke() { + Map scxEndpoint = new HashMap<>(); + LOGGER.info("SCX endpoint invoke, scxProperties is {}", scxProperties); + scxEndpoint.put("namespace", + edasProperties == null ? "" : edasProperties.getNamespace()); + scxEndpoint.put("scxProperties", scxProperties); + return scxEndpoint; + } } diff --git a/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java b/spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java similarity index 99% rename from alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java rename to spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java index 676bbd14..98563e3a 100644 --- a/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java +++ b/spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java @@ -21,9 +21,10 @@ import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.context.annotation.Bean; + import com.alibaba.alicloud.context.edas.EdasProperties; import com.alibaba.alicloud.context.scx.ScxProperties; -import org.springframework.context.annotation.Bean; /** * @author xiaolongzuo diff --git a/alicloud-schedulerx-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-schedulerx/src/main/resources/META-INF/spring.factories similarity index 100% rename from alicloud-schedulerx-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alicloud-schedulerx/src/main/resources/META-INF/spring.factories diff --git a/alicloud-sms-spring-cloud/pom.xml b/spring-cloud-alicloud-sms/pom.xml similarity index 93% rename from alicloud-sms-spring-cloud/pom.xml rename to spring-cloud-alicloud-sms/pom.xml index b44b0280..14f53905 100644 --- a/alicloud-sms-spring-cloud/pom.xml +++ b/spring-cloud-alicloud-sms/pom.xml @@ -9,15 +9,14 @@ 4.0.0 - com.alibaba.cloud - alicloud-sms-spring-cloud - Alibaba Cloud SMS Spring Cloud + spring-cloud-alicloud-sms + Spring Cloud Alibaba Cloud SMS com.alibaba.cloud - alicloud-context-spring-cloud + spring-cloud-alicloud-context com.aliyun diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/AbstractSmsService.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/AbstractSmsService.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/AbstractSmsService.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/AbstractSmsService.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/ISmsService.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/ISmsService.java similarity index 88% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/ISmsService.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/ISmsService.java index bedf9679..45f81b44 100644 --- a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/ISmsService.java +++ b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/ISmsService.java @@ -16,7 +16,12 @@ package com.alibaba.alicloud.sms; import com.aliyuncs.IAcsClient; -import com.aliyuncs.dysmsapi.model.v20170525.*; +import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsResponse; +import com.aliyuncs.dysmsapi.model.v20170525.SendBatchSmsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.SendBatchSmsResponse; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ServerException; diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java similarity index 99% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java index 81658f85..5724785c 100644 --- a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java +++ b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java @@ -15,16 +15,18 @@ */ package com.alibaba.alicloud.sms; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.profile.DefaultProfile; +import java.util.Collection; +import java.util.concurrent.atomic.AtomicBoolean; + import org.springframework.boot.context.event.ApplicationStartedEvent; -import com.alibaba.alicloud.context.sms.SmsProperties; -import com.alibaba.alicloud.sms.base.MessageListener; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; -import java.util.Collection; -import java.util.concurrent.atomic.AtomicBoolean; +import com.alibaba.alicloud.context.sms.SmsProperties; +import com.alibaba.alicloud.sms.base.MessageListener; + +import com.aliyuncs.exceptions.ClientException; +import com.aliyuncs.profile.DefaultProfile; /** * @author pbting diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsMessageListener.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsMessageListener.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsMessageListener.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsMessageListener.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsReportMessageListener.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsReportMessageListener.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsReportMessageListener.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsReportMessageListener.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java similarity index 99% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java index 5a6165a4..b7e6ea3b 100644 --- a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java +++ b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java @@ -19,6 +19,7 @@ import java.text.ParseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import com.alibaba.alicloud.context.AliCloudProperties; import com.alibaba.alicloud.context.sms.SmsProperties; import com.alibaba.alicloud.sms.base.DefaultAlicomMessagePuller; diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsUpMessageListener.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsUpMessageListener.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsUpMessageListener.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsUpMessageListener.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/DefaultAlicomMessagePuller.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/DefaultAlicomMessagePuller.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/DefaultAlicomMessagePuller.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/DefaultAlicomMessagePuller.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/MessageListener.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/MessageListener.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/MessageListener.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/MessageListener.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueRequest.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueRequest.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueRequest.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueRequest.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponse.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponse.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponse.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponse.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/TokenForAlicom.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/TokenForAlicom.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/TokenForAlicom.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/TokenForAlicom.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/TokenGetterForAlicom.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/TokenGetterForAlicom.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/TokenGetterForAlicom.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/TokenGetterForAlicom.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java similarity index 99% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java index 03a76abe..08e75098 100644 --- a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java +++ b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java @@ -18,13 +18,14 @@ package com.alibaba.alicloud.sms.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.alibaba.alicloud.context.AliCloudProperties; import com.alibaba.alicloud.context.sms.SmsProperties; import com.alibaba.alicloud.sms.ISmsService; import com.alibaba.alicloud.sms.SmsInitializerEventListener; import com.alibaba.alicloud.sms.SmsServiceImpl; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/EndpointManager.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/EndpointManager.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/EndpointManager.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/EndpointManager.java index 5047a8f1..79354f24 100644 --- a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/EndpointManager.java +++ b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/EndpointManager.java @@ -15,9 +15,6 @@ */ package com.alibaba.alicloud.sms.endpoint; -import com.aliyuncs.dysmsapi.model.v20170525.SendBatchSmsRequest; -import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; - import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -25,6 +22,9 @@ import java.util.Map; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.locks.ReentrantLock; +import com.aliyuncs.dysmsapi.model.v20170525.SendBatchSmsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; + /** * */ diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java index 2825f3a5..685fbe97 100644 --- a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java +++ b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java @@ -15,10 +15,10 @@ */ package com.alibaba.alicloud.sms.endpoint; -import com.alibaba.alicloud.sms.base.MessageListener; - import java.io.Serializable; +import com.alibaba.alicloud.sms.base.MessageListener; + /** * @author pbting */ diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpoint.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpoint.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpoint.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpoint.java diff --git a/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java b/spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java similarity index 100% rename from alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java rename to spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java diff --git a/alicloud-sms-spring-cloud/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-sms/src/main/resources/META-INF/spring.factories similarity index 100% rename from alicloud-sms-spring-cloud/src/main/resources/META-INF/spring.factories rename to spring-cloud-alicloud-sms/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-starter-alibaba/pom.xml b/spring-cloud-starter-alibaba/pom.xml new file mode 100644 index 00000000..5afd96b0 --- /dev/null +++ b/spring-cloud-starter-alibaba/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + + com.alibaba.cloud + spring-cloud-alibaba + 0.9.1.BUILD-SNAPSHOT + ../pom.xml + + spring-cloud-starter-alibaba + pom + Spring Cloud Alibaba Starters + Spring Cloud Alibaba Starters + + spring-cloud-starter-alibaba-nacos-config + spring-cloud-starter-alibaba-nacos-config-server + spring-cloud-starter-alibaba-nacos-discovery + spring-cloud-starter-alibaba-sentinel + spring-cloud-starter-alibaba-seata + spring-cloud-starter-stream-rocketmq + spring-cloud-starter-bus-rocketmq + spring-cloud-starter-dubbo + + \ No newline at end of file diff --git a/alibaba-spring-cloud-starter/alibaba-nacos-config-server-spring-cloud-starter/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config-server/pom.xml similarity index 68% rename from alibaba-spring-cloud-starter/alibaba-nacos-config-server-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config-server/pom.xml index 48f432e7..6cdb3f93 100644 --- a/alibaba-spring-cloud-starter/alibaba-nacos-config-server-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config-server/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT - alibaba-nacos-config-server-spring-cloud-starter - Alibaba Nacos Config Server Spring Cloud Starter + spring-cloud-starter-alibaba-nacos-config-server + Spring Cloud Starter Alibaba Nacos Config Server com.alibaba.cloud - alibaba-nacos-config-spring-cloud + spring-cloud-alibaba-nacos-config diff --git a/alibaba-spring-cloud-starter/alibaba-nacos-config-spring-cloud-starter/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml similarity index 68% rename from alibaba-spring-cloud-starter/alibaba-nacos-config-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml index 1ca97dab..0e58cd6e 100644 --- a/alibaba-spring-cloud-starter/alibaba-nacos-config-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT - alibaba-nacos-config-spring-cloud-starter - Alibaba Nacos Config Spring Cloud Starter + spring-cloud-starter-alibaba-nacos-config + Spring Cloud Starter Alibaba Nacos Config com.alibaba.cloud - alibaba-nacos-config-spring-cloud + spring-cloud-alibaba-nacos-config diff --git a/alibaba-spring-cloud-starter/alibaba-nacos-discovery-spring-cloud-starter/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml similarity index 68% rename from alibaba-spring-cloud-starter/alibaba-nacos-discovery-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml index 048145b2..1479674b 100644 --- a/alibaba-spring-cloud-starter/alibaba-nacos-discovery-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT - alibaba-nacos-discovery-spring-cloud-starter - Alibaba Nacos Discovery Spring Cloud Starter + spring-cloud-starter-alibaba-nacos-discovery + Spring Cloud Starter Alibaba Nacos Discovery com.alibaba.cloud - alibaba-nacos-discovery-spring-cloud + spring-cloud-alibaba-nacos-discovery diff --git a/alibaba-spring-cloud-starter/alibaba-seata-spring-cloud-starter/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml similarity index 68% rename from alibaba-spring-cloud-starter/alibaba-seata-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml index e405165b..47cc5acd 100644 --- a/alibaba-spring-cloud-starter/alibaba-seata-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT - alibaba-seata-spring-cloud-starter - Alibaba Seata Spring Cloud Starter + spring-cloud-starter-alibaba-seata + Spring Cloud Starter Alibaba Seata com.alibaba.cloud - alibaba-seata-spring-cloud + spring-cloud-alibaba-seata diff --git a/alibaba-spring-cloud-starter/alibaba-sentinel-spring-cloud-starter/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml similarity index 68% rename from alibaba-spring-cloud-starter/alibaba-sentinel-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml index 5d5159c7..cc903895 100644 --- a/alibaba-spring-cloud-starter/alibaba-sentinel-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT - alibaba-sentinel-spring-cloud-starter - Alibaba Sentinel Spring Cloud Starter + spring-cloud-starter-alibaba-sentinel + Spring Cloud Starter Alibaba Sentinel com.alibaba.cloud - alibaba-sentinel-spring-cloud + spring-cloud-alibaba-sentinel diff --git a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml similarity index 74% rename from alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml index 106a0aee..44b1726f 100644 --- a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml @@ -4,21 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT + ../pom.xml 4.0.0 com.alibaba.cloud - rocketmq-spring-cloud-starter-bus - RocketMQ Spring Cloud Starter Bus + spring-cloud-starter-bus-rocketmq + Spring Cloud Alibaba Bus RocketMQ com.alibaba.cloud - rocketmq-spring-cloud-stream-binder + spring-cloud-stream-binder-rocketmq diff --git a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/java/com/alibaba/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/java/org/springframework/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java similarity index 98% rename from alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/java/com/alibaba/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java rename to spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/java/org/springframework/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java index 4895741c..093dce41 100644 --- a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/java/com/alibaba/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/java/org/springframework/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.cloud.bus.rocketmq.env; +package org.springframework.cloud.bus.rocketmq.env; import static org.springframework.cloud.bus.SpringCloudBusClient.INPUT; diff --git a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/resources/META-INF/spring.factories similarity index 51% rename from alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/resources/META-INF/spring.factories rename to spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/resources/META-INF/spring.factories index 9f26c6c5..c5a9fb95 100644 --- a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # EnvironmentPostProcessor org.springframework.boot.env.EnvironmentPostProcessor=\ -com.alibaba.cloud.bus.rocketmq.env.RocketMQBusEnvironmentPostProcessor \ No newline at end of file +org.springframework.cloud.bus.rocketmq.env.RocketMQBusEnvironmentPostProcessor \ No newline at end of file diff --git a/alibaba-spring-cloud-starter/dubbo-spring-cloud-starter/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml similarity index 69% rename from alibaba-spring-cloud-starter/dubbo-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml index e3a77c50..9d26ad96 100644 --- a/alibaba-spring-cloud-starter/dubbo-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml @@ -4,19 +4,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT + ../pom.xml 4.0.0 - com.alibaba.cloud - dubbo-spring-cloud-starter - Dubbo Spring Cloud Starter + spring-cloud-starter-dubbo + Spring Cloud Starter Dubbo ${project.groupId} - alibaba-dubbo-spring-cloud + spring-cloud-alibaba-dubbo ${project.version} diff --git a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml similarity index 64% rename from alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml index 7abf2dfb..1ad87f56 100644 --- a/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml @@ -4,16 +4,17 @@ com.alibaba.cloud - alibaba-spring-cloud-starter + spring-cloud-starter-alibaba 0.9.1.BUILD-SNAPSHOT + ../pom.xml - rocketmq-spring-cloud-starter-stream - RocketMQ Spring Cloud Starter Stream + spring-cloud-starter-stream-rocketmq + Spring Cloud Starter Stream RocketMQ com.alibaba.cloud - rocketmq-spring-cloud-stream-binder + spring-cloud-stream-binder-rocketmq diff --git a/alicloud-spring-cloud-starter/pom.xml b/spring-cloud-starter-alicloud/pom.xml similarity index 50% rename from alicloud-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alicloud/pom.xml index 8dd295e1..498be0fe 100644 --- a/alicloud-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alicloud/pom.xml @@ -6,15 +6,15 @@ spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT - alicloud-spring-cloud-starter + spring-cloud-starter-alicloud pom - Alibaba Cloud Spring Cloud Starters - Alibaba Cloud Spring Cloud Starters + Spring Cloud Alibaba Cloud Starters + Spring Cloud Alibaba Cloud Starters - alicloud-oss-spring-cloud-starter - alicloud-acm-spring-cloud-starter - alicloud-ans-spring-cloud-starter - alicloud-schedulerx-spring-cloud-starter - alicloud-sms-spring-cloud-starter + spring-cloud-starter-alicloud-oss + spring-cloud-starter-alicloud-acm + spring-cloud-starter-alicloud-ans + spring-cloud-starter-alicloud-schedulerx + spring-cloud-starter-alicloud-sms - + \ No newline at end of file diff --git a/alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml similarity index 67% rename from alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml index 5a5b6d94..6195e93c 100644 --- a/alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alicloud-spring-cloud-starter + spring-cloud-starter-alicloud 0.9.1.BUILD-SNAPSHOT - alicloud-sms-spring-cloud-starter - Alibaba Cloud SMS Spring Cloud Starter + spring-cloud-starter-alicloud-acm + Spring Cloud Starter Alibaba Cloud ACM com.alibaba.cloud - alicloud-sms-spring-cloud + spring-cloud-alicloud-acm diff --git a/alicloud-spring-cloud-starter/alicloud-ans-spring-cloud-starter/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml similarity index 69% rename from alicloud-spring-cloud-starter/alicloud-ans-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml index 20916c49..6bd99648 100644 --- a/alicloud-spring-cloud-starter/alicloud-ans-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml @@ -4,17 +4,17 @@ 4.0.0 com.alibaba.cloud - alicloud-spring-cloud-starter + spring-cloud-starter-alicloud 0.9.1.BUILD-SNAPSHOT - alicloud-ans-spring-cloud-starter - Alibaba Cloud ANS Spring Cloud Starter + spring-cloud-starter-alicloud-ans + Spring Cloud Starter Alibaba Cloud ANS com.alibaba.cloud - alicloud-ans-spring-cloud + spring-cloud-alicloud-ans diff --git a/alicloud-spring-cloud-starter/alicloud-oss-spring-cloud-starter/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml similarity index 72% rename from alicloud-spring-cloud-starter/alicloud-oss-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml index 892c10f4..4cad9b7c 100644 --- a/alicloud-spring-cloud-starter/alicloud-oss-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alicloud-spring-cloud-starter + spring-cloud-starter-alicloud 0.9.1.BUILD-SNAPSHOT - alicloud-oss-spring-cloud-starter - Alibaba Cloud OSS Spring Cloud Starter + spring-cloud-starter-alicloud-oss + Spring Cloud Starter Alibaba Cloud OSS com.alibaba.cloud - alicloud-oss-spring-cloud + spring-cloud-alicloud-oss com.aliyun.oss diff --git a/alicloud-spring-cloud-starter/alicloud-schedulerx-spring-cloud-starter/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml similarity index 67% rename from alicloud-spring-cloud-starter/alicloud-schedulerx-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml index 538ac06f..dc9f7bfe 100644 --- a/alicloud-spring-cloud-starter/alicloud-schedulerx-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alicloud-spring-cloud-starter + spring-cloud-starter-alicloud 0.9.1.BUILD-SNAPSHOT - alicloud-schedulerx-spring-cloud-starter - Alibaba Cloud SchedulerX Spring Cloud Starter + spring-cloud-starter-alicloud-schedulerx + Spring Cloud Starter Alibaba Cloud SchedulerX com.alibaba.cloud - alicloud-schedulerx-spring-cloud + spring-cloud-alicloud-schedulerx diff --git a/alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml similarity index 67% rename from alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml rename to spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml index 331b1abe..b53e0599 100644 --- a/alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml +++ b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml @@ -4,16 +4,16 @@ com.alibaba.cloud - alicloud-spring-cloud-starter + spring-cloud-starter-alicloud 0.9.1.BUILD-SNAPSHOT - alicloud-acm-spring-cloud-starter - Alibaba Cloud ACM Spring Cloud Starter + spring-cloud-starter-alicloud-sms + Spring Cloud Starter Alibaba Cloud SMS com.alibaba.cloud - alicloud-acm-spring-cloud + spring-cloud-alicloud-sms diff --git a/rocketmq-spring-cloud-stream-binder/pom.xml b/spring-cloud-stream-binder-rocketmq/pom.xml similarity index 94% rename from rocketmq-spring-cloud-stream-binder/pom.xml rename to spring-cloud-stream-binder-rocketmq/pom.xml index e0b838f5..75979bd1 100644 --- a/rocketmq-spring-cloud-stream-binder/pom.xml +++ b/spring-cloud-stream-binder-rocketmq/pom.xml @@ -10,9 +10,8 @@ 4.0.0 - com.alibaba.cloud - rocketmq-spring-cloud-stream-binder - RocketMQ Spring Cloud Stream Binder + spring-cloud-stream-binder-rocketmq + Spring Cloud Alibaba RocketMQ Binder diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java index 065cb4a5..673d3370 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java @@ -17,9 +17,10 @@ package com.alibaba.cloud.stream.binder.rocketmq; import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; import org.springframework.util.StringUtils; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; + /** * @author Jim */ diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java index 4a20477c..d4aaf88a 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java @@ -32,16 +32,6 @@ import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; import org.springframework.cloud.stream.binder.ExtendedProducerProperties; import org.springframework.cloud.stream.binder.ExtendedPropertiesBinder; -import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer; -import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQInboundChannelAdapter; -import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQMessageHandler; -import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQMessageSource; -import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties; -import com.alibaba.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner; import org.springframework.cloud.stream.provisioning.ConsumerDestination; import org.springframework.cloud.stream.provisioning.ProducerDestination; import org.springframework.integration.StaticMessageHeaderAccessor; @@ -53,6 +43,17 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; import org.springframework.util.StringUtils; +import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer; +import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQInboundChannelAdapter; +import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQMessageHandler; +import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQMessageSource; +import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties; +import com.alibaba.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner; + import com.fasterxml.jackson.databind.ObjectMapper; /** diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java index 46c67158..c7539822 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java @@ -16,12 +16,11 @@ package com.alibaba.cloud.stream.binder.rocketmq.actuator; -import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.health.AbstractHealthIndicator; import org.springframework.boot.actuate.health.Health; +import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation; import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; /** diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java index 4d7f7934..66a26ec1 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java @@ -16,12 +16,6 @@ package com.alibaba.cloud.stream.binder.rocketmq.config; -import com.alibaba.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder; -import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties; -import com.alibaba.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner; - import org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration; import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +24,12 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import com.alibaba.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder; +import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties; +import com.alibaba.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner; + /** * @author Timur Valiev * @author Jim diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java index c435b512..cdc3537a 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java @@ -16,13 +16,13 @@ package com.alibaba.cloud.stream.binder.rocketmq.config; -import com.alibaba.cloud.stream.binder.rocketmq.actuator.RocketMQBinderHealthIndicator; - import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.cloud.stream.binder.rocketmq.actuator.RocketMQBinderHealthIndicator; + /** * @author Jim */ diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java similarity index 97% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java index f318233f..33186962 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java @@ -16,8 +16,6 @@ package com.alibaba.cloud.stream.binder.rocketmq.config; -import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants; - import org.apache.rocketmq.acl.common.AclClientRPCHook; import org.apache.rocketmq.acl.common.SessionCredentials; import org.apache.rocketmq.client.producer.DefaultMQProducer; @@ -34,6 +32,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.util.StringUtils; +import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants; + import com.fasterxml.jackson.databind.ObjectMapper; /** @@ -68,9 +68,9 @@ public class RocketMQComponent4BinderAutoConfiguration { else { producer = new DefaultMQProducer(RocketMQBinderConstants.DEFAULT_GROUP); } - if(StringUtils.isEmpty(configNameServer)) { - configNameServer = RocketMQBinderConstants.DEFAULT_NAME_SERVER; - } + if (StringUtils.isEmpty(configNameServer)) { + configNameServer = RocketMQBinderConstants.DEFAULT_NAME_SERVER; + } producer.setNamesrvAddr(configNameServer); return producer; } diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java index babf95ba..1a11324f 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java @@ -19,9 +19,6 @@ package com.alibaba.cloud.stream.binder.rocketmq.consuming; import java.util.List; import java.util.Objects; -import com.alibaba.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; - import org.apache.rocketmq.acl.common.AclClientRPCHook; import org.apache.rocketmq.acl.common.SessionCredentials; import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; @@ -48,12 +45,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; - -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; import org.springframework.context.SmartLifecycle; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.alibaba.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; + /** * @author Jim */ diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java index 3f3abb4f..eeb8d3ef 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java @@ -20,10 +20,6 @@ import org.apache.rocketmq.spring.core.RocketMQListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; -import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer; -import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation; -import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; @@ -35,6 +31,11 @@ import org.springframework.retry.RetryListener; import org.springframework.retry.support.RetryTemplate; import org.springframework.util.Assert; +import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer; +import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation; +import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; + /** * @author Jim */ diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java index 85212bf6..6aa0e0fe 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java @@ -18,8 +18,6 @@ package com.alibaba.cloud.stream.binder.rocketmq.integration; import java.util.Optional; -import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants; - import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendResult; @@ -29,9 +27,6 @@ import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.apache.rocketmq.spring.support.RocketMQHeaders; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation; -import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; import org.springframework.context.Lifecycle; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.support.DefaultErrorMessageStrategy; @@ -43,6 +38,10 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants; +import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation; +import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager; + /** * @author Jim */ diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java index 0ea93a33..1d1ec5d6 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java @@ -33,9 +33,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; -import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQMessageQueueChooser; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; import org.springframework.context.Lifecycle; import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.acks.AcknowledgmentCallback; @@ -46,6 +43,10 @@ import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQMessageQueueChooser; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; + /** * @author Jim */ diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/Instrumentation.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/Instrumentation.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/Instrumentation.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/Instrumentation.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java index c23cf536..4fda8c8f 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java @@ -16,11 +16,11 @@ package com.alibaba.cloud.stream.binder.rocketmq.properties; -import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants; - import org.apache.rocketmq.common.MixAll; import org.springframework.boot.context.properties.ConfigurationProperties; +import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants; + /** * @author Timur Valiev * @author Jim diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java diff --git a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java rename to spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java index df2fa190..95f0b5fb 100644 --- a/rocketmq-spring-cloud-stream-binder/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java @@ -20,13 +20,14 @@ import org.apache.rocketmq.client.Validators; import org.apache.rocketmq.client.exception.MQClientException; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; import org.springframework.cloud.stream.binder.ExtendedProducerProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; -import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties; import org.springframework.cloud.stream.provisioning.ConsumerDestination; import org.springframework.cloud.stream.provisioning.ProducerDestination; import org.springframework.cloud.stream.provisioning.ProvisioningException; import org.springframework.cloud.stream.provisioning.ProvisioningProvider; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties; +import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties; + /** * @author Timur Valiev * @author Jim diff --git a/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.binders b/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.binders similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.binders rename to spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.binders diff --git a/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.factories b/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.factories similarity index 100% rename from rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.factories rename to spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.factories diff --git a/rocketmq-spring-cloud-stream-binder/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java b/spring-cloud-stream-binder-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java similarity index 99% rename from rocketmq-spring-cloud-stream-binder/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java rename to spring-cloud-stream-binder-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java index c456defd..cdecbeab 100644 --- a/rocketmq-spring-cloud-stream-binder/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java +++ b/spring-cloud-stream-binder-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java @@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; + import com.alibaba.cloud.stream.binder.rocketmq.config.RocketMQBinderAutoConfiguration; import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties;