Fix optional encode and decode (#15539)

project-chip · Oct 20, 2023 · 062970b · 062970b
1 parent 9f443ac
commit 062970b
Show file tree

Hide file tree

Showing 6 changed files with 777 additions and 546 deletions.
diff --git a/src/controller/java/templates/partials/decode_value.zapt b/src/controller/java/templates/partials/decode_value.zapt
@@ -5,7 +5,9 @@ jobject {{target}};
 if (!{{source}}.HasValue()) {
   chip::JniReferences::GetInstance().CreateOptional(nullptr, {{target}});
 } else {
-  {{>decode_value target=target source=(concat source ".Value()") cluster=cluster depth=(incrementDepth depth) isOptional=false omitDeclaration=true earlyReturn=earlyReturn}}
+  jobject {{target}}InsideOptional;
+  {{>decode_value target=(concat target "InsideOptional") source=(concat source ".Value()") cluster=cluster depth=(incrementDepth depth) isOptional=false omitDeclaration=true earlyReturn=earlyReturn}}
+  chip::JniReferences::GetInstance().CreateOptional({{target}}InsideOptional, {{target}});
 }
 {{else if isNullable}}
 if ({{source}}.IsNull()) {

diff --git a/src/controller/java/templates/partials/encode_value.zapt b/src/controller/java/templates/partials/encode_value.zapt
@@ -2,8 +2,10 @@
   if ({{source}} != nullptr) {
     jobject optionalValue_{{depth}};
     chip::JniReferences::GetInstance().GetOptionalValue({{source}}, optionalValue_{{depth}});
-    auto & definedValue_{{depth}} = {{target}}.Emplace();
-    {{>encode_value target=(concat "definedValue_" depth) source=(concat "optionalValue_" depth) cluster=cluster depth=(incrementDepth depth) isOptional=false}}
+    if (optionalValue_{{depth}} != nullptr) {
+      auto & definedValue_{{depth}} = {{target}}.Emplace();
+      {{>encode_value target=(concat "definedValue_" depth) source=(concat "optionalValue_" depth) cluster=cluster depth=(incrementDepth depth) isOptional=false}}
+    }
   }
 {{else if isNullable}}
   if ({{source}} == nullptr) {