From 0ed292d3ccf93c889734960676a321d1166d3f66 Mon Sep 17 00:00:00 2001
From: Raquel Medina <raquel.medina@konsulko.com>
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 <raquel.medina@konsulko.com>
Change-Id: I3a7a6325209ddeca2293f1ac745371861a947bfb
---
 hvac/CMakeLists.txt |  4 ++--
 hvac/hvac.cpp       | 32 ++++++++++++++++++++------------
 hvac/hvac.h         |  5 ++---
 3 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'hvac')

diff --git a/hvac/CMakeLists.txt b/hvac/CMakeLists.txt
index 0ee635a..b5124cb 100644
--- a/hvac/CMakeLists.txt
+++ b/hvac/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_headers(hvac.h hvacmessage.h)
-add_sources(hvac.cpp hvacmessage.cpp)
+add_headers(hvac.h)
+add_sources(hvac.cpp)
diff --git a/hvac/hvac.cpp b/hvac/hvac.cpp
index f9e509b..23aef30 100644
--- a/hvac/hvac.cpp
+++ b/hvac/hvac.cpp
@@ -19,9 +19,9 @@
 #include <QMimeDatabase>
 #include <QtQml/QQmlEngine>
 
-#include "message.h"
-#include "hvacmessage.h"
-#include "responsemessage.h"
+#include "callmessage.h"
+#include "eventmessage.h"
+#include "messagefactory.h"
 #include "messageengine.h"
 #include "hvac.h"
 
@@ -45,13 +45,16 @@ HVAC::~HVAC()
 
 void HVAC::control(QString verb, QString field, int value)
 {
-    HVACMessage *tmsg = new HVACMessage();
+    std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
+    if (!msg)
+        return;
+
+    CallMessage* hmsg = static_cast<CallMessage*>(msg.get());
     QJsonObject parameter;
 
     parameter.insert(field, value);
-    tmsg->createRequest(verb, parameter);
-    m_mloop->sendMessage(tmsg);
-    delete tmsg;
+    hmsg->createRequest("hvac", verb, parameter);
+    m_mloop->sendMessage(std::move(msg));
 }
 
 void HVAC::set_fanspeed(int speed)
@@ -75,14 +78,19 @@ void HVAC::set_temp_right_zone(int temp)
     emit rightTemperatureChanged(temp);
 }
 
-void HVAC::onMessageReceived(MessageType type, Message *msg)
+void HVAC::onMessageReceived(std::shared_ptr<Message> msg)
 {
-    if (msg->isEvent() && type == MessageType::HVACEventMessage) {
-        HVACMessage *tmsg = qobject_cast<HVACMessage*>(msg);
+    if (!msg)
+        return;
+
+    if (msg->isEvent()) {
+        std::shared_ptr<EventMessage> emsg = std::static_pointer_cast<EventMessage>(msg);
+        if (emsg->eventApi() != "hvac")
+            return;
 
-        if (tmsg->isLanguageEvent()) {
+        if (emsg->eventName() == "language") {
             // TODO: cannot be currently tested with identity service
-            QVariantMap data = tmsg->eventData().toVariantMap();
+            QVariantMap data = emsg->eventData().toVariantMap();
             emit languageChanged(data.value("language").toString());
         }
     }
diff --git a/hvac/hvac.h b/hvac/hvac.h
index 47a9e08..81378e4 100644
--- a/hvac/hvac.h
+++ b/hvac/hvac.h
@@ -17,6 +17,7 @@
 #ifndef HVAC_H
 #define HVAC_H
 
+#include <memory>
 #include <QObject>
 #include <QJsonArray>
 #include <QtQml/QQmlContext>
@@ -25,8 +26,6 @@
 class MessageEngine;
 class Message;
 
-enum class MessageType;
-
 class HVAC : public QObject
 {
     Q_OBJECT
@@ -62,7 +61,7 @@ class HVAC : public QObject
         void set_temp_right_zone(int temp);
 
         // slots
-        void onMessageReceived(MessageType, Message*);
+        void onMessageReceived(std::shared_ptr<Message>);
 };
 
 #endif // HVAC_H
-- 
cgit 1.2.3-korg