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 96bb4a48508a896a271cb46821c289ba5beacfb2
Author: Dmitry Volodin <dmvo...@gmail.com>
AuthorDate: Mon Oct 26 10:07:23 2020 +0300
CAMEL-15754: Fix deprecated calls and options
Closing #4511
---
.../grpc/auth/jwt/JwtCallCredentials.java | 27 +++++++++-------------
.../GrpcResponseAggregationStreamObserver.java | 4 ++--
.../grpc/client/GrpcSimpleExchangeForwarder.java | 4 ++--
.../GrpcRequestAggregationStreamObserver.java | 8 +------
.../GrpcRequestPropagationStreamObserver.java | 8 +------
.../component/grpc/GrpcProducerAsyncTest.java | 8 +++----
parent/pom.xml | 2 +-
7 files changed, 22 insertions(+), 39 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 4b84e38..5303d78 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
@@ -25,8 +25,6 @@ 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
*/
@@ -40,22 +38,19 @@ public class JwtCallCredentials extends CallCredentials {
@Override
public void applyRequestMetadata(RequestInfo requestInfo, Executor
executor, MetadataApplier metadataApplier) {
- String authority =
requestInfo.getTransportAttrs().get(ATTR_LB_ADDR_AUTHORITY);
+ String authority = requestInfo.getAuthority();
LOG.debug("Using authority {} for credentials", authority);
- executor.execute(new Runnable() {
- @Override
- public void run() {
- try {
- LOG.debug("Start to apply for the JWT token header");
- Metadata headers = new Metadata();
- Metadata.Key<String> jwtKey =
GrpcConstants.GRPC_JWT_METADATA_KEY;
- headers.put(jwtKey, jwtToken);
- metadataApplier.apply(headers);
- } catch (Throwable e) {
- LOG.debug("Unable to set metadata credentials header", e);
- metadataApplier.fail(Status.UNAUTHENTICATED.withCause(e));
- }
+ executor.execute(() -> {
+ try {
+ LOG.debug("Start to apply for the JWT token header");
+ Metadata headers = new Metadata();
+ Metadata.Key<String> jwtKey =
GrpcConstants.GRPC_JWT_METADATA_KEY;
+ headers.put(jwtKey, jwtToken);
+ metadataApplier.apply(headers);
+ } catch (Throwable e) {
+ LOG.debug("Unable to set metadata credentials header", e);
+ metadataApplier.fail(Status.UNAUTHENTICATED.withCause(e));
}
});
}
diff --git
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcResponseAggregationStreamObserver.java
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcResponseAggregationStreamObserver.java
index 5056b40..e97fe79 100644
---
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcResponseAggregationStreamObserver.java
+++
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcResponseAggregationStreamObserver.java
@@ -50,8 +50,8 @@ public class GrpcResponseAggregationStreamObserver implements
StreamObserver<Obj
@Override
public void onCompleted() {
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
- exchange.getOut().setBody(responseCollection);
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().setBody(responseCollection);
callback.done(false);
}
diff --git
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcSimpleExchangeForwarder.java
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcSimpleExchangeForwarder.java
index 78f3d94..ab1db63 100644
---
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcSimpleExchangeForwarder.java
+++
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/client/GrpcSimpleExchangeForwarder.java
@@ -55,8 +55,8 @@ class GrpcSimpleExchangeForwarder implements
GrpcExchangeForwarder {
public void forward(Exchange exchange) {
Message message = exchange.getIn();
Object outBody = GrpcUtils.invokeSyncMethod(grpcStub,
configuration.getMethod(), message.getBody());
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
- exchange.getOut().setBody(outBody);
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().setBody(outBody);
}
@Override
diff --git
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java
index 1ff09bf..e7dcea2 100644
---
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java
+++
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java
@@ -51,7 +51,6 @@ public class GrpcRequestAggregationStreamObserver extends
GrpcRequestAbstractStr
@Override
public void onCompleted() {
CountDownLatch latch = new CountDownLatch(1);
- Object responseBody = null;
exchange.getIn().setBody(requestList);
exchange.getIn().setHeaders(headers);
@@ -63,12 +62,7 @@ public class GrpcRequestAggregationStreamObserver extends
GrpcRequestAbstractStr
try {
latch.await();
- if (exchange.hasOut()) {
- responseBody = exchange.getOut().getBody();
- } else {
- responseBody = exchange.getIn().getBody();
- }
-
+ Object responseBody = exchange.getMessage().getBody();
if (responseBody instanceof List) {
List<?> responseList = (List<?>) responseBody;
responseList.forEach(responseObserver::onNext);
diff --git
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java
index e4044eb..091b120 100644
---
a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java
+++
b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java
@@ -38,7 +38,6 @@ public class GrpcRequestPropagationStreamObserver extends
GrpcRequestAbstractStr
@Override
public void onNext(Object request) {
CountDownLatch latch = new CountDownLatch(1);
- Object responseBody;
exchange = endpoint.createExchange();
exchange.getIn().setBody(request);
@@ -49,12 +48,7 @@ public class GrpcRequestPropagationStreamObserver extends
GrpcRequestAbstractStr
try {
latch.await();
- if (exchange.hasOut()) {
- responseBody = exchange.getOut().getBody();
- } else {
- responseBody = exchange.getIn().getBody();
- }
-
+ Object responseBody = exchange.getMessage().getBody();
if (responseBody instanceof List) {
List<?> responseList = (List<?>) responseBody;
responseList.forEach(responseObserver::onNext);
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 5c7946b..6fb903f 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
@@ -79,7 +79,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport {
@Override
public void onComplete(Exchange exchange) {
- asyncPongResponse = exchange.getOut().getBody();
+ asyncPongResponse = exchange.getMessage().getBody();
latch.countDown();
}
});
@@ -107,7 +107,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport
{
@Override
public void onComplete(Exchange exchange) {
- asyncPongResponse = exchange.getOut().getBody();
+ asyncPongResponse = exchange.getMessage().getBody();
latch.countDown();
}
});
@@ -136,7 +136,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport
{
@Override
public void onComplete(Exchange exchange) {
- asyncPongResponse = exchange.getOut().getBody();
+ asyncPongResponse = exchange.getMessage().getBody();
latch.countDown();
}
});
@@ -164,7 +164,7 @@ public class GrpcProducerAsyncTest extends CamelTestSupport
{
@Override
public void onComplete(Exchange exchange) {
- asyncPongResponse = exchange.getOut().getBody();
+ asyncPongResponse = exchange.getMessage().getBody();
latch.countDown();
}
});
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a16c34..3e72d89 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -287,7 +287,7 @@
<javacrumbs-version>0.22</javacrumbs-version>
<javaparser-version>3.13.10</javaparser-version>
<javapoet-version>1.11.1</javapoet-version>
- <javassist-version>3.20.0-GA</javassist-version>
+ <javassist-version>3.27.0-GA</javassist-version>
<javax-el3-version>3.0.0</javax-el3-version>
<javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
<javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
