-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Android] Decouple generated API - 2 (#28010)
* decouple ChipStructs, ChipIDMapping * modify build.gn * restore kotlin file * Restyled by autopep8 * add matter idl file * Seperate each class * Restyled by autopep8 * add exclude kotlin check (generated file) * remove previous generated file * add kotlin check config * relocation * remodified * Remove MagicNumber check * remove kotlin check exception * Update generated kt file * update TlvReaderExt * modify unused import * Update generated file * Update unit test * fix kotlin static check error * Restyled by whitespace * update build.gn * Kotlin format * Run kotlin format during zap regen * Restyled by autopep8 * Fix traceback print * Install a newer openjdk for zap generation * Try to make linter happy * Try to make linter happy * Fix unit tests --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Andrei Litvin <andy314@gmail.com> Co-authored-by: Andrei Litvin <andreilitvin@google.com>
- Loading branch information
Showing
160 changed files
with
12,460 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
153 changes: 153 additions & 0 deletions
153
scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs.jinja
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| {%- macro encode_value(source, encodable, depth) -%} | ||
| {%- if encodable.is_nullable -%} | ||
| {{encode_value(source, encodable.without_nullable(), depth + 1)}}? | ||
| {%- elif encodable.is_optional -%} | ||
| Optional<{{encode_value(source, encodable.without_optional(), depth + 1)}}> | ||
| {%- elif encodable.is_list -%} | ||
| List<{{encode_value(source, encodable.without_list(), depth + 1)}}> | ||
| {%- elif encodable.is_struct -%} | ||
| {%- set struct = encodable.get_underlying_struct() -%} | ||
| chip.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}} | ||
| {%- else -%} | ||
| {{encodable.kotlin_type}} | ||
| {%- endif -%} | ||
| {%- endmacro -%} | ||
|
|
||
| {%- macro encode_tlv(encodable, tag, name, depth) %} | ||
| {%- if encodable.is_nullable -%} | ||
| if ({{name}} != null) { | ||
| {{encode_tlv(encodable.without_nullable(), tag, name, depth + 1)}} | ||
| } else { | ||
| putNull({{tag}}) | ||
| } | ||
| {%- elif encodable.is_optional -%} | ||
| if ({{name}}.isPresent) { | ||
| val opt{{name}} = {{name}}.get() | ||
| {{encode_tlv(encodable.without_optional(), tag, "opt" + name, depth + 1)}} | ||
| } | ||
| {%- elif encodable.is_list -%} | ||
| startList({{tag}}) | ||
| for (item in {{name}}.iterator()) { | ||
| {{encode_tlv(encodable.without_list(), "AnonymousTag", "item", depth + 1)}} | ||
| } | ||
| endList() | ||
| {%- elif encodable.is_struct -%} | ||
| {{name}}.toTlv({{tag}}, this) | ||
| {%- else -%} | ||
| put({{tag}}, {{name}}) | ||
| {%- endif -%} | ||
| {%- endmacro -%} | ||
|
|
||
| {%- macro decode_tlv(source, encodable, tag, depth) %} | ||
| {%- if encodable.is_nullable -%} | ||
| if (!tlvReader.isNull()) { | ||
| {{decode_tlv(source, encodable.without_nullable(), tag, depth + 1)}} | ||
| } else { | ||
| tlvReader.getNull({{tag}}) | ||
| null | ||
| } | ||
| {%- elif encodable.is_optional -%} | ||
| if (tlvReader.isNextTag({{tag}})) { | ||
| Optional.of({{decode_tlv(source, encodable.without_optional(), tag, depth + 1)}}) | ||
| } else { | ||
| Optional.empty() | ||
| } | ||
| {%- elif encodable.is_list -%} | ||
| {%- set encodablewithoutlist = encodable.without_list() -%} | ||
| buildList <{{encode_value(source, encodablewithoutlist, depth + 1)}}> { | ||
| tlvReader.enterList({{tag}}) | ||
| while(!tlvReader.isEndOfContainer()) { | ||
| this.add({{decode_tlv(source, encodablewithoutlist, "AnonymousTag", depth + 1)}}) | ||
| } | ||
| tlvReader.exitContainer() | ||
| } | ||
| {%- elif encodable.is_struct -%} | ||
| {%- set struct = encodable.get_underlying_struct() -%} | ||
| chip.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader) | ||
| {%- else -%} | ||
| tlvReader.get{{encodable.kotlin_type}}({{tag}}) | ||
| {%- endif -%} | ||
| {%- endmacro -%} | ||
|
|
||
| {%- macro contextSpecificTag(field) -%} | ||
| ContextSpecificTag(TAG_{{field.name | constcase}}) | ||
| {%- endmacro -%} | ||
|
|
||
| /* | ||
| * | ||
| * Copyright (c) 2023 Project CHIP Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package chip.devicecontroller.cluster.eventstructs | ||
|
|
||
| import chip.devicecontroller.cluster.* | ||
| import chip.tlv.AnonymousTag | ||
| import chip.tlv.ContextSpecificTag | ||
| import chip.tlv.Tag | ||
| import chip.tlv.TlvParsingException | ||
| import chip.tlv.TlvReader | ||
| import chip.tlv.TlvWriter | ||
|
|
||
| import java.util.Optional | ||
|
|
||
| class {{cluster.name}}Cluster{{event.name}}Event ( | ||
| {%- for field in event.fields -%} | ||
| {%- set encodable = field | asEncodable(typeLookup) %} | ||
| val {{field.name}}: {{encode_value(cluster, encodable, 0)}} | ||
| {%- if loop.index0 < loop.length - 1 -%}{{","}}{%- endif -%} | ||
| {%- endfor -%}) { | ||
| override fun toString(): String = buildString { | ||
| append("{{cluster.name}}Cluster{{event.name}}Event {\n") | ||
| {%- for field in event.fields %} | ||
| append("\t{{field.name}} : ${{field.name}}\n") | ||
| {%- endfor %} | ||
| append("}\n") | ||
| } | ||
|
|
||
| fun toTlv(tag: Tag, tlvWriter: TlvWriter) { | ||
| tlvWriter.apply { | ||
| startStructure(tag) | ||
| {% for field in event.fields %} | ||
| {%- set encodable = field | asEncodable(typeLookup) %} | ||
| {%- set tag = contextSpecificTag(field) -%} | ||
| {{encode_tlv(encodable, tag, field.name, 0)}} | ||
| {% endfor -%} | ||
| endStructure() | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| {%- for field in event.fields %} | ||
| private const val TAG_{{field.name | constcase}} = {{field.code}} | ||
| {%- endfor %} | ||
|
|
||
| fun fromTlv(tag: Tag, tlvReader: TlvReader) : {{cluster.name}}Cluster{{event.name}}Event { | ||
| tlvReader.enterStructure(tag) | ||
| {% for field in event.fields %} | ||
| {%- set decodable = field | asEncodable(typeLookup) %} | ||
| {%- set tag = contextSpecificTag(field) -%} | ||
| val {{field.name}} = {{decode_tlv(cluster, decodable, tag, 0)}} | ||
| {% endfor %} | ||
| tlvReader.exitContainer() | ||
|
|
||
| return {{cluster.name}}Cluster{{event.name}}Event( | ||
| {%- for field in event.fields -%} | ||
| {%- set encodable = field | asEncodable(typeLookup) -%} | ||
| {{field.name}} | ||
| {%- if loop.index0 < loop.length - 1 -%}{{", "}}{%- endif -%} | ||
| {%- endfor -%} | ||
| ) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.