Changeset 73978 in vbox for trunk/src/VBox/Runtime/common/rest

Timestamp:

Aug 30, 2018 1:19:36 PM (7 years ago)

Author:

vboxsync

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

124714

Message:

IPRT/rest: Fixed empty array & map handling by making the begin iteration functions return VERR_JSON_IS_EMPTY rather than letter the query method do that. Made query parameter processing table driven and made it use the right escapeing. bugref:9167

Location:

trunk/src/VBox/Runtime/common/rest

Files:

• RTCRestArrayBase.cpp (modified) (1 diff)
• RTCRestClientApiBase.cpp (modified) (1 diff)
• RTCRestClientRequestBase.cpp (modified) (1 diff)
• RTCRestStringMapBase.cpp (modified) (1 diff)

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

@@ -179 +179 @@
         RTJsonIteratorFree(hIterator);
     }
+    else if (rcRet == VERR_JSON_IS_EMPTY)
+        rcRet = VINF_SUCCESS;
     else
         rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet, "RTJsonIteratorBeginArray failed: %Rrc", rcRet);

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

@@ -117 +117 @@
                 if (strQuery.isNotEmpty())
                 {
-                    if (RT_SUCCESS(rc))
-                        rc = strFullUrl.appendNoThrow('?');
-                    if (RT_SUCCESS(rc))
-                        rc = strFullUrl.appendNoThrow(strQuery);
+                    Assert(strQuery.startsWith("?"));
+                    rc = strFullUrl.appendNoThrow(strQuery);
                     strQuery.setNull();
                 }

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

@@ -112 +112 @@
 }
 
+
+int RTCRestClientRequestBase::doQueryParameters(RTCString *a_pStrQuery, QUERYPARAMDESC const *a_paQueryParams,
+                                                RTCRestObjectBase const **a_papQueryParamObjs, size_t a_cQueryParams) const
+{
+    RTCString strTmpVal;
+    char chSep = a_pStrQuery->isEmpty() ? '?' : '&';
+    for (size_t i = 0; i < a_cQueryParams; i++)
+    {
+        if ((a_paQueryParams[i].fFlags & RTCRestObjectBase::kCollectionFormat_Mask) != RTCRestObjectBase::kCollectionFormat_multi)
+        {
+            int rc = a_papQueryParamObjs[i]->toString(&strTmpVal, a_paQueryParams[i].fFlags);
+            AssertRCReturn(rc, rc);
+
+            rc = a_pStrQuery->appendPrintfNoThrow("%c%RMpq=%RMpq", chSep, a_paQueryParams[i].pszName, strTmpVal.c_str());
+            AssertRCReturn(rc, rc);
+
+            chSep = '&';
+        }
+        else
+        {
+            AssertFailedReturn(VERR_NOT_IMPLEMENTED);
+        }
+    }
+    return VINF_SUCCESS;
+}
+

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

@@ -175 +175 @@
         RTJsonIteratorFree(hIterator);
     }
+    else if (rcRet == VERR_JSON_IS_EMPTY)
+        rcRet = VINF_SUCCESS;
     else
         rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet, "RTJsonIteratorBegin failed: %Rrc", rcRet);