You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2021/10/22 11:16:27 UTC
[plc4x] 02/02: - Fixed the problem with enum fields and simplified
the code generated for complex types
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/mspec-ng
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 824831803e8b5998cb9d1723436fb0bb16770b85
Author: cdutz <ch...@c-ware.de>
AuthorDate: Fri Oct 22 13:14:41 2021 +0200
- Fixed the problem with enum fields and simplified the code generated for complex types
---
.../main/resources/templates/java/io-template.java.ftlh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/code-generation/language-java/src/main/resources/templates/java/io-template.java.ftlh b/code-generation/language-java/src/main/resources/templates/java/io-template.java.ftlh
index 0df71d7..bdb25da 100644
--- a/code-generation/language-java/src/main/resources/templates/java/io-template.java.ftlh
+++ b/code-generation/language-java/src/main/resources/templates/java/io-template.java.ftlh
@@ -303,6 +303,14 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
readBuffer.closeContext("${arrayField.name}", WithReaderWriterArgs.WithRenderAsList(true));
</#if>
<#break>
+ <#case "assert">
+ <#assign assertField = field.asAssertField().orElseThrow()>
+ <#assign typedField = field.asTypedField().orElseThrow()>
+ <#assign namedField = field.asNamedField().orElseThrow()>
+
+ // ${field.typeName?cap_first} Field (${namedField.name})
+ ${helper.getLanguageTypeNameForField(field)} ${namedField.name} = read${field.typeName?cap_first}Field("${namedField.name}", ${helper.getDataReaderCall(typedField.type)}, ${type.name}.${namedField.name?upper_case});
+ <#break>
<#-- TODO: Port this -->
<#case "checksum">
<#assign checksumField = field.asChecksumField().orElseThrow()>
@@ -455,14 +463,6 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
</#if>
${helper.getLanguageTypeNameForField(field)} ${namedField.name} = read${field.typeName?cap_first}Field("${namedField.name}", ${helper.getDataReaderCall(typedField.type)}<#if optionalField.conditionExpression.present>, ${helper.toParseExpression(optionalField, optionalField.conditionExpression.get(), parserArguments)}</#if>);
<#break>
- <#case "assert">
- <#assign assertField = field.asAssertField().orElseThrow()>
- <#assign typedField = field.asTypedField().orElseThrow()>
- <#assign namedField = field.asNamedField().orElseThrow()>
-
- // ${field.typeName?cap_first} Field (${namedField.name})
- ${helper.getLanguageTypeNameForField(field)} ${namedField.name} = read${field.typeName?cap_first}Field("${namedField.name}", ${helper.getDataReaderCall(typedField.type)}, ${type.name}.${namedField.name?upper_case});
- <#break>
<#case "padding">
<#assign paddingField = field.asPaddingField().orElseThrow()>
<#assign typedField = field.asTypedField().orElseThrow()>