From 87fc20082bd6fd0ee30d0b644cfabb513cc864cb Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Thu, 25 Feb 2021 20:05:25 +0100
Subject: [PATCH 1/2] Fix: JNI-129 - Message.getSent calls getSent() instead of
 _getSent()

---
 src/codegen/gen_java_Message.ysl2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/codegen/gen_java_Message.ysl2 b/src/codegen/gen_java_Message.ysl2
index f8e83f1..4e4f6f7 100644
--- a/src/codegen/gen_java_Message.ysl2
+++ b/src/codegen/gen_java_Message.ysl2
@@ -288,6 +288,7 @@ tstylesheet {
                     return «$type».getByInt(_get«$name»());
                 }
                 private native int _get«$name»();
+
                 public void set«$name»(«$type» value) {
                     if(value != null)
                         _set«$name»(value.value);
@@ -303,7 +304,7 @@ tstylesheet {
                 ||
                 // Property type: no intermediate type [java: «$type», intermediate: «$itype», ctype: «$ctype»]
                 public «$type» get«$name»() {
-                    return get«$name»();
+                    return _get«$name»();
                 }
                 private native «$type» _get«$name»();
 

From 31ddafa3e527ffbf031887889d065d9512deea4f Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Thu, 25 Feb 2021 23:52:45 +0100
Subject: [PATCH 2/2] codegen : message.cc fix datetime type

---
 src/codegen/gen_cpp_Message.ysl2 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/codegen/gen_cpp_Message.ysl2 b/src/codegen/gen_cpp_Message.ysl2
index 13ee28f..d73825d 100644
--- a/src/codegen/gen_cpp_Message.ysl2
+++ b/src/codegen/gen_cpp_Message.ysl2
@@ -117,14 +117,8 @@ tstylesheet {
         param "type";
         param "name";
         param "classname" call "CamelCase" with "text", "../@name";
-        const "convert", "$type != 'timestamp'";
 
-        choose {
-            when "$convert"
-                > «concat('Java_foundation_pEp_jniadapter_', $classname, '__1', str:replace($name, '_', '_1'))»
-            otherwise
-                > «concat('Java_foundation_pEp_jniadapter_', $classname, '_', str:replace($name, '_', '_1'))»
-        }
+        > «concat('Java_foundation_pEp_jniadapter_', $classname, '__1', str:replace($name, '_', '_1'))»
     }
 
     template "*", mode=entry {