fix(plc4c): fix tracer for enums

apache · Sep 28, 2021 · c3e13b7 · c3e13b7
1 parent e0819a8
commit c3e13b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -845,10 +845,8 @@ public Map<String, Map<String, String>> getDiscriminatorValues() {
     }
 
     public TypeReference getArgumentType(TypeReference typeReference, int index) {
-        if (!(typeReference instanceof ComplexTypeReference)) {
-            throw new FreemarkerException("Only complex type references supported here.");
-        }
-        ComplexTypeReference complexTypeReference = (ComplexTypeReference) typeReference;
+        Objects.requireNonNull(typeReference, "type reference must not be null");
+        ComplexTypeReference complexTypeReference = typeReference.asComplexTypeReference().orElseThrow(() -> new FreemarkerException("Only complex type references supported here."));
         if (!getTypeDefinitions().containsKey(complexTypeReference.getName())) {
             throw new FreemarkerException("Could not find definition of complex type " + complexTypeReference.getName());
         }

diff --git a/...eration/language-c/src/main/java/org/apache/plc4x/language/c/CLanguageTemplateHelper.java b/...eration/language-c/src/main/java/org/apache/plc4x/language/c/CLanguageTemplateHelper.java
@@ -937,8 +937,7 @@ private String toVariableSerializationExpression(TypeDefinition baseType, Field
                 if ((typeDefinitionForTypeReference instanceof EnumTypeDefinition) && (variableLiteral.getChild().isPresent())) {
                     tracer = tracer.dive("is enum type definition");
                     sb.append(camelCaseToSnakeCase(variableLiteral.getName()));
-                    return getCTypeName(typeDefinitionForTypeReference.getName()) +
-                        tracer + "_get_" + camelCaseToSnakeCase(variableLiteral.getChild().get().getName()) +
+                    return tracer + getCTypeName(typeDefinitionForTypeReference.getName()) + "_get_" + camelCaseToSnakeCase(variableLiteral.getChild().get().getName()) +
                         "(" + sb + ")";
                 }
             }