From 935f3b58caa0d98c74f6d75a917af5ca74689050 Mon Sep 17 00:00:00 2001 From: heck Date: Fri, 3 Jul 2020 17:49:51 +0200 Subject: [PATCH] move java interfaces into own subpkg "foundation.pep.interfaces" --- src/Makefile | 12 ++++++------ src/codegen/gen_java_Engine.ysl2 | 6 ++++-- src/codegen/gen_java_Message.ysl2 | 8 +++++--- src/foundation/pEp/jniadapter/AbstractEngine.java | 1 + src/foundation/pEp/jniadapter/Blob.java | 1 + src/foundation/pEp/jniadapter/BlobInterface.java | 5 ----- src/foundation/pEp/jniadapter/Identity.java | 1 + src/foundation/pEp/jniadapter/IdentityInterface.java | 5 ----- .../{ => interfaces}/AbstractEngineInterface.java | 5 ++++- .../pEp/jniadapter/interfaces/BlobInterface.java | 5 +++++ .../pEp/jniadapter/interfaces/IdentityInterface.java | 7 +++++++ 11 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 src/foundation/pEp/jniadapter/BlobInterface.java delete mode 100644 src/foundation/pEp/jniadapter/IdentityInterface.java rename src/foundation/pEp/jniadapter/{ => interfaces}/AbstractEngineInterface.java (84%) create mode 100644 src/foundation/pEp/jniadapter/interfaces/BlobInterface.java create mode 100644 src/foundation/pEp/jniadapter/interfaces/IdentityInterface.java diff --git a/src/Makefile b/src/Makefile index 4d3225b..ae3efa9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -51,12 +51,12 @@ GENERATED_JAVA=\ $(JAVA_PKG_ROOT)/CipherSuite.java \ $(JAVA_PKG_ROOT)/Color.java \ $(JAVA_PKG_ROOT)/DecryptFlags.java \ - $(JAVA_PKG_ROOT)/EngineInterface.java \ $(JAVA_PKG_ROOT)/IdentityFlags.java \ - $(JAVA_PKG_ROOT)/MessageInterface.java \ $(JAVA_PKG_ROOT)/Rating.java \ $(JAVA_PKG_ROOT)/SyncHandshakeResult.java \ - $(JAVA_PKG_ROOT)/SyncHandshakeSignal.java + $(JAVA_PKG_ROOT)/SyncHandshakeSignal.java \ + $(JAVA_PKG_ROOT)/interfaces/EngineInterface.java \ + $(JAVA_PKG_ROOT)/interfaces/MessageInterface.java # files to compile which will be be generated GENERATED_CC=\ @@ -118,6 +118,7 @@ $(LIB_CXX_STATIC): compile-cxx compile-java: create-dirs codegen $(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) $(JAVA_PKG_ROOT)/*.java $(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) $(JAVA_PKG_ROOT)/exceptions/*.java + $(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) $(JAVA_PKG_ROOT)/interfaces/*.java compile-cxx: create-dirs gen-jni-headers $(OBJECTS) @@ -133,11 +134,10 @@ gen-jni-headers: codegen $(JNI_GENERATED_HH) $(JNI_GENERATED_HH): $(JNI_GENERATING_JAVA) ifdef OLD_JAVA - $(JAVA_BIN_DIR)/javah $(subst /,.,$(subst .java,,$<)) + $(JAVA_BIN_DIR)/javah -d $(JAVA_BUILD_ROOT) $(subst /,.,$(subst .java,,$<)) else - $(JAVA_BIN_DIR)/javac -h . $(JAVA_PKG_ROOT)/*.java + $(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) -h . $(JAVA_PKG_ROOT)/*.java endif - mv $(JAVA_PKG_ROOT)/*.class $(JAVA_BUILD_ROOT)/$(JAVA_PKG_ROOT)/ # ------------- YML2 CodeGen -------------- diff --git a/src/codegen/gen_java_Engine.ysl2 b/src/codegen/gen_java_Engine.ysl2 index 96a2fe1..4402599 100644 --- a/src/codegen/gen_java_Engine.ysl2 +++ b/src/codegen/gen_java_Engine.ysl2 @@ -15,6 +15,7 @@ tstylesheet { || package foundation.pEp.jniadapter; + import foundation.pEp.jniadapter.interfaces.*; import foundation.pEp.jniadapter.exceptions.*; import java.util.ArrayList; import java.util.Vector; @@ -26,10 +27,11 @@ tstylesheet { } || - document("../foundation/pEp/jniadapter/{$cname}Interface.java", "text") + document("../foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text") || - package foundation.pEp.jniadapter; + package foundation.pEp.jniadapter.interfaces; + import foundation.pEp.jniadapter.*; import java.util.ArrayList; import java.util.Vector; diff --git a/src/codegen/gen_java_Message.ysl2 b/src/codegen/gen_java_Message.ysl2 index d94eae0..651da83 100644 --- a/src/codegen/gen_java_Message.ysl2 +++ b/src/codegen/gen_java_Message.ysl2 @@ -15,6 +15,7 @@ tstylesheet { || package foundation.pEp.jniadapter; + import foundation.pEp.jniadapter.interfaces.*; import foundation.pEp.jniadapter.exceptions.*; import java.util.ArrayList; import java.util.Vector; @@ -64,11 +65,12 @@ tstylesheet { `` apply "*[name(.)!='enum']", mode=entry } || - document("../foundation/pEp/jniadapter/{$cname}Interface.java", "text") + document("../foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text") || - package foundation.pEp.jniadapter; + package foundation.pEp.jniadapter.interfaces; - import foundation.pEp.jniadapter.Message.Direction; + import foundation.pEp.jniadapter.*; + import foundation.pEp.jniadapter.Message.*; import java.util.Date; import java.util.Vector; import java.util.ArrayList; diff --git a/src/foundation/pEp/jniadapter/AbstractEngine.java b/src/foundation/pEp/jniadapter/AbstractEngine.java index b4befa8..d4005a8 100644 --- a/src/foundation/pEp/jniadapter/AbstractEngine.java +++ b/src/foundation/pEp/jniadapter/AbstractEngine.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Vector; import foundation.pEp.jniadapter.Sync.DefaultCallback; +import foundation.pEp.jniadapter.interfaces.*; import foundation.pEp.jniadapter.exceptions.*; diff --git a/src/foundation/pEp/jniadapter/Blob.java b/src/foundation/pEp/jniadapter/Blob.java index 073ac42..4fdffa4 100644 --- a/src/foundation/pEp/jniadapter/Blob.java +++ b/src/foundation/pEp/jniadapter/Blob.java @@ -1,5 +1,6 @@ package foundation.pEp.jniadapter; +import foundation.pEp.jniadapter.interfaces.*; import java.io.Serializable; public class Blob implements BlobInterface, Serializable { diff --git a/src/foundation/pEp/jniadapter/BlobInterface.java b/src/foundation/pEp/jniadapter/BlobInterface.java deleted file mode 100644 index d52e7c7..0000000 --- a/src/foundation/pEp/jniadapter/BlobInterface.java +++ /dev/null @@ -1,5 +0,0 @@ -package foundation.pEp.jniadapter; - -public interface BlobInterface { - -} diff --git a/src/foundation/pEp/jniadapter/Identity.java b/src/foundation/pEp/jniadapter/Identity.java index 34e7dde..2b0cdde 100644 --- a/src/foundation/pEp/jniadapter/Identity.java +++ b/src/foundation/pEp/jniadapter/Identity.java @@ -1,5 +1,6 @@ package foundation.pEp.jniadapter; +import foundation.pEp.jniadapter.interfaces.*; import java.io.Serializable; public class Identity implements IdentityInterface, Serializable { diff --git a/src/foundation/pEp/jniadapter/IdentityInterface.java b/src/foundation/pEp/jniadapter/IdentityInterface.java deleted file mode 100644 index 93e0d29..0000000 --- a/src/foundation/pEp/jniadapter/IdentityInterface.java +++ /dev/null @@ -1,5 +0,0 @@ -package foundation.pEp.jniadapter; - -public interface IdentityInterface { - public Rating getRating(); -} diff --git a/src/foundation/pEp/jniadapter/AbstractEngineInterface.java b/src/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java similarity index 84% rename from src/foundation/pEp/jniadapter/AbstractEngineInterface.java rename to src/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java index 7ad20f0..9e3630f 100644 --- a/src/foundation/pEp/jniadapter/AbstractEngineInterface.java +++ b/src/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java @@ -1,4 +1,7 @@ -package foundation.pEp.jniadapter; +package foundation.pEp.jniadapter.interfaces; + +import foundation.pEp.jniadapter.Message; +import foundation.pEp.jniadapter.Sync; public interface AbstractEngineInterface { public String getVersion(); diff --git a/src/foundation/pEp/jniadapter/interfaces/BlobInterface.java b/src/foundation/pEp/jniadapter/interfaces/BlobInterface.java new file mode 100644 index 0000000..6a357d4 --- /dev/null +++ b/src/foundation/pEp/jniadapter/interfaces/BlobInterface.java @@ -0,0 +1,5 @@ +package foundation.pEp.jniadapter.interfaces; + +public interface BlobInterface { + +} diff --git a/src/foundation/pEp/jniadapter/interfaces/IdentityInterface.java b/src/foundation/pEp/jniadapter/interfaces/IdentityInterface.java new file mode 100644 index 0000000..1782cd3 --- /dev/null +++ b/src/foundation/pEp/jniadapter/interfaces/IdentityInterface.java @@ -0,0 +1,7 @@ +package foundation.pEp.jniadapter.interfaces; + +import foundation.pEp.jniadapter.Rating; + +public interface IdentityInterface { + public Rating getRating(); +}