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/12/03 01:56:43 UTC
[dubbo] branch 2.7.5-release updated: fix gRPC support compiler bug
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.5-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.5-release by this push:
new 0edeffc fix gRPC support compiler bug
0edeffc is described below
commit 0edeffc6522e1fd846c6d2e30db05a093753e179
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Dec 3 09:56:23 2019 +0800
fix gRPC support compiler bug
---
compiler/pom.xml | 2 +-
.../main/resources/ReactorDubboGrpcStub.mustache | 4 +-
dubbo-distribution/src/assembly/source-release.xml | 2 -
dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml | 62 ----------------------
4 files changed, 3 insertions(+), 67 deletions(-)
diff --git a/compiler/pom.xml b/compiler/pom.xml
index d0df460..88f95e8 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -73,7 +73,7 @@
<configuration>
<archive>
<manifest>
- <!-- <addClasspath>true</addClasspath>-->
+ <addClasspath>true</addClasspath>
<mainClass>org.apache.dubbo.gen.grpc.DubboGrpcGenerator</mainClass>
</manifest>
</archive>
diff --git a/compiler/src/main/resources/ReactorDubboGrpcStub.mustache b/compiler/src/main/resources/ReactorDubboGrpcStub.mustache
index 919f62e..2cf1471 100644
--- a/compiler/src/main/resources/ReactorDubboGrpcStub.mustache
+++ b/compiler/src/main/resources/ReactorDubboGrpcStub.mustache
@@ -54,7 +54,7 @@ stub = {{serviceName}}Grpc.newStub(channel).build(channel, callOptions);
@java.lang.Deprecated
{{/deprecated}}
public {{#isManyOutput}}reactor.core.publisher.Flux{{/isManyOutput}}{{^isManyOutput}}reactor.core.publisher.Mono{{/isManyOutput}}<{{outputType}}> {{methodName}}({{#isManyInput}}reactor.core.publisher.Flux{{/isManyInput}}{{^isManyInput}}reactor.core.publisher.Mono{{/isManyInput}}<{{inputType}}> reactorRequest) {
- {{serviceName}}Grpc.ChatStub localStub = stub.withDeadlineAfter(url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT), TimeUnit.MILLISECONDS);
+ {{serviceName}}Grpc.{{serviceName}}Stub localStub = stub.withDeadlineAfter(url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT), TimeUnit.MILLISECONDS);
return com.salesforce.reactorgrpc.stub.ClientCalls.{{reactiveCallsMethodName}}(reactorRequest, localStub::{{methodName}});
}
@@ -67,7 +67,7 @@ stub = {{serviceName}}Grpc.newStub(channel).build(channel, callOptions);
@java.lang.Deprecated
{{/deprecated}}
public {{#isManyOutput}}reactor.core.publisher.Flux{{/isManyOutput}}{{^isManyOutput}}reactor.core.publisher.Mono{{/isManyOutput}}<{{outputType}}> {{methodName}}({{inputType}} reactorRequest) {
- {{serviceName}}Grpc.ChatStub localStub = stub.withDeadlineAfter(url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT), TimeUnit.MILLISECONDS);
+ {{serviceName}}Grpc.{{serviceName}}Stub localStub = stub.withDeadlineAfter(url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT), TimeUnit.MILLISECONDS);
return com.salesforce.reactorgrpc.stub.ClientCalls.{{reactiveCallsMethodName}}(reactor.core.publisher.Mono.just(reactorRequest), localStub::{{methodName}});
}
diff --git a/dubbo-distribution/src/assembly/source-release.xml b/dubbo-distribution/src/assembly/source-release.xml
index 1708f8f..2f26516 100644
--- a/dubbo-distribution/src/assembly/source-release.xml
+++ b/dubbo-distribution/src/assembly/source-release.xml
@@ -51,8 +51,6 @@
<exclude>**/*.jar</exclude>
<exclude>**/mvnw*</exclude>
<exclude>**/.flattened-pom.xml</exclude>
- <exclude>**/compiler/.gradle/**</exclude>
- <exclude>**/compiler/gradle/**</exclude>
</excludes>
</fileSet>
</fileSets>
diff --git a/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml b/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml
deleted file mode 100644
index 0963763..0000000
--- a/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>dubbo-rpc</artifactId>
- <groupId>org.apache.dubbo</groupId>
- <version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>dubbo-rpc-jsonrpc</artifactId>
-
- <description>The JSON-RPC module of dubbo project</description>
-
- <properties>
- <skip_maven_deploy>false</skip_maven_deploy>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-rpc-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-remoting-http</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.briandilley.jsonrpc4j</groupId>
- <artifactId>jsonrpc4j</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
- </dependencies>
-
-
-</project>
\ No newline at end of file