There are invalid APIs setErrorCode/getErrorCode in C++ layer.
It can be caused a big confusion to user.
Since the value never transfer on network. it just set in class inside.
Thur, It is better to remove the methods.
Change-Id: Iab863b1c16095ec77b9733bd3ff0ea38167b2dba
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
{
}
-void JniOcResourceResponse::setErrorCode(const int eCode)
-{
- this->m_response->setErrorCode(eCode);
-}
-
std::string JniOcResourceResponse::getNewResourceUri(void)
{
return this->m_response->getNewResourceUri();
}
return request;
}
-/*
-* Class: org_iotivity_base_OcResourceResponse
-* Method: setErrorCode
-* Signature: (I)V
-*/
-JNIEXPORT void JNICALL Java_org_iotivity_base_OcResourceResponse_setErrorCode
-(JNIEnv *env, jobject thiz, jint eCode)
-{
- LOGD("OcResourceResponse_setErrorCode");
- JniOcResourceResponse *response = JniOcResourceResponse::getJniOcResourceResponsePtr(env, thiz);
- if (!response)
- {
- return;
- }
- response->setErrorCode(static_cast<int>(eCode));
-}
/*
* Class: org_iotivity_base_OcResourceResponse
public:
JniOcResourceResponse(std::shared_ptr<OCResourceResponse> resourceResponse);
~JniOcResourceResponse();
- void setErrorCode(const int eCode);
std::string getNewResourceUri(void);
void setNewResourceUri(const std::string newResourceUri);
void setHeaderOptions(const HeaderOptions& headerOptions);
/*
* Class: org_iotivity_base_OcResourceResponse
- * Method: setErrorCode
- * Signature: (I)V
- */
- JNIEXPORT void JNICALL Java_org_iotivity_base_OcResourceResponse_setErrorCode
- (JNIEnv *, jobject, jint);
-
- /*
- * Class: org_iotivity_base_OcResourceResponse
* Method: getNewResourceUri
* Signature: ()Ljava/lang/String;
*/
#ifdef __cplusplus
}
#endif
-#endif
\ No newline at end of file
+#endif
assertTrue(false);
}
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResponseResult(EntityHandlerResult.OK);
ocResourceResponse.setResourceRepresentation(
getRepresentation(74));
Log.i(TAG, "URI: " + rep.getUri());
ocResourceResponse.setResponseResult(EntityHandlerResult.OK);
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResourceRepresentation(rep);
break;
case POST:
}
Log.i(TAG, "URI: " + rep.getUri());
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResponseResult(EntityHandlerResult.OK);
ocResourceResponse.setResourceRepresentation(
getRepresentation(44));
switch (requestType) {
case DELETE:
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResponseResult(
EntityHandlerResult.RESOURCE_DELETED);
break;
switch (requestType) {
case GET:
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResponseResult(
EntityHandlerResult.ERROR);
break;
case PUT:
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResponseResult(
EntityHandlerResult.ERROR);
break;
case POST:
- ocResourceResponse.setErrorCode(200);
- ocResourceResponse.setResponseResult(
+ ocResourceResponse.setResponseResult(
EntityHandlerResult.ERROR);
break;
case DELETE:
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResponseResult(
EntityHandlerResult.ERROR);
break;
switch (requestType) {
case GET:
- ocResourceResponse.setErrorCode(200);
ocResourceResponse.setResponseResult(EntityHandlerResult.OK);
ocResourceResponse.setResourceRepresentation(
getRepresentation(
}
/**
- * This API sets the error code for this response
- *
- * @param eCode error code to set
- */
- public native void setErrorCode(int eCode);
-
- /**
* Gets new resource uri
*
* @return new resource uri
switch (ocResourceRequest.getRequestType()) {
case GET:
- response.setErrorCode(Resource.SUCCESS);
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
response.setResponseResult(EntityHandlerResult.OK);
OcPlatform.sendResponse(response);
break;
case PUT:
- response.setErrorCode(Resource.SUCCESS);
put(ocResourceRequest.getResourceRepresentation());
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
break;
case DELETE:
response.setResponseResult(EntityHandlerResult.RESOURCE_DELETED);
- response.setErrorCode(204);
OcPlatform.sendResponse(response);
break;
}
response.setResourceHandle(ocResourceRequest.getResourceHandle());
switch (ocResourceRequest.getRequestType()) {
case GET:
- response.setErrorCode(Resource.SUCCESS);
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
response.setResponseResult(EntityHandlerResult.OK);
result = EntityHandlerResult.OK;
break;
case PUT:
- response.setErrorCode(Resource.SUCCESS);
put(ocResourceRequest.getResourceRepresentation());
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
switch (ocResourceRequest.getRequestType()) {
case GET:
- response.setErrorCode(SUCCESS);
response.setResponseResult(EntityHandlerResult.OK);
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
switch (ocResourceRequest.getRequestType()) {
case GET:
- response.setErrorCode(SUCCESS);
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
response.setResponseResult(EntityHandlerResult.OK);
OcPlatform.sendResponse(response);
break;
case PUT:
- response.setErrorCode(SUCCESS);
put(ocResourceRequest.getResourceRepresentation());
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
break;
case DELETE:
response.setResponseResult(EntityHandlerResult.RESOURCE_DELETED);
- response.setErrorCode(204);
OcPlatform.sendResponse(response);
break;
}
switch (ocResourceRequest.getRequestType()) {
case GET:
- response.setErrorCode(SUCCESS);
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
response.setResponseResult(EntityHandlerResult.OK);
result = EntityHandlerResult.OK;
break;
case PUT:
- response.setErrorCode(SUCCESS);
put(ocResourceRequest.getResourceRepresentation());
updateRepresentationValues();
response.setResourceRepresentation(mRepresentation);
OcResourceResponse response = new OcResourceResponse();
response.setRequestHandle(request.getRequestHandle());
response.setResourceHandle(request.getResourceHandle());
- response.setErrorCode(Common.SUCCESS);
response.setResponseResult(EntityHandlerResult.OK);
response.setResourceRepresentation(getOcRepresentation());
return sendResponse(response);
setOcRepresentation(request.getResourceRepresentation());
response.setResourceRepresentation(getOcRepresentation());
response.setResponseResult(EntityHandlerResult.OK);
- response.setErrorCode(Common.SUCCESS);
return sendResponse(response);
}
}).start();
ehResult = EntityHandlerResult.SLOW;
} else { // normal response case.
- response.setErrorCode(SUCCESS);
response.setResponseResult(EntityHandlerResult.OK);
response.setResourceRepresentation(getOcRepresentation());
ehResult = sendResponse(response);
setOcRepresentation(request.getResourceRepresentation());
response.setResourceRepresentation(getOcRepresentation());
response.setResponseResult(EntityHandlerResult.OK);
- response.setErrorCode(SUCCESS);
return sendResponse(response);
}
Log.e(TAG, e.toString());
}
response.setResourceRepresentation(rep_post);
- response.setErrorCode(SUCCESS);
response.setNewResourceUri(newUri);
response.setResponseResult(EntityHandlerResult.RESOURCE_CREATED);
return sendResponse(response);
response.setRequestHandle(request.getRequestHandle());
response.setResourceHandle(request.getResourceHandle());
- response.setErrorCode(SUCCESS);
response.setResponseResult(EntityHandlerResult.OK);
response.setResourceRepresentation(getOcRepresentation());
sendResponse(response);
try {
if (mIsListOfObservers) {
OcResourceResponse response = new OcResourceResponse();
- response.setErrorCode(SUCCESS);
response.setResourceRepresentation(getOcRepresentation());
OcPlatform.notifyListOfObservers(
mResourceHandle,
pResponse->setResourceRepresentation(getRepresentation(), DEFAULT_INTERFACE);
}
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
shared_ptr<OCResourceResponse> resourceResponse =
{ make_shared<OCResourceResponse>() };
- resourceResponse->setErrorCode(200);
resourceResponse->setResourceRepresentation(getRepresentation(), DEFAULT_INTERFACE);
return OCPlatform::notifyListOfObservers(m_handle,
auto response = std::make_shared<OC::OCResourceResponse>();
response->setRequestHandle(request->getRequestHandle());
response->setResourceHandle(request->getResourceHandle());
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
if (OC_STACK_OK != OCPlatform::sendResponse(response)) {
return OC_EH_ERROR;
usleep(1500000);
cout << "Temperature Observer Callback" << endl;
shared_ptr<OCResourceResponse> resourceResponse(new OCResourceResponse());
- resourceResponse->setErrorCode(200);
resourceResponse->setResourceRepresentation(getTemperatureRepresentation(),
EDISON_RESOURCE_INTERFACE);
OCStackResult result = OCPlatform::notifyListOfObservers(m_temperatureResource,
usleep(1500000);
cout << "Light Observer Callback" << endl;
shared_ptr<OCResourceResponse> resourceResponse(new OCResourceResponse());
- resourceResponse->setErrorCode(200);
resourceResponse->setResourceRepresentation(getLightRepresentation(),
EDISON_RESOURCE_INTERFACE);
OCStackResult result = OCPlatform::notifyListOfObservers(m_ambientLightResource,
cout << "GET request for ambient light reading" << endl;
if (Response)
{
- Response->setErrorCode(200);
Response->setResponseResult(OC_EH_OK);
Response->setResourceRepresentation(getLightRepresentation());
if (OCPlatform::sendResponse(Response) == OC_STACK_OK)
cout << "GET request for temperature sensor reading" << endl;
if (Response)
{
- Response->setErrorCode(200);
Response->setResponseResult(OC_EH_OK);
Response->setResourceRepresentation(getTemperatureRepresentation());
if (OCPlatform::sendResponse(Response) == OC_STACK_OK)
putLEDRepresentation();
if (Response)
{
- Response->setErrorCode(200);
Response->setResourceRepresentation(getLEDRepresentation());
Response->setResponseResult(OC_EH_OK);
if (OCPlatform::sendResponse(Response) == OC_STACK_OK)
cout << "GET request for platform LED" << endl;
if (Response)
{
- Response->setErrorCode(200);
Response->setResourceRepresentation(getLEDRepresentation());
Response->setResponseResult(OC_EH_OK);
if (OCPlatform::sendResponse(Response) == OC_STACK_OK)
if(request->getRequestType() == "GET")
{
std::cout<<"DeviceResource Get Request"<<std::endl;
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get(), "");
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
std::cout<<"DeviceResource Delete Request"<<std::endl;
if(deleteDeviceResource() == OC_STACK_OK)
{
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_RESOURCE_DELETED);
ehResult = OC_EH_OK;
}
if(request->getRequestType() == "GET")
{
std::cout<<"Default Entity Handler: Get Request"<<std::endl;
- pResponse->setErrorCode(200);
+
pResponse->setResourceRepresentation(get(), "");
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
{
if(request->getRequestType() == "GET")
{
std::cout<<"Light Get Request"<<std::endl;
- pResponse->setErrorCode(200);
+
pResponse->setResourceRepresentation(get(), "");
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
{
{
std::cout <<"Light Put Request"<<std::endl;
put(request->getResourceRepresentation());
- pResponse->setErrorCode(200);
+
pResponse->setResourceRepresentation(get(), "");
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
{
// note that we know the side because std::bind gives us the
// appropriate object
std::cout<< m_side << " Door Get Request"<<std::endl;
- pResponse->setErrorCode(200);
+
pResponse->setResourceRepresentation(get(), "");
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
{
{
std::cout << m_side <<" Door Put Request"<<std::endl;
put(request->getResourceRepresentation());
- pResponse->setErrorCode(200);
+
pResponse->setResourceRepresentation(get(),"");
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
{
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(myGarage.get());
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
}
else // normal response case.
{
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to PUT request
// Update the lightResource
put(rep);
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to POST request
OCRepresentation rep_post = post(rep);
pResponse->setResourceRepresentation(rep_post);
- pResponse->setErrorCode(200);
+
if(rep_post.hasAttribute("createduri"))
{
pResponse->setResponseResult(OC_EH_RESOURCE_CREATED);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(lightPtr->get());
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
// Set the slow response flag back to false
}
else // normal response case.
{
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to PUT request
// Update the mediaResource
put(rep);
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to POST request
OCRepresentation rep_post = post(rep);
pResponse->setResourceRepresentation(rep_post);
- pResponse->setErrorCode(200);
+
if(rep_post.hasAttribute("createduri"))
{
pResponse->setResponseResult(OC_EH_RESOURCE_CREATED);
std::shared_ptr<OCResourceResponse> resourceResponse =
{std::make_shared<OCResourceResponse>()};
- resourceResponse->setErrorCode(200);
resourceResponse->setResourceRepresentation(mediaPtr->get(), DEFAULT_INTERFACE);
result = OCPlatform::notifyListOfObservers( mediaPtr->getHandle(),
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(mediaPtr->get());
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
// Set the slow response flag back to false
pResponse->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(myRoomResource.getLightRepresentation());
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(myRoomResource.getFanRepresentation());
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(get(), "");
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
}
else // normal response case.
{
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to PUT request
// Update the lightResource
put(rep);
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if(OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to POST request
OCRepresentation rep_post = post(rep);
pResponse->setResourceRepresentation(rep_post);
- pResponse->setErrorCode(200);
+
if(rep_post.hasAttribute("createduri"))
{
pResponse->setResponseResult(OC_EH_RESOURCE_CREATED);
std::shared_ptr<OCResourceResponse> resourceResponse =
{std::make_shared<OCResourceResponse>()};
- resourceResponse->setErrorCode(200);
resourceResponse->setResourceRepresentation(lightPtr->get(), DEFAULT_INTERFACE);
result = OCPlatform::notifyListOfObservers( lightPtr->getHandle(),
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(lightPtr->get());
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
// Set the slow response flag back to false
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(get());
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
OCRepresentation rep_post = post(rep);
pResponse->setResourceRepresentation(rep_post);
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
std::shared_ptr<OCResourceResponse> resourceResponse =
std::make_shared<OCResourceResponse>();
- resourceResponse->setErrorCode(200);
resourceResponse->setResourceRepresentation(lightPtr->get(), DEFAULT_INTERFACE);
result = OCPlatform::notifyListOfObservers(
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(get(), "");
- pResponse->setErrorCode(200);
+
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
OCResourceResponse():
m_newResourceUri{},
- m_errorCode{},
m_headerOptions{},
m_interface{},
m_representation{},
#if defined(_MSC_VER) && (_MSC_VER < 1900)
OCResourceResponse(OCResourceResponse&& o):
m_newResourceUri(std::move(o.m_newResourceUri)),
- m_errorCode(o.m_errorCode),
m_headerOptions(std::move(o.m_headerOptions)),
m_interface(std::move(o.m_interface)),
m_representation(std::move(o.m_representation)),
OCResourceResponse& operator=(OCResourceResponse&& o)
{
m_newResourceUri = std::move(o.m_newResourceUri);
- m_errorCode = o.m_errorCode;
m_headerOptions = std::move(o.m_headerOptions);
m_interface = std::move(o.m_interface);
m_representation = std::move(o.m_representation);
virtual ~OCResourceResponse(void) {}
/**
- * This API sets the error code for this response
- * @param eCode error code to set
- */
- void setErrorCode(const int eCode) { m_errorCode = eCode; }
-
- /**
* gets new resource uri
* @return std::string new resource uri
*/
}
private:
std::string m_newResourceUri;
- int m_errorCode;
HeaderOptions m_headerOptions;
std::string m_interface;
OCRepresentation m_representation;
public:
/**
- * Get error code
- */
- int getErrorCode() const
- {
- return m_errorCode;
- }
-
- /**
* Get the Response Representation
*/
const OCRepresentation& getResourceRepresentation() const
using namespace OC;
using namespace std;
- TEST(ErrorCodeTest, SetGetErrorCodeValidCode)
- {
- OCResourceResponse response;
- int setCode = 200;
- EXPECT_NO_THROW(response.setErrorCode(setCode));
- EXPECT_EQ(setCode, response.getErrorCode());
- setCode = 500;
- EXPECT_NO_THROW(response.setErrorCode(setCode));
- EXPECT_EQ(setCode, response.getErrorCode());
- setCode = 400;
- EXPECT_NO_THROW(response.setErrorCode(setCode));
- EXPECT_EQ(setCode, response.getErrorCode());
- }
-
TEST(NewResourceUriTest, SetGetNewResourceUriValidUri)
{
OCResourceResponse response;
{
std::string request = requests->getRequestType();
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
if (request == "GET")
auto response = std::make_shared<OC::OCResourceResponse>();
response->setRequestHandle(requests->getRequestHandle());
response->setResourceHandle(requests->getResourceHandle());
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
response->setResourceRepresentation(rep);
{
std::string request = requests->getRequestType();
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
if (request == "GET")
auto response = std::make_shared<OC::OCResourceResponse>();
response->setRequestHandle(requests->getRequestHandle());
response->setResourceHandle(requests->getResourceHandle());
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
response->setResourceRepresentation(rep);
if (response)
{
- // TODO Error Code
- response->setErrorCode(200);
response->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
}
if (response)
{
- // TODO Error Code
- response->setErrorCode(200);
response->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
}
if (response)
{
- // TODO Error Code
- response->setErrorCode(200);
response->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
}
if (response)
{
- // TODO Error Code
- response->setErrorCode(200);
response->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
}
auto ocResponse = std::make_shared< OC::OCResourceResponse >();
ocResponse->setResponseResult(OC_EH_OK);
- ocResponse->setErrorCode(reqHandler->getErrorCode());
if (reqHandler->hasCustomRepresentation())
{
ASSERT_EQ(OC_EH_OK, handler(createRequest()));
}
-TEST_F(ResourceObjectHandlingRequestTest, SendResponseWithRCSResponseResults)
-{
- constexpr int errorCode{ 1999 };
-
- server->setGetRequestHandler(
- [](const RCSRequest&, RCSResourceAttributes&) -> RCSGetResponse
- {
- return RCSGetResponse::create(errorCode);
- }
- );
-
- mocks.ExpectCallFunc(OCPlatform::sendResponse).Match(
- [](const shared_ptr<OCResourceResponse> response)
- {
- return response->getErrorCode() == errorCode;
- }
- ).Return(OC_STACK_OK);
-
- ASSERT_EQ(OC_EH_OK, handler(createRequest()));
-}
-
-TEST_F(ResourceObjectHandlingRequestTest, SendSetResponseWithCustomAttrs)
-{
- constexpr int errorCode{ 1999 };
- constexpr char value[]{ "VALUE" };
-
- server->setSetRequestHandler(
- [](const RCSRequest&, RCSResourceAttributes&) -> RCSSetResponse
- {
- RCSResourceAttributes attrs;
- attrs[KEY] = value;
- return RCSSetResponse::create(attrs, errorCode);
- }
- );
-
- mocks.ExpectCallFunc(OCPlatform::sendResponse).Match(
- [](const shared_ptr<OCResourceResponse> response)
- {
- return value == response->getResourceRepresentation()[KEY].getValue<std::string>()
- && response->getErrorCode() == errorCode;
- }
- ).Return(OC_STACK_OK);
-
- ASSERT_EQ(OC_EH_OK, handler(createRequest(OC_REST_POST)));
-}
-
TEST_F(ResourceObjectHandlingRequestTest, SeparateResponseIsSlowResponse)
{
server->setGetRequestHandler(
logMessage("GET");
ocResourceResponse
.setResponseResult(EntityHandlerResult.OK);
- ocResourceResponse
- .setErrorCode(StringConstants.ERROR_CODE);
ocResourceResponse.setResourceRepresentation(get());
OcPlatform.sendResponse(ocResourceResponse);
break;
.getResourceRepresentation();
put(rep);
ocResourceResponse
- .setErrorCode(StringConstants.ERROR_CODE);
- ocResourceResponse
.setResponseResult(EntityHandlerResult.OK);
ocResourceResponse.setResourceRepresentation(get());
OcPlatform.sendResponse(ocResourceResponse);
// if observationList is not empty, call notifyListOfObservers
if (mObservationIds.size() > 0) {
OcResourceResponse ocResourceResponse = new OcResourceResponse();
- ocResourceResponse.setErrorCode(StringConstants.ERROR_CODE);
ocResourceResponse.setResponseResult(EntityHandlerResult.OK);
OcRepresentation r = get();
ocResourceResponse.setResourceRepresentation(r,
{
cout << "\t\trequestType : GET\n";
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(myResource.get());
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
if (pResponse)
{
- pResponse->setErrorCode(200);
pResponse->setResourceRepresentation(myResource.get());
}
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
if (pResponse)
{
- pResponse->setErrorCode(200);
pResponse->setResourceRepresentation(myResource.get());
}
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
if (myResource.deleteDeviceResource() == OC_STACK_OK)
{
cout << "\tSuccess DELETE\n";
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_RESOURCE_DELETED);
ehResult = OC_EH_OK;
}
}
else // normal response case.
{
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to PUT request
// Update the lightResource
put(rep);
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to POST request
OCRepresentation rep_post = post(rep);
pResponse->setResourceRepresentation(rep_post);
- pResponse->setErrorCode(200);
if (rep_post.hasAttribute("createduri"))
{
pResponse->setResponseResult(OC_EH_RESOURCE_CREATED);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(fanPtr->get());
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
// Set the slow response flag back to false
}
else // normal response case.
{
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to PUT request
// Update the lightResource
put(rep);
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
// Do related operations related to POST request
OCRepresentation rep_post = post(rep);
pResponse->setResourceRepresentation(rep_post);
- pResponse->setErrorCode(200);
if (rep_post.hasAttribute("createduri"))
{
pResponse->setResponseResult(OC_EH_RESOURCE_CREATED);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(lightPtr->get());
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
// Set the slow response flag back to false
// Construct the representation
OC::OCRepresentation ocRep = m_resModel.asOCRepresentation();
response = std::make_shared<OC::OCResourceResponse>();
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
response->setResourceRepresentation(ocRep);
std::string resPayload = getPayloadString(ocRep);
response = std::make_shared<OC::OCResourceResponse>();
response->setRequestHandle(request->getRequestHandle());
response->setResourceHandle(request->getResourceHandle());
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
response->setResourceRepresentation(ocRep);
std::string resPayload = getPayloadString(ocRep);
{
std::lock_guard<std::recursive_mutex> lock(m_objectLock);
std::shared_ptr<OC::OCResourceResponse> response(new OC::OCResourceResponse());
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
OC::OCRepresentation ocRep = m_resModel.asOCRepresentation();
std::shared_ptr<OC::OCResourceResponse> response(new OC::OCResourceResponse());
response->setRequestHandle(request->getRequestHandle());
response->setResourceHandle(request->getResourceHandle());
- response->setErrorCode(errorCode);
response->setResponseResult(responseResult);
if (OC_STACK_OK != OC::OCPlatform::sendResponse(response))
{
}
return true;
-}
\ No newline at end of file
+}
return;
std::shared_ptr<OC::OCResourceResponse> response(new OC::OCResourceResponse);
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
response->setResourceRepresentation(resModel.asOCRepresentation(), m_interfaces[0]);
return;
std::shared_ptr<OC::OCResourceResponse> response(new OC::OCResourceResponse);
- response->setErrorCode(200);
response->setResponseResult(OC_EH_OK);
response->setResourceRepresentation(resModel.asOCRepresentation(), m_interfaces[0]);
std::shared_ptr<OC::OCResourceResponse> response(new OC::OCResourceResponse());
response->setRequestHandle(request->getRequestHandle());
response->setResourceHandle(request->getResourceHandle());
- response->setErrorCode(errorCode);
response->setResponseResult(responseResult);
if (OC_STACK_OK != OC::OCPlatform::sendResponse(response))
{
std::shared_ptr<OC::OCResourceResponse> response(new OC::OCResourceResponse());
response->setRequestHandle(request->getRequestHandle());
response->setResourceHandle(request->getResourceHandle());
- response->setErrorCode(errorCode);
response->setResponseResult(responseResult);
response->setResourceRepresentation(payload, interfaceType);
if (OC_STACK_OK != OC::OCPlatform::sendResponse(response))
rep = mntResource.getDiagnosticsRepresentation();
}
response.setResourceRepresentation(rep, OcPlatform.DEFAULT_INTERFACE);
- response.setErrorCode(200);
try {
OcPlatform.sendResponse(response);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(myBootstrapResource.getBootstrapRepresentation());
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
pResponse->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
pResponse->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
}
else
{
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(get());
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
cout << "\t\t\trequestType : PUT\n";
OCRepresentation rep = request->getResourceRepresentation();
put(rep);
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
pResponse->setResourceRepresentation(rep);
if (OC_STACK_OK == OCPlatform::sendResponse(pResponse))
OCRepresentation rep_post = post(rep);
pResponse->setResourceRepresentation(rep_post);
- pResponse->setErrorCode(200);
if (rep_post.hasAttribute("createduri"))
{
pResponse->setResponseResult(OC_EH_RESOURCE_CREATED);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(lightPtr->get());
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
isSlowResponse = false;
pResponse->setResourceRepresentation(rep, DEFAULT_INTERFACE);
}
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);
pResponse->setRequestHandle(pRequest->getRequestHandle());
pResponse->setResourceHandle(pRequest->getResourceHandle());
pResponse->setResourceRepresentation(myBootstrapResource.getBootstrapRepresentation());
- pResponse->setErrorCode(200);
pResponse->setResponseResult(OC_EH_OK);
return OCPlatform::sendResponse(pResponse);