From 7a465e66d77ae78f81a3595288ed7f31b53c9f18 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Mon, 7 Dec 2020 23:10:07 +0400
Subject: [PATCH] Renamed org.kiwix.kiwixlib.{Pair->DirectAccessInfo}

---
 src/wrapper/java/kiwixreader.cpp                     | 12 ++++++------
 src/wrapper/java/meson.build                         |  2 +-
 .../kiwixlib/{Pair.java => DirectAccessInfo.java}    |  2 +-
 .../java/org/kiwix/kiwixlib/JNIKiwixReader.java      |  6 +++---
 src/wrapper/java/utils.h                             |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename src/wrapper/java/org/kiwix/kiwixlib/{Pair.java => DirectAccessInfo.java} (96%)

diff --git a/src/wrapper/java/kiwixreader.cpp b/src/wrapper/java/kiwixreader.cpp
index df32595ed..b7f968822 100644
--- a/src/wrapper/java/kiwixreader.cpp
+++ b/src/wrapper/java/kiwixreader.cpp
@@ -379,22 +379,22 @@ JNIEXPORT jobject JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_getDirectAccessInformation(
     JNIEnv* env, jobject obj, jstring url)
 {
-   jclass classPair = env->FindClass("org/kiwix/kiwixlib/Pair");
-   jmethodID midPairinit = env->GetMethodID(classPair, "<init>", "()V");
-   jobject pair = env->NewObject(classPair, midPairinit);
-   setPairObjValue("", 0, pair, env);
+   jclass daiClass = env->FindClass("org/kiwix/kiwixlib/DirectAccessInfo");
+   jmethodID daiInitMethod = env->GetMethodID(daiClass, "<init>", "()V");
+   jobject dai = env->NewObject(daiClass, daiInitMethod);
+   setDaiObjValue("", 0, dai, env);
 
    std::string cUrl = jni2c(url, env);
    try {
     auto entry = READER->getEntryFromEncodedPath(cUrl);
     entry = entry.getFinalEntry();
     auto part_info = entry.getDirectAccessInfo();
-    setPairObjValue(part_info.first, part_info.second, pair, env);
+    setDaiObjValue(part_info.first, part_info.second, dai, env);
   } catch (std::exception& e) {
     LOG("Unable to get direct access info for url: %s", cUrl.c_str());
     LOG(e.what());
   }
-  return pair;
+  return dai;
 }
 
 JNIEXPORT jboolean JNICALL
diff --git a/src/wrapper/java/meson.build b/src/wrapper/java/meson.build
index 034173045..de72e49b3 100644
--- a/src/wrapper/java/meson.build
+++ b/src/wrapper/java/meson.build
@@ -12,7 +12,7 @@ java_sources = files([
   'org/kiwix/kiwixlib/JNIKiwixString.java',
   'org/kiwix/kiwixlib/JNIKiwixBool.java',
   'org/kiwix/kiwixlib/JNIKiwixException.java',
-  'org/kiwix/kiwixlib/Pair.java'
+  'org/kiwix/kiwixlib/DirectAccessInfo.java'
 ])
 
 kiwix_jni = custom_target('jni',
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/Pair.java b/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
similarity index 96%
rename from src/wrapper/java/org/kiwix/kiwixlib/Pair.java
rename to src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
index 05aacb678..4ba137dc4 100644
--- a/src/wrapper/java/org/kiwix/kiwixlib/Pair.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/DirectAccessInfo.java
@@ -19,7 +19,7 @@
 
 package org.kiwix.kiwixlib;
 
-public class Pair
+public class DirectAccessInfo
 {
   public String filename;
   public long offset;
diff --git a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
index 94b7b39ff..e11d72190 100644
--- a/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
+++ b/src/wrapper/java/org/kiwix/kiwixlib/JNIKiwixReader.java
@@ -24,7 +24,7 @@ import org.kiwix.kiwixlib.JNIKiwixException;
 import org.kiwix.kiwixlib.JNIKiwixString;
 import org.kiwix.kiwixlib.JNIKiwixInt;
 import org.kiwix.kiwixlib.JNIKiwixSearcher;
-import org.kiwix.kiwixlib.Pair;
+import org.kiwix.kiwixlib.DirectAccessInfo;
 import java.io.FileDescriptor;
 
 public class JNIKiwixReader
@@ -103,13 +103,13 @@ public class JNIKiwixReader
    * the zim file (or zim part) and directly read the content from it (and so
    * bypassing the libzim).
    *
-   * Return a `Pair` (filename, offset) where the content is located.
+   * Return a `DirectAccessInfo` (filename, offset) where the content is located.
    *
    * If the content cannot be directly accessed (content is compressed or zim
    * file is cut in the middle of the content), the filename is an empty string
    * and offset is zero.
    */
-  public native Pair getDirectAccessInformation(String url);
+  public native DirectAccessInfo getDirectAccessInformation(String url);
 
   public native boolean searchSuggestions(String prefix, int count);
 
diff --git a/src/wrapper/java/utils.h b/src/wrapper/java/utils.h
index 00b5855a5..232071d54 100644
--- a/src/wrapper/java/utils.h
+++ b/src/wrapper/java/utils.h
@@ -246,7 +246,7 @@ inline void setBoolObjValue(const bool value, const jobject obj, JNIEnv* env)
   env->SetIntField(obj, objFid, c2jni(value, env));
 }
 
-inline void setPairObjValue(const std::string& filename, const long offset,
+inline void setDaiObjValue(const std::string& filename, const long offset,
                             const jobject obj, JNIEnv* env)
 {
   jclass objClass = env->GetObjectClass(obj);