Merge branch 'master' into development/METROL-1196

Author: SatheeshkumarG15

CMakeLists.txt

@@ -37,6 +37,7 @@ option(PLUGIN_DICTIONARY "Include Dictionary plugin" OFF)
 option(PLUGIN_DOGGO "Include watchdog plugin" OFF)
 option(PLUGIN_IOCONNECTOR "Include IOConnector plugin" OFF)
 option(PLUGIN_INPUTSWITCH "Include InputSwitch plugin" OFF)
+option(PLUGIN_JSONRPCMUXER "Include JsonRpcMuxer plugin capable to execute batched jsonRPC messages" OFF)
 option(PLUGIN_FIRMWARECONTROL "Include FirmwareControl Plugin" OFF)
 option(PLUGIN_PROCESSMONITOR "Include Process Monitor plugin" OFF)
 option(PLUGIN_LANGUAGEADMINISTRATOR "Include LanguageAdministrator plugin" OFF)
@@ -158,6 +159,10 @@ if(PLUGIN_INPUTSWITCH)
     add_subdirectory(InputSwitch)
 endif()
 
+if(PLUGIN_JSONRPCMUXER)
+    add_subdirectory(JsonRpcMuxer)
+endif()
+
 if(PLUGIN_SICONTROL)
     add_subdirectory (SIControl)
 endif(PLUGIN_SICONTROL)

JsonRpcMuxer/CMakeLists.txt

@@ -0,0 +1,63 @@
+# If not stated otherwise in this file or this component's LICENSE file the
+# following copyright and licenses apply:
+#
+# Copyright 2020 Metrological
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+project(JsonRpcMuxer)
+
+cmake_minimum_required(VERSION 3.15)
+
+find_package(Thunder)
+
+project_version(1.0.0)
+
+set(MODULE_NAME ${NAMESPACE}${PROJECT_NAME})
+
+message("Setup ${MODULE_NAME} v${PROJECT_VERSION}")
+
+set(PLUGIN_JSONRPCMUXER_STARTMODE "Activated" CACHE STRING "Automatically start JsonRpcMuxer plugin")
+set(PLUGIN_JSONRPCMUXER_MAX_CONCURRENT_JOBS 0 CACHE STRING "Maximum number of concurrent WorkerPool jobs")
+set(PLUGIN_JSONRPCMUXER_MAX_BATCH_SIZE 0 CACHE STRING "Maximum requests per batch")
+
+if(BUILD_REFERENCE)
+    add_definitions(-DBUILD_REFERENCE=${BUILD_REFERENCE})
+endif()
+
+find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(CompileSettingsDebug CONFIG REQUIRED)
+
+add_library(${MODULE_NAME} SHARED 
+    JsonRpcMuxer.cpp
+    Module.cpp)
+
+target_compile_definitions(${MODULE_NAME} PRIVATE
+    PLUGIN_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
+    PLUGIN_VERSION_MINOR=${PROJECT_VERSION_MINOR}
+    PLUGIN_VERSION_PATCH=${PROJECT_VERSION_PATCH}
+)
+
+set_target_properties(${MODULE_NAME} PROPERTIES
+        CXX_STANDARD 11
+        CXX_STANDARD_REQUIRED YES)
+
+target_link_libraries(${MODULE_NAME} 
+    PRIVATE
+        CompileSettingsDebug::CompileSettingsDebug
+        ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
+
+install(TARGETS ${MODULE_NAME} 
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
+
+write_config()

JsonRpcMuxer/JsonRpcMuxer.conf.in

@@ -0,0 +1,9 @@
+startmode = "@PLUGIN_JSONRPCMUXER_STARTMODE@"
+
+configuration = JSON()
+
+if @PLUGIN_JSONRPCMUXER_MAX_CONCURRENT_JOBS@:
+    configuration.add("maxconcurrentjobs", "@PLUGIN_JSONRPCMUXER_MAX_CONCURRENT_JOBS@")
+
+if @PLUGIN_JSONRPCMUXER_MAX_BATCH_SIZE@:
+    configuration.add("maxbatchsize", "@PLUGIN_JSONRPCMUXER_MAX_BATCH_SIZE@")