Changeset 74013 in vbox

Timestamp:

Aug 31, 2018 8:57:59 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Added parameter based api methods (constructs Request objects themselves). More on the null subject. Misc. bugref:9167

Location:

trunk

Files:

• include/iprt/cpp/restbase.h (modified) (6 diffs)
• src/VBox/Runtime/common/rest/RTCRestClientApiBase.cpp (modified) (1 diff)
• src/VBox/Runtime/common/rest/rest-primary-object-types.cpp (modified) (5 diffs)

trunk/include/iprt/cpp/restbase.h

@@ -404 +404 @@
     /** Safe copy assignment method. */
     int assignCopy(RTCRestBool const &a_rThat);
+    /** Assign value and clear null indicator. */
+    void assignValue(bool a_fValue);
 
     /* Overridden methods: */
@@ -434 +436 @@
     RTCRestInt64(RTCRestInt64 const &a_rThat);
     /** From value constructor. */
-    RTCRestInt64(int64_t iValue);
+    RTCRestInt64(int64_t a_iValue);
     /** Destructor. */
     virtual ~RTCRestInt64();
@@ -441 +443 @@
     /** Safe copy assignment method. */
     int assignCopy(RTCRestInt64 const &a_rThat);
+    /** Assign value and clear null indicator. */
+    void assignValue(int64_t a_iValue);
 
     /* Overridden methods: */
@@ -478 +482 @@
     /** Safe copy assignment method. */
     int assignCopy(RTCRestInt32 const &a_rThat);
+    /** Assign value and clear null indicator. */
+    void assignValue(int32_t a_iValue);
 
     /* Overridden methods: */
@@ -515 +521 @@
     /** Safe copy assignment method. */
     int assignCopy(RTCRestInt16 const &a_rThat);
+    /** Assign value and clear null indicator. */
+    void assignValue(int16_t a_iValue);
 
     /* Overridden methods: */
@@ -552 +560 @@
     /** Safe copy assignment method. */
     int assignCopy(RTCRestDouble const &a_rThat);
+    /** Assign value and clear null indicator. */
+    void assignValue(double a_rdValue);
 
     /* Overridden methods: */

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

@@ -68 +68 @@
     LogFlow(("doCall: %s %s\n", a_pszMethod, RTHttpMethodName(a_enmHttpMethod)));
 
-    /*
-     * Reset the response object, allowing reuse of such.
-     */
-    a_pResponse->reset();
 
     /*
-     * Initialize the HTTP instance.
+     * Reset the response object (allowing reuse of such) and check the request
+     * object for assignment errors.
      */
+    int    rc;
     RTHTTP hHttp = NIL_RTHTTP;
