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/10/12 21:31:01 UTC
[plc4x] 01/02: - Added escaping of string enum values.
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
commit 0c386db4fafd4cd5c731e9895fb291f47875605e
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sat Oct 12 23:29:59 2019 +0200
- Added escaping of string enum values.
---
.../org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java | 2 ++
.../src/main/resources/templates/java/io-template.ftlh | 2 +-
.../src/main/resources/templates/java/pojo-template.ftlh | 2 +-
.../org/apache/plc4x/java/s7/netty/model/types/TransportSize.java | 4 ++--
.../plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java | 7 ++-----
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
index 36ac79e..cfa28d5 100644
--- a/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
+++ b/build-utils/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java
@@ -622,6 +622,8 @@ public class JavaLanguageTemplateHelper implements FreemarkerLanguageTemplateHel
return "'" + valueString + "'";
}
break;
+ case STRING:
+ return "\"" + valueString + "\"";
}
}
return valueString;
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 b718935..8b5d96e 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
@@ -40,7 +40,7 @@ package ${helper.packageName(protocolName, languageName, outputFlavor)}.io;
import ${helper.packageName(protocolName, languageName, outputFlavor)}.*;
<#if helper.getComplexTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.io.*;</#if>
-<#if helper.getEnumTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;</#if>
+import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;
import org.apache.plc4x.java.utils.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
index a5c1e60..b4dfb1b 100644
--- a/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/pojo-template.ftlh
@@ -38,7 +38,7 @@ ${helper.packageName(protocolName, languageName, outputFlavor)?replace(".", "/")
package ${helper.packageName(protocolName, languageName, outputFlavor)};
-<#if helper.getEnumTypes(type)?has_content>import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;</#if>
+import ${helper.packageName(protocolName, languageName, outputFlavor)}.types.*;
import com.fasterxml.jackson.annotation.*;
import org.apache.plc4x.java.utils.Message;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
index 323d0a1..2f806ed 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
@@ -89,12 +89,12 @@ public enum TransportSize {
// Time of day
// -----------------------------------------
// Time (hh:mm:ss.S)
- TIME_OF_DAY(0x02, "X", 4, null, DataTransportSize.BYTE_WORD_DWORD,S7ControllerType.ANY),
+ TIME_OF_DAY(0x02, "X", 4, null, DataTransportSize.BYTE_WORD_DWORD, S7ControllerType.ANY),
// -----------------------------------------
// Date and time of day
// -----------------------------------------
- DATE_AND_TIME(0x02, "X", 8,null, null, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
+ DATE_AND_TIME(0x02, "X", 8, null, null, S7ControllerType.S7_1500, S7ControllerType.S7_300, S7ControllerType.S7_400),
// -----------------------------------------
// ASCII Strings
diff --git a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java
index b9b1d1a..a166538 100644
--- a/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java
+++ b/sandbox/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerProtocol.java
@@ -20,10 +20,7 @@ package org.apache.plc4x.simulator.server.s7.protocol;
import io.netty.channel.*;
import org.apache.plc4x.java.s7.readwrite.*;
-import org.apache.plc4x.java.s7.readwrite.types.COTPProtocolClass;
-import org.apache.plc4x.java.s7.readwrite.types.COTPTpduSize;
-import org.apache.plc4x.java.s7.readwrite.types.SzlModuleTypeClass;
-import org.apache.plc4x.java.s7.readwrite.types.SzlSublist;
+import org.apache.plc4x.java.s7.readwrite.types.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -180,7 +177,7 @@ public class S7Step7ServerProtocol extends ChannelInboundHandlerAdapter {
S7PayloadUserDataItemCpuFunctionReadSzlResponse readSzlResponsePayload =
new S7PayloadUserDataItemCpuFunctionReadSzlResponse(
- (short) 0xFF, (short) 0x09, szlId,
+ (short) 0xFF, DataTransportSize.OCTET_STRING, szlId,
readSzlRequestPayload.getSzlIndex(), items);
S7ParameterUserDataItem[] responseParameterItems =