From 27e0cae126ee222e1c45f9942a77d79b424e32a2 Mon Sep 17 00:00:00 2001 From: Ryan Young Date: Tue, 29 May 2018 11:26:26 -0400 Subject: [PATCH] Client to use controller type for DMaaP partition Update client library to use the controller type to set the DMaaP cambria.partition Change-Id: I7e3206309d99ba599d7d6785e63a76ec7c948896 Signed-off-by: Ryan Young Issue-ID: APPC-934 (cherry picked from commit 61f4c8ce5e093db0b63d4030cbd3e6df499854a1) --- .../appc/client/impl/protocol/AsyncProtocolImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/AsyncProtocolImpl.java b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/AsyncProtocolImpl.java index 8567d993a..9f39b9f57 100644 --- a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/AsyncProtocolImpl.java +++ b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/AsyncProtocolImpl.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ============================================================================= @@ -18,7 +18,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ @@ -72,6 +71,7 @@ class AsyncProtocolImpl implements AsyncProtocol { private static final EELFLogger LOG = EELFManager.getInstance().getLogger(AsyncProtocolImpl.class); + private String controllerType = null; AsyncProtocolImpl() { @@ -87,8 +87,10 @@ class AsyncProtocolImpl implements AsyncProtocol { throw new ProtocolException("Callback param should not be null!"); } this.callback = callback; - - try { + + controllerType = props.getProperty(UEBPropertiesKeys.CONTROLLER_TYPE); + + try { messageService.init(props); //get message bus listener thread //start the thread after initializing services @@ -100,7 +102,11 @@ class AsyncProtocolImpl implements AsyncProtocol { @Override public void sendRequest(String payload, MessageContext context) throws ProtocolException { - + if (controllerType != null && controllerType.length()!= 0 && (!controllerType.equals("APPC"))) + { + context.setPartiton(controllerType); + } + //get message to be sent to appc from payload and context String message = messageWriter.write(payload, context); try { -- 2.16.6