natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish apache/dubbo#4508 : [Version] Update the version of cloud native features to be 2.7.4 (#4509)

This commit is contained in:
Mercy Ma 2019-07-09 18:24:42 +08:00 committed by GitHub
parent 5008e0f2ac
commit c3caf8f4d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
121 changed files with 157 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dubbo-all/pom.xml
View File

@ -500,7 +500,7 @@
<optional>true</optional>
</dependency>
<!-- 2.7.3 new modules -->
<!-- 2.7.4 new modules -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-event</artifactId>
@ -765,7 +765,7 @@
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
</resource>
</transformer>
<!-- @since 2.7.3 -->
<!-- @since 2.7.4 -->
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.event.EventDispatcher
</resource>

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/AbstractSettings.java
View File

@ -19,7 +19,7 @@ package org.apache.dubbo.bootstrap;
/**
* Abstract {@link Settings}
*
* @since 2.7.3
* @since 2.7.4
*/
public class AbstractSettings implements Settings {

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/ApplicationSettings.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
/**
* {@link ApplicationConfig Application} settings
*
* @since 2.7.3
* @since 2.7.4
*/
public class ApplicationSettings extends AbstractSettings {

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
View File

@ -79,7 +79,7 @@ import static org.apache.dubbo.registry.support.AbstractRegistryFactory.getRegis
/**
* The bootstrap class of Dubbo
*
* @since 2.7.3
* @since 2.7.4
*/
public class DubboBootstrap {

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/ProtocolSettings.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
* The settings of {@link ProtocolConfig protcol}
*
* @see ProtocolBuilder
* @since 2.7.3
* @since 2.7.4
*/
public class ProtocolSettings extends AbstractSettings {

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/ReferenceSettings.java
View File

@ -33,7 +33,7 @@ import java.util.Map;
/**
* The settings of {@link ReferenceConfig}
*
* @since 2.7.3
* @since 2.7.4
*/
public class ReferenceSettings<S> extends AbstractSettings {

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/RegistrySettings.java
View File

@ -24,7 +24,7 @@ import java.util.Map;
/**
* The settings of {@link RegistryConfig}
*
* @since 2.7.3
* @since 2.7.4
*/
public class RegistrySettings extends AbstractSettings {

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/ServiceSettings.java
View File

@ -34,7 +34,7 @@ import java.util.Map;
/**
* The settings of {@link ServiceConfig Dubbo service}
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceSettings<S> extends AbstractSettings {

2
dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/Settings.java
View File

@ -19,7 +19,7 @@ package org.apache.dubbo.bootstrap;
/**
* The Dubbo settings
*
* @since 2.7.3
* @since 2.7.4
*/
public interface Settings {

2
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboBootstrapTest.java
View File

@ -28,7 +28,7 @@ import java.io.IOException;
/**
* {@link DubboBootstrap} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class DubboBootstrapTest {

2
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
View File

@ -23,7 +23,7 @@ import org.apache.dubbo.config.builders.RegistryBuilder;
/**
* Dubbo Provider Bootstrap
*
* @since 2.7.3
* @since 2.7.4
*/
public class DubboServiceConsumerBootstrap {

2
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
View File

@ -27,7 +27,7 @@ import java.io.IOException;
/**
* Dubbo Provider Bootstrap
*
* @since 2.7.3
* @since 2.7.4
*/
public class DubboServiceProviderBootstrap {

2
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EchoService.java
View File

@ -19,7 +19,7 @@ package org.apache.dubbo.bootstrap;
/**
* Echo Service
*
* @since 2.7.3
* @since 2.7.4
*/
public interface EchoService {

2
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/EchoServiceImpl.java
View File

@ -24,7 +24,7 @@ import static java.lang.String.format;
* The implementation of {@link EchoService}
*
* @see EchoService
* @since 2.7.3
* @since 2.7.4
*/
public class EchoServiceImpl implements EchoService {

8
dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/DynamicConfiguration.java
View File

@ -141,7 +141,7 @@ public interface DynamicConfiguration extends Configuration {
* @param content the content of configuration
* @return <code>true</code> if success, or <code>false</code>
* @throws UnsupportedOperationException If the under layer does not support
* @since 2.7.3
* @since 2.7.4
*/
default boolean publishConfig(String key, String group, String content) throws UnsupportedOperationException {
throw new UnsupportedOperationException("No support");
@ -153,7 +153,7 @@ public interface DynamicConfiguration extends Configuration {
* @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.3
* @since 2.7.4
*/
default SortedSet<String> getConfigKeys(String group) throws UnsupportedOperationException {
throw new UnsupportedOperationException("No support");
@ -165,7 +165,7 @@ public interface DynamicConfiguration extends Configuration {
* @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.3
* @since 2.7.4
*/
default SortedMap<String, String> getConfigs(String group) throws UnsupportedOperationException {
return getConfigs(group, -1);
@ -179,7 +179,7 @@ public interface DynamicConfiguration extends Configuration {
* @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.3
* @since 2.7.4
*/
default SortedMap<String, String> getConfigs(String group, long timeout) throws UnsupportedOperationException,
IllegalStateException {

8
dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java
View File

@ -24,10 +24,6 @@ import java.util.SortedSet;
import static java.util.Collections.emptySortedSet;
import java.util.SortedSet;
import static java.util.Collections.emptySortedSet;
/**
* The default extension of {@link DynamicConfiguration}. If user does not specify a config centre, or specifies one
* that is not a valid extension, it will default to this one.
@ -64,7 +60,7 @@ public class NopDynamicConfiguration implements DynamicConfiguration {
}
/**
* @since 2.7.3
* @since 2.7.4
*/
@Override
public boolean publishConfig(String key, String group, String content) {
@ -72,7 +68,7 @@ public class NopDynamicConfiguration implements DynamicConfiguration {
}
/**
* @since 2.7.3
* @since 2.7.4
*/
@Override
public SortedSet<String> getConfigKeys(String group) {

8
dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java
View File

@ -56,21 +56,21 @@ public interface RegistryConstants {
/**
* The parameter key of Dubbo Registry type
*
* @since 2.7.3
* @since 2.7.4
*/
String REGISTRY_TYPE_KEY = "registry-type";
/**
* The parameter value of Service-Oriented Registry type
*
* @since 2.7.3
* @since 2.7.4
*/
String SERVICE_REGISTRY_TYPE = "service";
/**
* The parameter key of the subscribed service names for Service-Oriented Registry
*
* @since 2.7.3
* @since 2.7.4
*/
String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed-services";
@ -78,7 +78,7 @@ public interface RegistryConstants {
/**
* The request size of service instances
*
* @since 2.7.3
* @since 2.7.4
*/
String INSTANCES_REQUEST_SIZE_KEY = "instances-request-size";

2
dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableConsumer.java
View File

@ -25,7 +25,7 @@ import java.util.function.Function;
* @param <T> the source type
* @see Function
* @see Throwable
* @since 2.7.3
* @since 2.7.4
*/
@FunctionalInterface
public interface ThrowableConsumer<T> {

2
dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableFunction.java
View File

@ -25,7 +25,7 @@ import java.util.function.Function;
* @param <R> the return type
* @see Function
* @see Throwable
* @since 2.7.3
* @since 2.7.4
*/
@FunctionalInterface
public interface ThrowableFunction<T, R> {

2
dubbo-common/src/main/java/org/apache/dubbo/common/utils/DefaultPage.java
View File

@ -22,7 +22,7 @@ import java.util.List;
/**
* The default implementation of {@link Page}
*
* @since 2.7.3
* @since 2.7.4
*/
public class DefaultPage<T> implements Page<T>, Serializable {

2
dubbo-common/src/main/java/org/apache/dubbo/common/utils/Page.java
View File

@ -21,7 +21,7 @@ import java.util.List;
/**
* The model class of pagination
*
* @since 2.7.3
* @since 2.7.4
*/
public interface Page<T> {

4
dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java
View File

@ -1133,7 +1133,7 @@ public final class ReflectUtils {
*
* @param sourceClass the source {@link Class class}
* @return non-null read-only {@link Set}
* @since 2.7.3
* @since 2.7.4
*/
public static Set<ParameterizedType> findParameterizedTypes(Class<?> sourceClass) {
// Add Generic Interfaces
@ -1166,7 +1166,7 @@ public final class ReflectUtils {
* @param matchType the type to match
* @param <T> the type to match
* @return non-null read-only {@link Set}
* @since 2.7.3
* @since 2.7.4
*/
public static <T> Set<Class<T>> findHierarchicalTypes(Class<?> sourceClass, Class<T> matchType) {
if (sourceClass == null) {

2
dubbo-common/src/test/java/org/apache/dubbo/common/utils/DefaultPageTest.java
View File

@ -25,7 +25,7 @@ import static java.util.Arrays.asList;
/**
* {@link DefaultPage}
*
* @since 2.7.3
* @since 2.7.4
*/
public class DefaultPageTest {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
View File

@ -93,7 +93,7 @@ public class DubboShutdownHook extends Thread {
AbstractRegistryFactory.destroyAll();
// destroy all the protocols
destroyProtocols();
// dispatch the DubboDestroyedEvent @since 2.7.3
// dispatch the DubboDestroyedEvent @since 2.7.4
eventDispatcher.dispatch(new DubboServiceDestroyedEvent(this));
}

8
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
View File

@ -181,7 +181,7 @@ public class ReferenceConfig<T> extends AbstractReferenceConfig {
/**
* The {@link EventDispatcher}
*
* @since 2.7.3
* @since 2.7.4
*/
private final EventDispatcher eventDispatcher = EventDispatcher.getDefaultExtension();
@ -280,7 +280,7 @@ public class ReferenceConfig<T> extends AbstractReferenceConfig {
invoker = null;
ref = null;
// dispatch a ReferenceConfigDestroyedEvent since 2.7.3
// dispatch a ReferenceConfigDestroyedEvent since 2.7.4
dispatch(new ReferenceConfigDestroyedEvent(this));
}
@ -348,7 +348,7 @@ public class ReferenceConfig<T> extends AbstractReferenceConfig {
initialized = true;
// dispatch a ReferenceConfigInitializedEvent since 2.7.3
// dispatch a ReferenceConfigInitializedEvent since 2.7.4
dispatch(new ReferenceConfigInitializedEvent(this, invoker));
}
@ -686,7 +686,7 @@ public class ReferenceConfig<T> extends AbstractReferenceConfig {
* Dispatch an {@link Event event}
*
* @param event an {@link Event event}
* @since 2.7.3
* @since 2.7.4
*/
protected void dispatch(Event event) {
eventDispatcher.dispatch(event);

8
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
View File

@ -200,7 +200,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
private volatile String generic;
/**
* @since 2.7.3
* @since 2.7.4
*/
private final EventDispatcher eventDispatcher = EventDispatcher.getDefaultExtension();
@ -423,7 +423,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
doExportUrls();
// dispatch a ServiceConfigExportedEvent since 2.7.3
// dispatch a ServiceConfigExportedEvent since 2.7.4
dispatch(new ServiceConfigExportedEvent(this));
}
@ -458,7 +458,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
unexported = true;
// dispatch a ServiceConfigUnExportedEvent since 2.7.3
// dispatch a ServiceConfigUnExportedEvent since 2.7.4
dispatch(new ServiceConfigUnexportedEvent(this));
}
@ -1056,7 +1056,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
* Dispatch an {@link Event event}
*
* @param event an {@link Event event}
* @since 2.7.3
* @since 2.7.4
*/
protected void dispatch(Event event) {
eventDispatcher.dispatch(event);

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/DubboServiceDestroyedEvent.java
View File

@ -22,7 +22,7 @@ import org.apache.dubbo.event.Event;
* An {@link Event Dubbo event} when the Dubbo service is about to be destroyed.
*
* @see Event
* @since 2.7.3
* @since 2.7.4
*/
public class DubboServiceDestroyedEvent extends Event {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigDestroyedEvent.java
View File

@ -26,7 +26,7 @@ import org.apache.dubbo.event.Event;
* @see Reference
* @see ReferenceConfig#destroy()
* @see Event
* @since 2.7.3
* @since 2.7.4
*/
public class ReferenceConfigDestroyedEvent extends Event {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ReferenceConfigInitializedEvent.java
View File

@ -27,7 +27,7 @@ import org.apache.dubbo.rpc.Invoker;
* @see Reference
* @see ReferenceConfig#get()
* @see Event
* @since 2.7.3
* @since 2.7.4
*/
public class ReferenceConfigInitializedEvent extends Event {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigExportedEvent.java
View File

@ -22,7 +22,7 @@ import org.apache.dubbo.event.Event;
/**
* {@link ServiceConfig} event post-{@link ServiceConfig#export() export}
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceConfigExportedEvent extends Event {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/ServiceConfigUnexportedEvent.java
View File

@ -22,7 +22,7 @@ import org.apache.dubbo.event.Event;
/**
* {@link ServiceConfig} event post-{@link ServiceConfig#unexport() unexport}
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceConfigUnexportedEvent extends Event {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/LoggingEventListener.java
View File

@ -29,7 +29,7 @@ import static java.lang.String.format;
* A listener for logging the {@link Event Dubbo event}
*
* @see ServiceConfigExportedEvent
* @since 2.7.3
* @since 2.7.4
*/
public class LoggingEventListener extends GenericEventListener {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java
View File

@ -34,7 +34,7 @@ import static org.apache.dubbo.metadata.ServiceNameMapping.getDefaultExtension;
*
* @see ServiceNameMapping
* @see ServiceConfig#getExportedUrls()
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceNameMappingListener implements EventListener<ServiceConfigExportedEvent> {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
View File

@ -46,7 +46,7 @@ import static java.util.Collections.unmodifiableList;
* @see MetadataServiceExporter
* @see ServiceConfig
* @see ConfigManager
* @since 2.7.3
* @since 2.7.4
*/
public class ConfigurableMetadataServiceExporter implements MetadataServiceExporter {

2
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ServiceInstancePortCustomizer.java
View File

@ -24,7 +24,7 @@ import org.apache.dubbo.registry.client.ServiceInstanceCustomizer;
/**
* The {@link ServiceInstanceCustomizer} to customize the {@link ServiceInstance#getPort() port} of service instance.
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceInstancePortCustomizer implements ServiceInstanceCustomizer {

2
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/DubboConsumerBootstrap.java
View File

@ -23,7 +23,7 @@ import java.io.IOException;
/**
* Dubbo Consumer Bootstrap
*
* @since 2.7.3
* @since 2.7.4
*/
public class DubboConsumerBootstrap {

2
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListenerTest.java
View File

@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
/**
* {@link ServiceNameMappingListener} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceNameMappingListenerTest {

2
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporterTest.java
View File

@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* {@link ConfigurableMetadataServiceExporter} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class ConfigurableMetadataServiceExporterTest {

2
dubbo-configcenter/dubbo-configcenter-api/src/test/java/org/apache/dubbo/configcenter/support/nop/NopDynamicConfigurationTest.java
View File

@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* {@link NopDynamicConfiguration} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class NopDynamicConfigurationTest {

2
dubbo-dependencies-bom/pom.xml
View File

@ -153,7 +153,7 @@
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
<revision>2.7.3-SNAPSHOT</revision>
<revision>2.7.4-SNAPSHOT</revision>
</properties>
<dependencyManagement>

2
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
View File

@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
<revision>2.7.3-SNAPSHOT</revision>
<revision>2.7.4-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
</properties>

2
dubbo-event/src/main/java/org/apache/dubbo/event/AbstractEventDispatcher.java
View File

@ -39,7 +39,7 @@ import static org.apache.dubbo.event.EventListener.findEventType;
* @see ServiceLoader
* @see EventListener
* @see Event
* @since 2.7.3
* @since 2.7.4
*/
public abstract class AbstractEventDispatcher implements EventDispatcher {

2
dubbo-event/src/main/java/org/apache/dubbo/event/DirectEventDispatcher.java
View File

@ -20,7 +20,7 @@ package org.apache.dubbo.event;
* Direct {@link EventDispatcher} implementation uses current thread execution model
*
* @see EventDispatcher
* @since 2.7.3
* @since 2.7.4
*/
public final class DirectEventDispatcher extends AbstractEventDispatcher {

2
dubbo-event/src/main/java/org/apache/dubbo/event/Event.java
View File

@ -21,7 +21,7 @@ import java.util.EventObject;
/**
* An event object of Dubbo is based on the Java standard {@link EventObject event}
*
* @since 2.7.3
* @since 2.7.4
*/
public abstract class Event extends EventObject {

2
dubbo-event/src/main/java/org/apache/dubbo/event/EventDispatcher.java
View File

@ -27,7 +27,7 @@ import java.util.concurrent.Executor;
* @see Event
* @see EventListener
* @see DirectEventDispatcher
* @since 2.7.3
* @since 2.7.4
*/
@SPI("direct")
public interface EventDispatcher extends Listenable<EventListener<?>> {

2
dubbo-event/src/main/java/org/apache/dubbo/event/EventListener.java
View File

@ -33,7 +33,7 @@ import static org.apache.dubbo.common.utils.ReflectUtils.findParameterizedTypes;
* @param <E> the concrete class of {@link Event Dubbo Event}
* @see Event
* @see java.util.EventListener
* @since 2.7.3
* @since 2.7.4
*/
@FunctionalInterface
public interface EventListener<E extends Event> extends java.util.EventListener, Comparable<EventListener<E>> {

2
dubbo-event/src/main/java/org/apache/dubbo/event/GenericEvent.java
View File

@ -20,7 +20,7 @@ package org.apache.dubbo.event;
* Generic {@link Event Dubbo event}
*
* @param <S> the type of event source
* @since 2.7.3
* @since 2.7.4
*/
public class GenericEvent<S> extends Event {

2
dubbo-event/src/main/java/org/apache/dubbo/event/GenericEventListener.java
View File

@ -44,7 +44,7 @@ import static org.apache.dubbo.common.function.ThrowableFunction.execute;
*
* @see Event
* @see EventListener
* @since 2.7.3
* @since 2.7.4
*/
public abstract class GenericEventListener implements EventListener<Event> {

2
dubbo-event/src/main/java/org/apache/dubbo/event/Listenable.java
View File

@ -27,7 +27,7 @@ import static java.util.stream.StreamSupport.stream;
* Dubbo Event Listenable
*
* @see EventDispatcher
* @since 2.7.3
* @since 2.7.4
*/
public interface Listenable<E extends EventListener<?>> {

2
dubbo-event/src/main/java/org/apache/dubbo/event/ParallelEventDispatcher.java
View File

@ -22,7 +22,7 @@ import java.util.concurrent.ForkJoinPool;
* Parallel {@link EventDispatcher} implementation uses {@link ForkJoinPool#commonPool() JDK common thread pool}
*
* @see ForkJoinPool#commonPool()
* @since 2.7.3
* @since 2.7.4
*/
public class ParallelEventDispatcher extends AbstractEventDispatcher {

2
dubbo-event/src/test/java/org/apache/dubbo/event/DirectEventDispatcherTest.java
View File

@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* {@link DirectEventDispatcher} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class DirectEventDispatcherTest {

2
dubbo-event/src/test/java/org/apache/dubbo/event/EchoEvent.java
View File

@ -19,7 +19,7 @@ package org.apache.dubbo.event;
/**
* Echo {@link Event}
*
* @since 2.7.3
* @since 2.7.4
*/
class EchoEvent extends Event {

2
dubbo-event/src/test/java/org/apache/dubbo/event/EchoEventListener.java
View File

@ -21,7 +21,7 @@ import java.io.Serializable;
/**
* {@link EchoEvent} {@link EventListener}
*
* @since 2.7.3
* @since 2.7.4
*/
public class EchoEventListener extends AbstractEventListener<EchoEvent> implements Serializable {

2
dubbo-event/src/test/java/org/apache/dubbo/event/EchoEventListener2.java
View File

@ -23,7 +23,7 @@ import java.util.Vector;
/**
* {@link EchoEvent} {@link EventListener} 2
*
* @since 2.7.3
* @since 2.7.4
*/
public class EchoEventListener2 extends Vector<EventListener<Event>> implements Serializable, Comparable<EventListener<Event>>,
EventListener<Event> {

2
dubbo-event/src/test/java/org/apache/dubbo/event/EventDispatcherTest.java
View File

@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* {@link EventDispatcher} Test
*
* @see DirectEventDispatcher
* @since 2.7.3
* @since 2.7.4
*/
public class EventDispatcherTest {

2
dubbo-event/src/test/java/org/apache/dubbo/event/EventListenerTest.java
View File

@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* {@link EventListener} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class EventListenerTest {

2
dubbo-event/src/test/java/org/apache/dubbo/event/GenericEventListenerTest.java
View File

@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* {@link GenericEventListener} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class GenericEventListenerTest {

2
dubbo-event/src/test/java/org/apache/dubbo/event/GenericEventTest.java
View File

@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* {@link GenericEvent} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class GenericEventTest {

2
dubbo-event/src/test/java/org/apache/dubbo/event/ParallelEventDispatcherTest.java
View File

@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* {@link ParallelEventDispatcher} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class ParallelEventDispatcherTest {

2
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataService.java
View File

@ -33,7 +33,7 @@ import static java.util.stream.StreamSupport.stream;
* also providers the fine-grain methods for the precise queries.
*
* @see WritableMetadataService
* @since 2.7.3
* @since 2.7.4
*/
public interface MetadataService {

2
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
View File

@ -26,7 +26,7 @@ import java.util.List;
* @see MetadataService
* @see #export()
* @see #unexport()
* @since 2.7.3
* @since 2.7.4
*/
public interface MetadataServiceExporter {

2
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java
View File

@ -25,7 +25,7 @@ import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoad
/**
* The interface for Dubbo service name Mapping
*
* @since 2.7.3
* @since 2.7.4
*/
@SPI("default")
public interface ServiceNameMapping {

2
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
View File

@ -28,7 +28,7 @@ import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoad
* Local {@link MetadataService} that extends {@link MetadataService} and provides the modification, which is used for
* Dubbo's consumers and providers.
*
* @since 2.7.3
* @since 2.7.4
*/
@SPI("local")
public interface WritableMetadataService extends MetadataService {

2
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/InMemoryWritableMetadataService.java
View File

@ -51,7 +51,7 @@ import static org.apache.dubbo.common.utils.CollectionUtils.isEmpty;
*
* @see MetadataService
* @see WritableMetadataService
* @since 2.7.3
* @since 2.7.4
*/
public class InMemoryWritableMetadataService implements WritableMetadataService {

2
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/DynamicConfigurationServiceNameMappingTest.java
View File

@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* {@link DynamicConfigurationServiceNameMapping} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class DynamicConfigurationServiceNameMappingTest {

2
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/InMemoryWritableMetadataServiceTest.java
View File

@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* {@link InMemoryWritableMetadataService} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class InMemoryWritableMetadataServiceTest {

2
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/LocalMetadataServiceTest.java
View File

@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* {@link WritableMetadataService} Test
*
* @since 2.7.3
* @since 2.7.4
*/
public class LocalMetadataServiceTest {

9
dubbo-monitor/dubbo-monitor-default/pom.xml
View File

@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.dubbo</groupId>
@ -64,5 +65,11 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
View File

@ -23,7 +23,7 @@ import java.util.Objects;
/**
* The default implementation of {@link ServiceInstance}.
*
* @since 2.7.3
* @since 2.7.4
*/
public class DefaultServiceInstance implements ServiceInstance {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/EventPublishingServiceDiscovery.java
View File

@ -102,7 +102,7 @@ import static java.util.Optional.of;
* @see ServiceInstanceRegisteredEvent
* @see ServiceDiscoveryStoppingEvent
* @see ServiceDiscoveryStoppedEvent
* @since 2.7.3
* @since 2.7.4
*/
class EventPublishingServiceDiscovery implements ServiceDiscovery {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/EventPublishingServiceDiscoveryFactory.java
View File

@ -27,7 +27,7 @@ import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoad
* @see ServiceDiscoveryFactory
* @see EventPublishingServiceDiscovery
* @see ServiceDiscovery
* @since 2.7.3
* @since 2.7.4
*/
public class EventPublishingServiceDiscoveryFactory implements ServiceDiscoveryFactory {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscovery.java
View File

@ -31,7 +31,7 @@ import static java.util.Collections.unmodifiableMap;
/**
* The common operations of Service Discovery
*
* @since 2.7.3
* @since 2.7.4
*/
public interface ServiceDiscovery {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryFactory.java
View File

@ -25,7 +25,7 @@ import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoad
* The Factory interface to create an instance of {@link ServiceDiscovery}
*
* @see ServiceDiscovery
* @since 2.7.3
* @since 2.7.4
*/
@SPI("event-publishing")
public interface ServiceDiscoveryFactory {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstance.java
View File

@ -33,7 +33,7 @@ import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
* The model class of an instance of a service, which is used for service registration and discovery.
* <p>
*
* @since 2.7.3
* @since 2.7.4
*/
public interface ServiceInstance {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceCustomizer.java
View File

@ -25,7 +25,7 @@ import org.apache.dubbo.registry.client.event.listener.CustomizableServiceInstan
* @see CustomizableServiceInstanceListener
* @see ServiceInstancePreRegisteredEvent
* @see ServiceInstance#getMetadata()
* @since 2.7.3
* @since 2.7.4
*/
public interface ServiceInstanceCustomizer {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceMetadataCustomizer.java
View File

@ -25,7 +25,7 @@ import static org.apache.dubbo.common.utils.StringUtils.isBlank;
*
* @see ServiceInstance#getMetadata()
* @see ServiceInstanceCustomizer
* @since 2.7.3
* @since 2.7.4
*/
public abstract class ServiceInstanceMetadataCustomizer implements ServiceInstanceCustomizer {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryStartedEvent.java
View File

@ -23,7 +23,7 @@ import org.apache.dubbo.registry.client.ServiceDiscovery;
* An event raised after the {@link ServiceDiscovery Service Discovery} started
*
* @see ServiceDiscovery#start()
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceDiscoveryStartedEvent extends Event {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryStartingEvent.java
View File

@ -23,7 +23,7 @@ import org.apache.dubbo.registry.client.ServiceDiscovery;
* An event raised when the {@link ServiceDiscovery Service Discovery} is starting.
*
* @see ServiceDiscovery#start
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceDiscoveryStartingEvent extends Event {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryStoppedEvent.java
View File

@ -23,7 +23,7 @@ import org.apache.dubbo.registry.client.ServiceDiscovery;
* An event raised after the {@link ServiceDiscovery Service Discovery} stopped.
*
* @see ServiceDiscovery#stop()
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceDiscoveryStoppedEvent extends Event {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceDiscoveryStoppingEvent.java
View File

@ -23,7 +23,7 @@ import org.apache.dubbo.registry.client.ServiceDiscovery;
* An event raised when the {@link ServiceDiscovery Service Discovery} is stopping.
*
* @see ServiceDiscovery#stop()
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceDiscoveryStoppingEvent extends Event {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceEvent.java
View File

@ -22,7 +22,7 @@ import org.apache.dubbo.registry.client.ServiceInstance;
/**
* The {@link Event Dubbo event} for {@link ServiceInstance an service instance}
*
* @since 2.7.3
* @since 2.7.4
*/
public abstract class ServiceInstanceEvent extends Event {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreRegisteredEvent.java
View File

@ -24,7 +24,7 @@ import org.apache.dubbo.registry.client.ServiceInstance;
* An event raised before a {@link ServiceInstance service instance}
* {@link ServiceDiscovery#register(ServiceInstance) registered}
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceInstancePreRegisteredEvent extends ServiceInstanceEvent {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancePreUnregisteredEvent.java
View File

@ -24,7 +24,7 @@ import org.apache.dubbo.registry.client.ServiceInstance;
* An event raised before a {@link ServiceInstance service instance}
* {@link ServiceDiscovery#unregister(ServiceInstance) unregistered}
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceInstancePreUnregisteredEvent extends ServiceInstanceEvent {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceRegisteredEvent.java
View File

@ -24,7 +24,7 @@ import org.apache.dubbo.registry.client.ServiceInstance;
* An event raised after a {@link ServiceInstance service instance}
* {@link ServiceDiscovery#register(ServiceInstance) registered}
*
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceInstanceRegisteredEvent extends ServiceInstanceEvent {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstanceUnregisteredEvent.java
View File

@ -25,7 +25,7 @@ import org.apache.dubbo.registry.client.ServiceInstance;
* {@link ServiceDiscovery#unregister(ServiceInstance) unregistered}
*
* @see ServiceInstanceEvent
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceInstanceUnregisteredEvent extends ServiceInstanceEvent {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/ServiceInstancesChangedEvent.java
View File

@ -28,7 +28,7 @@ import static java.util.Collections.unmodifiableCollection;
* An event raised after the {@link ServiceInstance instances} of one service has been changed.
*
* @see ServiceInstancesChangedListener
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceInstancesChangedEvent extends Event {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java
View File

@ -34,7 +34,7 @@ import static java.util.ServiceLoader.load;
* @see EventListener
* @see ServiceInstancePreRegisteredEvent
* @see ServiceInstanceCustomizer
* @since 2.7.3
* @since 2.7.4
*/
public class CustomizableServiceInstanceListener implements EventListener<ServiceInstancePreRegisteredEvent> {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/LoggingEventListener.java
View File

@ -35,7 +35,7 @@ import static java.lang.String.format;
/**
* A listener for logging the {@link Event Dubbo event}
*
* @since 2.7.3
* @since 2.7.4
*/
public class LoggingEventListener extends GenericEventListener {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
View File

@ -23,7 +23,7 @@ import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent;
* The Service Discovery Changed {@link EventListener Event Listener}
*
* @see ServiceInstancesChangedEvent
* @since 2.7.3
* @since 2.7.4
*/
public interface ServiceInstancesChangedListener extends EventListener<ServiceInstancesChangedEvent> {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/DefaultMetadataServiceProxyFactory.java
View File

@ -25,7 +25,7 @@ import java.lang.reflect.Proxy;
/**
* The factory of {@link MetadataService}'s {@link Proxy}
*
* @since 2.7.3
* @since 2.7.4
*/
public class DefaultMetadataServiceProxyFactory implements MetadataServiceProxyFactory {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ExportedServicesRevisionMetadataCustomizer.java
View File

@ -36,7 +36,7 @@ import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
* <p>
* The reversion is calculated on the methods that all Dubbo exported interfaces declare
*
* @since 2.7.3
* @since 2.7.4
*/
public class ExportedServicesRevisionMetadataCustomizer extends ServiceInstanceMetadataCustomizer {

12
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceProxy.java
View File

@ -38,7 +38,7 @@ import static org.apache.dubbo.registry.client.metadata.MetadataServiceURLBuilde
*
* @see ServiceInstance
* @see MetadataService
* @since 2.7.3
* @since 2.7.4
*/
class MetadataServiceProxy implements MetadataService {
@ -73,6 +73,16 @@ class MetadataServiceProxy implements MetadataService {
metadataService.getExportedURLs(serviceInterface, group, version, protocol));
}
@Override
public String getServiceDefinition(String interfaceName, String version, String group) {
return null;
}
@Override
public String getServiceDefinition(String serviceKey) {
return null;
}
protected <T> T doInMetadataService(Function<MetadataService, T> callback) {
T result = null; // execution result

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceProxyFactory.java
View File

@ -27,7 +27,7 @@ import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoad
*
* @see ServiceInstance
* @see MetadataService
* @since 2.7.3
* @since 2.7.4
*/
@SPI("default")
public interface MetadataServiceProxyFactory {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLBuilder.java
View File

@ -34,7 +34,7 @@ import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
* The {@link URL} builder for {@link MetadataService}
*
* @see MetadataService
* @since 2.7.3
* @since 2.7.4
*/
class MetadataServiceURLBuilder {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceURLParamsMetadataCustomizer.java
View File

@ -33,7 +33,7 @@ import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
* into {@link ServiceInstance#getMetadata() the service instances' metadata}
*
* @see ServiceInstanceMetadataCustomizer
* @since 2.7.3
* @since 2.7.4
*/
public class MetadataServiceURLParamsMetadataCustomizer extends ServiceInstanceMetadataCustomizer {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
View File

@ -38,7 +38,7 @@ import static org.apache.dubbo.registry.integration.RegistryProtocol.DEFAULT_REG
* @see ServiceInstance#getMetadata()
* @see MetadataService
* @see URL
* @since 2.7.3
* @since 2.7.4
*/
public class ServiceInstanceMetadataUtils {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/DefaultMetadataServiceProxyFactory.java
View File

@ -36,7 +36,7 @@ import java.util.stream.Collectors;
/**
* The factory of {@link MetadataService}'s {@link Proxy}
*
* @since 2.7.3
* @since 2.7.4
*/
public class DefaultMetadataServiceProxyFactory implements MetadataServiceProxyFactory {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/MetadataServiceProxyFactory.java
View File

@ -27,7 +27,7 @@ import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoad
*
* @see ServiceInstance
* @see MetadataService
* @since 2.7.3
* @since 2.7.4
*/
@SPI("local")
public interface MetadataServiceProxyFactory {

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/package-info.java
View File

@ -18,6 +18,6 @@
* * The inspiration of service registration and discovery comes from
* <a href="https://spring.io/projects/spring-cloud-commons">Spring Cloud Commons</a>.
*
* @since 2.7.3
* @since 2.7.4
*/
package org.apache.dubbo.registry.client;

2
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/selector/RandomServiceInstanceSelector.java
View File

@ -27,7 +27,7 @@ import java.util.concurrent.ThreadLocalRandom;
*
* @see ThreadLocalRandom
* @see ServiceInstanceSelector
* @since 2.7.3
* @since 2.7.4
*/
public class RandomServiceInstanceSelector implements ServiceInstanceSelector {

Some files were not shown because too many files have changed in this diff Show More