From a0186caacd0fe16ef5876d6a5e97f4b3e204b65e Mon Sep 17 00:00:00 2001 From: heliang <3596006474@qq.com> Date: Fri, 31 May 2024 12:05:01 +0800 Subject: [PATCH 1/2] [Feature] Merge CommonConfigPostProcessor and ConfigPostProcessor --- .../config/CommonConfigPostProcessor.java | 31 ------------------- .../dubbo/config/ConfigPostProcessor.java | 3 +- .../apache/dubbo/config/ReferenceConfig.java | 5 ++- .../apache/dubbo/config/ServiceConfig.java | 5 ++- 4 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 dubbo-common/src/main/java/org/apache/dubbo/config/CommonConfigPostProcessor.java diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/CommonConfigPostProcessor.java b/dubbo-common/src/main/java/org/apache/dubbo/config/CommonConfigPostProcessor.java deleted file mode 100644 index f3a7e309b79..00000000000 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/CommonConfigPostProcessor.java +++ /dev/null @@ -1,31 +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 org.apache.dubbo.config; - -import org.apache.dubbo.common.extension.ExtensionScope; -import org.apache.dubbo.common.extension.SPI; - -/** - * it will be call when reference or service config refresh - */ -@SPI(scope = ExtensionScope.MODULE) -public interface CommonConfigPostProcessor { - - default void postProcessReferConfig(ReferenceConfigBase referenceConfig) {} - - default void postProcessServiceConfig(ServiceConfigBase serviceConfig) {} -} diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigPostProcessor.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigPostProcessor.java index 57daef48df9..4bddc9f526f 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigPostProcessor.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigPostProcessor.java @@ -23,9 +23,8 @@ * 2019/12/30 * it will be instead of CommonConfigPostProcessor */ -@Deprecated @SPI(scope = ExtensionScope.MODULE) -public interface ConfigPostProcessor extends CommonConfigPostProcessor { +public interface ConfigPostProcessor { default void postProcessReferConfig(ReferenceConfig referenceConfig) {} diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java index c0aad1a209a..40fe19ebc68 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java @@ -871,11 +871,10 @@ protected boolean shouldJvmRefer(Map map) { private void postProcessConfig() { List configPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); - List commonConfigPostProcessors = this.getExtensionLoader( - CommonConfigPostProcessor.class) + List commonConfigPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); - HashSet allConfigPostProcessor = new HashSet<>(); + HashSet allConfigPostProcessor = new HashSet<>(); // merge common and old config allConfigPostProcessor.addAll(commonConfigPostProcessors); diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java index 53bf3c84e95..70df2f8ea90 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java @@ -1000,11 +1000,10 @@ private boolean isOnlyInJvm() { private void postProcessConfig() { List configPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) .getActivateExtension(URL.valueOf("configPostProcessor://", getScopeModel()), (String[]) null); - List commonConfigPostProcessors = this.getExtensionLoader( - CommonConfigPostProcessor.class) + List commonConfigPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); - HashSet allConfigPostProcessor = new HashSet<>(); + HashSet allConfigPostProcessor = new HashSet<>(); // merge common and old config allConfigPostProcessor.addAll(commonConfigPostProcessors); From d938842f1f5f5dcea59c2d808cf985b5d36c338e Mon Sep 17 00:00:00 2001 From: heliang <3596006474@qq.com> Date: Fri, 31 May 2024 12:12:58 +0800 Subject: [PATCH 2/2] [Feature] Merge CommonConfigPostProcessor and ConfigPostProcessor --- .../main/java/org/apache/dubbo/config/ReferenceConfig.java | 4 +--- .../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 4 +--- dubbo-distribution/dubbo-all-shaded/pom.xml | 4 ---- dubbo-distribution/dubbo-all/pom.xml | 4 ---- dubbo-distribution/dubbo-core-spi/pom.xml | 3 --- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java index 40fe19ebc68..913785a9c50 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java @@ -871,13 +871,11 @@ protected boolean shouldJvmRefer(Map map) { private void postProcessConfig() { List configPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); - List commonConfigPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) - .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); HashSet allConfigPostProcessor = new HashSet<>(); // merge common and old config - allConfigPostProcessor.addAll(commonConfigPostProcessors); + allConfigPostProcessor.addAll(configPostProcessors); allConfigPostProcessor.addAll(configPostProcessors); allConfigPostProcessor.forEach(component -> component.postProcessReferConfig(this)); diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java index 70df2f8ea90..363eccd8b5e 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java @@ -1000,13 +1000,11 @@ private boolean isOnlyInJvm() { private void postProcessConfig() { List configPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) .getActivateExtension(URL.valueOf("configPostProcessor://", getScopeModel()), (String[]) null); - List commonConfigPostProcessors = this.getExtensionLoader(ConfigPostProcessor.class) - .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); HashSet allConfigPostProcessor = new HashSet<>(); // merge common and old config - allConfigPostProcessor.addAll(commonConfigPostProcessors); + allConfigPostProcessor.addAll(configPostProcessors); allConfigPostProcessor.addAll(configPostProcessors); allConfigPostProcessor.forEach(component -> component.postProcessServiceConfig(this)); diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml index c259d3b60b5..bc7ca34f7f5 100644 --- a/dubbo-distribution/dubbo-all-shaded/pom.xml +++ b/dubbo-distribution/dubbo-all-shaded/pom.xml @@ -885,10 +885,6 @@ META-INF/dubbo/internal/org.apache.dubbo.common.json.JsonUtil - - META-INF/dubbo/internal/org.apache.dubbo.config.CommonConfigPostProcessor - - META-INF/dubbo/internal/org.apache.dubbo.registry.integration.ServiceURLCustomizer diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index 15de10a5186..db8f34bf76a 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -924,10 +924,6 @@ META-INF/dubbo/internal/org.apache.dubbo.common.json.JsonUtil - - META-INF/dubbo/internal/org.apache.dubbo.config.CommonConfigPostProcessor - - META-INF/dubbo/internal/org.apache.dubbo.registry.integration.ServiceURLCustomizer diff --git a/dubbo-distribution/dubbo-core-spi/pom.xml b/dubbo-distribution/dubbo-core-spi/pom.xml index c9661590f2d..43511a8c924 100644 --- a/dubbo-distribution/dubbo-core-spi/pom.xml +++ b/dubbo-distribution/dubbo-core-spi/pom.xml @@ -523,9 +523,6 @@ META-INF/dubbo/internal/org.apache.dubbo.common.json.JsonUtil - - META-INF/dubbo/internal/org.apache.dubbo.config.CommonConfigPostProcessor - META-INF/dubbo/internal/org.apache.dubbo.registry.integration.ServiceURLCustomizer