Account for array/struct in encode_value/decode_value.

austinh0 · Nov 17, 2021 · 6bef481 · 6bef481
1 parent 22770f7
commit 6bef481
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 71 deletions.
diff --git a/src/android/CHIPTool/app/bin/src/main/cpp/native-lib.cpp b/src/android/CHIPTool/app/bin/src/main/cpp/native-lib.cpp
diff --git a/src/controller/java/templates/CHIPClusters-JNI.zapt b/src/controller/java/templates/CHIPClusters-JNI.zapt
@@ -52,7 +52,7 @@ JNI_METHOD(void, {{asUpperCamelCase ../name}}Cluster, {{asLowerCamelCase name}})
  chip::app::Clusters::{{asUpperCamelCase parent.name}}::Commands::{{asUpperCamelCase name}}::Type request;
 
  {{#chip_cluster_command_arguments}}
- {{>encode_value label=(asLowerCamelCase label)}}
+ {{>encode_value target=(concat "request." (asLowerCamelCase label)) source=(asLowerCamelCase label)}}
  {{/chip_cluster_command_arguments}}
 
  {{#*inline "callbackName"}}{{#if hasSpecificResponse}}{{asUpperCamelCase parent.name false}}Cluster{{asUpperCamelCase responseName false}}{{else}}DefaultSuccess{{/if}}{{/inline}}

diff --git a/src/controller/java/templates/partials/command_callback_responses.zapt b/src/controller/java/templates/partials/command_callback_responses.zapt
@@ -9,11 +9,11 @@
 {{#if isArray}}
  // {{asSymbol label}}: {{asUnderlyingZclType type}}
  // Conversion from this type to Java is not properly implemented yet
- {{else if (isOctetString type)}}
-  {{#if isOptional}}Optional<{{/if}}byte[]{{#if isOptional}}>{{/if}} {{asSymbol label}}{{#notLastSupportedCommandResponseType parent.arguments}},{{/notLastSupportedCommandResponseType}}
- {{else if (isShortString type)}}
-  {{#if isOptional}}Optional<{{/if}}String{{#if isOptional}}>{{/if}} {{asSymbol label}}{{#notLastSupportedCommandResponseType parent.arguments}},{{/notLastSupportedCommandResponseType}}
- {{else}}
-  {{#if isOptional}}Optional<{{/if}}{{asJavaBasicTypeForZclType type true}}{{#if isOptional}}>{{/if}} {{asSymbol label}}{{#notLastSupportedCommandResponseType parent.arguments}},{{/notLastSupportedCommandResponseType}}
+{{else if (isOctetString type)}}
+ {{#if isOptional}}Optional<{{/if}}byte[]{{#if isOptional}}>{{/if}} {{asSymbol label}}{{#notLastSupportedCommandResponseType parent.arguments}},{{/notLastSupportedCommandResponseType}}
+{{else if (isShortString type)}}
+ {{#if isOptional}}Optional<{{/if}}String{{#if isOptional}}>{{/if}} {{asSymbol label}}{{#notLastSupportedCommandResponseType parent.arguments}},{{/notLastSupportedCommandResponseType}}
+{{else}}
+ {{#if isOptional}}Optional<{{/if}}{{asJavaBasicTypeForZclType type true}}{{#if isOptional}}>{{/if}} {{asSymbol label}}{{#notLastSupportedCommandResponseType parent.arguments}},{{/notLastSupportedCommandResponseType}}
 {{/if}}
 {{/chip_cluster_response_arguments}}
diff --git a/src/controller/java/templates/partials/decode_value.zapt b/src/controller/java/templates/partials/decode_value.zapt
@@ -12,6 +12,8 @@ if (dataResponse.{{asLowerCamelCase label}}.Value().IsNull()) {
 {{~#*inline "item"}}dataResponse.{{asLowerCamelCase name}}{{#if isOptional}}.Value(){{/if}}{{#if isNullable}}.Value(){{/if}}{{/inline}}
 {{#if isArray}}
 {{asSymbol label}} = nullptr; /* Array - Conversion from this type to Java is not properly implemented yet */
+{{else if isStruct}}
+{{asSymbol label}} = nullptr; /* Struct - conversion from this type to Java is not properly implemented yet */
 {{else if (isOctetString type)}}
 {{asSymbol label}} = chip::ByteArray(env, {{>item}}).jniValue();
 {{else if (isCharString type)}}

diff --git a/src/controller/java/templates/partials/encode_value.zapt b/src/controller/java/templates/partials/encode_value.zapt
@@ -1,24 +1,40 @@
 {{#if isOptional}}
-chip::JniReferences::GetInstance().GetOptionalValue({{label}}, {{label}});
+chip::JniReferences::GetInstance().GetOptionalValue({{source}}, {{source}});
 {{/if}}
 {{#if isNullable}}
  {{#if_chip_enum type}}
- decltype(request.{{label}}) {{label}}Primitive;
- if ({{label}} != nullptr) {
- {{label}}Primitive = static_cast<decltype(request.{{label}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{label}}));
+ decltype({{target}}) {{source}}Value;
+ if ({{source}} != nullptr) {
+ {{source}}Value = static_cast<decltype({{target}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{source}}));
  }
  {{else}}
- {{#if_is_bitmap type}}
- decltype(request.{{label}}) {{label}}Primitive;
- if ({{label}} != nullptr) {
- {{label}}Primitive = static_cast<decltype(request.{{label}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{label}}));
+ {{#if isArray}}
+ {{! TODO: Support array types. }}
+ {{else if isStruct}}
+ {{! TODO: Support struct types. }}
+ {{else if (isOctetString type)}}
+ chip::ByteSpan {{source}}Value;
+ if ({{source}} != nullptr) {
+ {{source}}Value = chip::JniByteArray(env, static_cast<jbyteArray>({{source}})).byteSpan();
  }
- {{else}}
- {{chipType}} {{label}}Primitive;
- if ({{label}} != nullptr) {
- {{label}}Primitive = chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{label}});
+ {{else if (isCharString type)}}
+ chip::CharSpan {{source}}Value;
+ if ({{source}} != nullptr) {
+ {{source}}Value = chip::JniUtfString(env, static_cast<jstring>({{source}})).charSpan();
  }
- {{/if_is_bitmap}}
+ {{else}}
+ {{#if_is_bitmap type}}
+ decltype({{target}}) {{source}}Value;
+ if ({{source}} != nullptr) {
+ {{source}}Value = static_cast<decltype({{target}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{source}}));
+ }
+ {{else}}
+ {{chipType}} {{source}}Value;
+ if ({{source}} != nullptr) {
+ {{source}}Value = chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{source}});
+ }
+ {{/if_is_bitmap}}
+ {{/if}}
  {{/if_chip_enum}}
 {{/if}}
 {{#*inline "value"}}
@@ -28,27 +44,27 @@ chip::JniReferences::GetInstance().GetOptionalValue({{label}}, {{label}});
 {{else if isStruct}}
 {{zapTypeToEncodableClusterObjectType type ns=parent.parent.name}}()
 {{else if (isOctetString type)}}
-chip::JniByteArray(env, static_cast<jbyteArray>({{label}})).byteSpan()
+chip::JniByteArray(env, static_cast<jbyteArray>({{source}})).byteSpan()
 {{else if (isCharString type)}}
-chip::JniUtfString(env, static_cast<jstring>({{label}})).charSpan()
+chip::JniUtfString(env, static_cast<jstring>({{source}})).charSpan()
 {{else}}
  {{#if_chip_enum type}}
- static_cast<decltype(request.{{label}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{label}}))
+ static_cast<decltype({{target}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{source}}))
  {{else}}
  {{#if_is_bitmap type}}
- static_cast<decltype(request.{{label}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{label}}))
+ static_cast<decltype({{target}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{source}}))
  {{else}}
- static_cast<decltype(request.{{label}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{label}}))
+ static_cast<decltype({{target}})>(chip::JniReferences::GetInstance().{{asJavaBoxedType type}}ToPrimitive({{source}}))
  {{/if_is_bitmap}}
  {{/if_chip_enum}}
 {{/if}}
 {{/inline}}
-request.{{label}} =
+{{target}} =
 {{#if isOptional}}
 {{zapTypeToEncodableClusterObjectType type ns=parent.parent.name}}(
 {{/if}}
 {{#if isNullable}}
- {{label}} == nullptr ? chip::app::DataModel::Nullable<{{chipType}}>() : chip::app::DataModel::Nullable<{{chipType}}>({{label}}Primitive)
+ {{source}} == nullptr ? chip::app::DataModel::Nullable<{{chipType}}>() : chip::app::DataModel::Nullable<{{chipType}}>({{source}}Value)
  {{else}}
 {{! TODO If the inline partial is indented, generation fails with "result.split is not a function". }}
 {{>value}}

diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp