From 0ed292d3ccf93c889734960676a321d1166d3f66 Mon Sep 17 00:00:00 2001 From: Raquel Medina Date: Wed, 18 Mar 2020 23:56:31 +0100 Subject: rework message hierarchy Rework message hierarchy with the final objective of splitting libqtappfw into several libraries. This commit carries the following changes: - Simplify message hierarchy, keeping abstract Message class, adding specialization for call and event messages, keeping ResponseMessage, and removing all module specific specializations. - Add MessageFactory class to create message objects. - Change messages life cycle: using smart pointers and removing QObject from message hierarchy (a Message is not a QObject anymore and thus 'deleteLater()' is not available). - Adapt all modules to use new message hierarchy. - Keep ResponseMessage original constructor to avoid breaking TaskManager. - Message constructors have been kept public, but will go private on a follow-up patch (once TaskManager class has been modified to use new MessageFactory). Bug-AGL: SPEC-3112 Signed-off-by: Raquel Medina Change-Id: I3a7a6325209ddeca2293f1ac745371861a947bfb --- map/CMakeLists.txt | 4 +-- map/map.cpp | 74 +++++++++++++++++++++++++++--------------------------- map/map.h | 5 ++-- 3 files changed, 41 insertions(+), 42 deletions(-) (limited to 'map') diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index 2e58fbe..044f81a 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -1,2 +1,2 @@ -add_headers(map.h mapmessage.h) -add_sources(map.cpp mapmessage.cpp) +add_headers(map.h) +add_sources(map.cpp) diff --git a/map/map.cpp b/map/map.cpp index 666efa1..e7a4157 100644 --- a/map/map.cpp +++ b/map/map.cpp @@ -16,9 +16,10 @@ #include -#include "message.h" -#include "mapmessage.h" +#include "callmessage.h" +#include "eventmessage.h" #include "responsemessage.h" +#include "messagefactory.h" #include "messageengine.h" #include "map.h" @@ -39,77 +40,76 @@ Map::~Map() void Map::compose(QString recipient, QString message) { - MapMessage *tmsg = new MapMessage(); + std::unique_ptr msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); + CallMessage* btmsg = static_cast(msg.get()); QJsonObject parameter; parameter.insert("recipient", recipient); parameter.insert("message", message); - tmsg->createRequest("compose", parameter); - m_mloop->sendMessage(tmsg); - delete tmsg; + btmsg->createRequest("bluetooth-map", "compose", parameter); + m_mloop->sendMessage(std::move(msg)); } void Map::message(QString handle) { - MapMessage *tmsg = new MapMessage(); + std::unique_ptr msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); + CallMessage* btmsg = static_cast(msg.get()); QJsonObject parameter; parameter.insert("handle", handle); - tmsg->createRequest("message", parameter); - m_mloop->sendMessage(tmsg); - delete tmsg; + btmsg->createRequest("bluetooth-map", "message", parameter); + m_mloop->sendMessage(std::move(msg)); } void Map::listMessages(QString folder) { - MapMessage *tmsg = new MapMessage(); + std::unique_ptr msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); + CallMessage* btmsg = static_cast(msg.get()); QJsonObject parameter; parameter.insert("folder", folder); - tmsg->createRequest("list_messages", parameter); - m_mloop->sendMessage(tmsg); - delete tmsg; + btmsg->createRequest("bluetooth-map", "list_messages", parameter); + m_mloop->sendMessage(std::move(msg)); } void Map::onConnected() { - MapMessage *tmsg = new MapMessage(); + std::unique_ptr msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); + CallMessage* btmsg = static_cast(msg.get()); QJsonObject parameter; parameter.insert("value", "notification"); - tmsg->createRequest("subscribe", parameter); - m_mloop->sendMessage(tmsg); - delete tmsg; + btmsg->createRequest("bluetooth-map", "subscribe", parameter); + m_mloop->sendMessage(std::move(msg)); listMessages(); } void Map::onDisconnected() { - MapMessage *tmsg = new MapMessage(); + std::unique_ptr msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); + CallMessage* btmsg = static_cast(msg.get()); QJsonObject parameter; parameter.insert("value", "notification"); - tmsg->createRequest("unsubscribe", parameter); - m_mloop->sendMessage(tmsg); - delete tmsg; + btmsg->createRequest("bluetooth-map", "unsubscribe", parameter); + m_mloop->sendMessage(std::move(msg)); } -void Map::onMessageReceived(MessageType type, Message *msg) +void Map::onMessageReceived(std::shared_ptr msg) { - if (type == MessageType::MapEventMessage) { - MapMessage *tmsg = qobject_cast(msg); + if (msg->isEvent()) { + std::shared_ptr tmsg = std::static_pointer_cast(msg); - if (tmsg->isNotificationEvent()) { + if (tmsg->eventApi() != "bluetooth-map") + return; + if (tmsg->eventName() == "notification") { emit notificationEvent(tmsg->eventData().toVariantMap()); } - } else if (msg->isReply() && type == MessageType::ResponseRequestMessage) { - ResponseMessage *tmsg = qobject_cast(msg); - - if (tmsg->requestVerb() == "list_messages") { - QString folder = tmsg->requestParameters().value("folder").toString(); - QVariantMap listing = tmsg->replyData().value("messages").toObject().toVariantMap(); + } else if (msg->isReply()) { + auto rmsg = std::static_pointer_cast(msg); + if (rmsg->requestVerb() == "list_messages") { + QString folder = rmsg->requestParameters().value("folder").toString(); + QVariantMap listing = rmsg->replyData().value("messages").toObject().toVariantMap(); emit listMessagesResult(folder, listing); - } else if (tmsg->requestVerb() == "message") { - QString handle = tmsg->requestParameters().value("handle").toString(); - emit messageResult(handle, tmsg->replyData().toVariantMap()); + } else if (rmsg->requestVerb() == "message") { + QString handle = rmsg->requestParameters().value("handle").toString(); + emit messageResult(handle, rmsg->replyData().toVariantMap()); } } - - msg->deleteLater(); } diff --git a/map/map.h b/map/map.h index 97407cc..91af103 100644 --- a/map/map.h +++ b/map/map.h @@ -17,6 +17,7 @@ #ifndef MAP_H #define MAP_H +#include #include #include #include @@ -25,8 +26,6 @@ class MessageEngine; class Message; -enum class MessageType; - class Map : public QObject { Q_OBJECT @@ -50,7 +49,7 @@ class Map : public QObject // slots void onConnected(); void onDisconnected(); - void onMessageReceived(MessageType, Message*); + void onMessageReceived(std::shared_ptr); }; #endif // MAP_H -- cgit 1.2.3-korg