You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/11/15 07:25:03 UTC
[dubbo] branch master updated (610b3e6 -> 562bfcc)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 610b3e6 fix grpc impl proxy problem
new dc58382 change protoc compiler version to SNAPSHOT
new 3512e27 change from throwing exception to logging warn message for duplicate configs
new 562bfcc Add comments for gRPC implementations
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
compiler/build.gradle | 2 +-
.../src/main/java/org/apache/dubbo/config/context/ConfigManager.java | 2 +-
.../main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java | 5 +++--
.../dubbo/rpc/protocol/grpc/interceptors/ClientInterceptor.java | 3 +++
.../dubbo/rpc/protocol/grpc/interceptors/RpcContextInterceptor.java | 2 +-
.../dubbo/rpc/protocol/grpc/interceptors/ServerInterceptor.java | 3 +++
.../dubbo/rpc/protocol/grpc/interceptors/ServerTransportFilter.java | 3 +++
7 files changed, 15 insertions(+), 5 deletions(-)
[dubbo] 02/03: change from throwing exception to logging warn
message for duplicate configs
Posted by li...@apache.org.
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
commit 3512e27669f051ae04c76ba3bb2893f439ee06c9
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Nov 15 13:56:41 2019 +0800
change from throwing exception to logging warn message for duplicate configs
---
.../src/main/java/org/apache/dubbo/config/context/ConfigManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index b7efb4f..4175c2e 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -445,7 +445,7 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt {
private static void checkDuplicate(AbstractConfig oldOne, AbstractConfig newOne) throws IllegalStateException {
if (oldOne != null && !oldOne.equals(newOne)) {
String configName = oldOne.getClass().getSimpleName();
- throw new IllegalStateException("Duplicate Config found for " + configName + ", you should use only one unique " + configName + " for one application.");
+ logger.warn("Duplicate Config found for " + configName + ", you should use only one unique " + configName + " for one application.");
}
}
[dubbo] 01/03: change protoc compiler version to SNAPSHOT
Posted by li...@apache.org.
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
commit dc583821a462e964a9390bf606cc01bd7ec36698
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Nov 15 13:55:40 2019 +0800
change protoc compiler version to SNAPSHOT
---
compiler/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler/build.gradle b/compiler/build.gradle
index 8cbb08d..f94fef7 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -2,7 +2,7 @@ apply plugin: "cpp"
apply plugin: "com.google.protobuf"
group = "org.apache.dubbo"
-version = "1.19.0" // CURRENT_GRPC_VERSION
+version = "1.19.0-SNAPSHOT" // CURRENT_GRPC_VERSION
description = 'The protoc plugin for gRPC Java'
[dubbo] 03/03: Add comments for gRPC implementations
Posted by li...@apache.org.
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
commit 562bfcc16a3f63e9f207726b2b7f4981d6aa9df3
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Nov 15 15:24:40 2019 +0800
Add comments for gRPC implementations
---
.../main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java | 5 +++--
.../dubbo/rpc/protocol/grpc/interceptors/ClientInterceptor.java | 3 +++
.../dubbo/rpc/protocol/grpc/interceptors/RpcContextInterceptor.java | 2 +-
.../dubbo/rpc/protocol/grpc/interceptors/ServerInterceptor.java | 3 +++
.../dubbo/rpc/protocol/grpc/interceptors/ServerTransportFilter.java | 3 +++
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java
index aa862a5..83aaf7b 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java
@@ -85,10 +85,11 @@ public class GrpcProtocol extends AbstractProxyProtocol {
Class<?> implClass = originalImpl.getClass();
try {
- Method method = implClass.getDeclaredMethod("setProxiedImpl", type);
+ Method method = implClass.getMethod("setProxiedImpl", type);
method.invoke(originalImpl, proxiedImpl);
} catch (Exception e) {
- throw new IllegalStateException();
+ throw new IllegalStateException("Failed to set dubbo proxied service impl to stub, please make sure your stub " +
+ "was generated by the dubbo-protoc-compiler.", e);
}
grpcServer.getRegistry().addService((BindableService) originalImpl, url.getServiceKey());
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ClientInterceptor.java b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ClientInterceptor.java
index 841b503..c97fec9 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ClientInterceptor.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ClientInterceptor.java
@@ -18,6 +18,9 @@ package org.apache.dubbo.rpc.protocol.grpc.interceptors;
import org.apache.dubbo.common.extension.SPI;
+/**
+ * Adapt to the standard Dubbo SPI, so that we can leverage the advantages of Dubbo ExtensionLoader.
+ */
@SPI
public interface ClientInterceptor extends io.grpc.ClientInterceptor {
}
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/RpcContextInterceptor.java b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/RpcContextInterceptor.java
index 88c18ce..31059e8 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/RpcContextInterceptor.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/RpcContextInterceptor.java
@@ -34,7 +34,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
/**
- * From gRPC's
+ * Hand over context information from Dubbo to gRPC.
*/
@Activate(group = {PROVIDER, CONSUMER})
public class RpcContextInterceptor implements ClientInterceptor, ServerInterceptor {
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerInterceptor.java b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerInterceptor.java
index fa876bc..a4c9a37 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerInterceptor.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerInterceptor.java
@@ -18,6 +18,9 @@ package org.apache.dubbo.rpc.protocol.grpc.interceptors;
import org.apache.dubbo.common.extension.SPI;
+/**
+ * Adapt to the standard Dubbo SPI, so that we can leverage the advantages of Dubbo ExtensionLoader.
+ */
@SPI
public interface ServerInterceptor extends io.grpc.ServerInterceptor {
}
diff --git a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerTransportFilter.java b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerTransportFilter.java
index aa8dda9..db815dc 100644
--- a/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerTransportFilter.java
+++ b/dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/interceptors/ServerTransportFilter.java
@@ -18,6 +18,9 @@ package org.apache.dubbo.rpc.protocol.grpc.interceptors;
import org.apache.dubbo.common.extension.SPI;
+/**
+ * Adapt to the standard Dubbo SPI, so that we can leverage the advantages of Dubbo ExtensionLoader.
+ */
@SPI
public interface ServerTransportFilter {
io.grpc.ServerTransportFilter grpcTransportFilter();