Update lucene to version 8.11.2

.gitignore

@@ -15,3 +15,5 @@ rebel.xml
 /.gradle/
 /build/
 atlassian-ide-plugin.xml
+.DS_Store
+local.properties

build.gradle.kts

@@ -16,7 +16,7 @@ tasks.withType<Test>() {
 }
 
 group = "org.crosswire"
-version = "2.3"
+version = "2.4"
 
 repositories {
     mavenCentral()
@@ -25,13 +25,13 @@ repositories {
 dependencies {
 //    implementation("org.jetbrains.kotlin:kotlin-stdlib")
     implementation("org.apache.commons:commons-compress:1.12")
-    implementation("com.chenlb.mmseg4j:mmseg4j-analysis:1.8.6")
-    implementation("com.chenlb.mmseg4j:mmseg4j-dic:1.8.6")
 
     implementation("org.jdom:jdom2:2.0.6.1")
-    implementation("org.apache.lucene:lucene-analyzers:3.6.2")
-    // To upgrade Lucene, change to
-    // implementation("org.apache.lucene:lucene-analyzers-common:x")
+    implementation("org.apache.lucene:lucene-analyzers-common:8.11.2")
+    implementation("org.apache.lucene:lucene-analyzers-smartcn:8.11.2")
+    implementation("org.apache.lucene:lucene-analyzers-kuromoji:8.11.2")
+
+    implementation("org.apache.lucene:lucene-queryparser:8.11.2")
 
     //implementation("org.slf4j:slf4j-api:1.7.6")
     implementation("org.slf4j:slf4j-api:1.7.6")

notes.md

@@ -0,0 +1,18 @@
+Functionality AbstractBookAnalyzer
+
+Add Book to analyzer
+    Is this necessary
+        It is used to automatically get the right language from the book
+            Might be done a level higher, when selecting the right analyser
+Set DoStemming
+    Stemming is done by default in language-specific analyzers
+Set DoStopWords
+    Initializing with empty stopwords set should disable stopwording
+
+Why is createComponents necessary?
+    I think to support optional stemming and stopwords
+        Both jSword itself and and-bible nowhere use these options, except when initializing them to the defaults
+
+# TODO
+
+Fix deleted tests

src/main/java/org/crosswire/common/util/CWClassLoader.java

@@ -65,7 +65,7 @@ public final class CWClassLoader extends ClassLoader {
      * @return the CrossWire Class Loader
      */
     public static CWClassLoader instance(Class<?> resourceOwner) {
-        return AccessController.doPrivileged(new PrivilegedLoader<CWClassLoader>(resourceOwner));
+        return new CWClassLoader(resourceOwner);
     }
 
     /**

src/main/java/org/crosswire/jsword/book/basic/AbstractBook.java

@@ -36,6 +36,7 @@
 import org.crosswire.jsword.book.sword.Backend;
 import org.crosswire.jsword.book.sword.processing.NoOpRawTextProcessor;
 import org.crosswire.jsword.book.sword.processing.RawTextToXmlProcessor;
+import org.crosswire.jsword.index.IndexManagerFactory;
 import org.crosswire.jsword.index.IndexStatus;
 import org.crosswire.jsword.index.IndexStatusEvent;
 import org.crosswire.jsword.index.IndexStatusListener;
@@ -186,6 +187,9 @@ public boolean match(String name) {
      * @see org.crosswire.jsword.book.Book#getIndexStatus()
      */
     public IndexStatus getIndexStatus() {
+        if (IndexManagerFactory.getIndexManager().needsReindexing(this)) {
+            return IndexStatus.INVALID;
+        }
         return bmd.getIndexStatus();
     }
 

src/main/java/org/crosswire/jsword/index/Index.java

@@ -44,6 +44,7 @@ public interface Index {
      * @throws BookException 
      */
     Key find(String query) throws BookException;
+    Key find(String query, boolean full_text) throws BookException;
 
     /**
      * An index must be able to create KeyLists for users in a similar way to

src/main/java/org/crosswire/jsword/index/lucene/IndexMetadata.java

@@ -20,6 +20,7 @@
 package org.crosswire.jsword.index.lucene;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import org.crosswire.common.util.PropertyMap;
 import org.crosswire.common.util.ResourceUtil;
@@ -41,17 +42,20 @@
 public final class IndexMetadata {
 
     /** latest version on top */
-    public static final float INDEX_VERSION_1_2 = 1.2f;
+    public static final float INDEX_VERSION_1_3 = 1.3f;
+
     /**
      * A prior version.
      *
      * @deprecated do not use
      */
+    @Deprecated
+    public static final float INDEX_VERSION_1_2 = 1.2f;
+
     @Deprecated
     public static final float INDEX_VERSION_1_1 = 1.1f;
 
     public static final String LATEST_INDEX_VERSION = "Latest.Index.Version";
-    public static final String LUCENE_VERSION = "Lucene.Version";
 
     public static final String PREFIX_LATEST_INDEX_VERSION_BOOK_OVERRIDE = "Latest.Index.Version.Book.";
     /**
@@ -69,38 +73,20 @@ public static IndexMetadata instance() {
         return myInstance;
     }
 
-    /**
-     * default Installed IndexVersion
-     *
-     * @return the index version
-     * @deprecated see InstalledIndex.java
-     */
-    @Deprecated
-    public float getInstalledIndexVersion() {
-        String value = props.get(INDEX_VERSION, "1.1"); // todo At some point
-                                                        // default should be 1.2
-        return Float.parseFloat(value);
-    }
-
     // Default Latest IndexVersion : Default version number of Latest indexing
     // schema: PerBook index version must be equal or greater than this
     public float getLatestIndexVersion() {
-        String value = props.get(LATEST_INDEX_VERSION, "1.2");
-        return Float.parseFloat(value);
-    }
-    public String getLatestIndexVersionStr() {
-        String value = props.get(LATEST_INDEX_VERSION, "1.2");
-        return value;
+        String value = props.get(LATEST_INDEX_VERSION);
+        return (value == null) ? InstalledIndex.DEFAULT_INSTALLED_INDEX_VERSION : Float.parseFloat(value);
     }
 
     public float getLatestIndexVersion(Book b) {
         if (b == null) {
             return getLatestIndexVersion();
         }
 
-        String value = props.get(PREFIX_LATEST_INDEX_VERSION_BOOK_OVERRIDE + IndexMetadata.getBookIdentifierPropSuffix(b.getBookMetaData()),
-                props.get(LATEST_INDEX_VERSION));
-        return Float.parseFloat(value);
+        String value = props.get(PREFIX_LATEST_INDEX_VERSION_BOOK_OVERRIDE + IndexMetadata.getBookIdentifierPropSuffix(b.getBookMetaData()));
+        return (value == null) ? getLatestIndexVersion() : Float.parseFloat(value);
     }
 
     // used in property keys e.g. Installed.Index.Version.Book.ESV[1.0.1]
@@ -112,9 +98,6 @@ public static String getBookIdentifierPropSuffix(BookMetaData meta) {
         return meta.getInitials() + moduleVer;
     }
 
-    public float getLuceneVersion() {
-        return Float.parseFloat(props.get(LUCENE_VERSION));
-    }
     private IndexMetadata() {
         try {
             props = ResourceUtil.getProperties(getClass());

src/main/java/org/crosswire/jsword/index/lucene/InstalledIndex.java

@@ -49,7 +49,7 @@ public final class InstalledIndex {
     public static final String PREFIX_INSTALLED_INDEX_VERSION_BOOK_OVERRIDE = "Installed.Index.Version.Book.";
     // TODO(Sijo): change this value on lucene upgrade
     /** The Index version for new indexes */
-    public static final float DEFAULT_INSTALLED_INDEX_VERSION = IndexMetadata.INDEX_VERSION_1_2;
+    public static final float DEFAULT_INSTALLED_INDEX_VERSION = IndexMetadata.INDEX_VERSION_1_3;
 
     /**
      * All access through this single instance.