Changeset 74395 in vbox

Timestamp:

Sep 20, 2018 9:52:13 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Implemented support for polymorphic parameters (requests). bugref:9167

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• src/VBox/Runtime/common/rest/RTCRestClientRequestBase.cpp (modified) (3 diffs)

trunk/include/iprt/err.h

@@ -3254 +3254 @@
 /** Unable to parse string as bool. */
 #define VERR_REST_UNABLE_TO_PARSE_STRING_AS_BOOL        (-25710)
+/** A path parameter was not set. */
+#define VERR_REST_PATH_PARAMETER_NOT_SET                (-25711)
+/** A required query parameter was not set. */
+#define VERR_REST_REQUIRED_QUERY_PARAMETER_NOT_SET      (-25712)
+/** A required header parmaeter was not set. */
+#define VERR_REST_REQUIRED_HEADER_PARAMETER_NOT_SET     (-25713)
 
 /** Internal error \#1. */

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

@@ -100 +100 @@
                      != RTCRestObjectBase::kCollectionFormat_multi,
                      VERR_INTERNAL_ERROR_3);
-        AssertMsg(m_fIsSet & RT_BIT_64(a_paPathParams[i].iBitNo),
-                  ("Path parameter '%s' is not set!\n", a_paPathParams[i].pszName));
+        AssertMsgReturn(a_paPathParamStates[i].pObj != NULL,
+                        ("Path parameter '%s' is not set!\n", a_paPathParams[i].pszName),
+                        VERR_REST_PATH_PARAMETER_NOT_SET);
+        AssertMsgReturn(m_fIsSet & RT_BIT_64(a_paPathParams[i].iBitNo),
+                        ("Path parameter '%s' is not set!\n", a_paPathParams[i].pszName),
+                        VERR_REST_PATH_PARAMETER_NOT_SET);
 
         rc = a_paPathParamStates[i].pObj->toString(&strTmpVal, a_paPathParams[i].fFlags);
@@ -132 +136 @@
             || (m_fIsSet & RT_BIT_64(a_paQueryParams[i].iBitNo)) )
         {
-            AssertMsg(m_fIsSet & RT_BIT_64(a_paQueryParams[i].iBitNo),
-                      ("Required query parameter '%s' is not set!\n", a_paQueryParams[i].pszName));
+            AssertMsgReturn(a_papQueryParamObjs[i] != NULL,
+                            ("Required query parameter '%s' is not set!\n", a_paQueryParams[i].pszName),
+                            VERR_REST_REQUIRED_QUERY_PARAMETER_NOT_SET);
+            AssertMsgReturn(m_fIsSet & RT_BIT_64(a_paQueryParams[i].iBitNo),
+                            ("Required query parameter '%s' is not set!\n", a_paQueryParams[i].pszName),
+                            VERR_REST_REQUIRED_QUERY_PARAMETER_NOT_SET);
 
             if (   (a_paQueryParams[i].fFlags & RTCRestObjectBase::kCollectionFormat_Mask)
@@ -185 +193 @@
             || (m_fIsSet & RT_BIT_64(a_paHeaderParams[i].iBitNo)) )
         {
-            AssertMsg(m_fIsSet & RT_BIT_64(a_paHeaderParams[i].iBitNo),
-                      ("Required header parameter '%s' is not set!\n", a_paHeaderParams[i].pszName));
+            AssertMsgReturn(m_fIsSet & RT_BIT_64(a_paHeaderParams[i].iBitNo),
+                            ("Required header parameter '%s' is not set!\n", a_paHeaderParams[i].pszName),
+                            VERR_REST_REQUIRED_HEADER_PARAMETER_NOT_SET);
+            AssertMsgReturn(a_papHeaderParamObjs[i] != NULL,
+                            ("Required header parameter '%s' is not set!\n", a_paHeaderParams[i].pszName),
+                            VERR_REST_REQUIRED_HEADER_PARAMETER_NOT_SET);
 
             if (!a_paHeaderParams[i].fMapCollection)