Skip to content

Commit 7fb5cd7

Browse files
restyled-commitsjoonhaengHeo
restyled-commits
authored and
joonhaengHeo
committed
Restyled by clang-format
1 parent 6877894 commit 7fb5cd7

File tree

4 files changed

+46
-35
lines changed

4 files changed

+46
-35
lines changed

‎src/controller/java/AndroidCallbacks-JNI.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ JNI_METHOD(void, GetConnectedDeviceCallbackJni, deleteCallback)(JNIEnv * env, jo
3939
JNI_METHOD(jlong, ReportCallbackJni, newCallback)
4040
(JNIEnv * env, jobject self, jobject subscriptionEstablishedCallbackJava, jobject resubscriptionAttemptCallbackJava)
4141
{
42-
return newReportCallback(env, self, subscriptionEstablishedCallbackJava, resubscriptionAttemptCallbackJava, "()Lchip/devicecontroller/model/NodeState;");
42+
return newReportCallback(env, self, subscriptionEstablishedCallbackJava, resubscriptionAttemptCallbackJava,
43+
"()Lchip/devicecontroller/model/NodeState;");
4344
}
4445

4546
JNI_METHOD(void, ReportCallbackJni, deleteCallback)(JNIEnv * env, jobject self, jlong callbackHandle)

‎src/controller/java/AndroidCallbacks.cpp

+40-32
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ void GetConnectedDeviceCallback::OnDeviceConnectedFn(void * context, Messaging::
7070
JniGlobalReference globalRef(std::move(self->mWrapperCallbackRef));
7171

7272
jclass getConnectedDeviceCallbackCls = nullptr;
73-
CHIP_ERROR err = JniReferences::GetInstance().GetLocalClassRef(env, self->mCallbackClassSignature, getConnectedDeviceCallbackCls);
73+
CHIP_ERROR err =
74+
JniReferences::GetInstance().GetLocalClassRef(env, self->mCallbackClassSignature, getConnectedDeviceCallbackCls);
7475
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "GetLocalClassRef Error! : %" CHIP_ERROR_FORMAT, err.Format()));
7576
VerifyOrReturn(getConnectedDeviceCallbackCls != nullptr,
7677
ChipLogError(Controller, "Could not find GetConnectedDeviceCallback class"));
@@ -128,14 +129,13 @@ void GetConnectedDeviceCallback::OnDeviceConnectionFailureFn(void * context,
128129
CHIP_ERROR CreateOptional(chip::Optional<uint8_t> value, jobject & outObj)
129130
{
130131

131-
132-
133132
return CHIP_NO_ERROR;
134133
}
135-
jobject GetNodeStateObj(JNIEnv * env, const char* nodeStateClassSignature, jobject wrapperCallback)
134+
jobject GetNodeStateObj(JNIEnv * env, const char * nodeStateClassSignature, jobject wrapperCallback)
136135
{
137136
jmethodID getNodeStateMethod;
138-
CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, wrapperCallback, "getNodeState", nodeStateClassSignature, &getNodeStateMethod);
137+
CHIP_ERROR err =
138+
JniReferences::GetInstance().FindMethod(env, wrapperCallback, "getNodeState", nodeStateClassSignature, &getNodeStateMethod);
139139
VerifyOrReturnValue(err == CHIP_NO_ERROR, nullptr, ChipLogError(Controller, "Could not find getNodeState method"));
140140

141141
DeviceLayer::StackUnlock unlock;
@@ -147,7 +147,8 @@ jobject GetNodeStateObj(JNIEnv * env, const char* nodeStateClassSignature, jobje
147147

148148
ReportCallback::ReportCallback(jobject wrapperCallback, jobject subscriptionEstablishedCallback,
149149
jobject resubscriptionAttemptCallback, const char * nodeStateClassSignature) :
150-
mClusterCacheAdapter(*this, Optional<EventNumber>::Missing(), false /*cacheData*/), mNodeStateClassSignature(nodeStateClassSignature)
150+
mClusterCacheAdapter(*this, Optional<EventNumber>::Missing(), false /*cacheData*/),
151+
mNodeStateClassSignature(nodeStateClassSignature)
151152
{
152153
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
153154
VerifyOrReturn(env != nullptr, ChipLogError(Controller, "Could not get JNIEnv for current thread"));
@@ -285,20 +286,24 @@ void ReportCallback::OnAttributeData(const app::ConcreteDataAttributePath & aPat
285286
ChipLogError(Controller, "Receive bad status %s", ErrorStr(aStatus.ToChipError()));
286287
// Add Attribute Status to wrapperCallback
287288
jmethodID addAttributeStatusMethod = nullptr;
288-
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addAttributeStatus",
289-
"(IJJILjava/lang/Integer;)V", &addAttributeStatusMethod);
289+
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addAttributeStatus", "(IJJILjava/lang/Integer;)V",
290+
&addAttributeStatusMethod);
290291
VerifyOrReturn(
291292
err == CHIP_NO_ERROR,
292293
ChipLogError(Controller, "Could not find addAttributeStatus method with error %" CHIP_ERROR_FORMAT, err.Format()));
293294

294295
jobject jClusterState = nullptr;
295-
if (aStatus.mClusterStatus.HasValue()) {
296-
err = JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", static_cast<jint>(aStatus.mClusterStatus.Value()), jClusterState);
297-
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not CreateBoxedObject with error %" CHIP_ERROR_FORMAT, err.Format()));
296+
if (aStatus.mClusterStatus.HasValue())
297+
{
298+
err = JniReferences::GetInstance().CreateBoxedObject<jint>(
299+
"java/lang/Integer", "(I)V", static_cast<jint>(aStatus.mClusterStatus.Value()), jClusterState);
300+
VerifyOrReturn(err == CHIP_NO_ERROR,
301+
ChipLogError(Controller, "Could not CreateBoxedObject with error %" CHIP_ERROR_FORMAT, err.Format()));
298302
}
299303

300304
env->CallVoidMethod(nodeState, addAttributeStatusMethod, static_cast<jint>(aPath.mEndpointId),
301-
static_cast<jlong>(aPath.mClusterId), static_cast<jlong>(aPath.mAttributeId), static_cast<jint>(aStatus.mStatus), jClusterState);
305+
static_cast<jlong>(aPath.mClusterId), static_cast<jlong>(aPath.mAttributeId),
306+
static_cast<jint>(aStatus.mStatus), jClusterState);
302307
VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe());
303308
return;
304309
}
@@ -349,13 +354,12 @@ void ReportCallback::OnAttributeData(const app::ConcreteDataAttributePath & aPat
349354

350355
// Add AttributeState to wrapperCallback
351356
jmethodID addAttributeMethod;
352-
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addAttribute",
353-
"(IJJLjava/lang/Object;[BLjava/lang/String;)V", &addAttributeMethod);
357+
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addAttribute", "(IJJLjava/lang/Object;[BLjava/lang/String;)V",
358+
&addAttributeMethod);
354359
VerifyOrReturn(err == CHIP_NO_ERROR,
355360
ChipLogError(Controller, "Could not find addAttribute method with error %s", ErrorStr(err)));
356-
env->CallVoidMethod(nodeState, addAttributeMethod, static_cast<jint>(aPath.mEndpointId),
357-
static_cast<jlong>(aPath.mClusterId), static_cast<jlong>(aPath.mAttributeId), value,
358-
jniByteArray.jniValue(), jsonString.jniValue());
361+
env->CallVoidMethod(nodeState, addAttributeMethod, static_cast<jint>(aPath.mEndpointId), static_cast<jlong>(aPath.mClusterId),
362+
static_cast<jlong>(aPath.mAttributeId), value, jniByteArray.jniValue(), jsonString.jniValue());
359363
VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe());
360364

