[plc4x] branch feature/ams_ads_mpsec updated: fixed generation for big integer

[sruehl]

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch feature/ams_ads_mpsec
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/feature/ams_ads_mpsec by this 
push:
     new 0ee09fa  fixed generation for big integer
0ee09fa is described below

commit 0ee09faaec8c93121e41bc097ca9de394f82113a
Author: Sebastian Rühl <sru...@apache.org>
AuthorDate: Tue Dec 10 16:52:04 2019 +0100

    fixed generation for big integer
---
 .../org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java  | 6 +++---
 .../src/main/resources/templates/java/io-template.ftlh              | 1 +
 .../java/org/apache/plc4x/java/amsads/protocol/AMSADSProtocol.java  | 2 +-
 3 files changed, 5 insertions(+), 4 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 0fc603f..8e47f74 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
@@ -201,7 +201,7 @@ public class JavaLanguageTemplateHelper implements 
FreemarkerLanguageTemplateHel
                 if (simpleTypeReference.getSize() <= 32) {
                     return "readUnsignedLong(" + simpleTypeReference.getSize() 
+ ")";
                 }
-                return "readUnsignedBigInteger" + 
simpleTypeReference.getSize() + ")";
+                return "readUnsignedBigInteger(" + 
simpleTypeReference.getSize() + ")";
             }
             case INT: {
                 if (simpleTypeReference.getSize() <= 8) {
@@ -252,7 +252,7 @@ public class JavaLanguageTemplateHelper implements 
FreemarkerLanguageTemplateHel
                 if (simpleTypeReference.getSize() <= 32) {
                     return "writeUnsignedLong(" + 
simpleTypeReference.getSize() + ", ((Number) " + fieldName + ").longValue())";
                 }
-                return "writeUnsignedBigInteger" + 
simpleTypeReference.getSize() + ", (BigInteger) " + fieldName + ")";
+                return "writeUnsignedBigInteger(" + 
simpleTypeReference.getSize() + ", BigInteger.valueOf(" + fieldName + "))";
             }
             case INT: {
                 if (simpleTypeReference.getSize() <= 8) {
@@ -267,7 +267,7 @@ public class JavaLanguageTemplateHelper implements 
FreemarkerLanguageTemplateHel
                 if (simpleTypeReference.getSize() <= 64) {
                     return "writeLong(" + simpleTypeReference.getSize() + ", 
((Number) " + fieldName + ").longValue())";
                 }
-                return "writeBigInteger(" + simpleTypeReference.getSize() + ", 
(BigInteger) " + fieldName + ")";
+                return "writeBigInteger(" + simpleTypeReference.getSize() + ", 
BigInteger.valueOf( " + fieldName + "))";
             }
             case FLOAT: {
                 if (simpleTypeReference.getSize() <= 32) {
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..7251237 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
@@ -48,6 +48,7 @@ import org.slf4j.LoggerFactory;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
+import java.math.BigInteger;
 
 public class ${typeName}IO {
 
diff --git 
a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AMSADSProtocol.java
 
b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AMSADSProtocol.java
index 36aed20..b8c0e36 100644
--- 
a/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AMSADSProtocol.java
+++ 
b/sandbox/test-java-amsads-driver/src/main/java/org/apache/plc4x/java/amsads/protocol/AMSADSProtocol.java
@@ -42,7 +42,7 @@ public class AMSADSProtocol extends 
PlcByteToMessageCodec<AMSADSCommand> {
     private final short remoteAddr;
     private final DF1SymbolIO df1SymbolIO;
 
-    public Df1Protocol(short localAddr, short remoteAddr) {
+    public AMSADSProtocol(short localAddr, short remoteAddr) {
         this.localAddr = localAddr;
         this.remoteAddr = remoteAddr;
         df1SymbolIO = new DF1SymbolIO();