[plc4x-build-tools] branch develop updated: fix(codegen): isNonDiscriminatorField has broken logic

[sr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x-build-tools.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5b038cf  fix(codegen): isNonDiscriminatorField has broken logic
5b038cf is described below

commit 5b038cf6797298ffa013d6063d4f14bf77b4244e
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Mon Mar 7 15:00:37 2022 +0100

    fix(codegen): isNonDiscriminatorField has broken logic
---
 .../plugins/codegenerator/types/definitions/ComplexTypeDefinition.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/ComplexTypeDefinition.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/ComplexTypeDefinition.java
index 8f2273e..6428fc6 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/ComplexTypeDefinition.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/ComplexTypeDefinition.java
@@ -269,7 +269,7 @@ public interface ComplexTypeDefinition extends TypeDefinition {
                 .anyMatch(field -> !(field instanceof DiscriminatorField) && field.getName().equals(discriminatorName));
         boolean hasMatchingVirtualField = getAllVirtualFields().stream()
                 .anyMatch(field -> field.getName().equals(discriminatorName));
-        return hasMatchingPropertyField && hasMatchingVirtualField;
+        return hasMatchingPropertyField || hasMatchingVirtualField;
     }
 
     default boolean isParserArgument(String discriminatorName) {