-    int rc = reinitHttpInstance();
-    if (RT_SUCCESS(rc))
+
+    a_pResponse->reset();
+    if (!a_rRequest.hasAssignmentErrors())
     {
-        hHttp = m_hHttp;
-        Assert(hHttp != NIL_RTHTTP);
-
         /*
-         * Prepare the response side.  This may install output callbacks and
-         * indicate this by clearing the ppvBody/ppvHdr variables.
+         * Initialize the HTTP instance.
          */
-        size_t   cbHdrs  = 0;
-        void    *pvHdrs  = NULL;
-        void   **ppvHdrs = &pvHdrs;
-
-        size_t   cbBody  = 0;
-        void    *pvBody  = NULL;
-        void   **ppvBody = &pvBody;
-
-        rc = a_pResponse->receivePrepare(hHttp, &ppvBody, &ppvHdrs);
+        rc = reinitHttpInstance();
         if (RT_SUCCESS(rc))
         {
+            hHttp = m_hHttp;
+            Assert(hHttp != NIL_RTHTTP);
+
             /*
-             * Prepare the request for the transmission.
+             * Prepare the response side.  This may install output callbacks and
+             * indicate this by clearing the ppvBody/ppvHdr variables.
              */
-            RTCString strExtraPath;
-            RTCString strQuery;
-            RTCString strXmitBody;
-            rc = a_rRequest.xmitPrepare(&strExtraPath, &strQuery, hHttp, &strXmitBody);
+            size_t   cbHdrs  = 0;
+            void    *pvHdrs  = NULL;
+            void   **ppvHdrs = &pvHdrs;
+
+            size_t   cbBody  = 0;
+            void    *pvBody  = NULL;
+            void   **ppvBody = &pvBody;
+
+            rc = a_pResponse->receivePrepare(hHttp, &ppvBody, &ppvHdrs);
             if (RT_SUCCESS(rc))
             {
                 /*
-                 * Construct the full URL.
+                 * Prepare the request for the transmission.
                  */
-                RTCString strFullUrl;
-                rc = strFullUrl.assignNoThrow(m_strBasePath);
-                if (strExtraPath.isNotEmpty())
-                {
-                    if (!strExtraPath.startsWith("/") && !strFullUrl.endsWith("/") && RT_SUCCESS(rc))
-                        rc = strFullUrl.appendNoThrow('/');
-                    if (RT_SUCCESS(rc))
-                        rc = strFullUrl.appendNoThrow(strExtraPath);
-                    strExtraPath.setNull();
-                }
-                if (strQuery.isNotEmpty())
-                {
-                    Assert(strQuery.startsWith("?"));
-                    rc = strFullUrl.appendNoThrow(strQuery);
-                    strQuery.setNull();
-                }
+                RTCString strExtraPath;
+                RTCString strQuery;
+                RTCString strXmitBody;
+                rc = a_rRequest.xmitPrepare(&strExtraPath, &strQuery, hHttp, &strXmitBody);
                 if (RT_SUCCESS(rc))
                 {
                     /*
-                     * Perform HTTP request.
+                     * Construct the full URL.
                      */
-                    uint32_t uHttpStatus = 0;
-                    rc = RTHttpPerform(hHttp, strFullUrl.c_str(), a_enmHttpMethod, strXmitBody.c_str(), strXmitBody.length(),
-                                       &uHttpStatus, ppvHdrs, &cbHdrs, ppvBody, &cbBody);
+                    RTCString strFullUrl;
+                    rc = strFullUrl.assignNoThrow(m_strBasePath);
+                    if (strExtraPath.isNotEmpty())
+                    {
+                        if (!strExtraPath.startsWith("/") && !strFullUrl.endsWith("/") && RT_SUCCESS(rc))
+                            rc = strFullUrl.appendNoThrow('/');
+                        if (RT_SUCCESS(rc))
+                            rc = strFullUrl.appendNoThrow(strExtraPath);
+                        strExtraPath.setNull();
+                    }
+                    if (strQuery.isNotEmpty())
+                    {
+                        Assert(strQuery.startsWith("?"));
+                        rc = strFullUrl.appendNoThrow(strQuery);
+                        strQuery.setNull();
+                    }
                     if (RT_SUCCESS(rc))
                     {
-                        a_rRequest.xmitComplete(uHttpStatus, hHttp);
+                        /*
+                         * Perform HTTP request.
+                         */
+                        uint32_t uHttpStatus = 0;
+                        rc = RTHttpPerform(hHttp, strFullUrl.c_str(), a_enmHttpMethod, strXmitBody.c_str(), strXmitBody.length(),
+                                           &uHttpStatus, ppvHdrs, &cbHdrs, ppvBody, &cbBody);
+                        if (RT_SUCCESS(rc))
+                        {
+                            a_rRequest.xmitComplete(uHttpStatus, hHttp);
 
-                        /*
-                         * Do response processing.
-                         */
-                        a_pResponse->receiveComplete(uHttpStatus, hHttp);
-                        if (pvHdrs)
-                        {
-                            a_pResponse->consumeHeaders((const char *)pvHdrs, cbHdrs);
-                            RTHttpFreeResponse(pvHdrs);
+                            /*
+                             * Do response processing.
+                             */
+                            a_pResponse->receiveComplete(uHttpStatus, hHttp);
+                            if (pvHdrs)
+                            {
+                                a_pResponse->consumeHeaders((const char *)pvHdrs, cbHdrs);
+                                RTHttpFreeResponse(pvHdrs);
+                            }
+                            if (pvBody)
+                            {
+                                a_pResponse->consumeBody((const char *)pvBody, cbBody);
+                                RTHttpFreeResponse(pvBody);
+                            }
+                            a_pResponse->receiveFinal();
+
+                            return a_pResponse->getStatus();
                         }
-                        if (pvBody)
-                        {
-                            a_pResponse->consumeBody((const char *)pvBody, cbBody);
-                            RTHttpFreeResponse(pvBody);
-                        }
-                        a_pResponse->receiveFinal();
-
-                        return a_pResponse->getStatus();
                     }
                 }
+                a_rRequest.xmitComplete(rc, hHttp);
             }
-            a_rRequest.xmitComplete(rc, hHttp);
         }
     }
+    else
+        rc = VERR_NO_MEMORY;
+
     a_pResponse->receiveComplete(rc, hHttp);
     RT_NOREF_PV(a_pszMethod);

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

@@ -176 +176 @@
 
 
+void RTCRestBool::assignValue(bool a_fValue)
+{
+    m_fValue = a_fValue;
+    m_fNullIndicator = false;
+}
+
+
 int RTCRestBool::resetToDefault()
 {
@@ -336 +343 @@
 
 
+void RTCRestInt64::assignValue(int64_t a_iValue)
+{
+    m_iValue = a_iValue;
+    m_fNullIndicator = false;
+}
+
+
 int RTCRestInt64::resetToDefault()
 {
@@ -491 +505 @@
     m_fNullIndicator = false;
     return VINF_SUCCESS;
+}
+
+
+void RTCRestInt32::assignValue(int32_t a_iValue)
+{
+    m_iValue = a_iValue;
+    m_fNullIndicator = false;
 }
 
@@ -642 +663 @@
 
 
+void RTCRestInt16::assignValue(int16_t a_iValue)
+{
+    m_iValue = a_iValue;
+    m_fNullIndicator = false;
+}
+
+
 int RTCRestInt16::resetToDefault()
 {
@@ -797 +825 @@
 
 
+void RTCRestDouble::assignValue(double a_rdValue)
+{
+    m_rdValue = a_rdValue;
+    m_fNullIndicator = false;
+}
+
+
 int RTCRestDouble::resetToDefault()
 {