From a27bf072b42c1971b1d4b85fb4f5fb37b17e3fdb Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Tue, 12 Nov 2019 11:12:34 +0800 Subject: [PATCH 1/3] [ISSURE] The beans of Dubbo's Config can't be found on the ReferenceBean's initialization (#5310) * Polish apache/dubbo#5306 : [Migration] Upgrade the @since tags in Javadoc migration cloud native to master * Polish apache/dubbo#5306 : [Migration] Upgrade the @since tags in Javadoc migration cloud native to master * Polish apache/dubbo#5309 : [ISSURE] The beans of Dubbo's Config can't be found on the ReferenceBean's initialization --- dubbo-all/pom.xml | 2 +- .../AbstractDynamicConfiguration.java | 2 +- .../AbstractDynamicConfigurationFactory.java | 2 +- .../configcenter/DynamicConfiguration.java | 20 ++++----- .../file/FileSystemDynamicConfiguration.java | 2 +- ...FileSystemDynamicConfigurationFactory.java | 2 +- .../nop/NopDynamicConfiguration.java | 4 +- .../common/constants/RegistryConstants.java | 10 ++--- .../dubbo/common/context/Lifecycle.java | 2 +- .../common/function/ThrowableAction.java | 2 +- .../common/function/ThrowableConsumer.java | 2 +- .../common/function/ThrowableFunction.java | 2 +- .../apache/dubbo/common/lang/Prioritized.java | 2 +- .../common/lang/ShutdownHookCallback.java | 2 +- .../common/lang/ShutdownHookCallbacks.java | 2 +- .../dubbo/common/utils/DefaultPage.java | 2 +- .../org/apache/dubbo/common/utils/Page.java | 2 +- .../dubbo/common/utils/ReflectUtils.java | 4 +- .../apache/dubbo/common/utils/UrlUtils.java | 4 +- .../apache/dubbo/config/AbstractConfig.java | 2 +- .../dubbo/event/AbstractEventDispatcher.java | 2 +- .../dubbo/event/ConditionalEventListener.java | 2 +- .../dubbo/event/DirectEventDispatcher.java | 2 +- .../java/org/apache/dubbo/event/Event.java | 2 +- .../apache/dubbo/event/EventDispatcher.java | 2 +- .../org/apache/dubbo/event/EventListener.java | 2 +- .../org/apache/dubbo/event/GenericEvent.java | 2 +- .../dubbo/event/GenericEventListener.java | 2 +- .../org/apache/dubbo/event/Listenable.java | 2 +- .../dubbo/event/ParallelEventDispatcher.java | 2 +- ...stractDynamicConfigurationFactoryTest.java | 2 +- .../AbstractDynamicConfigurationTest.java | 2 +- .../configcenter/ConfigChangeTypeTest.java | 2 +- .../configcenter/ConfigChangedEventTest.java | 2 +- .../DynamicConfigurationFactoryTest.java | 2 +- ...SystemDynamicConfigurationFactoryTest.java | 2 +- .../AdaptiveClassCodeGeneratorTest.java | 2 +- .../common/function/ThrowableActionTest.java | 2 +- .../function/ThrowableConsumerTest.java | 2 +- .../function/ThrowableFunctionTest.java | 2 +- .../lang/DefaultShutdownHookCallback.java | 2 +- .../dubbo/common/lang/PrioritizedTest.java | 2 +- .../lang/ShutdownHookCallbacksTest.java | 2 +- .../common/utils/DefaultCharSequence.java | 2 +- .../dubbo/common/utils/DefaultPageTest.java | 2 +- .../event/ConditionalEventListenerTest.java | 2 +- .../event/DirectEventDispatcherTest.java | 2 +- .../org/apache/dubbo/event/EchoEvent.java | 2 +- .../apache/dubbo/event/EchoEventListener.java | 2 +- .../dubbo/event/EchoEventListener2.java | 2 +- .../dubbo/event/EventDispatcherTest.java | 2 +- .../apache/dubbo/event/EventListenerTest.java | 2 +- .../dubbo/event/GenericEventListenerTest.java | 2 +- .../apache/dubbo/event/GenericEventTest.java | 2 +- .../event/ParallelEventDispatcherTest.java | 2 +- .../dubbo/config/DubboShutdownHook.java | 2 +- .../apache/dubbo/config/ReferenceConfig.java | 2 +- .../apache/dubbo/config/ServiceConfig.java | 2 +- .../config/bootstrap/DubboBootstrap.java | 2 +- .../event/DubboServiceDestroyedEvent.java | 2 +- .../DubboShutdownHookRegisteredEvent.java | 2 +- .../DubboShutdownHookUnregisteredEvent.java | 2 +- .../event/ReferenceConfigDestroyedEvent.java | 2 +- .../ReferenceConfigInitializedEvent.java | 2 +- .../event/ServiceConfigExportedEvent.java | 2 +- .../event/ServiceConfigUnexportedEvent.java | 2 +- .../event/listener/LoggingEventListener.java | 2 +- .../listener/ServiceNameMappingListener.java | 2 +- .../ConfigurableMetadataServiceExporter.java | 2 +- .../ServiceInstancePortCustomizer.java | 2 +- .../config/bootstrap/DubboBootstrapTest.java | 2 +- .../DubboServiceConsumerBootstrap.java | 2 +- .../DubboServiceProviderBootstrap.java | 2 +- .../dubbo/config/bootstrap/EchoService.java | 2 +- .../config/bootstrap/EchoServiceImpl.java | 2 +- .../EtcdDubboServiceConsumerBootstrap.java | 2 +- .../EtcdDubboServiceProviderBootstrap.java | 2 +- .../NacosDubboServiceConsumerBootstrap.java | 2 +- .../NacosDubboServiceProviderBootstrap.java | 2 +- ...ookeeperDubboServiceConsumerBootstrap.java | 2 +- .../DubboInterfaceConsumerBootstrap.java | 2 +- .../dubbo/config/spring/ReferenceBean.java | 37 ++++++++++++--- .../DubboConfigAliasPostProcessor.java | 2 +- .../ReferenceAnnotationBeanPostProcessor.java | 45 ------------------- ...ConfigurableSourceBeanMetadataElement.java | 2 +- ...LifecycleComponentApplicationListener.java | 2 +- .../DubboConfigBindingRegistrar.java | 2 +- .../DubboLifecycleComponentRegistrar.java | 2 +- .../annotation/EnableDubboLifecycle.java | 2 +- .../schema/DubboBeanDefinitionParser.java | 2 +- .../spring/schema/DubboNamespaceHandler.java | 6 +-- .../annotation/EnableDubboLifecycleTest.java | 2 +- .../dubbo/metadata/MetadataService.java | 2 +- .../metadata/MetadataServiceExporter.java | 2 +- .../dubbo/metadata/ServiceNameMapping.java | 2 +- .../metadata/WritableMetadataService.java | 2 +- ...icConfigurationServiceNameMappingTest.java | 2 +- .../InMemoryWritableMetadataServiceTest.java | 2 +- .../metadata/LocalMetadataServiceTest.java | 2 +- .../AbstractServiceDiscoveryFactory.java | 2 +- .../DefaultServiceDiscoveryFactory.java | 2 +- .../client/DefaultServiceInstance.java | 2 +- .../EventPublishingServiceDiscovery.java | 2 +- .../client/FileSystemServiceDiscovery.java | 2 +- .../registry/client/ServiceDiscovery.java | 2 +- .../client/ServiceDiscoveryFactory.java | 2 +- .../client/ServiceDiscoveryRegistry.java | 2 +- .../registry/client/ServiceInstance.java | 2 +- .../client/ServiceInstanceCustomizer.java | 2 +- .../ServiceInstanceMetadataCustomizer.java | 2 +- .../event/ServiceDiscoveryDestroyedEvent.java | 2 +- .../ServiceDiscoveryDestroyingEvent.java | 2 +- .../client/event/ServiceDiscoveryEvent.java | 2 +- .../event/ServiceDiscoveryExceptionEvent.java | 2 +- .../ServiceDiscoveryInitializedEvent.java | 2 +- .../ServiceDiscoveryInitializingEvent.java | 2 +- .../client/event/ServiceInstanceEvent.java | 2 +- .../ServiceInstancePreRegisteredEvent.java | 2 +- .../ServiceInstancePreUnregisteredEvent.java | 2 +- .../event/ServiceInstanceRegisteredEvent.java | 2 +- .../ServiceInstanceUnregisteredEvent.java | 2 +- .../event/ServiceInstancesChangedEvent.java | 2 +- .../CustomizableServiceInstanceListener.java | 2 +- .../event/listener/LoggingEventListener.java | 2 +- .../ServiceInstancesChangedListener.java | 2 +- ...tedServicesRevisionMetadataCustomizer.java | 2 +- .../metadata/MetadataServiceURLBuilder.java | 2 +- ...ataServiceURLParamsMetadataCustomizer.java | 2 +- .../ProtocolPortsMetadataCustomizer.java | 2 +- ...RestProtocolSubscribedURLsSynthesizer.java | 2 +- .../ServiceInstanceMetadataUtils.java | 2 +- .../SpringCloudMetadataServiceURLBuilder.java | 2 +- .../StandardMetadataServiceURLBuilder.java | 2 +- .../metadata/SubscribedURLsSynthesizer.java | 2 +- .../client/metadata/URLRevisionResolver.java | 2 +- .../DefaultMetadataServiceProxyFactory.java | 2 +- .../proxy/MetadataServiceProxyFactory.java | 2 +- .../dubbo/registry/client/package-info.java | 2 +- .../RandomServiceInstanceSelector.java | 2 +- .../selector/ServiceInstanceSelector.java | 2 +- .../client/DefaultServiceInstanceTest.java | 2 +- .../EventPublishingServiceDiscoveryTest.java | 2 +- .../FileSystemServiceDiscoveryTest.java | 2 +- .../client/InMemoryServiceDiscovery.java | 2 +- .../registry/client/ServiceDiscoveryTest.java | 2 +- ...stomizableServiceInstanceListenerTest.java | 2 +- .../listener/LoggingEventListenerTest.java | 2 +- .../ServiceInstancesChangedListenerTest.java | 2 +- ...efaultServiceInstanceDeserializerTest.java | 2 +- .../MetadataServiceURLBuilderTest.java | 2 +- .../ServiceInstanceMetadataUtilsTest.java | 2 +- ...ingCloudMetadataServiceURLBuilderTest.java | 2 +- .../metadata/URLRevisionResolverTest.java | 2 +- .../support/ServiceOrientedRegistryTest.java | 2 +- .../dubbo/registry/eureka/package-info.java | 2 +- .../eureka/EurekaServiceDiscoveryTest.java | 2 +- .../registry/nacos/NacosServiceDiscovery.java | 2 +- .../nacos/util/NacosNamingServiceUtils.java | 10 ++--- .../registry/zookeeper/ZookeeperInstance.java | 2 +- ...ookeeperServiceDiscoveryChangeWatcher.java | 2 +- .../util/CuratorFrameworkParams.java | 2 +- .../zookeeper/util/CuratorFrameworkUtils.java | 2 +- .../ZookeeperServiceDiscoveryTest.java | 2 +- 163 files changed, 215 insertions(+), 233 deletions(-) diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml index ea2ad2706fb..f3104238e2b 100644 --- a/dubbo-all/pom.xml +++ b/dubbo-all/pom.xml @@ -808,7 +808,7 @@ META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory - + META-INF/dubbo/internal/org.apache.dubbo.event.EventDispatcher diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java index 40d10be528b..6e85982a19d 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfiguration.java @@ -30,7 +30,7 @@ /** * The abstract implementation of {@link DynamicConfiguration} * - * @since 2.7.4 + * @since 2.7.5 */ public abstract class AbstractDynamicConfiguration implements DynamicConfiguration { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactory.java index e4f6d537f88..eb35b9bec04 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactory.java @@ -27,7 +27,7 @@ * Abstract {@link DynamicConfigurationFactory} implementation with cache ability * * @see DynamicConfigurationFactory - * @since 2.7.4 + * @since 2.7.5 */ public abstract class AbstractDynamicConfigurationFactory implements DynamicConfigurationFactory { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java index 3b0f54547e8..e6362024060 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java @@ -136,7 +136,7 @@ default String getProperties(String key, String group, long timeout) throws Ille * @param content the content of configuration * @return true if success, or false * @throws UnsupportedOperationException If the under layer does not support - * @since 2.7.4 + * @since 2.7.5 */ default boolean publishConfig(String key, String content) throws UnsupportedOperationException { return publishConfig(key, DEFAULT_GROUP, content); @@ -150,7 +150,7 @@ default boolean publishConfig(String key, String content) throws UnsupportedOper * @param content the content of configuration * @return true if success, or false * @throws UnsupportedOperationException If the under layer does not support - * @since 2.7.4 + * @since 2.7.5 */ default boolean publishConfig(String key, String group, String content) throws UnsupportedOperationException { throw new UnsupportedOperationException("No support"); @@ -162,7 +162,7 @@ default boolean publishConfig(String key, String group, String content) throws U * @param key the key to represent a configuration * @return the content of configuration was removed * @throws UnsupportedOperationException If the under layer does not support - * @since 2.7.4 + * @since 2.7.5 */ default String removeConfig(String key) throws UnsupportedOperationException { return removeConfig(key, DEFAULT_GROUP); @@ -175,7 +175,7 @@ default String removeConfig(String key) throws UnsupportedOperationException { * @param group the group where the key belongs to * @return the content of configuration was removed * @throws UnsupportedOperationException If the under layer does not support - * @since 2.7.4 + * @since 2.7.5 */ default String removeConfig(String key, String group) throws UnsupportedOperationException { throw new UnsupportedOperationException("No support"); @@ -186,7 +186,7 @@ default String removeConfig(String key, String group) throws UnsupportedOperatio * * @return the read-only non-null {@link Set set} of config keys * @throws UnsupportedOperationException If the under layer does not support - * @since 2.7.4 + * @since 2.7.5 */ default Set getConfigGroups() throws UnsupportedOperationException { throw new UnsupportedOperationException("No support"); @@ -198,7 +198,7 @@ default Set getConfigGroups() throws UnsupportedOperationException { * @param group the specified group * @return the read-only non-null sorted {@link Set set} of config keys * @throws UnsupportedOperationException If the under layer does not support - * @since 2.7.4 + * @since 2.7.5 */ default SortedSet getConfigKeys(String group) throws UnsupportedOperationException { throw new UnsupportedOperationException("No support"); @@ -210,7 +210,7 @@ default SortedSet getConfigKeys(String group) throws UnsupportedOperatio * @param group the specified group * @return the read-only non-null sorted {@link SortedMap map} * @throws UnsupportedOperationException If the under layer does not support - * @since 2.7.4 + * @since 2.7.5 */ default SortedMap getConfigs(String group) throws UnsupportedOperationException { return getConfigs(group, -1); @@ -224,7 +224,7 @@ default SortedMap getConfigs(String group) throws UnsupportedOpe * @return the read-only non-null sorted {@link SortedMap map} * @throws UnsupportedOperationException If the under layer does not support * @throws IllegalStateException If timeout exceeds - * @since 2.7.4 + * @since 2.7.5 */ default SortedMap getConfigs(String group, long timeout) throws UnsupportedOperationException, IllegalStateException { @@ -238,7 +238,7 @@ default SortedMap getConfigs(String group, long timeout) throws * Close the configuration * * @throws Exception - * @since 2.7.4 + * @since 2.7.5 */ @Override default void close() throws Exception { @@ -262,7 +262,7 @@ static DynamicConfiguration getDynamicConfiguration() { * * @param connectionURL * @return non-null - * @since 2.7.4 + * @since 2.7.5 */ static DynamicConfiguration getDynamicConfiguration(URL connectionURL) { String protocol = connectionURL.getProtocol(); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java index 284da64a16b..c1d01ddf358 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java @@ -74,7 +74,7 @@ /** * File-System based {@link DynamicConfiguration} implementation * - * @since 2.7.4 + * @since 2.7.5 */ public class FileSystemDynamicConfiguration extends AbstractDynamicConfiguration { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactory.java index f2a13322c67..b5440f7b0f3 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactory.java @@ -24,7 +24,7 @@ /** * File-System based {@link DynamicConfigurationFactory} implementation * - * @since 2.7.4 + * @since 2.7.5 */ public class FileSystemDynamicConfigurationFactory extends AbstractDynamicConfigurationFactory { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java index e61af123ba5..66acfdea15e 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java @@ -57,7 +57,7 @@ public String getConfig(String key, String group, long timeout) throws IllegalSt } /** - * @since 2.7.4 + * @since 2.7.5 */ @Override public boolean publishConfig(String key, String group, String content) { @@ -65,7 +65,7 @@ public boolean publishConfig(String key, String group, String content) { } /** - * @since 2.7.4 + * @since 2.7.5 */ @Override public SortedSet getConfigKeys(String group) { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java index 03eb9b2684b..08d6073a8ff 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java @@ -56,28 +56,28 @@ public interface RegistryConstants { /** * The parameter key of Dubbo Registry type * - * @since 2.7.4 + * @since 2.7.5 */ String REGISTRY_TYPE_KEY = "registry-type"; /** * The parameter value of Service-Oriented Registry type * - * @since 2.7.4 + * @since 2.7.5 */ String SERVICE_REGISTRY_TYPE = "service"; /** * The protocol for Service Discovery * - * @since 2.7.4 + * @since 2.7.5 */ String SERVICE_REGISTRY_PROTOCOL = "service-discovery-registry"; /** * The parameter key of the subscribed service names for Service-Oriented Registry * - * @since 2.7.4 + * @since 2.7.5 */ String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed-services"; @@ -87,7 +87,7 @@ public interface RegistryConstants { /** * The request size of service instances * - * @since 2.7.4 + * @since 2.7.5 */ String INSTANCES_REQUEST_SIZE_KEY = "instances-request-size"; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/context/Lifecycle.java b/dubbo-common/src/main/java/org/apache/dubbo/common/context/Lifecycle.java index 4706257efa7..8f8a273ef5d 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/context/Lifecycle.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/context/Lifecycle.java @@ -19,7 +19,7 @@ /** * The Lifecycle of Dubbo component * - * @since 2.7.4 + * @since 2.7.5 */ public interface Lifecycle { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableAction.java b/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableAction.java index 443844c982e..ecfb6888f09 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableAction.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableAction.java @@ -23,7 +23,7 @@ * * @see Function * @see Throwable - * @since 2.7.4 + * @since 2.7.5 */ @FunctionalInterface public interface ThrowableAction { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableConsumer.java b/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableConsumer.java index 4b135fbc4dc..8a1cc6d1ca3 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableConsumer.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableConsumer.java @@ -25,7 +25,7 @@ * @param the source type * @see Function * @see Throwable - * @since 2.7.4 + * @since 2.7.5 */ @FunctionalInterface public interface ThrowableConsumer { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableFunction.java b/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableFunction.java index 7f2e3cd329e..1c29cf674fa 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableFunction.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableFunction.java @@ -25,7 +25,7 @@ * @param the return type * @see Function * @see Throwable - * @since 2.7.4 + * @since 2.7.5 */ @FunctionalInterface public interface ThrowableFunction { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/lang/Prioritized.java b/dubbo-common/src/main/java/org/apache/dubbo/common/lang/Prioritized.java index f416ae0a1bb..babb3ed3c9f 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/lang/Prioritized.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/lang/Prioritized.java @@ -24,7 +24,7 @@ * {@code Prioritized} interface can be implemented by objects that * should be sorted, for example the tasks in executable queue. * - * @since 2.7.4 + * @since 2.7.5 */ public interface Prioritized extends Comparable { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallback.java b/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallback.java index 4cfb0cebc70..52d5605a193 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallback.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallback.java @@ -21,7 +21,7 @@ /** * Dubbo ShutdownHook callback interface * - * @since 2.7.4 + * @since 2.7.5 */ @SPI public interface ShutdownHookCallback extends Prioritized { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallbacks.java b/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallbacks.java index f3946336302..385f7b22cf0 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallbacks.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallbacks.java @@ -28,7 +28,7 @@ /** * The compose {@link ShutdownHookCallback} class to manipulate one and more {@link ShutdownHookCallback} instances * - * @since 2.7.4 + * @since 2.7.5 */ public class ShutdownHookCallbacks { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DefaultPage.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DefaultPage.java index 3d06c1189c8..c8b6043fba3 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DefaultPage.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DefaultPage.java @@ -22,7 +22,7 @@ /** * The default implementation of {@link Page} * - * @since 2.7.4 + * @since 2.7.5 */ public class DefaultPage implements Page, Serializable { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Page.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Page.java index 7de5693b9c6..85d7074e156 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Page.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Page.java @@ -21,7 +21,7 @@ /** * The model class of pagination * - * @since 2.7.4 + * @since 2.7.5 */ public interface Page { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java index 18201d88ed6..0e62526dd90 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java @@ -1177,7 +1177,7 @@ public static Type[] getReturnTypes(Method method) { * * @param sourceClass the source {@link Class class} * @return non-null read-only {@link Set} - * @since 2.7.4 + * @since 2.7.5 */ public static Set findParameterizedTypes(Class sourceClass) { // Add Generic Interfaces @@ -1210,7 +1210,7 @@ public static Set findParameterizedTypes(Class sourceClass * @param matchType the type to match * @param the type to match * @return non-null read-only {@link Set} - * @since 2.7.4 + * @since 2.7.5 */ public static Set> findHierarchicalTypes(Class sourceClass, Class matchType) { if (sourceClass == null) { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java index c795ffda64a..510021b7361 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java @@ -498,7 +498,7 @@ public static boolean isRegistry(URL url) { * * @param url the {@link URL} connects to the registry * @return If it is, return true, or false - * @since 2.7.4 + * @since 2.7.5 */ public static boolean isServiceDiscoveryRegistryType(URL url) { return isServiceDiscoveryRegistryType(url == null ? emptyMap() : url.getParameters()); @@ -509,7 +509,7 @@ public static boolean isServiceDiscoveryRegistryType(URL url) { * * @param parameters the parameters of {@link URL} that connects to the registry * @return If it is, return true, or false - * @since 2.7.4 + * @since 2.7.5 */ public static boolean isServiceDiscoveryRegistryType(Map parameters) { if (parameters == null || parameters.isEmpty()) { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java index f18042c6f94..d1803d2f51e 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java @@ -569,7 +569,7 @@ public boolean equals(Object obj) { * Current method will invoked by Spring or Java EE container automatically, or should be triggered manually. * * @see ConfigManager#addConfig(AbstractConfig) - * @since 2.7.4 + * @since 2.7.5 */ @PostConstruct public void addIntoConfigManager() { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/AbstractEventDispatcher.java b/dubbo-common/src/main/java/org/apache/dubbo/event/AbstractEventDispatcher.java index ce1ffc36ffd..68009a1fa6c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/AbstractEventDispatcher.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/AbstractEventDispatcher.java @@ -42,7 +42,7 @@ * @see ServiceLoader * @see EventListener * @see Event - * @since 2.7.4 + * @since 2.7.5 */ public abstract class AbstractEventDispatcher implements EventDispatcher { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/ConditionalEventListener.java b/dubbo-common/src/main/java/org/apache/dubbo/event/ConditionalEventListener.java index 3c6fce92ab4..c504511d97b 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/ConditionalEventListener.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/ConditionalEventListener.java @@ -21,7 +21,7 @@ * {@link Event event} is handled or not by current listener. * * @see EventListener - * @since 2.7.4 + * @since 2.7.5 */ public interface ConditionalEventListener extends EventListener { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/DirectEventDispatcher.java b/dubbo-common/src/main/java/org/apache/dubbo/event/DirectEventDispatcher.java index f156f1ff8a3..773f5321c1c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/DirectEventDispatcher.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/DirectEventDispatcher.java @@ -20,7 +20,7 @@ * Direct {@link EventDispatcher} implementation uses current thread execution model * * @see EventDispatcher - * @since 2.7.4 + * @since 2.7.5 */ public final class DirectEventDispatcher extends AbstractEventDispatcher { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/Event.java b/dubbo-common/src/main/java/org/apache/dubbo/event/Event.java index e929c21ce0e..184c2c9f47e 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/Event.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/Event.java @@ -21,7 +21,7 @@ /** * An event object of Dubbo is based on the Java standard {@link EventObject event} * - * @since 2.7.4 + * @since 2.7.5 */ public abstract class Event extends EventObject { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/EventDispatcher.java b/dubbo-common/src/main/java/org/apache/dubbo/event/EventDispatcher.java index 29746ab5372..53e08135d36 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/EventDispatcher.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/EventDispatcher.java @@ -27,7 +27,7 @@ * @see Event * @see EventListener * @see DirectEventDispatcher - * @since 2.7.4 + * @since 2.7.5 */ @SPI("direct") public interface EventDispatcher extends Listenable> { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java b/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java index 1f3faf818dc..06c6f6afdf7 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java @@ -35,7 +35,7 @@ * @param the concrete class of {@link Event Dubbo Event} * @see Event * @see java.util.EventListener - * @since 2.7.4 + * @since 2.7.5 */ @SPI @FunctionalInterface diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEvent.java b/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEvent.java index 072114411b0..7711baa2749 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEvent.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEvent.java @@ -20,7 +20,7 @@ * Generic {@link Event Dubbo event} * * @param the type of event source - * @since 2.7.4 + * @since 2.7.5 */ public class GenericEvent extends Event { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEventListener.java b/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEventListener.java index e05b7cb1a33..57bbd0a4df4 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEventListener.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/GenericEventListener.java @@ -44,7 +44,7 @@ * * @see Event * @see EventListener - * @since 2.7.4 + * @since 2.7.5 */ public abstract class GenericEventListener implements EventListener { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/Listenable.java b/dubbo-common/src/main/java/org/apache/dubbo/event/Listenable.java index ed1ba483fe4..c61e2114b19 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/Listenable.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/Listenable.java @@ -27,7 +27,7 @@ * Dubbo Event Listenable * * @see EventDispatcher - * @since 2.7.4 + * @since 2.7.5 */ public interface Listenable> { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/event/ParallelEventDispatcher.java b/dubbo-common/src/main/java/org/apache/dubbo/event/ParallelEventDispatcher.java index 1ca42dd58aa..082bb992112 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/event/ParallelEventDispatcher.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/event/ParallelEventDispatcher.java @@ -22,7 +22,7 @@ * Parallel {@link EventDispatcher} implementation uses {@link ForkJoinPool#commonPool() JDK common thread pool} * * @see ForkJoinPool#commonPool() - * @since 2.7.4 + * @since 2.7.5 */ public class ParallelEventDispatcher extends AbstractEventDispatcher { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactoryTest.java index 149d1986e0c..7a9536b0173 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactoryTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactoryTest.java @@ -28,7 +28,7 @@ * {@link AbstractDynamicConfigurationFactory} Test * * @see AbstractDynamicConfigurationFactory - * @since 2.7.4 + * @since 2.7.5 */ public class AbstractDynamicConfigurationFactoryTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java index 42a15f9e1db..05e7bcaba68 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java @@ -39,7 +39,7 @@ /** * {@link AbstractDynamicConfiguration} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class AbstractDynamicConfigurationTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangeTypeTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangeTypeTest.java index 8095d597321..e56e4fbe594 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangeTypeTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangeTypeTest.java @@ -27,7 +27,7 @@ * {@link ConfigChangeType} Test * * @see ConfigChangeType - * @since 2.7.4 + * @since 2.7.5 */ public class ConfigChangeTypeTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangedEventTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangedEventTest.java index 7de409aa082..91549275d44 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangedEventTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/ConfigChangedEventTest.java @@ -24,7 +24,7 @@ /** * {@link ConfigChangedEvent} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ConfigChangedEventTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/DynamicConfigurationFactoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/DynamicConfigurationFactoryTest.java index 8a4a1f8dba6..6bbbcc6487f 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/DynamicConfigurationFactoryTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/DynamicConfigurationFactoryTest.java @@ -26,7 +26,7 @@ /** * {@link DynamicConfigurationFactory} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class DynamicConfigurationFactoryTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactoryTest.java index 37e37b1430a..86d6d17106a 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactoryTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfigurationFactoryTest.java @@ -27,7 +27,7 @@ /** * {@link FileSystemDynamicConfigurationFactory} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class FileSystemDynamicConfigurationFactoryTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGeneratorTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGeneratorTest.java index 911e34b3003..6a5046d17d3 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGeneratorTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGeneratorTest.java @@ -31,7 +31,7 @@ /** * {@link AdaptiveClassCodeGenerator} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class AdaptiveClassCodeGeneratorTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableActionTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableActionTest.java index 977b730cbe5..c5abf147540 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableActionTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableActionTest.java @@ -24,7 +24,7 @@ /** * {@link ThrowableAction} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ThrowableActionTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableConsumerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableConsumerTest.java index 475974c5190..0891a5200a4 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableConsumerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableConsumerTest.java @@ -24,7 +24,7 @@ /** * {@link ThrowableConsumer} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ThrowableConsumerTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableFunctionTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableFunctionTest.java index abd2bee6511..8ddaf271c6a 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableFunctionTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/function/ThrowableFunctionTest.java @@ -24,7 +24,7 @@ /** * {@link ThrowableFunction} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ThrowableFunctionTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/lang/DefaultShutdownHookCallback.java b/dubbo-common/src/test/java/org/apache/dubbo/common/lang/DefaultShutdownHookCallback.java index 35256c1bb15..a3d31f718c9 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/lang/DefaultShutdownHookCallback.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/lang/DefaultShutdownHookCallback.java @@ -19,7 +19,7 @@ /** * Default {@link ShutdownHookCallback} * - * @since 2.7.4 + * @since 2.7.5 */ public class DefaultShutdownHookCallback implements ShutdownHookCallback { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/lang/PrioritizedTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/lang/PrioritizedTest.java index 3bb57535c78..5311ced541b 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/lang/PrioritizedTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/lang/PrioritizedTest.java @@ -29,7 +29,7 @@ /** * {@link Prioritized} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class PrioritizedTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/lang/ShutdownHookCallbacksTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/lang/ShutdownHookCallbacksTest.java index a2ab0b46218..c59914820fa 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/lang/ShutdownHookCallbacksTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/lang/ShutdownHookCallbacksTest.java @@ -26,7 +26,7 @@ /** * {@link ShutdownHookCallbacks} * - * @since 2.7.4 + * @since 2.7.5 */ public class ShutdownHookCallbacksTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultCharSequence.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultCharSequence.java index e00d4acbca7..0db1c96ffed 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultCharSequence.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultCharSequence.java @@ -21,7 +21,7 @@ /** * Default {@link CharSequence} * - * @since 2.7.4 + * @since 2.7.5 */ public class DefaultCharSequence implements CharSequence, Prioritized { @Override diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultPageTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultPageTest.java index 8e9a174da48..36ceb4d2df9 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultPageTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultPageTest.java @@ -25,7 +25,7 @@ /** * {@link DefaultPage} * - * @since 2.7.4 + * @since 2.7.5 */ public class DefaultPageTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/ConditionalEventListenerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/event/ConditionalEventListenerTest.java index ad196f5a153..603b85c3452 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/ConditionalEventListenerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/ConditionalEventListenerTest.java @@ -25,7 +25,7 @@ /** * {@link ConditionalEventListener} test * - * @since 2.7.4 + * @since 2.7.5 */ public class ConditionalEventListenerTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/DirectEventDispatcherTest.java b/dubbo-common/src/test/java/org/apache/dubbo/event/DirectEventDispatcherTest.java index 139f29009ea..35b98b6c6a1 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/DirectEventDispatcherTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/DirectEventDispatcherTest.java @@ -29,7 +29,7 @@ /** * {@link DirectEventDispatcher} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class DirectEventDispatcherTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEvent.java b/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEvent.java index 9c32741d536..a8f808e2fa4 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEvent.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEvent.java @@ -19,7 +19,7 @@ /** * Echo {@link Event} * - * @since 2.7.4 + * @since 2.7.5 */ class EchoEvent extends Event { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener.java b/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener.java index f6542523fcd..136cd7deef0 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener.java @@ -21,7 +21,7 @@ /** * {@link EchoEvent} {@link EventListener} * - * @since 2.7.4 + * @since 2.7.5 */ public class EchoEventListener extends AbstractEventListener implements Serializable { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener2.java b/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener2.java index f9b291e0d9d..18e7cf90aeb 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener2.java @@ -23,7 +23,7 @@ /** * {@link EchoEvent} {@link EventListener} 2 * - * @since 2.7.4 + * @since 2.7.5 */ public class EchoEventListener2 extends Vector> implements Serializable, EventListener { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/EventDispatcherTest.java b/dubbo-common/src/test/java/org/apache/dubbo/event/EventDispatcherTest.java index 2fa67f61684..4fcc667cda5 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/EventDispatcherTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/EventDispatcherTest.java @@ -26,7 +26,7 @@ * {@link EventDispatcher} Test * * @see DirectEventDispatcher - * @since 2.7.4 + * @since 2.7.5 */ public class EventDispatcherTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/EventListenerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/event/EventListenerTest.java index b9b10ae2737..c54e3545051 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/EventListenerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/EventListenerTest.java @@ -24,7 +24,7 @@ /** * {@link EventListener} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class EventListenerTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventListenerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventListenerTest.java index 4a3f8f0bdb3..738de97f6a5 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventListenerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventListenerTest.java @@ -25,7 +25,7 @@ /** * {@link GenericEventListener} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class GenericEventListenerTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventTest.java b/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventTest.java index c3bbb310b47..d0b01bf94fc 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/GenericEventTest.java @@ -24,7 +24,7 @@ /** * {@link GenericEvent} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class GenericEventTest { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/event/ParallelEventDispatcherTest.java b/dubbo-common/src/test/java/org/apache/dubbo/event/ParallelEventDispatcherTest.java index 2e38ae96b6f..49293a6628a 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/event/ParallelEventDispatcherTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/event/ParallelEventDispatcherTest.java @@ -28,7 +28,7 @@ /** * {@link ParallelEventDispatcher} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ParallelEventDispatcherTest { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java index 020d7835ba3..8fc27176291 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java @@ -117,7 +117,7 @@ public void doDestroy() { AbstractRegistryFactory.destroyAll(); // destroy all the protocols destroyProtocols(); - // dispatch the DubboDestroyedEvent @since 2.7.4 + // dispatch the DubboDestroyedEvent @since 2.7.5 dispatch(new DubboServiceDestroyedEvent(this)); } 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 eaf89f3025c..5c287ccc641 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 @@ -441,7 +441,7 @@ protected boolean shouldJvmRefer(Map map) { * Dispatch an {@link Event event} * * @param event an {@link Event event} - * @since 2.7.4 + * @since 2.7.5 */ protected void dispatch(Event event) { EventDispatcher.getDefaultExtension().dispatch(event); 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 b7a8a1b7438..bf21cd9cb84 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 @@ -703,7 +703,7 @@ public void appendParameters() { * Dispatch an {@link Event event} * * @param event an {@link Event event} - * @since 2.7.4 + * @since 2.7.5 */ private void dispatch(Event event) { EventDispatcher.getDefaultExtension().dispatch(event); diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java index 06e2bba8385..7ac5efbfd3f 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java @@ -107,7 +107,7 @@ * Get singleton instance by calling static method {@link #getInstance()}. * Designed as singleton because some classes inside Dubbo, such as ExtensionLoader, are designed only for one instance per process. * - * @since 2.7.4 + * @since 2.7.5 */ public class DubboBootstrap extends GenericEventListener { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboServiceDestroyedEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboServiceDestroyedEvent.java index 4ef5ba946a9..3db52f61180 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboServiceDestroyedEvent.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboServiceDestroyedEvent.java @@ -22,7 +22,7 @@ * An {@link Event Dubbo event} when the Dubbo service is about to be destroyed. * * @see Event - * @since 2.7.4 + * @since 2.7.5 */ public class DubboServiceDestroyedEvent extends Event { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookRegisteredEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookRegisteredEvent.java index ab30b03a995..00c188ab9ea 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookRegisteredEvent.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookRegisteredEvent.java @@ -25,7 +25,7 @@ * * @see DubboShutdownHook * @see ApplicationShutdownHooks - * @since 2.7.4 + * @since 2.7.5 */ public class DubboShutdownHookRegisteredEvent extends Event { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookUnregisteredEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookUnregisteredEvent.java index 621d7a20314..f4644e592aa 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookUnregisteredEvent.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboShutdownHookUnregisteredEvent.java @@ -25,7 +25,7 @@ * * @see DubboShutdownHook * @see ApplicationShutdownHooks - * @since 2.7.4 + * @since 2.7.5 */ public class DubboShutdownHookUnregisteredEvent extends Event { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java index 5c588a5f02d..456693b002d 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java @@ -26,7 +26,7 @@ * @see Reference * @see ReferenceConfig#destroy() * @see Event - * @since 2.7.4 + * @since 2.7.5 */ public class ReferenceConfigDestroyedEvent extends Event { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java index dae7c309586..1302d3f32b5 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java @@ -27,7 +27,7 @@ * @see Reference * @see ReferenceConfig#get() * @see Event - * @since 2.7.4 + * @since 2.7.5 */ public class ReferenceConfigInitializedEvent extends Event { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java index 7aff1f3f4ac..9d1730e3352 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java @@ -22,7 +22,7 @@ /** * {@link ServiceConfig} event post-{@link ServiceConfig#export() export} * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceConfigExportedEvent extends Event { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java index 2e3a2bc0383..7e9f8e955de 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java @@ -22,7 +22,7 @@ /** * {@link ServiceConfig} event post-{@link ServiceConfig#unexport() unexport} * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceConfigUnexportedEvent extends Event { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/LoggingEventListener.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/LoggingEventListener.java index 6fb406d6a2d..19be72e0524 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/LoggingEventListener.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/LoggingEventListener.java @@ -29,7 +29,7 @@ * A listener for logging the {@link Event Dubbo event} * * @see ServiceConfigExportedEvent - * @since 2.7.4 + * @since 2.7.5 */ public class LoggingEventListener extends GenericEventListener { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java index efb42a5a995..4dcfde3a94a 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java @@ -34,7 +34,7 @@ * * @see ServiceNameMapping * @see ServiceConfig#getExportedUrls() - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceNameMappingListener implements EventListener { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java index da04b379ef9..fdb011f8953 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java @@ -47,7 +47,7 @@ * @see MetadataServiceExporter * @see ServiceConfig * @see ConfigManager - * @since 2.7.4 + * @since 2.7.5 */ public class ConfigurableMetadataServiceExporter implements MetadataServiceExporter { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstancePortCustomizer.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstancePortCustomizer.java index bdde8b12eeb..db68898c59b 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstancePortCustomizer.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstancePortCustomizer.java @@ -29,7 +29,7 @@ /** * The {@link ServiceInstanceCustomizer} to customize the {@link ServiceInstance#getPort() port} of service instance. * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstancePortCustomizer implements ServiceInstanceCustomizer { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java index f885cfc276f..0a830b0690d 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java @@ -23,7 +23,7 @@ /** * {@link DubboBootstrap} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class DubboBootstrapTest { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceConsumerBootstrap.java index f64c158ae14..f493c1637aa 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceConsumerBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceConsumerBootstrap.java @@ -22,7 +22,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class DubboServiceConsumerBootstrap { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceProviderBootstrap.java index f5453f41d14..35285dd3e34 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceProviderBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboServiceProviderBootstrap.java @@ -29,7 +29,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class DubboServiceProviderBootstrap { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoService.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoService.java index c33bff995bb..7969c071481 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoService.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoService.java @@ -19,7 +19,7 @@ /** * Echo Service * - * @since 2.7.4 + * @since 2.7.5 */ public interface EchoService { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoServiceImpl.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoServiceImpl.java index 06eb4c0058f..7c9225df40b 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoServiceImpl.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EchoServiceImpl.java @@ -24,7 +24,7 @@ * The implementation of {@link EchoService} * * @see EchoService - * @since 2.7.4 + * @since 2.7.5 */ public class EchoServiceImpl implements EchoService { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceConsumerBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceConsumerBootstrap.java index 752b65ffa41..8d6152443f2 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceConsumerBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceConsumerBootstrap.java @@ -22,7 +22,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class EtcdDubboServiceConsumerBootstrap { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceProviderBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceProviderBootstrap.java index 360f43c0a9d..cbe7b011122 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceProviderBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/EtcdDubboServiceProviderBootstrap.java @@ -28,7 +28,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class EtcdDubboServiceProviderBootstrap { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceConsumerBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceConsumerBootstrap.java index 313e22f3599..552fb208fe6 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceConsumerBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceConsumerBootstrap.java @@ -23,7 +23,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class NacosDubboServiceConsumerBootstrap { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceProviderBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceProviderBootstrap.java index c426231f869..763cfdfe8de 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceProviderBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/NacosDubboServiceProviderBootstrap.java @@ -24,7 +24,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class NacosDubboServiceProviderBootstrap { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/ZookeeperDubboServiceConsumerBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/ZookeeperDubboServiceConsumerBootstrap.java index b81166bf549..ed421b100bb 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/ZookeeperDubboServiceConsumerBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/ZookeeperDubboServiceConsumerBootstrap.java @@ -21,7 +21,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class ZookeeperDubboServiceConsumerBootstrap { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/compatible/DubboInterfaceConsumerBootstrap.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/compatible/DubboInterfaceConsumerBootstrap.java index 22fed38d567..738a8812f70 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/compatible/DubboInterfaceConsumerBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/compatible/DubboInterfaceConsumerBootstrap.java @@ -24,7 +24,7 @@ /** * Dubbo Provider Bootstrap * - * @since 2.7.4 + * @since 2.7.5 */ public class DubboInterfaceConsumerBootstrap { diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java index 9c5bc665d59..6f60403c66b 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java @@ -16,22 +16,33 @@ */ package org.apache.dubbo.config.spring; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ConsumerConfig; +import org.apache.dubbo.config.MetadataReportConfig; +import org.apache.dubbo.config.MetricsConfig; +import org.apache.dubbo.config.ModuleConfig; +import org.apache.dubbo.config.MonitorConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.spring.extension.SpringExtensionFactory; import org.apache.dubbo.config.support.Parameter; -import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors; + /** * ReferenceFactoryBean */ -public class ReferenceBean extends ReferenceConfig implements FactoryBean, ApplicationContextAware, InitializingBean, DisposableBean { +public class ReferenceBean extends ReferenceConfig implements FactoryBean, + ApplicationContextAware, InitializingBean, DisposableBean { private static final long serialVersionUID = 213195494150089726L; @@ -67,12 +78,28 @@ public boolean isSingleton() { return true; } + /** + * Initializes there Dubbo's Config Beans before @Reference bean autowiring + */ + private void prepareDubboConfigBeans() { + beansOfTypeIncludingAncestors(applicationContext, ApplicationConfig.class); + beansOfTypeIncludingAncestors(applicationContext, ModuleConfig.class); + beansOfTypeIncludingAncestors(applicationContext, RegistryConfig.class); + beansOfTypeIncludingAncestors(applicationContext, ProtocolConfig.class); + beansOfTypeIncludingAncestors(applicationContext, MonitorConfig.class); + beansOfTypeIncludingAncestors(applicationContext, ProviderConfig.class); + beansOfTypeIncludingAncestors(applicationContext, ConsumerConfig.class); + beansOfTypeIncludingAncestors(applicationContext, ConfigCenterBean.class); + beansOfTypeIncludingAncestors(applicationContext, MetadataReportConfig.class); + beansOfTypeIncludingAncestors(applicationContext, MetricsConfig.class); + } + @Override @SuppressWarnings({"unchecked"}) public void afterPropertiesSet() throws Exception { - if (applicationContext != null) { - BeanFactoryUtils.beansOfTypeIncludingAncestors(applicationContext, ConfigCenterBean.class, false, false); - } + + // Initializes there Dubbo's Config Beans before @Reference bean autowiring + prepareDubboConfigBeans(); // lazy init by default. if (init == null) { diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessor.java index ddbcbf0e45b..8293289f6f8 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessor.java @@ -32,7 +32,7 @@ /** * A Post-Processor class to set the alias of Dubbo Config bean using its {@link AbstractConfig#getId()} * - * @since 2.7.4 + * @since 2.7.5 */ public class DubboConfigAliasPostProcessor implements BeanDefinitionRegistryPostProcessor, BeanPostProcessor { diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java index 77aa85f9f44..548ffe1e5d6 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java @@ -16,18 +16,8 @@ */ package org.apache.dubbo.config.spring.beans.factory.annotation; -import org.apache.dubbo.config.ApplicationConfig; -import org.apache.dubbo.config.ConsumerConfig; -import org.apache.dubbo.config.MetadataReportConfig; -import org.apache.dubbo.config.MetricsConfig; -import org.apache.dubbo.config.ModuleConfig; -import org.apache.dubbo.config.MonitorConfig; -import org.apache.dubbo.config.ProtocolConfig; -import org.apache.dubbo.config.ProviderConfig; -import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.annotation.Service; -import org.apache.dubbo.config.spring.ConfigCenterBean; import org.apache.dubbo.config.spring.ReferenceBean; import org.apache.dubbo.config.spring.ServiceBean; import org.apache.dubbo.config.spring.context.event.ServiceBeanExportedEvent; @@ -42,7 +32,6 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.core.annotation.AnnotationAttributes; import java.lang.reflect.Field; @@ -58,7 +47,6 @@ import static java.lang.reflect.Proxy.newProxyInstance; import static org.apache.dubbo.config.spring.beans.factory.annotation.ServiceBeanNameBuilder.create; import static org.apache.dubbo.config.spring.util.AnnotationUtils.getAttribute; -import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors; import static org.springframework.util.StringUtils.hasText; /** @@ -94,8 +82,6 @@ public class ReferenceAnnotationBeanPostProcessor extends AnnotationInjectedBean private ApplicationContext applicationContext; - private volatile boolean preparedDubboConfigBeans; - /** * To support the legacy annotation that is @com.alibaba.dubbo.config.annotation.Reference since 2.7.3 */ @@ -103,29 +89,6 @@ public ReferenceAnnotationBeanPostProcessor() { super(Reference.class, com.alibaba.dubbo.config.annotation.Reference.class); } - private void prepareDubboConfigBeans() { - - if (preparedDubboConfigBeans) { - return; - } - - preparedDubboConfigBeans = true; - - ConfigurableListableBeanFactory beanFactory = getBeanFactory(); - - // Initializes there Dubbo's Config Beans before @Reference bean autowiring - beansOfTypeIncludingAncestors(beanFactory, ApplicationConfig.class); - beansOfTypeIncludingAncestors(beanFactory, ModuleConfig.class); - beansOfTypeIncludingAncestors(beanFactory, RegistryConfig.class); - beansOfTypeIncludingAncestors(beanFactory, ProtocolConfig.class); - beansOfTypeIncludingAncestors(beanFactory, MonitorConfig.class); - beansOfTypeIncludingAncestors(beanFactory, ProviderConfig.class); - beansOfTypeIncludingAncestors(beanFactory, ConsumerConfig.class); - beansOfTypeIncludingAncestors(beanFactory, ConfigCenterBean.class); - beansOfTypeIncludingAncestors(beanFactory, MetadataReportConfig.class); - beansOfTypeIncludingAncestors(beanFactory, MetricsConfig.class); - } - /** * Gets all beans of {@link ReferenceBean} * @@ -159,8 +122,6 @@ public Map> getInjectedMetho @Override protected Object doGetInjectedBean(AnnotationAttributes attributes, Object bean, String beanName, Class injectedType, InjectionMetadata.InjectedElement injectedElement) throws Exception { - prepareDubboConfigBeans(); - /** * The name of bean that annotated Dubbo's {@link Service @Service} in local Spring {@link ApplicationContext} */ @@ -388,8 +349,6 @@ public void setApplicationContext(ApplicationContext applicationContext) throws public void onApplicationEvent(ApplicationEvent event) { if (event instanceof ServiceBeanExportedEvent) { onServiceBeanExportEvent((ServiceBeanExportedEvent) event); - } else if (event instanceof ContextRefreshedEvent) { - onContextRefreshedEvent((ContextRefreshedEvent) event); } } @@ -408,10 +367,6 @@ private void initReferenceBeanInvocationHandler(ServiceBean serviceBean) { } } - private void onContextRefreshedEvent(ContextRefreshedEvent event) { - - } - @Override public void destroy() throws Exception { diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/ConfigurableSourceBeanMetadataElement.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/ConfigurableSourceBeanMetadataElement.java index 1a92a2e964b..95693c251eb 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/ConfigurableSourceBeanMetadataElement.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/ConfigurableSourceBeanMetadataElement.java @@ -22,7 +22,7 @@ /** * Configurable the {@link BeanMetadataAttributeAccessor#setSource(Object) source} for {@link BeanMetadataElement} * - * @since 2.7.4 + * @since 2.7.5 */ public interface ConfigurableSourceBeanMetadataElement { diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboLifecycleComponentApplicationListener.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboLifecycleComponentApplicationListener.java index 04f30e22f8c..61cb66d97be 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboLifecycleComponentApplicationListener.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboLifecycleComponentApplicationListener.java @@ -39,7 +39,7 @@ * * @see {@link Lifecycle Dubbo Lifecycle} * @see SmartApplicationListener - * @since 2.7.4 + * @since 2.7.5 */ public class DubboLifecycleComponentApplicationListener implements ApplicationListener { diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrar.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrar.java index bc3834a27c0..894a363eecf 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrar.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrar.java @@ -124,7 +124,7 @@ private void registerDubboConfigBean(String beanName, Class { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java index e8908e0e933..47fdb1f94cd 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java @@ -42,7 +42,7 @@ /** * The common operations of Service Discovery * - * @since 2.7.4 + * @since 2.7.5 */ @SPI("file") public interface ServiceDiscovery extends Prioritized { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryFactory.java index b9b8bb5ef7b..a6bbcf37bca 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryFactory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryFactory.java @@ -26,7 +26,7 @@ * The factory to create {@link ServiceDiscovery} * * @see ServiceDiscovery - * @since 2.7.4 + * @since 2.7.5 */ @SPI("default") public interface ServiceDiscoveryFactory { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java index f8e6b4bd3d2..2462905bf5a 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java @@ -119,7 +119,7 @@ * @see ServiceDiscovery * @see FailbackRegistry * @see WritableMetadataService - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceDiscoveryRegistry extends FailbackRegistry { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstance.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstance.java index a5edd08f7ac..0422925593a 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstance.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstance.java @@ -23,7 +23,7 @@ * The model class of an instance of a service, which is used for service registration and discovery. *

* - * @since 2.7.4 + * @since 2.7.5 */ public interface ServiceInstance extends Serializable { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceCustomizer.java index 76437fd658a..10674fc4696 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceCustomizer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceCustomizer.java @@ -27,7 +27,7 @@ * @see CustomizableServiceInstanceListener * @see ServiceInstancePreRegisteredEvent * @see ServiceInstance#getMetadata() - * @since 2.7.4 + * @since 2.7.5 */ @SPI public interface ServiceInstanceCustomizer extends Prioritized { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceMetadataCustomizer.java index 0b7a3b9d601..457441f9aaa 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceMetadataCustomizer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceMetadataCustomizer.java @@ -25,7 +25,7 @@ * * @see ServiceInstance#getMetadata() * @see ServiceInstanceCustomizer - * @since 2.7.4 + * @since 2.7.5 */ public abstract class ServiceInstanceMetadataCustomizer implements ServiceInstanceCustomizer { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyedEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyedEvent.java index 7a99fdcdfe2..9b7a54827d0 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyedEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyedEvent.java @@ -22,7 +22,7 @@ * An event raised after the {@link ServiceDiscovery Service Discovery} destroyed. * * @see ServiceDiscovery#destroy() - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceDiscoveryDestroyedEvent extends ServiceDiscoveryEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyingEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyingEvent.java index d6ebfd61e66..ff937ffaffb 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyingEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryDestroyingEvent.java @@ -22,7 +22,7 @@ * An event raised when the {@link ServiceDiscovery Service Discovery} is destroying. * * @see ServiceDiscovery#destroy() - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceDiscoveryDestroyingEvent extends ServiceDiscoveryEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryEvent.java index afe613da476..d312bbba894 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryEvent.java @@ -24,7 +24,7 @@ * * @see Event * @see ServiceDiscovery - * @since 2.7.4 + * @since 2.7.5 */ public abstract class ServiceDiscoveryEvent extends Event { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryExceptionEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryExceptionEvent.java index fd25076b846..543a784b9a9 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryExceptionEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryExceptionEvent.java @@ -23,7 +23,7 @@ * * @see ServiceDiscovery * @see org.apache.dubbo.event.Event - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceDiscoveryExceptionEvent extends ServiceDiscoveryEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializedEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializedEvent.java index a688847a93a..769b8d700b7 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializedEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializedEvent.java @@ -23,7 +23,7 @@ * An event raised after the {@link ServiceDiscovery Service Discovery} initialized * * @see ServiceDiscovery#initialize(URL) - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceDiscoveryInitializedEvent extends ServiceDiscoveryEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializingEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializingEvent.java index da92466d517..3f5039ad386 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializingEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryInitializingEvent.java @@ -23,7 +23,7 @@ * An event raised when the {@link ServiceDiscovery Service Discovery} is initializing. * * @see ServiceDiscovery#initialize(URL) - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceDiscoveryInitializingEvent extends ServiceDiscoveryEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceEvent.java index dd9779cae59..941a5c88a9e 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceEvent.java @@ -22,7 +22,7 @@ /** * The {@link Event Dubbo event} for {@link ServiceInstance an service instance} * - * @since 2.7.4 + * @since 2.7.5 */ public abstract class ServiceInstanceEvent extends Event { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreRegisteredEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreRegisteredEvent.java index 7ee5cab13b9..c4363e6dcf1 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreRegisteredEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreRegisteredEvent.java @@ -24,7 +24,7 @@ * An event raised before a {@link ServiceInstance service instance} * {@link ServiceDiscovery#register(ServiceInstance) registered} * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstancePreRegisteredEvent extends ServiceInstanceEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreUnregisteredEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreUnregisteredEvent.java index 1863a345164..e52baf9dfd9 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreUnregisteredEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreUnregisteredEvent.java @@ -24,7 +24,7 @@ * An event raised before a {@link ServiceInstance service instance} * {@link ServiceDiscovery#unregister(ServiceInstance) unregistered} * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstancePreUnregisteredEvent extends ServiceInstanceEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceRegisteredEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceRegisteredEvent.java index 14f50dd4601..a6bd8460c2e 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceRegisteredEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceRegisteredEvent.java @@ -24,7 +24,7 @@ * An event raised after a {@link ServiceInstance service instance} * {@link ServiceDiscovery#register(ServiceInstance) registered} * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstanceRegisteredEvent extends ServiceInstanceEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceUnregisteredEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceUnregisteredEvent.java index 363b060d46c..ef92db46f64 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceUnregisteredEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceUnregisteredEvent.java @@ -25,7 +25,7 @@ * {@link ServiceDiscovery#unregister(ServiceInstance) unregistered} * * @see ServiceInstanceEvent - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstanceUnregisteredEvent extends ServiceInstanceEvent { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancesChangedEvent.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancesChangedEvent.java index d7d5d4e0e5d..4b912656599 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancesChangedEvent.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancesChangedEvent.java @@ -28,7 +28,7 @@ * An event raised after the {@link ServiceInstance instances} of one service has been changed. * * @see ServiceInstancesChangedListener - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstancesChangedEvent extends Event { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java index 8164b66354a..d2ee50fa856 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java @@ -25,7 +25,7 @@ /** * Customize the {@link ServiceInstance} before registering to Registry. * - * @since 2.7.4 + * @since 2.7.5 */ public class CustomizableServiceInstanceListener implements EventListener { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListener.java index f2205bb23d1..91fb07d7149 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListener.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListener.java @@ -35,7 +35,7 @@ /** * A listener for logging the {@link Event Dubbo event} * - * @since 2.7.4 + * @since 2.7.5 */ public class LoggingEventListener extends GenericEventListener { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java index 196e3226072..102830110d8 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java @@ -26,7 +26,7 @@ * The Service Discovery Changed {@link EventListener Event Listener} * * @see ServiceInstancesChangedEvent - * @since 2.7.4 + * @since 2.7.5 */ public abstract class ServiceInstancesChangedListener implements ConditionalEventListener { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ExportedServicesRevisionMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ExportedServicesRevisionMetadataCustomizer.java index f6429661b8f..a356068b228 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ExportedServicesRevisionMetadataCustomizer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ExportedServicesRevisionMetadataCustomizer.java @@ -31,7 +31,7 @@ *

* The reversion is calculated on the methods that all Dubbo exported interfaces declare * - * @since 2.7.4 + * @since 2.7.5 */ public class ExportedServicesRevisionMetadataCustomizer extends ServiceInstanceMetadataCustomizer { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilder.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilder.java index 36e6963352e..7f77bdcfc9f 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilder.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilder.java @@ -25,7 +25,7 @@ /** * Used to build metadata service url from ServiceInstance. * - * @since 2.7.4 + * @since 2.7.5 */ @SPI public interface MetadataServiceURLBuilder { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLParamsMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLParamsMetadataCustomizer.java index 131e8f67e9c..5ad373aae92 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLParamsMetadataCustomizer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLParamsMetadataCustomizer.java @@ -35,7 +35,7 @@ * into {@link ServiceInstance#getMetadata() the service instances' metadata} * * @see ServiceInstanceMetadataCustomizer - * @since 2.7.4 + * @since 2.7.5 */ public class MetadataServiceURLParamsMetadataCustomizer extends ServiceInstanceMetadataCustomizer { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ProtocolPortsMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ProtocolPortsMetadataCustomizer.java index 616c7a6ad54..2d832955754 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ProtocolPortsMetadataCustomizer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ProtocolPortsMetadataCustomizer.java @@ -34,7 +34,7 @@ * A Class to customize the ports of {@link Protocol protocols} into * {@link ServiceInstance#getMetadata() the metadata of service instance} * - * @since 2.7.4 + * @since 2.7.5 */ public class ProtocolPortsMetadataCustomizer implements ServiceInstanceCustomizer { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RestProtocolSubscribedURLsSynthesizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RestProtocolSubscribedURLsSynthesizer.java index 7ee7de7999f..50d3ad40e3d 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RestProtocolSubscribedURLsSynthesizer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RestProtocolSubscribedURLsSynthesizer.java @@ -41,7 +41,7 @@ /** * {@link SubscribedURLsSynthesizer} implementation for REST {@link Protocol protocol} * - * @since 2.7.4 + * @since 2.7.5 */ public class RestProtocolSubscribedURLsSynthesizer implements SubscribedURLsSynthesizer { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java index eefa26cbe24..b66ae793fba 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java @@ -47,7 +47,7 @@ * @see ServiceInstance#getMetadata() * @see MetadataService * @see URL - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstanceMetadataUtils { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilder.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilder.java index 3a0238e3fba..c5640601904 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilder.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilder.java @@ -33,7 +33,7 @@ * Supporting interaction with Dubbo Spring Cloud at https://github.com/alibaba/spring-cloud-alibaba * Dubbo Spring Cloud is a Dubbo extension that favours a per instance registry model and exposes metadata service. * - * @since 2.7.4 + * @since 2.7.5 */ public class SpringCloudMetadataServiceURLBuilder implements MetadataServiceURLBuilder { public static final String NAME = "spring-cloud"; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java index 8b31839ee56..026146e4241 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java @@ -34,7 +34,7 @@ * Standard Dubbo provider enabling introspection service discovery mode. * * @see MetadataService - * @since 2.7.4 + * @since 2.7.5 */ public class StandardMetadataServiceURLBuilder implements MetadataServiceURLBuilder { public static final String NAME = "standard"; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SubscribedURLsSynthesizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SubscribedURLsSynthesizer.java index 745fff71154..2f3a499dae6 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SubscribedURLsSynthesizer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SubscribedURLsSynthesizer.java @@ -29,7 +29,7 @@ /** * The inteface to synthesize the subscribed {@link URL URLs} * - * @since 2.7.4 + * @since 2.7.5 */ @SPI public interface SubscribedURLsSynthesizer extends Prioritized { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolver.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolver.java index d8b994d0f0b..66f4dbf5f95 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolver.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolver.java @@ -35,7 +35,7 @@ /** * A class to resolve the version from {@link URL URLs} * - * @since 2.7.4 + * @since 2.7.5 */ public class URLRevisionResolver { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/DefaultMetadataServiceProxyFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/DefaultMetadataServiceProxyFactory.java index 157fc5337bb..90b37190dd5 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/DefaultMetadataServiceProxyFactory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/DefaultMetadataServiceProxyFactory.java @@ -40,7 +40,7 @@ * Use this implementation to generate the proxy on Consumer side representing the remote MetadataService * exposed on the Provider side. Also see {@link RemoteMetadataServiceProxyFactory} * - * @since 2.7.4 + * @since 2.7.5 */ public class DefaultMetadataServiceProxyFactory extends BaseMetadataServiceProxyFactory implements MetadataServiceProxyFactory { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/MetadataServiceProxyFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/MetadataServiceProxyFactory.java index fd55bb776f1..e3c09bf116f 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/MetadataServiceProxyFactory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/MetadataServiceProxyFactory.java @@ -27,7 +27,7 @@ * * @see ServiceInstance * @see MetadataService - * @since 2.7.4 + * @since 2.7.5 */ @SPI("default") public interface MetadataServiceProxyFactory { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/package-info.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/package-info.java index 0144c78470a..6cb6b54ff82 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/package-info.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/package-info.java @@ -18,6 +18,6 @@ * * The inspiration of service registration and discovery comes from * Spring Cloud Commons. * - * @since 2.7.4 + * @since 2.7.5 */ package org.apache.dubbo.registry.client; \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/RandomServiceInstanceSelector.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/RandomServiceInstanceSelector.java index 605575f01cc..b8dd7d800f2 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/RandomServiceInstanceSelector.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/RandomServiceInstanceSelector.java @@ -27,7 +27,7 @@ * * @see ThreadLocalRandom * @see ServiceInstanceSelector - * @since 2.7.4 + * @since 2.7.5 */ public class RandomServiceInstanceSelector implements ServiceInstanceSelector { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/ServiceInstanceSelector.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/ServiceInstanceSelector.java index e7c5289586c..c2f18638b9b 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/ServiceInstanceSelector.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/ServiceInstanceSelector.java @@ -26,7 +26,7 @@ /** * The {@link ServiceInstance} Selector * - * @since 2.7.4 + * @since 2.7.5 */ @SPI("random") public interface ServiceInstanceSelector { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/DefaultServiceInstanceTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/DefaultServiceInstanceTest.java index 93b0be84b86..e55b223bf6f 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/DefaultServiceInstanceTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/DefaultServiceInstanceTest.java @@ -27,7 +27,7 @@ /** * {@link DefaultServiceInstance} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class DefaultServiceInstanceTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/EventPublishingServiceDiscoveryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/EventPublishingServiceDiscoveryTest.java index 97ccf8eaf31..7851ef09ebe 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/EventPublishingServiceDiscoveryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/EventPublishingServiceDiscoveryTest.java @@ -38,7 +38,7 @@ /** * {@link EventPublishingServiceDiscovery} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class EventPublishingServiceDiscoveryTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/FileSystemServiceDiscoveryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/FileSystemServiceDiscoveryTest.java index 2cb4c226e53..8677381f8e5 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/FileSystemServiceDiscoveryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/FileSystemServiceDiscoveryTest.java @@ -27,7 +27,7 @@ /** * {@link FileSystemServiceDiscovery} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class FileSystemServiceDiscoveryTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/InMemoryServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/InMemoryServiceDiscovery.java index 83ca8e6c188..fbc410b9d15 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/InMemoryServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/InMemoryServiceDiscovery.java @@ -34,7 +34,7 @@ /** * In-Memory {@link ServiceDiscovery} implementation * - * @since 2.7.4 + * @since 2.7.5 */ public class InMemoryServiceDiscovery implements ServiceDiscovery { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/ServiceDiscoveryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/ServiceDiscoveryTest.java index 1d0e0d3fa88..e31e7d1f8e8 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/ServiceDiscoveryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/ServiceDiscoveryTest.java @@ -34,7 +34,7 @@ /** * {@link ServiceDiscovery} Test case * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceDiscoveryTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListenerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListenerTest.java index 0b022b0c1b7..bf8d9d2cf3c 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListenerTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListenerTest.java @@ -24,7 +24,7 @@ /** * {@link CustomizableServiceInstanceListener} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class CustomizableServiceInstanceListenerTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListenerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListenerTest.java index e1eeecf7c62..093309263e6 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListenerTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListenerTest.java @@ -38,7 +38,7 @@ /** * {@link LoggingEventListener} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class LoggingEventListenerTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java index c4eedf1868d..8e76e440251 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java @@ -31,7 +31,7 @@ /** * {@link ServiceInstancesChangedListener} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstancesChangedListenerTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/fastjson/DefaultServiceInstanceDeserializerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/fastjson/DefaultServiceInstanceDeserializerTest.java index 291c792954c..57b8086324c 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/fastjson/DefaultServiceInstanceDeserializerTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/fastjson/DefaultServiceInstanceDeserializerTest.java @@ -26,7 +26,7 @@ ///** // * {@link DefaultServiceInstanceDeserializer} Test // * -// * @since 2.7.4 +// * @since 2.7.5 // */ //public class DefaultServiceInstanceDeserializerTest { // diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilderTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilderTest.java index 669beed6c80..cf6492709bd 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilderTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilderTest.java @@ -22,7 +22,7 @@ /** * {@link MetadataServiceURLBuilder} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class MetadataServiceURLBuilderTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtilsTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtilsTest.java index 6f88b8a8133..e3eeecd56b8 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtilsTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtilsTest.java @@ -31,7 +31,7 @@ /** * {@link ServiceInstanceMetadataUtils} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceInstanceMetadataUtilsTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilderTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilderTest.java index 0a2b9f4a466..33fb2868f2f 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilderTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/SpringCloudMetadataServiceURLBuilderTest.java @@ -29,7 +29,7 @@ /** * {@link SpringCloudMetadataServiceURLBuilder} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class SpringCloudMetadataServiceURLBuilderTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolverTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolverTest.java index e038f282c1e..3386bba0e84 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolverTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/URLRevisionResolverTest.java @@ -25,7 +25,7 @@ /** * {@link URLRevisionResolver} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class URLRevisionResolverTest { diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java index f884b9d167d..ff10ae53316 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java @@ -45,7 +45,7 @@ /** * {@link ServiceDiscoveryRegistry} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ServiceOrientedRegistryTest { diff --git a/dubbo-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/package-info.java b/dubbo-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/package-info.java index 2c300216513..f803f9e4736 100644 --- a/dubbo-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/package-info.java +++ b/dubbo-registry/dubbo-registry-eureka/src/main/java/org/apache/dubbo/registry/eureka/package-info.java @@ -17,6 +17,6 @@ /** * The package contains the registry implementations for Netflix Eureka * - * @since 2.7.4 + * @since 2.7.5 */ package org.apache.dubbo.registry.eureka; diff --git a/dubbo-registry/dubbo-registry-eureka/src/test/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscoveryTest.java b/dubbo-registry/dubbo-registry-eureka/src/test/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscoveryTest.java index 80230f28e9d..c4428983acd 100644 --- a/dubbo-registry/dubbo-registry-eureka/src/test/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscoveryTest.java +++ b/dubbo-registry/dubbo-registry-eureka/src/test/java/org/apache/dubbo/registry/eureka/EurekaServiceDiscoveryTest.java @@ -29,7 +29,7 @@ /** * {@link EurekaServiceDiscovery} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class EurekaServiceDiscoveryTest { diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java index 49e3d4e7e4c..42c96c725b7 100644 --- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java @@ -44,7 +44,7 @@ * Nacos {@link ServiceDiscovery} implementation * * @see ServiceDiscovery - * @since 2.7.4 + * @since 2.7.5 */ public class NacosServiceDiscovery implements ServiceDiscovery { diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java index 98c9b5bbe1f..2d2499ed08d 100644 --- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java +++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java @@ -43,7 +43,7 @@ /** * The utilities class for {@link NamingService} * - * @since 2.7.4 + * @since 2.7.5 */ public class NacosNamingServiceUtils { @@ -54,7 +54,7 @@ public class NacosNamingServiceUtils { * * @param serviceInstance {@link ServiceInstance} * @return non-null - * @since 2.7.4 + * @since 2.7.5 */ public static Instance toInstance(ServiceInstance serviceInstance) { Instance instance = new Instance(); @@ -73,7 +73,7 @@ public static Instance toInstance(ServiceInstance serviceInstance) { * * @param instance {@link Instance} * @return non-null - * @since 2.7.4 + * @since 2.7.5 */ public static ServiceInstance toServiceInstance(Instance instance) { DefaultServiceInstance serviceInstance = new DefaultServiceInstance(instance.getInstanceId(), @@ -89,7 +89,7 @@ public static ServiceInstance toServiceInstance(Instance instance) { * * @param connectionURL {@link URL connection url} * @return non-null, "default" as default - * @since 2.7.4 + * @since 2.7.5 */ public static String getGroup(URL connectionURL) { return connectionURL.getParameter("nacos.group", DEFAULT_GROUP); @@ -100,7 +100,7 @@ public static String getGroup(URL connectionURL) { * * @param connectionURL {@link URL connection url} * @return {@link NamingService} - * @since 2.7.4 + * @since 2.7.5 */ public static NamingService createNamingService(URL connectionURL) { Properties nacosProperties = buildNacosProperties(connectionURL); diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperInstance.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperInstance.java index 962f2377d5a..5bf38d02846 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperInstance.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperInstance.java @@ -24,7 +24,7 @@ *

* It's compatible with Spring Cloud * - * @since 2.7.4 + * @since 2.7.5 */ public class ZookeeperInstance { diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java index 7bfb0a46639..325c80c3638 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java @@ -31,7 +31,7 @@ * {@link Watcher.Event.EventType#NodeChildrenChanged} and {@link Watcher.Event.EventType#NodeDataChanged} event types, * which will multicast a {@link ServiceInstancesChangedEvent} when the service node has been changed. * - * @since 2.7.4 + * @since 2.7.5 */ public class ZookeeperServiceDiscoveryChangeWatcher implements CuratorWatcher { diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkParams.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkParams.java index 3c13fd64788..3e6ad641023 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkParams.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkParams.java @@ -28,7 +28,7 @@ * The enumeration for the parameters of {@link CuratorFramework} * * @see CuratorFramework - * @since 2.7.4 + * @since 2.7.5 */ public enum CuratorFrameworkParams { diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java index e72b87dd68b..3bbf43e29c4 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java @@ -44,7 +44,7 @@ /** * Curator Framework Utilities Class * - * @since 2.7.4 + * @since 2.7.5 */ public abstract class CuratorFrameworkUtils { diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryTest.java b/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryTest.java index 5dd975dbdfe..8767e45217f 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryTest.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryTest.java @@ -45,7 +45,7 @@ /** * {@link ZookeeperServiceDiscovery} Test * - * @since 2.7.4 + * @since 2.7.5 */ public class ZookeeperServiceDiscoveryTest { From b133782e4ef38d2cb154de19b5d085e3fa84f2e9 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Tue, 12 Nov 2019 13:03:42 +0800 Subject: [PATCH 2/3] repackage ServiceConfigBase and ReferenceConfigBase --- .../org/apache/dubbo/config/AbstractReferenceConfig.java | 1 - .../main/java/org/apache/dubbo/config/ProviderConfig.java | 1 - .../dubbo/config/{service => }/ReferenceConfigBase.java | 5 +---- .../dubbo/config/{service => }/ServiceConfigBase.java | 6 +----- .../org/apache/dubbo/config/context/ConfigManager.java | 4 ++-- .../java/org/apache/dubbo/rpc/model/ConsumerModel.java | 2 +- .../java/org/apache/dubbo/rpc/model/ProviderModel.java | 2 +- .../org/apache/dubbo/rpc/model/ServiceRepository.java | 4 ++-- .../java/org/apache/dubbo/config/ReferenceConfig.java | 1 - .../main/java/org/apache/dubbo/config/ServiceConfig.java | 1 - .../org/apache/dubbo/config/bootstrap/DubboBootstrap.java | 2 +- .../dubbo/config/bootstrap/builders/ReferenceBuilder.java | 2 +- .../dubbo/config/bootstrap/builders/ServiceBuilder.java | 2 +- .../apache/dubbo/config/utils/ReferenceConfigCache.java | 2 +- .../src/main/resources/META-INF/compat/dubbo.xsd | 4 ++-- .../src/main/resources/META-INF/dubbo.xsd | 8 ++++---- .../apache/dubbo/qos/command/util/ServiceCheckUtils.java | 4 ++-- 17 files changed, 20 insertions(+), 31 deletions(-) rename dubbo-common/src/main/java/org/apache/dubbo/config/{service => }/ReferenceConfigBase.java (98%) rename dubbo-common/src/main/java/org/apache/dubbo/config/{service => }/ServiceConfigBase.java (98%) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java index 02934c8a010..b33a7e77c98 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java @@ -17,7 +17,6 @@ package org.apache.dubbo.config; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.config.service.ReferenceConfigBase; import org.apache.dubbo.config.support.Parameter; import org.apache.dubbo.rpc.support.ProtocolUtils; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java index fd4ee80715b..8373fffdd56 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ProviderConfig.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.config; -import org.apache.dubbo.config.service.ServiceConfigBase; import org.apache.dubbo.config.support.Parameter; import java.util.ArrayList; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/service/ReferenceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java similarity index 98% rename from dubbo-common/src/main/java/org/apache/dubbo/config/service/ReferenceConfigBase.java rename to dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java index 40efebcb2ed..1eac6233361 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/service/ReferenceConfigBase.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java @@ -14,14 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.config.service; +package org.apache.dubbo.config; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.ClassUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.config.AbstractReferenceConfig; -import org.apache.dubbo.config.ConsumerConfig; -import org.apache.dubbo.config.MethodConfig; import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.support.Parameter; import org.apache.dubbo.rpc.model.ApplicationModel; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/service/ServiceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java similarity index 98% rename from dubbo-common/src/main/java/org/apache/dubbo/config/service/ServiceConfigBase.java rename to dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java index e6b0d8e5cc7..2ab79361f75 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/service/ServiceConfigBase.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java @@ -14,15 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.config.service; +package org.apache.dubbo.config; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.config.AbstractServiceConfig; -import org.apache.dubbo.config.MethodConfig; -import org.apache.dubbo.config.ProtocolConfig; -import org.apache.dubbo.config.ProviderConfig; import org.apache.dubbo.config.annotation.Service; import org.apache.dubbo.config.support.Parameter; import org.apache.dubbo.rpc.model.ApplicationModel; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java index 50d01e64ba5..b7efb4f3e9e 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java @@ -31,10 +31,10 @@ import org.apache.dubbo.config.MonitorConfig; import org.apache.dubbo.config.ProtocolConfig; import org.apache.dubbo.config.ProviderConfig; +import org.apache.dubbo.config.ReferenceConfigBase; import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfigBase; import org.apache.dubbo.config.SslConfig; -import org.apache.dubbo.config.service.ReferenceConfigBase; -import org.apache.dubbo.config.service.ServiceConfigBase; import org.apache.dubbo.rpc.model.ApplicationModel; import java.util.Collection; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java index 4f0faef99e1..894b7837775 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java @@ -18,7 +18,7 @@ import org.apache.dubbo.common.utils.Assert; import org.apache.dubbo.common.utils.CollectionUtils; -import org.apache.dubbo.config.service.ReferenceConfigBase; +import org.apache.dubbo.config.ReferenceConfigBase; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java index 3af524ddb9d..39b9b08527a 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java @@ -17,7 +17,7 @@ package org.apache.dubbo.rpc.model; import org.apache.dubbo.common.URL; -import org.apache.dubbo.config.service.ServiceConfigBase; +import org.apache.dubbo.config.ServiceConfigBase; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java index c134108dde1..a674ef253ca 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java @@ -20,8 +20,8 @@ import org.apache.dubbo.common.context.LifecycleAdapter; import org.apache.dubbo.common.extension.ExtensionLoader; import org.apache.dubbo.common.utils.CollectionUtils; -import org.apache.dubbo.config.service.ReferenceConfigBase; -import org.apache.dubbo.config.service.ServiceConfigBase; +import org.apache.dubbo.config.ReferenceConfigBase; +import org.apache.dubbo.config.ServiceConfigBase; import java.util.ArrayList; import java.util.Collections; 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 5c287ccc641..8af20e3f432 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 @@ -30,7 +30,6 @@ import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.bootstrap.DubboBootstrap; import org.apache.dubbo.config.event.ReferenceConfigDestroyedEvent; -import org.apache.dubbo.config.service.ReferenceConfigBase; import org.apache.dubbo.config.utils.ConfigValidationUtils; import org.apache.dubbo.event.Event; import org.apache.dubbo.event.EventDispatcher; 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 bf21cd9cb84..f6f5cf87b96 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 @@ -32,7 +32,6 @@ import org.apache.dubbo.config.bootstrap.DubboBootstrap; import org.apache.dubbo.config.event.ServiceConfigExportedEvent; import org.apache.dubbo.config.invoker.DelegateProviderMetaDataInvoker; -import org.apache.dubbo.config.service.ServiceConfigBase; import org.apache.dubbo.config.support.Parameter; import org.apache.dubbo.config.utils.ConfigValidationUtils; import org.apache.dubbo.event.Event; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java index 7ac5efbfd3f..a404b9804ba 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java @@ -42,6 +42,7 @@ import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.config.ServiceConfigBase; import org.apache.dubbo.config.SslConfig; import org.apache.dubbo.config.bootstrap.builders.ApplicationBuilder; import org.apache.dubbo.config.bootstrap.builders.ConsumerBuilder; @@ -52,7 +53,6 @@ import org.apache.dubbo.config.bootstrap.builders.ServiceBuilder; import org.apache.dubbo.config.context.ConfigManager; import org.apache.dubbo.config.metadata.ConfigurableMetadataServiceExporter; -import org.apache.dubbo.config.service.ServiceConfigBase; import org.apache.dubbo.config.utils.ConfigValidationUtils; import org.apache.dubbo.config.utils.ReferenceConfigCache; import org.apache.dubbo.event.EventDispatcher; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ReferenceBuilder.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ReferenceBuilder.java index 0984595ffa3..69e798433bd 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ReferenceBuilder.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ReferenceBuilder.java @@ -19,7 +19,7 @@ import org.apache.dubbo.config.ConsumerConfig; import org.apache.dubbo.config.MethodConfig; import org.apache.dubbo.config.ReferenceConfig; -import org.apache.dubbo.config.service.ReferenceConfigBase; +import org.apache.dubbo.config.ReferenceConfigBase; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilder.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilder.java index 3b947a69c46..b7df8a43ace 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilder.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/ServiceBuilder.java @@ -19,7 +19,7 @@ import org.apache.dubbo.config.MethodConfig; import org.apache.dubbo.config.ProviderConfig; import org.apache.dubbo.config.ServiceConfig; -import org.apache.dubbo.config.service.ServiceConfigBase; +import org.apache.dubbo.config.ServiceConfigBase; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java index b2a8fdab6cc..dc82c5b7181 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java @@ -18,7 +18,7 @@ import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.config.service.ReferenceConfigBase; +import org.apache.dubbo.config.ReferenceConfigBase; import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.service.Destroyable; diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd index b12ee2e56d8..5736f920571 100644 --- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd +++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd @@ -1474,7 +1474,7 @@ - + @@ -1485,7 +1485,7 @@ - + diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd index 534a63aebb1..facc4234798 100644 --- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd +++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd @@ -1388,8 +1388,8 @@ - - + + @@ -1499,7 +1499,7 @@ - + @@ -1510,7 +1510,7 @@ - + diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java index 7c7381ce6ac..fbee463120f 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/ServiceCheckUtils.java @@ -20,9 +20,9 @@ import org.apache.dubbo.common.extension.ExtensionLoader; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ReferenceConfigBase; import org.apache.dubbo.config.RegistryConfig; -import org.apache.dubbo.config.service.ReferenceConfigBase; -import org.apache.dubbo.config.service.ServiceConfigBase; +import org.apache.dubbo.config.ServiceConfigBase; import org.apache.dubbo.registry.Registry; import org.apache.dubbo.registry.support.AbstractRegistry; import org.apache.dubbo.rpc.model.ConsumerModel; From 8be772625d4f8eb18bfd5fa6d2bb2f0accd52270 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Tue, 12 Nov 2019 13:05:26 +0800 Subject: [PATCH 3/3] fix potential NPE before mock check. --- .../dubbo/config/utils/ConfigValidationUtils.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java index 1be05d41b63..b23634f36d1 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java @@ -490,12 +490,14 @@ public static void validateMethodConfig(MethodConfig config) { checkMethodName("name", config.getName()); String mock = config.getMock(); - if (mock.startsWith(RETURN_PREFIX) || mock.startsWith(THROW_PREFIX + " ")) { - checkLength(MOCK_KEY, mock); - } else if (mock.startsWith(FAIL_PREFIX) || mock.startsWith(FORCE_PREFIX)) { - checkNameHasSymbol(MOCK_KEY, mock); - } else { - checkName(MOCK_KEY, mock); + if (StringUtils.isNotEmpty(mock)) { + if (mock.startsWith(RETURN_PREFIX) || mock.startsWith(THROW_PREFIX + " ")) { + checkLength(MOCK_KEY, mock); + } else if (mock.startsWith(FAIL_PREFIX) || mock.startsWith(FORCE_PREFIX)) { + checkNameHasSymbol(MOCK_KEY, mock); + } else { + checkName(MOCK_KEY, mock); + } } }