From 97a006385d2aa119fe124beb36043fe7f0120528 Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 1 Jul 2020 16:17:29 +0200 Subject: [PATCH] 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 | 7 +++++++ src/gen_java_Engine.ysl2 | 7 ------- .../foundation/pEp/jniadapter/test/basic/TestMain.java | 7 ++----- .../foundation/pEp/jniadapter/test/jni98/TestMain.java | 6 +++--- .../pEp/jniadapter/test/templateAliceBob/TestAlice.java | 4 ++-- .../pEp/jniadapter/test/templateAliceBob/TestBob.java | 4 ++-- 6 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 src/foundation/pEp/jniadapter/decrypt_message_Return.java diff --git a/src/foundation/pEp/jniadapter/decrypt_message_Return.java b/src/foundation/pEp/jniadapter/decrypt_message_Return.java new file mode 100644 index 0000000..e59aae9 --- /dev/null +++ b/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; +} diff --git a/src/gen_java_Engine.ysl2 b/src/gen_java_Engine.ysl2 index 838729c..1e74012 100644 --- a/src/gen_java_Engine.ysl2 +++ b/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" diff --git a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java index d1f290c..12dc192 100644 --- a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java +++ b/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"); diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java index a8327e1..aad0166 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java +++ b/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(); diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java index 1cb6358..f872423 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java +++ b/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); diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java index c8b7afc..d5e477e 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java +++ b/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);