Upgrade CDS GRPC implementations.

Dependent on : https://gerrit.onap.org/r/c/ccsdk/parent/+/98823

Issue-ID: CCSDK-1737
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I0b5087f7e98490d7066f389af29424aed40a6520

9 files changed, 39 insertions, 38 deletions

diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcClientLoggingInterceptor.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcClientLoggingInterceptor.kt
index 99ac74070..43e56606f 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcClientLoggingInterceptor.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcClientLoggingInterceptor.kt
@@ -42,12 +42,13 @@ class GrpcClientLoggingInterceptor : ClientInterceptor {
         .SimpleForwardingClientCall<ReqT, RespT>(channel.newCall(method, callOptions)) {
 
             override fun start(responseListener: Listener<RespT>, headers: Metadata) {
-                val listener = object : ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {
-                    override fun onMessage(message: RespT) {
-                        loggingService.grpcInvoking(headers)
-                        super.onMessage(message)
+                val listener =
+                    object : ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {
+                        override fun onMessage(message: RespT) {
+                            loggingService.grpcInvoking(headers)
+                            super.onMessage(message)
+                        }
                     }
-                }
                 super.start(listener, headers)
             }
         }
diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcServerLoggingInterceptor.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcServerLoggingInterceptor.kt
index ec0761af4..a49b96743 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcServerLoggingInterceptor.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/interceptor/GrpcServerLoggingInterceptor.kt
@@ -40,7 +40,7 @@ class GrpcServerLoggingInterceptor : ServerInterceptor {
         requestHeaders: Metadata,
         next: ServerCallHandler<ReqT, RespT>
     ):
-            ServerCall.Listener<ReqT> {
+        ServerCall.Listener<ReqT> {
 
         val forwardingServerCall = object : ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(call) {
             override fun sendHeaders(responseHeaders: Metadata) {
diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BasicAuthGrpcClientService.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BasicAuthGrpcClientService.kt
index e3fd14c1e..f7be8c66d 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BasicAuthGrpcClientService.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BasicAuthGrpcClientService.kt
@@ -18,7 +18,6 @@ package org.onap.ccsdk.cds.blueprintsprocessor.grpc.service
 
 import io.grpc.ManagedChannel
 import io.grpc.internal.DnsNameResolverProvider
-import io.grpc.internal.PickFirstLoadBalancerProvider
 import io.grpc.netty.NettyChannelBuilder
 import org.onap.ccsdk.cds.blueprintsprocessor.grpc.BasicAuthGrpcClientProperties
 
@@ -29,7 +28,6 @@ open class BasicAuthGrpcClientService(private val basicAuthGrpcClientProperties:
         val managedChannel = NettyChannelBuilder
             .forAddress(basicAuthGrpcClientProperties.host, basicAuthGrpcClientProperties.port)
             .nameResolverFactory(DnsNameResolverProvider())
-            .loadBalancerFactory(PickFirstLoadBalancerProvider())
             // .intercept(BasicAuthClientInterceptor(basicAuthGrpcClientProperties)).usePlaintext()
             .build()
         return managedChannel
diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyService.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyService.kt
index 8a3c5a6a7..79da447a1 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyService.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyService.kt
@@ -87,7 +87,7 @@ open class BluePrintGrpcLibPropertyService(private var bluePrintPropertiesServic
     }
 
     private fun blueprintGrpcServerService(grpcServerProperties: GrpcServerProperties):
-            BluePrintGrpcServerService {
+        BluePrintGrpcServerService {
         when (grpcServerProperties) {
             is TLSAuthGrpcServerProperties -> {
                 return TLSAuthGrpcServerService(grpcServerProperties)
@@ -151,7 +151,7 @@ open class BluePrintGrpcLibPropertyService(private var bluePrintPropertiesServic
     }
 
     fun blueprintGrpcClientService(grpcClientProperties: GrpcClientProperties):
-            BluePrintGrpcClientService {
+        BluePrintGrpcClientService {
         return when (grpcClientProperties) {
             is TokenAuthGrpcClientProperties -> {
                 TokenAuthGrpcClientService(grpcClientProperties)
diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TLSAuthGrpcClientService.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TLSAuthGrpcClientService.kt
index 68ca3c16b..44df5fbe5 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TLSAuthGrpcClientService.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TLSAuthGrpcClientService.kt
@@ -18,7 +18,6 @@ package org.onap.ccsdk.cds.blueprintsprocessor.grpc.service
 
 import io.grpc.ManagedChannel
 import io.grpc.internal.DnsNameResolverProvider
-import io.grpc.internal.PickFirstLoadBalancerProvider
 import io.grpc.netty.GrpcSslContexts
 import io.grpc.netty.NettyChannelBuilder
 import io.netty.handler.ssl.SslContext
@@ -30,10 +29,14 @@ class TLSAuthGrpcClientService(private val tlsAuthGrpcClientProperties: TLSAuthG
     BluePrintGrpcClientService {
 
     override suspend fun channel(): ManagedChannel {
+
+        val target =
+            if (tlsAuthGrpcClientProperties.port == -1) tlsAuthGrpcClientProperties.host
+            else "${tlsAuthGrpcClientProperties.host}:${tlsAuthGrpcClientProperties.port}"
+
         return NettyChannelBuilder
-            .forAddress(tlsAuthGrpcClientProperties.host, tlsAuthGrpcClientProperties.port)
+            .forTarget(target)
             .nameResolverFactory(DnsNameResolverProvider())
-            .loadBalancerFactory(PickFirstLoadBalancerProvider())
             .intercept(GrpcClientLoggingInterceptor())
             .sslContext(sslContext())
             .build()
diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TokenAuthGrpcClientService.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TokenAuthGrpcClientService.kt
index 371353db2..4c991df1f 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TokenAuthGrpcClientService.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/TokenAuthGrpcClientService.kt
@@ -25,7 +25,6 @@ import io.grpc.ManagedChannel
 import io.grpc.Metadata
 import io.grpc.MethodDescriptor
 import io.grpc.internal.DnsNameResolverProvider
-import io.grpc.internal.PickFirstLoadBalancerProvider
 import io.grpc.netty.NettyChannelBuilder
 import org.onap.ccsdk.cds.blueprintsprocessor.grpc.TokenAuthGrpcClientProperties
 import org.onap.ccsdk.cds.blueprintsprocessor.grpc.interceptor.GrpcClientLoggingInterceptor
@@ -34,17 +33,21 @@ class TokenAuthGrpcClientService(private val tokenAuthGrpcClientProperties: Toke
     BluePrintGrpcClientService {
 
     override suspend fun channel(): ManagedChannel {
+        val target =
+            if (tokenAuthGrpcClientProperties.port == -1) tokenAuthGrpcClientProperties.host
+            else "${tokenAuthGrpcClientProperties.host}:${tokenAuthGrpcClientProperties.port}"
+
         val managedChannel = NettyChannelBuilder
-            .forAddress(tokenAuthGrpcClientProperties.host, tokenAuthGrpcClientProperties.port)
+            .forTarget(target)
             .nameResolverFactory(DnsNameResolverProvider())
-            .loadBalancerFactory(PickFirstLoadBalancerProvider())
             .intercept(GrpcClientLoggingInterceptor())
             .intercept(TokenAuthClientInterceptor(tokenAuthGrpcClientProperties)).usePlaintext().build()
         return managedChannel
     }
 }
 
-class TokenAuthClientInterceptor(private val tokenAuthGrpcClientProperties: TokenAuthGrpcClientProperties) : ClientInterceptor {
+class TokenAuthClientInterceptor(private val tokenAuthGrpcClientProperties: TokenAuthGrpcClientProperties) :
+    ClientInterceptor {
 
     override fun <ReqT, RespT> interceptCall(
         method: MethodDescriptor<ReqT, RespT>,
diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyServiceTest.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyServiceTest.kt
index ea17b94a1..d9a8082d4 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyServiceTest.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/BluePrintGrpcLibPropertyServiceTest.kt
@@ -84,23 +84,19 @@ class BluePrintGrpcLibPropertyServiceTest {
         val properties = bluePrintGrpcLibPropertyService.grpcClientProperties(
             "blueprintsprocessor.grpcclient.sample"
         )
-                as BasicAuthGrpcClientProperties
+            as BasicAuthGrpcClientProperties
         assertNotNull(properties, "failed to create property bean")
         assertNotNull(
-            properties.host, "failed to get host property" +
-                    " in property bean"
+            properties.host, "failed to get host property in property bean"
         )
         assertNotNull(
-            properties.port, "failed to get host property" +
-                    " in property bean"
+            properties.port, "failed to get host property in property bean"
         )
         assertNotNull(
-            properties.username, "failed to get host pro" +
-                    "perty in property bean"
+            properties.username, "failed to get host property in property bean"
         )
         assertNotNull(
-            properties.password, "failed to get host pr" +
-                    "operty in property bean"
+            properties.password, "failed to get host property in property bean"
         )
     }
 
@@ -110,10 +106,10 @@ class BluePrintGrpcLibPropertyServiceTest {
     @Test
     fun testGrpcClientPropertiesWithJson() {
         val json: String = "{\n" +
-                "  \"type\" : \"token-auth\",\n" +
-                "  \"host\" : \"127.0.0.1\",\n" +
-                "  \"port\" : \"50505\"\n" +
-                "}"
+            "  \"type\" : \"token-auth\",\n" +
+            "  \"host\" : \"127.0.0.1\",\n" +
+            "  \"port\" : \"50505\"\n" +
+            "}"
         val mapper = ObjectMapper()
         val actualObj: JsonNode = mapper.readTree(json)
         val properties = bluePrintGrpcLibPropertyService.grpcClientProperties(
@@ -152,12 +148,12 @@ class BluePrintGrpcLibPropertyServiceTest {
     @Test
     fun testGrpcClientServiceWithJson() {
         val json: String = "{\n" +
-                "  \"type\" : \"basic-auth\",\n" +
-                "  \"host\" : \"127.0.0.1\",\n" +
-                "  \"port\" : \"50505\",\n" +
-                "  \"username\" : \"sampleuser\",\n" +
-                "  \"password\" : \"samplepwd\"\n" +
-                "}"
+            "  \"type\" : \"basic-auth\",\n" +
+            "  \"host\" : \"127.0.0.1\",\n" +
+            "  \"port\" : \"50505\",\n" +
+            "  \"username\" : \"sampleuser\",\n" +
+            "  \"password\" : \"samplepwd\"\n" +
+            "}"
         val mapper = ObjectMapper()
         val actualObj: JsonNode = mapper.readTree(json)
         val svc = bluePrintGrpcLibPropertyService
diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/MockTLSBluePrintProcessingServer.kt b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/MockTLSBluePrintProcessingServer.kt
index 25828b15e..fb7282f75 100644
--- a/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/MockTLSBluePrintProcessingServer.kt
+++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/grpc/service/MockTLSBluePrintProcessingServer.kt
@@ -57,7 +57,7 @@ class MockTLSBluePrintProcessingServer : BluePrintProcessingServiceGrpc.BluePrin
             override fun onNext(executionServiceInput: ExecutionServiceInput) {
                 log.info(
                     "Received requestId(${executionServiceInput.commonHeader.requestId})  " +
-                            "subRequestId(${executionServiceInput.commonHeader.subRequestId})"
+                        "subRequestId(${executionServiceInput.commonHeader.subRequestId})"
                 )
                 responseObserver.onNext(buildResponse(executionServiceInput))
                 responseObserver.onCompleted()
diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionServiceTest.kt b/ms/blueprintsprocessor/modules/services/execution-service/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionServiceTest.kt
index dede885c1..28e2b11b2 100644
--- a/ms/blueprintsprocessor/modules/services/execution-service/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionServiceTest.kt
+++ b/ms/blueprintsprocessor/modules/services/execution-service/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/execution/StreamingRemoteExecutionServiceTest.kt
@@ -76,7 +76,7 @@ class StreamingRemoteExecutionServiceTest {
             val streamingRemoteExecutionService = StreamingRemoteExecutionServiceImpl(bluePrintGrpcLibPropertyService)
 
             val spyStreamingRemoteExecutionService = spyk(streamingRemoteExecutionService)
-            /** To test with real server, uncomment below line */
+            /** To test with real server, comment below line */
             coEvery() { spyStreamingRemoteExecutionService.createGrpcChannel(any()) } returns channel
 
             /** Test Send and Receive non interactive transaction */