Changeset 74093 in vbox for trunk

Timestamp:

Sep 5, 2018 7:30:01 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Implemented the hybrid RTCRestAnyObject chameleon. bugref:9167

Location:

trunk

Files:

• include/iprt/cpp/restanyobject.h (added)
• include/iprt/cpp/restbase.h (modified) (1 diff)
• include/iprt/err.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/rest/RTCRestAnyObject.cpp (added)
• src/VBox/Runtime/common/rest/RTCRestClientRequestBase.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/rest/rest-primary-object-types.cpp (modified) (1 diff)

trunk/include/iprt/cpp/restbase.h

@@ -877 +877 @@
 };
 
-
-/**
- * Dynamic REST object.
- *
- * @todo figure this one out. it's possible this is only used in maps and
- *       could be a specialized map implementation.
- */
-class /*RT_DECL_CLASS*/ RTCRestObject : public RTCRestObjectBase
-{
-public:
-    /** Default constructor. */
-    RTCRestObject();
-    /** Destructor. */
-    virtual ~RTCRestObject();
-
-    /** Copy constructor. */
-    RTCRestObject(RTCRestObject const &a_rThat);
-    /** Copy assignment operator. */
-    RTCRestObject &operator=(RTCRestObject const &a_rThat);
-    /** Safe Safe copy assignment method. */
-    int assignCopy(RTCRestObject const &a_rThat);
-
-    /* Overridden methods: */
-    virtual int setNull(void) RT_OVERRIDE;
-    virtual int resetToDefault() RT_OVERRIDE;
-    virtual RTCRestOutputBase &serializeAsJson(RTCRestOutputBase &a_rDst) const RT_OVERRIDE;
-    virtual int deserializeFromJson(RTCRestJsonCursor const &a_rCursor) RT_OVERRIDE;
-    virtual int toString(RTCString *a_pDst, uint32_t a_fFlags = kCollectionFormat_Unspecified) const RT_OVERRIDE;
-    virtual int fromString(RTCString const &a_rValue, const char *a_pszName, PRTERRINFO a_pErrInfo = NULL,
-                           uint32_t a_fFlags = kCollectionFormat_Unspecified) RT_OVERRIDE;
-    virtual kTypeClass typeClass(void) const RT_OVERRIDE;
-    virtual const char *typeName(void) const RT_OVERRIDE;
-
-    /** Factory method. */
-    static DECLCALLBACK(RTCRestObjectBase *) createInstance(void);
-
-protected:
-    /** @todo figure out the value stuff here later... */
-};
-
-
 /** @} */
 

trunk/include/iprt/err.h

@@ -3220 +3220 @@
 
 /** Internal error \#1. */
-#define VERR_REST_INTERAL_ERROR_1                       (-25791)
+#define VERR_REST_INTERNAL_ERROR_1                      (-25791)
 /** Internal error \#2. */
-#define VERR_REST_INTERAL_ERROR_2                       (-25792)
+#define VERR_REST_INTERNAL_ERROR_2                      (-25792)
 /** Internal error \#3. */
-#define VERR_REST_INTERAL_ERROR_3                       (-25793)
+#define VERR_REST_INTERNAL_ERROR_3                      (-25793)
 /** Internal error \#4. */
-#define VERR_REST_INTERAL_ERROR_4                       (-25794)
+#define VERR_REST_INTERNAL_ERROR_4                      (-25794)
 /** Internal error \#5. */
-#define VERR_REST_INTERAL_ERROR_5                       (-25795)
+#define VERR_REST_INTERNAL_ERROR_5                      (-25795)
 /** Internal error \#6. */
-#define VERR_REST_INTERAL_ERROR_6                       (-25796)
+#define VERR_REST_INTERNAL_ERROR_6                      (-25796)
 /** Internal error \#7. */
-#define VERR_REST_INTERAL_ERROR_7                       (-25797)
+#define VERR_REST_INTERNAL_ERROR_7                      (-25797)
 /** Internal error \#8. */
-#define VERR_REST_INTERAL_ERROR_8                       (-25798)
+#define VERR_REST_INTERNAL_ERROR_8                      (-25798)
 /** Internal error \#9. */
-#define VERR_REST_INTERAL_ERROR_9                       (-25799)
+#define VERR_REST_INTERNAL_ERROR_9                      (-25799)
 /** @} */
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1653 +1653 @@
         generic/http-curl.cpp \
         common/rest/rest-primary-object-types.cpp \
+        common/rest/RTCRestAnyObject.cpp \
         common/rest/RTCRestArrayBase.cpp \
         common/rest/RTCRestClientApiBase.cpp \

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

@@ -152 +152 @@
                  */
                 AssertReturn(a_papQueryParamObjs[i]->typeClass() == RTCRestObjectBase::kTypeClass_Array,
-                             VERR_REST_INTERAL_ERROR_2);
+                             VERR_REST_INTERNAL_ERROR_2);
                 RTCRestArrayBase const *pArray = (RTCRestArrayBase const *)a_papQueryParamObjs[i];
                 for (size_t j = 0; j < pArray->size(); j++)
@@ -204 +204 @@
                  */
                 AssertReturn(a_papHeaderParamObjs[i]->typeClass() == RTCRestObjectBase::kTypeClass_StringMap,
-                             VERR_REST_INTERAL_ERROR_1);
+                             VERR_REST_INTERNAL_ERROR_1);
                 RTCRestStringMapBase const *pMap    = (RTCRestStringMapBase const *)a_papHeaderParamObjs[i];
                 const size_t                cchName = strlen(a_paHeaderParams[i].pszName);

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

@@ -1256 +1256 @@
             size_t              cEntries  = 0;
             ENUMMAPENTRY const *paEntries = getMappingTable(&cEntries);
-            AssertReturn((unsigned)(m_iEnumValue - 1) < cEntries, VERR_REST_INTERAL_ERROR_3);
+            AssertReturn((unsigned)(m_iEnumValue - 1) < cEntries, VERR_REST_INTERNAL_ERROR_3);
             Assert(paEntries[m_iEnumValue - 1].iValue == m_iEnumValue);