From 647b538360333cdf408eba9e4a62b37dfef1cc71 Mon Sep 17 00:00:00 2001 From: Jung Seungho Date: Thu, 24 Nov 2016 13:11:55 +0900 Subject: [PATCH] [IOT-1599] fix message publish in MQ removed logic for checking 'message' property https://jira.iotivity.org/browse/IOT-1599 Change-Id: I1edc3eb68d97156ce3befe44205e2d1ff6006b7c Signed-off-by: Jung Seungho Reviewed-on: https://gerrit.iotivity.org/gerrit/14715 Reviewed-by: Uze Choi Tested-by: jenkins-iotivity Reviewed-by: Jee Hyeok Kim --- .../org/iotivity/cloud/mqserver/topic/Topic.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/topic/Topic.java b/cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/topic/Topic.java index 28dc14e..44b3e22 100644 --- a/cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/topic/Topic.java +++ b/cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/topic/Topic.java @@ -121,8 +121,8 @@ public class Topic { */ public IResponse handleCreateSubtopic(IRequest request) { - String newTopicName = request.getUriPathSegments().get( - request.getUriPathSegments().size() - 1); + String newTopicName = request.getUriPathSegments() + .get(request.getUriPathSegments().size() - 1); String newTopicType = new String(); @@ -209,8 +209,8 @@ public class Topic { } synchronized (mSubscribers) { - mSubscribers.put(request.getRequestId(), new TopicSubscriber( - srcDevice, request)); + mSubscribers.put(request.getRequestId(), + new TopicSubscriber(srcDevice, request)); } return MessageBuilder.createResponse(request, ResponseStatus.CONTENT, @@ -229,8 +229,8 @@ public class Topic { synchronized (mSubscribers) { - TopicSubscriber subscriber = mSubscribers.get(request - .getRequestId()); + TopicSubscriber subscriber = mSubscribers + .get(request.getRequestId()); mSubscribers.remove(subscriber.mRequest.getRequestId()); @@ -263,10 +263,8 @@ public class Topic { HashMap message = mCbor.parsePayloadFromCbor(payload, HashMap.class); - if (message == null - || message.containsKey(Constants.MQ_MESSAGE) == false) { - throw new PreconditionFailedException( - "message field is not included"); + if (message == null || message.isEmpty()) { + throw new PreconditionFailedException("message is not included"); } if (mKafkaProducerOperator.publishMessage(payload) == false) { @@ -336,8 +334,8 @@ public class Topic { synchronized (mSubscribers) { for (TopicSubscriber subscriber : mSubscribers.values()) { - subscriber.mSubscriber.sendResponse(MessageBuilder - .createResponse(subscriber.mRequest, + subscriber.mSubscriber.sendResponse( + MessageBuilder.createResponse(subscriber.mRequest, ResponseStatus.CONTENT, ContentFormat.APPLICATION_CBOR, mLatestData)); } -- 2.7.4