Remove unused OC_INIT_FLAG.

The stack/samples doesn't send it or rely on it.

Change-Id: I2809ab9fc48b2f8cf45f4ba4bc88d68f3c66b988
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1016
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/examples/OICMiddle/Server.cpp b/examples/OICMiddle/Server.cpp
index b55e715..b729a48 100644 (file)
--- a/examples/OICMiddle/Server.cpp
+++ b/examples/OICMiddle/Server.cpp
@@ -45,10 +45,6 @@ OCEntityHandlerResult MiddleServer::entityHandler(const std::shared_ptr<OCResour
     int requestFlag = request->getRequestHandlerFlag();
     bool responseNeeded = false;
 
-    if (requestFlag && RequestHandlerFlag::InitFlag) {
-        return OC_EH_OK;
-    }
-
     if (requestFlag && RequestHandlerFlag::RequestFlag) {
         if (requestType == "PUT") {
             responseNeeded = true;

diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h
index 7af8122..c597771 100644 (file)
--- a/resource/csdk/stack/include/octypes.h
+++ b/resource/csdk/stack/include/octypes.h
@@ -440,7 +440,6 @@ typedef struct
 
 typedef enum
 {
-    OC_INIT_FLAG    = (1 << 0),
     OC_REQUEST_FLAG = (1 << 1),
     OC_OBSERVE_FLAG = (1 << 2)
 } OCEntityHandlerFlag; //entity_handler_flag_t ;

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
index a3d1f29..d487852 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
@@ -509,10 +509,6 @@ OCDeviceEntityHandlerCb (OCEntityHandlerFlag flag,
     memset(response.resourceUri, 0, sizeof response.resourceUri);
 
 
-    if (flag & OC_INIT_FLAG)
-    {
-        OC_LOG (INFO, TAG, "Flag includes OC_INIT_FLAG");
-    }
     if (flag & OC_REQUEST_FLAG)
     {
         OC_LOG (INFO, TAG, "Flag includes OC_REQUEST_FLAG");
@@ -612,10 +608,6 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag,
             0, sizeof response.sendVendorSpecificHeaderOptions);
     memset(response.resourceUri, 0, sizeof response.resourceUri);
 
-    if (flag & OC_INIT_FLAG)
-    {
-        OC_LOG (INFO, TAG, "Flag includes OC_INIT_FLAG");
-    }
     if (flag & OC_REQUEST_FLAG)
     {
         OC_LOG (INFO, TAG, "Flag includes OC_REQUEST_FLAG");

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp
index 83bd46b..43b913f 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp
@@ -272,11 +272,6 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag,
     OCEntityHandlerResponse response;
     char payload[MAX_RESPONSE_LENGTH] = {0};
 
-    if (flag & OC_INIT_FLAG)
-    {
-        OC_LOG (INFO, TAG, "Flag includes OC_INIT_FLAG");
-        ehResult = OC_EH_OK;
-    }
     if (flag & OC_REQUEST_FLAG)
     {
         OC_LOG (INFO, TAG, "Flag includes OC_REQUEST_FLAG");

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
index 344723f..aff73b6 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
@@ -125,9 +125,6 @@ PrintReceivedMsgInfo(OCEntityHandlerFlag flag, OCEntityHandlerRequest * ehReques
 
     switch (flag)
     {
-        case OC_INIT_FLAG:
-            typeOfMessage = "OC_INIT_FLAG";
-            break;
         case OC_REQUEST_FLAG:
             typeOfMessage = "OC_REQUEST_FLAG";
             break;

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
index b698613..eb015e4 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
@@ -212,11 +212,6 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag,
     OCEntityHandlerRequest *request = NULL;
 
     OC_LOG_V (INFO, TAG, "Inside entity handler - flags: 0x%x", flag);
-    if (flag & OC_INIT_FLAG)
-    {
-        OC_LOG(INFO, TAG, "Flag includes OC_INIT_FLAG");
-        result = OC_EH_OK;
-    }
     if (flag & OC_REQUEST_FLAG)
     {
         OC_LOG(INFO, TAG, "Flag includes OC_REQUEST_FLAG");

diff --git a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
index 869b973..440b667 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
+++ b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
@@ -248,11 +248,6 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag,
     OCEntityHandlerResponse response;
     char payload[MAX_RESPONSE_LENGTH] = {0};
 
-    if (flag & OC_INIT_FLAG)
-    {
-        OC_LOG (INFO, TAG, "Flag includes OC_INIT_FLAG");
-        ehResult = OC_EH_OK;
-    }
     if (flag & OC_REQUEST_FLAG)
     {
         OC_LOG (INFO, TAG, "Flag includes OC_REQUEST_FLAG");

diff --git a/resource/examples/garageserver.cpp b/resource/examples/garageserver.cpp
index ce6cdfe..fd839fc 100644 (file)
--- a/resource/examples/garageserver.cpp
+++ b/resource/examples/garageserver.cpp
@@ -195,12 +195,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
         if(requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/resource/examples/lightserver.cpp b/resource/examples/lightserver.cpp
index 7f3d5ee..6bddfbd 100644 (file)
--- a/resource/examples/lightserver.cpp
+++ b/resource/examples/lightserver.cpp
@@ -176,12 +176,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
         if(requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/resource/examples/roomserver.cpp b/resource/examples/roomserver.cpp
index e81f9af..7768b3f 100644 (file)
--- a/resource/examples/roomserver.cpp
+++ b/resource/examples/roomserver.cpp
@@ -290,13 +290,7 @@ bool prepareLightResponse(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if(requestFlag == RequestHandlerFlag::RequestFlag)
+        if(requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";
 
@@ -351,13 +345,7 @@ bool prepareFanResponse(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if(requestFlag == RequestHandlerFlag::RequestFlag)
+        if(requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";
 
@@ -412,13 +400,7 @@ OCEntityHandlerResult entityHandlerRoom(std::shared_ptr<OCResourceRequest> reque
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if(requestFlag == RequestHandlerFlag::RequestFlag)
+        if(requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";
 

diff --git a/resource/examples/simpleclientserver.cpp b/resource/examples/simpleclientserver.cpp
index 43f4899..f4282a3 100644 (file)
--- a/resource/examples/simpleclientserver.cpp
+++ b/resource/examples/simpleclientserver.cpp
@@ -278,11 +278,7 @@ struct FooResource
             {
                 std::cout <<"\t\trequestFlag : UNSUPPORTED: ";
 
-                if(request->getRequestHandlerFlag()==RequestHandlerFlag::InitFlag)
-                {
-                    std::cout<<"InitFlag"<<std::endl;
-                }
-                else if(request->getRequestHandlerFlag()== RequestHandlerFlag::ObserverFlag)
+                if(request->getRequestHandlerFlag()== RequestHandlerFlag::ObserverFlag)
                 {
                     std::cout<<"ObserverFlag"<<std::endl;
                 }

diff --git a/resource/examples/simpleserver.cpp b/resource/examples/simpleserver.cpp
index 004414d..f52588b 100644 (file)
--- a/resource/examples/simpleserver.cpp
+++ b/resource/examples/simpleserver.cpp
@@ -262,11 +262,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-            // entity handler to perform resource initialization operations
-        }
         if(requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/resource/examples/simpleserverHQ.cpp b/resource/examples/simpleserverHQ.cpp
index 7ae61b2..492968c 100644 (file)
--- a/resource/examples/simpleserverHQ.cpp
+++ b/resource/examples/simpleserverHQ.cpp
@@ -266,11 +266,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr<OCResourceRequest> request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if(requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-            // entity handler to perform resource initialization operations
-        }
         if(requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/resource/examples/threadingsample.cpp b/resource/examples/threadingsample.cpp
index 9d4b5e9..e1332c8 100644 (file)
--- a/resource/examples/threadingsample.cpp
+++ b/resource/examples/threadingsample.cpp
@@ -141,11 +141,7 @@ struct FooResource
             {
                 std::cout <<"\t\trequestFlag : UNSUPPORTED: ";
 
-                if(request->getRequestHandlerFlag()==RequestHandlerFlag::InitFlag)
-                {
-                    std::cout<<"InitFlag"<<std::endl;
-                }
-                else if(request->getRequestHandlerFlag()== RequestHandlerFlag::ObserverFlag)
+                if(request->getRequestHandlerFlag()== RequestHandlerFlag::ObserverFlag)
                 {
                     std::cout<<"ObserverFlag"<<std::endl;
                 }

diff --git a/resource/include/OCApi.h b/resource/include/OCApi.h
index 46aa6ff..8087a4e 100644 (file)
--- a/resource/include/OCApi.h
+++ b/resource/include/OCApi.h
@@ -148,7 +148,6 @@ namespace OC
 
     enum RequestHandlerFlag
     {
-        InitFlag = 1 << 0,
         RequestFlag = 1 << 1,
         ObserverFlag = 1 << 2
     };

diff --git a/resource/src/InProcServerWrapper.cpp b/resource/src/InProcServerWrapper.cpp
index 77b3c10..f42a18c 100644 (file)
--- a/resource/src/InProcServerWrapper.cpp
+++ b/resource/src/InProcServerWrapper.cpp
@@ -61,11 +61,6 @@ void formResourceRequest(OCEntityHandlerFlag flag,
         pRequest->setResourceHandle(entityHandlerRequest->resource);
     }
 
-    if(flag & OC_INIT_FLAG)
-    {
-        pRequest->setRequestHandlerFlag(OC::RequestHandlerFlag::InitFlag);
-    }
-
     if(flag & OC_REQUEST_FLAG)
     {
         pRequest->setRequestHandlerFlag(OC::RequestHandlerFlag::RequestFlag);

diff --git a/service/notification-manager/NotificationManager/src/hosting.c b/service/notification-manager/NotificationManager/src/hosting.c
index 3878d6a..0c2391d 100755 (executable)
--- a/service/notification-manager/NotificationManager/src/hosting.c
+++ b/service/notification-manager/NotificationManager/src/hosting.c
@@ -1046,10 +1046,6 @@ resourceEntityHandlerCB (OCEntityHandlerFlag entifyHandlerFlag,
            sizeof entityHandlerResponse.sendVendorSpecificHeaderOptions);
     memset(entityHandlerResponse.resourceUri, 0, sizeof entityHandlerResponse.resourceUri);
 
-    if (entifyHandlerFlag & OC_INIT_FLAG)
-    {
-        OC_LOG_V(DEBUG, HOSTING_TAG, "Flag includes OC_INIT_FLAG");
-    }
     if (entifyHandlerFlag & OC_REQUEST_FLAG)
     {
         OC_LOG_V(DEBUG, HOSTING_TAG, "Flag includes OC_REQUEST_FLAG");

diff --git a/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp b/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp
index 3c50d0b..8d924ae 100755 (executable)
--- a/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp
+++ b/service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp
@@ -228,11 +228,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr< OCResourceRequest > request
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if (requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-        }
-
         if (requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/service/protocol-plugin/plugins/mqtt-fan/src/fanserver.cpp b/service/protocol-plugin/plugins/mqtt-fan/src/fanserver.cpp
index 9722564..bfbc399 100644 (file)
--- a/service/protocol-plugin/plugins/mqtt-fan/src/fanserver.cpp
+++ b/service/protocol-plugin/plugins/mqtt-fan/src/fanserver.cpp
@@ -268,12 +268,6 @@ class FanResource
                 std::string requestType = request->getRequestType();
                 int requestFlag = request->getRequestHandlerFlag();
 
-                if (requestFlag & RequestHandlerFlag::InitFlag)
-                {
-                    cout << "\t\trequestFlag : Init\n";
-
-                    // entity handler to perform resource initialization operations
-                }
                 if (requestFlag & RequestHandlerFlag::RequestFlag)
                 {
                     cout << "\t\trequestFlag : Request   ===  Handle by FanServer\n";

diff --git a/service/protocol-plugin/plugins/mqtt-light/src/lightserver.cpp b/service/protocol-plugin/plugins/mqtt-light/src/lightserver.cpp
index d7146af..bc77110 100644 (file)
--- a/service/protocol-plugin/plugins/mqtt-light/src/lightserver.cpp
+++ b/service/protocol-plugin/plugins/mqtt-light/src/lightserver.cpp
@@ -268,12 +268,6 @@ class LightResource
                 std::string requestType = request->getRequestType();
                 int requestFlag = request->getRequestHandlerFlag();
 
-                if (requestFlag & RequestHandlerFlag::InitFlag)
-                {
-                    cout << "\t\trequestFlag : Init\n";
-
-                    // entity handler to perform resource initialization operations
-                }
                 if (requestFlag & RequestHandlerFlag::RequestFlag)
                 {
                     cout << "\t\trequestFlag : Request ===  Handle by FanServer\n";

diff --git a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp
index 588e9dc..d11b427 100644 (file)
--- a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp
+++ b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp
@@ -195,11 +195,6 @@ OCEntityHandlerResult SSMResourceServer::entityHandler(std::shared_ptr< OCResour
         response->setRequestHandle(request->getRequestHandle());
         response->setResourceHandle(request->getResourceHandle());
 
-        if (requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            // entity handler to perform resource initialization operations
-        }
-
         if (requestFlag & RequestHandlerFlag::RequestFlag)
         {
             // If the request type is GET

diff --git a/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/src/HeightSensorApp.cpp b/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/src/HeightSensorApp.cpp
index 6a49243..dcc4d9e 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/src/HeightSensorApp.cpp
+++ b/service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/src/HeightSensorApp.cpp
@@ -156,13 +156,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr< OCResourceRequest > request
         response->setRequestHandle(request->getRequestHandle());
         response->setResourceHandle(request->getResourceHandle());
 
-        if (requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-
         if (requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/service/soft-sensor-manager/SampleApp/linux/THSensorApp/src/ThingResourceServer.cpp b/service/soft-sensor-manager/SampleApp/linux/THSensorApp/src/ThingResourceServer.cpp
index 73f43e7..bdb667a 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/THSensorApp/src/ThingResourceServer.cpp
+++ b/service/soft-sensor-manager/SampleApp/linux/THSensorApp/src/ThingResourceServer.cpp
@@ -127,13 +127,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr< OCResourceRequest > request
         response->setRequestHandle(request->getRequestHandle());
         response->setResourceHandle(request->getResourceHandle());
 
-        if (requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-
         if (requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/src/ThingResourceServer1.cpp b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/src/ThingResourceServer1.cpp
index 93c8e0d..8065c06 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/src/ThingResourceServer1.cpp
+++ b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/src/ThingResourceServer1.cpp
@@ -127,13 +127,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr< OCResourceRequest > request
         response->setRequestHandle(request->getRequestHandle());
         response->setResourceHandle(request->getResourceHandle());
 
-        if (requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-
         if (requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/src/WeightSensorApp.cpp b/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/src/WeightSensorApp.cpp
index 9bf6314..91ababd 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/src/WeightSensorApp.cpp
+++ b/service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/src/WeightSensorApp.cpp
@@ -154,13 +154,6 @@ OCEntityHandlerResult entityHandler(std::shared_ptr< OCResourceRequest > request
         response->setRequestHandle(request->getRequestHandle());
         response->setResourceHandle(request->getResourceHandle());
 
-        if (requestFlag & RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-
         if (requestFlag & RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";

diff --git a/service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp b/service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp
index 5bc8141..a1548e6 100755 (executable)
--- a/service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp
+++ b/service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp
@@ -111,13 +111,7 @@ bool prepareResponse(std::shared_ptr< OCResourceRequest > request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if (requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if (requestFlag == RequestHandlerFlag::RequestFlag)
+        if (requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\t\trequestFlag : Request\n";
 

diff --git a/service/things-manager/sampleapp/linux/configuration/con-server.cpp b/service/things-manager/sampleapp/linux/configuration/con-server.cpp
index bb68bfd..a41127d 100755 (executable)
--- a/service/things-manager/sampleapp/linux/configuration/con-server.cpp
+++ b/service/things-manager/sampleapp/linux/configuration/con-server.cpp
@@ -108,13 +108,7 @@ bool prepareResponseForResource(std::shared_ptr< OCResourceRequest > request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if (requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            std::cout << "\t\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if (requestFlag == RequestHandlerFlag::RequestFlag)
+        if (requestFlag == RequestHandlerFlag::RequestFlag)
         {
             std::cout << "\t\trequestFlag : Request\n";
 

diff --git a/service/things-manager/sampleapp/linux/groupaction/bookmark.cpp b/service/things-manager/sampleapp/linux/groupaction/bookmark.cpp
index 6f67aef..e64997d 100644 (file)
--- a/service/things-manager/sampleapp/linux/groupaction/bookmark.cpp
+++ b/service/things-manager/sampleapp/linux/groupaction/bookmark.cpp
@@ -49,13 +49,7 @@ private:
             std::string requestType = request->getRequestType();
             int requestFlag = request->getRequestHandlerFlag();
 
-            if (requestFlag & RequestHandlerFlag::InitFlag)
-            {
-                cout << "\t\trequestFlag : Init\n";
-
-                // entity handler to perform resource initialization operations
-            }
-            else if (requestFlag & RequestHandlerFlag::RequestFlag)
+            if (requestFlag & RequestHandlerFlag::RequestFlag)
             {
                 auto pResponse = std::make_shared< OC::OCResourceResponse >();
                 pResponse->setRequestHandle(request->getRequestHandle());

diff --git a/service/things-manager/sampleapp/linux/groupaction/lightserver.cpp b/service/things-manager/sampleapp/linux/groupaction/lightserver.cpp
index d73bf5e..dc3566b 100644 (file)
--- a/service/things-manager/sampleapp/linux/groupaction/lightserver.cpp
+++ b/service/things-manager/sampleapp/linux/groupaction/lightserver.cpp
@@ -184,12 +184,6 @@ private:
             std::string requestType = request->getRequestType();
             int requestFlag = request->getRequestHandlerFlag();
 
-            if (requestFlag & RequestHandlerFlag::InitFlag)
-            {
-                cout << "\t\trequestFlag : Init\n";
-
-                // entity handler to perform resource initialization operations
-            }
             if (requestFlag & RequestHandlerFlag::RequestFlag)
             {
                 cout << "\t\trequestFlag : Request\n";

diff --git a/service/things-manager/sampleapp/linux/groupsyncaction/musicplayer.cpp b/service/things-manager/sampleapp/linux/groupsyncaction/musicplayer.cpp
index 9a898a3..4c4ebec 100644 (file)
--- a/service/things-manager/sampleapp/linux/groupsyncaction/musicplayer.cpp
+++ b/service/things-manager/sampleapp/linux/groupsyncaction/musicplayer.cpp
@@ -38,13 +38,7 @@ OCEntityHandlerResult mpEntityHandler(const std::shared_ptr< OCResourceRequest >
         int requestFlag = request->getRequestHandlerFlag();
         std::string action;
 
-        if (requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if (requestFlag == RequestHandlerFlag::RequestFlag)
+        if (requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\trequestFlag : Request\n";
 

diff --git a/service/things-manager/sampleapp/linux/groupsyncaction/speaker.cpp b/service/things-manager/sampleapp/linux/groupsyncaction/speaker.cpp
index 41abb36..d8f07b1 100644 (file)
--- a/service/things-manager/sampleapp/linux/groupsyncaction/speaker.cpp
+++ b/service/things-manager/sampleapp/linux/groupsyncaction/speaker.cpp
@@ -38,13 +38,7 @@ OCEntityHandlerResult speakerEntityHandler(const std::shared_ptr< OCResourceRequ
         int requestFlag = request->getRequestHandlerFlag();
         std::string action;
 
-        if (requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            cout << "\trequestFlag : Init\n";
-
-            // entity handler to perform resource initialization operations
-        }
-        else if (requestFlag == RequestHandlerFlag::RequestFlag)
+        if (requestFlag == RequestHandlerFlag::RequestFlag)
         {
             cout << "\trequestFlag : Request\n";
 

diff --git a/service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp b/service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp
index 1dfc12f..669a8db 100644 (file)
--- a/service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp
+++ b/service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp
@@ -121,11 +121,7 @@ bool prepareResponseForResource(std::shared_ptr< OCResourceRequest > request)
         std::string requestType = request->getRequestType();
         int requestFlag = request->getRequestHandlerFlag();
 
-        if (requestFlag == RequestHandlerFlag::InitFlag)
-        {
-            dlog_print(DLOG_INFO, LOG_TAG, "#### requestFlag : Init");
-        }
-        else if (requestFlag == RequestHandlerFlag::RequestFlag)
+        if (requestFlag == RequestHandlerFlag::RequestFlag)
         {
             dlog_print(DLOG_INFO, LOG_TAG, "#### requestFlag : Request");
 

diff --git a/service/things-manager/sdk/src/GroupSynchronization.cpp b/service/things-manager/sdk/src/GroupSynchronization.cpp
index 00aed30..8b8687f 100644 (file)
--- a/service/things-manager/sdk/src/GroupSynchronization.cpp
+++ b/service/things-manager/sdk/src/GroupSynchronization.cpp
@@ -660,13 +660,7 @@ OCStackResult GroupSynchronization::leaveGroup(
             std::string requestType = request->getRequestType();
             int requestFlag = request->getRequestHandlerFlag();
 
-            if (requestFlag == RequestHandlerFlag::InitFlag)
-            {
-                OC_LOG(DEBUG, TAG, "\trequestFlag : Init");
-
-                // entity handler to perform resource initialization operations
-            }
-            else if (requestFlag == RequestHandlerFlag::RequestFlag)
+            if (requestFlag == RequestHandlerFlag::RequestFlag)
             {
                 OC_LOG(DEBUG, TAG, "\trequestFlag : Request");