OpcUaDataValue reworking

Author: Viacheslav Kalenikov

shared/libraries/opcua/opcuashared/include/opcuashared/opcuadatavalue.h

@@ -33,7 +33,6 @@ class OpcUaDataValue : public OpcUaObject<UA_DataValue>
     const UA_DataValue& getDataValue() const;
 
     bool hasValue() const;
-    OpcUaVariant getValue() const;
 
     UA_StatusCode getStatusCode() const;
 
@@ -45,8 +44,32 @@ class OpcUaDataValue : public OpcUaObject<UA_DataValue>
 
     bool isStatusOK() const;
 
-protected:
+    bool isInteger() const;
+    bool isString() const;
+    bool isDouble() const;
+    bool isNull() const;
+    bool isReal() const;
+    bool isNumber() const;
 
+    std::string toString() const;
+    int64_t toInteger() const;
+
+    template <typename T>
+    inline T readScalar() const
+    {
+        return VariantUtils::ReadScalar<T>(this->value.value);
+    }
+
+    template <typename T, typename UATYPE = TypeToUaDataType<T>>
+    void setScalar(const T& value)
+    {
+        static_assert(UATYPE::DataType != nullptr, "Implement specialization of TypeToUaDataType");
+
+        this->clear();
+
+        const auto status = UA_Variant_setScalarCopy(&(this->value.value), &value, UATYPE::DataType);
+        CheckStatusCodeException(status);
+    }
 };
 
 END_NAMESPACE_OPENDAQ_OPCUA

shared/libraries/opcua/opcuashared/include/opcuashared/opcuavariant.h

@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "opcuacommon.h"
 #include <opcuashared/opcuanodeid.h>
 
 BEGIN_NAMESPACE_OPENDAQ_OPCUA
@@ -26,15 +25,17 @@ using OpcUaVariantPtr = std::shared_ptr<OpcUaVariant>;
 
 namespace VariantUtils
 {
-    inline bool IsScalar(const UA_Variant& value)
-    {
-        return UA_Variant_isScalar(&value);
-    }
-
-    inline bool IsVector(const UA_Variant& value)
-    {
-        return !IsScalar(value);
-    }
+    bool IsScalar(const UA_Variant& value);
+    bool IsVector(const UA_Variant& value);
+    bool IsInteger(const UA_Variant& value);
+    bool isReal(const UA_Variant& value);
+    bool isNull(const UA_Variant& value);
+
+    std::string ToString(const UA_Variant& value);
+    int64_t ToNumber(const UA_Variant& value);
+    OpcUaNodeId ToNodeId(const UA_Variant& value);
+    void ToInt32Variant(OpcUaVariant& variant);
+    void ToInt64Variant(OpcUaVariant& variant);
 
     template <typename T>
     inline bool IsType(const UA_Variant& value)
@@ -69,47 +70,6 @@ namespace VariantUtils
             throw std::runtime_error("Variant does not contain a scalar of specified return type");
         return *static_cast<T*>(value.data);
     }
-
-    inline std::string ToString(const UA_Variant& value)
-    {
-        return utils::ToStdString(ReadScalar<UA_String>(value));
-    }
-
-    inline int64_t ToNumber(const UA_Variant& value)
-    {
-        switch (value.type->typeKind)
-        {
-            case UA_TYPES_SBYTE:
-                return ReadScalar<UA_SByte>(value);
-            case UA_TYPES_BYTE:
-                return ReadScalar<UA_Byte>(value);
-            case UA_TYPES_INT16:
-                return ReadScalar<UA_Int16>(value);
-            case UA_TYPES_UINT16:
-                return ReadScalar<UA_UInt16>(value);
-            case UA_TYPES_INT32:
-            case UA_TYPES_ENUMERATION:
-                return ReadScalar<UA_Int32>(value);
-            case UA_TYPES_UINT32:
-                return ReadScalar<UA_UInt32>(value);
-            case UA_TYPES_INT64:
-                return ReadScalar<UA_Int64>(value);
-            case UA_TYPES_UINT64:
-                return ReadScalar<UA_UInt64>(value);
-
-            default:
-                throw std::runtime_error("Type not supported!");
-        }
-    }
-
-    inline OpcUaNodeId ToNodeId(const UA_Variant& value)
-    {
-        UA_NodeId nodeId = ReadScalar<UA_NodeId>(value);
-        return OpcUaNodeId(nodeId);
-    }
-
-    void ToInt32Variant(OpcUaVariant& variant);
-    void ToInt64Variant(OpcUaVariant& variant);
 }
 
 class OpcUaVariant : public OpcUaObject<UA_Variant>
@@ -170,24 +130,15 @@ class OpcUaVariant : public OpcUaObject<UA_Variant>
     bool isNull() const;
     bool isReal() const;
     bool isNumber() const;
+    bool isScalar() const;
+    bool isVector() const;
 
     std::string toString() const;
     int64_t toInteger() const;
     double toDouble() const;
     float toFloat() const;
     bool toBool() const;
     OpcUaNodeId toNodeId() const;
-
-    inline bool isScalar() const
-    {
-        return VariantUtils::IsScalar(value);
-    }
-    inline bool isVector() const
-    {
-        return VariantUtils::IsVector(value);
-    }
-
-    static bool IsInteger(const UA_Variant& value);
 };
 
 class OpcUaVariableConversionError : public OpcUaException

shared/libraries/opcua/opcuashared/src/opcuadatavalue.cpp

@@ -2,11 +2,6 @@
 
 BEGIN_NAMESPACE_OPENDAQ_OPCUA
 
-OpcUaVariant OpcUaDataValue::getValue() const
-{
-    return OpcUaVariant(OpcUaObject<UA_DataValue>::getValue().value, true);
-}
-
 UA_StatusCode OpcUaDataValue::getStatusCode() const
 {
     if (!getDataValue().hasStatus)
@@ -58,4 +53,44 @@ uint64_t OpcUaDataValue::toUnixTimeUs(UA_DateTime date)
     return static_cast<uint64_t>((date - UA_DATETIME_UNIX_EPOCH) / UA_DATETIME_USEC);
 }
 
+bool OpcUaDataValue::isInteger() const
+{
+    return VariantUtils::IsInteger(this->value.value);
+}
+
+bool OpcUaDataValue::isString() const
+{
+    return VariantUtils::HasScalarType<UA_String>(value.value) ||
+           VariantUtils::HasScalarType<UA_LocalizedText>(value.value);
+}
+
+bool OpcUaDataValue::isDouble() const
+{
+    return VariantUtils::HasScalarType<UA_Double>(value.value);
+}
+
+bool OpcUaDataValue::isNull() const
+{
+    return VariantUtils::isNull(value.value);
+}
+
+bool OpcUaDataValue::isReal() const
+{
+    return VariantUtils::isReal(value.value);
+}
+
+bool OpcUaDataValue::isNumber() const
+{
+    return isInteger() || isReal();
+}
+
+std::string OpcUaDataValue::toString() const
+{
+    return VariantUtils::ToString(value.value);
+}
+
+int64_t OpcUaDataValue::toInteger() const
+{
+    return VariantUtils::ToNumber(value.value);
+}
 END_NAMESPACE_OPENDAQ_OPCUA