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/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new cea3de7 Refactor, revert ReferenceConfigCache package change
cea3de7 is described below
commit cea3de7b3804323badef97008632e6d83e3a1177
Author: ken.lj <[email protected]>
AuthorDate: Thu Oct 31 16:23:11 2019 +0800
Refactor, revert ReferenceConfigCache package change
---
compiler/.gradle/4.9/fileContent/fileContent.lock | Bin 17 -> 17 bytes
compiler/.gradle/4.9/fileContent/parsedCSource.bin | Bin 4543839 -> 4544531
bytes
compiler/.gradle/4.9/fileHashes/fileHashes.bin | Bin 883035 -> 883135 bytes
compiler/.gradle/4.9/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes
.../.gradle/4.9/nativeCompile/nativeCompile.bin | Bin 62218 -> 62218 bytes
.../.gradle/4.9/nativeCompile/nativeCompile.lock | Bin 17 -> 17 bytes
compiler/.gradle/4.9/taskHistory/taskHistory.bin | Bin 12084605 -> 12084605
bytes
compiler/.gradle/4.9/taskHistory/taskHistory.lock | Bin 17 -> 17 bytes
.../buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 17 bytes
.../.gradle/buildOutputCleanup/outputFiles.bin | Bin 57803 -> 57857 bytes
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 1 +
.../utils}/ReferenceConfigCache.java | 3 +-
.../apache/dubbo/config/spring/ReferenceBean.java | 2 +-
.../ReferenceAnnotationBeanPostProcessorTest.java | 2 +-
.../remoting/{Transporter.java => Server.java} | 5 +-
.../com/alibaba/dubbo/remoting/Transporter.java | 60 +++++++++++++++++++++
.../apache/dubbo/demo/consumer/Application.java | 2 +-
.../legacy/service/generic/GenericServiceTest.java | 2 +-
18 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/compiler/.gradle/4.9/fileContent/fileContent.lock
b/compiler/.gradle/4.9/fileContent/fileContent.lock
index 30f4129..e67948a 100644
Binary files a/compiler/.gradle/4.9/fileContent/fileContent.lock and
b/compiler/.gradle/4.9/fileContent/fileContent.lock differ
diff --git a/compiler/.gradle/4.9/fileContent/parsedCSource.bin
b/compiler/.gradle/4.9/fileContent/parsedCSource.bin
index d520ea6..75425a8 100644
Binary files a/compiler/.gradle/4.9/fileContent/parsedCSource.bin and
b/compiler/.gradle/4.9/fileContent/parsedCSource.bin differ
diff --git a/compiler/.gradle/4.9/fileHashes/fileHashes.bin
b/compiler/.gradle/4.9/fileHashes/fileHashes.bin
index 9c85376..bc281ac 100644
Binary files a/compiler/.gradle/4.9/fileHashes/fileHashes.bin and
b/compiler/.gradle/4.9/fileHashes/fileHashes.bin differ
diff --git a/compiler/.gradle/4.9/fileHashes/fileHashes.lock
b/compiler/.gradle/4.9/fileHashes/fileHashes.lock
index a6f3649..fb42e88 100644
Binary files a/compiler/.gradle/4.9/fileHashes/fileHashes.lock and
b/compiler/.gradle/4.9/fileHashes/fileHashes.lock differ
diff --git a/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin
b/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin
index 72cf47a..52fa87c 100644
Binary files a/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin and
b/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin differ
diff --git a/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock
b/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock
index f3aa1b3..44cae06 100644
Binary files a/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock and
b/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock differ
diff --git a/compiler/.gradle/4.9/taskHistory/taskHistory.bin
b/compiler/.gradle/4.9/taskHistory/taskHistory.bin
index 51c48d0..55bc23c 100644
Binary files a/compiler/.gradle/4.9/taskHistory/taskHistory.bin and
b/compiler/.gradle/4.9/taskHistory/taskHistory.bin differ
diff --git a/compiler/.gradle/4.9/taskHistory/taskHistory.lock
b/compiler/.gradle/4.9/taskHistory/taskHistory.lock
index b52f3b6..5f31fc0 100644
Binary files a/compiler/.gradle/4.9/taskHistory/taskHistory.lock and
b/compiler/.gradle/4.9/taskHistory/taskHistory.lock differ
diff --git a/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock
b/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index b9c10e9..009acc6 100644
Binary files a/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock and
b/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/compiler/.gradle/buildOutputCleanup/outputFiles.bin
b/compiler/.gradle/buildOutputCleanup/outputFiles.bin
index a82673e..8bd6f36 100644
Binary files a/compiler/.gradle/buildOutputCleanup/outputFiles.bin and
b/compiler/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git
a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
index a9c31f3..6281366 100644
---
a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
+++
b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
@@ -61,6 +61,7 @@ import
org.apache.dubbo.config.invoker.DelegateProviderMetaDataInvoker;
import org.apache.dubbo.config.metadata.ConfigurableMetadataServiceExporter;
import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.config.service.ServiceConfig;
+import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.event.Event;
import org.apache.dubbo.event.EventDispatcher;
import org.apache.dubbo.event.EventListener;
diff --git
a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/ReferenceConfigCache.java
b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
similarity index 99%
rename from
dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/ReferenceConfigCache.java
rename to
dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
index c509570..925e1e9 100644
---
a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/ReferenceConfigCache.java
+++
b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.bootstrap;
+package org.apache.dubbo.config.utils;
+import org.apache.dubbo.bootstrap.BootstrapUtils;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.bytecode.Wrapper;
diff --git
a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
index 08b00cf..26ca08e 100644
---
a/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
+++
b/dubbo-bootstrap/dubbo-bootstrap-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
@@ -16,11 +16,11 @@
*/
package org.apache.dubbo.config.spring;
-import org.apache.dubbo.bootstrap.ReferenceConfigCache;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
import org.apache.dubbo.config.support.Parameter;
+import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.DisposableBean;
diff --git
a/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
b/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
index c7a444f..83ec889 100644
---
a/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
+++
b/dubbo-bootstrap/dubbo-bootstrap-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.dubbo.config.spring.beans.factory.annotation;
-import org.apache.dubbo.bootstrap.ReferenceConfigCache;
import org.apache.dubbo.config.annotation.Method;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.api.HelloService;
+import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Transporter.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Server.java
similarity index 89%
copy from
dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Transporter.java
copy to dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Server.java
index 72d81fd..2ad23d6 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Transporter.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Server.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package com.alibaba.dubbo.remoting;
+import org.apache.dubbo.remoting.RemotingServer;
+
@Deprecated
-public interface Transporter extends org.apache.dubbo.remoting.Transporter {
+public interface Server extends RemotingServer {
}
diff --git
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Transporter.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Transporter.java
index 72d81fd..3dcc143 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Transporter.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Transporter.java
@@ -17,6 +17,66 @@
package com.alibaba.dubbo.remoting;
+import org.apache.dubbo.common.extension.Adaptive;
+import org.apache.dubbo.remoting.Constants;
+import org.apache.dubbo.remoting.RemotingServer;
+
+import com.alibaba.dubbo.common.URL;
+
@Deprecated
public interface Transporter extends org.apache.dubbo.remoting.Transporter {
+
+ @Adaptive({Constants.SERVER_KEY, Constants.TRANSPORTER_KEY})
+ Server bind(URL url, ChannelHandler handler) throws RemotingException;
+
+ @Override
+ default RemotingServer bind(org.apache.dubbo.common.URL url,
org.apache.dubbo.remoting.ChannelHandler handler)
+ throws org.apache.dubbo.remoting.RemotingException {
+ return bind(new URL(url), new ChannelHandler() {
+ @Override
+ public void connected(Channel channel) throws RemotingException {
+ try {
+ handler.connected(channel);
+ } catch (org.apache.dubbo.remoting.RemotingException e) {
+ throw new RemotingException(e);
+ }
+ }
+
+ @Override
+ public void disconnected(Channel channel) throws RemotingException
{
+ try {
+ handler.disconnected(channel);
+ } catch (org.apache.dubbo.remoting.RemotingException e) {
+ throw new RemotingException(e);
+ }
+ }
+
+ @Override
+ public void sent(Channel channel, Object message) throws
RemotingException {
+ try {
+ handler.sent(channel, message);
+ } catch (org.apache.dubbo.remoting.RemotingException e) {
+ throw new RemotingException(e);
+ }
+ }
+
+ @Override
+ public void received(Channel channel, Object message) throws
RemotingException {
+ try {
+ handler.received(channel, message);
+ } catch (org.apache.dubbo.remoting.RemotingException e) {
+ throw new RemotingException(e);
+ }
+ }
+
+ @Override
+ public void caught(Channel channel, Throwable exception) throws
RemotingException {
+ try {
+ handler.caught(channel, exception);
+ } catch (org.apache.dubbo.remoting.RemotingException e) {
+ throw new RemotingException(e);
+ }
+ }
+ });
+ }
}
diff --git
a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
index 7e1de6e..67f739e 100644
---
a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
+++
b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
@@ -19,10 +19,10 @@
package org.apache.dubbo.demo.consumer;
import org.apache.dubbo.bootstrap.DubboBootstrap;
-import org.apache.dubbo.bootstrap.ReferenceConfigCache;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.service.ReferenceConfig;
+import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.demo.DemoService;
public class Application {
diff --git
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java
index 67fd22b..3cf1308 100644
---
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java
+++
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/service/generic/GenericServiceTest.java
@@ -19,7 +19,6 @@
package org.apache.dubbo.qos.legacy.service.generic;
import org.apache.dubbo.bootstrap.DubboBootstrap;
-import org.apache.dubbo.bootstrap.ReferenceConfigCache;
import org.apache.dubbo.common.beanutil.JavaBeanAccessor;
import org.apache.dubbo.common.beanutil.JavaBeanDescriptor;
import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil;
@@ -31,6 +30,7 @@ import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.service.ReferenceConfig;
import org.apache.dubbo.config.service.ServiceConfig;
+import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
