Intrudoce DISPOSE macro to implement the dispose method.

lib/src/main/cpp/libkiwix/book.cpp

@@ -34,10 +34,7 @@ METHOD0(void, allocate)
   SET_PTR(std::make_shared<NATIVE_TYPE>());
 }
 
-METHOD0(void, dispose)
+DISPOSE
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 METHOD(void, update__Lorg_kiwix_libkiwix_Book_2, jobject otherBook)
 {

lib/src/main/cpp/libkiwix/filter.cpp

@@ -35,10 +35,7 @@ METHOD0(void, allocate) {
   SET_PTR(std::make_shared<NATIVE_TYPE>());
 }
 
-METHOD0(void, dispose) {
+DISPOSE
-  dispose<kiwix::Library>(env, thisObj);
-}
-
 
 #define FORWARD(name, args_type) \
 METHOD(jobject, name, args_type value) { \

lib/src/main/cpp/libkiwix/kiwixserver.cpp

@@ -45,10 +45,8 @@ METHOD(void, setNativeServer, jobject jLibrary)
   }
 }
 
-METHOD0(void, dispose)
+
-{
+DISPOSE
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 /* Kiwix library functions */
 METHOD(void, setRoot, jstring root)

lib/src/main/cpp/libkiwix/library.cpp

@@ -34,10 +34,7 @@ METHOD0(void, setNativeHandler)
   SET_PTR(std::make_shared<NATIVE_TYPE>());
 }
 
-METHOD0(void, dispose)
+DISPOSE
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 /* Kiwix library functions */
 METHOD(jboolean, addBook, jobject book)

lib/src/main/cpp/libkiwix/manager.cpp

@@ -34,10 +34,8 @@ METHOD(void, allocate, jobject libraryObj)
   SET_PTR(std::make_shared<NATIVE_TYPE>(lib.get()));
 }
 
-METHOD0(void, dispose)
+DISPOSE
-{
+
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 /* Kiwix manager functions */
 METHOD(jboolean, readFile, jstring path)
 {

lib/src/main/cpp/libzim/archive.cpp

@@ -113,11 +113,7 @@ JNIEXPORT void JNICALL Java_org_kiwix_libzim_Archive_setNativeArchiveEmbedded(
 #endif
 }
 
-JNIEXPORT void JNICALL
+DISPOSE
-Java_org_kiwix_libzim_Archive_dispose(JNIEnv* env, jobject thisObj)
-{
-  dispose<zim::Archive>(env, thisObj);
-}
 
 GETTER(jstring, getFilename)
 GETTER(jlong, getFilesize)

lib/src/main/cpp/libzim/blob.cpp

@@ -33,12 +33,7 @@
 #define TYPENAME libzim_Blob
 #include <macros.h>
 
-
+DISPOSE
-
-METHOD0(void, dispose)
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 METHOD0(jstring, getData) {
   return TO_JNI(std::string(*THIS));

lib/src/main/cpp/libzim/entry.cpp

@@ -35,10 +35,7 @@
 #include <macros.h>
 
 
-METHOD0(void, dispose)
+DISPOSE
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 GETTER(jboolean, isRedirect)
 GETTER(jstring, getTitle)

lib/src/main/cpp/libzim/item.cpp

@@ -33,10 +33,7 @@
 #define TYPENAME libzim_Item
 #include <macros.h>
 
-METHOD0(void, dispose)
+DISPOSE
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 GETTER(jstring, getTitle)
 GETTER(jstring, getPath)

lib/src/main/cpp/libzim/query.cpp

@@ -46,10 +46,7 @@ METHOD(void, setNativeQuery, jstring query)
   }
 }
 
-METHOD0(void, dispose)
+DISPOSE
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 METHOD(jobject, setQuery, jstring query) {
   THIS->setQuery(TO_C(query));

lib/src/main/cpp/libzim/search.cpp

@@ -33,11 +33,7 @@
 #define TYPENAME libzim_Search
 #include <macros.h>
 
-
+DISPOSE
-METHOD0(void, dispose)
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 METHOD(jobject, getResults, jint start, jint maxResults) {
   auto results = THIS->getResults(TO_C(start), TO_C(maxResults));

lib/src/main/cpp/libzim/search_iterator.cpp

@@ -34,6 +34,8 @@
 #define TYPENAME libzim_SearchIterator
 #include <macros.h>
 
+
+// We cannot use the default macro to implement `dispose` as we need to delete the end handle
 METHOD0(void, dispose)
 {
   // Delete end iterator

lib/src/main/cpp/libzim/searcher.cpp

@@ -48,10 +48,8 @@ METHOD(void, setNativeSearcher, jobject archive)
 }
 
 
-METHOD0(void, dispose)
+
-{
+DISPOSE
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 METHOD(jobject, addArchive, jobject archive) {
   auto cArchive = getPtr<zim::Archive>(env, archive);

lib/src/main/cpp/libzim/suggestion_item.cpp

@@ -33,10 +33,7 @@
 #define TYPENAME libzim_SuggestionItem
 #include <macros.h>
 
-METHOD0(void, dispose)
+DISPOSE
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 GETTER(jstring, getTitle)
 GETTER(jstring, getPath)

lib/src/main/cpp/libzim/suggestion_iterator.cpp

@@ -33,7 +33,7 @@
 #define TYPENAME libzim_SuggestionIterator
 #include <macros.h>
 
-
+// We cannot use the default macro to implement `dispose` as we need to delete the end handle
 METHOD0(void, dispose)
 {
   // Delete end iterator

lib/src/main/cpp/libzim/suggestion_search.cpp

@@ -33,10 +33,7 @@
 #define TYPENAME libzim_SuggestionSearch
 #include <macros.h>
 
-METHOD0(void, dispose)
+DISPOSE
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 METHOD(jobject, getResults, jint start, jint maxResults) {
   auto results = THIS->getResults(TO_C(start), TO_C(maxResults));

lib/src/main/cpp/libzim/suggestion_searcher.cpp

@@ -47,11 +47,7 @@ METHOD(void, setNativeSearcher, jobject archive)
   }
 }
 
-
+DISPOSE
-METHOD0(void, dispose)
-{
-  dispose<NATIVE_TYPE>(env, thisObj);
-}
 
 METHOD(jobject, suggest, jstring query) {
   return BUILD_WRAPPER("org/kiwix/libzim/SuggestionSearch", THIS->suggest(TO_C(query)));

lib/src/main/cpp/macros.h

@@ -39,3 +39,4 @@ JNIEXPORT retType JNICALL BUILD_METHOD(TYPENAME ,name) ( \
   return TO_JNI(THIS->name()); \
 }
 
+#define DISPOSE  METHOD0(void, dispose)  { dispose<NATIVE_TYPE>(env, thisObj); }