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..7be6319c389 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 @@ -21,11 +21,10 @@ /** * 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 cca118bbfa6..a299acfe80a 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 @@ -857,14 +857,9 @@ 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) - .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); - - HashSet allConfigPostProcessor = new HashSet<>(); + HashSet allConfigPostProcessor = new HashSet<>(); // merge common and old config - allConfigPostProcessor.addAll(commonConfigPostProcessors); 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 4b13e2dcfca..414d5ed4f04 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,14 +1000,9 @@ 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) - .getActivateExtension(URL.valueOf("configPostProcessor://"), (String[]) null); - - HashSet allConfigPostProcessor = new HashSet<>(); + HashSet allConfigPostProcessor = new HashSet<>(); // merge common and old config - allConfigPostProcessor.addAll(commonConfigPostProcessors); 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 b0591156921..56e72cbe7ee 100644 --- a/dubbo-distribution/dubbo-all-shaded/pom.xml +++ b/dubbo-distribution/dubbo-all-shaded/pom.xml @@ -959,7 +959,7 @@ - META-INF/dubbo/internal/org.apache.dubbo.config.CommonConfigPostProcessor + META-INF/dubbo/internal/org.apache.dubbo.config.ConfigPostProcessor diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index 19fd7dbbfc3..22b4e5a2801 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -1014,7 +1014,7 @@ - META-INF/dubbo/internal/org.apache.dubbo.config.CommonConfigPostProcessor + META-INF/dubbo/internal/org.apache.dubbo.config.ConfigPostProcessor diff --git a/dubbo-distribution/dubbo-core-spi/pom.xml b/dubbo-distribution/dubbo-core-spi/pom.xml index 6ef9c5d928e..c7346ba38e5 100644 --- a/dubbo-distribution/dubbo-core-spi/pom.xml +++ b/dubbo-distribution/dubbo-core-spi/pom.xml @@ -573,7 +573,7 @@ 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.config.ConfigPostProcessor META-INF/dubbo/internal/org.apache.dubbo.registry.integration.ServiceURLCustomizer diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml index 2e27452ad6a..5dab8cf621d 100644 --- a/dubbo-rpc/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml @@ -179,5 +179,11 @@ log4j-slf4j-impl test + + org.apache.dubbo + dubbo-config-api + 3.2.9 + compile + diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/config/FeignClientAnnotationConfigPostProcessor.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/config/FeignClientAnnotationConfigPostProcessor.java index 4f62417a284..d9b75234e8b 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/config/FeignClientAnnotationConfigPostProcessor.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/config/FeignClientAnnotationConfigPostProcessor.java @@ -20,8 +20,8 @@ import org.apache.dubbo.common.utils.AnnotationUtils; import org.apache.dubbo.common.utils.ClassUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.config.CommonConfigPostProcessor; -import org.apache.dubbo.config.ReferenceConfigBase; +import org.apache.dubbo.config.ConfigPostProcessor; +import org.apache.dubbo.config.ReferenceConfig; import java.lang.annotation.Annotation; @@ -29,15 +29,15 @@ * parsing @FeignClient service name attribute to replace reference config provided by */ @Activate -public class FeignClientAnnotationConfigPostProcessor implements CommonConfigPostProcessor { +public class FeignClientAnnotationConfigPostProcessor implements ConfigPostProcessor { @Override - public void postProcessReferConfig(ReferenceConfigBase referenceConfig) { + public void postProcessReferConfig(ReferenceConfig referenceConfig) { appendParametersFromInterfaceClassMetadata(referenceConfig.getInterfaceClass(), referenceConfig); } public static void appendParametersFromInterfaceClassMetadata( - Class interfaceClass, ReferenceConfigBase referenceConfig) { + Class interfaceClass, ReferenceConfig referenceConfig) { if (interfaceClass == null) { return; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.config.CommonConfigPostProcessor b/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.config.ConfigPostProcessor similarity index 100% rename from dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.config.CommonConfigPostProcessor rename to dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.config.ConfigPostProcessor diff --git a/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml index 6585f611e45..3c34086dcf8 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml @@ -46,6 +46,12 @@ spring-boot-starter-web true + + org.apache.dubbo + dubbo-rpc-api + 3.3.0-beta.2-SNAPSHOT + compile +