Changeset 74386 in vbox

Timestamp:

Sep 20, 2018 3:46:38 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

125207

Message:

IPRT/rest: Early support for polymorphic data objects in the data model. bugref:9167 ..\..\ e:\vbox\svn\trunk\include\iprt\

Location:

trunk/src/VBox/Runtime/common/rest

Files:

• RTCRestAnyObject.cpp (modified) (1 diff)
• RTCRestArrayBase.cpp (modified) (2 diffs)
• RTCRestStringMapBase.cpp (modified) (2 diffs)
• rest-binary.cpp (modified) (3 diffs)
• rest-primary-object-types.cpp (modified) (12 diffs)

trunk/src/VBox/Runtime/common/rest/RTCRestAnyObject.cpp

@@ -382 +382 @@
 
 
+RTCRestObjectBase *RTCRestAnyObject::baseClone() const
+{
+    RTCRestAnyObject *pClone = new (std::nothrow) RTCRestAnyObject();
+    if (pClone)
+    {
+        int rc = pClone->assignCopy(*this);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
+}
+
+
 int RTCRestAnyObject::setNull(void)
 {

trunk/src/VBox/Runtime/common/rest/RTCRestArrayBase.cpp

@@ -90 +90 @@
 *********************************************************************************************************************************/
 
+RTCRestObjectBase *RTCRestArrayBase::baseClone() const
+{
+    RTCRestArrayBase *pClone = createClone();
+    if (pClone)
+    {
+        int rc = pClone->copyArrayWorker(*this, false /*fThrow*/);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
+}
+
+
 int RTCRestArrayBase::resetToDefault()
 {
@@ -458 +472 @@
 {
     int rc;
-    RTCRestObjectBase *pValueCopy = createValueCopy(&a_rValue);
+    RTCRestObjectBase *pValueCopy = a_rValue.baseClone();
     if (pValueCopy)
     {

trunk/src/VBox/Runtime/common/rest/RTCRestStringMapBase.cpp

@@ -73 +73 @@
 *   Overridden base object methods                                                                                               *
 *********************************************************************************************************************************/
+
+RTCRestObjectBase *RTCRestStringMapBase::baseClone() const
+{
+    RTCRestStringMapBase *pClone = createClone();
+    if (pClone)
+    {
+        int rc = pClone->copyMapWorker(*this, false /*fThrow*/);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
+}
+
 
 int RTCRestStringMapBase::resetToDefault()
@@ -394 +408 @@
 {
     int rc;
-    RTCRestObjectBase *pValueCopy = createValueCopy(&a_rValue);
+    RTCRestObjectBase *pValueCopy = a_rValue.baseClone();
     if (pValueCopy)
     {

trunk/src/VBox/Runtime/common/rest/rest-binary.cpp

@@ -176 +176 @@
 
 /* Overridden methods: */
+
+RTCRestObjectBase *RTCRestBinary::baseClone() const
+{
+    RTCRestBinary *pClone = new (std::nothrow) RTCRestBinary();
+    if (pClone)
+    {
+        int rc = pClone->assignCopy(*this);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
+}
+
+
 int RTCRestBinary::setNull(void)
 {
@@ -302 +317 @@
     AssertMsgFailed(("Please use assignReadOnly!\n"));
     return assignReadOnly(a_pvBuf, a_cbBuf);
+}
+
+
+RTCRestObjectBase *RTCRestBinaryParameter::baseClone() const
+{
+    RTCRestBinaryParameter *pClone = new (std::nothrow) RTCRestBinaryParameter();
+    if (pClone)
+    {
+        int rc = pClone->assignCopy(*this);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
 }
 
@@ -487 +516 @@
     AssertStmt(a_cbBuf <= m_cbMaxDownload, m_cbMaxDownload = a_cbBuf);
     return RTCRestBinary::assignWriteable(a_pvBuf, a_cbBuf);
+}
+
+
+RTCRestObjectBase *RTCRestBinaryResponse::baseClone() const
+{
+    RTCRestBinaryResponse *pClone = new (std::nothrow) RTCRestBinaryResponse();
+    if (pClone)
+    {
+        int rc = pClone->assignCopy(*this);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
 }
 

trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp

@@ -185 +185 @@
 
 
+RTCRestObjectBase *RTCRestBool::baseClone() const
+{
+    return new (std::nothrow) RTCRestBool(*this);
+}
+
+
 int RTCRestBool::resetToDefault()
 {
@@ -356 +362 @@
 
 
+RTCRestObjectBase *RTCRestInt64::baseClone() const
+{
+    return new (std::nothrow) RTCRestInt64(*this);
+}
+
+
 int RTCRestInt64::resetToDefault()
 {
@@ -510 +522 @@
     m_iValue = a_rThat.m_iValue;
     return VINF_SUCCESS;
+}
+
+
+RTCRestObjectBase *RTCRestInt32::baseClone() const
+{
+    return new (std::nothrow) RTCRestInt32(*this);
 }
 
@@ -690 +708 @@
 
 
+RTCRestObjectBase *RTCRestInt16::baseClone() const
+{
+    return new (std::nothrow) RTCRestInt16(*this);
+}
+
+
 int RTCRestInt16::resetToDefault()
 {
@@ -856 +880 @@
     m_rdValue = a_rdValue;
     m_fNullIndicator = false;
+}
+
+
+RTCRestObjectBase *RTCRestDouble::baseClone() const
+{
+    return new (std::nothrow) RTCRestDouble(*this);
 }
 
@@ -1030 +1060 @@
 /** Default constructor. */
 RTCRestString::RTCRestString()
-    : RTCString()
-    , RTCRestObjectBase()
+    : RTCRestObjectBase()
+    , RTCString()
 {
 }
@@ -1038 +1068 @@
 /** Copy constructor. */
 RTCRestString::RTCRestString(RTCRestString const &a_rThat)
-    : RTCString(a_rThat)
-    , RTCRestObjectBase(a_rThat)
+    : RTCRestObjectBase(a_rThat)
+    , RTCString(a_rThat)
 {
 }
@@ -1053 +1083 @@
 /** From value constructor. */
 RTCRestString::RTCRestString(const char *a_pszSrc)
-    : RTCString(a_pszSrc)
-    , RTCRestObjectBase()
+    : RTCRestObjectBase()
+    , RTCString(a_pszSrc)
 {
 }
@@ -1093 +1123 @@
     m_fNullIndicator = true;
     return VINF_SUCCESS;
+}
+
+
+RTCRestObjectBase *RTCRestString::baseClone() const
+{
+    RTCRestString *pClone = new (std::nothrow) RTCRestString();
+    if (pClone)
+    {
+        int rc = pClone->assignCopy(*this);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
 }
 
@@ -1366 +1410 @@
     m_enmFormat      = a_rThat.m_enmFormat;
     return m_strFormatted.assignNoThrow(a_rThat.m_strFormatted);
+}
+
+
+RTCRestObjectBase *RTCRestDate::baseClone() const
+{
+    RTCRestDate *pClone = new (std::nothrow) RTCRestDate();
+    if (pClone)
+    {
+        int rc = pClone->assignCopy(*this);
+        if (RT_SUCCESS(rc))
+            return pClone;
+        delete pClone;
+    }
+    return NULL;
 }
 
@@ -2010 +2068 @@
 
 
+RTCRestObjectBase  *RTCRestStringEnumBase::cloneWorker(RTCRestStringEnumBase *a_pDst) const
+{
+    if (a_pDst)
+    {
+        int rc = a_pDst->assignCopy(*this);
+        if (RT_SUCCESS(rc))
+            return a_pDst;
+        delete a_pDst;
+    }
+    return NULL;
+}
+
+
 
 /*********************************************************************************************************************************
@@ -2170 +2241 @@
 }
 
+
+
+/*********************************************************************************************************************************
+*   RTCRestPolyDataObject                                                                                                        *
+*********************************************************************************************************************************/
+
+RTCRestPolyDataObject::RTCRestPolyDataObject()
+    : RTCRestDataObject()
+{
+}
+
+
+RTCRestPolyDataObject::RTCRestPolyDataObject(RTCRestPolyDataObject const &a_rThat)
+    : RTCRestDataObject(a_rThat)
+{
+}
+
+
+RTCRestPolyDataObject::~RTCRestPolyDataObject()
+{
+}
+
+
+int RTCRestPolyDataObject::resetToDefault()
+{
+    return RTCRestDataObject::resetToDefault();
+}
+
+
+bool RTCRestPolyDataObject::isChild() const
+{
+    return false;
+}
+
+
+RTCRestPolyDataObject &RTCRestPolyDataObject::operator=(RTCRestPolyDataObject const &a_rThat)
+{
+    RTCRestDataObject::operator=(a_rThat);
+    return *this;
+}
+