Move class decrypt_message_Return from inner class of Engine, to new class decrypt_message_Return (in pkg foundation.pEp.jniadapter)

src/foundation/pEp/jniadapter/decrypt_message_Return.java

@@ -0,0 +1,7 @@
+package foundation.pEp.jniadapter;
+
+public class decrypt_message_Return {
+    public Message dst;
+    public Rating rating;
+    public int flags;
+}

src/gen_java_Engine.ysl2

@@ -159,13 +159,6 @@ tstylesheet {
             }
 
             ||
-
-            ||
-            public class «@name»_Return {
-            `` apply "parm[creates|returns|inout[../int]]", 1, mode=java with "public", 1;
-            }
-
-            ||
         }
 
         if "$convert"

test/java/foundation/pEp/jniadapter/test/basic/TestMain.java

@@ -1,9 +1,6 @@
 package foundation.pEp.jniadapter.test.basic;
 
-import foundation.pEp.jniadapter.Blob;
-import foundation.pEp.jniadapter.Engine;
-import foundation.pEp.jniadapter.Identity;
-import foundation.pEp.jniadapter.Message;
+import foundation.pEp.jniadapter.*;
 import foundation.pEp.pitytest.TestSuite;
 import foundation.pEp.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
@@ -15,7 +12,7 @@ import static foundation.pEp.pitytest.TestLogger.log;
 
 class BasicTestContext extends AdapterBaseTestContext {
     Message enc;
-    Engine.decrypt_message_Return result;
+    decrypt_message_Return result;
 
     public BasicTestContext() {
         setTestContextName("BasicTestContext");

test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java

@@ -1,6 +1,6 @@
 package foundation.pEp.jniadapter.test.jni98;
 
-import foundation.pEp.jniadapter.Engine;
+import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.Message;
 import foundation.pEp.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
@@ -34,7 +34,7 @@ class TestMain {
             log("\n" + msgToString(msg1, false));
 
             // Lets get the pgpText of the msg1, and the EncFormat
-            String pgpText = Engine.toUTF16(msg1.getAttachments().elementAt(1).data);
+            String pgpText = Utils.toUTF16(msg1.getAttachments().elementAt(1).data);
             Message.EncFormat ef = msg1.getEncFormat();
             //TODO: setting encformat to 4 (PEP) but getting back 3 (PGPMIME)
 
@@ -44,7 +44,7 @@ class TestMain {
             log("\n" + msgToString(msg2, false));
 
             logH2("Verify msg2");
-            Engine.decrypt_message_Return result = null;
+            decrypt_message_Return result = null;
             result = ctx.engine.decrypt_message(msg2, ctx.vStr, 0);
             log("\n" + msgToString(result.dst, false));
         }).run();

test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java

@@ -2,7 +2,7 @@ package foundation.pEp.jniadapter.test.templateAliceBob;
 
 import static foundation.pEp.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.Engine;
+import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.Message;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.FsMQMessage;
 import foundation.pEp.pitytest.*;
@@ -59,7 +59,7 @@ class TestAlice {
                     Message msgRx = Utils.deserializepEpMessage(ctx, msgRxSerialized, Message.EncFormat.PEPEncInlineEA);
                     log("ENCRYPTED IN: \n" + AdapterTestUtils.msgToString(msgRx, false));
 
-                    Engine.decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, null, 0);
+                    decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, null, 0);
                     log("DECRYPTED msg: \n" + AdapterTestUtils.msgToString(result.dst, false));
                     log("DECRYPTED rating:" + result.rating.toString());
                     log("DECRYPTED flags:" + result.flags);

test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java

@@ -2,7 +2,7 @@ package foundation.pEp.jniadapter.test.templateAliceBob;
 
 import static foundation.pEp.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.Engine;
+import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.Message;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.FsMQMessage;
 import foundation.pEp.pitytest.*;
@@ -39,7 +39,7 @@ class TestBob {
                     Message msgRx = Utils.deserializepEpMessage(ctx, msgRxSerialized, Message.EncFormat.PEPEncInlineEA);
                     log("ENCRYPTED IN: \n" + AdapterTestUtils.msgToString(msgRx, false));
 
-                    Engine.decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, null, 0);
+                    decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, null, 0);
                     log("DECRYPTED msg: \n" + AdapterTestUtils.msgToString(result.dst, false));
                     log("DECRYPTED rating:" + result.rating.toString());
                     log("DECRYPTED flags:" + result.flags);