[version 2.7.0]remove the StaticContext class and refactor the code related to Async #2688

Jeff-Lv · 2018-10-25T12:55:41Z

What is the purpose of the change

The class StaticContext is a Map which place anything to it and it will leave design risks if StaticContext is used easily and everywhere.

Verifying this change

remove the class StaticContext
fix the testcases
refactor the part of using StaticContext which is mainly about Async

merge from master's apache

this commits is no need to commit to remote repo.

codecov-io · 2018-10-26T02:45:04Z

Codecov Report

Merging #2688 into master will increase coverage by 0.11%.
The diff coverage is 77.59%.

@@            Coverage Diff             @@
##           master    #2688      +/-   ##
==========================================
+ Coverage   63.24%   63.35%   +0.11%     
==========================================
  Files         573      578       +5     
  Lines       25763    25963     +200     
  Branches     4533     4547      +14     
==========================================
+ Hits        16294    16450     +156     
- Misses       7320     7352      +32     
- Partials     2149     2161      +12

Impacted Files	Coverage Δ
...a/org/apache/dubbo/rpc/model/ApplicationModel.java	`92.85% <ø> (+7.14%)`	⬆️
...java/org/apache/dubbo/rpc/model/ProviderModel.java	`52.94% <ø> (ø)`	⬆️
...java/org/apache/dubbo/rpc/model/ConsumerModel.java	`64.28% <100%> (+5.95%)`	⬆️
...rg/apache/dubbo/rpc/model/ConsumerMethodModel.java	`81.39% <100%> (+21.39%)`	⬆️
...n/java/org/apache/dubbo/config/AbstractConfig.java	`73.68% <73.68%> (-3.11%)`	⬇️
.../java/org/apache/dubbo/config/ReferenceConfig.java	`56.27% <87.5%> (+0.79%)`	⬆️
.../dubbo/rpc/protocol/dubbo/filter/FutureFilter.java	`65.42% <96.15%> (+6.32%)`	⬆️
...a/org/apache/dubbo/rpc/filter/AccessLogFilter.java	`52.22% <0%> (-18.89%)`	⬇️
...onfig/spring/extension/SpringExtensionFactory.java	`75.86% <0%> (-10.35%)`	⬇️
...rpc/cluster/loadbalance/RoundRobinLoadBalance.java	`85.29% <0%> (-8.46%)`	⬇️
... and 22 more

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 7286e23...4cba125. Read the comment docs.

beiwei30

in the files you touched, pls. also consider to change its pair class under compat package.

dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java

beiwei30 · 2018-10-26T06:10:14Z

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java

+import org.apache.dubbo.common.utils.ConfigUtils;
+import org.apache.dubbo.common.utils.ReflectUtils;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.config.DubboShutdownHook;


unused imports.

beiwei30 · 2018-10-26T06:11:00Z

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java

