Softsensor Manager - Fix java api method name to follow coding guidelines

1. Fix jave api method name to follow coding guidelines

Change-Id: If707b52ee3da12b635e7bc44ecd18552b28e568d
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/654
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/CoreController.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/CoreController.java
index f25c206..3c03303 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/CoreController.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/CoreController.java
@@ -89,7 +89,7 @@ public class CoreController
          * @return void
          * 
          */
-        public native void InitializeSSMCore(String xmlDescription)
+        public native void initializeSSMCore(String xmlDescription)
         throws Exception;
 
         /**
@@ -99,7 +99,7 @@ public class CoreController
          * @return void
          * 
          */
-        public native void StartSSMCore() throws Exception;
+        public native void startSSMCore() throws Exception;
 
         /**
          * Stops the framework and terminate all communications.
@@ -107,7 +107,7 @@ public class CoreController
          * @return void
          * 
          */
-        public native void StopSSMCore() throws Exception;
+        public native void stopSSMCore() throws Exception;
 
         /**
          * Terminate the framework, return all allocated resources
@@ -115,7 +115,7 @@ public class CoreController
          * @return void
          * 
          */
-        public native void TerminateSSMCore() throws Exception;
+        public native void terminateSSMCore() throws Exception;
 
         /**
          * Creates an instance of the Query Engine
@@ -123,7 +123,7 @@ public class CoreController
          * @return QueryEngine - QueryEngine object created
          *               
          */
-        public native QueryEngine CreateQueryEngine() throws Exception;
+        public native QueryEngine createQueryEngine() throws Exception;
 
         /**
          * Release the QueryEngine object.
@@ -134,7 +134,7 @@ public class CoreController
          * @return int - success or failure result
          * 
          */
-        public native int ReleaseQueryEngine(QueryEngine queryEngine);
+        public native int releaseQueryEngine(QueryEngine queryEngine);
 
         // QueryEngine
         /**
@@ -151,7 +151,7 @@ public class CoreController
          * @return int - ID of context query executed
          * 
          */
