Remove 'using namespace' keyword from JNI headers

The use of the 'using namespace OC' was causing an
ambiguous symbol between the C++ OC::OCResource and
the C OCResource when including ocpayload.h.

It is bad practice to use 'using namespace' key words in
header files because any code that includes that header
also imports the namespace, whether they want it or not.

This defeats the purpose of namespaces and can cause name
collisions.

This is part of the work for IOT-2405

Bug: https://jira.iotivity.org/browse/IOT-2405
Change-Id: I8e7e01b1bf645b6333166bd4624a82e9f0345bf8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20767
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit ef076e24c7e81742b80c048a76a4023c635062d9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21059

diff --git a/java/jni/JniEntityHandler.cpp b/java/jni/JniEntityHandler.cpp
index f46dde0..786a58a 100644 (file)
--- a/java/jni/JniEntityHandler.cpp
+++ b/java/jni/JniEntityHandler.cpp
@@ -23,6 +23,8 @@
 #include "JniOcResourceResponse.h"
 #include "JniUtils.h"
 
+using namespace OC;
+
 JniEntityHandler::JniEntityHandler(JNIEnv *env, jobject entityHandler)
 {
     m_jListener = env->NewGlobalRef(entityHandler);

diff --git a/java/jni/JniOcAccountManager.h b/java/jni/JniOcAccountManager.h
index 01ec75c..0a24fc2 100644 (file)
--- a/java/jni/JniOcAccountManager.h
+++ b/java/jni/JniOcAccountManager.h
@@ -31,8 +31,6 @@
 #include "JniOnDeleteListener.h"
 #include "JniOnObserveListener.h"
 
-using namespace OC;
-
 class JniOcAccountManager
 {
 public:

diff --git a/java/jni/JniOcCloudProvisioning.h b/java/jni/JniOcCloudProvisioning.h
index 9bad7f2..1d6817e 100644 (file)
--- a/java/jni/JniOcCloudProvisioning.h
+++ b/java/jni/JniOcCloudProvisioning.h
@@ -27,9 +27,6 @@
 #include "JniCreateAciIdListener.h"
 #include <mutex>
 
-
-using namespace OC;
-
 #ifndef _Included_org_iotivity_base_OcCloudProvisioning
 #define _Included_org_iotivity_base_OcCloudProvisioning
 class JniOcCloudProvisioning

diff --git a/java/jni/JniOcDirectPairDevice.h b/java/jni/JniOcDirectPairDevice.h
index 505bac2..0d39f17 100644 (file)
--- a/java/jni/JniOcDirectPairDevice.h
+++ b/java/jni/JniOcDirectPairDevice.h
@@ -28,24 +28,22 @@
 #ifndef _Included_org_iotivity_base_OcDirectPairDevice
 #define _Included_org_iotivity_base_OcDirectPairDevice
 
-using namespace OC;
-
 class JniOcDirectPairDevice
 {
     public:
-        JniOcDirectPairDevice(std::shared_ptr<OCDirectPairing> directPairingDevice);
+        JniOcDirectPairDevice(std::shared_ptr<OC::OCDirectPairing> directPairingDevice);
         ~JniOcDirectPairDevice();
 
         static JniOcDirectPairDevice* getJniOcDirectPairDevicePtr(JNIEnv *env, jobject thiz);
         static jintArray JconvertIntVectorToJavaList(JNIEnv *env, std::vector<OCPrm_t> &vector);
 
-        std::shared_ptr<OCDirectPairing> getPtr();
+        std::shared_ptr<OC::OCDirectPairing> getPtr();
         std::string getHost();
         std::vector<OCPrm_t> getPairingMethods();
         OCConnectivityType connectivityType();
 
     private:
-          std::shared_ptr<OCDirectPairing> m_sharedDirectPairDevice;
+          std::shared_ptr<OC::OCDirectPairing> m_sharedDirectPairDevice;
 };
 
 /* DO NOT EDIT THIS FILE BEYOND THIS LINE - it is machine generated */

diff --git a/java/jni/JniOcPlatform.cpp b/java/jni/JniOcPlatform.cpp
index 19b548e..291e44f 100644 (file)
--- a/java/jni/JniOcPlatform.cpp
+++ b/java/jni/JniOcPlatform.cpp
@@ -35,6 +35,7 @@
 #endif
 
 using namespace OC;
+using namespace OC::OCPlatform;
 
 JniOnResourceFoundListener* AddOnResourceFoundListener(JNIEnv* env, jobject jListener)
 {
@@ -960,7 +961,7 @@ JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_findResource0(
 
     JniOnResourceFoundListener *onResFoundListener = AddOnResourceFoundListener(env, jListener);
 
-    FindCallback findCallback = [onResFoundListener](std::shared_ptr<OCResource> resource)
+    FindCallback findCallback = [onResFoundListener](std::shared_ptr<OC::OCResource> resource)
     {
         onResFoundListener->foundResourceCallback(resource);
     };
@@ -1024,7 +1025,7 @@ JNIEXPORT void JNICALL Java_org_iotivity_base_OcPlatform_findResource1(
     }
     JniOnResourceFoundListener *onResFoundListener = AddOnResourceFoundListener(env, jListener);
 
-    FindCallback findCallback = [onResFoundListener](std::shared_ptr<OCResource> resource)
+    FindCallback findCallback = [onResFoundListener](std::shared_ptr<OC::OCResource> resource)
     {
         onResFoundListener->foundResourceCallback(resource);
     };
@@ -2794,7 +2795,7 @@ JNIEXPORT jobject JNICALL Java_org_iotivity_base_OcPlatform_constructResourceObj
     std::vector<std::string> interfaces;
     JniUtils::convertJavaStrArrToStrVector(env, jInterfaceArray, interfaces);
 
-    std::shared_ptr<OCResource> resource = OCPlatform::constructResourceObject(
+    std::shared_ptr<OC::OCResource> resource = OCPlatform::constructResourceObject(
         host,
         uri,
         static_cast<OCConnectivityType>(jConnectivityType),

diff --git a/java/jni/JniOcPlatform.h b/java/jni/JniOcPlatform.h
index 45d4125..385c82f 100644 (file)
--- a/java/jni/JniOcPlatform.h
+++ b/java/jni/JniOcPlatform.h
@@ -34,8 +34,6 @@
 #ifndef _Included_org_iotivity_base_OcPlatform
 #define _Included_org_iotivity_base_OcPlatform
 
-using namespace OC;
-
 JniOnResourceFoundListener* AddOnResourceFoundListener(JNIEnv* env, jobject jListener);
 void RemoveOnResourceFoundListener(JNIEnv* env, jobject jListener);
 

diff --git a/java/jni/JniOcPresenceHandle.cpp b/java/jni/JniOcPresenceHandle.cpp
index 9d74e23..42dd4d7 100644 (file)
--- a/java/jni/JniOcPresenceHandle.cpp
+++ b/java/jni/JniOcPresenceHandle.cpp
@@ -22,6 +22,8 @@
 #include "JniOcPresenceHandle.h"
 #include "OCPlatform.h"
 
+using namespace OC::OCPlatform;
+
 JniOcPresenceHandle::JniOcPresenceHandle(JniOnPresenceListener* jniListener, OCPresenceHandle presenceHandle)
     : m_jniListener(jniListener), m_presenceHandle(presenceHandle), m_jniObserveListener(nullptr)
 {

diff --git a/java/jni/JniOcPresenceHandle.h b/java/jni/JniOcPresenceHandle.h
index 9c543e6..2a24300 100644 (file)
--- a/java/jni/JniOcPresenceHandle.h
+++ b/java/jni/JniOcPresenceHandle.h
@@ -27,28 +27,26 @@
 #ifndef _Included_org_iotivity_base_OcPresenceHandle
 #define _Included_org_iotivity_base_OcPresenceHandle
 
-using namespace OC::OCPlatform;
-
 class JniOcPresenceHandle
 {
 public:
 
-    JniOcPresenceHandle(JniOnPresenceListener* jniListener, OCPresenceHandle presenceHandle);
-    JniOcPresenceHandle(JniOnObserveListener* jniListener, OCPresenceHandle presenceHandle);
+    JniOcPresenceHandle(JniOnPresenceListener* jniListener, OC::OCPlatform::OCPresenceHandle presenceHandle);
+    JniOcPresenceHandle(JniOnObserveListener* jniListener, OC::OCPlatform::OCPresenceHandle presenceHandle);
     ~JniOcPresenceHandle();
     JniOcPresenceHandle(const JniOcPresenceHandle &) = delete;
     void operator=(const JniOcPresenceHandle &) = delete;
 
     static JniOcPresenceHandle* getJniOcPresenceHandlePtr(JNIEnv *env, jobject thiz);
 
-    OCPresenceHandle getOCPresenceHandle();
+    OC::OCPlatform::OCPresenceHandle getOCPresenceHandle();
     JniOnPresenceListener* getJniOnPresenceListener();
     JniOnObserveListener* getJniOnObserveListener();
 
 private:
     JniOnPresenceListener* m_jniListener;
     JniOnObserveListener* m_jniObserveListener;
-    OCPresenceHandle m_presenceHandle;
+    OC::OCPlatform::OCPresenceHandle m_presenceHandle;
 };
 
 #ifdef __cplusplus

diff --git a/java/jni/JniOcProvisioning.h b/java/jni/JniOcProvisioning.h
index 8fe7347..2e2f46d 100644 (file)
--- a/java/jni/JniOcProvisioning.h
+++ b/java/jni/JniOcProvisioning.h
@@ -30,8 +30,6 @@
 #ifndef _Included_org_iotivity_base_OcProvisioning
 #define _Included_org_iotivity_base_OcProvisioning
 
-using namespace OC;
-
 /* DO NOT EDIT THIS FILE - it is machine generated */
 /* Header for class org_iotivity_base_OcProvisioning */
 

diff --git a/java/jni/JniOcRDClient.h b/java/jni/JniOcRDClient.h
index 171c2c4..d39ea36 100644 (file)
--- a/java/jni/JniOcRDClient.h
+++ b/java/jni/JniOcRDClient.h
@@ -27,8 +27,6 @@
 #ifndef _Included_org_iotivity_base_RDClient
 #define _Included_org_iotivity_base_RDClient
 
-using namespace OC;
-
 void RemoveOnPublishResourceListener(JNIEnv* env, jobject jListener);
 JniOnPublishResourceListener* AddOnPublishResourceListener(JNIEnv* env, jobject jListener);
 

diff --git a/java/jni/JniOcRepresentation.h b/java/jni/JniOcRepresentation.h
index dc85747..63825dc 100644 (file)
--- a/java/jni/JniOcRepresentation.h
+++ b/java/jni/JniOcRepresentation.h
@@ -25,12 +25,10 @@
 #ifndef _Included_org_iotivity_base_OcRepresentation
 #define _Included_org_iotivity_base_OcRepresentation
 
-using namespace OC;
-
 class JniOcRepresentation
 {
 public:
-    static OCRepresentation* getOCRepresentationPtr(JNIEnv *env, jobject thiz);
+    static OC::OCRepresentation* getOCRepresentationPtr(JNIEnv *env, jobject thiz);
 };
 
 struct JObjectConverter : boost::static_visitor < jobject >
@@ -39,7 +37,7 @@ struct JObjectConverter : boost::static_visitor < jobject >
     {
     }
 
-    jobject operator()(const NullType&) const
+    jobject operator()(const OC::NullType&) const
     {
         return nullptr;
     }
@@ -75,7 +73,7 @@ struct JObjectConverter : boost::static_visitor < jobject >
     }
     jobject operator()(const OC::OCRepresentation& val) const
     {
-        OCRepresentation * rep = new OCRepresentation(val);
+        OC::OCRepresentation * rep = new OC::OCRepresentation(val);
         jlong handle = reinterpret_cast<jlong>(rep);
         jobject jRepresentation = env->NewObject(
             g_cls_OcRepresentation,
@@ -261,7 +259,7 @@ struct JObjectConverter : boost::static_visitor < jobject >
         }
         for (jsize i = 0; i < len; ++i)
         {
-            OCRepresentation* rep = new OCRepresentation(val[i]);
+            OC::OCRepresentation* rep = new OC::OCRepresentation(val[i]);
             jlong handle = reinterpret_cast<jlong>(rep);
             jobject jRepresentation = env->NewObject(g_cls_OcRepresentation, g_mid_OcRepresentation_N_ctor_bool,
                 handle, true);
@@ -651,7 +649,7 @@ struct JObjectConverter : boost::static_visitor < jobject >
             }
             for (jsize j = 0; j < lenInner; ++j)
             {
-                OCRepresentation* rep = new OCRepresentation(val[i][j]);
+                OC::OCRepresentation* rep = new OC::OCRepresentation(val[i][j]);
                 jlong handle = reinterpret_cast<jlong>(rep);
                 jobject jRepresentation = env->NewObject(g_cls_OcRepresentation, g_mid_OcRepresentation_N_ctor_bool,
                     handle, true);
@@ -702,7 +700,7 @@ struct JObjectConverter : boost::static_visitor < jobject >
                 }
                 for (jsize j = 0; j < lenInner; ++j)
                 {
-                    OCRepresentation* rep = new OCRepresentation(val[k][i][j]);
+                    OC::OCRepresentation* rep = new OC::OCRepresentation(val[k][i][j]);
                     jlong handle = reinterpret_cast<jlong>(rep);
                     jobject jRepresentation = env->NewObject(g_cls_OcRepresentation, g_mid_OcRepresentation_N_ctor_bool,
                         handle, true);

diff --git a/java/jni/JniOcResource.cpp b/java/jni/JniOcResource.cpp
index 0e50385..ae8fe0c 100644 (file)
--- a/java/jni/JniOcResource.cpp
+++ b/java/jni/JniOcResource.cpp
@@ -24,6 +24,8 @@
 #include "JniOcRepresentation.h"
 #include "JniUtils.h"
 
+using namespace OC;
+
 JniOcResource::JniOcResource(std::shared_ptr<OCResource> resource)
     : m_sharedResource(resource)
 {

diff --git a/java/jni/JniOcResource.h b/java/jni/JniOcResource.h
index 6f32fc0..72f3511 100644 (file)
--- a/java/jni/JniOcResource.h
+++ b/java/jni/JniOcResource.h
@@ -37,52 +37,50 @@
 #ifndef _Included_org_iotivity_base_OcResource
 #define _Included_org_iotivity_base_OcResource
 
-using namespace OC;
-
 class JniOcResource
 {
 public:
-    JniOcResource(std::shared_ptr<OCResource> resource);
+    JniOcResource(std::shared_ptr<OC::OCResource> resource);
     ~JniOcResource();
 
-    OCStackResult get(JNIEnv* env, const QueryParamsMap &queryParametersMap, jobject jListener);
-    OCStackResult get(JNIEnv* env, const QueryParamsMap &queryParametersMap, jobject jListener,
-        QualityOfService QoS);
+    OCStackResult get(JNIEnv* env, const OC::QueryParamsMap &queryParametersMap, jobject jListener);
+    OCStackResult get(JNIEnv* env, const OC::QueryParamsMap &queryParametersMap, jobject jListener,
+        OC::QualityOfService QoS);
     OCStackResult get(JNIEnv* env, const std::string &resourceType, const std::string &resourceInterface,
-        const QueryParamsMap &queryParametersMap, jobject jListener);
+        const OC::QueryParamsMap &queryParametersMap, jobject jListener);
     OCStackResult get(JNIEnv* env, const std::string &resourceType, const std::string &resourceInterface,
-        const QueryParamsMap &queryParametersMap, jobject jListener, QualityOfService QoS);
+        const OC::QueryParamsMap &queryParametersMap, jobject jListener, OC::QualityOfService QoS);
 
-    OCStackResult put(JNIEnv* env, const OCRepresentation &representation, const QueryParamsMap &queryParametersMap,
+    OCStackResult put(JNIEnv* env, const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap,
         jobject jListener);
-    OCStackResult put(JNIEnv* env, const OCRepresentation &representation, const QueryParamsMap &queryParametersMap,
-        jobject jListener, QualityOfService QoS);
+    OCStackResult put(JNIEnv* env, const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap,
+        jobject jListener, OC::QualityOfService QoS);
     OCStackResult put(JNIEnv* env, const std::string &resourceType, const std::string &resourceInterface,
-        const OCRepresentation &representation, const QueryParamsMap &queryParametersMap, jobject jListener);
+        const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap, jobject jListener);
     OCStackResult put(JNIEnv* env, const std::string &resourceType, const std::string &resourceInterface,
-        const OCRepresentation &representation, const QueryParamsMap &queryParametersMap, jobject jListener, QualityOfService QoS);
+        const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap, jobject jListener, OC::QualityOfService QoS);
 
-    OCStackResult post(JNIEnv* env, const OCRepresentation &representation, const QueryParamsMap &queryParametersMap,
+    OCStackResult post(JNIEnv* env, const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap,
         jobject jListener);
-    OCStackResult post(JNIEnv* env, const OCRepresentation &representation, const QueryParamsMap &queryParametersMap,
-        jobject jListener, QualityOfService QoS);
+    OCStackResult post(JNIEnv* env, const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap,
+        jobject jListener, OC::QualityOfService QoS);
     OCStackResult post(JNIEnv* env, const std::string &resourceType, const std::string &resourceInterface,
-        const OCRepresentation &representation, const QueryParamsMap &queryParametersMap, jobject jListener);
+        const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap, jobject jListener);
     OCStackResult post(JNIEnv* env, const std::string &resourceType, const std::string &resourceInterface,
-        const OCRepresentation &representation, const QueryParamsMap &queryParametersMap, jobject jListener, QualityOfService QoS);
+        const OC::OCRepresentation &representation, const OC::QueryParamsMap &queryParametersMap, jobject jListener, OC::QualityOfService QoS);
 
     OCStackResult deleteResource(JNIEnv* env, jobject jListener);
-    OCStackResult deleteResource(JNIEnv* env, jobject jListener, QualityOfService QoS);
+    OCStackResult deleteResource(JNIEnv* env, jobject jListener, OC::QualityOfService QoS);
 
-    OCStackResult observe(JNIEnv* env, ObserveType observeType, const QueryParamsMap &queryParametersMap,
+    OCStackResult observe(JNIEnv* env, OC::ObserveType observeType, const OC::QueryParamsMap &queryParametersMap,
         jobject jListener);
-    OCStackResult observe(JNIEnv* env, ObserveType observeType, const QueryParamsMap &queryParametersMap,
-        jobject jListener, QualityOfService qos);
+    OCStackResult observe(JNIEnv* env, OC::ObserveType observeType, const OC::QueryParamsMap &queryParametersMap,
+        jobject jListener, OC::QualityOfService qos);
 
     OCStackResult cancelObserve(JNIEnv* env);
-    OCStackResult cancelObserve(JNIEnv* env, QualityOfService qos);
+    OCStackResult cancelObserve(JNIEnv* env, OC::QualityOfService qos);
 
-    void setHeaderOptions(const HeaderOptions &headerOptions);
+    void setHeaderOptions(const OC::HeaderOptions &headerOptions);
     void unsetHeaderOptions();
     std::string host();
     std::vector< std::string > getAllHosts() const;
@@ -92,7 +90,7 @@ public:
     bool isObservable();
     std::vector< std::string >  getResourceTypes() const;
     std::vector< std::string >  getResourceInterfaces(void) const;
-    OCResourceIdentifier uniqueIdentifier() const;
+    OC::OCResourceIdentifier uniqueIdentifier() const;
     std::string sid() const;
 
     JniOnGetListener* addOnGetListener(JNIEnv* env, jobject jListener);
@@ -107,7 +105,7 @@ public:
     void removeOnDeleteListener(JNIEnv* env, jobject jListener);
     void removeOnObserveListener(JNIEnv* env, jobject jListener);
 
-    std::shared_ptr<OCResource> getOCResource();
+    std::shared_ptr<OC::OCResource> getOCResource();
 
     static JniOcResource* getJniOcResourcePtr(JNIEnv *env, jobject thiz);
 
@@ -119,23 +117,23 @@ public:
     void removeOnMQTopicSubscribeListener(JNIEnv* env, jobject jListener);
 
     OCStackResult discoveryMQTopics(JNIEnv* env, const QueryParamsMap &queryParametersMap,
-                                    jobject jListener, QualityOfService QoS);
-    OCStackResult createMQTopic(JNIEnv* env, const OCRepresentation &representation,
+                                    jobject jListener, OC::QualityOfService QoS);
+    OCStackResult createMQTopic(JNIEnv* env, const OC::OCRepresentation &representation,
                                 const std::string &targetUri,
                                 const QueryParamsMap &queryParametersMap,
-                                jobject jListener, QualityOfService QoS);
+                                jobject jListener, OC::QualityOfService QoS);
 #endif
 #ifdef MQ_SUBSCRIBER
     OCStackResult subscribeMQTopic(JNIEnv* env, const QueryParamsMap &queryParametersMap,
-                                   jobject jListener, QualityOfService QoS);
-    OCStackResult unsubscribeMQTopic(QualityOfService QoS);
+                                   jobject jListener, OC::QualityOfService QoS);
+    OCStackResult unsubscribeMQTopic(OC::QualityOfService QoS);
     OCStackResult requestMQPublish(JNIEnv* env, const QueryParamsMap &queryParametersMap,
-                                   jobject jListener, QualityOfService QoS);
+                                   jobject jListener, OC::QualityOfService QoS);
 #endif
 #ifdef MQ_PUBLISHER
-    OCStackResult publishMQTopic(JNIEnv* env, const OCRepresentation &representation,
+    OCStackResult publishMQTopic(JNIEnv* env, const OC::OCRepresentation &representation,
                                  const QueryParamsMap &queryParametersMap,
-                                 jobject jListener, QualityOfService QoS);
+                                 jobject jListener, OC::QualityOfService QoS);
 #endif
 
 private:
@@ -149,7 +147,7 @@ private:
     JniListenerManager<JniOnMQSubscribeListener> m_onSubcribeTopicManager;
 #endif
 
-    std::shared_ptr<OCResource> m_sharedResource;
+    std::shared_ptr<OC::OCResource> m_sharedResource;
 };
 
 /* DO NOT EDIT THIS FILE BEYOND THIS LINE - it is machine generated */

diff --git a/java/jni/JniOcResourceRequest.h b/java/jni/JniOcResourceRequest.h
index f2de51d..205e5e8 100644 (file)
--- a/java/jni/JniOcResourceRequest.h
+++ b/java/jni/JniOcResourceRequest.h
@@ -24,30 +24,28 @@
 #ifndef _Included_org_iotivity_base_OcResourceRequest
 #define _Included_org_iotivity_base_OcResourceRequest
 
-using namespace OC;
-
 class JniOcResourceRequest
 {
 public:
-    JniOcResourceRequest(const std::shared_ptr<OCResourceRequest> resourceRequest);
+    JniOcResourceRequest(const std::shared_ptr<OC::OCResourceRequest> resourceRequest);
 
     ~JniOcResourceRequest();
 
     std::string getRequestType();
 
-    const QueryParamsMap& getQueryParameters() const;
+    const OC::QueryParamsMap& getQueryParameters() const;
 
     int getRequestHandlerFlag() const;
 
-    const OCRepresentation& getResourceRepresentation() const;
+    const OC::OCRepresentation& getResourceRepresentation() const;
 
-    const ObservationInfo& getObservationInfo() const;
+    const OC::ObservationInfo& getObservationInfo() const;
 
     void setResourceUri(const std::string resourceUri);
 
     std::string getResourceUri(void);
 
-    const HeaderOptions& getHeaderOptions() const;
+    const OC::HeaderOptions& getHeaderOptions() const;
 
     const OCRequestHandle& getRequestHandle() const;
 
@@ -57,7 +55,7 @@ public:
         (JNIEnv *env, jobject thiz);
 
 private:
-    std::shared_ptr<OCResourceRequest> m_request;
+    std::shared_ptr<OC::OCResourceRequest> m_request;
 };
 
 #ifdef __cplusplus
@@ -155,4 +153,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif
\ No newline at end of file
+#endif

diff --git a/java/jni/JniOcResourceResponse.h b/java/jni/JniOcResourceResponse.h
index 9f00698..686487d 100644 (file)
--- a/java/jni/JniOcResourceResponse.h
+++ b/java/jni/JniOcResourceResponse.h
@@ -25,25 +25,23 @@
 #ifndef _Included_org_iotivity_base_OcResourceResponse
 #define _Included_org_iotivity_base_OcResourceResponse
 
-using namespace OC;
-
 class JniOcResourceResponse
 {
 public:
-    JniOcResourceResponse(std::shared_ptr<OCResourceResponse> resourceResponse);
+    JniOcResourceResponse(std::shared_ptr<OC::OCResourceResponse> resourceResponse);
     ~JniOcResourceResponse();
     std::string getNewResourceUri(void);
     void setNewResourceUri(const std::string newResourceUri);
-    void setHeaderOptions(const HeaderOptions& headerOptions);
+    void setHeaderOptions(const OC::HeaderOptions& headerOptions);
     void setRequestHandle(const OCRequestHandle& requestHandle);
     void setResourceHandle(const OCResourceHandle& resourceHandle);
     void setResponseResult(const OCEntityHandlerResult& responseResult);
-    void setResourceRepresentation(OCRepresentation& rep, std::string interfaceStr);
-    void setResourceRepresentation(OCRepresentation& rep);
-    std::shared_ptr<OCResourceResponse> getOCResourceResponse();
+    void setResourceRepresentation(OC::OCRepresentation& rep, std::string interfaceStr);
+    void setResourceRepresentation(OC::OCRepresentation& rep);
+    std::shared_ptr<OC::OCResourceResponse> getOCResourceResponse();
     static JniOcResourceResponse* getJniOcResourceResponsePtr(JNIEnv *env, jobject thiz);
 private:
-    std::shared_ptr<OCResourceResponse> m_response;
+    std::shared_ptr<OC::OCResourceResponse> m_response;
 };
 
 #ifdef __cplusplus

diff --git a/java/jni/JniOcSecureResource.cpp b/java/jni/JniOcSecureResource.cpp
index c470d34..186c92f 100644 (file)
--- a/java/jni/JniOcSecureResource.cpp
+++ b/java/jni/JniOcSecureResource.cpp
@@ -25,7 +25,9 @@
 #include "aclresource.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
+
 namespace PH = std::placeholders;
+using namespace OC;
 
 JniOcSecureResource::JniOcSecureResource(std::shared_ptr<OCSecureResource> device)
     : m_sharedSecureResource(device)

diff --git a/java/jni/JniOcSecureResource.h b/java/jni/JniOcSecureResource.h
index 0cd820f..4307eb3 100644 (file)
--- a/java/jni/JniOcSecureResource.h
+++ b/java/jni/JniOcSecureResource.h
@@ -28,12 +28,10 @@
 #ifndef _Included_org_iotivity_base_OcSecureResource
 #define _Included_org_iotivity_base_OcSecureResource
 
-using namespace OC;
-
 class JniOcSecureResource
 {
     public:
-        JniOcSecureResource(std::shared_ptr<OCSecureResource> secureresource);
+        JniOcSecureResource(std::shared_ptr<OC::OCSecureResource> secureresource);
         ~JniOcSecureResource();
 
         static JniOcSecureResource* getJniOcSecureResourcePtr(JNIEnv *env, jobject thiz);
@@ -41,13 +39,13 @@ class JniOcSecureResource
         std::string getIpAddr(void);
         int getDeviceStatus(void);
         bool getOwnedStatus(void);
-        OCSecureResource* getDevicePtr();
+        OC::OCSecureResource* getDevicePtr();
 
         JniProvisionResultListner* AddProvisionResultListener(JNIEnv* env, jobject jListener);
         void  RemoveProvisionResultListener(JNIEnv* env, jobject jListener);
 
         OCStackResult doOwnershipTransfer(JNIEnv* env, jobject jListener);
-        OCStackResult getLinkedDevices(JNIEnv *env, UuidList_t &uuidList);
+        OCStackResult getLinkedDevices(JNIEnv *env, OC::UuidList_t &uuidList);
         OCStackResult provisionACL(JNIEnv* env, jobject acl, jobject jListener);
         OCStackResult provisionPairwiseDevices(JNIEnv* env, jint type, jint keySize,
                 jobject acl1, jobject device2, jobject acl2, jobject jListener);
@@ -69,7 +67,7 @@ class JniOcSecureResource
 
         std::map<jobject, std::pair<JniProvisionResultListner*, int>> resultMap;
         std::mutex resultMapLock;
-        std::shared_ptr<OCSecureResource> m_sharedSecureResource;
+        std::shared_ptr<OC::OCSecureResource> m_sharedSecureResource;
 };
 
 /* DO NOT EDIT THIS FILE BEYOND THIS LINE - it is machine generated */

diff --git a/java/jni/JniOcSecurity.h b/java/jni/JniOcSecurity.h
index 78293e6..6afbd77 100644 (file)
--- a/java/jni/JniOcSecurity.h
+++ b/java/jni/JniOcSecurity.h
@@ -26,7 +26,9 @@
 #include <stdio.h>
 #include <string>
 #include "octypes.h"
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 namespace OC
 {

diff --git a/java/jni/JniOnDeleteListener.cpp b/java/jni/JniOnDeleteListener.cpp
index bb0f5db..1cf5378 100644 (file)
--- a/java/jni/JniOnDeleteListener.cpp
+++ b/java/jni/JniOnDeleteListener.cpp
@@ -27,6 +27,8 @@
 #include "JniOcAccountManager.h"
 #endif
 
+using namespace OC;
+
 JniOnDeleteListener::JniOnDeleteListener(JNIEnv *env, jobject jListener, JniOcResource* owner)
     : m_ownerResource(owner)
 {

diff --git a/java/jni/JniOnDeleteListener.h b/java/jni/JniOnDeleteListener.h
index 9354232..3b2ec75 100644 (file)
--- a/java/jni/JniOnDeleteListener.h
+++ b/java/jni/JniOnDeleteListener.h
@@ -24,8 +24,6 @@
 #ifndef _Included_org_iotivity_base_OcResource_OnDeleteListener
 #define _Included_org_iotivity_base_OcResource_OnDeleteListener
 
-using namespace OC;
-
 class JniOcResource;
 #ifdef WITH_CLOUD
 class JniOcAccountManager;
@@ -40,7 +38,7 @@ public:
 #endif
     ~JniOnDeleteListener();
 
-    void onDeleteCallback(const HeaderOptions&, const int eCode);
+    void onDeleteCallback(const OC::HeaderOptions&, const int eCode);
 
 private:
     jweak m_jwListener;

diff --git a/java/jni/JniOnDeleteResourceListener.h b/java/jni/JniOnDeleteResourceListener.h
index 267646f..4e4523f 100644 (file)
--- a/java/jni/JniOnDeleteResourceListener.h
+++ b/java/jni/JniOnDeleteResourceListener.h
@@ -22,8 +22,6 @@
 #ifndef _Included_org_iotivity_base_OcPlatform_OnDeleteResourceListener
 #define _Included_org_iotivity_base_OcPlatform_OnDeleteResourceListener
 
-using namespace OC;
-
 class JniOnDeleteResourceListener
 {
 public:

diff --git a/java/jni/JniOnDeviceInfoListener.cpp b/java/jni/JniOnDeviceInfoListener.cpp
index 520cdfd..21f3ef3 100644 (file)
--- a/java/jni/JniOnDeviceInfoListener.cpp
+++ b/java/jni/JniOnDeviceInfoListener.cpp
@@ -22,6 +22,8 @@
 #include "JniOnDeviceInfoListener.h"
 #include "JniOcRepresentation.h"
 
+using namespace OC;
+
 JniOnDeviceInfoListener::JniOnDeviceInfoListener(JNIEnv *env, jobject jListener,
     RemoveListenerCallback removeListenerCallback)
 {

diff --git a/java/jni/JniOnGetListener.cpp b/java/jni/JniOnGetListener.cpp
index 9a801f1..e6534ef 100644 (file)
--- a/java/jni/JniOnGetListener.cpp
+++ b/java/jni/JniOnGetListener.cpp
@@ -27,6 +27,8 @@
 #include "JniOcAccountManager.h"
 #endif
 
+using namespace OC;
+
 JniOnGetListener::JniOnGetListener(JNIEnv *env, jobject jListener, JniOcResource* owner)
     : m_ownerResource(owner)
 {

diff --git a/java/jni/JniOnGetListener.h b/java/jni/JniOnGetListener.h
index abffaa0..ecbe4aa 100644 (file)
--- a/java/jni/JniOnGetListener.h
+++ b/java/jni/JniOnGetListener.h
@@ -24,8 +24,6 @@
 #ifndef _Included_org_iotivity_base_OcResource_OnGetListener
 #define _Included_org_iotivity_base_OcResource_OnGetListener
 
-using namespace OC;
-
 class JniOcResource;
 #ifdef WITH_CLOUD
 class JniOcAccountManager;
@@ -39,7 +37,7 @@ public:
     JniOnGetListener(JNIEnv *env, jobject listener, JniOcAccountManager* resource);
 #endif
     ~JniOnGetListener();
-    void onGetCallback(const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode);
+    void onGetCallback(const OC::HeaderOptions& headerOptions, const OC::OCRepresentation& rep, const int eCode);
 
 private:
     jweak m_jwListener;

diff --git a/java/jni/JniOnMQSubscribeListener.h b/java/jni/JniOnMQSubscribeListener.h
index 3f747cf..8178590 100644 (file)
--- a/java/jni/JniOnMQSubscribeListener.h
+++ b/java/jni/JniOnMQSubscribeListener.h
@@ -23,8 +23,6 @@
 #ifndef _Included_org_iotivity_base_OcResource_OnMQSubscribeListener
 #define _Included_org_iotivity_base_OcResource_OnMQSubscribeListener
 
-using namespace OC;
-
 class JniOcResource;
 
 class JniOnMQSubscribeListener

diff --git a/java/jni/JniOnMQTopicFoundListener.h b/java/jni/JniOnMQTopicFoundListener.h
index 45b73a0..f7a3a15 100644 (file)
--- a/java/jni/JniOnMQTopicFoundListener.h
+++ b/java/jni/JniOnMQTopicFoundListener.h
@@ -22,8 +22,6 @@
 #ifndef _Included_org_iotivity_base_OcResource_JniOnMQTopicFoundListener
 #define _Included_org_iotivity_base_OcResource_JniOnMQTopicFoundListener
 
-using namespace OC;
-
 class JniOcResource;
 
 class JniOnMQTopicFoundListener

diff --git a/java/jni/JniOnObserveListener.cpp b/java/jni/JniOnObserveListener.cpp
index 060b19e..bd90a6e 100644 (file)
--- a/java/jni/JniOnObserveListener.cpp
+++ b/java/jni/JniOnObserveListener.cpp
@@ -27,6 +27,8 @@
 #include "JniOcAccountManager.h"
 #endif
 
+using namespace OC;
+
 #define CA_OBSERVE_MAX_SEQUENCE_NUMBER 0xFFFFFF
 
 JniOnObserveListener::JniOnObserveListener(JNIEnv *env, jobject jListener, JniOcResource* owner)

diff --git a/java/jni/JniOnObserveListener.h b/java/jni/JniOnObserveListener.h
index 3fc478d..e87daaa 100644 (file)
--- a/java/jni/JniOnObserveListener.h
+++ b/java/jni/JniOnObserveListener.h
@@ -24,8 +24,6 @@
 #ifndef _Included_org_iotivity_base_OcResource_OnObserveListener
 #define _Included_org_iotivity_base_OcResource_OnObserveListener
 
-using namespace OC;
-
 class JniOcResource;
 #ifdef WITH_CLOUD
 class JniOcAccountManager;
@@ -39,7 +37,7 @@ public:
     JniOnObserveListener(JNIEnv *env, jobject jListener, JniOcAccountManager* owner);
 #endif
     ~JniOnObserveListener();
-    void onObserveCallback(const HeaderOptions headerOptions, const OCRepresentation& rep,
+    void onObserveCallback(const OC::HeaderOptions headerOptions, const OC::OCRepresentation& rep,
         const int& eCode, const int& sequenceNumber);
     jweak getJWListener();
 private:

diff --git a/java/jni/JniOnPlatformInfoListener.cpp b/java/jni/JniOnPlatformInfoListener.cpp
index 7a220bf..f52b25c 100644 (file)
--- a/java/jni/JniOnPlatformInfoListener.cpp
+++ b/java/jni/JniOnPlatformInfoListener.cpp
@@ -22,6 +22,8 @@
 #include "JniOnPlatformInfoListener.h"
 #include "JniOcRepresentation.h"
 
+using namespace OC;
+
 JniOnPlatformInfoListener::JniOnPlatformInfoListener(JNIEnv *env, jobject jListener,
     RemoveListenerCallback removeListenerCallback)
 {

diff --git a/java/jni/JniOnPostListener.cpp b/java/jni/JniOnPostListener.cpp
index 62f6e96..bdbadfe 100644 (file)
--- a/java/jni/JniOnPostListener.cpp
+++ b/java/jni/JniOnPostListener.cpp
@@ -27,6 +27,8 @@
 #include "JniOcAccountManager.h"
 #endif
 
+using namespace OC;
+
 JniOnPostListener::JniOnPostListener(JNIEnv *env, jobject jListener, JniOcResource* owner)
     : m_ownerResource(owner)
 {

diff --git a/java/jni/JniOnPostListener.h b/java/jni/JniOnPostListener.h
index bf3387c..a41e81d 100644 (file)
--- a/java/jni/JniOnPostListener.h
+++ b/java/jni/JniOnPostListener.h
@@ -24,8 +24,6 @@
 #ifndef _Included_org_iotivity_base_OcResource_OnPostListener
 #define _Included_org_iotivity_base_OcResource_OnPostListener
 
-using namespace OC;
-
 class JniOcResource;
 #ifdef WITH_CLOUD
 class JniOcAccountManager;
@@ -40,7 +38,7 @@ public:
 #endif
     ~JniOnPostListener();
 
-    void onPostCallback(const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode);
+    void onPostCallback(const OC::HeaderOptions& headerOptions, const OC::OCRepresentation& rep, const int eCode);
 
 private:
     jweak m_jwListener;

diff --git a/java/jni/JniOnPublishResourceListener.cpp b/java/jni/JniOnPublishResourceListener.cpp
index 4adc14a..e9eef30 100644 (file)
--- a/java/jni/JniOnPublishResourceListener.cpp
+++ b/java/jni/JniOnPublishResourceListener.cpp
@@ -19,6 +19,8 @@
  ******************************************************************/
 #include "JniOnPublishResourceListener.h"
 
+using namespace OC;
+
 JniOnPublishResourceListener::JniOnPublishResourceListener(JNIEnv *env, jobject jListener,
     RemoveListenerCallback removeListenerCallback)
 {

diff --git a/java/jni/JniOnPublishResourceListener.h b/java/jni/JniOnPublishResourceListener.h
index a147ba2..7986d6f 100644 (file)
--- a/java/jni/JniOnPublishResourceListener.h
+++ b/java/jni/JniOnPublishResourceListener.h
@@ -22,15 +22,13 @@
 #ifndef _Included_org_iotivity_base_OcPlatform_OnPublishResourceListener
 #define _Included_org_iotivity_base_OcPlatform_OnPublishResourceListener
 
-using namespace OC;
-
 class JniOnPublishResourceListener
 {
 public:
     JniOnPublishResourceListener(JNIEnv *env, jobject listener,
                                  RemoveListenerCallback removeListenerCallback);
     ~JniOnPublishResourceListener();
-    void onPublishResourceCallback(const OCRepresentation& rep, const int eCode);
+    void onPublishResourceCallback(const OC::OCRepresentation& rep, const int eCode);
 private:
     RemoveListenerCallback m_removeListenerCallback;
     jweak m_jwListener;

diff --git a/java/jni/JniOnPutListener.cpp b/java/jni/JniOnPutListener.cpp
index 5e2dd4a..ee24c78 100644 (file)
--- a/java/jni/JniOnPutListener.cpp
+++ b/java/jni/JniOnPutListener.cpp
@@ -24,6 +24,8 @@
 #include "JniOcRepresentation.h"
 #include "JniUtils.h"
 
+using namespace OC;
+
 JniOnPutListener::JniOnPutListener(JNIEnv *env, jobject jListener, JniOcResource* owner)
     : m_ownerResource(owner)
 {

diff --git a/java/jni/JniOnPutListener.h b/java/jni/JniOnPutListener.h
index 80057e1..92ac452 100644 (file)
--- a/java/jni/JniOnPutListener.h
+++ b/java/jni/JniOnPutListener.h
@@ -24,8 +24,6 @@
 #ifndef _Included_org_iotivity_base_OcResource_OnPutListener
 #define _Included_org_iotivity_base_OcResource_OnPutListener
 
-using namespace OC;
-
 class JniOcResource;
 
 class JniOnPutListener
@@ -34,7 +32,7 @@ public:
     JniOnPutListener(JNIEnv *env, jobject jListener, JniOcResource* resource);
     ~JniOnPutListener();
 
-    void onPutCallback(const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode);
+    void onPutCallback(const OC::HeaderOptions& headerOptions, const OC::OCRepresentation& rep, const int eCode);
 
 private:
     jweak m_jwListener;

diff --git a/java/jni/JniProvisionResultListner.cpp b/java/jni/JniProvisionResultListner.cpp
index a4418d3..cf5549e 100644 (file)
--- a/java/jni/JniProvisionResultListner.cpp
+++ b/java/jni/JniProvisionResultListner.cpp
@@ -23,6 +23,8 @@
 #include "JniOcSecureResource.h"
 #include "JniSecureUtils.h"
 
+using namespace OC;
+
 JniProvisionResultListner::JniProvisionResultListner(JNIEnv *env, jobject jListener,
     RemoveCallback removeProvisionResultListener)
 {

diff --git a/java/jni/JniSecureUtils.cpp b/java/jni/JniSecureUtils.cpp
index 332a7e6..4b6e18a 100644 (file)
--- a/java/jni/JniSecureUtils.cpp
+++ b/java/jni/JniSecureUtils.cpp
@@ -27,6 +27,8 @@
 #include "srmutility.h"
 #include "base64.h"
 
+using namespace OC;
+
 jobject JniSecureUtils::convertProvisionresultVectorToJavaList(JNIEnv *env, const OC::PMResultList_t *result)
 {
     jobject jResultList = env->NewObject(g_cls_LinkedList, g_mid_LinkedList_ctor);

diff --git a/java/jni/JniUtils.cpp b/java/jni/JniUtils.cpp
index a99a475..1851a16 100644 (file)
--- a/java/jni/JniUtils.cpp
+++ b/java/jni/JniUtils.cpp
@@ -24,6 +24,8 @@
 #include "JniOcRepresentation.h"
 #include "JniOcResource.h"
 
+using namespace OC;
+
 jobject JniUtils::convertStrVectorToJavaStrList(JNIEnv *env, std::vector<std::string> &vector)
 {
     jobject jList = env->NewObject(g_cls_LinkedList, g_mid_LinkedList_ctor);