You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/12/31 18:21:41 UTC
[plc4x] branch develop updated: - Minor adjustements to get develop
working again
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 9653deb - Minor adjustements to get develop working again
9653deb is described below
commit 9653debd5c8a365155c1c09f9ff18d8d75a65ddf
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Dec 31 19:21:33 2019 +0100
- Minor adjustements to get develop working again
---
.../src/main/resources/templates/java/io-template.ftlh | 14 +++++++-------
.../mspec/model/fields/DefaultImplicitField.java | 10 +++++-----
.../mspec/model/fields/DefaultManualArrayField.java | 18 +++++++++---------
.../mspec/model/fields/DefaultManualField.java | 18 +++++++++---------
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
index aa26563..a53727d 100644
--- a/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
@@ -166,7 +166,7 @@ public class ${typeName}IO {
int _${field.name}Count = ${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)};
${helper.getLanguageTypeNameForField(field)}[] ${field.name} = new ${helper.getLanguageTypeNameForField(field)}[_${field.name}Count];
for(int i = 0; i < _${field.name}Count; i++) {
- ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)});
+ ${field.name}[i] = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.parseExpression, type.parserArguments)});
}
<#-- In all other cases do we have to work with a list, that is later converted to an array -->
<#else>
@@ -177,7 +177,7 @@ public class ${typeName}IO {
List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
int ${field.name}EndPos = io.getPos() + _${field.name}Length;
while(io.getPos() < ${field.name}EndPos) {
- _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)}));
+ _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.parseExpression, type.parserArguments)}));
<#-- After parsing, update the current position, but only if it's needed -->
<#if field.loopExpression.contains("curPos")>
curPos = io.getPos() - startPos;
@@ -188,7 +188,7 @@ public class ${typeName}IO {
// Terminated array
List<${helper.getNonPrimitiveLanguageTypeNameForField(field)}> _${field.name}List = new LinkedList<>();
while(!((boolean) (${helper.toDeserializationExpression(field.loopExpression, type.parserArguments)}))) {
- _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)}));
+ _${field.name}List.add((${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.parseExpression, type.parserArguments)}));
<#-- After parsing, update the current position, but only if it's needed -->
<#if field.loopExpression.contains("curPos")>
@@ -214,7 +214,7 @@ public class ${typeName}IO {
<#case "manual">
// Manual Field (${field.name})
- ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.deserializationExpression, type.parserArguments)});
+ ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toDeserializationExpression(field.parseExpression, type.parserArguments)});
<#break>
<#case "optional">
@@ -320,7 +320,7 @@ public class ${typeName}IO {
<#case "implicit">
// Implicit Field (${field.name}) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
- ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)});
+ ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializeExpression, type.parserArguments)});
${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
<#break>
<#case "manualArray">
@@ -328,14 +328,14 @@ public class ${typeName}IO {
// Manual Array Field (${field.name})
if(_value.get${field.name?cap_first}() != null) {
for(${helper.getLanguageTypeNameForField(field)} element : _value.get${field.name?cap_first}()) {
- ${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)};
+ ${helper.toSerializationExpression(field.serializeExpression, type.parserArguments)};
}
}
<#break>
<#case "manual">
// Manual Field (${field.name})
- ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializationExpression, type.parserArguments)});
+ ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toSerializationExpression(field.serializeExpression, type.parserArguments)});
${helper.getWriteBufferReadMethodCall(field.type, "(" + field.name + ")")?no_esc};
<#break>
<#case "optional">
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java
index 02c416e..36d6206 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java
@@ -27,13 +27,13 @@ public class DefaultImplicitField extends DefaultTaggedField implements Implicit
private final TypeReference type;
private final String name;
- private final Term serializationExpression;
+ private final Term serializeExpression;
- public DefaultImplicitField(String[] tags, TypeReference type, String name, Term serializationExpression) {
+ public DefaultImplicitField(String[] tags, TypeReference type, String name, Term serializeExpression) {
super(tags);
this.type = type;
this.name = name;
- this.serializationExpression = serializationExpression;
+ this.serializeExpression = serializeExpression;
}
public TypeReference getType() {
@@ -44,8 +44,8 @@ public class DefaultImplicitField extends DefaultTaggedField implements Implicit
return name;
}
- public Term getSerializationExpression() {
- return serializationExpression;
+ public Term getSerializeExpression() {
+ return serializeExpression;
}
public Term[] getParams() {
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
index a108d3e..d4b96d4 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
@@ -29,19 +29,19 @@ public class DefaultManualArrayField extends DefaultTaggedField implements Manua
private final String name;
private final LoopType loopType;
private final Term loopExpression;
- private final Term serializationExpression;
- private final Term deserializationExpression;
+ private final Term serializeExpression;
+ private final Term parseExpression;
private final Term lengthExpression;
private final Term[] params;
- public DefaultManualArrayField(String[] tags, TypeReference type, String name, LoopType loopType, Term loopExpression, Term serializationExpression, Term deserializationExpression, Term lengthExpression, Term[] params) {
+ public DefaultManualArrayField(String[] tags, TypeReference type, String name, LoopType loopType, Term loopExpression, Term serializeExpression, Term parseExpression, Term lengthExpression, Term[] params) {
super(tags);
this.type = type;
this.name = name;
this.loopType = loopType;
this.loopExpression = loopExpression;
- this.serializationExpression = serializationExpression;
- this.deserializationExpression = deserializationExpression;
+ this.serializeExpression = serializeExpression;
+ this.parseExpression = parseExpression;
this.lengthExpression = lengthExpression;
this.params = params;
}
@@ -62,12 +62,12 @@ public class DefaultManualArrayField extends DefaultTaggedField implements Manua
return loopExpression;
}
- public Term getSerializationExpression() {
- return serializationExpression;
+ public Term getSerializeExpression() {
+ return serializeExpression;
}
- public Term getDeserializationExpression() {
- return deserializationExpression;
+ public Term getParseExpression() {
+ return parseExpression;
}
public Term getLengthExpression() {
diff --git a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
index 3cbd337..4f6bc3f 100644
--- a/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
+++ b/build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
@@ -27,17 +27,17 @@ public class DefaultManualField extends DefaultTaggedField implements ManualFiel
private final TypeReference type;
private final String name;
- private final Term serializationExpression;
- private final Term deserializationExpression;
+ private final Term serializeExpression;
+ private final Term parseExpression;
private final Term lengthExpression;
private final Term[] params;
- public DefaultManualField(String[] tags, TypeReference type, String name, Term serializationExpression, Term deserializationExpression, Term lengthExpression, Term[] params) {
+ public DefaultManualField(String[] tags, TypeReference type, String name, Term serializeExpression, Term parseExpression, Term lengthExpression, Term[] params) {
super(tags);
this.type = type;
this.name = name;
- this.serializationExpression = serializationExpression;
- this.deserializationExpression = deserializationExpression;
+ this.serializeExpression = serializeExpression;
+ this.parseExpression = parseExpression;
this.lengthExpression = lengthExpression;
this.params = params;
}
@@ -50,12 +50,12 @@ public class DefaultManualField extends DefaultTaggedField implements ManualFiel
return name;
}
- public Term getSerializationExpression() {
- return serializationExpression;
+ public Term getSerializeExpression() {
+ return serializeExpression;
}
- public Term getDeserializationExpression() {
- return deserializationExpression;
+ public Term getParseExpression() {
+ return parseExpression;
}
public Term getLengthExpression() {