This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 15faa9b Merge pull request #3333, add @Override for sub-class method.
15faa9b is described below
commit 15faa9bb36a09481467a6ee4d94bdc5d6c2d6a23
Author: LiZhen <[email protected]>
AuthorDate: Thu Jan 24 20:20:04 2019 +0800
Merge pull request #3333, add @Override for sub-class method.
---
.../src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java | 1 +
.../java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java | 1 +
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Protocol.java | 4 +++-
.../beans/factory/annotation/CompatibleReferenceBeanBuilder.java | 5 ++---
.../factory/annotation/AnnotationInjectedBeanPostProcessor.java | 2 ++
.../config/spring/beans/factory/annotation/ReferenceBeanBuilder.java | 2 +-
.../remoting/zookeeper/curator/CuratorZookeeperTransporter.java | 2 +-
.../remoting/zookeeper/support/AbstractZookeeperTransporter.java | 1 +
.../remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java | 2 +-
9 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
index 8d5f02c..b85a046 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
@@ -98,6 +98,7 @@ public interface Configurator extends
Comparable<Configurator> {
* 1. the url with a specific host ip should have higher priority than
0.0.0.0
* 2. if two url has the same host, compare by priority value；
*/
+ @Override
default int compareTo(Configurator o) {
if (o == null) {
return -1;
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
index aa47d65..f826dae 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
@@ -62,6 +62,7 @@ public abstract class AbstractRouter implements Router {
this.force = force;
}
+ @Override
public int getPriority() {
return priority;
}
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Protocol.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Protocol.java
index 57abfb3..1803541 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Protocol.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Protocol.java
@@ -22,14 +22,16 @@ import com.alibaba.dubbo.common.URL;
@Deprecated
public interface Protocol extends org.apache.dubbo.rpc.Protocol {
- <T> Exporter<T> export(Invoker <T> invoker) throws RpcException;
+ <T> Exporter<T> export(Invoker<T> invoker) throws RpcException;
<T> Invoker<T> refer(Class<T> aClass, URL url) throws RpcException;
+ @Override
default <T> org.apache.dubbo.rpc.Exporter<T>
export(org.apache.dubbo.rpc.Invoker<T> invoker) throws RpcException {
return this.export(new Invoker.CompatibleInvoker<>(invoker));
}
+ @Override
default <T> org.apache.dubbo.rpc.Invoker<T> refer(Class<T> aClass,
org.apache.dubbo.common.URL url) throws RpcException {
return this.refer(aClass, new URL(url));
}
diff --git
a/dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java
b/dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java
index 1883f79..16013b3 100644
---
a/dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java
+++
b/dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java
@@ -17,7 +17,6 @@
package org.apache.dubbo.config.spring.beans.factory.annotation;
import com.alibaba.dubbo.config.annotation.Reference;
-
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.spring.ReferenceBean;
@@ -104,7 +103,7 @@ class CompatibleReferenceBeanBuilder extends
AbstractAnnotationConfigBeanBuilder
dataBinder.registerCustomEditor(String.class, "filter", new
StringTrimmerEditor(true));
dataBinder.registerCustomEditor(String.class, "listener", new
StringTrimmerEditor(true));
dataBinder.registerCustomEditor(Map.class, "parameters", new
PropertyEditorSupport() {
-
+ @Override
public void setAsText(String text) throws
java.lang.IllegalArgumentException {
// Trim all whitespace
String content = StringUtils.trimAllWhitespace(text);
@@ -161,7 +160,7 @@ class CompatibleReferenceBeanBuilder extends
AbstractAnnotationConfigBeanBuilder
}
public static CompatibleReferenceBeanBuilder create(Reference annotation,
ClassLoader classLoader,
- ApplicationContext
applicationContext) {
+ ApplicationContext
applicationContext) {
return new CompatibleReferenceBeanBuilder(annotation, classLoader,
applicationContext);
}
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
index 1dc147f..30592a1 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
@@ -113,6 +113,7 @@ public abstract class AnnotationInjectedBeanPostProcessor<A
extends Annotation>
return annotationType;
}
+ @Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory,
"AnnotationInjectedBeanPostProcessor requires a
ConfigurableListableBeanFactory");
@@ -293,6 +294,7 @@ public abstract class AnnotationInjectedBeanPostProcessor<A
extends Annotation>
this.classLoader = classLoader;
}
+ @Override
public void setEnvironment(Environment environment) {
this.environment = environment;
}
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java
index d415bf7..aff3ed2 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java
@@ -102,7 +102,7 @@ class ReferenceBeanBuilder extends
AbstractAnnotationConfigBeanBuilder<Reference
dataBinder.registerCustomEditor(String.class, "filter", new
StringTrimmerEditor(true));
dataBinder.registerCustomEditor(String.class, "listener", new
StringTrimmerEditor(true));
dataBinder.registerCustomEditor(Map.class, "parameters", new
PropertyEditorSupport() {
-
+ @Override
public void setAsText(String text) throws
java.lang.IllegalArgumentException {
// Trim all whitespace
String content = StringUtils.trimAllWhitespace(text);
diff --git
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java
index b6a6c3e..21a2e09 100644
---
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java
+++
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import
org.apache.dubbo.remoting.zookeeper.support.AbstractZookeeperTransporter;
public class CuratorZookeeperTransporter extends AbstractZookeeperTransporter {
-
+ @Override
public ZookeeperClient createZookeeperClient(URL url) {
return new CuratorZookeeperClient(url);
}
diff --git
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
index 5b58dc7..72c702a 100644
---
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
+++
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
@@ -47,6 +47,7 @@ public abstract class AbstractZookeeperTransporter implements
ZookeeperTransport
* @param url
* @return
*/
+ @Override
public ZookeeperClient connect(URL url) {
ZookeeperClient zookeeperClient;
List<String> addressList = getURLBackupAddress(url);
diff --git
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java
index eef25af..0ad86ff 100644
---
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java
+++
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import
org.apache.dubbo.remoting.zookeeper.support.AbstractZookeeperTransporter;
public class ZkclientZookeeperTransporter extends AbstractZookeeperTransporter
{
-
+ @Override
public ZookeeperClient createZookeeperClient(URL url) {
return new ZkclientZookeeperClient(url);
}
