******************************************************************/
#include "simulator_resource_model_jni.h"
+#include "simulator_resource_attribute_jni.h"
#include "simulator_exceptions_jni.h"
#include "simulator_utils_jni.h"
#include "jni_sharedobject_holder.h"
#include "simulator_single_resource.h"
-#define VALIDATE_OBJECT(ENV, OBJECT) if (!OBJECT){throwBadObjectException(ENV, "No corresponsing native object!"); return;}
-#define VALIDATE_OBJECT_RET(ENV, OBJECT, RET) if (!OBJECT){throwBadObjectException(ENV, "No corresponsing native object!"); return RET;}
+#define VALIDATE_OBJECT(ENV, OBJECT) if (!OBJECT){ThrowBadObjectException(ENV, "No corresponsing native object!"); return;}
+#define VALIDATE_OBJECT_RET(ENV, OBJECT, RET) if (!OBJECT){ThrowBadObjectException(ENV, "No corresponsing native object!"); return RET;}
-SimulatorSingleResourceSP simulatorSingleResourceToCpp(JNIEnv *env, jobject object)
+static SimulatorSingleResourceSP simulatorSingleResourceToCpp(JNIEnv *env, jobject object)
{
JniSharedObjectHolder<SimulatorSingleResource> *jniResource =
- GetHandle<JniSharedObjectHolder<SimulatorSingleResource>>(env, object);
+ getHandle<JniSharedObjectHolder<SimulatorSingleResource>>(env, object);
if (jniResource)
return jniResource->get();
return nullptr;
}
-static void onResourceModelChange(jobject listener, const std::string &uri,
- SimulatorResourceModel &resModel)
+static AutoUpdateType autoUpdateTypeToCpp(JNIEnv *env, jobject jType)
{
- JNIEnv *env = getEnv();
- if (!env)
- return;
+ static jmethodID ordinalMID = env->GetMethodID(
+ gSimulatorClassRefs.autoUpdateTypeCls, "ordinal", "()I");
- jclass listenerCls = env->GetObjectClass(listener);
- jmethodID listenerMethod = env->GetMethodID(listenerCls, "onResourceModelChanged",
- "(Ljava/lang/String;Lorg/oic/simulator/SimulatorResourceModel;)V");
-
- jobject jResModel = simulatorResourceModelToJava(env, resModel);
- jstring jUri = env->NewStringUTF(uri.c_str());
- env->CallVoidMethod(listenerCls, listenerMethod, jUri, jResModel);
- releaseEnv();
+ int ordinal = env->CallIntMethod(jType, ordinalMID);
+ return AutoUpdateType(ordinal);
}
static void onAutoUpdationComplete(jobject listener, const std::string &uri, const int id)
{
- JNIEnv *env = getEnv();
+ JNIEnv *env = GetEnv();
if (!env)
return;
jstring jUri = env->NewStringUTF(uri.c_str());
env->CallVoidMethod(listener, listenerMethod, jUri, id);
- releaseEnv();
+ ReleaseEnv();
}
#ifdef __cplusplus
#endif
JNIEXPORT jobject JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_getResourceModel
-(JNIEnv *env, jobject object)
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeGetAttribute
+(JNIEnv *env, jobject object, jstring jAttrName)
{
+ VALIDATE_INPUT_RET(env, !jAttrName, "Attribute name is null!", nullptr)
+
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
VALIDATE_OBJECT_RET(env, singleResource, nullptr)
- SimulatorResourceModel resModel = singleResource->getResourceModel();
- return simulatorResourceModelToJava(env, resModel);
+ JniString jniAttrName(env, jAttrName);
+ SimulatorResourceAttribute attribute;
+ if (singleResource->getAttribute(jniAttrName.get(), attribute))
+ return SimulatorResourceAttributeToJava(env, attribute);
+ return nullptr;
}
JNIEXPORT jobject JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_getAttribute
-(JNIEnv *env, jobject object, jstring attrName)
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeGetAttributes
+(JNIEnv *env, jobject object)
{
- VALIDATE_INPUT_RET(env, !attrName, "Attribute name is null!", nullptr)
-
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
VALIDATE_OBJECT_RET(env, singleResource, nullptr)
- JniString jniAttrName(env, attrName);
- SimulatorResourceModel::Attribute attribute;
- if (singleResource->getAttribute(jniAttrName.get(), attribute))
- return simulatorResourceAttributeToJava(env, attribute);
- return nullptr;
+ return SimulatorResourceAttributesToJava(env, singleResource->getAttributes());
}
-JNIEXPORT void JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_addAttribute
-(JNIEnv *env, jobject object, jobject resAttribute)
+JNIEXPORT jboolean JNICALL
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeAddAttribute
+(JNIEnv *env, jobject object, jobject jResAttribute)
{
- VALIDATE_INPUT(env, !resAttribute, "Resource attribute is null!")
+ VALIDATE_INPUT_RET(env, !jResAttribute, "Resource attribute is null!", false)
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
- VALIDATE_OBJECT(env, singleResource)
+ VALIDATE_OBJECT_RET(env, singleResource, false)
try
{
- SimulatorResourceModel::Attribute attribute;
- if (!simulatorResourceAttributeToCpp(env, resAttribute, attribute))
+ SimulatorResourceAttribute attribute;
+ if (!SimulatorResourceAttributeToCpp(env, jResAttribute, attribute))
{
- throwSimulatorException(env, SIMULATOR_ERROR,
+ ThrowSimulatorException(env, SIMULATOR_ERROR,
"Failed to covnert SimulatorResourceAttribute java object!");
- return;
+ return false;
}
-
- singleResource->addAttribute(attribute);
+ return singleResource->addAttribute(attribute);
}
catch (SimulatorException &e)
{
- throwSimulatorException(env, e.code(), e.what());
+ ThrowSimulatorException(env, e.code(), e.what());
}
+
+ return false;
}
-JNIEXPORT void JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_updateAttribute
-(JNIEnv *env, jobject object, jstring attrName, jobject attrValue)
+JNIEXPORT jboolean JNICALL
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeUpdateAttribute
+(JNIEnv *env, jobject object, jstring jAttrName, jobject jAttrValue)
{
- VALIDATE_INPUT(env, !attrName, "Attribute name is null!")
- VALIDATE_INPUT(env, !attrValue, "Attribute value is null!")
+ VALIDATE_INPUT_RET(env, !jAttrName, "Attribute name is null!", false)
+ VALIDATE_INPUT_RET(env, !jAttrValue, "Attribute value is null!", false)
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
- VALIDATE_OBJECT(env, singleResource)
+ VALIDATE_OBJECT_RET(env, singleResource, false)
- SimulatorResourceModel::ValueVariant value;
- if (!AttributeValueToCpp(env, attrValue, value))
+ AttributeValueVariant value;
+ if (!AttributeValueToCpp(env, jAttrValue, value))
{
- throwSimulatorException(env, SIMULATOR_ERROR,
+ ThrowSimulatorException(env, SIMULATOR_ERROR,
"Failed to covnert AttributeValue java object!");
- return;
+ return false;
}
- SimulatorResourceModel::Attribute attribute(JniString(env, attrName).get());
+ SimulatorResourceAttribute attribute(JniString(env, jAttrName).get());
attribute.setValue(value);
- singleResource->updateAttributeValue(attribute);
+ return singleResource->updateAttributeValue(attribute);
}
-JNIEXPORT void JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_removeAttribute
-(JNIEnv *env, jobject object, jstring attrName)
+JNIEXPORT jboolean JNICALL
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeRemoveAttribute
+(JNIEnv *env, jobject object, jstring jAttrName)
{
- VALIDATE_INPUT(env, !attrName, "Attribute name is null!")
+ VALIDATE_INPUT_RET(env, !jAttrName, "Attribute name is null!", false)
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
- VALIDATE_OBJECT(env, singleResource)
+ VALIDATE_OBJECT_RET(env, singleResource, false)
try
{
- JniString jniAttrName(env, attrName);
- singleResource->removeAttribute(jniAttrName.get());
+ JniString jniAttrName(env, jAttrName);
+ return singleResource->removeAttribute(jniAttrName.get());
}
catch (InvalidArgsException &e)
{
- throwInvalidArgsException(env, e.code(), e.what());
+ ThrowInvalidArgsException(env, e.code(), e.what());
}
+
+ return false;
}
JNIEXPORT jint JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_startResourceUpdation
-(JNIEnv *env, jobject object, jint type, jint interval, jobject listener)
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeStartResourceUpdation
+(JNIEnv *env, jobject object, jobject jType, jint jInterval, jobject jListener)
{
- VALIDATE_CALLBACK_RET(env, listener, -1)
+ VALIDATE_CALLBACK_RET(env, jListener, -1)
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
VALIDATE_OBJECT_RET(env, singleResource, -1)
- jobject listenerRef = env->NewGlobalRef(listener);
- updateCompleteCallback callback = [listenerRef](const std::string & uri, const int id)
+ jobject listenerRef = env->NewGlobalRef(jListener);
+ SimulatorSingleResource::AutoUpdateCompleteCallback callback = [listenerRef](
+ const std::string & uri, const int id)
{
onAutoUpdationComplete(listenerRef, uri, id);
};
try
{
- int id = singleResource->startResourceUpdation((1 == type) ? AutomationType::RECURRENT :
- AutomationType::NORMAL, interval, callback);
- return id;
+ AutoUpdateType autoUpdateType = autoUpdateTypeToCpp(env, jType);
+ return singleResource->startResourceUpdation(autoUpdateType, jInterval, callback);
}
catch (InvalidArgsException &e)
{
- throwInvalidArgsException(env, e.code(), e.what());
+ ThrowInvalidArgsException(env, e.code(), e.what());
}
catch (SimulatorException &e)
{
- throwSimulatorException(env, e.code(), e.what());
+ ThrowSimulatorException(env, e.code(), e.what());
}
return -1;
}
JNIEXPORT jint JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_startAttributeUpdation
-(JNIEnv *env, jobject object, jstring attrName, jint type, jint interval, jobject listener)
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeStartAttributeUpdation
+(JNIEnv *env, jobject object, jstring jAttrName, jobject jType, jint jInterval, jobject jListener)
{
- VALIDATE_INPUT_RET(env, !attrName, "Attribute name is null!", -1)
- VALIDATE_CALLBACK_RET(env, listener, -1)
+ VALIDATE_INPUT_RET(env, !jAttrName, "Attribute name is null!", -1)
+ VALIDATE_CALLBACK_RET(env, jListener, -1)
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
VALIDATE_OBJECT_RET(env, singleResource, -1)
- jobject listenerRef = env->NewGlobalRef(listener);
- updateCompleteCallback callback = [listenerRef](const std::string & uri, const int id)
+ jobject listenerRef = env->NewGlobalRef(jListener);
+ SimulatorSingleResource::AutoUpdateCompleteCallback callback =
+ [listenerRef](const std::string & uri, const int id)
{
onAutoUpdationComplete(listenerRef, uri, id);
};
- JniString jniAttrName(env, attrName);
-
try
{
- int id = singleResource->startAttributeUpdation(jniAttrName.get(),
- (1 == type) ? AutomationType::RECURRENT : AutomationType::NORMAL,
- interval, callback);
- return id;
+ JniString jniAttrName(env, jAttrName);
+ AutoUpdateType autoUpdateType = autoUpdateTypeToCpp(env, jType);
+ return singleResource->startAttributeUpdation(jniAttrName.get(), autoUpdateType,
+ jInterval, callback);
}
catch (InvalidArgsException &e)
{
- throwInvalidArgsException(env, e.code(), e.what());
+ ThrowInvalidArgsException(env, e.code(), e.what());
}
catch (SimulatorException &e)
{
- throwSimulatorException(env, e.code(), e.what());
+ ThrowSimulatorException(env, e.code(), e.what());
}
return -1;
}
JNIEXPORT void JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_stopUpdation
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeStopUpdation
(JNIEnv *env, jobject object, jint id)
{
SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
}
JNIEXPORT void JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_setModelChangeListener
-(JNIEnv *env, jobject object, jobject listener)
-{
- VALIDATE_CALLBACK(env, listener)
-
- SimulatorSingleResourceSP singleResource = simulatorSingleResourceToCpp(env, object);
- VALIDATE_OBJECT(env, singleResource)
-
- SimulatorResource::ResourceModelChangedCallback callback = std::bind(
- [](const std::string & uri, SimulatorResourceModel & resModel,
- const std::shared_ptr<JniListenerHolder> &listenerRef)
- {
- onResourceModelChange(listenerRef->get(), uri, resModel);
- }, std::placeholders::_1, std::placeholders::_2, JniListenerHolder::create(env, listener));
-
- try
- {
- singleResource->setModelChangeCallback(callback);
- }
- catch (InvalidArgsException &e)
- {
- throwInvalidArgsException(env, e.code(), e.what());
- }
-}
-
-JNIEXPORT void JNICALL
-Java_org_oic_simulator_server_SimulatorSingleResource_dispose
+Java_org_oic_simulator_server_SimulatorSingleResource_nativeDispose
(JNIEnv *env, jobject object)
{
JniSharedObjectHolder<SimulatorSingleResource> *resource =
- GetHandle<JniSharedObjectHolder<SimulatorSingleResource>>(env, object);
+ getHandle<JniSharedObjectHolder<SimulatorSingleResource>>(env, object);
delete resource;
}
projects / platform / upstream / iotivity.git / blobdiff