From 1a8cffddf383872b84d0df9acef5662e02189f2b Mon Sep 17 00:00:00 2001 From: rtk0c Date: Mon, 27 Jun 2022 00:15:35 +0000 Subject: (From git) Update code style, misc clean up git-svn-id: file:///home/arch/svn/epistmool/trunk@6 71f44415-077c-4ad7-a976-72ddbf76608f --- .../source/EpistmoolServer/Protocol/Command.cpp | 82 ++++++++++++++++++---- 1 file changed, 69 insertions(+), 13 deletions(-) (limited to 'server-v1/source/EpistmoolServer/Protocol/Command.cpp') diff --git a/server-v1/source/EpistmoolServer/Protocol/Command.cpp b/server-v1/source/EpistmoolServer/Protocol/Command.cpp index a108e0e..3e76b9c 100644 --- a/server-v1/source/EpistmoolServer/Protocol/Command.cpp +++ b/server-v1/source/EpistmoolServer/Protocol/Command.cpp @@ -7,7 +7,7 @@ using namespace Epistmool::Server; namespace { -auto kKindTraits = []() { +const auto kKindTraits = []() { using enum ProtocolMessage::Kind; std::array(KindCOUNT)> array; @@ -15,7 +15,6 @@ auto kKindTraits = []() { array[SessionDestroy] = { .isC2S = true, .hasReply = true }; array[WorkspaceCreate] = { .isC2S = true, .hasReply = true }; - array[WorkspaceOpen] = { .isC2S = true, .hasReply = true }; array[WorkspaceFetchIndex] = { .isC2S = true, .hasReply = true }; array[WorkspaceFetchKnowledge] = { .isC2S = true, .hasReply = true }; @@ -39,11 +38,10 @@ std::unique_ptr ProtocolMessage::createRequest(Kind kind) { switch(kind) { case SessionAuth: return std::make_unique(); - case SessionDestroy: return nullptr; + case SessionDestroy: return std::make_unique(); case WorkspaceCreate: return nullptr; - case WorkspaceOpen: return nullptr; - case WorkspaceFetchIndex: return nullptr; + case WorkspaceFetchIndex: return std::make_unique(); case WorkspaceFetchKnowledge: return nullptr; case WorkspaceUpdateKnowledge: return nullptr; @@ -55,7 +53,7 @@ std::unique_ptr ProtocolMessage::createRequest(Kind kind) case WorkspaceCreateKeyword: return nullptr; case WorkspaceDeleteKeyword: return nullptr; - case NotificationWorkspaceUpdated: return nullptr; + case NotificationWorkspaceUpdated: return std::make_unique(); case NotificationKnowledgeUpdated: return nullptr; default: return nullptr; @@ -66,11 +64,10 @@ std::unique_ptr ProtocolMessage::createReply(Kind kind) { switch(kind) { case SessionAuth: return std::make_unique(); - case SessionDestroy: return nullptr; + case SessionDestroy: return std::make_unique(); case WorkspaceCreate: return nullptr; - case WorkspaceOpen: return nullptr; - case WorkspaceFetchIndex: return nullptr; + case WorkspaceFetchIndex: return std::make_unique(); case WorkspaceFetchKnowledge: return nullptr; case WorkspaceUpdateKnowledge: return nullptr; @@ -172,14 +169,12 @@ ProtocolRequest_SessionAuth::ProtocolRequest_SessionAuth() void ProtocolRequest_SessionAuth::serializeFields(QJsonObject& object) const { - ProtocolRequest::serializeFields(object); object.insert("session", theSession); object.insert("createIfInvalid", createIfInvalid); } void ProtocolRequest_SessionAuth::deserializeFields(const QJsonObject& object) { - ProtocolRequest::deserializeFields(object); theSession = object.value("session").toInt(); createIfInvalid = object.value("createIfInvalid").toBool(); } @@ -189,12 +184,73 @@ ProtocolReply_SessionAuth::ProtocolReply_SessionAuth() void ProtocolReply_SessionAuth::serializeFields(QJsonObject& object) const { - ProtocolReply::serializeFields(object); object.insert("session", theSession); } void ProtocolReply_SessionAuth::deserializeFields(const QJsonObject& object) { - ProtocolReply::deserializeFields(object); theSession = object.value("session").toInt(); } + +ProtocolRequest_SessionDestroy::ProtocolRequest_SessionDestroy() + : ProtocolRequest(SessionDestroy) {} + +void ProtocolRequest_SessionDestroy::serializeFields(QJsonObject& object) const +{ +} + +void ProtocolRequest_SessionDestroy::deserializeFields(const QJsonObject& object) +{ +} + +ProtocolReply_SessionDestroy::ProtocolReply_SessionDestroy() + : ProtocolReply(SessionDestroy) {} + +void ProtocolReply_SessionDestroy::serializeFields(QJsonObject& object) const +{ +} + +void ProtocolReply_SessionDestroy::deserializeFields(const QJsonObject& object) +{ +} + +ProtocolRequest_WorkspaceFetchIndex::ProtocolRequest_WorkspaceFetchIndex() + : ProtocolRequest(WorkspaceFetchIndex) {} + +void ProtocolRequest_WorkspaceFetchIndex::serializeFields(QJsonObject& object) const +{ + object.insert("knowledgeFilter", knowledgeFilter); + object.insert("knowledgeMaxCount", knowledgeMaxCount); + object.insert("keywordFilter", keywordFilter); + object.insert("keywordMaxCount", keywordMaxCount); +} + +void ProtocolRequest_WorkspaceFetchIndex::deserializeFields(const QJsonObject& object) +{ + knowledgeFilter = object.value("knowledgeFilter").toString(); + knowledgeMaxCount = object.value("knowledgeMaxCount").toInt(); + keywordFilter = object.value("keywordFilter").toString(); + keywordMaxCount = object.value("keywordMaxCount").toInt(); +} + +ProtocolReply_WorkspaceFetchIndex::ProtocolReply_WorkspaceFetchIndex() + : ProtocolReply(WorkspaceFetchIndex) {} + +void ProtocolReply_WorkspaceFetchIndex::serializeFields(QJsonObject& object) const +{ +} + +void ProtocolReply_WorkspaceFetchIndex::deserializeFields(const QJsonObject& object) +{ +} + +ProtocolNotification_WorkspaceUpdate::ProtocolNotification_WorkspaceUpdate() + : ProtocolRequest(NotificationWorkspaceUpdated) {} + +void ProtocolNotification_WorkspaceUpdate::serializeFields(QJsonObject& object) const +{ +} + +void ProtocolNotification_WorkspaceUpdate::deserializeFields(const QJsonObject& object) +{ +} -- cgit v1.2.3-70-g09d2