Fix for observe request handling issue.

This change set also includes code for notifying the application layer
when simulator resource model gets changed.

Change-Id: If1cae07038485636aef46a4fe5d76d17d05666ec
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1619
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/simulator/examples/server/service_provider.cpp b/service/simulator/examples/server/service_provider.cpp
index a9cbcee69e791a2ca8b38a356c25cefb1af51453..e9e3ed6aa27699d4d2b7e9fa126d437658705fc2 100644 (file)
--- a/service/simulator/examples/server/service_provider.cpp
+++ b/service/simulator/examples/server/service_provider.cpp
@@ -92,14 +92,14 @@ class SimLightResource
         }
 
         void onResourceModelChanged(const std::string &uri,
-                                    const std::vector<SimulatorResourceModel::Attribute> &attributes)
+                                    const SimulatorResourceModel &resModel)
         {
-            std::cout << "[callback] Resource model is changed URI: " << uri.c_str() << "Count : " <<
-                      attributes.size() << std::endl;
+            std::cout << "[callback] Resource model is changed URI: " << uri.c_str() << " Count : " <<
+                      resModel.size() << std::endl;
             std::cout << "#### Modified attributes are ####" << std::endl;
-            for (auto & attribute : attributes)
+            for (auto & attribute : resModel.getAttributes())
             {
-                std::cout << attribute.getName() << " :  " << attribute.valueToString().c_str() << std::endl;
+                std::cout << attribute.second.getName() << " :  " << attribute.second.valueToString().c_str() << std::endl;
             }
             std::cout << "########################" << std::endl;
         }

diff --git a/service/simulator/src/simulator_attribute_automation.h b/service/simulator/src/simulator_attribute_automation.h
index 4b9d03e20fa23f97277afc64afe43454a6fda513..a23764afb882a030123236ef75eb75a6be3e6d59 100644 (file)
--- a/service/simulator/src/simulator_attribute_automation.h
+++ b/service/simulator/src/simulator_attribute_automation.h
@@ -26,11 +26,11 @@
 
 class SimulatorResource;
 
-typedef enum class
+enum class AutomationType
 {
     NORMAL,
     RECURRENT
-} AutomationType;
+};
 
 class AttributeUpdateAutomation
 {

diff --git a/service/simulator/src/simulator_resource.cpp b/service/simulator/src/simulator_resource.cpp
index f0448170eeac14de43cbf6921c386503f1a24624..a9db65c08f2e564e33c1473657add13df5ca1389 100644 (file)
--- a/service/simulator/src/simulator_resource.cpp
+++ b/service/simulator/src/simulator_resource.cpp
@@ -86,6 +86,7 @@ void SimulatorResource::updateAttributeFromAllowedValues(const std::string &attr
         const int allowedValueIndex)
 {
     m_resModel.updateAttributeFromAllowedValues(attrName, allowedValueIndex);
+    notifyListOfObservers();
 }
 
 SimulatorResourceModel SimulatorResource::getModel() const
@@ -218,7 +219,8 @@ OCEntityHandlerResult SimulatorResource::entityHandler(std::shared_ptr<OC::OCRes
             errCode = OC_EH_ERROR;
         }
     }
-    else if (OC::RequestHandlerFlag::ObserverFlag & request->getRequestHandlerFlag())
+
+    if (OC::RequestHandlerFlag::ObserverFlag & request->getRequestHandlerFlag())
     {
         OC::ObservationInfo observationInfo = request->getObservationInfo();
         if (OC::ObserveAction::ObserveRegister == observationInfo.action)
@@ -240,15 +242,22 @@ OCEntityHandlerResult SimulatorResource::entityHandler(std::shared_ptr<OC::OCRes
 
 void SimulatorResource::notifyListOfObservers ()
 {
-    if (0 == m_interestedObservers.size())
-        return;
-
-    std::shared_ptr<OC::OCResourceResponse> resourceResponse =
-    {std::make_shared<OC::OCResourceResponse>()};
+    if(getHandle())
+    {
+        if (m_interestedObservers.size())
+        {
+            std::shared_ptr<OC::OCResourceResponse> resourceResponse =
+            {std::make_shared<OC::OCResourceResponse>()};
 
-    resourceResponse->setErrorCode(200);
-    resourceResponse->setResponseResult(OC_EH_OK);
-    resourceResponse->setResourceRepresentation(getOCRepresentation(), OC::DEFAULT_INTERFACE);
+            resourceResponse->setErrorCode(200);
+            resourceResponse->setResponseResult(OC_EH_OK);
+            resourceResponse->setResourceRepresentation(getOCRepresentation(), OC::DEFAULT_INTERFACE);
 
-    OC::OCPlatform::notifyListOfObservers(getHandle(), m_interestedObservers, resourceResponse);
+            OC::OCPlatform::notifyListOfObservers(getHandle(), m_interestedObservers, resourceResponse);
+        }
+        if(m_callback)
+        {
+            m_callback(getURI(),getModel());
+        }
+    }
 }

diff --git a/service/simulator/src/simulator_resource.h b/service/simulator/src/simulator_resource.h
index 868c539157bbeb7620af41a33098bd88fabb9030..ab5389f6473fa9ccedd58dd2121de8b839248ef7 100644 (file)
--- a/service/simulator/src/simulator_resource.h
+++ b/service/simulator/src/simulator_resource.h
@@ -42,7 +42,7 @@ class SimulatorResource
         friend class ResourceManager;
 
     public:
-        typedef std::function<void (const std::string &uri, const std::vector<SimulatorResourceModel::Attribute> &attributes)>
+        typedef std::function<void (const std::string &uri, const SimulatorResourceModel &resModel)>
         ResourceModelChangedCB;
 
         /**

diff --git a/service/simulator/src/simulator_resource_creator.cpp b/service/simulator/src/simulator_resource_creator.cpp
index acb0cd338f93904b80ae169ff43567da17b88a88..6011feaeee49318ae2429b384be806a3f0c6ab49 100644 (file)
--- a/service/simulator/src/simulator_resource_creator.cpp
+++ b/service/simulator/src/simulator_resource_creator.cpp
@@ -41,7 +41,7 @@ SimulatorResourcePtr SimulatorResourceCreator::createLightResoure()
 
     // set other properties
     lightResource->setName("Light");
-    lightResource->setURI("oic/light");
+    lightResource->setURI("/oic/light");
     lightResource->setResourceType("oic.light");
     lightResource->setInterfaceType(OC::DEFAULT_INTERFACE);