This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a change to branch feat/upstream-manual-status
in repository https://gitbox.apache.org/repos/asf/shenyu.git
from cbb516e765 Merge branch 'master' into feat/upstream-manual-status
add 338ea9adaf [type:refactor] remove motan support (#6307)
add 47a3ff822d Merge branch 'master' into feat/upstream-manual-status
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 1 -
.github/workflows/integrated-test-k8s-ingress.yml | 1 -
.github/workflows/integrated-test.yml | 1 -
README.md | 2 +-
db/init/mysql/schema.sql | 22 +-
db/init/ob/schema.sql | 22 +-
db/init/og/create-table.sql | 22 +-
db/init/oracle/schema.sql | 4 +-
db/init/pg/create-table.sql | 22 +-
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 29 ++
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 31 +-
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 33 ++
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 33 ++
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 33 ++
pom.xml | 25 --
.../org/apache/shenyu/admin/model/dto/ApiDTO.java | 2 +-
.../apache/shenyu/admin/model/entity/ApiDO.java | 2 +-
.../org/apache/shenyu/admin/model/vo/ApiVO.java | 2 +-
.../ShenyuClientRegisterMotanServiceImpl.java | 62 ---
.../src/main/resources/sql-script/h2/schema.sql | 12 +-
.../ShenyuClientRegisterMotanServiceImplTest.java | 89 ----
shenyu-bootstrap/pom.xml | 41 --
shenyu-client/pom.xml | 1 -
shenyu-client/shenyu-client-motan/pom.xml | 57 ---
.../client/motan/MotanServiceEventListener.java | 233 ----------
.../motan/common/annotation/ShenyuMotanClient.java | 71 ---
.../common/annotation/ShenyuMotanService.java | 293 -------------
.../client/motan/common/dto/MotanRpcExt.java | 210 ---------
.../motan/MotanServiceEventListenerTest.java | 278 ------------
.../apache/shenyu/common/constant/Constants.java | 10 -
.../dto/convert/plugin/MotanRegisterConfig.java | 193 ---------
.../common/dto/convert/selector/MotanUpstream.java | 274 ------------
.../org/apache/shenyu/common/enums/PluginEnum.java | 5 -
.../apache/shenyu/common/enums/RpcTypeEnum.java | 7 +-
.../shenyu/common/utils/PluginNameAdapter.java | 2 -
.../convert/plugin/MotanRegisterConfigTest.java | 56 ---
.../apache/shenyu/common/enums/PluginEnumTest.java | 1 -
.../shenyu/common/enums/RpcTypeEnumTest.java | 2 -
.../src/main/release-docs/README.txt | 2 +-
.../src/main/release-docs/LICENSE | 4 -
.../src/main/release-docs/README.txt | 2 +-
shenyu-e2e/shenyu-e2e-case/pom.xml | 1 -
.../shenyu-e2e-case/shenyu-e2e-case-motan/pom.xml | 30 --
.../e2e/testcase/motan/MotanPluginCases.java | 353 ---------------
.../shenyu/e2e/testcase/motan/MotanPluginTest.java | 140 ------
.../java/org/apache/shenyu/e2e/model/Plugin.java | 1 -
shenyu-examples/pom.xml | 1 -
shenyu-examples/shenyu-examples-motan/pom.xml | 36 --
.../shenyu-examples-motan-api/pom.xml | 107 -----
.../motan/service/MotanClassDemoService.java | 58 ---
.../examples/motan/service/MotanDemoService.java | 47 --
.../shenyu/examples/motan/service/MotanTest.java | 84 ----
.../shenyu-examples-motan-service/Dockerfile | 30 --
.../shenyu-examples-motan-service/k8s/ingress.yml | 89 ----
.../k8s/shenyu-examples-motan.yml | 88 ----
.../k8s/shenyu-zookeeper.yml | 81 ----
.../shenyu-examples-motan-service/pom.xml | 130 ------
.../src/main/http/motan-class-test-api.http | 49 ---
.../src/main/http/motan-test-api.http | 35 --
.../motan/service/TestMotanApplication.java | 37 --
.../service/impl/MotanClassDemoServiceImpl.java | 69 ---
.../motan/service/impl/MotanDemoServiceImpl.java | 65 ---
.../src/main/resources/application.yml | 54 ---
shenyu-integrated-test/pom.xml | 2 -
.../docker-compose.yml | 26 --
.../shenyu-integrated-test-combination/pom.xml | 28 --
.../controller/SharedThreadPoolController.java | 13 -
.../test/combination/SharedThreadPoolTest.java | 17 -
.../shenyu/integratedtest/common/dto/MotanDTO.java | 48 ---
.../Dockerfile | 29 --
.../deploy/deploy-shenyu.yaml | 107 -----
.../deploy/kind-config.yaml | 36 --
.../pom.xml | 167 -------
.../script/build_k8s_cluster.sh | 24 --
.../script/healthcheck.sh | 36 --
.../script/services.list | 17 -
.../MotanIngressControllerIntegratedBootstrap.java | 38 --
.../src/main/resources/application.yml | 326 --------------
.../test/k8s/ingress/motan/MotanPluginTest.java | 49 ---
.../shenyu-integrated-test-motan/Dockerfile | 29 --
.../docker-compose.yml | 97 -----
.../shenyu-integrated-test-motan/pom.xml | 134 ------
.../script/healthcheck.sh | 36 --
.../script/services.list | 20 -
.../test/motan/MotanIntegratedBootstrap.java | 38 --
.../src/main/resources/application-local.yml | 59 ---
.../src/main/resources/application.yml | 18 -
.../test/motan/MotanPluginShareThreadPoolTest.java | 52 ---
.../integrated/test/motan/MotanPluginTest.java | 52 ---
.../apache/shenyu/k8s/common/IngressConstants.java | 27 --
.../apache/shenyu/k8s/parser/IngressParser.java | 6 +-
.../shenyu/k8s/parser/MotanIngressParser.java | 304 -------------
.../shenyu/k8s/reconciler/IngressReconciler.java | 13 -
.../org/apache/shenyu/k8s/MotanReconcilerTest.java | 153 -------
.../shenyu/plugin/api/result/ShenyuResultEnum.java | 5 -
.../plugin/api/result/ShenyuResultEnumTest.java | 17 +-
.../shenyu-plugin-proxy/shenyu-plugin-rpc/pom.xml | 1 -
.../general/context/GeneralContextPlugin.java | 2 +-
.../shenyu-plugin-rpc/shenyu-plugin-motan/pom.xml | 55 ---
.../apache/shenyu/plugin/motan/MotanPlugin.java | 129 ------
.../plugin/motan/cache/ApplicationConfigCache.java | 480 ---------------------
.../motan/context/MotanShenyuContextDecorator.java | 43 --
.../plugin/motan/handler/MotanMetaDataHandler.java | 74 ----
.../motan/handler/MotanPluginDataHandler.java | 79 ----
.../plugin/motan/proxy/MotanProxyService.java | 197 ---------
.../shenyu/plugin/motan/util/PrxInfoUtil.java | 120 ------
.../shenyu/plugin/motan/MotanPluginTest.java | 109 -----
.../motan/cache/ApplicationConfigCacheTest.java | 92 ----
.../context/MotanShenyuContextDecoratorTest.java | 57 ---
.../motan/handler/MotanPluginDataHandlerTest.java | 54 ---
.../plugin/motan/proxy/MotanProxyServiceTest.java | 98 -----
.../shenyu/plugin/motan/util/PrxInfoUtilTest.java | 32 --
.../plugin/transform/RpcParamTransformPlugin.java | 1 -
.../plugin/response/strategy/RPCMessageWriter.java | 4 +-
.../shenyu/plugin/response/ResponsePluginTest.java | 4 -
.../register/common/dto/ApiDocRegisterDTO.java | 2 +-
.../register/common/enums/RegisterTypeEnum.java | 5 -
.../shenyu-spring-boot-starter-client/pom.xml | 1 -
.../pom.xml | 47 --
.../motan/ShenyuMotanClientConfiguration.java | 178 --------
.../client/motan/property/RegistryConfig.java | 65 ---
.../client/motan/property/ShenyuMotanConfig.java | 288 -------------
.../src/main/resources/META-INF/spring.factories | 19 -
.../src/main/resources/META-INF/spring.provides | 18 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
.../motan/ShenyuMotanClientConfigurationTest.java | 69 ---
.../shenyu-spring-boot-starter-plugin/pom.xml | 1 -
.../pom.xml | 57 ---
.../plugin/motan/MotanPluginConfiguration.java | 92 ----
.../src/main/resources/META-INF/spring.factories | 19 -
.../src/main/resources/META-INF/spring.provides | 18 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
.../plugin/motan/MotanPluginConfigurationTest.java | 85 ----
133 files changed, 185 insertions(+), 8246 deletions(-)
delete mode 100644
shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterMotanServiceImpl.java
delete mode 100644
shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterMotanServiceImplTest.java
delete mode 100644 shenyu-client/shenyu-client-motan/pom.xml
delete mode 100644
shenyu-client/shenyu-client-motan/src/main/java/org/apache/shenyu/client/motan/MotanServiceEventListener.java
delete mode 100644
shenyu-client/shenyu-client-motan/src/main/java/org/apache/shenyu/client/motan/common/annotation/ShenyuMotanClient.java
delete mode 100644
shenyu-client/shenyu-client-motan/src/main/java/org/apache/shenyu/client/motan/common/annotation/ShenyuMotanService.java
delete mode 100644
shenyu-client/shenyu-client-motan/src/main/java/org/apache/shenyu/client/motan/common/dto/MotanRpcExt.java
delete mode 100644
shenyu-client/shenyu-client-motan/src/test/java/org/apache/shenyu/client/motan/MotanServiceEventListenerTest.java
delete mode 100644
shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/plugin/MotanRegisterConfig.java
delete mode 100644
shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/selector/MotanUpstream.java
delete mode 100644
shenyu-common/src/test/java/org/apache/shenyu/common/dto/convert/plugin/MotanRegisterConfigTest.java
delete mode 100644 shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/pom.xml
delete mode 100644
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginCases.java
delete mode 100644
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
delete mode 100644 shenyu-examples/shenyu-examples-motan/pom.xml
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-api/pom.xml
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-api/src/main/java/org/apache/shenyu/examples/motan/service/MotanClassDemoService.java
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-api/src/main/java/org/apache/shenyu/examples/motan/service/MotanDemoService.java
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-api/src/main/java/org/apache/shenyu/examples/motan/service/MotanTest.java
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/Dockerfile
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/k8s/ingress.yml
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/k8s/shenyu-examples-motan.yml
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/k8s/shenyu-zookeeper.yml
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/pom.xml
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/http/motan-class-test-api.http
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/http/motan-test-api.http
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/java/org/apache/shenyu/examples/motan/service/TestMotanApplication.java
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/java/org/apache/shenyu/examples/motan/service/impl/MotanClassDemoServiceImpl.java
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/java/org/apache/shenyu/examples/motan/service/impl/MotanDemoServiceImpl.java
delete mode 100644
shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/src/main/resources/application.yml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-common/src/main/java/org/apache/shenyu/integratedtest/common/dto/MotanDTO.java
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/Dockerfile
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/deploy/deploy-shenyu.yaml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/deploy/kind-config.yaml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/pom.xml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/script/build_k8s_cluster.sh
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/script/healthcheck.sh
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/script/services.list
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/src/main/java/org/apache/shenyu/integrated/test/k8s/ingress/motan/MotanIngressControllerIntegratedBootstrap.java
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/src/main/resources/application.yml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-motan/src/test/java/org/apache/shenyu/integrated/test/k8s/ingress/motan/MotanPluginTest.java
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/Dockerfile
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/docker-compose.yml
delete mode 100644 shenyu-integrated-test/shenyu-integrated-test-motan/pom.xml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/script/healthcheck.sh
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/script/services.list
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/src/main/java/org/apache/shenyu/integrated/test/motan/MotanIntegratedBootstrap.java
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/application-local.yml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/application.yml
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/src/test/java/org/apache/shenyu/integrated/test/motan/MotanPluginShareThreadPoolTest.java
delete mode 100644
shenyu-integrated-test/shenyu-integrated-test-motan/src/test/java/org/apache/shenyu/integrated/test/motan/MotanPluginTest.java
delete mode 100644
shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/parser/MotanIngressParser.java
delete mode 100644
shenyu-kubernetes-controller/src/test/java/org/apache/shenyu/k8s/MotanReconcilerTest.java
copy
shenyu-common/src/test/java/org/apache/shenyu/common/enums/PluginHandlerEventEnumTest.java
=>
shenyu-plugin/shenyu-plugin-api/src/test/java/org/apache/shenyu/plugin/api/result/ShenyuResultEnumTest.java
(71%)
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/pom.xml
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/main/java/org/apache/shenyu/plugin/motan/MotanPlugin.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/main/java/org/apache/shenyu/plugin/motan/cache/ApplicationConfigCache.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/main/java/org/apache/shenyu/plugin/motan/context/MotanShenyuContextDecorator.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/main/java/org/apache/shenyu/plugin/motan/handler/MotanMetaDataHandler.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/main/java/org/apache/shenyu/plugin/motan/handler/MotanPluginDataHandler.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/main/java/org/apache/shenyu/plugin/motan/proxy/MotanProxyService.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/main/java/org/apache/shenyu/plugin/motan/util/PrxInfoUtil.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/test/java/org/apache/shenyu/plugin/motan/MotanPluginTest.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/test/java/org/apache/shenyu/plugin/motan/cache/ApplicationConfigCacheTest.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/test/java/org/apache/shenyu/plugin/motan/context/MotanShenyuContextDecoratorTest.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/test/java/org/apache/shenyu/plugin/motan/handler/MotanPluginDataHandlerTest.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/test/java/org/apache/shenyu/plugin/motan/proxy/MotanProxyServiceTest.java
delete mode 100644
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/test/java/org/apache/shenyu/plugin/motan/util/PrxInfoUtilTest.java
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/pom.xml
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/main/java/org/apache/shenyu/springboot/starter/client/motan/ShenyuMotanClientConfiguration.java
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/main/java/org/apache/shenyu/springboot/starter/client/motan/property/RegistryConfig.java
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/main/java/org/apache/shenyu/springboot/starter/client/motan/property/ShenyuMotanConfig.java
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/main/resources/META-INF/spring.factories
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/main/resources/META-INF/spring.provides
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/test/java/org/apache/shenyu/springboot/starter/client/motan/ShenyuMotanClientConfigurationTest.java
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/pom.xml
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/main/java/org/apache/shenyu/springboot/starter/plugin/motan/MotanPluginConfiguration.java
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/main/resources/META-INF/spring.factories
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/main/resources/META-INF/spring.provides
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
delete mode 100644
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/test/java/org/apache/shenyu/springboot/starter/plugin/motan/MotanPluginConfigurationTest.java
