[DNMY] Reworking

CHANGELOG.md

@@ -4,11 +4,26 @@ All notable changes to 'fty-messagebus2' project will be documented in this file
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-[1.0.0] - 2021-mm-dd
+[1.0.X] - 2022-mm-dd [IN PROGRESS]
 ### Added
-  -
+- Add secured class for promise/future management.
 ### Changed
-  -
+- Reworking Amqp code.
 ### Removed
-  -
+- Remove the intermediate class MsgBusAmqp.
 ### Fixed
+
+[1.0.1] - 2022-07-13
+### Added
+- Add callback for definitive communication lost treatment.
+### Changed
+- Reworking Amqp code.
+- Optimise the number of simultaneous connection on the Amqp library.
+- Modify name space of the project.
+### Fixed
+- Close missing open handles.
+- Modify default configuration to avoid loss of connection.
+
+[1.0.0] - 2022-01-20
+### Added
+- First version

Jenkinsfile

@@ -2,9 +2,11 @@
 
 @Library('etn-ipm2-jenkins') _
 
-import params.CmakePipelineParams
-CmakePipelineParams parameters = new CmakePipelineParams()
-parameters.enableDebugBuild = false
+//import params.CmakePipelineParams
+//CmakePipelineParams parameters = new CmakePipelineParams()
+//parameters.enableDebugBuild = false
 //parameters.debugBuildRunCoverage = true
+//etn_ipm2_build_and_tests_pipeline_cmake(parameters)
 
-etn_ipm2_build_and_tests_pipeline_cmake(parameters)
+// run with default parameters
+etn_ipm2_build_and_tests_pipeline_cmake()

README.md

@@ -3,14 +3,14 @@
 ## Description
 
 This project aims to provide somme common methods to address communication over several message bus.
-It provide an high level interface to handle comunication of Message. The format of the Message also defined in this project.
+It provide an high level interface to handle communication of Message. The format of the Message also defined in this project.
 
 It comes today with 2 implementations:
 
 * MQTT
 * AMQP
 
-Those 2 implementations are implementing the fty-commom-messagebus2 interface and are carring Message.
+Those 2 implementations are implementing the fty-messagebus2 interface and are carrying Message.
 
 ## Interface & Message
 

amqp/public_include/fty/messagebus2/amqp/MessageBusAmqp.h

@@ -27,40 +27,41 @@ namespace fty::messagebus2::amqp {
 
 // Default amqp end point
 static auto constexpr DEFAULT_ENDPOINT{"amqp://127.0.0.1:5672"};
-
 static auto constexpr BUS_IDENTITY{"AMQP"};
-static const std::string TOPIC_PREFIX = "topic://";
-static const std::string QUEUE_PREFIX = "queue://";
 
-class MsgBusAmqp;
+class AmqpClient;
 
 class MessageBusAmqp final : public MessageBus
 {
 public:
-    MessageBusAmqp(const ClientName& clientName = utils::getClientId("MessageBusAmqp"), const Endpoint& endpoint = DEFAULT_ENDPOINT);
-
+    MessageBusAmqp(const std::string& clientName = utils::getClientId("MessageBusAmqp"), const Endpoint& endpoint = DEFAULT_ENDPOINT);
     ~MessageBusAmqp() = default;
 
     MessageBusAmqp(MessageBusAmqp&&) = delete;
-    MessageBusAmqp& operator=(MessageBusAmqp&&) = delete;
-    MessageBusAmqp(const MessageBusAmqp&)       = delete;
-    MessageBusAmqp& operator=(const MessageBusAmqp&) = delete;
+    MessageBusAmqp& operator = (MessageBusAmqp&&) = delete;
+    MessageBusAmqp(const MessageBusAmqp&) = delete;
+    MessageBusAmqp& operator = (const MessageBusAmqp&) = delete;
 
     [[nodiscard]] fty::Expected<void, ComState>      connect() noexcept override;
     [[nodiscard]] fty::Expected<void, DeliveryState> send(const Message& msg) noexcept override;
     [[nodiscard]] fty::Expected<void, DeliveryState> receive(
-        const Address& address, MessageListener&& func, const std::string& filter = {}) noexcept override;
-    [[nodiscard]] fty::Expected<void, DeliveryState>    unreceive(const Address& address) noexcept override;
-    [[nodiscard]] fty::Expected<Message, DeliveryState> request(const Message& msg, int timeOut) noexcept override;
-
-    void setConnectionErrorListener(ConnectionErrorListener errorListener);
-
+        const Address& address, MessageListener&& messageListener, const std::string& filter = {}) noexcept override;
+    [[nodiscard]] fty::Expected<void, DeliveryState> unreceive(const Address& address, const std::string& filter = {}) noexcept override;
+    // Sync request with timeout
+    [[nodiscard]] fty::Expected<Message, DeliveryState> request(const Message& message, int timeoutInSeconds) noexcept override;
     [[nodiscard]] const ClientName& clientName() const noexcept override;
-    [[nodiscard]] const Identity&   identity() const noexcept override;
+    [[nodiscard]] const Identity& identity() const noexcept override;
 
-    using MessageBus::receive;
 private:
-    std::shared_ptr<MsgBusAmqp> m_busAmqp;
+    // Test if the service is available or not
+    bool isServiceAvailable();
+
+    // Client name
+    std::string m_clientName{};
+    // Amqp endpoint
+    Endpoint    m_endpoint{};
+    // AmqpClient instance
+    std::shared_ptr<AmqpClient> m_clientPtr;
 };
 
 } // namespace fty::messagebus2::amqp