361365
UpdateClusterDataVersion();
@@ -390,12 +394,11 @@ void ReportCallback::UpdateClusterDataVersion()
390394
VerifyOrReturn(mWrapperCallbackRef.HasValidObjectRef(),
391395
ChipLogError(Controller, "mReportCallbackRef is not valid in %s", __func__));
392396
jobject wrapperCallback = mWrapperCallbackRef.ObjectRef();
393-
jobject nodeState = GetNodeStateObj(env, mNodeStateClassSignature, wrapperCallback);
397+
jobject nodeState = GetNodeStateObj(env, mNodeStateClassSignature, wrapperCallback);
394398

395399
// SetDataVersion to NodeState
396400
jmethodID setDataVersionMethod;
397-
CHIP_ERROR err =
398-
JniReferences::GetInstance().FindMethod(env, nodeState, "setDataVersion", "(IJJ)V", &setDataVersionMethod);
401+
CHIP_ERROR err = JniReferences::GetInstance().FindMethod(env, nodeState, "setDataVersion", "(IJJ)V", &setDataVersionMethod);
399402
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find setDataVersion method"));
400403
env->CallVoidMethod(nodeState, setDataVersionMethod, static_cast<jint>(lastConcreteClusterPath.mEndpointId),
401404
static_cast<jlong>(lastConcreteClusterPath.mClusterId), static_cast<jlong>(committedDataVersion.Value()));
@@ -411,22 +414,25 @@ void ReportCallback::OnEventData(const app::EventHeader & aEventHeader, TLV::TLV
411414
VerifyOrReturn(mWrapperCallbackRef.HasValidObjectRef(),
412415
ChipLogError(Controller, "mReportCallbackRef is not valid in %s", __func__));
413416
jobject wrapperCallback = mWrapperCallbackRef.ObjectRef();
414-
jobject nodeState = GetNodeStateObj(env, mNodeStateClassSignature, wrapperCallback);
417+
jobject nodeState = GetNodeStateObj(env, mNodeStateClassSignature, wrapperCallback);
415418
if (apStatus != nullptr && apStatus->IsFailure())
416419
{
417420
ChipLogError(Controller, "Receive bad status %s", ErrorStr(apStatus->ToChipError()));
418421
// Add Event Status to NodeState
419422
jmethodID addEventStatusMethod;
420-
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addEventStatus",
421-
"(IJJILjava/lang/Integer;)V", &addEventStatusMethod);
423+
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addEventStatus", "(IJJILjava/lang/Integer;)V",
424+
&addEventStatusMethod);
422425
VerifyOrReturn(
423426
err == CHIP_NO_ERROR,
424427
ChipLogError(Controller, "Could not find addEventStatus method with error %" CHIP_ERROR_FORMAT, err.Format()));
425428

