This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new ee85eabdb [type: refactor] fix group and package (#3813)
ee85eabdb is described below
commit ee85eabdbc9b5e4aaab23ee074f79bd9316f4528
Author: dragon-zhang <[email protected]>
AuthorDate: Sat Aug 6 22:46:51 2022 +0800
[type: refactor] fix group and package (#3813)
* fix group and package
* fix name
---
.../shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java | 2 +-
.../shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java | 2 +-
.../springboot/starter/client/grpc/ShenyuGrpcClientConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../starter/client/grpc/ShenyuGrpcClientConfigurationTest.java | 4 ++--
.../starter/client/grpc/server/ShenyuGrpcServerBuilderTest.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
b/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
index ec157075d..a14374c65 100644
---
a/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
+++
b/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
@@ -88,7 +88,7 @@ public class AlibabaDubboServiceBeanListener implements
ApplicationListener<Cont
if (!registered.compareAndSet(false, true)) {
return;
}
- // Fix bug(https://github.com/dromara/shenyu/issues/415), upload dubbo
metadata on ContextRefreshedEvent
+ // Fix bug(https://github.com/apache/shenyu/issues/415), upload dubbo
metadata on ContextRefreshedEvent
Map<String, ServiceBean> serviceBean =
contextRefreshedEvent.getApplicationContext().getBeansOfType(ServiceBean.class);
for (Map.Entry<String, ServiceBean> entry : serviceBean.entrySet()) {
handler(entry.getValue());
diff --git
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
index db4357e3b..c251b65d5 100644
---
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
+++
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
@@ -103,7 +103,7 @@ public class ApacheDubboServiceBeanListener implements
ApplicationListener<Conte
*/
@Override
public void onApplicationEvent(final ContextRefreshedEvent
contextRefreshedEvent) {
- // Fix bug(https://github.com/dromara/shenyu/issues/415), upload dubbo
metadata on ContextRefreshedEvent
+ // Fix bug(https://github.com/apache/shenyu/issues/415), upload dubbo
metadata on ContextRefreshedEvent
Map<String, ServiceBean> serviceBean =
contextRefreshedEvent.getApplicationContext().getBeansOfType(ServiceBean.class);
if (serviceBean.isEmpty()) {
return;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfiguration.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcClientConfiguration.java
similarity index 98%
rename from
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfiguration.java
rename to
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcClientConfiguration.java
index 57c91e796..a379e1278 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfiguration.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcClientConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dromara.springboot.starter.client.grpc;
+package org.apache.springboot.starter.client.grpc;
import org.apache.shenyu.client.grpc.GrpcClientEventListener;
import org.apache.shenyu.client.grpc.GrpcContextRefreshedEventListener;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/resources/META-INF/spring.factories
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/resources/META-INF/spring.factories
index 3bf55a3fa..95d9c7dab 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/resources/META-INF/spring.factories
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
#
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.dromara.springboot.starter.client.grpc.ShenyuGrpcClientConfiguration
+org.apache.springboot.starter.client.grpc.ShenyuGrpcClientConfiguration
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
similarity index 96%
rename from
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
rename to
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
index 9748bf243..5753e92de 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dromara.springboot.starter.client.grpc;
+package org.apache.springboot.starter.client.grpc;
import org.apache.shenyu.client.grpc.GrpcClientEventListener;
import org.apache.shenyu.client.grpc.GrpcContextRefreshedEventListener;
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.mockStatic;
*/
@Configuration
@EnableConfigurationProperties
-@ComponentScan(value =
"org.apache.dromara.springboot.starter.client.grpc.server")
+@ComponentScan(value = "org.apache.springboot.starter.client.grpc.server")
public class ShenyuGrpcClientConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/server/ShenyuGrpcServerBuilderTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/springboot/starter/client/grpc/server/ShenyuGrpcServerBuilderTest.java
similarity index 94%
rename from
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/server/ShenyuGrpcServerBuilderTest.java
rename to
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/springboot/starter/client/grpc/server/ShenyuGrpcServerBuilderTest.java
index 15e89fb6a..762711de9 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/server/ShenyuGrpcServerBuilderTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/springboot/starter/client/grpc/server/ShenyuGrpcServerBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dromara.springboot.starter.client.grpc.server;
+package org.apache.springboot.starter.client.grpc.server;
import io.grpc.ServerBuilder;
import org.apache.shenyu.client.grpc.server.GrpcServerBuilder;
