refactor(plc4go/codegen): fixed virtual field implementation

+ Added parser arguments as field like in plc4j + fixed several bugs in code generation
apache · Feb 14, 2022 · e02e64d · e02e64d
1 parent 33e07bd
commit e02e64d
Show file tree

Hide file tree

Showing 693 changed files with 10,132 additions and 8,448 deletions.
diff --git a/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java b/...plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -510,7 +510,7 @@ public boolean isEnumField(Field field) {
         if (isSimpleTypeReference(typeReference)) {
             return false;
         }
-        TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typedField.getType());
+        TypeDefinition typeDefinition = getTypeDefinitionForTypeReference(typeReference);
         return typeDefinition instanceof EnumTypeDefinition;
     }
 

diff --git a/...tion/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java b/...tion/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
diff --git a/code-generation/language-go/src/main/resources/templates/go/data-io-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/data-io-template.go.ftlh
@@ -85,7 +85,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if parserArguments?has_conte
                         <#assign enumValue=helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)>
                         <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)>
                         <#assign enumValueTraces=tracer.extractTraces(enumValue)>
-                        ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces}
+                        ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")}
 					<#else>
 						${helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)}
 					</#if>
@@ -204,6 +204,18 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if parserArguments?has_conte
 }
 
 func ${type.name}Serialize(writeBuffer utils.WriteBuffer, value api.PlcValue<#if parserArguments?has_content>, <#list parserArguments as parserArgument>${parserArgument.name} <#if helper.isComplexTypeReference(parserArgument.type) && !helper.isEnumTypeReference(parserArgument.type)>I</#if>${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}<#sep>, </#sep></#list></#if>) error {
+	<#if parserArguments?has_content>
+	m := struct {
+    	<#list parserArguments as parserArgument>
+			${parserArgument.name?cap_first} <#if helper.isComplexTypeReference(parserArgument.type) && !helper.isEnumTypeReference(parserArgument.type)>I</#if>${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
+		</#list>
+	}{
+		<#list parserArguments as parserArgument>
+			${parserArgument.name?cap_first}: ${parserArgument.name},
+		</#list>
+	}
+	_ = m
+	</#if>
 	writeBuffer.PushContext("${type.name}")
 	switch {
 	<#assign defaultSet=false>
@@ -221,7 +233,7 @@ func ${type.name}Serialize(writeBuffer utils.WriteBuffer, value api.PlcValue<#if
                         <#assign enumValue=helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)>
                         <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)>
                         <#assign enumValueTraces=tracer.extractTraces(enumValue)>
-                        ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces}
+                        ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")}
 					<#else>
 						${helper.toParseExpression(null, parserArguments[discriminatorValueTerm?index].type, discriminatorValueTerm, parserArguments)}
 					</#if>

diff --git a/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/enum-template.go.ftlh
@@ -162,13 +162,13 @@ func Cast${type.name}(structType interface{}) ${type.name} {
 	return castFunc(structType)
 }
 
-func (m ${type.name}) LengthInBits() uint16 {
+func (m ${type.name}) GetLengthInBits() uint16 {
 	<#assign simpleTypeReference = type.type.asSimpleTypeReference().orElseThrow()>
 	return <#if type.type.isStringTypeReference()>0<#else>${simpleTypeReference.sizeInBits}</#if>
 }
 
-func (m ${type.name}) LengthInBytes() uint16 {
-	return m.LengthInBits() / 8
+func (m ${type.name}) GetLengthInBytes() uint16 {
+	return m.GetLengthInBits() / 8
 }
 
 <#if type.type?has_content && helper.isSimpleTypeReference(type.type)>

diff --git a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
diff --git a/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml
@@ -522,10 +522,10 @@
                               <BACnetApplicationTagDate>
                                 <payload>
                                   <BACnetTagPayloadDate>
-                                    <yearMinus1900 dataType="int" bitLength="8">106</yearMinus1900>
-                                    <month dataType="int" bitLength="8">9</month>
-                                    <dayOfMonth dataType="int" bitLength="8">23</dayOfMonth>
-                                    <dayOfWeek dataType="int" bitLength="8">6</dayOfWeek>
+                                    <yearMinus1900 dataType="uint" bitLength="8">106</yearMinus1900>
+                                    <month dataType="uint" bitLength="8">9</month>
+                                    <dayOfMonth dataType="uint" bitLength="8">23</dayOfMonth>
+                                    <dayOfWeek dataType="uint" bitLength="8">6</dayOfWeek>
                                   </BACnetTagPayloadDate>
                                 </payload>
                               </BACnetApplicationTagDate>
@@ -545,10 +545,10 @@
                               <BACnetApplicationTagTime>
                                 <payload>
                                   <BACnetTagPayloadTime>
-                                    <hour dataType="int" bitLength="8">23</hour>
-                                    <minute dataType="int" bitLength="8">9</minute>
-                                    <second dataType="int" bitLength="8">54</second>
-                                    <fractional dataType="int" bitLength="8">0</fractional>
+                                    <hour dataType="uint" bitLength="8">23</hour>
+                                    <minute dataType="uint" bitLength="8">9</minute>
+                                    <second dataType="uint" bitLength="8">54</second>
+                                    <fractional dataType="uint" bitLength="8">0</fractional>
                                   </BACnetTagPayloadTime>
                                 </payload>
                               </BACnetApplicationTagTime>
@@ -7767,10 +7767,10 @@ make -f wp.mak clean</value>
                               <BACnetApplicationTagDate>
                                 <payload>
                                   <BACnetTagPayloadDate>
-                                    <yearMinus1900 dataType="int" bitLength="8">106</yearMinus1900>
-                                    <month dataType="int" bitLength="8">9</month>
-                                    <dayOfMonth dataType="int" bitLength="8">23</dayOfMonth>
-                                    <dayOfWeek dataType="int" bitLength="8">-1</dayOfWeek>
+                                    <yearMinus1900 dataType="uint" bitLength="8">106</yearMinus1900>
+                                    <month dataType="uint" bitLength="8">9</month>
+                                    <dayOfMonth dataType="uint" bitLength="8">23</dayOfMonth>
+                                    <dayOfWeek dataType="uint" bitLength="8">255</dayOfWeek>
                                   </BACnetTagPayloadDate>
                                 </payload>
                               </BACnetApplicationTagDate>
@@ -7790,10 +7790,10 @@ make -f wp.mak clean</value>
                               <BACnetApplicationTagTime>
                                 <payload>
                                   <BACnetTagPayloadTime>
-                                    <hour dataType="int" bitLength="8">23</hour>
-                                    <minute dataType="int" bitLength="8">21</minute>
-                                    <second dataType="int" bitLength="8">13</second>
-                                    <fractional dataType="int" bitLength="8">0</fractional>
+                                    <hour dataType="uint" bitLength="8">23</hour>
+                                    <minute dataType="uint" bitLength="8">21</minute>
+                                    <second dataType="uint" bitLength="8">13</second>
+                                    <fractional dataType="uint" bitLength="8">0</fractional>
                                   </BACnetTagPayloadTime>
                                 </payload>
                               </BACnetApplicationTagTime>

diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationPacket.go
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go