Skip to content

Commit 22770f7

Browse files
Restyled by clang-format
1 parent 829bad3 commit 22770f7

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

src/controller/java/templates/helper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,4 @@ exports.convertCTypeToJniSignature = convertCTypeToJniSignature;
253253
exports.convertBasicCTypeToJavaBoxedType = convertBasicCTypeToJavaBoxedType;
254254
exports.convertAttributeCallbackTypeToJavaName = convertAttributeCallbackTypeToJavaName;
255255
exports.notLastSupportedEntryTypes = notLastSupportedEntryTypes;
256-
exports.notLastSupportedCommandResponseType = notLastSupportedCommandResponseType;
256+
exports.notLastSupportedCommandResponseType = notLastSupportedCommandResponseType;

src/lib/support/JniReferences.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ CHIP_ERROR JniReferences::CreateOptional(jobject objectToWrap, jobject & outOpti
196196
return CHIP_NO_ERROR;
197197
}
198198

199-
CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & optionalValue) {
199+
CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & optionalValue)
200+
{
200201
JNIEnv * env = GetEnvForCurrentThread();
201202
jclass optionalCls;
202203
chip::JniReferences::GetInstance().GetClassRef(env, "java/util/Optional", optionalCls);
@@ -207,7 +208,8 @@ CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & option
207208
VerifyOrReturnError(isPresentMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
208209
jboolean isPresent = env->CallBooleanMethod(optionalObj, isPresentMethod);
209210

210-
if (!isPresent) {
211+
if (!isPresent)
212+
{
211213
optionalValue = nullptr;
212214
return CHIP_NO_ERROR;
213215
}

src/lib/support/JniReferences.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,20 @@ class JniReferences
102102
jboolean BooleanToPrimitive(jobject boxedObject);
103103

104104
/**
105-
* Creates a boxed type (e.g. java.lang.Integer) based on the the class name ("java/lang/Integer"), constructor JNI signature ("(I)V"), and value.
105+
* Creates a boxed type (e.g. java.lang.Integer) based on the the class name ("java/lang/Integer"), constructor JNI signature
106+
* ("(I)V"), and value.
106107
*/
107108
template <class T>
108109
CHIP_ERROR CreateBoxedObject(std::string boxedTypeClsName, std::string constructorSignature, T value, jobject & outObj)
109110
{
110-
JNIEnv * env = GetEnvForCurrentThread();
111+
JNIEnv * env = GetEnvForCurrentThread();
111112
CHIP_ERROR err = CHIP_NO_ERROR;
112113
jclass boxedTypeCls;
113114
err = GetClassRef(env, boxedTypeClsName.c_str(), boxedTypeCls);
114115
VerifyOrReturnError(err == CHIP_NO_ERROR, err);
115116

116117
jmethodID boxedTypeConstructor = env->GetMethodID(boxedTypeCls, "<init>", constructorSignature.c_str());
117-
outObj = env->NewObject(boxedTypeCls, boxedTypeConstructor, value);
118+
outObj = env->NewObject(boxedTypeCls, boxedTypeConstructor, value);
118119
env->DeleteGlobalRef(boxedTypeCls);
119120

120121
return err;

src/lib/support/JniTypeWrappers.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ namespace chip {
2828
class JniUtfString
2929
{
3030
public:
31-
JniUtfString(JNIEnv * env, jstring string) : mEnv(env), mString(string) {
32-
if (string == nullptr) {
31+
JniUtfString(JNIEnv * env, jstring string) : mEnv(env), mString(string)
32+
{
33+
if (string == nullptr)
34+
{
3335
return;
3436
}
35-
mChars = env->GetStringUTFChars(string, 0);
37+
mChars = env->GetStringUTFChars(string, 0);
3638
mDataLength = env->GetStringUTFLength(string);
3739
}
3840
~JniUtfString() { mEnv->ReleaseStringUTFChars(mString, mChars); }
3941

4042
const char * c_str() const { return mChars; }
4143

42-
chip::CharSpan charSpan() const {
43-
return chip::CharSpan(c_str(), static_cast<size_t>(size()));
44-
}
44+
chip::CharSpan charSpan() const { return chip::CharSpan(c_str(), static_cast<size_t>(size())); }
4545

4646
jsize size() const { return mDataLength; }
4747

@@ -63,7 +63,8 @@ class JniByteArray
6363

6464
const jbyte * data() const { return mData; }
6565

66-
chip::ByteSpan byteSpan() const {
66+
chip::ByteSpan byteSpan() const
67+
{
6768
return chip::ByteSpan(reinterpret_cast<const uint8_t *>(data()), static_cast<size_t>(size()));
6869
}
6970

@@ -107,14 +108,13 @@ class ByteArray
107108
env->SetByteArrayRegion(mArray, 0, dataLen, data);
108109
}
109110
}
110-
ByteArray(JNIEnv * env, chip::ByteSpan data): mEnv(env)
111+
ByteArray(JNIEnv * env, chip::ByteSpan data) : mEnv(env)
111112
{
112113
mArray = mEnv->NewByteArray(static_cast<jsize>(data.size()));
113114
if (mArray != nullptr)
114115
{
115-
env->SetByteArrayRegion(mArray, 0, static_cast<jsize>(data.size()), reinterpret_cast<const jbyte*>(data.data()));
116+
env->SetByteArrayRegion(mArray, 0, static_cast<jsize>(data.size()), reinterpret_cast<const jbyte *>(data.data()));
116117
}
117-
118118
}
119119
~ByteArray() { mEnv->DeleteLocalRef(mArray); }
120120

0 commit comments

Comments
 (0)