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 2020/06/23 10:35:39 UTC
[plc4x] branch develop updated: - Fixed some problems related to
the refactoring of the discriminators
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 1849c3f - Fixed some problems related to the refactoring of the discriminators
1849c3f is described below
commit 1849c3fa2f369ce874ee7158c0cfcb0fb249b1a8
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Jun 23 12:35:32 2020 +0200
- Fixed some problems related to the refactoring of the discriminators
---
.../language-java/src/main/resources/templates/java/pojo-template.ftlh | 1 +
.../drivers/knxnetip/src/test/resources/testsuite/KNXNetIPTestsuite.xml | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
index 43da35d..4325dae 100644
--- a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
@@ -93,6 +93,7 @@ public<#if helper.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${
<#list helper.getDiscriminatorValues(discriminatedChildType) as discriminatorName, discriminatorValue>
<#-- If the discriminator name matches that of another field, suppress the methods generation -->
<#if !helper.isNonDiscriminatorField(discriminatorName)>
+ @JsonIgnore
public ${helper.getLanguageTypeNameForTypeReference(helper.getDiscriminatorTypes()[discriminatorName])} get${discriminatorName?cap_first}() {
return <#if discriminatorValue??>${discriminatorValue}<#else>${helper.getNullValueForTypeReference(helper.getDiscriminatorTypes()[discriminatorName])}</#if>;
}
diff --git a/plc4j/drivers/knxnetip/src/test/resources/testsuite/KNXNetIPTestsuite.xml b/plc4j/drivers/knxnetip/src/test/resources/testsuite/KNXNetIPTestsuite.xml
index beca9a9..5f52c17 100644
--- a/plc4j/drivers/knxnetip/src/test/resources/testsuite/KNXNetIPTestsuite.xml
+++ b/plc4j/drivers/knxnetip/src/test/resources/testsuite/KNXNetIPTestsuite.xml
@@ -335,8 +335,6 @@
</additionalInformation>
</additionalInformation>
<cemiFrame className="org.apache.plc4x.java.knxnetip.readwrite.CEMIFrameData">
- <standardFrame>true</standardFrame>
- <polling>false</polling>
<doNotRepeat>true</doNotRepeat>
<priority>LOW</priority>
<sourceAddress className="org.apache.plc4x.java.knxnetip.readwrite.KNXAddress">