[Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353 #2418

kexianjun · 2018-09-01T03:23:07Z

What is the purpose of the change

fix #2353

Brief changelog

ignore the attribute of interfaceName in ServiceAnnotationBeanPostProcessor#buildServiceBeanDefinition method

Verifying this change

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a GITHUB_issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn clean install -DskipTests & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
If this contribution is large, please follow the Software Donation Guide.

Sync apache dubbo code

add getter and setter method for ServiceConfig's interfceName property#2352

codecov-io · 2018-09-02T06:04:26Z

Codecov Report

Merging #2418 into master will decrease coverage by 0.06%.
The diff coverage is 33.33%.

@@             Coverage Diff              @@
##             master    #2418      +/-   ##
============================================
- Coverage     55.14%   55.07%   -0.07%     
+ Complexity     5274     5271       -3     
============================================
  Files           573      573              
  Lines         25459    25462       +3     
  Branches       4537     4537              
============================================
- Hits          14039    14024      -15     
- Misses         9327     9342      +15     
- Partials       2093     2096       +3

Impacted Files	Coverage Δ	Complexity Δ
...in/java/org/apache/dubbo/config/ServiceConfig.java	`47.34% <33.33%> (-0.1%)`	`63 <1> (+1)`
...he/dubbo/remoting/transport/netty/NettyClient.java	`72.88% <0%> (-10.17%)`	`12% <0%> (-1%)`
...apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java	`58.06% <0%> (-6.46%)`	`3% <0%> (ø)`
...org/apache/dubbo/rpc/filter/ActiveLimitFilter.java	`83.33% <0%> (-5.56%)`	`6% <0%> (-1%)`
...ng/zookeeper/zkclient/ZkclientZookeeperClient.java	`59.52% <0%> (-4.77%)`	`10% <0%> (ø)`
...rg/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java	`59.79% <0%> (-4.13%)`	`14% <0%> (-2%)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2ae2f58...d8dd283. Read the comment docs.

lexburner · 2018-09-07T04:17:38Z

I reproduced the same problem locally. When use @service(interfaceName = "xx.xx.xx") Annotation. ServiceConfig will mismatch the setter setInterface() .Given that the function setInterface() is heavily used through the dubbo framework, it is a good idea to redundancy a new function setInterfaceName().

this pr should be merged soon.

carryxyh · 2018-09-07T05:32:43Z

I don't think there is a need to add a demo here. Only the simplest demo can be kept in the source code. Just keep unit tests and modifications. :)

carryxyh · 2018-09-07T05:33:01Z

...dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/service-annotation.xml

@@ -0,0 +1,32 @@
+<!--


No need for example.

carryxyh · 2018-09-07T05:33:13Z

...nfig-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceAnnotationImpl.java

@@ -0,0 +1,40 @@
+/*


This file, too.

this demo shows a situation when a class implements more than tow intefaces and just need to expot one of them(not the first one),so it is necessary to specify the interfaceName

Nope, this project should only keep the simplest demo, just like it does now.
If u think this demo is necessary, pls send pr to here:
https://github.com/dubbo/dubbo-samples

:)
pls send this demo to here:
https://github.com/dubbo/dubbo-samples

thx for your pr.

ok,I'll do that.

dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java

lexburner · 2018-09-11T03:32:16Z

@kexianjun
It’s truly better to ignore the attribute of interfaceName in ServiceAnnotationBeanPostProcessor.java

I have reviewed the change.

Maybe the brief changelog need change since your second plan was ignore the attribute, not

Add getter and setter for ServiceConfig's interfaceName property

kexianjun · 2018-09-11T04:15:48Z

@lexburner changed that

…pache.dubbo.config.spring.ServiceBean]apache#2353 (apache#2418) * add getter and setter for ServiceConfig's interfaceName property#2353 * add interfaceName to ignoreAttributeNames and change the unit test * delete the demo source code and update the unit test * unchange ServiceConfig * update unit test * update unit test

@reference

* combine test coverage report (apache#2643) * Optimize ut for serialization model. (apache#2632) * 1. Integrate the unit test of the serialization module, code reuse. 2. Remove redundant unit tests and pojo classes. 3. Remove the useless pojo class in the common module. * fix ci fail * fix ci fail * fix ci fail * fix ci fail * remove author info * prototype for issue2570 (apache#2640) * apache#2570: dubbo all in one fail to start from a tomcat server when spring framework is absent * add comments and fix unit test * add license header * update comments in unit tests * [Dubbo -fix annotation bug] Fix @reference bug (apache#2649) It's fine. * Merge pull request apache#2656, make sure serialization exception sends back to consumer to preventing endless waiting. Fixes apache#1903: Our customized serialization id exceeds the maximum limit, now it cannot work on 2.6.2 anymore. * apache#1903: supplemental change (apache#2666) * Optimize the doSelect method of RandomLoadBalance to reduce the times of invoke of the getWeight method of the AbstractLoadBalance (apache#2597) * 解决与quartz集成报错问题 (apache#2677) quartz初始化的Bean没有beanName，beanName=null，走这段代码的时候报空指针了。 org.springframework.boot.autoconfigure.quartz.AutowireCapableBeanJobFactory类的createJobInstance方法中使用this.beanFactory.initializeBean(jobInstance, null);初始化的Bean，其beanName=null。 * Code format (apache#2662) * NullPointerException * code rule * Merge pull request#2679, consumer throws RpcException when RegistryDirectory notify in high QPS. Fixes apache#2016 * remove ServiceClassHolder and use the ApplicationModel replacedly (apache#2646) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * [Dubbo-1983] Support Protobuf Serialization (apache#2618) * finish support protobuf * polish * fix code review * use the general test for serialization * Smooth Round Robin selection (apache#2650) * enhance pull request 2618 (apache#2691) * enhance pull request 2618 * move spi file into the right directory * ignore protostuff test case * make unit test pass, support Time type * fix useless imports issue * add license header * fix typo error in FAQ (apache#2684) fix typo error in FAQ * remove author info for RoundRobinLoadBalance (apache#2697) * fix pom for protostuff serialization (apache#2700) * Optimize REGISTRIES field in AbstractRegistryFactory. (apache#2703) * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * [version 2.7.0]remove the StaticContext class and refactor the code related to Async (apache#2688) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * remove StaticContext * remove the unused imported classes of ReferenceConfig * fix NPE of ConsumerModel * fix the failed testcase of AbstractClusterInvokerTest * [Dubbo] #PR2688 to fix the review issues * Optimize heartbeat and reconnect task. (apache#2658) * Optimize heartbeat and reconnect task. 1.Use hashedWheelTimer. 2.Distinguish between reconnect and heartbeat. 3.Increase inspection cycle. * fix ci fail. * fix ci fail. * fix ci fail. * polish the code for pull request 2658: Optimize heartbeat and reconnect task (apache#2709) * 重构 ServiceBean 的 isDelay 方法，使其更符合语义 (apache#2686) * Refactor method isDelay of ServiceBean to fix the wrong meaning of the method * Remove unnecessary method isDelay of ServiceBean * 【Unit Test】FailbackRegistry Test: recover method (apache#2591) * FailbackRegistry Test: recover method * fix the type error, and use CountDownLatch await method to fix the unstable problom * trigger the travis ci test retry * trigger the code static check again * replace ServiceAnnotationBeanPostProcessor log.isInfoEnabled->log.isWarnEnabled (apache#2712) simplify ExtensionLoader code segment * [Dubbo-2678][For Master] Add ability to turn off SPI auto injection, special support for Object type. (apache#2682) * Add ability to turn off SPI auto injection, special support for generic Object type injection. * Change Inject to AutoInject since it's main purpose is to turn off auto-injection. * disable is redundant in DisableInject annotation * Merge pull request apache#2725, problems of graceful shutdown in 2.6.3 and some recommendation. * enhance comments (apache#2735) * code format (apache#2730) * NullPointerException * code rule * code rule * Close all servers/ports after tests finish (apache#2741) * Simplify the code of StringUtils to make it more graceful. (apache#2740) * Simplify the code of StringUtils to make it more graceful. * Add Apache license * Add 'forks' config into xml config (apache#2568) * Add forks into xml config. * Add forks into xml config. * Add forks into xml config. * fix typo (apache#2747) * [DUBBO-2489] MockClusterInvoker provides local forced mock，I tested it locally, but it doesn't work (apache#2742) * apache#2748: Provider should disable mock configuration (apache#2749) * Fix the bug that ReferenceBean refers service more than once when debugging. (apache#2754) note: please visit http://t.cn/EAhta27 for more detail. * Close all servers/ports after tests finish (apache#2755) * add checkstyle rule to check import order (apache#2745) * Changing URL so tests can run in any order (apache#2760) * [Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]apache#2353 (apache#2418) * add getter and setter for ServiceConfig's interfaceName property#2353 * add interfaceName to ignoreAttributeNames and change the unit test * delete the demo source code and update the unit test * unchange ServiceConfig * update unit test * update unit test * apache#2762: [Dubbo - qos-http] stopServer should be invoked ? (apache#2767) * apache#2777: heartbeat threads blocks process shutdown (apache#2778) Fix heartbeat threads blocks process shutdown because its hashed-wheel-timer is non-daemon thread. * oschina vote (apache#2786) * fix typo (apache#2791) Fix typo confilict -> conflict * improvement on Parameters and CollectionUtils (apache#2790) Use CollectionUtils.toStringMap to reduce duplicate code in Parameters, and use Java 8 type inference for collections. * [REFACTOR]:[fix typo] (apache#2804) fix typos * [Dubbo-2798]fix apporiate NotWritablePropertyException (apache#2800) fix apache#2798 . 'propertyname in java donot contain '-' but camel format'. * [Dubbo-2758] Adding dependency on dubbo-remoting-mina for tests in dubbo-rpc-dubbo (apache#2797) * Adding dependency on dubbo-remoting-mina so DubboProtocolTest.testDubboProtocolWithMina is no longer flaky * Changing port number to ensure new server/client created for test * modify dubbo version to 2.6.5 * fix typo of field (apache#2825) * [Dubbo-2845] Fix OOM in UT testSelectByWeight (apache#2845) (apache#2846) Fix OOM Exception generated during UT * Fix UT failed on windows with FileNetworkerTest (apache#2848) Fix FileNetworkerTest failure * Update README.md remove oschina vote * fixed typo of variable (apache#2875) fixed type of variable * Remove unnessesary code in RegistryDirectory#doList (apache#2861) * remove unnessesary code * remove unused import * add some ScriptRoute test case (apache#2879) * add router test case * correct an error word * remove the duplicate superclass of TagRouter and ConditionRouter (apache#2885) Remove the class ConditionRouter and TagRouter implement duplicate superclass Comparable

@reference

* combine test coverage report (apache#2643) * Optimize ut for serialization model. (apache#2632) * 1. Integrate the unit test of the serialization module, code reuse. 2. Remove redundant unit tests and pojo classes. 3. Remove the useless pojo class in the common module. * fix ci fail * fix ci fail * fix ci fail * fix ci fail * remove author info * prototype for issue2570 (apache#2640) * apache#2570: dubbo all in one fail to start from a tomcat server when spring framework is absent * add comments and fix unit test * add license header * update comments in unit tests * [Dubbo -fix annotation bug] Fix @reference bug (apache#2649) It's fine. * Merge pull request apache#2656, make sure serialization exception sends back to consumer to preventing endless waiting. Fixes apache#1903: Our customized serialization id exceeds the maximum limit, now it cannot work on 2.6.2 anymore. * apache#1903: supplemental change (apache#2666) * Optimize the doSelect method of RandomLoadBalance to reduce the times of invoke of the getWeight method of the AbstractLoadBalance (apache#2597) * 解决与quartz集成报错问题 (apache#2677) quartz初始化的Bean没有beanName，beanName=null，走这段代码的时候报空指针了。 org.springframework.boot.autoconfigure.quartz.AutowireCapableBeanJobFactory类的createJobInstance方法中使用this.beanFactory.initializeBean(jobInstance, null);初始化的Bean，其beanName=null。 * Code format (apache#2662) * NullPointerException * code rule * Merge pull request#2679, consumer throws RpcException when RegistryDirectory notify in high QPS. Fixes apache#2016 * remove ServiceClassHolder and use the ApplicationModel replacedly (apache#2646) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * [Dubbo-1983] Support Protobuf Serialization (apache#2618) * finish support protobuf * polish * fix code review * use the general test for serialization * Smooth Round Robin selection (apache#2650) * enhance pull request 2618 (apache#2691) * enhance pull request 2618 * move spi file into the right directory * ignore protostuff test case * make unit test pass, support Time type * fix useless imports issue * add license header * fix typo error in FAQ (apache#2684) fix typo error in FAQ * remove author info for RoundRobinLoadBalance (apache#2697) * fix pom for protostuff serialization (apache#2700) * Optimize REGISTRIES field in AbstractRegistryFactory. (apache#2703) * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * [version 2.7.0]remove the StaticContext class and refactor the code related to Async (apache#2688) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * remove StaticContext * remove the unused imported classes of ReferenceConfig * fix NPE of ConsumerModel * fix the failed testcase of AbstractClusterInvokerTest * [Dubbo] #PR2688 to fix the review issues * Optimize heartbeat and reconnect task. (apache#2658) * Optimize heartbeat and reconnect task. 1.Use hashedWheelTimer. 2.Distinguish between reconnect and heartbeat. 3.Increase inspection cycle. * fix ci fail. * fix ci fail. * fix ci fail. * polish the code for pull request 2658: Optimize heartbeat and reconnect task (apache#2709) * 重构 ServiceBean 的 isDelay 方法，使其更符合语义 (apache#2686) * Refactor method isDelay of ServiceBean to fix the wrong meaning of the method * Remove unnecessary method isDelay of ServiceBean * 【Unit Test】FailbackRegistry Test: recover method (apache#2591) * FailbackRegistry Test: recover method * fix the type error, and use CountDownLatch await method to fix the unstable problom * trigger the travis ci test retry * trigger the code static check again * replace ServiceAnnotationBeanPostProcessor log.isInfoEnabled->log.isWarnEnabled (apache#2712) simplify ExtensionLoader code segment * [Dubbo-2678][For Master] Add ability to turn off SPI auto injection, special support for Object type. (apache#2682) * Add ability to turn off SPI auto injection, special support for generic Object type injection. * Change Inject to AutoInject since it's main purpose is to turn off auto-injection. * disable is redundant in DisableInject annotation * Merge pull request apache#2725, problems of graceful shutdown in 2.6.3 and some recommendation. * enhance comments (apache#2735) * code format (apache#2730) * NullPointerException * code rule * code rule * Close all servers/ports after tests finish (apache#2741) * Simplify the code of StringUtils to make it more graceful. (apache#2740) * Simplify the code of StringUtils to make it more graceful. * Add Apache license * Add 'forks' config into xml config (apache#2568) * Add forks into xml config. * Add forks into xml config. * Add forks into xml config. * fix typo (apache#2747) * [DUBBO-2489] MockClusterInvoker provides local forced mock，I tested it locally, but it doesn't work (apache#2742) * apache#2748: Provider should disable mock configuration (apache#2749) * Fix the bug that ReferenceBean refers service more than once when debugging. (apache#2754) note: please visit http://t.cn/EAhta27 for more detail. * Close all servers/ports after tests finish (apache#2755) * add checkstyle rule to check import order (apache#2745) * Changing URL so tests can run in any order (apache#2760) * [Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]apache#2353 (apache#2418) * add getter and setter for ServiceConfig's interfaceName property#2353 * add interfaceName to ignoreAttributeNames and change the unit test * delete the demo source code and update the unit test * unchange ServiceConfig * update unit test * update unit test * apache#2762: [Dubbo - qos-http] stopServer should be invoked ? (apache#2767) * apache#2777: heartbeat threads blocks process shutdown (apache#2778) Fix heartbeat threads blocks process shutdown because its hashed-wheel-timer is non-daemon thread. * oschina vote (apache#2786) * fix typo (apache#2791) Fix typo confilict -> conflict * improvement on Parameters and CollectionUtils (apache#2790) Use CollectionUtils.toStringMap to reduce duplicate code in Parameters, and use Java 8 type inference for collections. * [REFACTOR]:[fix typo] (apache#2804) fix typos * [Dubbo-2798]fix apporiate NotWritablePropertyException (apache#2800) fix apache#2798 . 'propertyname in java donot contain '-' but camel format'. * [Dubbo-2758] Adding dependency on dubbo-remoting-mina for tests in dubbo-rpc-dubbo (apache#2797) * Adding dependency on dubbo-remoting-mina so DubboProtocolTest.testDubboProtocolWithMina is no longer flaky * Changing port number to ensure new server/client created for test * modify dubbo version to 2.6.5 * fix typo of field (apache#2825) * [Dubbo-2845] Fix OOM in UT testSelectByWeight (apache#2845) (apache#2846) Fix OOM Exception generated during UT * Fix UT failed on windows with FileNetworkerTest (apache#2848) Fix FileNetworkerTest failure * Update README.md remove oschina vote * fixed typo of variable (apache#2875) fixed type of variable * Remove unnessesary code in RegistryDirectory#doList (apache#2861) * remove unnessesary code * remove unused import * add some ScriptRoute test case (apache#2879) * add router test case * correct an error word * remove the duplicate superclass of TagRouter and ConditionRouter (apache#2885) Remove the class ConditionRouter and TagRouter implement duplicate superclass Comparable

@reference

* combine test coverage report (apache#2643) * Optimize ut for serialization model. (apache#2632) * 1. Integrate the unit test of the serialization module, code reuse. 2. Remove redundant unit tests and pojo classes. 3. Remove the useless pojo class in the common module. * fix ci fail * fix ci fail * fix ci fail * fix ci fail * remove author info * prototype for issue2570 (apache#2640) * apache#2570: dubbo all in one fail to start from a tomcat server when spring framework is absent * add comments and fix unit test * add license header * update comments in unit tests * [Dubbo -fix annotation bug] Fix @reference bug (apache#2649) It's fine. * Merge pull request apache#2656, make sure serialization exception sends back to consumer to preventing endless waiting. Fixes apache#1903: Our customized serialization id exceeds the maximum limit, now it cannot work on 2.6.2 anymore. * apache#1903: supplemental change (apache#2666) * Optimize the doSelect method of RandomLoadBalance to reduce the times of invoke of the getWeight method of the AbstractLoadBalance (apache#2597) * 解决与quartz集成报错问题 (apache#2677) quartz初始化的Bean没有beanName，beanName=null，走这段代码的时候报空指针了。 org.springframework.boot.autoconfigure.quartz.AutowireCapableBeanJobFactory类的createJobInstance方法中使用this.beanFactory.initializeBean(jobInstance, null);初始化的Bean，其beanName=null。 * Code format (apache#2662) * NullPointerException * code rule * Merge pull request#2679, consumer throws RpcException when RegistryDirectory notify in high QPS. Fixes apache#2016 * remove ServiceClassHolder and use the ApplicationModel replacedly (apache#2646) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * [Dubbo-1983] Support Protobuf Serialization (apache#2618) * finish support protobuf * polish * fix code review * use the general test for serialization * Smooth Round Robin selection (apache#2650) * enhance pull request 2618 (apache#2691) * enhance pull request 2618 * move spi file into the right directory * ignore protostuff test case * make unit test pass, support Time type * fix useless imports issue * add license header * fix typo error in FAQ (apache#2684) fix typo error in FAQ * remove author info for RoundRobinLoadBalance (apache#2697) * fix pom for protostuff serialization (apache#2700) * Optimize REGISTRIES field in AbstractRegistryFactory. (apache#2703) * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * [version 2.7.0]remove the StaticContext class and refactor the code related to Async (apache#2688) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * remove StaticContext * remove the unused imported classes of ReferenceConfig * fix NPE of ConsumerModel * fix the failed testcase of AbstractClusterInvokerTest * [Dubbo] #PR2688 to fix the review issues * Optimize heartbeat and reconnect task. (apache#2658) * Optimize heartbeat and reconnect task. 1.Use hashedWheelTimer. 2.Distinguish between reconnect and heartbeat. 3.Increase inspection cycle. * fix ci fail. * fix ci fail. * fix ci fail. * polish the code for pull request 2658: Optimize heartbeat and reconnect task (apache#2709) * 重构 ServiceBean 的 isDelay 方法，使其更符合语义 (apache#2686) * Refactor method isDelay of ServiceBean to fix the wrong meaning of the method * Remove unnecessary method isDelay of ServiceBean * 【Unit Test】FailbackRegistry Test: recover method (apache#2591) * FailbackRegistry Test: recover method * fix the type error, and use CountDownLatch await method to fix the unstable problom * trigger the travis ci test retry * trigger the code static check again * replace ServiceAnnotationBeanPostProcessor log.isInfoEnabled->log.isWarnEnabled (apache#2712) simplify ExtensionLoader code segment * [Dubbo-2678][For Master] Add ability to turn off SPI auto injection, special support for Object type. (apache#2682) * Add ability to turn off SPI auto injection, special support for generic Object type injection. * Change Inject to AutoInject since it's main purpose is to turn off auto-injection. * disable is redundant in DisableInject annotation * Merge pull request apache#2725, problems of graceful shutdown in 2.6.3 and some recommendation. * enhance comments (apache#2735) * code format (apache#2730) * NullPointerException * code rule * code rule * Close all servers/ports after tests finish (apache#2741) * Simplify the code of StringUtils to make it more graceful. (apache#2740) * Simplify the code of StringUtils to make it more graceful. * Add Apache license * Add 'forks' config into xml config (apache#2568) * Add forks into xml config. * Add forks into xml config. * Add forks into xml config. * fix typo (apache#2747) * [DUBBO-2489] MockClusterInvoker provides local forced mock，I tested it locally, but it doesn't work (apache#2742) * apache#2748: Provider should disable mock configuration (apache#2749) * Fix the bug that ReferenceBean refers service more than once when debugging. (apache#2754) note: please visit http://t.cn/EAhta27 for more detail. * Close all servers/ports after tests finish (apache#2755) * add checkstyle rule to check import order (apache#2745) * Changing URL so tests can run in any order (apache#2760) * [Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]apache#2353 (apache#2418) * add getter and setter for ServiceConfig's interfaceName property#2353 * add interfaceName to ignoreAttributeNames and change the unit test * delete the demo source code and update the unit test * unchange ServiceConfig * update unit test * update unit test * apache#2762: [Dubbo - qos-http] stopServer should be invoked ? (apache#2767) * apache#2777: heartbeat threads blocks process shutdown (apache#2778) Fix heartbeat threads blocks process shutdown because its hashed-wheel-timer is non-daemon thread. * oschina vote (apache#2786) * fix typo (apache#2791) Fix typo confilict -> conflict * improvement on Parameters and CollectionUtils (apache#2790) Use CollectionUtils.toStringMap to reduce duplicate code in Parameters, and use Java 8 type inference for collections. * [REFACTOR]:[fix typo] (apache#2804) fix typos * [Dubbo-2798]fix apporiate NotWritablePropertyException (apache#2800) fix apache#2798 . 'propertyname in java donot contain '-' but camel format'. * [Dubbo-2758] Adding dependency on dubbo-remoting-mina for tests in dubbo-rpc-dubbo (apache#2797) * Adding dependency on dubbo-remoting-mina so DubboProtocolTest.testDubboProtocolWithMina is no longer flaky * Changing port number to ensure new server/client created for test * modify dubbo version to 2.6.5 * fix typo of field (apache#2825) * [Dubbo-2845] Fix OOM in UT testSelectByWeight (apache#2845) (apache#2846) Fix OOM Exception generated during UT * Fix UT failed on windows with FileNetworkerTest (apache#2848) Fix FileNetworkerTest failure * Update README.md remove oschina vote * fixed typo of variable (apache#2875) fixed type of variable * Remove unnessesary code in RegistryDirectory#doList (apache#2861) * remove unnessesary code * remove unused import * add some ScriptRoute test case (apache#2879) * add router test case * correct an error word * remove the duplicate superclass of TagRouter and ConditionRouter (apache#2885) Remove the class ConditionRouter and TagRouter implement duplicate superclass Comparable

…pache.dubbo.config.spring.ServiceBean]apache#2353 (apache#2418) * add getter and setter for ServiceConfig's interfaceName property#2353 * add interfaceName to ignoreAttributeNames and change the unit test * delete the demo source code and update the unit test * unchange ServiceConfig * update unit test * update unit test

@reference

* combine test coverage report (apache#2643) * Optimize ut for serialization model. (apache#2632) * 1. Integrate the unit test of the serialization module, code reuse. 2. Remove redundant unit tests and pojo classes. 3. Remove the useless pojo class in the common module. * fix ci fail * fix ci fail * fix ci fail * fix ci fail * remove author info * prototype for issue2570 (apache#2640) * apache#2570: dubbo all in one fail to start from a tomcat server when spring framework is absent * add comments and fix unit test * add license header * update comments in unit tests * [Dubbo -fix annotation bug] Fix @reference bug (apache#2649) It's fine. * Merge pull request apache#2656, make sure serialization exception sends back to consumer to preventing endless waiting. Fixes apache#1903: Our customized serialization id exceeds the maximum limit, now it cannot work on 2.6.2 anymore. * apache#1903: supplemental change (apache#2666) * Optimize the doSelect method of RandomLoadBalance to reduce the times of invoke of the getWeight method of the AbstractLoadBalance (apache#2597) * 解决与quartz集成报错问题 (apache#2677) quartz初始化的Bean没有beanName，beanName=null，走这段代码的时候报空指针了。 org.springframework.boot.autoconfigure.quartz.AutowireCapableBeanJobFactory类的createJobInstance方法中使用this.beanFactory.initializeBean(jobInstance, null);初始化的Bean，其beanName=null。 * Code format (apache#2662) * NullPointerException * code rule * Merge pull request#2679, consumer throws RpcException when RegistryDirectory notify in high QPS. Fixes apache#2016 * remove ServiceClassHolder and use the ApplicationModel replacedly (apache#2646) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * [Dubbo-1983] Support Protobuf Serialization (apache#2618) * finish support protobuf * polish * fix code review * use the general test for serialization * Smooth Round Robin selection (apache#2650) * enhance pull request 2618 (apache#2691) * enhance pull request 2618 * move spi file into the right directory * ignore protostuff test case * make unit test pass, support Time type * fix useless imports issue * add license header * fix typo error in FAQ (apache#2684) fix typo error in FAQ * remove author info for RoundRobinLoadBalance (apache#2697) * fix pom for protostuff serialization (apache#2700) * Optimize REGISTRIES field in AbstractRegistryFactory. (apache#2703) * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * modify ConcurrentHashMap to HashMap.这里REGISTRIES在使用的时候都会先加锁，不存在多线程安全的问题。所以这里建议使用hashmap * [version 2.7.0]remove the StaticContext class and refactor the code related to Async (apache#2688) * [Dubbo] move the classes of model from config to rpc-api for reusing * remove ServiceClassHolder and use the ApplicationModel replacedly * [Dubbo] delete the unused imported of ApplicationModel * Update dubbo-demo-consumer.xml this commits is no need to commit to remote repo. * remove StaticContext * remove the unused imported classes of ReferenceConfig * fix NPE of ConsumerModel * fix the failed testcase of AbstractClusterInvokerTest * [Dubbo] #PR2688 to fix the review issues * Optimize heartbeat and reconnect task. (apache#2658) * Optimize heartbeat and reconnect task. 1.Use hashedWheelTimer. 2.Distinguish between reconnect and heartbeat. 3.Increase inspection cycle. * fix ci fail. * fix ci fail. * fix ci fail. * polish the code for pull request 2658: Optimize heartbeat and reconnect task (apache#2709) * 重构 ServiceBean 的 isDelay 方法，使其更符合语义 (apache#2686) * Refactor method isDelay of ServiceBean to fix the wrong meaning of the method * Remove unnecessary method isDelay of ServiceBean * 【Unit Test】FailbackRegistry Test: recover method (apache#2591) * FailbackRegistry Test: recover method * fix the type error, and use CountDownLatch await method to fix the unstable problom * trigger the travis ci test retry * trigger the code static check again * replace ServiceAnnotationBeanPostProcessor log.isInfoEnabled->log.isWarnEnabled (apache#2712) simplify ExtensionLoader code segment * [Dubbo-2678][For Master] Add ability to turn off SPI auto injection, special support for Object type. (apache#2682) * Add ability to turn off SPI auto injection, special support for generic Object type injection. * Change Inject to AutoInject since it's main purpose is to turn off auto-injection. * disable is redundant in DisableInject annotation * Merge pull request apache#2725, problems of graceful shutdown in 2.6.3 and some recommendation. * enhance comments (apache#2735) * code format (apache#2730) * NullPointerException * code rule * code rule * Close all servers/ports after tests finish (apache#2741) * Simplify the code of StringUtils to make it more graceful. (apache#2740) * Simplify the code of StringUtils to make it more graceful. * Add Apache license * Add 'forks' config into xml config (apache#2568) * Add forks into xml config. * Add forks into xml config. * Add forks into xml config. * fix typo (apache#2747) * [DUBBO-2489] MockClusterInvoker provides local forced mock，I tested it locally, but it doesn't work (apache#2742) * apache#2748: Provider should disable mock configuration (apache#2749) * Fix the bug that ReferenceBean refers service more than once when debugging. (apache#2754) note: please visit http://t.cn/EAhta27 for more detail. * Close all servers/ports after tests finish (apache#2755) * add checkstyle rule to check import order (apache#2745) * Changing URL so tests can run in any order (apache#2760) * [Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]apache#2353 (apache#2418) * add getter and setter for ServiceConfig's interfaceName property#2353 * add interfaceName to ignoreAttributeNames and change the unit test * delete the demo source code and update the unit test * unchange ServiceConfig * update unit test * update unit test * apache#2762: [Dubbo - qos-http] stopServer should be invoked ? (apache#2767) * apache#2777: heartbeat threads blocks process shutdown (apache#2778) Fix heartbeat threads blocks process shutdown because its hashed-wheel-timer is non-daemon thread. * oschina vote (apache#2786) * fix typo (apache#2791) Fix typo confilict -> conflict * improvement on Parameters and CollectionUtils (apache#2790) Use CollectionUtils.toStringMap to reduce duplicate code in Parameters, and use Java 8 type inference for collections. * [REFACTOR]:[fix typo] (apache#2804) fix typos * [Dubbo-2798]fix apporiate NotWritablePropertyException (apache#2800) fix apache#2798 . 'propertyname in java donot contain '-' but camel format'. * [Dubbo-2758] Adding dependency on dubbo-remoting-mina for tests in dubbo-rpc-dubbo (apache#2797) * Adding dependency on dubbo-remoting-mina so DubboProtocolTest.testDubboProtocolWithMina is no longer flaky * Changing port number to ensure new server/client created for test * modify dubbo version to 2.6.5 * fix typo of field (apache#2825) * [Dubbo-2845] Fix OOM in UT testSelectByWeight (apache#2845) (apache#2846) Fix OOM Exception generated during UT * Fix UT failed on windows with FileNetworkerTest (apache#2848) Fix FileNetworkerTest failure * Update README.md remove oschina vote * fixed typo of variable (apache#2875) fixed type of variable * Remove unnessesary code in RegistryDirectory#doList (apache#2861) * remove unnessesary code * remove unused import * add some ScriptRoute test case (apache#2879) * add router test case * correct an error word * remove the duplicate superclass of TagRouter and ConditionRouter (apache#2885) Remove the class ConditionRouter and TagRouter implement duplicate superclass Comparable

kexianjun and others added 3 commits August 31, 2018 21:56

Merge pull request #1 from apache/master

66c7053

Sync apache dubbo code

add getter and setter for ServiceConfig's interfaceName property#2353

2fd0bb4

Merge branch 'master' of https://github.com/kexianjun/incubator-dubbo

d8dd283

add getter and setter method for ServiceConfig's interfceName property#2352

kexianjun closed this Sep 1, 2018

kexianjun reopened this Sep 1, 2018

kexianjun changed the title ~~[Dubbo-2323]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353~~ [Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353 Sep 1, 2018

lexburner approved these changes Sep 7, 2018

View reviewed changes

kexianjun added 2 commits September 7, 2018 13:23

add interfaceName to ignoreAttributeNames and change the unit test

4e0a0bc

Merge branch 'master' of https://github.com/apache/incubator-dubbo

6d1be10

carryxyh reviewed Sep 7, 2018

View reviewed changes

delete the demo source code and update the unit test

cd46b4f

kexianjun force-pushed the master branch from 650d9ca to cd46b4f Compare September 7, 2018 07:47

kexianjun added 4 commits September 7, 2018 15:49

unchange ServiceConfig

9fecd6b

Merge branch 'master' of https://github.com/apache/incubator-dubbo

e507489

update unit test

50729a7

update unit test

3cfb36e

lexburner approved these changes Sep 11, 2018

View reviewed changes

beiwei30 merged commit 117d485 into apache:master Nov 8, 2018

beiwei30 mentioned this pull request Nov 8, 2018

[DUBBO-2418]: merge pull request #2353 to 2.6.x to fix #2353 #2761

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353 #2418

[Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353 #2418

kexianjun commented Sep 1, 2018 •

edited

Loading

codecov-io commented Sep 2, 2018 •

edited

Loading

lexburner commented Sep 7, 2018

carryxyh commented Sep 7, 2018

carryxyh Sep 7, 2018

carryxyh Sep 7, 2018

kexianjun Sep 7, 2018

carryxyh Sep 7, 2018

kexianjun Sep 7, 2018

carryxyh Sep 7, 2018

kexianjun Sep 7, 2018

lexburner commented Sep 11, 2018

kexianjun commented Sep 11, 2018

[Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353 #2418

[Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353 #2418

Conversation

kexianjun commented Sep 1, 2018 • edited Loading

What is the purpose of the change

Brief changelog

Verifying this change

codecov-io commented Sep 2, 2018 • edited Loading

Codecov Report

lexburner commented Sep 7, 2018

carryxyh commented Sep 7, 2018

carryxyh Sep 7, 2018

Choose a reason for hiding this comment

carryxyh Sep 7, 2018

Choose a reason for hiding this comment

kexianjun Sep 7, 2018

Choose a reason for hiding this comment

carryxyh Sep 7, 2018

Choose a reason for hiding this comment

kexianjun Sep 7, 2018

Choose a reason for hiding this comment

carryxyh Sep 7, 2018

Choose a reason for hiding this comment

kexianjun Sep 7, 2018

Choose a reason for hiding this comment

lexburner commented Sep 11, 2018

kexianjun commented Sep 11, 2018

kexianjun commented Sep 1, 2018 •

edited

Loading

codecov-io commented Sep 2, 2018 •

edited

Loading