[type:refactor] remove sofa support by Aias00 · Pull Request #6308 · apache/shenyu

Aias00 · 2026-03-29T13:52:45Z

Summary

remove sofa modules, examples, integrated tests, and spring boot starters
clean remaining sofa references from upgrade scripts, release docs, and the tracked admin static bundle
keep only the upgrade SQL delete statements that purge historical sofa data and remove the obsolete SOFA-specific negative test

Verification

mvn -pl shenyu-common -Dtest=RpcTypeEnumTest test
git diff --check
`rg -n --hidden -S "\bsofa\b|Sofa|SOFA" /Users/aias/Work/github/shenyu/.worktrees/remove-sofa --glob '!/.git/' --glob '!/.git' --glob '!/target/' --glob '!/node_modules/**' --glob '!RELEASE-NOTES.md'

Copilot

Pull request overview

This PR removes SOFA RPC support across ShenYu (plugin/client/starter modules, examples, integrated & e2e tests, Kubernetes ingress wiring) and updates shared enums/constants plus DB upgrade scripts to clean existing SOFA data.

Changes:

Delete SOFA-related Maven modules (plugin, client, spring-boot starters), examples, and integrated/e2e test suites.
Remove SOFA references from core enums/constants and plugins that route by RpcTypeEnum / PluginEnum.
Add DB upgrade cleanup statements and a small regression test asserting SOFA is no longer present in RpcTypeEnum.

Reviewed changes

Copilot reviewed 144 out of 144 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/test/java/org/apache/shenyu/springboot/starter/plugin/sofa/SofaPluginConfigurationTest.java	Removes SOFA starter test coverage.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports	Removes SOFA auto-config import.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/main/resources/META-INF/spring.provides	Removes SOFA starter provides metadata.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/main/resources/META-INF/spring.factories	Removes legacy SOFA spring.factories registration.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/main/java/org/apache/shenyu/springboot/starter/plugin/sofa/SofaPluginConfiguration.java	Deletes SOFA starter configuration class.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/pom.xml	Deletes SOFA starter module POM.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/pom.xml	Drops SOFA starter module from reactor.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/test/java/org/apache/shenyu/springboot/starter/client/sofa/ShenyuSofaClientConfigurationTest.java	Removes SOFA client-starter test coverage.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports	Removes SOFA client auto-config import.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/main/resources/META-INF/spring.provides	Removes SOFA client-starter provides metadata.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/main/resources/META-INF/spring.factories	Removes legacy SOFA client spring.factories registration.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/main/java/org/apache/shenyu/springboot/starter/client/sofa/ShenyuSofaClientConfiguration.java	Deletes SOFA client-starter configuration.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/pom.xml	Deletes SOFA client-starter module POM.
shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/pom.xml	Drops SOFA client-starter module from reactor.
shenyu-register-center/shenyu-register-common/src/main/java/org/apache/shenyu/register/common/enums/RegisterTypeEnum.java	Removes SOFA from register type enum.
shenyu-register-center/shenyu-register-common/src/main/java/org/apache/shenyu/register/common/dto/ApiDocRegisterDTO.java	Updates rpcType field comment to be generic.
shenyu-plugin/shenyu-plugin-response/src/test/java/org/apache/shenyu/plugin/response/ResponsePluginTest.java	Removes SOFA response-writer mapping/tests.
shenyu-plugin/shenyu-plugin-response/src/main/java/org/apache/shenyu/plugin/response/strategy/RPCMessageWriter.java	Removes SOFA from supported RPC writer types.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-transform/src/main/java/org/apache/shenyu/plugin/transform/RpcParamTransformPlugin.java	Removes SOFA from skip/handling list.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/test/java/org/apache/shenyu/plugin/sofa/handler/SofaPluginDataHandlerTest.java	Deletes SOFA plugin unit tests.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/test/java/org/apache/shenyu/plugin/sofa/handler/SofaMetaDataHandlerTest.java	Deletes SOFA plugin unit tests.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/test/java/org/apache/shenyu/plugin/sofa/context/SofaShenyuContextDecoratorTest.java	Deletes SOFA plugin unit tests.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/test/java/org/apache/shenyu/plugin/sofa/cache/ApplicationConfigCacheTest.java	Deletes SOFA plugin unit tests.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/test/java/org/apache/shenyu/plugin/sofa/SofaPluginTest.java	Deletes SOFA plugin unit tests.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/main/java/org/apache/shenyu/plugin/sofa/proxy/SofaProxyService.java	Deletes SOFA proxy implementation.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/main/java/org/apache/shenyu/plugin/sofa/param/SofaParamResolveServiceImpl.java	Deletes SOFA param resolver implementation.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/main/java/org/apache/shenyu/plugin/sofa/param/SofaParamResolveService.java	Deletes SOFA param resolver interface.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/main/java/org/apache/shenyu/plugin/sofa/handler/SofaPluginDataHandler.java	Deletes SOFA plugin data handler.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/main/java/org/apache/shenyu/plugin/sofa/handler/SofaMetaDataHandler.java	Deletes SOFA metadata handler.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/main/java/org/apache/shenyu/plugin/sofa/context/SofaShenyuContextDecorator.java	Deletes SOFA context decorator.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/src/main/java/org/apache/shenyu/plugin/sofa/SofaPlugin.java	Deletes SOFA plugin implementation.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa/pom.xml	Deletes SOFA plugin module POM.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-motan/src/test/java/org/apache/shenyu/plugin/motan/proxy/MotanProxyServiceTest.java	Fixes test data naming from sofa→motan.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-general-context/src/test/java/org/apache/shenyu/plugin/general/context/GeneralContextPluginTest.java	Updates assertions to avoid SOFA enum usage.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-general-context/src/main/java/org/apache/shenyu/plugin/general/context/GeneralContextPlugin.java	Removes SOFA from skipExcept list.
shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/pom.xml	Drops SOFA plugin module from reactor.
shenyu-plugin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/result/ShenyuResultEnum.java	Removes SOFA-specific result enum entry.
shenyu-plugin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/context/ShenyuContext.java	Updates rpcType comment to remove SOFA mention.
shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/reconciler/IngressReconciler.java	Removes SOFA annotation handling and config generation.
shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/parser/IngressParser.java	Removes SOFA parsing branch; adjusts context-path gating logic.
shenyu-kubernetes-controller/src/main/java/org/apache/shenyu/k8s/common/IngressConstants.java	Removes SOFA-related annotation constants.
shenyu-integrated-test/shenyu-integrated-test-sofa/src/test/java/org/apache/shenyu/integrated/test/sofa/SofaPluginTest.java	Deletes SOFA integrated tests.
shenyu-integrated-test/shenyu-integrated-test-sofa/src/test/java/org/apache/shenyu/integrated/test/sofa/SofaPluginShareThreadPoolTest.java	Deletes SOFA integrated tests (shared pool).
shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/resources/application.yml	Removes SOFA integrated-test app config.
shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/resources/application-local.yml	Removes SOFA integrated-test app config.
shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/java/org/apache/shenyu/integrated/test/sofa/dto/SofaTestData.java	Deletes SOFA integrated-test DTO.
shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/java/org/apache/shenyu/integrated/test/sofa/SofaIntegratedBootstrap.java	Deletes SOFA integrated-test bootstrap.
shenyu-integrated-test/shenyu-integrated-test-sofa/script/services.list	Deletes SOFA integrated-test scripts.
shenyu-integrated-test/shenyu-integrated-test-sofa/script/healthcheck.sh	Deletes SOFA integrated-test scripts.
shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml	Deletes SOFA integrated-test module POM.
shenyu-integrated-test/shenyu-integrated-test-sofa/docker-compose.yml	Deletes SOFA integrated-test compose stack.
shenyu-integrated-test/shenyu-integrated-test-sofa/Dockerfile	Deletes SOFA integrated-test Dockerfile.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/src/test/java/org/apache/shenyu/integrated/test/k8s/ingress/sofa/SofaPluginShareThreadPoolTest.java	Deletes SOFA k8s-ingress integrated tests.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/src/main/resources/application.yml	Deletes SOFA k8s-ingress integrated config.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/src/main/resources/application-local.yml	Deletes SOFA k8s-ingress integrated config.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/src/main/java/org/apache/shenyu/integrated/test/k8s/ingress/sofa/dto/SofaTestData.java	Deletes SOFA k8s-ingress integrated DTO.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/src/main/java/org/apache/shenyu/integrated/test/k8s/ingress/sofa/SofaIngressControllerIntegratedBootstrap.java	Deletes SOFA k8s-ingress integrated bootstrap.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/script/services.list	Deletes SOFA k8s-ingress scripts.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/script/healthcheck.sh	Deletes SOFA k8s-ingress scripts.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/script/build_k8s_cluster.sh	Deletes SOFA k8s-ingress scripts.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/pom.xml	Deletes SOFA k8s-ingress module POM.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/deploy/kind-config.yaml	Deletes SOFA k8s-ingress deploy assets.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/deploy/deploy-shenyu.yaml	Deletes SOFA k8s-ingress deploy assets.
shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/Dockerfile	Deletes SOFA k8s-ingress Dockerfile.
shenyu-integrated-test/shenyu-integrated-test-combination/src/test/java/org/apache/shenyu/integrated/test/combination/SharedThreadPoolTest.java	Removes SOFA from combination shared-pool test.
shenyu-integrated-test/shenyu-integrated-test-combination/src/main/java/org/apache/shenyu/integrated/test/combination/controller/SharedThreadPoolController.java	Removes SOFA shared-pool endpoint.
shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml	Drops SOFA deps from combination module.
shenyu-integrated-test/shenyu-integrated-test-combination/docker-compose.yml	Removes SOFA example service from compose.
shenyu-integrated-test/pom.xml	Drops SOFA integrated-test modules from reactor.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/resources/invoke-server-example.xml	Deletes SOFA example service config.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/resources/application.yml	Deletes SOFA example application config.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaSingleParamServiceImpl.java	Deletes SOFA example implementations.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaMultiParamServiceImpl.java	Deletes SOFA example implementations.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientSingleParamServiceImpl.java	Deletes SOFA example implementations.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/impl/SofaClientMultiParamServiceImpl.java	Deletes SOFA example implementations.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/java/org/apache/shenyu/examples/sofa/service/TestSofaApplication.java	Deletes SOFA example bootstrap.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/src/main/http/sofa-test-api.http	Deletes SOFA HTTP test collection.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/k8s/shenyu-zookeeper.yml	Deletes SOFA example k8s assets.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/k8s/shenyu-examples-sofa.yml	Deletes SOFA example k8s assets.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/k8s/ingress.yml	Deletes SOFA example ingress assets.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/Dockerfile	Deletes SOFA example Dockerfile.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaSingleParamService.java	Deletes SOFA example API interfaces.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaMultiParamService.java	Deletes SOFA example API interfaces.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientSingleParamService.java	Deletes SOFA example API interfaces.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/service/SofaClientMultiParamService.java	Deletes SOFA example API interfaces.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaSimpleTypeBean.java	Deletes SOFA example DTOs.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-api/src/main/java/org/apache/shenyu/examples/sofa/api/entity/SofaComplexTypeBean.java	Deletes SOFA example DTOs.
shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-api/pom.xml	Deletes SOFA example API module POM.
shenyu-examples/shenyu-examples-sofa/pom.xml	Deletes SOFA examples aggregator module POM.
shenyu-examples/shenyu-examples-sofa/README.md	Deletes SOFA examples documentation.
shenyu-examples/pom.xml	Drops SOFA examples module from reactor.
shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/model/Plugin.java	Removes SOFA from e2e plugin model enum.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java	Deletes SOFA e2e test suite.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynTest.java	Deletes SOFA e2e sync test.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/pom.xml	Deletes SOFA e2e module POM.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/k8s/shenyu-examples-sofa.yml	Deletes SOFA e2e k8s assets.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/k8s/script/e2e-sofa-sync.sh	Deletes SOFA e2e k8s scripts.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/compose/shenyu-examples-sofa-compose.yml	Deletes SOFA e2e compose assets.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/compose/script/e2e-sofa-sync-compose.sh	Deletes SOFA e2e compose scripts.
shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/GrpcPluginCases.java	Updates grpc e2e checks to avoid SOFA path.
shenyu-e2e/shenyu-e2e-case/pom.xml	Drops SOFA e2e case module from reactor.
shenyu-common/src/test/java/org/apache/shenyu/common/enums/RpcTypeEnumTest.java	Updates enum tests + asserts SOFA removal.
shenyu-common/src/test/java/org/apache/shenyu/common/dto/convert/rule/impl/SofaRuleHandleTest.java	Deletes SOFA rule-handle tests.
shenyu-common/src/test/java/org/apache/shenyu/common/dto/convert/plugin/SofaRegisterConfigTest.java	Deletes SOFA register-config tests.
shenyu-common/src/main/java/org/apache/shenyu/common/utils/PluginNameAdapter.java	Removes SOFA mapping from rpcType→plugin.
shenyu-common/src/main/java/org/apache/shenyu/common/enums/RpcTypeEnum.java	Removes SOFA from rpc type enum + supported metadata list.
shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java	Removes SOFA plugin enum constant.
shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/rule/impl/SofaRuleHandle.java	Deletes SOFA rule handle model.
shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/plugin/SofaRegisterConfig.java	Deletes SOFA plugin config model.
shenyu-common/src/main/java/org/apache/shenyu/common/constant/Constants.java	Removes SOFA constants.
shenyu-client/shenyu-client-sofa/src/main/java/org/apache/shenyu/client/sofa/common/dto/SofaRpcExt.java	Deletes SOFA client DTO.
shenyu-client/shenyu-client-sofa/src/main/java/org/apache/shenyu/client/sofa/common/annotation/ShenyuSofaClient.java	Deletes SOFA client annotation.
shenyu-client/shenyu-client-sofa/pom.xml	Deletes SOFA client module POM.
shenyu-client/pom.xml	Drops SOFA client module from reactor.
shenyu-bootstrap/pom.xml	Removes SOFA dependencies from bootstrap assembly.
shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSofaServiceImplTest.java	Deletes SOFA admin register service tests.
shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PluginServiceTest.java	Updates plugin query test data away from SOFA.
shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/ShenyuClientRegisterSofaServiceImpl.java	Deletes SOFA admin register service.
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/ApiVO.java	Updates rpcType comment to remove SOFA mention.
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ApiDO.java	Updates rpcType comment to remove SOFA mention.
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/ApiDTO.java	Updates rpcType comment to remove SOFA mention.
pom.xml	Removes SOFA dependency management properties/deps.
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql	Adds upgrade cleanup to delete SOFA plugin data.
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql	Adds upgrade cleanup to delete SOFA plugin data.
README.md	Removes SOFA from feature list.
.github/workflows/integrated-test.yml	Drops SOFA integrated-test job.
.github/workflows/integrated-test-k8s-ingress.yml	Removes/keeps disabled SOFA k8s-ingress job entry.
.github/workflows/e2e-k8s.yml	Drops SOFA e2e job.
.asf.yaml	Removes SOFA label from GitHub settings.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-29T13:56:55Z

        boolean dubboEnabled = getBooleanAnnotation(ingress, IngressConstants.PLUGIN_DUBBO_ENABLED);
        boolean motanEnabled = getBooleanAnnotation(ingress, IngressConstants.PLUGIN_MOTAN_ENABLED);
        boolean webSocketEnabled = getBooleanAnnotation(ingress, IngressConstants.PLUGIN_WEB_SOCKET_ENABLED);
        boolean brpcEnabled = getBooleanAnnotation(ingress, IngressConstants.PLUGIN_BRPC_ENABLED);
        boolean grpcEnabled = getBooleanAnnotation(ingress, IngressConstants.PLUGIN_GRPC_ENABLED);
-        boolean sofaEnabled = getBooleanAnnotation(ingress, IngressConstants.PLUGIN_SOFA_ENABLED);

-        if (!dubboEnabled || !motanEnabled || !sofaEnabled) {
+        if (!dubboEnabled || !motanEnabled) {
            contextPathParse(ingress, shenyuMemoryConfigList, coreV1Api);
        }


The condition guarding contextPathParse (if (!dubboEnabled || !motanEnabled)) will evaluate to true for almost every ingress (it is false only when both dubbo and motan are enabled). As a result, the ContextPath plugin config will be generated even for ingresses that only enable a specific plugin (e.g., dubbo-only, motan-only, grpc-only), and it also ignores webSocketEnabled/brpcEnabled/grpcEnabled entirely. Consider tightening this to run only when the ContextPath annotations are actually present, or when none of the RPC plugin flags are enabled (i.e., the Divide/default path), or otherwise aligning the boolean logic with the plugin-selection chain below.

Signed-off-by: liuhy <liuhongyu@apache.org>

Aias00 · 2026-09-19T00:59:13Z

Note (PMC Aias00): this PR currently has merge conflicts (CONFLICTING) and cannot be merged. Please rebase onto the latest master and resolve the conflicts, then request a re-review. (Leaving a comment rather than requesting changes since this is my own PR.)

Aias00 · 2026-09-30T23:17:06Z

Closing this one. The Sofa support it removes is still present in master — shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-sofa is still an active module alongside dubbo, grpc and tars.

The ~9.3k-line removal has also been open and conflicting for months. If the project decides to drop Sofa, this should be reopened as a deliberate, coordinated removal (release note, docs, and the module list) rather than a long-lived branch.

cloudbase-ai · 2026-10-08T03:37:59Z

Superseded by #7494, opened by cloudbase-ai, with the receiving migration in apache/shenyu-plugin-store#6.

The replacement moves SOFA/TARS gateway runtime plugins, starters, and protocol runtime dependencies to the store while preserving shared identifiers, Admin registration, client SDKs, and existing configuration data. This older PR is already closed and remains closed; no reopening is needed.

[type:refactor] remove sofa support

583e432

Copilot AI review requested due to automatic review settings March 29, 2026 13:52

Copilot started reviewing on behalf of Aias00 March 29, 2026 13:53 View session

Copilot AI reviewed Mar 29, 2026

View reviewed changes

Aias00 added 7 commits March 30, 2026 09:37

[type:refactor] remove remaining sofa references

cafccb0

Merge branch 'master' into codex/remove-sofa

2e4f552

[type:fix] guard context-path parsing by annotation

55c0b71

[type:refactor] remove unused import from SharedThreadPoolTest

e243926

Signed-off-by: liuhy <liuhongyu@apache.org>

Merge branch 'master' into codex/remove-sofa

43474d9

test(common): drop sofa schema sync check on remove-sofa

b3c6c5d

Merge branch 'master' into codex/remove-sofa

a54fe9b

moremind added this to the 2.7.1 milestone Apr 11, 2026

moremind added the status: pending label Apr 11, 2026

Aias00 added 7 commits April 14, 2026 22:16

Merge branch 'master' into codex/remove-sofa

21b04d7

Merge branch 'master' into codex/remove-sofa

4769766

Merge branch 'master' into codex/remove-sofa

90b7e18

Merge branch 'master' into codex/remove-sofa

474eac4

Merge branch 'master' into codex/remove-sofa

f3c5a85

Merge branch 'master' into codex/remove-sofa

00b8e1f

Merge branch 'master' into codex/remove-sofa

f0bb916

Duansg mentioned this pull request Jul 15, 2026

infra(ci): remove sofa related workflow after sofa support removed #6430

Merged

1 of 3 tasks

This was referenced Sep 24, 2026

fix: add null-safety checks for labels and services in K8s RPC ingress parsers #6896

Closed

[type:feature] Custome classloader hot load plugins to gateway. #5403

Closed

Aias00 closed this Sep 30, 2026

cloudbase-ai mentioned this pull request Oct 8, 2026

[type:refactor] move bundled SOFA and TARS gateway plugins to store #7494

Merged

Navigation Menu

Repository navigation

[type:refactor] remove sofa support - #6308

[type:refactor] remove sofa support#6308
Aias00 wants to merge 15 commits into
masterfrom
codex/remove-sofa

Aias00 commented Mar 29, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 29, 2026

Uh oh!

Aias00 commented Sep 19, 2026

Uh oh!

Aias00 commented Sep 30, 2026

Uh oh!

cloudbase-ai commented Oct 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

Aias00 commented Mar 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Verification

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

Aias00 commented Sep 19, 2026

Uh oh!

Aias00 commented Sep 30, 2026

Uh oh!

cloudbase-ai commented Oct 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Aias00 commented Mar 29, 2026 •

edited

Loading