Skip to content

Commit 4fef275

Browse files
viacheslauKviacheslauK
committed
mqtt: renaming (mqtt_streaming_client_module -> mqtt_streaming_module)
1 parent 009a4c8 commit 4fef275

43 files changed

Lines changed: 197 additions & 197 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ endif()
6262

6363
add_subdirectory(external)
6464
add_subdirectory(mqtt_streaming_protocol)
65-
add_subdirectory(mqtt_streaming_client_module)
65+
add_subdirectory(mqtt_streaming_module)
6666

6767
if(OPENDAQ_DEVICE_EXAMPLE_ENABLE_EXAMPLE_APPS)
6868
message(STATUS "Example applications have been enabled")

‎mqtt_streaming_client_module/CMakeLists.txt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎mqtt_streaming_client_module/src/module_dll.cpp‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎mqtt_streaming_module/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
cmake_minimum_required(VERSION 3.10)
2+
set_cmake_folder_context(TARGET_FOLDER_NAME)
3+
4+
set(MQTT_MODULE_VERSION ${OPENDAQ_PACKAGE_VERSION})
5+
set(MQTT_MODULE_PRJ_NAME "OpenDaqMqttModule")
6+
7+
message(STATUS "${MQTT_MODULE_PRJ_NAME} version: ${MQTT_MODULE_VERSION}")
8+
project(${MQTT_MODULE_PRJ_NAME} VERSION ${MQTT_MODULE_VERSION} LANGUAGES C CXX)
9+
10+
add_subdirectory(src)
11+
#if (OPENDAQ_MQTT_ENABLE_TESTS)
12+
add_subdirectory(tests)
13+
#endif()

mqtt_streaming_client_module/include/mqtt_streaming_client_module/common.h renamed to mqtt_streaming_module/include/mqtt_streaming_module/common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
#pragma once
1818
#include <coretypes/common.h>
1919

20-
#define BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE BEGIN_NAMESPACE_OPENDAQ_MODULE(mqtt_streaming_client_module)
21-
#define END_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE END_NAMESPACE_OPENDAQ_MODULE
20+
#define BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE BEGIN_NAMESPACE_OPENDAQ_MODULE(mqtt_streaming_module)
21+
#define END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE END_NAMESPACE_OPENDAQ_MODULE

mqtt_streaming_client_module/include/mqtt_streaming_client_module/constants.h renamed to mqtt_streaming_module/include/mqtt_streaming_module/constants.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "common.h"
44

5-
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
5+
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
66

77
static const char* DaqMqttDeviceTypeId = "OpenDAQMQTTStreaming";
88
static const char* DaqMqttProtocolId = "OpenDAQMQTTStreaming";
@@ -54,4 +54,4 @@ static const char* MQTT_LOCAL_DEVICE_ID_PREFIX = "MqttDevice";
5454
static const char* MQTT_DEVICE_NAME = "MqttStreamingClientPseudoDevice";
5555

5656
static const char* MQTT_LOCAL_PUB_FB_ID_PREFIX = "publisherMqttFb";
57-
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
57+
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE

mqtt_streaming_client_module/include/mqtt_streaming_client_module/handler_base.h renamed to mqtt_streaming_module/include/mqtt_streaming_module/handler_base.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
#pragma once
1818

19-
#include "mqtt_streaming_client_module/common.h"
20-
#include <mqtt_streaming_client_module/types.h>
19+
#include "mqtt_streaming_module/common.h"
20+
#include <mqtt_streaming_module/types.h>
2121
#include <opendaq/sample_type_traits.h>
2222
#include <vector>
2323

24-
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
24+
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
2525

2626
class HandlerBase
2727
{
@@ -111,4 +111,4 @@ class HandlerBase
111111
}
112112
};
113113

114-
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
114+
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE

mqtt_streaming_client_module/include/mqtt_streaming_client_module/handler_factory.h renamed to mqtt_streaming_module/include/mqtt_streaming_module/handler_factory.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
#pragma once
1818

19-
#include "mqtt_streaming_client_module/types.h"
20-
#include <mqtt_streaming_client_module/multiple_handler.h>
21-
#include <mqtt_streaming_client_module/multiple_shared_handler.h>
22-
#include <mqtt_streaming_client_module/multisingle_handler.h>
23-
#include <mqtt_streaming_client_module/single_handler.h>
19+
#include "mqtt_streaming_module/types.h"
20+
#include <mqtt_streaming_module/multiple_handler.h>
21+
#include <mqtt_streaming_module/multiple_shared_handler.h>
22+
#include <mqtt_streaming_module/multisingle_handler.h>
23+
#include <mqtt_streaming_module/single_handler.h>
2424

25-
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
25+
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
2626

2727
class HandlerFactory
2828
{
@@ -48,4 +48,4 @@ class HandlerFactory
4848
return std::make_unique<SingleHandler>(config.useSignalNames);
4949
}
5050
};
51-
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
51+
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE

mqtt_streaming_client_module/include/mqtt_streaming_client_module/helper.h renamed to mqtt_streaming_module/include/mqtt_streaming_module/helper.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616

1717
#pragma once
18-
#include <mqtt_streaming_client_module/common.h>
18+
#include <mqtt_streaming_module/common.h>
1919
#include <property_object_ptr.h>
2020

21-
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
21+
BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
2222

2323
std::string buildSignalNameFromTopic(std::string topic, const std::string& signalName);
2424
std::string buildDomainSignalNameFromTopic(std::string topic, const std::string& signalName);
2525
PropertyObjectPtr populateDefaultConfig(const PropertyObjectPtr& defaultConfig, const PropertyObjectPtr& config);
2626

27-
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_CLIENT_MODULE
27+
END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE

mqtt_streaming_client_module/include/mqtt_streaming_client_module/module_dll.h renamed to mqtt_streaming_module/include/mqtt_streaming_module/module_dll.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
#pragma once
1818
#include <opendaq/module_exports.h>
1919

20-
DECLARE_MODULE_EXPORTS(MqttStreamingClientModule)
20+
DECLARE_MODULE_EXPORTS(MqttStreamingModule)

0 commit comments

Comments
 (0)