-        public native int ExecuteContextQuery(int pQueryEngineInstance,
+        public native int executeContextQuery(int pQueryEngineInstance,
                                               String contextQuery) throws Exception;
 
         /**
@@ -167,7 +167,7 @@ public class CoreController
          * @return void
          * 
          */
-        public native void RegisterQueryEvent(int pQueryEngineInstance,
+        public native void registerQueryEvent(int pQueryEngineInstance,
                                               IQueryEngineEvent queryEngineEvent);
 
 
@@ -184,7 +184,7 @@ public class CoreController
          * @return void
          * 
          */
-        public native void KillContextQuery(int pQueryEngineInstance, int cqid)
+        public native void killContextQuery(int pQueryEngineInstance, int cqid)
         throws Exception;
 
         // public native void UnregiterQueryEvent(int pQueryEngineInstance,
@@ -202,7 +202,7 @@ public class CoreController
          * @return int - the affected DataId
          * 
          */
-        public native int GetDataId(int pIModelDataInstance);
+        public native int getDataId(int pIModelDataInstance);
 
         /**
          * ContextModel has at least one property that contains data \n
@@ -214,7 +214,7 @@ public class CoreController
          * @return @return int - number of properties
          * 
          */
-        public native int GetPropertyCount(int pIModelDataInstance);
+        public native int getPropertyCount(int pIModelDataInstance);
 
         /**
          * Retrieve the name of the property using the given index
@@ -229,7 +229,7 @@ public class CoreController
          * @return String - property name
          * 
          */
-        public native String GetPropertyName(int pIModelDataInstance,
+        public native String getPropertyName(int pIModelDataInstance,
                                              int propertyIndex);
 
         /**
@@ -245,7 +245,7 @@ public class CoreController
          * @return String - property value
          * 
          */
-        public native String GetPropertyValue(int pIModelDataInstance,
+        public native String getPropertyValue(int pIModelDataInstance,
                                               int propertyIndex);
 
         // IDataReader
@@ -261,7 +261,7 @@ public class CoreController
          * @return List<String> - affected ContextModel list
          * 
          */
-        public native List<String> GetAffectedModels(int pDataReaderInstance);
+        public native List<String> getAffectedModels(int pDataReaderInstance);
 
         /**
          * Get affected model data count. There can be multiple data models existing
@@ -277,7 +277,7 @@ public class CoreController
          * @return int  - affected dataId count
          * 
          */
-        public native int GetModelDataCount(int pDataReaderInstance,
+        public native int getModelDataCount(int pDataReaderInstance,
                                             String modelName) throws Exception;
 
         /**
@@ -296,7 +296,7 @@ public class CoreController
          * @return ModelData  - affected ContextModel data reader
          * 
          */
-        public native ModelData GetModelData(int pDataReaderInstance,
+        public native ModelData getModelData(int pDataReaderInstance,
                                              String modelName, int dataIndex) throws Exception;
 
         /**
@@ -308,5 +308,5 @@ public class CoreController
          * @return void
          * 
          */
-        public native void RegisterReportReceiver(IReportReceiver reportReceiver);
+        public native void registerReportReceiver(IReportReceiver reportReceiver);
 }
\ No newline at end of file

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/DataReader.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/DataReader.java
index eef8d3a..2679850 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/DataReader.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/DataReader.java
@@ -52,9 +52,9 @@ public class DataReader
          * @return List<String> - affected ContextModel list
          * 
          */
-        public List<String> GetAffectedModels()
+        public List<String> getAffectedModels()
         {
-            return CoreController.getInstance().GetAffectedModels(
+            return CoreController.getInstance().getAffectedModels(
                        pDataReaderInstance);
         }
 
@@ -68,9 +68,9 @@ public class DataReader
          * @return int  - affected dataId count
          * 
          */
-        public int GetModelDataCount(String modelName) throws Exception
+        public int getModelDataCount(String modelName) throws Exception
         {
-            return CoreController.getInstance().GetModelDataCount(
+            return CoreController.getInstance().getModelDataCount(
                 pDataReaderInstance, modelName);
         }
 
@@ -86,10 +86,10 @@ public class DataReader
          * @return ModelData  - affected ContextModel data reader
          * 
          */
-        public ModelData GetModelData(String modelName, int dataIndex)
+        public ModelData getModelData(String modelName, int dataIndex)
         throws Exception
         {
-            return CoreController.getInstance().GetModelData(pDataReaderInstance,
+            return CoreController.getInstance().getModelData(pDataReaderInstance,
             modelName, dataIndex);
         }
 }

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IQueryEngineEvent.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IQueryEngineEvent.java
index 7244e03..30e7e1b 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IQueryEngineEvent.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IQueryEngineEvent.java
@@ -42,7 +42,7 @@ package org.iotivity.service.ssm;
         private IQueryEngineEvent mQueryEngineEventListener = new IQueryEngineEvent()
         {
         @Override
-        public void OnQueryEngineEvent(int cqid, DataReader result)
+        public void onQueryEngineEvent(int cqid, DataReader result)
         {
                 List<String> models = result.GetAffectedModels();
 
@@ -79,5 +79,5 @@ public abstract class IQueryEngineEvent
          * @return void
          *
          */
-        public abstract void OnQueryEngineEvent(int cqid, DataReader result);
+        public abstract void onQueryEngineEvent(int cqid, DataReader result);
 }
\ No newline at end of file

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IReportReceiver.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IReportReceiver.java
index f16a7d1..090f823 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IReportReceiver.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IReportReceiver.java
@@ -47,5 +47,5 @@ public abstract class IReportReceiver
          * @return void
          * 
          */
-        public abstract void OnMessageReceived(String tag, String msg);
+        public abstract void onMessageReceived(String tag, String msg);
 }
\ No newline at end of file

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java
index 501dfdf..c276f83 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java
@@ -50,9 +50,9 @@ public class ModelData
          * @return int - the affected DataId
          * 
          */
-        public int GetDataId()
+        public int getDataId()
         {
-            return CoreController.getInstance().GetDataId(pIModelDataInstance);
+            return CoreController.getInstance().getDataId(pIModelDataInstance);
         }
 
         /**
@@ -62,9 +62,9 @@ public class ModelData
          * @return int - number of properties
          * 
          */
-        public int GetPropertyCount()
+        public int getPropertyCount()
         {
-            return CoreController.getInstance().GetPropertyCount(
+            return CoreController.getInstance().getPropertyCount(
                        pIModelDataInstance);
         }
 
@@ -77,9 +77,9 @@ public class ModelData
          * @return String - property name
          * 
          */
-        public String GetPropertyName(int propertyIndex)
+        public String getPropertyName(int propertyIndex)
         {
-            return CoreController.getInstance().GetPropertyName(
+            return CoreController.getInstance().getPropertyName(
                        pIModelDataInstance, propertyIndex);
         }
 
@@ -92,9 +92,9 @@ public class ModelData
          * @return String - property value
          * 
          */
-        public String GetPropertyValue(int propertyIndex)
+        public String getPropertyValue(int propertyIndex)
         {
-            return CoreController.getInstance().GetPropertyValue(
+            return CoreController.getInstance().getPropertyValue(
                        pIModelDataInstance, propertyIndex);
         }
 }
\ No newline at end of file

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/QueryEngine.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/QueryEngine.java
index 0c48844..348e51d 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/QueryEngine.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/QueryEngine.java
@@ -50,7 +50,7 @@ public class QueryEngine
          * @return int - Instance of the query engine object, set on object's creation
          * 
          */
-        public int GetQueryEngineInstance()
+        public int getQueryEngineInstance()
         {
             return pQueryEngineInstance;
         }
@@ -65,9 +65,9 @@ public class QueryEngine
          * @return int - ID of context query executed
          * 
          */
-        public int ExecuteContextQuery(String contextQuery) throws Exception
+        public int executeContextQuery(String contextQuery) throws Exception
         {
-            return CoreController.getInstance().ExecuteContextQuery(
+            return CoreController.getInstance().executeContextQuery(
                 pQueryEngineInstance, contextQuery);
         }
 
@@ -80,9 +80,9 @@ public class QueryEngine
          * @return void
          * 
          */
-        public void RegisterQueryEvent(IQueryEngineEvent queryEngineEvent)
+        public void registerQueryEvent(IQueryEngineEvent queryEngineEvent)
         {
-            CoreController.getInstance().RegisterQueryEvent(pQueryEngineInstance,
+            CoreController.getInstance().registerQueryEvent(pQueryEngineInstance,
                     queryEngineEvent);
         }
 
@@ -95,9 +95,9 @@ public class QueryEngine
          * @return void
          * 
          */
-        public void KillContextQuery(int cqid) throws Exception
+        public void killContextQuery(int cqid) throws Exception
         {
-            CoreController.getInstance().KillContextQuery(pQueryEngineInstance,
+            CoreController.getInstance().killContextQuery(pQueryEngineInstance,
             cqid);
         }
 }
\ No newline at end of file

diff --git a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/SSMInterface.java b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/SSMInterface.java
index 4e09faa..93f1d45 100644 (file)
--- a/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/SSMInterface.java
+++ b/service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/SSMInterface.java
@@ -73,11 +73,11 @@ public class SSMInterface
                  * @return void
                  *
                  */
-                public void OnQueryEngineEvent(int cqid, DataReader result)
+                public void onQueryEngineEvent(int cqid, DataReader result)
                 {
                     mMtxListener.lock();
 
-                    mMapListener.get(cqid).OnQueryEngineEvent(cqid, result);
+                    mMapListener.get(cqid).onQueryEngineEvent(cqid, result);
 
                     mMtxListener.unlock();
                 }
@@ -160,12 +160,12 @@ public class SSMInterface
         public void startSSMCore(String initConfig) throws Exception
         {
             mSSMCore = CoreController.getInstance();
-            mSSMCore.InitializeSSMCore(initConfig);
-            mSSMCore.StartSSMCore();
+            mSSMCore.initializeSSMCore(initConfig);
+            mSSMCore.startSSMCore();
 
-            mQueryEngine = mSSMCore.CreateQueryEngine();
+            mQueryEngine = mSSMCore.createQueryEngine();
 
-            mQueryEngine.RegisterQueryEvent(mQueryEngineEventListenerReceiver);
+            mQueryEngine.registerQueryEvent(mQueryEngineEventListenerReceiver);
         }
 
         /**
@@ -176,12 +176,12 @@ public class SSMInterface
          */
         public void stopSSMCore() throws Exception
         {
-            mQueryEngine.RegisterQueryEvent(null);
-            mSSMCore.ReleaseQueryEngine(mQueryEngine);
+            mQueryEngine.registerQueryEvent(null);
+            mSSMCore.releaseQueryEngine(mQueryEngine);
             mQueryEngineEventListenerReceiver = null;
             mQueryEngine = null;
-            mSSMCore.StopSSMCore();
-            mSSMCore.TerminateSSMCore();
+            mSSMCore.stopSSMCore();
+            mSSMCore.terminateSSMCore();
         }
 
         /**
@@ -206,7 +206,7 @@ public class SSMInterface
 
             try {
                 mQueryEngineEventListenerReceiver.lockListener();
-                cqid = mQueryEngine.ExecuteContextQuery(contextQuery);
+                cqid = mQueryEngine.executeContextQuery(contextQuery);
                 mQueryEngineEventListenerReceiver.addListener(cqid, listener);
                 mRunningCQLs.add(cqid);
             }
@@ -235,7 +235,7 @@ public class SSMInterface
         {
             try {
                 mQueryEngineEventListenerReceiver.lockListener();
-                mQueryEngine.KillContextQuery(cqid);
+                mQueryEngine.killContextQuery(cqid);
                 mQueryEngineEventListenerReceiver.removeListener(cqid);
                 mRunningCQLs.remove((Object) cqid);
             }

diff --git a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp
index a8351c5..05e73b4 100644 (file)
--- a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp
+++ b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.cpp
@@ -53,7 +53,7 @@ void ReportMessage(const char *tag, const char *msg)
     ATTACH_CURRENT_THREAD(g_JVM, env);
 
     jmethodID midReportReceiver =
-        env->GetMethodID(g_ClassReportReceiver, "OnMessageReceived",
+        env->GetMethodID(g_ClassReportReceiver, "onMessageReceived",
                          "(Ljava/lang/String;Ljava/lang/String;)V");
 
     env->CallVoidMethod(g_objReportReceiver, midReportReceiver,
@@ -86,7 +86,7 @@ class QueryEngineEventReceiver
             }
         }
 
-        void SetQueryEngineEventObj(jobject objQueryEngineEvent)
+        void setQueryEngineEventObj(jobject objQueryEngineEvent)
         {
             if (m_objQueryEngineEvent != NULL)
             {
@@ -106,7 +106,7 @@ class QueryEngineEventReceiver
             ATTACH_CURRENT_THREAD(g_JVM, env);
 
             jmethodID midQueryEngineEvent =
-                env->GetMethodID(g_ClassQueryEngineEvent, "OnQueryEngineEvent",
+                env->GetMethodID(g_ClassQueryEngineEvent, "onQueryEngineEvent",
                                  "(ILorg/iotivity/service/ssm/DataReader;)V");
 
             jmethodID cid_DataReader = env->GetMethodID(g_ClassDataReader, "<init>", "(I)V");
@@ -187,7 +187,7 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *reserved)
         delete g_QueryEngineEventReceiver;
 }
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_InitializeSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_initializeSSMCore
 (JNIEnv *env, jclass clz, jstring jstrXmlDescription)
 {
     SSMRESULT res = SSM_E_FAIL;
@@ -201,28 +201,28 @@ JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_InitializeSS
         env->ThrowNew(env->FindClass("java/lang/IllegalArgumentException"), "InitializeSSMCore failed");
 }
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_StartSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_startSSMCore
 (JNIEnv *env, jclass clz)
 {
     if (StartSSMCore() != SSM_S_OK)
         env->ThrowNew(env->FindClass("java/lang/IllegalArgumentException"), "StartSSMCore failed");
 }
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_StopSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_stopSSMCore
 (JNIEnv *env, jclass clz)
 {
     if (StopSSMCore() != SSM_S_OK)
         env->ThrowNew(env->FindClass("java/lang/IllegalArgumentException"), "StopSSMCore failed");
 }
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_TerminateSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_terminateSSMCore
 (JNIEnv *env, jclass clz)
 {
     if (TerminateSSMCore() != SSM_S_OK)
         env->ThrowNew(env->FindClass("java/lang/IllegalArgumentException"), "TerminateSSMCore failed");
 }
 
-JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_CreateQueryEngine
+JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_createQueryEngine
 (JNIEnv *env, jclass clz)
 {
     IQueryEngine        *pQueryEngine = NULL;
@@ -241,7 +241,7 @@ JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_CreateQue
     return env->NewObject(g_ClassQueryEngine, cid_QueryEngine, (jint)pQueryEngine);
 }
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_ReleaseQueryEngine
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_releaseQueryEngine
 (JNIEnv *env, jclass clz, jobject queryEngine)
 {
     IQueryEngine        *pQueryEngine = NULL;
@@ -257,7 +257,7 @@ JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_ReleaseQuery
     return ReleaseQueryEngine(pQueryEngine);
 }
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_ExecuteContextQuery
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_executeContextQuery
 (JNIEnv *env, jclass clz, jint pQueryEngineInstance, jstring jstrContextQuery)
 {
     int                 cqid = 0;
@@ -274,7 +274,7 @@ JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_ExecuteConte
     return cqid;
 }
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_RegisterQueryEvent
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_registerQueryEvent
 (JNIEnv *env, jclass clz, jint pQueryEngineInstance, jobject queryEngineEvent)
 {
     IQueryEngine        *pQueryEngine = (IQueryEngine *)pQueryEngineInstance;
@@ -285,11 +285,11 @@ JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_RegisterQuer
         return;
     }
 
-    g_QueryEngineEventReceiver->SetQueryEngineEventObj(env->NewGlobalRef(queryEngineEvent));
+    g_QueryEngineEventReceiver->setQueryEngineEventObj(env->NewGlobalRef(queryEngineEvent));
     pQueryEngine->registerQueryEvent(g_QueryEngineEventReceiver);
 }
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_KillContextQuery
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_killContextQuery
 (JNIEnv *env, jclass clz, jint pQueryEngineInstance, jint cqid)
 {
     IQueryEngine        *pQueryEngine = (IQueryEngine *)pQueryEngineInstance;
@@ -300,7 +300,7 @@ JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_KillContextQ
     }
 }
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetDataId
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_getDataId
 (JNIEnv *env, jclass clz, jint pDataReaderInstance)
 {
     IModelData *pDataReader = (IModelData *)pDataReaderInstance;
@@ -308,7 +308,7 @@ JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetDataId
     return pDataReader->getDataId();
 }
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetPropertyCount
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_getPropertyCount
 (JNIEnv *env, jclass clz, jint pIModelDataInstance )
 {
     IModelData *pModelData = (IModelData *)pIModelDataInstance;
@@ -316,7 +316,7 @@ JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetPropertyC
     return pModelData->getPropertyCount();
 }
 
-JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_GetPropertyName
+JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_getPropertyName
 (JNIEnv *env, jclass clz, jint pIModelDataInstance, jint propertyIndex )
 {
     IModelData *pModelData = (IModelData *)pIModelDataInstance;
@@ -324,7 +324,7 @@ JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_GetProper
     return env->NewStringUTF(pModelData->getPropertyName(propertyIndex).c_str());
 }
 
-JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_GetPropertyValue
+JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_getPropertyValue
 (JNIEnv *env, jclass clz, jint pIModelDataInstance, jint propertyIndex )
 {
     IModelData *pModelData = (IModelData *)pIModelDataInstance;
@@ -332,7 +332,7 @@ JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_GetProper
     return env->NewStringUTF(pModelData->getPropertyValue(propertyIndex).c_str());
 }
 
-JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_GetAffectedModels
+JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_getAffectedModels
 (JNIEnv *env, jclass clz, jint pDataReaderInstance)
 {
     IDataReader *pDataReader = (IDataReader *)pDataReaderInstance;
@@ -357,7 +357,7 @@ JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_GetAffect
     return objAffectedModels;
 }
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetModelDataCount
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_getModelDataCount
 (JNIEnv *env, jclass clz, jint pDataReaderInstance, jstring jstrModelName)
 {
     IDataReader *pDataReader = (IDataReader *)pDataReaderInstance;
@@ -374,7 +374,7 @@ JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetModelData
     return modelCount;
 }
 //return IModelData
-JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_GetModelData
+JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_getModelData
 (JNIEnv *env, jclass clz, jint pDataReaderInstance, jstring jstrModelName, jint jintDataIndex )
 {
     IDataReader *pDataReader = (IDataReader *)pDataReaderInstance;
@@ -395,7 +395,7 @@ JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_GetModelD
     return env->NewObject(g_ClassModelData, cid_ModelData, (jint)pModelData);
 }
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_RegisterReportReceiver
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_registerReportReceiver
 (JNIEnv *env, jclass clz, jobject reportReceiver)
 {
     if (g_objReportReceiver != NULL)

diff --git a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.h b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.h
index 38f51c3..d950bce 100644 (file)
--- a/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.h
+++ b/service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore_JNI.h
@@ -26,58 +26,55 @@
 extern "C" {
 #endif
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_InitializeSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_initializeSSMCore
 (JNIEnv *env, jclass clz, jstring jstrXmlDescription);
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_StartSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_startSSMCore
 (JNIEnv *env, jclass clz);
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_StopSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_stopSSMCore
 (JNIEnv *env, jclass clz);
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_TerminateSSMCore
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_terminateSSMCore
 (JNIEnv *env, jclass clz);
 
-JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_CreateQueryEngine
+JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_createQueryEngine
 (JNIEnv *env, jclass clz);
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_ReleaseQueryEngine
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_releaseQueryEngine
 (JNIEnv *env, jclass clz, jobject queryEngine);
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_ExecuteContextQuery
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_executeContextQuery
 (JNIEnv *env, jclass clz, jint pQueryEngineInstance, jstring jstrContextQuery);
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_RegisterQueryEvent
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_registerQueryEvent
 (JNIEnv *env, jclass clz, jint pQueryEngineInstance, jobject queryEngineEvent);
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_KillContextQuery
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_killContextQuery
 (JNIEnv *env, jclass clz, jint pQueryEngineInstance, jint cqid);
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_Release
-(JNIEnv *env, jclass clz, jint pQueryEngineInstance);
-
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetDataId
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_getDataId
 (JNIEnv *env, jclass clz, jint pDataReaderInstance);
 
-JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_GetAffectedModels
+JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_getAffectedModels
 (JNIEnv *env, jclass clz, jint pDataReaderInstance);
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetModelDataCount
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_getModelDataCount
 (JNIEnv *env, jclass clz, jint pDataReaderInstance, jstring jstrModelName);
 
-JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_GetModelData
+JNIEXPORT jobject JNICALL Java_org_iotivity_service_ssm_CoreController_getModelData
 (JNIEnv *env, jclass clz, jint pDataReaderInstance, jstring jstrModelName, jint jintDataIndex );
 
-JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_GetPropertyCount
+JNIEXPORT jint JNICALL Java_org_iotivity_service_ssm_CoreController_getPropertyCount
 (JNIEnv *env, jclass clz, jint pIModelDataInstance );
 
-JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_GetPropertyName
+JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_getPropertyName
 (JNIEnv *env, jclass clz, jint pIModelDataInstance, jint propertyIndex );
 
-JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_GetPropertyValue
+JNIEXPORT jstring JNICALL Java_org_iotivity_service_ssm_CoreController_getPropertyValue
 (JNIEnv *env, jclass clz, jint pIModelDataInstance, jint propertyIndex );
 
-JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_RegisterReportReceiver
+JNIEXPORT void JNICALL Java_org_iotivity_service_ssm_CoreController_registerReportReceiver
 (JNIEnv *env, jclass clz, jobject reportReceiver );
 
 #ifdef __cplusplus

diff --git a/service/soft-sensor-manager/SampleApp/android/SSMTesterApp/src/org/iotivity/service/ssm/sample/MainActivity.java b/service/soft-sensor-manager/SampleApp/android/SSMTesterApp/src/org/iotivity/service/ssm/sample/MainActivity.java
index 11d4801..9e01311 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/android/SSMTesterApp/src/org/iotivity/service/ssm/sample/MainActivity.java
+++ b/service/soft-sensor-manager/SampleApp/android/SSMTesterApp/src/org/iotivity/service/ssm/sample/MainActivity.java
@@ -36,22 +36,22 @@ public class MainActivity extends Activity {
 
        private IQueryEngineEvent mQueryEngineEventListener = new IQueryEngineEvent() {
                @Override
-               public void OnQueryEngineEvent(int cqid, DataReader result) {
+               public void onQueryEngineEvent(int cqid, DataReader result) {
                        Log.i("[SSM]", "event received! cqid=" + cqid);
                        PrintLog("Event from cqid " + cqid + " has received");
 
-                       List<String> models = result.GetAffectedModels();
+                       List<String> models = result.getAffectedModels();
 
                        for (String modelName : models) {
                                PrintLog("Model: " + modelName);
                                try {
-                                       int dataCount = result.GetModelDataCount(modelName);
+                                       int dataCount = result.getModelDataCount(modelName);
                                        for (int i = 0; i < dataCount; i++) {
-                                               ModelData modelData = result.GetModelData(modelName, i);
-                                               for (int j = 0; j < modelData.GetPropertyCount(); j++) {
-                                                       PrintLog("Name: " + modelData.GetPropertyName(j)
+                                               ModelData modelData = result.getModelData(modelName, i);
+                                               for (int j = 0; j < modelData.getPropertyCount(); j++) {
+                                                       PrintLog("Name: " + modelData.getPropertyName(j)
                                                                        + " Value: "
-                                                                       + modelData.GetPropertyValue(j));
+                                                                       + modelData.getPropertyValue(j));
                                                }
                                        }
                                } catch (Exception e) {