426429
jobject jClusterState = nullptr;
427-
if (apStatus->mClusterStatus.HasValue()) {
428-
err = JniReferences::GetInstance().CreateBoxedObject<jint>("java/lang/Integer", "(I)V", static_cast<jint>(apStatus->mClusterStatus.Value()), jClusterState);
429-
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not CreateBoxedObject with error %" CHIP_ERROR_FORMAT, err.Format()));
430+
if (apStatus->mClusterStatus.HasValue())
431+
{
432+
err = JniReferences::GetInstance().CreateBoxedObject<jint>(
433+
"java/lang/Integer", "(I)V", static_cast<jint>(apStatus->mClusterStatus.Value()), jClusterState);
434+
VerifyOrReturn(err == CHIP_NO_ERROR,
435+
ChipLogError(Controller, "Could not CreateBoxedObject with error %" CHIP_ERROR_FORMAT, err.Format()));
430436
}
431437

432438
env->CallVoidMethod(nodeState, addEventStatusMethod, static_cast<jint>(aEventHeader.mPath.mEndpointId),
@@ -500,8 +506,8 @@ void ReportCallback::OnEventData(const app::EventHeader & aEventHeader, TLV::TLV
500506
UtfString jsonString(env, json.c_str());
501507

502508
jmethodID addEventMethod;
503-
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addEvent",
504-
"(IJJJIIJLjava/lang/Object;[BLjava/lang/String;)V", &addEventMethod);
509+
err = JniReferences::GetInstance().FindMethod(env, nodeState, "addEvent", "(IJJJIIJLjava/lang/Object;[BLjava/lang/String;)V",
510+
&addEventMethod);
505511
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find addEvent method with error %s", ErrorStr(err));
506512
aEventHeader.LogPath());
507513
env->CallVoidMethod(nodeState, addEventMethod, static_cast<jint>(aEventHeader.mPath.mEndpointId),
@@ -550,8 +556,10 @@ void ReportCallback::OnSubscriptionEstablished(SubscriptionId aSubscriptionId)
550556
DeviceLayer::StackUnlock unlock;
551557
VerifyOrReturn(mSubscriptionEstablishedCallbackRef.HasValidObjectRef(),
552558
ChipLogError(Controller, " mSubscriptionEstablishedCallbackRef is not valid in %s", __func__));
553-
CHIP_ERROR err = JniReferences::GetInstance().CallSubscriptionEstablished(mSubscriptionEstablishedCallbackRef.ObjectRef(), aSubscriptionId);
554-
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "CallSubscriptionEstablished error! : %" CHIP_ERROR_FORMAT, err.Format()));
559+
CHIP_ERROR err =
560+
JniReferences::GetInstance().CallSubscriptionEstablished(mSubscriptionEstablishedCallbackRef.ObjectRef(), aSubscriptionId);
561+
VerifyOrReturn(err == CHIP_NO_ERROR,
562+
ChipLogError(Controller, "CallSubscriptionEstablished error! : %" CHIP_ERROR_FORMAT, err.Format()));
555563
}
556564

