This is an automated email from the ASF dual-hosted git repository. bbannier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit b6d7abbb36d4de7bb4a407128a1cbe21d099f056 Author: Benjamin Bannier <[email protected]> AuthorDate: Sat Mar 2 21:25:12 2019 +0100 Fixed cpplint issues in the Java bindings. Review: https://reviews.apache.org/r/70095 --- src/java/jni/construct.cpp | 9 +- src/java/jni/convert.cpp | 3 +- src/java/jni/org_apache_mesos_Log.cpp | 8 +- .../jni/org_apache_mesos_MesosExecutorDriver.cpp | 76 ++++--- .../jni/org_apache_mesos_MesosSchedulerDriver.cpp | 167 ++++++++------ .../jni/org_apache_mesos_state_AbstractState.cpp | 240 ++++++++++++--------- .../jni/org_apache_mesos_state_LevelDBState.cpp | 4 +- .../jni/org_apache_mesos_state_ZooKeeperState.cpp | 38 ++-- .../jni/org_apache_mesos_v1_scheduler_V0Mesos.cpp | 4 +- support/mesos-style.py | 2 - 10 files changed, 331 insertions(+), 220 deletions(-) diff --git a/src/java/jni/construct.cpp b/src/java/jni/construct.cpp index 2645d9e..8d8f76e 100644 --- a/src/java/jni/construct.cpp +++ b/src/java/jni/construct.cpp @@ -84,7 +84,8 @@ map<string, string> construct(JNIEnv *env, jobject jobj) clazz = env->GetObjectClass(jentrySet); // Iterator iterator = entrySet.iterator(); - jmethodID iterator = env->GetMethodID(clazz, "iterator", "()Ljava/util/Iterator;"); + jmethodID iterator = + env->GetMethodID(clazz, "iterator", "()Ljava/util/Iterator;"); jobject jiterator = env->CallObjectMethod(jentrySet, iterator); clazz = env->GetObjectClass(jiterator); @@ -101,11 +102,13 @@ map<string, string> construct(JNIEnv *env, jobject jobj) clazz = env->GetObjectClass(jentry); // String key = entry.getKey(); - jmethodID getKey = env->GetMethodID(clazz, "getKey", "()Ljava/lang/Object;"); + jmethodID getKey = + env->GetMethodID(clazz, "getKey", "()Ljava/lang/Object;"); jobject jkey = env->CallObjectMethod(jentry, getKey); // String value = entry.getValue(); - jmethodID getValue = env->GetMethodID(clazz, "getValue", "()Ljava/lang/Object;"); + jmethodID getValue = + env->GetMethodID(clazz, "getValue", "()Ljava/lang/Object;"); jobject jvalue = env->CallObjectMethod(jentry, getValue); const string& key = construct<string>(env, jkey); diff --git a/src/java/jni/convert.cpp b/src/java/jni/convert.cpp index 338eb96..e0bbee6 100644 --- a/src/java/jni/convert.cpp +++ b/src/java/jni/convert.cpp @@ -52,7 +52,8 @@ using std::string; // http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob;f=core/jni/AndroidRuntime.cpp;h=f61e2476c71191aa6eabc93bcb26b3c15ccf6136;hb=HEAD namespace { -jweak mesosClassLoader = nullptr; // Initialized in JNI_OnLoad later in this file. +// Initialized in JNI_OnLoad later in this file. +jweak mesosClassLoader = nullptr; jclass FindMesosClass(JNIEnv* env, const char* className) { diff --git a/src/java/jni/org_apache_mesos_Log.cpp b/src/java/jni/org_apache_mesos_Log.cpp index 1ffbacf..9737393 100644 --- a/src/java/jni/org_apache_mesos_Log.cpp +++ b/src/java/jni/org_apache_mesos_Log.cpp @@ -532,7 +532,7 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_Log_00024Writer_finalize * Method: initialize * Signature: (ILjava/lang/String;Ljava/util/Set;)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_2Ljava_util_Set_2 +JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_2Ljava_util_Set_2 // NOLINT(whitespace/line_length) (JNIEnv* env, jobject thiz, jint jquorum, @@ -584,7 +584,7 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_ * Method: initialize * Signature: (ILjava/lang/String;Ljava/lang/String;JLjava/util/concurrent/TimeUnit;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_2Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2 +JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_2Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2 // NOLINT(whitespace/line_length) (JNIEnv* env, jobject thiz, jint jquorum, @@ -611,7 +611,7 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_ std::string znode = construct<std::string>(env, jznode); - // Create the C++ Log and initialize the __log variable. + // Create the C++ Log and initialize the __log variable. Log* log = new Log(quorum, path, servers, seconds, znode); clazz = env->GetObjectClass(thiz); @@ -626,7 +626,7 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_ * Method: initialize * Signature: (ILjava/lang/String;Ljava/lang/String;JLjava/util/concurrent/TimeUnit;Ljava/lang/String;Ljava/lang/String;[B)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_2Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2Ljava_lang_String_2_3B +JNIEXPORT void JNICALL Java_org_apache_mesos_Log_initialize__ILjava_lang_String_2Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2Ljava_lang_String_2_3B // NOLINT(whitespace/line_length) (JNIEnv* env, jobject thiz, jint jquorum, diff --git a/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp b/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp index 9d1d456..f16b3da 100644 --- a/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp +++ b/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp @@ -44,7 +44,8 @@ public: const ExecutorInfo& executorInfo, const FrameworkInfo& frameworkInfo, const SlaveInfo& slaveInfo) override; - void reregistered(ExecutorDriver* driver, const SlaveInfo& slaveInfo) override; + void reregistered( + ExecutorDriver* driver, const SlaveInfo& slaveInfo) override; void disconnected(ExecutorDriver* driver) override; void launchTask(ExecutorDriver* driver, const TaskInfo& task) override; void killTask(ExecutorDriver* driver, const TaskID& taskId) override; @@ -67,7 +68,8 @@ void JNIExecutor::registered(ExecutorDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); @@ -108,7 +110,8 @@ void JNIExecutor::reregistered(ExecutorDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); @@ -143,7 +146,8 @@ void JNIExecutor::disconnected(ExecutorDriver* driver) jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); @@ -175,16 +179,18 @@ void JNIExecutor::launchTask(ExecutorDriver* driver, const TaskInfo& desc) jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); // executor.launchTask(driver, desc); - jmethodID launchTask = - env->GetMethodID(clazz, "launchTask", - "(Lorg/apache/mesos/ExecutorDriver;" - "Lorg/apache/mesos/Protos$TaskInfo;)V"); + jmethodID launchTask = env->GetMethodID( + clazz, + "launchTask", + "(Lorg/apache/mesos/ExecutorDriver;" + "Lorg/apache/mesos/Protos$TaskInfo;)V"); jobject jdesc = convert<TaskInfo>(env, desc); @@ -210,16 +216,18 @@ void JNIExecutor::killTask(ExecutorDriver* driver, const TaskID& taskId) jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); // executor.killTask(driver, taskId); - jmethodID killTask = - env->GetMethodID(clazz, "killTask", - "(Lorg/apache/mesos/ExecutorDriver;" - "Lorg/apache/mesos/Protos$TaskID;)V"); + jmethodID killTask = env->GetMethodID( + clazz, + "killTask", + "(Lorg/apache/mesos/ExecutorDriver;" + "Lorg/apache/mesos/Protos$TaskID;)V"); jobject jtaskId = convert<TaskID>(env, taskId); @@ -245,16 +253,18 @@ void JNIExecutor::frameworkMessage(ExecutorDriver* driver, const string& data) jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); // executor.frameworkMessage(driver, data); - jmethodID frameworkMessage = - env->GetMethodID(clazz, "frameworkMessage", - "(Lorg/apache/mesos/ExecutorDriver;" - "[B)V"); + jmethodID frameworkMessage = env->GetMethodID( + clazz, + "frameworkMessage", + "(Lorg/apache/mesos/ExecutorDriver;" + "[B)V"); // byte[] data = ..; jbyteArray jdata = env->NewByteArray(data.size()); @@ -282,15 +292,15 @@ void JNIExecutor::shutdown(ExecutorDriver* driver) jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); // executor.shutdown(driver); jmethodID shutdown = - env->GetMethodID(clazz, "shutdown", - "(Lorg/apache/mesos/ExecutorDriver;)V"); + env->GetMethodID(clazz, "shutdown", "(Lorg/apache/mesos/ExecutorDriver;)V"); env->ExceptionClear(); @@ -314,16 +324,18 @@ void JNIExecutor::error(ExecutorDriver* driver, const string& message) jclass clazz = env->GetObjectClass(jdriver); - jfieldID executor = env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); + jfieldID executor = + env->GetFieldID(clazz, "executor", "Lorg/apache/mesos/Executor;"); jobject jexecutor = env->GetObjectField(jdriver, executor); clazz = env->GetObjectClass(jexecutor); // executor.error(driver, message); - jmethodID error = - env->GetMethodID(clazz, "error", - "(Lorg/apache/mesos/ExecutorDriver;" - "Ljava/lang/String;)V"); + jmethodID error = env->GetMethodID( + clazz, + "error", + "(Lorg/apache/mesos/ExecutorDriver;" + "Ljava/lang/String;)V"); jobject jmessage = convert<string>(env, message); @@ -490,8 +502,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosExecutorDriver_join * Method: sendStatusUpdate * Signature: (Lorg/apache/mesos/Protos/TaskStatus;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosExecutorDriver_sendStatusUpdate - (JNIEnv* env, jobject thiz, jobject jstatus) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosExecutorDriver_sendStatusUpdate( + JNIEnv* env, jobject thiz, jobject jstatus) { // Construct a C++ TaskStatus from the Java TaskStatus. const TaskStatus& taskStatus = construct<TaskStatus>(env, jstatus); @@ -514,8 +527,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosExecutorDriver_sendStatusUp * Method: sendFrameworkMessage * Signature: ([B)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosExecutorDriver_sendFrameworkMessage - (JNIEnv* env, jobject thiz, jbyteArray jdata) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosExecutorDriver_sendFrameworkMessage( + JNIEnv* env, jobject thiz, jbyteArray jdata) { // Construct a C++ string from the Java byte array. jbyte* data = env->GetByteArrayElements(jdata, nullptr); diff --git a/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp b/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp index 762fe85..e042140 100644 --- a/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp +++ b/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp @@ -82,17 +82,19 @@ void JNIScheduler::registered(SchedulerDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); // sched.registered(driver, frameworkId, masterInfo); - jmethodID registered = - env->GetMethodID(clazz, "registered", - "(Lorg/apache/mesos/SchedulerDriver;" - "Lorg/apache/mesos/Protos$FrameworkID;" - "Lorg/apache/mesos/Protos$MasterInfo;)V"); + jmethodID registered = env->GetMethodID( + clazz, + "registered", + "(Lorg/apache/mesos/SchedulerDriver;" + "Lorg/apache/mesos/Protos$FrameworkID;" + "Lorg/apache/mesos/Protos$MasterInfo;)V"); jobject jframeworkId = convert<FrameworkID>(env, frameworkId); @@ -100,7 +102,8 @@ void JNIScheduler::registered(SchedulerDriver* driver, env->ExceptionClear(); - env->CallVoidMethod(jscheduler, registered, jdriver, jframeworkId, jmasterInfo); + env->CallVoidMethod( + jscheduler, registered, jdriver, jframeworkId, jmasterInfo); if (env->ExceptionCheck()) { env->ExceptionDescribe(); @@ -121,7 +124,8 @@ void JNIScheduler::reregistered(SchedulerDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); @@ -156,7 +160,8 @@ void JNIScheduler::disconnected(SchedulerDriver* driver) jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); @@ -189,16 +194,18 @@ void JNIScheduler::resourceOffers(SchedulerDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); // scheduler.resourceOffers(driver, offers); - jmethodID resourceOffers = - env->GetMethodID(clazz, "resourceOffers", - "(Lorg/apache/mesos/SchedulerDriver;" - "Ljava/util/List;)V"); + jmethodID resourceOffers = env->GetMethodID( + clazz, + "resourceOffers", + "(Lorg/apache/mesos/SchedulerDriver;" + "Ljava/util/List;)V"); // List offers = new ArrayList(); clazz = env->FindClass("java/util/ArrayList"); @@ -237,16 +244,18 @@ void JNIScheduler::offerRescinded(SchedulerDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); // scheduler.offerRescinded(driver, offerId); - jmethodID offerRescinded = - env->GetMethodID(clazz, "offerRescinded", - "(Lorg/apache/mesos/SchedulerDriver;" - "Lorg/apache/mesos/Protos$OfferID;)V"); + jmethodID offerRescinded = env->GetMethodID( + clazz, + "offerRescinded", + "(Lorg/apache/mesos/SchedulerDriver;" + "Lorg/apache/mesos/Protos$OfferID;)V"); jobject jofferId = convert<OfferID>(env, offerId); @@ -273,7 +282,8 @@ void JNIScheduler::statusUpdate(SchedulerDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); @@ -311,17 +321,19 @@ void JNIScheduler::frameworkMessage(SchedulerDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); // scheduler.frameworkMessage(driver, executorId, slaveId, data); - jmethodID frameworkMessage = - env->GetMethodID(clazz, "frameworkMessage", - "(Lorg/apache/mesos/SchedulerDriver;" - "Lorg/apache/mesos/Protos$ExecutorID;" - "Lorg/apache/mesos/Protos$SlaveID;[B)V"); + jmethodID frameworkMessage = env->GetMethodID( + clazz, + "frameworkMessage", + "(Lorg/apache/mesos/SchedulerDriver;" + "Lorg/apache/mesos/Protos$ExecutorID;" + "Lorg/apache/mesos/Protos$SlaveID;[B)V"); // byte[] data = ..; jbyteArray jdata = env->NewByteArray(data.size()); @@ -332,8 +344,8 @@ void JNIScheduler::frameworkMessage(SchedulerDriver* driver, env->ExceptionClear(); - env->CallVoidMethod(jscheduler, frameworkMessage, - jdriver, jexecutorId, jslaveId, jdata); + env->CallVoidMethod( + jscheduler, frameworkMessage, jdriver, jexecutorId, jslaveId, jdata); if (env->ExceptionCheck()) { env->ExceptionDescribe(); @@ -353,16 +365,18 @@ void JNIScheduler::slaveLost(SchedulerDriver* driver, const SlaveID& slaveId) jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); // scheduler.slaveLost(driver, slaveId); - jmethodID slaveLost = - env->GetMethodID(clazz, "slaveLost", - "(Lorg/apache/mesos/SchedulerDriver;" - "Lorg/apache/mesos/Protos$SlaveID;)V"); + jmethodID slaveLost = env->GetMethodID( + clazz, + "slaveLost", + "(Lorg/apache/mesos/SchedulerDriver;" + "Lorg/apache/mesos/Protos$SlaveID;)V"); jobject jslaveId = convert<SlaveID>(env, slaveId); @@ -391,7 +405,8 @@ void JNIScheduler::executorLost(SchedulerDriver* driver, jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); @@ -433,16 +448,18 @@ void JNIScheduler::error(SchedulerDriver* driver, const string& message) jclass clazz = env->GetObjectClass(jdriver); - jfieldID scheduler = env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); + jfieldID scheduler = + env->GetFieldID(clazz, "scheduler", "Lorg/apache/mesos/Scheduler;"); jobject jscheduler = env->GetObjectField(jdriver, scheduler); clazz = env->GetObjectClass(jscheduler); // scheduler.error(driver, message); - jmethodID error = - env->GetMethodID(clazz, "error", - "(Lorg/apache/mesos/SchedulerDriver;" - "Ljava/lang/String;)V"); + jmethodID error = env->GetMethodID( + clazz, + "error", + "(Lorg/apache/mesos/SchedulerDriver;" + "Ljava/lang/String;)V"); jobject jmessage = convert<string>(env, message); @@ -489,7 +506,8 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_MesosSchedulerDriver_initialize env->SetLongField(thiz, __scheduler, (jlong) scheduler); // Get out the FrameworkInfo passed into the constructor. - jfieldID framework = env->GetFieldID(clazz, "framework", "Lorg/apache/mesos/Protos$FrameworkInfo;"); + jfieldID framework = env->GetFieldID( + clazz, "framework", "Lorg/apache/mesos/Protos$FrameworkInfo;"); jobject jframework = env->GetObjectField(thiz, framework); // Get out the master passed into the constructor. @@ -518,7 +536,8 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_MesosSchedulerDriver_initialize // NOTE: Older versions (< 0.15.0) of MesosSchedulerDriver do not set // 'credential' field. To be backwards compatible we should safely // handle this case. - Result<jfieldID> credential = getFieldID(env, clazz, "credential", "Lorg/apache/mesos/Protos$Credential;"); + Result<jfieldID> credential = getFieldID( + env, clazz, "credential", "Lorg/apache/mesos/Protos$Credential;"); if (credential.isError()) { return; // Exception has been thrown. } @@ -669,8 +688,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_join * Method: acknowledgeStatusUpdate * Signature: (Lorg/apache/mesos/Protos/TaskStatus;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_acknowledgeStatusUpdate - (JNIEnv* env, jobject thiz, jobject jtaskStatus) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_acknowledgeStatusUpdate( + JNIEnv* env, jobject thiz, jobject jtaskStatus) { // Construct a C++ TaskID from the Java TaskId. const TaskStatus& taskStatus = construct<TaskStatus>(env, jtaskStatus); @@ -693,8 +713,13 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_acknowledge * Method: sendFrameworkMessage * Signature: (Lorg/apache/mesos/Protos/ExecutorID;Lorg/apache/mesos/Protos/SlaveID;[B)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_sendFrameworkMessage - (JNIEnv* env, jobject thiz, jobject jexecutorId, jobject jslaveId, jbyteArray jdata) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_sendFrameworkMessage( + JNIEnv* env, + jobject thiz, + jobject jexecutorId, + jobject jslaveId, + jbyteArray jdata) { // Construct a C++ ExecutorID from the Java ExecutorID. const ExecutorID& executorId = construct<ExecutorID>(env, jexecutorId); @@ -752,8 +777,13 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_killTask * Method: launchTasks * Signature: (Lorg/apache/mesos/Protos$OfferID;Ljava/util/Collection;Lorg/apache/mesos/Protos$Filters;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_launchTasks__Lorg_apache_mesos_Protos_00024OfferID_2Ljava_util_Collection_2Lorg_apache_mesos_Protos_00024Filters_2 - (JNIEnv *env, jobject thiz, jobject jofferId, jobject jtasks, jobject jfilters) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_launchTasks__Lorg_apache_mesos_Protos_00024OfferID_2Ljava_util_Collection_2Lorg_apache_mesos_Protos_00024Filters_2( // NOLINT(whitespace/line_length) + JNIEnv* env, + jobject thiz, + jobject jofferId, + jobject jtasks, + jobject jfilters) { // Construct a C++ OfferID from the Java OfferID. const OfferID& offerId = construct<OfferID>(env, jofferId); @@ -806,8 +836,13 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_launchTasks * Method: launchTasks * Signature: (Ljava/util/Collection;Ljava/util/Collection;Lorg/apache/mesos/Protos$Filters;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_launchTasks__Ljava_util_Collection_2Ljava_util_Collection_2Lorg_apache_mesos_Protos_00024Filters_2 - (JNIEnv* env, jobject thiz, jobject jofferIds, jobject jtasks, jobject jfilters) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_launchTasks__Ljava_util_Collection_2Ljava_util_Collection_2Lorg_apache_mesos_Protos_00024Filters_2( // NOLINT(whitespace/line_length) + JNIEnv* env, + jobject thiz, + jobject jofferIds, + jobject jtasks, + jobject jfilters) { // Construct a C++ OfferID from each Java OfferID. vector<OfferID> offers; @@ -875,8 +910,13 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_launchTasks * Method: acceptOffers * Signature: (Ljava/util/Collection;Ljava/util/Collection;Lorg/apache/mesos/Protos$Filters;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_acceptOffers__Ljava_util_Collection_2Ljava_util_Collection_2Lorg_apache_mesos_Protos_00024Filters_2 - (JNIEnv* env, jobject thiz, jobject jofferIds, jobject joperations, jobject jfilters) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_acceptOffers__Ljava_util_Collection_2Ljava_util_Collection_2Lorg_apache_mesos_Protos_00024Filters_2( // NOLINT(whitespace/line_length) + JNIEnv* env, + jobject thiz, + jobject jofferIds, + jobject joperations, + jobject jfilters) { // Construct C++ OfferIDs from each Java OfferIDs. vector<OfferID> offers; @@ -942,8 +982,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_acceptOffer * Method: declineOffer * Signature: (Lorg/apache/mesos/Protos/OfferID;Lorg/apache/mesos/Protos/Filters;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_declineOffer - (JNIEnv* env, jobject thiz, jobject jofferId, jobject jfilters) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_declineOffer( + JNIEnv* env, jobject thiz, jobject jofferId, jobject jfilters) { // Construct a C++ OfferID from the Java OfferID. const OfferID& offerId = construct<OfferID>(env, jofferId); @@ -969,8 +1010,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_declineOffe * Method: reviveOffers * Signature: ()Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers - (JNIEnv* env, jobject thiz) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_reviveOffers( + JNIEnv* env, jobject thiz) { jclass clazz = env->GetObjectClass(thiz); @@ -989,8 +1031,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_reviveOffer * Method: suppressOffers * Signature: ()Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_suppressOffers - (JNIEnv* env, jobject thiz) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_suppressOffers( + JNIEnv* env, jobject thiz) { jclass clazz = env->GetObjectClass(thiz); @@ -1009,8 +1052,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_suppressOff * Method: requestResources * Signature: (Ljava/util/Collection;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_requestResources - (JNIEnv* env, jobject thiz, jobject jrequests) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_requestResources( + JNIEnv* env, jobject thiz, jobject jrequests) { jclass clazz = env->GetObjectClass(thiz); @@ -1052,8 +1096,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_requestReso * Method: reconcileTasks * Signature: (Ljava/util/Collection;)Lorg/apache/mesos/Protos/Status; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosSchedulerDriver_reconcileTasks - (JNIEnv* env, jobject thiz, jobject jstatuses) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_MesosSchedulerDriver_reconcileTasks( + JNIEnv* env, jobject thiz, jobject jstatuses) { // Construct a C++ TaskStatus from each Java TaskStatus. vector<TaskStatus> statuses; diff --git a/src/java/jni/org_apache_mesos_state_AbstractState.cpp b/src/java/jni/org_apache_mesos_state_AbstractState.cpp index 0f12f4f..9a15547 100644 --- a/src/java/jni/org_apache_mesos_state_AbstractState.cpp +++ b/src/java/jni/org_apache_mesos_state_AbstractState.cpp @@ -102,8 +102,9 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch * Method: __fetch_cancel * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1cancel - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1fetch_1cancel( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Variable>* future = (Future<Variable>*) jfuture; @@ -120,8 +121,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1 * Method: __fetch_is_cancelled * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1is_1cancelled - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1fetch_1is_1cancelled( + JNIEnv* env, jobject thiz, jlong jfuture) { // We always return false since while we might discard the future in // 'cancel' we don't know if it has really been discarded and we @@ -137,8 +139,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1 * Method: __fetch_is_done * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1is_1done - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1fetch_1is_1done( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Variable>* future = (Future<Variable>*) jfuture; @@ -151,8 +154,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1 * Method: __fetch_get * Signature: (J)Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1get - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1fetch_1get( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Variable>* future = (Future<Variable>*) jfuture; @@ -192,8 +196,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1g * Method: __fetch_get_timeout * Signature: (JJLjava/util/concurrent/TimeUnit;)Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1get_1timeout - (JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1fetch_1get_1timeout( + JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) { Future<Variable>* future = (Future<Variable>*) jfuture; @@ -246,8 +251,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1g * Method: __fetch_finalize * Signature: (J)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1finalize - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState__1_1fetch_1finalize( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Variable>* future = (Future<Variable>*) jfuture; @@ -260,8 +266,9 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1fetch_1fina * Method: cancel * Signature: (Z)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFuture_cancel - (JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024FetchFuture_cancel( + JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) { if (mayInterruptIfRunning) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); @@ -284,8 +291,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchF * Method: is_cancelled * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFuture_is_1cancelled - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024FetchFuture_is_1cancelled( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -304,8 +312,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchF * Method: is_done * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFuture_is_1done - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024FetchFuture_is_1done( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -324,8 +333,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchF * Method: get * Signature: ()Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFuture_get - (JNIEnv* env, jobject thiz) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024FetchFuture_get( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -344,8 +354,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFu * Method: get_timeout * Signature: (JLjava/util/concurrent/TimeUnit;)Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFuture_get_1timeout - (JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024FetchFuture_get_1timeout( + JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -366,8 +377,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFu * Method: finalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState_00024FetchFuture_finalize - (JNIEnv* env, jobject thiz) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState_00024FetchFuture_finalize( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -413,8 +425,9 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1store * Method: __store_cancel * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1cancel - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1store_1cancel( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture; @@ -431,8 +444,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1 * Method: __store_is_cancelled * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1is_1cancelled - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1store_1is_1cancelled( + JNIEnv* env, jobject thiz, jlong jfuture) { // We always return false since while we might discard the future in // 'cancel' we don't know if it has really been discarded and we @@ -448,8 +462,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1 * Method: __store_is_done * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1is_1done - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1store_1is_1done( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture; @@ -462,8 +477,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1 * Method: __store_get * Signature: (J)Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1get - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1store_1get( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture; @@ -507,8 +523,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1g * Method: __store_get_timeout * Signature: (JJLjava/util/concurrent/TimeUnit;)Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1get_1timeout - (JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1store_1get_1timeout( + JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) { Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture; @@ -566,8 +583,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1g * Method: __store_finalize * Signature: (J)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1finalize - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState__1_1store_1finalize( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<Option<Variable>>* future = (Future<Option<Variable>>*) jfuture; @@ -580,8 +598,9 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1store_1fina * Method: cancel * Signature: (Z)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFuture_cancel - (JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024StoreFuture_cancel( + JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) { if (mayInterruptIfRunning) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); @@ -604,8 +623,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreF * Method: is_cancelled * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFuture_is_1cancelled - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024StoreFuture_is_1cancelled( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -624,8 +644,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreF * Method: is_done * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFuture_is_1done - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024StoreFuture_is_1done( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -644,8 +665,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreF * Method: get * Signature: ()Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFuture_get - (JNIEnv* env, jobject thiz) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024StoreFuture_get( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -664,8 +686,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFu * Method: get_timeout * Signature: (JLjava/util/concurrent/TimeUnit;)Lorg/apache/mesos/state/Variable; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFuture_get_1timeout - (JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024StoreFuture_get_1timeout( + JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -686,8 +709,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFu * Method: finalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState_00024StoreFuture_finalize - (JNIEnv* env, jobject thiz) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState_00024StoreFuture_finalize( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -732,8 +756,9 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge * Method: __expunge_cancel * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_1cancel - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1expunge_1cancel( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<bool>* future = (Future<bool>*) jfuture; @@ -750,8 +775,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge * Method: __expunge_is_cancelled * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_1is_1cancelled - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1expunge_1is_1cancelled( + JNIEnv* env, jobject thiz, jlong jfuture) { // We always return false since while we might discard the future in // 'cancel' we don't know if it has really been discarded and we @@ -767,8 +793,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge * Method: __expunge_is_done * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_1is_1done - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1expunge_1is_1done( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<bool>* future = (Future<bool>*) jfuture; @@ -781,8 +808,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge * Method: __expunge_get * Signature: (J)Ljava/lang/Boolean; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_1get - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1expunge_1get( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<bool>* future = (Future<bool>*) jfuture; @@ -819,8 +847,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_ * Method: __expunge_get_timeout * Signature: (JJLjava/util/concurrent/TimeUnit;)Ljava/lang/Boolean; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_1get_1timeout - (JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1expunge_1get_1timeout( + JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) { Future<bool>* future = (Future<bool>*) jfuture; @@ -871,8 +900,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_ * Method: __expunge_finalize * Signature: (J)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_1finalize - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState__1_1expunge_1finalize( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<bool>* future = (Future<bool>*) jfuture; @@ -885,8 +915,9 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1expunge_1fi * Method: cancel * Signature: (Z)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_cancel - (JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_cancel( + JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) { if (mayInterruptIfRunning) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); @@ -909,8 +940,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024Expung * Method: is_cancelled * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_is_1cancelled - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_is_1cancelled( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -929,8 +961,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024Expung * Method: is_done * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_is_1done - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_is_1done( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -949,8 +982,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024Expung * Method: __get * Signature: ()Ljava/lang/Boolean; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_get - (JNIEnv* env, jobject thiz) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_get( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -969,8 +1003,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024Expunge * Method: get_timeout * Signature: (JLjava/util/concurrent/TimeUnit;)Ljava/lang/Boolean; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_get_1timeout - (JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_get_1timeout( + JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -991,8 +1026,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024Expunge * Method: finalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_finalize - (JNIEnv* env, jobject thiz) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState_00024ExpungeFuture_finalize( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -1032,8 +1068,9 @@ JNIEXPORT jlong JNICALL Java_org_apache_mesos_state_AbstractState__1_1names * Method: __names_cancel * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1cancel - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1names_1cancel( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<set<string>>* future = (Future<set<string>>*) jfuture; @@ -1049,8 +1086,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1 * Method: __names_is_cancelled * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1is_1cancelled - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1names_1is_1cancelled( + JNIEnv* env, jobject thiz, jlong jfuture) { // We always return false since while we might discard the future in // 'cancel' we don't know if it has really been discarded and we @@ -1066,8 +1104,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1 * Method: __names_is_done * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1is_1done - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState__1_1names_1is_1done( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<set<string>>* future = (Future<set<string>>*) jfuture; @@ -1080,8 +1119,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1 * Method: __names_get * Signature: (J)Ljava/util/Iterator; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1get - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1names_1get( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<set<string>>* future = (Future<set<string>>*) jfuture; @@ -1128,8 +1168,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1g * Method: __names_get_timeout * Signature: (JJLjava/util/concurrent/TimeUnit;)Ljava/util/Iterator; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1get_1timeout - (JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState__1_1names_1get_1timeout( + JNIEnv* env, jobject thiz, jlong jfuture, jlong jtimeout, jobject junit) { Future<set<string>>* future = (Future<set<string>>*) jfuture; @@ -1190,8 +1231,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1g * Method: __names_finalize * Signature: (J)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1finalize - (JNIEnv* env, jobject thiz, jlong jfuture) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState__1_1names_1finalize( + JNIEnv* env, jobject thiz, jlong jfuture) { Future<set<string>>* future = (Future<set<string>>*) jfuture; @@ -1204,8 +1246,9 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState__1_1names_1fina * Method: cancel * Signature: (Z)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFuture_cancel - (JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024NamesFuture_cancel( + JNIEnv* env, jobject thiz, jboolean mayInterruptIfRunning) { if (mayInterruptIfRunning) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); @@ -1228,8 +1271,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesF * Method: is_cancelled * Signature: (J)Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFuture_is_1cancelled - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024NamesFuture_is_1cancelled( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -1248,8 +1292,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesF * Method: is_done * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFuture_is_1done - (JNIEnv* env, jobject thiz) +JNIEXPORT jboolean JNICALL +Java_org_apache_mesos_state_AbstractState_00024NamesFuture_is_1done( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -1268,8 +1313,9 @@ JNIEXPORT jboolean JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesF * Method: get * Signature: ()Ljava/util/Iterator; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFuture_get - (JNIEnv* env, jobject thiz) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024NamesFuture_get( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -1288,8 +1334,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFu * Method: get_timeout * Signature: (JLjava/util/concurrent/TimeUnit;)Ljava/util/Iterator; */ -JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFuture_get_1timeout - (JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) +JNIEXPORT jobject JNICALL +Java_org_apache_mesos_state_AbstractState_00024NamesFuture_get_1timeout( + JNIEnv* env, jobject thiz, jlong jtimeout, jobject junit) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); @@ -1310,8 +1357,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFu * Method: finalize * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_AbstractState_00024NamesFuture_finalize - (JNIEnv* env, jobject thiz) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_AbstractState_00024NamesFuture_finalize( + JNIEnv* env, jobject thiz) { static jclass clazz = (jclass)env->NewGlobalRef(env->GetObjectClass(thiz)); static jfieldID field = env->GetFieldID(clazz, "future", "J"); diff --git a/src/java/jni/org_apache_mesos_state_LevelDBState.cpp b/src/java/jni/org_apache_mesos_state_LevelDBState.cpp index b06956f..cfabf37 100644 --- a/src/java/jni/org_apache_mesos_state_LevelDBState.cpp +++ b/src/java/jni/org_apache_mesos_state_LevelDBState.cpp @@ -42,8 +42,8 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_state_LevelDBState_initialize { string path = construct<string>(env, jpath); - // Create the C++ Storage and State instances and initialize the - // __storage and __state variables. + // Create the C++ Storage and State instances and initialize the + // __storage and __state variables. Storage* storage = new LevelDBStorage(path); State* state = new State(storage); diff --git a/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp b/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp index b2734c6..a6a05bf 100644 --- a/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp +++ b/src/java/jni/org_apache_mesos_state_ZooKeeperState.cpp @@ -39,13 +39,14 @@ extern "C" { * Method: initialize * Signature: (Ljava/lang/String;JLjava/util/concurrent/TimeUnit;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_ZooKeeperState_initialize__Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2 - (JNIEnv* env, - jobject thiz, - jstring jservers, - jlong jtimeout, - jobject junit, - jstring jznode) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_ZooKeeperState_initialize__Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2( // NOLINT(whitespace/line_length) + JNIEnv* env, + jobject thiz, + jstring jservers, + jlong jtimeout, + jobject junit, + jstring jznode) { string servers = construct<string>(env, jservers); @@ -60,8 +61,8 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_state_ZooKeeperState_initialize__Lj string znode = construct<string>(env, jznode); - // Create the C++ Storage and State instances and initialize the - // __storage and __state variables. + // Create the C++ Storage and State instances and initialize the + // __storage and __state variables. Storage* storage = new ZooKeeperStorage(servers, timeout, znode); State* state = new State(storage); @@ -82,15 +83,16 @@ JNIEXPORT void JNICALL Java_org_apache_mesos_state_ZooKeeperState_initialize__Lj * Method: initialize * Signature: (Ljava/lang/String;JLjava/util/concurrent/TimeUnit;Ljava/lang/String;Ljava/lang/String;[B)V */ -JNIEXPORT void JNICALL Java_org_apache_mesos_state_ZooKeeperState_initialize__Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2Ljava_lang_String_2_3B - (JNIEnv* env, - jobject thiz, - jstring jservers, - jlong jtimeout, - jobject junit, - jstring jznode, - jstring jscheme, - jbyteArray jcredentials) +JNIEXPORT void JNICALL +Java_org_apache_mesos_state_ZooKeeperState_initialize__Ljava_lang_String_2JLjava_util_concurrent_TimeUnit_2Ljava_lang_String_2Ljava_lang_String_2_3B( // NOLINT(whitespace/line_length) + JNIEnv* env, + jobject thiz, + jstring jservers, + jlong jtimeout, + jobject junit, + jstring jznode, + jstring jscheme, + jbyteArray jcredentials) { string servers = construct<string>(env, jservers); diff --git a/src/java/jni/org_apache_mesos_v1_scheduler_V0Mesos.cpp b/src/java/jni/org_apache_mesos_v1_scheduler_V0Mesos.cpp index 4e4dd54..35a04a3 100644 --- a/src/java/jni/org_apache_mesos_v1_scheduler_V0Mesos.cpp +++ b/src/java/jni/org_apache_mesos_v1_scheduler_V0Mesos.cpp @@ -759,7 +759,7 @@ void V0ToV1AdapterProcess::__received(const Event& event) void V0ToV1AdapterProcess::connect() { - jvm->AttachCurrentThread(JNIENV_CAST(&env), NULL); + jvm->AttachCurrentThread(JNIENV_CAST(&env), nullptr); jclass clazz = env->GetObjectClass(jmesos); @@ -815,7 +815,7 @@ void V0ToV1AdapterProcess::heartbeat() void V0ToV1AdapterProcess::disconnect() { - jvm->AttachCurrentThread(JNIENV_CAST(&env), NULL); + jvm->AttachCurrentThread(JNIENV_CAST(&env), nullptr); jclass clazz = env->GetObjectClass(jmesos); diff --git a/support/mesos-style.py b/support/mesos-style.py index 11d5f96..b14820a 100755 --- a/support/mesos-style.py +++ b/support/mesos-style.py @@ -246,7 +246,6 @@ class CppLinter(LinterBase): r'glog\-0\.3\.3|' \ r'boost\-1\.53\.0|' \ r'libev\-4\.15|' \ - r'java/jni|' \ r'\.pb\.cc|\.pb\.h|\.md|\.virtualenv' \ ')' @@ -373,7 +372,6 @@ class PyLinter(LinterBase): r'glog\-0\.3\.3|' \ r'boost\-1\.53\.0|' \ r'libev\-4\.15|' \ - r'java/jni|' \ r'\.virtualenv|' \ r'\.tox' \ ')'
