- add publishResourceToRD() overload function
- add deleteResourceFromRD() overload function
- remove unnecessary code
- add null check logic for input parameter
Change-Id: Ib3ad9d196af4a1b1662a4fca0dce40e963dc78f5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9907
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
PublishResourceCallback callback);
/**
PublishResourceCallback callback);
/**
+ * @overload
+ *
+ * @param host Host IP Address of a service to direct resource publish query.
+ * @param connectivityType ::OCConnectivityType type of connectivity.
+ * @param callback Handles callbacks, success states and failure states.
+ * @param QoS the quality of communication.
+ *
+ * @return Returns ::OC_STACK_OK if success.
+ */
+ OCStackResult publishResourceToRD(const std::string& host,
+ OCConnectivityType connectivityType,
+ PublishResourceCallback callback,
+ QualityOfService QoS);
+
+ /**
* API for Resource Publish to Resource Directory.
* @note This API applies to resource server side only.
*
* API for Resource Publish to Resource Directory.
* @note This API applies to resource server side only.
*
* @param connectivityType ::OCConnectivityType type of connectivity.
* @param resourceHandle resource handle of the resource.
* @param callback function to callback with published resources.
* @param connectivityType ::OCConnectivityType type of connectivity.
* @param resourceHandle resource handle of the resource.
* @param callback function to callback with published resources.
- * @param QoS the quality of communication
+ * @param QoS the quality of communication.
* @see publishResourceToRD(const std::string&, OCConnectivityType, OCResourceHandle,
* uint8_t, PublishResourceCallback)
*/
* @see publishResourceToRD(const std::string&, OCConnectivityType, OCResourceHandle,
* uint8_t, PublishResourceCallback)
*/
*
* @param host Host IP Address of a service to direct resource delete query.
* @param connectivityType ::OCConnectivityType type of connectivity.
*
* @param host Host IP Address of a service to direct resource delete query.
* @param connectivityType ::OCConnectivityType type of connectivity.
+ * @param callback Handles callbacks, success states and failure states.
+ * @param QoS the quality of communication.
+ *
+ * @return Returns ::OC_STACK_OK if success.
+ */
+ OCStackResult deleteResourceFromRD(const std::string& host,
+ OCConnectivityType connectivityType,
+ DeleteResourceCallback callback,
+ QualityOfService QoS);
+
+ /**
+ * @overload
+ *
+ * @param host Host IP Address of a service to direct resource delete query.
+ * @param connectivityType ::OCConnectivityType type of connectivity.
* @param resourceHandle resource handle of the resource.
* @param callback function to callback with published resources.
* @param resourceHandle resource handle of the resource.
* @param callback function to callback with published resources.
- * @param QoS the quality of communication
* @see publishResourceToRD(const std::string&, OCConnectivityType, OCResourceHandle,
* uint8_t, PublishResourceCallback)
*/
* @see publishResourceToRD(const std::string&, OCConnectivityType, OCResourceHandle,
* uint8_t, PublishResourceCallback)
*/
* @param connectivityType ::OCConnectivityType type of connectivity.
* @param resourceHandle resource handle of the resource.
* @param callback function to callback with published resources.
* @param connectivityType ::OCConnectivityType type of connectivity.
* @param resourceHandle resource handle of the resource.
* @param callback function to callback with published resources.
- * @param QoS the quality of communication
+ * @param QoS the quality of communication.
* @see publishResourceToRD(const std::string&, OCConnectivityType, OCResourceHandle,
* uint8_t, PublishResourceCallback)
*/
* @see publishResourceToRD(const std::string&, OCConnectivityType, OCResourceHandle,
* uint8_t, PublishResourceCallback)
*/
OCStackResult deleteResourceFromRD(const std::string& host,
OCConnectivityType connectivityType,
OCStackResult deleteResourceFromRD(const std::string& host,
OCConnectivityType connectivityType,
- DeleteResourceCallback callback);
-
- OCStackResult deleteResourceFromRD(const std::string& host,
- OCConnectivityType connectivityType,
ResourceHandles& resourceHandles,
DeleteResourceCallback callback);
ResourceHandles& resourceHandles,
DeleteResourceCallback callback);
#ifdef RD_CLIENT
OCRepresentation parseRDResponseCallback(OCClientResponse* clientResponse)
{
#ifdef RD_CLIENT
OCRepresentation parseRDResponseCallback(OCClientResponse* clientResponse)
{
- if (nullptr == clientResponse->payload ||
+ if (nullptr == clientResponse || nullptr == clientResponse->payload ||
PAYLOAD_TYPE_RD != clientResponse->payload->type)
{
return OCRepresentation();
PAYLOAD_TYPE_RD != clientResponse->payload->type)
{
return OCRepresentation();
OCStackResult publishResourceToRD(const std::string& host,
OCConnectivityType connectivityType,
OCStackResult publishResourceToRD(const std::string& host,
OCConnectivityType connectivityType,
+ PublishResourceCallback callback,
+ QualityOfService QoS)
+ {
+ ResourceHandles resourceHandles;
+ return OCPlatform_impl::Instance().publishResourceToRD(host, connectivityType,
+ resourceHandles,
+ callback, QoS);
+ }
+
+ OCStackResult publishResourceToRD(const std::string& host,
+ OCConnectivityType connectivityType,
ResourceHandles& resourceHandles,
PublishResourceCallback callback)
{
ResourceHandles& resourceHandles,
PublishResourceCallback callback)
{
OCStackResult deleteResourceFromRD(const std::string& host,
OCConnectivityType connectivityType,
OCStackResult deleteResourceFromRD(const std::string& host,
OCConnectivityType connectivityType,
+ DeleteResourceCallback callback,
+ QualityOfService QoS)
+ {
+ ResourceHandles resourceHandles;
+ return OCPlatform_impl::Instance().deleteResourceFromRD(host, connectivityType,
+ resourceHandles, callback, QoS);
+ }
+
+ OCStackResult deleteResourceFromRD(const std::string& host,
+ OCConnectivityType connectivityType,
ResourceHandles& resourceHandles,
DeleteResourceCallback callback)
{
ResourceHandles& resourceHandles,
DeleteResourceCallback callback)
{