fix(plc4j/codgen): fixed issue with missing type reference params

apache · Nov 17, 2021 · 1329013 · 1329013
1 parent 72cb49f
commit 1329013
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -850,6 +850,7 @@ public Map<String, Map<String, String>> getDiscriminatorValues() {
         }
         return thisType.getDiscriminatorCaseToKeyValueMap();
     }
+
     public TypeReference getArgumentType(TypeReference typeReference, int index) {
         Objects.requireNonNull(typeReference, "type reference must not be null");
         ComplexTypeReference complexTypeReference = typeReference.asComplexTypeReference().orElseThrow(() -> new FreemarkerException("Only complex type references supported here."));

diff --git a/...e/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java b/...e/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultTypeDefinition.java
@@ -23,12 +23,11 @@
 import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
 import org.apache.plc4x.plugins.codegenerator.types.references.DefaultComplexTypeReference;
 import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+import org.apache.plc4x.plugins.codegenerator.types.terms.DefaultVariableLiteral;
 import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public abstract class DefaultTypeDefinition {
 
@@ -49,7 +48,7 @@ public String getName() {
     }
 
     public Optional<Term> getAttribute(String attributeName) {
-        if(attributes.containsKey(attributeName)) {
+        if (attributes.containsKey(attributeName)) {
             return Optional.of(attributes.get(attributeName));
         }
         return Optional.empty();
@@ -68,7 +67,13 @@ public void setParentType(TypeDefinition parentType) {
     }
 
     public TypeReference getTypeReference() {
-        return new DefaultComplexTypeReference(getName(), null);
+        List<Term> params = getParserArguments()
+            .map(arguments -> arguments.stream()
+                .map(argument -> new DefaultVariableLiteral(argument.getName(), null, -1, null))
+                .map(Term.class::cast)
+                .collect(Collectors.toList()))
+            .orElse(null);
+        return new DefaultComplexTypeReference(getName(), params);
     }
 
 }