From 35dff8f8bd31fd71e7f5e6c9aa39fe096e35d98a Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Mon, 2 Aug 2021 14:37:35 -0400 Subject: Upgrade to cds 1.1.5-SNAPSHOT Upgrading policy components to cds 1.1.5-SNAPSHOT to verify the contract and fixes coming up in the next released version. Issue-ID: POLICY-3516 Change-Id: I93602c392a5f917e68a7a1a74eaf0f188f520c39 Signed-off-by: Ram Krishna Verma --- .../java/org/onap/policy/cds/client/CdsProcessorHandler.java | 6 +++--- .../cds/client/BasicAuthClientHeaderInterceptorTest.java | 10 +++++----- .../org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'models-interactions/model-impl/cds/src') diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java index 231ec28d4..6c4d6caab 100644 --- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java +++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java @@ -23,8 +23,8 @@ import io.grpc.ManagedChannel; import io.grpc.stub.StreamObserver; import java.util.concurrent.CountDownLatch; import lombok.AllArgsConstructor; -import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc; -import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceStub; +import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc; +import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceStub; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput; import org.onap.policy.cds.api.CdsProcessorListener; @@ -48,7 +48,7 @@ public class CdsProcessorHandler { header.getBlueprintName(), header.getBlueprintVersion()); final var finishLatch = new CountDownLatch(1); - final BlueprintProcessingServiceStub asyncStub = BlueprintProcessingServiceGrpc.newStub(channel); + final BluePrintProcessingServiceStub asyncStub = BluePrintProcessingServiceGrpc.newStub(channel); final StreamObserver responseObserver = new StreamObserver<>() { @Override public void onNext(ExecutionServiceOutput output) { diff --git a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java index 99d1da9e5..3192520ae 100644 --- a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java +++ b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java @@ -45,9 +45,9 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; -import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc; -import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceImplBase; -import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceStub; +import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc; +import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase; +import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceStub; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput; import org.onap.policy.cds.properties.CdsServerProperties; @@ -83,7 +83,7 @@ public class BasicAuthClientHeaderInterceptorTest { props.setTimeout(60); // Implement the test gRPC server - BlueprintProcessingServiceImplBase testCdsBlueprintServerImpl = new BlueprintProcessingServiceImplBase() {}; + BluePrintProcessingServiceImplBase testCdsBlueprintServerImpl = new BluePrintProcessingServiceImplBase() {}; // Create a server, add service, start, and register for automatic graceful shutdown. grpcCleanup.register(InProcessServerBuilder.forName(SERVER_NAME).directExecutor() @@ -96,7 +96,7 @@ public class BasicAuthClientHeaderInterceptorTest { @Test public void testIfBasicAuthHeaderIsDeliveredToCdsServer() { - BlueprintProcessingServiceStub bpProcessingSvcStub = BlueprintProcessingServiceGrpc + BluePrintProcessingServiceStub bpProcessingSvcStub = BluePrintProcessingServiceGrpc .newStub(ClientInterceptors.intercept(channel, new BasicAuthClientHeaderInterceptor(props))); ArgumentCaptor metadataCaptor = ArgumentCaptor.forClass(Metadata.class); bpProcessingSvcStub.process(new StreamObserver() { diff --git a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java index d38b0a4ca..0922fc4cb 100644 --- a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java +++ b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/CdsProcessorGrpcClientTest.java @@ -44,7 +44,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers; -import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc.BlueprintProcessingServiceImplBase; +import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput; import org.onap.policy.cds.api.CdsProcessorListener; @@ -95,7 +95,7 @@ public class CdsProcessorGrpcClientTest { client = new CdsProcessorGrpcClient(channel, new CdsProcessorHandler(listener, "gRPC://localhost:1234/")); // Implement the test gRPC server - BlueprintProcessingServiceImplBase testCdsBlueprintServerImpl = new BlueprintProcessingServiceImplBase() { + BluePrintProcessingServiceImplBase testCdsBlueprintServerImpl = new BluePrintProcessingServiceImplBase() { @Override public StreamObserver process( final StreamObserver responseObserver) { -- cgit 1.2.3-korg