fix(plc4j/codgen): avoid duplicating params

apache · Oct 27, 2021 · 194cff3 · 194cff3
1 parent 8a16e46
commit 194cff3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...anguage-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/...anguage-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
@@ -379,13 +379,15 @@ public String getDataReaderCall(TypeReference typeReference, String resolverMeth
             StringBuilder paramsString = new StringBuilder();
             ComplexTypeReference complexTypeReference = typeReference.asComplexTypeReference().orElseThrow(IllegalStateException::new);
             TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typeReference);
+            int parentParamIndex = -1;
             if (typeDefinition.isDiscriminatedChildTypeDefinition()) {
                 List<Term> parentParamTerms = typeDefinition.getParentType().getTypeReference().asComplexTypeReference()
                     .orElseThrow(() -> new IllegalStateException("Shouldn't happen as the parent must be complex"))
                     .getParams()
                     .orElse(Collections.emptyList());
                 ComplexTypeReference parentTypeReference = typeDefinition.getParentType().getTypeReference().asComplexTypeReference().orElseThrow(IllegalStateException::new);
                 for (int i = 0; i < parentParamTerms.size(); i++) {
+                    parentParamIndex++;
                     Term paramTerm = parentParamTerms.get(i);
                     paramsString
                         .append(", (")
@@ -396,6 +398,10 @@ public String getDataReaderCall(TypeReference typeReference, String resolverMeth
             }
             List<Term> paramTerms = complexTypeReference.getParams().orElse(Collections.emptyList());
             for (int i = 0; i < paramTerms.size(); i++) {
+                if (i <= parentParamIndex) {
+                    // Ignore params that are part of the parent
+                    continue;
+                }
                 Term paramTerm = paramTerms.get(i);
                 paramsString
                     .append(", (")