You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/02/23 14:56:26 UTC
[plc4x] branch feature/cleaned-up-type-references updated: fix(codegen): fixed some issues with parent types
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch feature/cleaned-up-type-references
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/cleaned-up-type-references by this push:
new 080640d fix(codegen): fixed some issues with parent types
080640d is described below
commit 080640dc4d6b93413bf85ceb7b503b96391eb62d
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Feb 23 15:56:17 2022 +0100
fix(codegen): fixed some issues with parent types
---
.../BaseFreemarkerLanguageTemplateHelper.java | 4 ++--
.../language/java/JavaLanguageTemplateHelper.java | 7 +++----
.../resources/templates/java/model-template.java.ftlh | 18 +++++++++---------
.../definitions/DefaultComplexTypeDefinition.java | 3 ---
.../mspec/model/definitions/DefaultTypeDefinition.java | 3 ---
5 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
index c306a70..b785533 100644
--- a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
+++ b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -100,10 +100,10 @@ public abstract class BaseFreemarkerLanguageTemplateHelper implements Freemarker
if (typeReference == null) {
return false;
}
- if (!typeReference.isComplexTypeReference()) {
+ if (!typeReference.isEnumTypeReference()) {
return false;
}
- return typeReference.asComplexTypeReference().orElseThrow().getTypeDefinition().isEnumTypeDefinition();
+ return typeReference.asEnumTypeReference().orElseThrow().getTypeDefinition().isEnumTypeDefinition();
}
/**
diff --git a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
index 1c18eb8..206964b 100644
--- a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
+++ b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
@@ -92,7 +92,7 @@ public class JavaLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHe
public String getLanguageTypeNameForTypeReference(TypeReference typeReference, boolean allowPrimitive) {
Objects.requireNonNull(typeReference);
if (!(typeReference instanceof SimpleTypeReference)) {
- return ((ComplexTypeReference) typeReference).getName();
+ return ((NonSimpleTypeReference) typeReference).getName();
}
SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference;
switch (simpleTypeReference.getBaseType()) {
@@ -366,11 +366,10 @@ public class JavaLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHe
} else if (typeReference.isComplexTypeReference()) {
StringBuilder paramsString = new StringBuilder();
ComplexTypeReference complexTypeReference = typeReference.asComplexTypeReference().orElseThrow(IllegalStateException::new);
- TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typeReference);
- Objects.requireNonNull(typeDefinition, "No type found for " + typeReference);
+ ComplexTypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typeReference).asComplexTypeDefinition().orElseThrow();
String parserCallString = getLanguageTypeNameForTypeReference(typeReference);
if (typeDefinition.isDiscriminatedChildTypeDefinition()) {
- parserCallString = "(" + getLanguageTypeNameForTypeReference(typeReference) + ") " + typeDefinition.getParentType().getName();
+ parserCallString = "(" + getLanguageTypeNameForTypeReference(typeReference) + ") " + typeDefinition.getParentType().orElseThrow().getName();
}
List<Term> paramTerms = complexTypeReference.getParams().orElse(Collections.emptyList());
for (int i = 0; i < paramTerms.size(); i++) {
diff --git a/code-generation/language-java/src/main/resources/templates/java/model-template.java.ftlh b/code-generation/language-java/src/main/resources/templates/java/model-template.java.ftlh
index 7e686ce..8e28069 100644
--- a/code-generation/language-java/src/main/resources/templates/java/model-template.java.ftlh
+++ b/code-generation/language-java/src/main/resources/templates/java/model-template.java.ftlh
@@ -68,7 +68,7 @@ import java.math.BigInteger;
<#-- TODO: the code below implies that parserArguments will be null if not present... not pretty -->
<#if type.parserArguments.isPresent()><#assign parserArguments=type.allParserArguments.orElseThrow()></#if>
-public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${type.name}<#if type.isDiscriminatedParentTypeDefinition()></#if><#if type.parentType??> extends ${type.parentType.name}</#if> implements Message {
+public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${type.name}<#if type.isDiscriminatedParentTypeDefinition()></#if><#if type.parentType.isPresent()> extends ${type.parentType.orElseThrow().name}</#if> implements Message {
<#--
If this is a discriminated child type, we need to generate methods for accessing it's discriminator
@@ -169,8 +169,8 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
<#sep>, </#sep>
</#list>
</#if>
- <#if type.parentType?has_content && type.parentType.allParserArguments.isPresent()>
- <#assign filteredParentParserArguments = type.parentType.allParserArguments.orElseThrow()?filter(arg -> !type.parentType.asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
+ <#if type.parentType.isPresent() && type.parentType.orElseThrow().allParserArguments.isPresent()>
+ <#assign filteredParentParserArguments = type.parentType.orElseThrow().allParserArguments.orElseThrow()?filter(arg -> !type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().isDiscriminatorField(arg.name))>
<#if filteredParentParserArguments?has_content>
<#if type.parentPropertyFields?has_content>, </#if>
<#list filteredParentParserArguments as parserArgument>
@@ -220,7 +220,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
<#if outputFlavor != "passive">
<#if type.isDiscriminatedChildTypeDefinition()>
@Override
- protected void serialize${type.parentType.name}Child(WriteBuffer writeBuffer) throws SerializationException {
+ protected void serialize${type.parentType.orElseThrow().name}Child(WriteBuffer writeBuffer) throws SerializationException {
<#else>
<#if type.isDiscriminatedParentTypeDefinition()>
abstract protected void serialize${type.name?cap_first}Child(WriteBuffer writeBuffer) throws SerializationException;
@@ -378,7 +378,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
@Override
public int getLengthInBits() {
- int lengthInBits = <#if type.parentType??>super.getLengthInBits()<#else>0</#if>;
+ int lengthInBits = <#if type.parentType.isPresent()>super.getLengthInBits()<#else>0</#if>;
${type.name} _value = this;
<#list type.fields as field>
<#switch field.typeName>
@@ -783,7 +783,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
</#if>
<#if type.isDiscriminatedChildTypeDefinition()>
- public static class ${type.name}Builder implements ${type.parentType.name}.${type.parentType.name}Builder {
+ public static class ${type.name}Builder implements ${type.parentType.orElseThrow().name}.${type.parentType.orElseThrow().name}Builder {
<#if type.propertyFields?has_content>
<#list type.propertyFields as field>
private final <#if field.loopType?? && field.type.isByteBased()>byte[]<#elseif field.loopType??>List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}><#else>${helper.getLanguageTypeNameForField(field)}</#if> ${field.name};
@@ -806,7 +806,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
</#if>
}
- public ${type.name} build(<#list type.parentType.asComplexTypeDefinition().orElseThrow().propertyFields as field><#if field.loopType?? && field.type.isByteBased()>byte[]<#elseif field.loopType??>List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}><#else>${helper.getLanguageTypeNameForField(field)}</#if> ${field.name}<#sep>, </#sep></#list><#if filteredParentParserArguments?has_content><#if type.parentType.asComplexTypeDefinition().orElseThrow().propertyFields?has_conten [...]
+ public ${type.name} build(<#list type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow().propertyFields as field><#if field.loopType?? && field.type.isByteBased()>byte[]<#elseif field.loopType??>List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}><#else>${helper.getLanguageTypeNameForField(field)}</#if> ${field.name}<#sep>, </#sep></#list><#if filteredParentParserArguments?has_content><#if type.parentType.orElseThrow().asComplexTypeDefinition().orElseThrow [...]
return new ${type.name}(<#list type.allPropertyFields as field>${field.name}<#sep>, </#sep></#list><#if filteredParserArguments?has_content><#if type.allPropertyFields?has_content>, </#if><#list filteredParserArguments as arg>${arg.name}<#sep>, </#sep></#list></#if>);
}
}
@@ -828,7 +828,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
(get${field.name?cap_first}() == that.get${field.name?cap_first}()) &&
</#list>
</#if>
- <#if type.parentType??>
+ <#if type.parentType.isPresent()>
super.equals(that) &&
</#if>
true;
@@ -837,7 +837,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
@Override
public int hashCode() {
return Objects.hash(
- <#if type.parentType??>
+ <#if type.parentType.isPresent()>
super.hashCode()<#if type.propertyFields?has_content>,</#if>
</#if>
<#if type.propertyFields?has_content>
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
index bc878dd..eeefacb 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultComplexTypeDefinition.java
@@ -55,9 +55,6 @@ public class DefaultComplexTypeDefinition extends DefaultTypeDefinition implemen
if (parserArguments != null) {
allArguments.addAll(parserArguments);
}
- if (allArguments.isEmpty()) {
- return Optional.empty();
- }
return Optional.of(allArguments);
}
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java
index 89145fd..74ff2ec 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java
@@ -56,9 +56,6 @@ public abstract class DefaultTypeDefinition {
if (parserArguments != null) {
allArguments.addAll(parserArguments);
}
- if (allArguments.isEmpty()) {
- return Optional.empty();
- }
return Optional.of(allArguments);
}