Skip to content

Commit 15faa9b

Browse files
LiZhenNetchickenlj
authored andcommitted
Merge pull request #3333, add @OverRide for sub-class method.
1 parent 9cdb2f0 commit 15faa9b

File tree

9 files changed

+13
-7
lines changed

9 files changed

+13
-7
lines changed

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ static Optional<List<Configurator>> toConfigurators(List<URL> urls) {
9898
* 1. the url with a specific host ip should have higher priority than 0.0.0.0
9999
* 2. if two url has the same host, compare by priority value;
100100
*/
101+
@Override
101102
default int compareTo(Configurator o) {
102103
if (o == null) {
103104
return -1;

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public void setForce(boolean force) {
6262
this.force = force;
6363
}
6464

65+
@Override
6566
public int getPriority() {
6667
return priority;
6768
}

dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Protocol.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@
2222
@Deprecated
2323
public interface Protocol extends org.apache.dubbo.rpc.Protocol {
2424

25-
<T> Exporter<T> export(Invoker <T> invoker) throws RpcException;
25+
<T> Exporter<T> export(Invoker<T> invoker) throws RpcException;
2626

2727
<T> Invoker<T> refer(Class<T> aClass, URL url) throws RpcException;
2828

29+
@Override
2930
default <T> org.apache.dubbo.rpc.Exporter<T> export(org.apache.dubbo.rpc.Invoker<T> invoker) throws RpcException {
3031
return this.export(new Invoker.CompatibleInvoker<>(invoker));
3132
}
3233

34+
@Override
3335
default <T> org.apache.dubbo.rpc.Invoker<T> refer(Class<T> aClass, org.apache.dubbo.common.URL url) throws RpcException {
3436
return this.refer(aClass, new URL(url));
3537
}

dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.apache.dubbo.config.spring.beans.factory.annotation;
1818

1919
import com.alibaba.dubbo.config.annotation.Reference;
20-
2120
import org.apache.dubbo.common.utils.CollectionUtils;
2221
import org.apache.dubbo.config.ConsumerConfig;
2322
import org.apache.dubbo.config.spring.ReferenceBean;
@@ -104,7 +103,7 @@ protected void preConfigureBean(Reference reference, ReferenceBean referenceBean
104103
dataBinder.registerCustomEditor(String.class, "filter", new StringTrimmerEditor(true));
105104
dataBinder.registerCustomEditor(String.class, "listener", new StringTrimmerEditor(true));
106105
dataBinder.registerCustomEditor(Map.class, "parameters", new PropertyEditorSupport() {
107-
106+
@Override
108107
public void setAsText(String text) throws java.lang.IllegalArgumentException {
109108
// Trim all whitespace
110109
String content = StringUtils.trimAllWhitespace(text);
@@ -161,7 +160,7 @@ protected void postConfigureBean(Reference annotation, ReferenceBean bean) throw
161160
}
162161

163162
public static CompatibleReferenceBeanBuilder create(Reference annotation, ClassLoader classLoader,
164-
ApplicationContext applicationContext) {
163+
ApplicationContext applicationContext) {
165164
return new CompatibleReferenceBeanBuilder(annotation, classLoader, applicationContext);
166165
}
167166

dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ public final Class<A> getAnnotationType() {
113113
return annotationType;
114114
}
115115

116+
@Override
116117
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
117118
Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory,
118119
"AnnotationInjectedBeanPostProcessor requires a ConfigurableListableBeanFactory");
@@ -293,6 +294,7 @@ public void setBeanClassLoader(ClassLoader classLoader) {
293294
this.classLoader = classLoader;
294295
}
295296

297+
@Override
296298
public void setEnvironment(Environment environment) {
297299
this.environment = environment;
298300
}

dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected void preConfigureBean(Reference reference, ReferenceBean referenceBean
102102
dataBinder.registerCustomEditor(String.class, "filter", new StringTrimmerEditor(true));
103103
dataBinder.registerCustomEditor(String.class, "listener", new StringTrimmerEditor(true));
104104
dataBinder.registerCustomEditor(Map.class, "parameters", new PropertyEditorSupport() {
105-
105+
@Override
106106
public void setAsText(String text) throws java.lang.IllegalArgumentException {
107107
// Trim all whitespace
108108
String content = StringUtils.trimAllWhitespace(text);

dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.dubbo.remoting.zookeeper.support.AbstractZookeeperTransporter;
2222

2323
public class CuratorZookeeperTransporter extends AbstractZookeeperTransporter {
24-
24+
@Override
2525
public ZookeeperClient createZookeeperClient(URL url) {
2626
return new CuratorZookeeperClient(url);
2727
}

dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public abstract class AbstractZookeeperTransporter implements ZookeeperTransport
4747
* @param url
4848
* @return
4949
*/
50+
@Override
5051
public ZookeeperClient connect(URL url) {
5152
ZookeeperClient zookeeperClient;
5253
List<String> addressList = getURLBackupAddress(url);

dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.dubbo.remoting.zookeeper.support.AbstractZookeeperTransporter;
2222

2323
public class ZkclientZookeeperTransporter extends AbstractZookeeperTransporter {
24-
24+
@Override
2525
public ZookeeperClient createZookeeperClient(URL url) {
2626
return new ZkclientZookeeperClient(url);
2727
}

0 commit comments

Comments
 (0)