557565
CHIP_ERROR ReportCallback::OnResubscriptionNeeded(app::ReadClient * apReadClient, CHIP_ERROR aTerminationCause)
@@ -914,8 +922,8 @@ jlong newReportCallback(JNIEnv * env, jobject self, jobject subscriptionEstablis
914922
jobject resubscriptionAttemptCallbackJava, const char * nodeStateClassSignature)
915923
{
916924
chip::DeviceLayer::StackLock lock;
917-
ReportCallback * reportCallback =
918-
chip::Platform::New<ReportCallback>(self, subscriptionEstablishedCallbackJava, resubscriptionAttemptCallbackJava, nodeStateClassSignature);
925+
ReportCallback * reportCallback = chip::Platform::New<ReportCallback>(
926+
self, subscriptionEstablishedCallbackJava, resubscriptionAttemptCallbackJava, nodeStateClassSignature);
919927
return reinterpret_cast<jlong>(reportCallback);
920928
}
921929

‎src/controller/java/AndroidCallbacks.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ struct GetConnectedDeviceCallback
5555
struct ReportCallback : public app::ClusterStateCache::Callback
5656
{
5757
/** Subscription established callback can be nullptr. */
58-
ReportCallback(jobject wrapperCallback, jobject subscriptionEstablishedCallback, jobject resubscriptionAttemptCallback, const char * nodeStateClassSignature);
58+
ReportCallback(jobject wrapperCallback, jobject subscriptionEstablishedCallback, jobject resubscriptionAttemptCallback,
59+
const char * nodeStateClassSignature);
5960
~ReportCallback();
6061

6162
void OnReportBegin() override;

‎src/controller/java/MatterCallbacks-JNI.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ JNI_METHOD(void, GetConnectedDeviceCallbackJni, deleteCallback)(JNIEnv * env, jo
3939
JNI_METHOD(jlong, ReportCallbackJni, newCallback)
4040
(JNIEnv * env, jobject self, jobject subscriptionEstablishedCallbackJava, jobject resubscriptionAttemptCallbackJava)
4141
{
42-
return newReportCallback(env, self, subscriptionEstablishedCallbackJava, resubscriptionAttemptCallbackJava, "()Lmatter/controller/model/NodeState;");
42+
return newReportCallback(env, self, subscriptionEstablishedCallbackJava, resubscriptionAttemptCallbackJava,
43+
"()Lmatter/controller/model/NodeState;");
4344
}
4445

4546
JNI_METHOD(void, ReportCallbackJni, deleteCallback)(JNIEnv * env, jobject self, jlong callbackHandle)

0 commit comments

Comments
 (0)