You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dm...@apache.org on 2019/06/26 19:17:23 UTC
[camel] branch master updated (ca0b490 -> 58330e6)
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ca0b490 CAMEL-13683: camel-main - configuring properties report better error if missing JARs on classpathand other mistakes.
new 84313d7 CAMEL-13209 Upgrading GRPC version to 1.20.0 Also upgrading associated dependencies and needed refactoring
new f478bca CAMEL-13209 Raising protobuf-maven-plugin-version to 0.6.1
new f5fd384 CAMEL-13209 Making use of non-deprecated method
new f2e9247 CAMEL-13209 correcting version of grpc-errorprone-version to 2.3.2
new d79b90c CAMEL-13209 Upgrading gRPC JWT version to 3.7.0
new 8294d6f CAMEL-13209 Uncommenting @Ignore from Test classes Works out of the box
new 9937529 CAMEL-13209 Fixing intermittent failure by increasing the sleep time of the main thread
new 4f86b29 CAMEL-13209 Adding documentation for additional lib installation per OS
new cc56f5d CAMEL-13209: Fix test issue
new cd7942c CAMEL-13209: Upgrade to gRPC 1.21.0 and fix SpringBoot test
new 48f7633 CAMEL-13209: Update protobuf to 3.7.1
new 58330e6 CAMEL-13209: Fix Karaf tests close #2924
The 12 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:
.../camel-grpc/src/main/docs/grpc-component.adoc | 7 +++--
.../apache/camel/component/grpc/GrpcConsumer.java | 32 +++++++++++-----------
.../grpc/auth/jwt/JwtCallCredentials.java | 14 ++++++----
.../component/grpc/GrpcProducerAsyncTest.java | 12 ++++----
.../component/grpc/GrpcProducerStreamingTest.java | 10 ++-----
parent/pom.xml | 21 +++++++-------
.../karaf/features/src/main/resources/features.xml | 7 +++--
.../components-starter/camel-grpc-starter/pom.xml | 8 ------
.../itest/springboot/util/ArquillianPackager.java | 1 +
9 files changed, 53 insertions(+), 59 deletions(-)
[camel] 11/12: CAMEL-13209: Update protobuf to 3.7.1
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 48f7633bb4047b848a3d0943188072a5fb968cd6
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Wed Jun 26 17:57:44 2019 +0300
CAMEL-13209: Update protobuf to 3.7.1
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 864f7ce..5eb6cae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -535,7 +535,7 @@
<olingo4-version>4.6.0</olingo4-version>
<ognl-version>3.1.12</ognl-version>
<ognl-bundle-version>3.1.12_1</ognl-bundle-version>
- <opencensus-api-version>0.12.3</opencensus-api-version>
+ <opencensus-api-version>0.21.0</opencensus-api-version>
<oncrpc-version>1.1.3</oncrpc-version>
<openejb-version>4.7.5</openejb-version>
<openjpa-version>2.4.3</openjpa-version>
@@ -561,7 +561,7 @@
<pdfbox-version>2.0.15</pdfbox-version>
<pgjdbc-ng-driver-version>0.8.2</pgjdbc-ng-driver-version>
<properties-maven-plugin-version>1.0-alpha-2</properties-maven-plugin-version>
- <protobuf-version>3.5.1</protobuf-version>
+ <protobuf-version>3.7.1</protobuf-version>
<protobuf-javanano-version>3.1.0</protobuf-javanano-version>
<protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
<protonpack-version>1.8</protonpack-version>
[camel] 04/12: CAMEL-13209 correcting version of
grpc-errorprone-version to 2.3.2
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f2e9247ae01ed2e948c0ca0a02946ef28883f904
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Fri May 17 20:15:41 2019 +0200
CAMEL-13209 correcting version of grpc-errorprone-version to 2.3.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index faaedc7..eae6d50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -264,7 +264,7 @@
<grpc-java-jwt-version>3.2.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.22.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-bundle-version>1.20.0_1</grpc-bundle-version>
- <grpc-errorprone-version>2.3.0</grpc-errorprone-version>
+ <grpc-errorprone-version>2.3.2</grpc-errorprone-version>
<gson-version>2.8.5</gson-version>
<guice3-version>3.0</guice3-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
[camel] 05/12: CAMEL-13209 Upgrading gRPC JWT version to 3.7.0
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d79b90ca10afacb980e00c4cfb4795f7db263bca
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Fri May 17 23:32:12 2019 +0200
CAMEL-13209 Upgrading gRPC JWT version to 3.7.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index eae6d50..1ba5236 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -261,7 +261,7 @@
<grpc-version>1.20.0</grpc-version>
<grpc-google-auth-library-version>0.13.0</grpc-google-auth-library-version>
<grpc-guava-version>26.0-android</grpc-guava-version>
- <grpc-java-jwt-version>3.2.0</grpc-java-jwt-version>
+ <grpc-java-jwt-version>3.7.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.22.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-bundle-version>1.20.0_1</grpc-bundle-version>
<grpc-errorprone-version>2.3.2</grpc-errorprone-version>
[camel] 02/12: CAMEL-13209 Raising protobuf-maven-plugin-version to
0.6.1
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f478bca25bf248e88644f2e0cc9a3237004a0111
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Fri May 17 20:10:42 2019 +0200
CAMEL-13209 Raising protobuf-maven-plugin-version to 0.6.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ea30dc7..faaedc7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -563,7 +563,7 @@
<properties-maven-plugin-version>1.0-alpha-2</properties-maven-plugin-version>
<protobuf-version>3.5.1</protobuf-version>
<protobuf-javanano-version>3.1.0</protobuf-javanano-version>
- <protobuf-maven-plugin-version>0.5.1</protobuf-maven-plugin-version>
+ <protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
<protonpack-version>1.8</protonpack-version>
<pubnub-version>4.25.0</pubnub-version>
<pulsar-version>2.3.1</pulsar-version>
[camel] 10/12: CAMEL-13209: Upgrade to gRPC 1.21.0 and fix
SpringBoot test
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cd7942cf0053f480334b05c1df46449961fa6d52
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Wed Jun 26 15:18:54 2019 +0300
CAMEL-13209: Upgrade to gRPC 1.21.0 and fix SpringBoot test
---
parent/pom.xml | 4 ++--
.../org/apache/camel/itest/springboot/util/ArquillianPackager.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1ba5236..864f7ce 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -258,12 +258,12 @@
<google-mail-guava-version>17.0</google-mail-guava-version>
<google-truth-version>0.30</google-truth-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
- <grpc-version>1.20.0</grpc-version>
+ <grpc-version>1.21.0</grpc-version>
<grpc-google-auth-library-version>0.13.0</grpc-google-auth-library-version>
<grpc-guava-version>26.0-android</grpc-guava-version>
<grpc-java-jwt-version>3.7.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.22.Final</grpc-netty-tcnative-boringssl-static-version>
- <grpc-bundle-version>1.20.0_1</grpc-bundle-version>
+ <grpc-bundle-version>1.21.0_1</grpc-bundle-version>
<grpc-errorprone-version>2.3.2</grpc-errorprone-version>
<gson-version>2.8.5</gson-version>
<guice3-version>3.0</guice3-version>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index 1104859..fd43610 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -309,6 +309,7 @@ public final class ArquillianPackager {
ignore.add("io.netty:netty:jar"); // an old version
ignore.add("io.netty:netty-tcnative-boringssl-static");
ignore.add("io.swagger:swagger-parser");
+ ignore.add("io.opencensus:opencensus-");
ignore.add("io.opentracing.contrib:opentracing-");
ignore.add("org.apache.commons");
ignore.add("org.apache.curator");
[camel] 08/12: CAMEL-13209 Adding documentation for additional lib
installation per OS
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4f86b29085c57a1ccbda76ec0d3bf416731f8408
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Thu May 30 22:38:57 2019 +0200
CAMEL-13209 Adding documentation for additional lib installation per OS
---
components/camel-grpc/src/main/docs/grpc-component.adoc | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/components/camel-grpc/src/main/docs/grpc-component.adoc b/components/camel-grpc/src/main/docs/grpc-component.adoc
index 08f106d..123dbc1 100644
--- a/components/camel-grpc/src/main/docs/grpc-component.adoc
+++ b/components/camel-grpc/src/main/docs/grpc-component.adoc
@@ -4,7 +4,7 @@
*Available as of Camel version 2.19*
The gRPC component allows you to call or expose Remote Procedure Call (RPC) services
-using https://developers.google.com/protocol-buffers/docs/overview[Protocol Buffers (protobuf)]
+using https://developers.google.com/protocol-buffers/docs/overview[Protocol Buffers (protobuf)]
exchange format over HTTP/2 transport.
Maven users will need to add the following dependency to their `pom.xml`
@@ -168,6 +168,9 @@ To enable these features the following component properties combinations must be
TLS with OpenSSL is currently the recommended approach for using gRPC over TLS component.
Using the JDK for ALPN is generally much slower and may not support the necessary ciphers for HTTP2. This function is not implemented in the component.
+There might be a need to install additional libraries according to the Operating System of choice.
+For more information consult https://github.com/grpc/grpc-java/blob/master/SECURITY.md[the Security page of gRPC].
+
### gRPC producer resource type mapping
The table below shows the types of objects in the message body, depending on the types (simple or stream) of incoming and outgoing parameters, as well as the invocation style (synchronous or asynchronous). Please note, that invocation of the procedures with incoming stream parameter in asynchronous style are not allowed.
@@ -267,7 +270,7 @@ It's it is recommended to use Maven Protocol Buffers Plugin which calls Protocol
Following steps are required:
-Insert operating system and CPU architecture detection extension inside **<build>** tag of the project pom.xml or set ${os.detected.classifier} parameter manually
+Insert operating system and CPU architecture detection extension inside **<build>** tag of the project pom.xml or set ${os.detected.classifier} parameter manually
[source,xml]
-------------------------------------------------------------------------
<extensions>
[camel] 01/12: CAMEL-13209 Upgrading GRPC version to 1.20.0 Also
upgrading associated dependencies and needed refactoring
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 84313d7891ed1a1be3816c4b4dbf21d0e5a105df
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Fri May 17 01:27:02 2019 +0200
CAMEL-13209 Upgrading GRPC version to 1.20.0
Also upgrading associated dependencies and needed refactoring
---
.../camel/component/grpc/auth/jwt/JwtCallCredentials.java | 14 ++++++++------
parent/pom.xml | 12 ++++++------
.../components-starter/camel-grpc-starter/pom.xml | 8 --------
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java
index 9a051e8..f1b1060 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java
@@ -27,10 +27,12 @@ import org.apache.camel.component.grpc.GrpcConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static io.grpc.internal.GrpcAttributes.ATTR_LB_ADDR_AUTHORITY;
+
/**
- * JSON Web Token client credentials generator and injector
+ * JSON Web Token client credentials generator and injector
*/
-public class JwtCallCredentials implements CallCredentials {
+public class JwtCallCredentials extends CallCredentials {
private static final Logger LOG = LoggerFactory.getLogger(JwtCallCredentials.class);
private final String jwtToken;
@@ -39,8 +41,8 @@ public class JwtCallCredentials implements CallCredentials {
}
@Override
- public void applyRequestMetadata(MethodDescriptor<?, ?> method, Attributes attrs, Executor executor, MetadataApplier applier) {
- String authority = attrs.get(ATTR_AUTHORITY);
+ public void applyRequestMetadata(RequestInfo requestInfo, Executor executor, MetadataApplier metadataApplier) {
+ String authority = requestInfo.getTransportAttrs().get(ATTR_LB_ADDR_AUTHORITY);
LOG.debug("Using authority {} for credentials", authority);
executor.execute(new Runnable() {
@@ -51,10 +53,10 @@ public class JwtCallCredentials implements CallCredentials {
Metadata headers = new Metadata();
Metadata.Key<String> jwtKey = GrpcConstants.GRPC_JWT_METADATA_KEY;
headers.put(jwtKey, jwtToken);
- applier.apply(headers);
+ metadataApplier.apply(headers);
} catch (Throwable e) {
LOG.debug("Unable to set metadata credentials header", e);
- applier.fail(Status.UNAUTHENTICATED.withCause(e));
+ metadataApplier.fail(Status.UNAUTHENTICATED.withCause(e));
}
}
});
diff --git a/parent/pom.xml b/parent/pom.xml
index 300a774..ea30dc7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -258,13 +258,13 @@
<google-mail-guava-version>17.0</google-mail-guava-version>
<google-truth-version>0.30</google-truth-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
- <grpc-version>1.15.0</grpc-version>
- <grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
- <grpc-guava-version>20.0</grpc-guava-version>
+ <grpc-version>1.20.0</grpc-version>
+ <grpc-google-auth-library-version>0.13.0</grpc-google-auth-library-version>
+ <grpc-guava-version>26.0-android</grpc-guava-version>
<grpc-java-jwt-version>3.2.0</grpc-java-jwt-version>
- <grpc-netty-tcnative-boringssl-static-version>2.0.18.Final</grpc-netty-tcnative-boringssl-static-version>
- <grpc-bundle-version>1.15.0_1</grpc-bundle-version>
- <grpc-errorprone-version>2.2.0</grpc-errorprone-version>
+ <grpc-netty-tcnative-boringssl-static-version>2.0.22.Final</grpc-netty-tcnative-boringssl-static-version>
+ <grpc-bundle-version>1.20.0_1</grpc-bundle-version>
+ <grpc-errorprone-version>2.3.0</grpc-errorprone-version>
<gson-version>2.8.5</gson-version>
<guice3-version>3.0</guice3-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
diff --git a/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml
index 8861693..4a10c2d 100644
--- a/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-grpc</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
[camel] 06/12: CAMEL-13209 Uncommenting @Ignore from Test classes
Works out of the box
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8294d6ffbe15f160fe65c153af3b9e35fd933d8f
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Fri May 17 23:45:19 2019 +0200
CAMEL-13209 Uncommenting @Ignore from Test classes
Works out of the box
---
.../apache/camel/component/grpc/GrpcProducerAsyncTest.java | 12 +++++-------
.../camel/component/grpc/GrpcProducerStreamingTest.java | 4 +---
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java
index ff526cc..c7c3ff2 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java
@@ -30,12 +30,10 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore("TODO: investigate for Camel 3.0")
public class GrpcProducerAsyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProducerAsyncTest.class);
@@ -117,7 +115,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport {
assertEquals(asyncPongResponseList.get(1).getPongId(), GRPC_TEST_PONG_ID02);
assertEquals(asyncPongResponseList.get(0).getPongName(), GRPC_TEST_PING_VALUE + GRPC_TEST_PONG_VALUE);
}
-
+
@Test
public void testPingAsyncSyncMethodInvocation() throws Exception {
LOG.info("gRPC PingAsyncSync method test start");
@@ -144,7 +142,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport {
assertEquals(asyncPongResponseList.get(0).getPongId(), GRPC_TEST_PING_ID);
assertEquals(asyncPongResponseList.get(0).getPongName(), GRPC_TEST_PING_VALUE + GRPC_TEST_PONG_VALUE);
}
-
+
@Test
public void testPingAsyncAsyncMethodInvocation() throws Exception {
LOG.info("gRPC PingAsyncAsync method test start");
@@ -206,7 +204,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport {
responseObserver.onNext(response02);
responseObserver.onCompleted();
}
-
+
@Override
public StreamObserver<PingRequest> pingAsyncSync(StreamObserver<PongResponse> responseObserver) {
StreamObserver<PingRequest> requestObserver = new StreamObserver<PingRequest>() {
@@ -229,7 +227,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport {
};
return requestObserver;
}
-
+
@Override
public StreamObserver<PingRequest> pingAsyncAsync(StreamObserver<PongResponse> responseObserver) {
StreamObserver<PingRequest> requestObserver = new StreamObserver<PingRequest>() {
@@ -253,4 +251,4 @@ public class GrpcProducerAsyncTest extends CamelTestSupport {
return requestObserver;
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
index 06c8ba6..53b2321 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
@@ -29,12 +29,10 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore("TODO: investigate for Camel 3.0")
public class GrpcProducerStreamingTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProducerStreamingTest.class);
@@ -169,4 +167,4 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
}
}
-}
\ No newline at end of file
+}
[camel] 09/12: CAMEL-13209: Fix test issue
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cc56f5d0153474a99e64b50adcf89d74a60c3e19
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Wed Jun 26 13:10:59 2019 +0300
CAMEL-13209: Fix test issue
---
.../org/apache/camel/component/grpc/GrpcProducerStreamingTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
index 0a128a4..8953bc4 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
@@ -84,13 +84,11 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
template.sendBody("direct:grpc-stream-async-async-route", PingRequest.newBuilder().setPingName("error").build());
-
-
MockEndpoint replies = getMockEndpoint("mock:grpc-replies");
replies.expectedMessageCount(messageGroupCount);
replies.assertIsSatisfied();
- Thread.sleep(1000);
+ Thread.sleep(2000);
for (int i = messageGroupCount + 1; i <= 2 * messageGroupCount; i++) {
template.sendBody("direct:grpc-stream-async-async-route", PingRequest.newBuilder().setPingName(String.valueOf(i)).build());
[camel] 03/12: CAMEL-13209 Making use of non-deprecated method
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f5fd384861398216463359374b59158de605fb5c
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Fri May 17 20:13:38 2019 +0200
CAMEL-13209 Making use of non-deprecated method
---
.../apache/camel/component/grpc/GrpcConsumer.java | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java
index 6595389..29f88f2 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java
@@ -57,7 +57,7 @@ public class GrpcConsumer extends DefaultConsumer {
this.endpoint = endpoint;
this.configuration = configuration;
}
-
+
public GrpcConfiguration getConfiguration() {
return configuration;
}
@@ -89,59 +89,59 @@ public class GrpcConsumer extends DefaultConsumer {
ProxyFactory serviceProxy = new ProxyFactory();
ServerInterceptor headerInterceptor = new GrpcHeaderInterceptor();
MethodHandler methodHandler = new GrpcMethodHandler(endpoint, this);
-
+
serviceProxy.setSuperclass(GrpcUtils.constructGrpcImplBaseClass(endpoint.getServicePackage(), endpoint.getServiceName(), endpoint.getCamelContext()));
try {
bindableService = (BindableService)serviceProxy.create(new Class<?>[0], new Object[0], methodHandler);
} catch (NoSuchMethodException | IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
throw new IllegalArgumentException("Unable to create bindable proxy service for " + configuration.getService());
}
-
+
if (!ObjectHelper.isEmpty(configuration.getHost()) && !ObjectHelper.isEmpty(configuration.getPort())) {
log.debug("Building gRPC server on {}:{}", configuration.getHost(), configuration.getPort());
serverBuilder = NettyServerBuilder.forAddress(new InetSocketAddress(configuration.getHost(), configuration.getPort()));
} else {
throw new IllegalArgumentException("No server start properties (host, port) specified");
}
-
+
if (configuration.getNegotiationType() == NegotiationType.TLS) {
ObjectHelper.notNull(configuration.getKeyCertChainResource(), "keyCertChainResource");
ObjectHelper.notNull(configuration.getKeyResource(), "keyResource");
-
+
ClassResolver classResolver = endpoint.getCamelContext().getClassResolver();
-
+
SslContextBuilder sslContextBuilder = SslContextBuilder.forServer(ResourceHelper.resolveResourceAsInputStream(classResolver, configuration.getKeyCertChainResource()),
ResourceHelper.resolveResourceAsInputStream(classResolver, configuration.getKeyResource()),
configuration.getKeyPassword())
.clientAuth(ClientAuth.REQUIRE)
.sslProvider(SslProvider.OPENSSL);
-
+
if (ObjectHelper.isNotEmpty(configuration.getTrustCertCollectionResource())) {
sslContextBuilder = sslContextBuilder.trustManager(ResourceHelper.resolveResourceAsInputStream(classResolver, configuration.getTrustCertCollectionResource()));
}
-
+
serverBuilder = serverBuilder.sslContext(GrpcSslContexts.configure(sslContextBuilder).build());
}
-
+
if (configuration.getAuthenticationType() == GrpcAuthType.JWT) {
ObjectHelper.notNull(configuration.getJwtSecret(), "jwtSecret");
-
+
serverBuilder = serverBuilder.intercept(new JwtServerInterceptor(configuration.getJwtAlgorithm(), configuration.getJwtSecret(),
configuration.getJwtIssuer(), configuration.getJwtSubject()));
}
-
+
server = serverBuilder.addService(ServerInterceptors.intercept(bindableService, headerInterceptor))
- .maxMessageSize(configuration.getMaxMessageSize())
+ .maxInboundMessageSize(configuration.getMaxMessageSize())
.flowControlWindow(configuration.getFlowControlWindow())
.maxConcurrentCallsPerConnection(configuration.getMaxConcurrentCallsPerConnection())
.build();
}
-
+
public boolean process(Exchange exchange, AsyncCallback callback) {
exchange.getIn().setHeader(GrpcConstants.GRPC_EVENT_TYPE_HEADER, GrpcConstants.GRPC_EVENT_TYPE_ON_NEXT);
return doSend(exchange, callback);
}
-
+
public void onCompleted(Exchange exchange) {
if (configuration.isForwardOnCompleted()) {
exchange.getIn().setHeader(GrpcConstants.GRPC_EVENT_TYPE_HEADER, GrpcConstants.GRPC_EVENT_TYPE_ON_COMPLETED);
@@ -154,12 +154,12 @@ public class GrpcConsumer extends DefaultConsumer {
if (configuration.isForwardOnError()) {
exchange.getIn().setHeader(GrpcConstants.GRPC_EVENT_TYPE_HEADER, GrpcConstants.GRPC_EVENT_TYPE_ON_ERROR);
exchange.getIn().setBody(error);
-
+
doSend(exchange, done -> {
});
}
}
-
+
private boolean doSend(Exchange exchange, AsyncCallback callback) {
if (this.isRunAllowed()) {
this.getAsyncProcessor().process(exchange, doneSync -> {
[camel] 07/12: CAMEL-13209 Fixing intermittent failure by
increasing the sleep time of the main thread
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 993752933edcc54fa155265ad7e7754bf1e15f55
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Fri May 17 23:58:11 2019 +0200
CAMEL-13209 Fixing intermittent failure by increasing the sleep time
of the main thread
---
.../org/apache/camel/component/grpc/GrpcProducerStreamingTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
index 53b2321..0a128a4 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
@@ -82,7 +82,7 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
template.sendBody("direct:grpc-stream-async-async-route", PingRequest.newBuilder().setPingName(String.valueOf(i)).build());
}
- template.sendBody("direct:grpc-stream-async-async-route", PingRequest.newBuilder().setPingName(String.valueOf("error")).build());
+ template.sendBody("direct:grpc-stream-async-async-route", PingRequest.newBuilder().setPingName("error").build());
@@ -90,7 +90,7 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
replies.expectedMessageCount(messageGroupCount);
replies.assertIsSatisfied();
- Thread.sleep(200);
+ Thread.sleep(1000);
for (int i = messageGroupCount + 1; i <= 2 * messageGroupCount; i++) {
template.sendBody("direct:grpc-stream-async-async-route", PingRequest.newBuilder().setPingName(String.valueOf(i)).build());
[camel] 12/12: CAMEL-13209: Fix Karaf tests close #2924
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58330e68dfad063b2354a3e6de69c6945f451edb
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Wed Jun 26 22:13:43 2019 +0300
CAMEL-13209: Fix Karaf tests
close #2924
---
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5eb6cae..dad458d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -562,6 +562,7 @@
<pgjdbc-ng-driver-version>0.8.2</pgjdbc-ng-driver-version>
<properties-maven-plugin-version>1.0-alpha-2</properties-maven-plugin-version>
<protobuf-version>3.7.1</protobuf-version>
+ <protobuf-guava-version>20.0</protobuf-guava-version>
<protobuf-javanano-version>3.1.0</protobuf-javanano-version>
<protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
<protonpack-version>1.8</protonpack-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c468e0e..da58a8a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1167,9 +1167,10 @@
<bundle dependency='true'>wrap:mvn:com.google.errorprone/error_prone_annotations/${grpc-errorprone-version}</bundle>
<!-- Third party dependencies -->
<bundle dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle>
- <bundle dependency='true'>wrap:mvn:com.auth0/java-jwt/${grpc-java-jwt-version}</bundle>
- <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.auth0/java-jwt/${grpc-java-jwt-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf.nano/protobuf-javanano/${protobuf-javanano-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
@@ -2020,7 +2021,7 @@
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${protobuf-guava-version}</bundle>
<bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle>mvn:org.apache.camel/camel-protobuf/${project.version}</bundle>
</feature>