Simulator:Fix for static analyzer reported issues

1. Removal of unused variables.
2. Using Map.empty() than Map.size() for optimization.
3. New API simulator_remote_resource::observe added to accept
   query parameters.

Change-Id: I3e8a4ebf3d03694f4f075a5345f1343d9ea453f8
Signed-off-by: Harry <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21237
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 543d59f964c8b16db34897a4440b74fb9b83a2f3)

diff --git a/service/simulator/examples/client/simulator_client.cpp b/service/simulator/examples/client/simulator_client.cpp
index 229de740da8458d541d9787836143a826bfca438..869bd6f6ca2530ce853177b696897d3d86340618 100644 (file)
--- a/service/simulator/examples/client/simulator_client.cpp
+++ b/service/simulator/examples/client/simulator_client.cpp
@@ -107,7 +107,7 @@ class ClientController
         SimulatorRemoteResourceSP selectResource()
         {
             std::lock_guard<std::recursive_mutex> lock(m_mutex);
-            if (0 == m_resList.size())
+            if (m_resList.empty())
             {
                 std::cout << "No resources!" << std::endl;
                 return nullptr;

diff --git a/service/simulator/inc/simulator_remote_resource.h b/service/simulator/inc/simulator_remote_resource.h
index 84da19a5bea1a19e060514d5748a920a7c48530d..44769c77af7cb06acdf7de78df4fdfb5f7b8cd81 100644 (file)
--- a/service/simulator/inc/simulator_remote_resource.h
+++ b/service/simulator/inc/simulator_remote_resource.h
@@ -141,6 +141,18 @@ class SimulatorRemoteResource : private UnCopyable
          */
         virtual void observe(ObserveType type, ObserveNotificationCallback callback) = 0;
 
+        /**
+         * API to send observe request to remote resource.
+         *
+         * @param type - Observe request type.
+         * @param queryParametersMap - Query parameters.
+         * @param callback - callback for receiving notifications from remote resource
+         * asynchronously.
+         */
+        virtual void observe(ObserveType type,
+                  const std::map<std::string, std::string> &queryParams,
+                  ObserveNotificationCallback callback) = 0;
+
         /**
          * API to send cancel observe request to remote resource.
          *

diff --git a/service/simulator/java/jni/simulator_remote_resource_jni.cpp b/service/simulator/java/jni/simulator_remote_resource_jni.cpp
index f033f2cc692882d05d4d070b8f802f5d81abd9e7..477e877b1c214856d76150b8d80e7aa49e812a05 100644 (file)
--- a/service/simulator/java/jni/simulator_remote_resource_jni.cpp
+++ b/service/simulator/java/jni/simulator_remote_resource_jni.cpp
@@ -436,7 +436,7 @@ Java_org_oic_simulator_client_SimulatorRemoteResource_nativeStartObserve
         }, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3,
         std::placeholders::_4, JniListenerHolder::create(env, jListener));
 
-        resource->observe(ObserveType::OBSERVE, callback);
+        resource->observe(ObserveType::OBSERVE, queryParams, callback);
     }
     catch (InvalidArgsException &e)
     {

diff --git a/service/simulator/java/jni/simulator_resource_jni.cpp b/service/simulator/java/jni/simulator_resource_jni.cpp
index ca6094fe1ff9457711c9596279aef6b42ee24451..2adfd652d168ddd95895f8f519e6614168bfacf7 100644 (file)
--- a/service/simulator/java/jni/simulator_resource_jni.cpp
+++ b/service/simulator/java/jni/simulator_resource_jni.cpp
@@ -54,7 +54,7 @@ static jobject createObserverInfo(JNIEnv *env, const ObserverInfo &observerInfo)
 }
 
 static jobject createObserverInfoVector(JNIEnv *env,
-                                        const std::vector<ObserverInfo> observersList)
+                                        const std::vector<ObserverInfo> &observersList)
 {
     jobject vectorObject = JniVector(env).toJava();
     if (!vectorObject)

diff --git a/service/simulator/ramlparser/raml/model/Raml.cpp b/service/simulator/ramlparser/raml/model/Raml.cpp
index d7dc0c4853c1e0287bdcb7ca0abc37730330c08e..d455a5a6a28ceabd2a341055455674f8c118c7b3 100644 (file)
--- a/service/simulator/ramlparser/raml/model/Raml.cpp
+++ b/service/simulator/ramlparser/raml/model/Raml.cpp
@@ -197,7 +197,6 @@ namespace RAML
                         for ( YAML::const_iterator tt = (*iit).begin(); tt != (*iit).end(); ++tt )\r
                         {\r
                             std::string key = READ_NODE_AS_STRING(tt->first);\r
-                            std::pair<std::string, Schema> schema;\r
 \r
                             IncludeResolver::FileType fileType = m_includeResolver->getFileType(tt->second);\r
                             if ((fileType == IncludeResolver::FileType::JSON) ||\r

diff --git a/service/simulator/ramlparser/raml/model/RamlResource.cpp b/service/simulator/ramlparser/raml/model/RamlResource.cpp
index ecee4188d4e1a979022ad0eae734bad13aff4dc1..14747965034d98ded55363f55d493022ba69a9a6 100644 (file)
--- a/service/simulator/ramlparser/raml/model/RamlResource.cpp
+++ b/service/simulator/ramlparser/raml/model/RamlResource.cpp
@@ -115,7 +115,8 @@ namespace RAML
     {\r
         return (m_parentUri + m_relativeUri);\r
     }\r
-    void RamlResource::readResource(const std::string resourceKey, const YAML::Node &yamlNode,\r
+\r
+    void RamlResource::readResource(const std::string &resourceKey, const YAML::Node &yamlNode,\r
                                     const std::string &parentUri)\r
     {\r
         m_relativeUri = resourceKey;\r

diff --git a/service/simulator/ramlparser/raml/model/RamlResource.h b/service/simulator/ramlparser/raml/model/RamlResource.h
index 1b4d7486ec6a6c98e6943e097cf9a962f3468046..c49ade9f1cd6a85d59263555b54fabcfb3d19289 100644 (file)
--- a/service/simulator/ramlparser/raml/model/RamlResource.h
+++ b/service/simulator/ramlparser/raml/model/RamlResource.h
@@ -221,14 +221,14 @@ namespace RAML
                    * @param parentUri - Uri of the Parent to form the Absolute Uri\r
                    *\r
                    */\r
-            RamlResource(const std::string resourceKey, const YAML::Node &yamlNode ,\r
+            RamlResource(const std::string &resourceKey, const YAML::Node &yamlNode ,\r
                          const IncludeResolverPtr &includeResolver,\r
                          const std::string &parentUri) : m_includeResolver(includeResolver)\r
             {\r
                 readResource(resourceKey, yamlNode, parentUri);\r
             }\r
         private:\r
-            void readResource(const std::string resourceKey, const YAML::Node &yamlNode,\r
+            void readResource(const std::string &resourceKey, const YAML::Node &yamlNode,\r
                               const std::string &parentUri);\r
         private:\r
             std::string m_displayName;\r

diff --git a/service/simulator/ramlparser/raml/model/RequestResponseBody.h b/service/simulator/ramlparser/raml/model/RequestResponseBody.h
index 929f915af24381e69dad96a718925857bd8aae12..0e0e80d6d831687c4633e2cc266173c037a26d7d 100644 (file)
--- a/service/simulator/ramlparser/raml/model/RequestResponseBody.h
+++ b/service/simulator/ramlparser/raml/model/RequestResponseBody.h
@@ -112,7 +112,7 @@ namespace RAML
                    * @param type - type of request response body\r
                    *\r
                    */\r
-            RequestResponseBody(const std::string type) : m_type(type), m_schema(NULL),\r
+            RequestResponseBody(const std::string &type) : m_type(type), m_schema(NULL),\r
                 m_includeResolver(NULL) {}\r
 \r
             /**\r
@@ -123,7 +123,7 @@ namespace RAML
                    * @param includeResolver - Reference to IncludeResolver for reading external files\r
                    *\r
                    */\r
-            RequestResponseBody(const std::string type, const YAML::Node &yamlNode,\r
+            RequestResponseBody(const std::string &type, const YAML::Node &yamlNode,\r
                                 const IncludeResolverPtr &includeResolver): m_schema(NULL),\r
                 m_includeResolver(includeResolver)\r
             { readRequestResponseBody(type, yamlNode); }\r

diff --git a/service/simulator/src/client/simulator_remote_resource_impl.cpp b/service/simulator/src/client/simulator_remote_resource_impl.cpp
index 55236952878618798c6238f86d034edee1c7a6d1..aacc6b0d053c739a873375c9459ca0e717efc4a3 100644 (file)
--- a/service/simulator/src/client/simulator_remote_resource_impl.cpp
+++ b/service/simulator/src/client/simulator_remote_resource_impl.cpp
@@ -115,6 +115,14 @@ bool SimulatorRemoteResourceImpl::isObservable() const
 
 void SimulatorRemoteResourceImpl::observe(ObserveType type,
         ObserveNotificationCallback callback)
+{
+    std::map<std::string, std::string> queryParams;
+    return observe(type, queryParams, callback);
+}
+
+void SimulatorRemoteResourceImpl::observe(ObserveType type,
+        const std::map<std::string, std::string> &queryParams,
+        ObserveNotificationCallback callback)
 {
     VALIDATE_CALLBACK(callback)
 
@@ -145,7 +153,7 @@ void SimulatorRemoteResourceImpl::observe(ObserveType type,
 
     try
     {
-        OCStackResult ocResult = m_ocResource->observe(observeType, OC::QueryParamsMap(), observeCallback);
+        OCStackResult ocResult = m_ocResource->observe(observeType, queryParams, observeCallback);
         if (OC_STACK_OK != ocResult)
             throw SimulatorException(static_cast<SimulatorResult>(ocResult), OC::OCException::reason(ocResult));
 

diff --git a/service/simulator/src/client/simulator_remote_resource_impl.h b/service/simulator/src/client/simulator_remote_resource_impl.h
index 2e75ab05411e321acf97b04b095ec99285a59347..4169c01e347c0ed7bf65e56e7cbf1ea2296af971 100644 (file)
--- a/service/simulator/src/client/simulator_remote_resource_impl.h
+++ b/service/simulator/src/client/simulator_remote_resource_impl.h
@@ -49,6 +49,8 @@ class SimulatorRemoteResourceImpl : public SimulatorRemoteResource
         bool isObservable() const;
 
         void observe(ObserveType type, ObserveNotificationCallback callback);
+        void observe(ObserveType type, const std::map<std::string, std::string> &queryParams,
+                     ObserveNotificationCallback callback);
         void cancelObserve();
 
         void get(const GetResponseCallback &callback);

diff --git a/service/simulator/src/common/simulator_utils.cpp b/service/simulator/src/common/simulator_utils.cpp
index 070e1f21b87b410d336d0f782925d9ce02ffe35d..618fda740489543a69228339462ccd68ed07827c 100644 (file)
--- a/service/simulator/src/common/simulator_utils.cpp
+++ b/service/simulator/src/common/simulator_utils.cpp
@@ -131,7 +131,7 @@ std::string getRequestString(const std::map<std::string, std::string> &queryPara
                              const OC::OCRepresentation &rep)
 {
     std::ostringstream requestString;
-    if (queryParams.size() > 0)
+    if (!queryParams.empty())
     {
         requestString << "qp: ";
         for (auto &qp : queryParams)
@@ -146,7 +146,7 @@ std::string getRequestString(const std::map<std::string, std::string> &queryPara
 std::string getRequestString(const std::map<std::string, std::string> &queryParams)
 {
     std::ostringstream requestString;
-    if (queryParams.size() > 0)
+    if (!queryParams.empty())
     {
         requestString << "qp: ";
         for (auto &qp : queryParams)