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 <dimitri...@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>