+        for (Method method : methods) {
+            try {
+                Parameter parameter = method.getAnnotation(Parameter.class);
+                if (parameter == null || !parameter.attribute())


pls. use {...}

beiwei30 · 2018-10-26T06:12:46Z

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java

+
+        //check config conflict
+        if (Boolean.FALSE.equals(methodConfig.isReturn()) && (methodConfig.getOnreturn() != null || methodConfig.getOnthrow() != null)) {
+            throw new IllegalStateException("method config error : return attribute must be set true when onreturn or onthrow has been setted.");


setted is typo

beiwei30 · 2018-10-26T06:25:58Z

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

                    }
                }
-                appendAttributes(attributes, method, prefix + "." + method.getName());
-                checkAndConvertImplicitConfig(method, map, attributes);
+                attributes.put(methodConfig.getName(), convertMethodConfig2AyncInfo(methodConfig));


why remove appendAttributes(attributes, method, prefix + "." + method.getName());

appendAttributes(attributes, method, prefix + "." + method.getName()); checkAndConvertImplicitConfig(method, map, attributes);

Those above methods is only for the storing async attributes to StaticContext.

beiwei30 · 2018-10-26T06:29:11Z

dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java

+     */
+    public ConsumerMethodModel getMethodModel(String method) {
+        Optional<Map.Entry<Method, ConsumerMethodModel>> consumerMethodModelEntry = methodModels.entrySet().stream().filter(entry -> entry.getKey().getName().equals(method)).findFirst();
+        return consumerMethodModelEntry.isPresent() ? consumerMethodModelEntry.get().getValue() : null;


IDE hint:

return consumerMethodModelEntry.map(Map.Entry::getValue).orElse(null);

yeh, this hint is good.

beiwei30 · 2018-10-26T06:31:29Z

...c/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java

-        final Method onInvokeMethod = (Method) StaticContext.getSystemContext().get(StaticContext.getKey(invoker.getUrl(), invocation.getMethodName(), Constants.ON_INVOKE_METHOD_KEY));
-        final Object onInvokeInst = StaticContext.getSystemContext().get(StaticContext.getKey(invoker.getUrl(), invocation.getMethodName(), Constants.ON_INVOKE_INSTANCE_KEY));
+        final ConsumerMethodModel.AsyncMethodInfo asyncMethodInfo = getAsyncMethodInfo(invoker, invocation);
+        if (asyncMethodInfo == null) return;


pls. consider to use {...}.

beiwei30 · 2018-10-26T06:36:06Z

...c/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java

-        final Method onReturnMethod = (Method) StaticContext.getSystemContext().get(StaticContext.getKey(invoker.getUrl(), invocation.getMethodName(), Constants.ON_RETURN_METHOD_KEY));
-        final Object onReturnInst = StaticContext.getSystemContext().get(StaticContext.getKey(invoker.getUrl(), invocation.getMethodName(), Constants.ON_RETURN_INSTANCE_KEY));
+        final ConsumerMethodModel.AsyncMethodInfo asyncMethodInfo = getAsyncMethodInfo(invoker, invocation);
+        if (asyncMethodInfo == null) return;


consider to use {...}

kimmking · 2018-10-28T06:32:27Z

dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java


-    public static final String ON_RETURN_METHOD_KEY = "onreturn.method";


why rename?

kimmking · 2018-10-28T06:34:38Z

...c/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java

-        final Method onthrowMethod = (Method) StaticContext.getSystemContext().get(StaticContext.getKey(invoker.getUrl(), invocation.getMethodName(), Constants.ON_THROW_METHOD_KEY));
-        final Object onthrowInst = StaticContext.getSystemContext().get(StaticContext.getKey(invoker.getUrl(), invocation.getMethodName(), Constants.ON_THROW_INSTANCE_KEY));
+        final ConsumerMethodModel.AsyncMethodInfo asyncMethodInfo = getAsyncMethodInfo(invoker, invocation);
+        if (asyncMethodInfo == null) return;


Jeff-Lv · 2018-10-29T09:40:14Z

I just commits the changes according to @beiwei30 @kimmking advices.

revert the Constants value changes. I used to use the values of async contants to map the properties of AsyncMethodInfo which is not allowed to the xxx.xxx and it was OK formerly when it is used as the key of StaticContext's map. So I changes those values. But the finally refactor is no more need those references.
fix the types and format {}

…elated 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

@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

…elated 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

@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

kongming and others added 11 commits October 11, 2018 15:36

[Dubbo] move the classes of model from config to rpc-api for reusing

c78648a

remove ServiceClassHolder and use the ApplicationModel replacedly

eb471ae

fix the merge from remote

6ed1e77

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

28b1a9b

merge from master's apache

[Dubbo] delete the unused imported of ApplicationModel

0e32a90

Update dubbo-demo-consumer.xml

a9bfc36

this commits is no need to commit to remote repo.

remove StaticContext

ea6af2d

fix the merging confict

185e940

Merge branch 'master' of github.com:Jeff-Lv/incubator-dubbo

42efd66

remove the unused imported classes of ReferenceConfig

0c86419

fix NPE of ConsumerModel

5a69aa0

fix the failed testcase of AbstractClusterInvokerTest

a2d5d3a

chickenlj self-assigned this Oct 26, 2018

beiwei30 requested changes Oct 26, 2018

View reviewed changes

kimmking reviewed Oct 28, 2018

View reviewed changes

[Dubbo] #PR2688 to fix the review issues

4cba125

beiwei30 approved these changes Oct 30, 2018

View reviewed changes

beiwei30 merged commit 36a1155 into apache:master Oct 30, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[version 2.7.0]remove the StaticContext class and refactor the code related to Async #2688

[version 2.7.0]remove the StaticContext class and refactor the code related to Async #2688

Jeff-Lv commented Oct 25, 2018 •

edited

Loading

codecov-io commented Oct 26, 2018 •

edited

Loading

beiwei30 left a comment

beiwei30 Oct 26, 2018

beiwei30 Oct 26, 2018

beiwei30 Oct 26, 2018

beiwei30 Oct 26, 2018

Jeff-Lv Oct 29, 2018

beiwei30 Oct 26, 2018

Jeff-Lv Oct 29, 2018

beiwei30 Oct 26, 2018

beiwei30 Oct 26, 2018

kimmking Oct 28, 2018

kimmking Oct 28, 2018

Jeff-Lv commented Oct 29, 2018 •

edited

Loading


		public static final String ON_RETURN_METHOD_KEY = "onreturn.method";

[version 2.7.0]remove the StaticContext class and refactor the code related to Async #2688

[version 2.7.0]remove the StaticContext class and refactor the code related to Async #2688

Conversation

Jeff-Lv commented Oct 25, 2018 • edited Loading

What is the purpose of the change

Verifying this change

codecov-io commented Oct 26, 2018 • edited Loading

Codecov Report

beiwei30 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jeff-Lv commented Oct 29, 2018 • edited Loading

Jeff-Lv commented Oct 25, 2018 •

edited

Loading

codecov-io commented Oct 26, 2018 •

edited

Loading

Jeff-Lv commented Oct 29, 2018 •

edited

Loading