diff options
| author |   Ajith Sreekumar <ajith.sreekumar@bell.ca> | 2021-01-29 14:36:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-01-29 14:36:21 +0000 |
| commit | 23dec48efae039ff961ea68358ab69d80a81531b (patch) | |
| tree | 3cfd5e503bc287e94cf111be6bd3ec2e4de879d2 /models-interactions/model-impl/cds | |
| parent | 9b3f84e4006f69bb93cb1400e17951dc9e7eadb1 (diff) | |
| parent | 96d0852481a6a594f6cdf1ce9f31def50663d6dc (diff) | |
Merge "Upgrade io.grpc library in CDS actor"
Diffstat (limited to 'models-interactions/model-impl/cds')
| -rw-r--r-- | models-interactions/model-impl/cds/pom.xml | 6 | ||||
| -rw-r--r-- | models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorGrpcClient.java | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml index 25da63210..8ed5c2244 100644 --- a/models-interactions/model-impl/cds/pom.xml +++ b/models-interactions/model-impl/cds/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2019-2020 Bell Canada. + Copyright (C) 2019-2021 Bell Canada. Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,8 +33,8 @@ <description>gRPC client implementation to send process message to CDS blueprint processor gRPC endpoint.</description> <properties> - <grpc.version>1.17.1</grpc.version> - <protobuf.version>3.6.1</protobuf.version> + <grpc.version>1.35.0</grpc.version> + <protobuf.version>3.14.0</protobuf.version> </properties> <dependencies> diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorGrpcClient.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorGrpcClient.java index efa8369bc..2dc128fd7 100644 --- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorGrpcClient.java +++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorGrpcClient.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Bell Canada. + * Copyright (C) 2019-2021 Bell Canada. * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,8 +21,6 @@ package org.onap.policy.cds.client; import com.google.common.base.Preconditions; import io.grpc.ManagedChannel; -import io.grpc.internal.DnsNameResolverProvider; -import io.grpc.internal.PickFirstLoadBalancerProvider; import io.grpc.netty.NettyChannelBuilder; import java.util.concurrent.CountDownLatch; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput; @@ -65,8 +63,6 @@ public class CdsProcessorGrpcClient implements AutoCloseable { String url = bldr.toString(); this.channel = NettyChannelBuilder.forAddress(props.getHost(), props.getPort()) - .nameResolverFactory(new DnsNameResolverProvider()) - .loadBalancerFactory(new PickFirstLoadBalancerProvider()) .intercept(new BasicAuthClientHeaderInterceptor(props)).usePlaintext().build(); this.handler = new CdsProcessorHandler(listener, url); LOGGER.info("CdsProcessorListener started"); |