Apache Lucene open-source search software
upgrade snowball to 34f3612e5e8c (round two) (#13227)
Robert Muirad8545151de8
diff --git a/gradle/generation/snowball.gradle b/gradle/generation/snowball.gradleindex a776390d361..55a23a18167 100644--- a/gradle/generation/snowball.gradle+++ b/gradle/generation/snowball.gradle@@ -24,17 +24,14 @@ apply plugin: "de.undercouch.download"configure(project(":lucene:analysis:common")) {ext {// git commit hash of source code https://github.com/snowballstem/snowball/- snowballStemmerCommit = "26db1ab9adbf437f37a6facd3ee2aad1da9eba03"+ snowballStemmerCommit = "34f3612e5e8c48975243bc2e87561abdac5aa9bb"// git commit hash of stopwords https://github.com/snowballstem/snowball-websitesnowballWebsiteCommit = "424fd1f75044160bb4a92f1daf08cce618459374"- // git commit hash of test data https://github.com/snowballstem/snowball-data- snowballDataCommit = "f08c4d63b9bc223aa7a1e706f4e8db8dd4ced28a"snowballWorkDir = file("${buildDir}/snowball")snowballStemmerDir = file("${snowballWorkDir}/stemmers-${snowballStemmerCommit}")snowballWebsiteDir = file("${snowballWorkDir}/website-${snowballWebsiteCommit}")- snowballDataDir = file("${snowballWorkDir}/data-${snowballDataCommit}")snowballPatchFile = file("${resources}/snowball.patch")snowballScript = file("${resources}/snowball.sh")@@ -78,19 +75,6 @@ configure(project(":lucene:analysis:common")) {}}- // downloads snowball test data (or use cached copy)- task downloadSnowballData(type: Download) {- src "https://github.com/snowballstem/snowball-data/archive/${snowballDataCommit}.zip"- def snowballDataZip = file("${snowballDataDir}.zip")- dest snowballDataZip- overwrite false- tempAndMove true-- doLast {- unpackFromZip(snowballDataZip, snowballDataDir)- }- }-// runs shell script to regenerate stemmers, base stemming subclasses, test data, and stopwords.task snowballInternal() {description "Regenerate snowball stemmers."@@ -109,10 +93,6 @@ configure(project(":lucene:analysis:common")) {dir: "src/resources/org/apache/lucene/analysis/snowball",include: "*_stop.txt")- inputs.files fileTree(- dir: "src/test/org/apache/lucene/analysis/snowball",- include: "*.zip")-// Don't even bother adding dependencies on Windows.if (Os.isFamily(Os.FAMILY_WINDOWS)) {doFirst {@@ -122,16 +102,15 @@ configure(project(":lucene:analysis:common")) {} else {dependsOn downloadSnowballStemmersdependsOn downloadSnowballWebsite- dependsOn downloadSnowballDatadoFirst {project.quietExec {executable "bash"- args = [snowballScript, snowballStemmerDir, snowballWebsiteDir, snowballDataDir, projectDir]+ args = [snowballScript, snowballStemmerDir, snowballWebsiteDir, projectDir]}}}}- regenerate.dependsOn wrapWithPersistentChecksums(snowballInternal, [ andThenTasks: ["spotlessJava", "spotlessJavaApply"], ignoreWithSource: [downloadSnowballStemmers, downloadSnowballWebsite, downloadSnowballData] ])+ regenerate.dependsOn wrapWithPersistentChecksums(snowballInternal, [ andThenTasks: ["spotlessJava", "spotlessJavaApply"], ignoreWithSource: [downloadSnowballStemmers, downloadSnowballWebsite] ])}diff --git a/gradle/generation/snowball/snowball.patch b/gradle/generation/snowball/snowball.patchindex fc6db142968..2d68f7c088e 100644--- a/gradle/generation/snowball/snowball.patch+++ b/gradle/generation/snowball/snowball.patch@@ -1,461 +1,3 @@-diff --git a/compiler/generator_java.c b/compiler/generator_java.c-index 2958452..c254dbe 100644---- a/compiler/generator_java.c-+++ b/compiler/generator_java.c-@@ -272,7 +272,7 @@ static void generate_AE(struct generator * g, struct node * p) {- break;- case c_len: /* Same as size() for Java. */- case c_size:-- w(g, "current.length()");-+ w(g, "limit");- break;- }- }-@@ -941,9 +941,12 @@ static void generate_define(struct generator * g, struct node * p) {- * be required to allow the SnowballProgram base class to invoke them.- * FIXME: Is this avoidable?- */-- if (q->type == t_routine && !q->used_in_among) {-+ if (q->used_in_among) {-+ g->S[0] = "public";-+ } else if (q->type == t_routine) {- g->S[0] = "private";- } else {-+ w(g, "~N~M@Override");- g->S[0] = "public";- }- g->V[0] = q;-@@ -1140,6 +1143,7 @@ static void generate_class_begin(struct generator * g) {- w(g, " {~+~N"- "~N"- "~Mprivate static final long serialVersionUID = 1L;~N"-+ "~Mprivate static final java.lang.invoke.MethodHandles.Lookup methodObject = java.lang.invoke.MethodHandles.lookup();~N"- "~N");- }--@@ -1186,7 +1190,7 @@ static void generate_among_table(struct generator * g, struct among * x) {- if (v->function != 0) {- w(g, ", \"");- write_varname(g, v->function);-- w(g, "\", ~n.class");-+ w(g, "\", methodObject");- }- w(g, ")~S0~N");- v++;-diff --git a/java/org/tartarus/snowball/Among.java b/java/org/tartarus/snowball/Among.java-index 8261503..abb8685 100644---- a/java/org/tartarus/snowball/Among.java-+++ b/java/org/tartarus/snowball/Among.java-@@ -1,7 +1,13 @@- package org.tartarus.snowball;---import java.lang.reflect.Method;-+import java.lang.invoke.MethodHandle;-+import java.lang.invoke.MethodHandles;-+import java.lang.invoke.MethodType;-+import java.util.Locale;--+/**-+ * Internal class used by Snowball stemmers-+ */- public class Among {- public Among (String s, int substring_i, int result) {- this.s = s.toCharArray();-@@ -11,19 +17,30 @@ public class Among {- }-- public Among (String s, int substring_i, int result, String methodname,-- Class<? extends SnowballProgram> programclass) {-+ MethodHandles.Lookup methodobject) {- this.s = s.toCharArray();- this.substring_i = substring_i;- this.result = result;-- try {-- this.method = programclass.getDeclaredMethod(methodname);-- } catch (NoSuchMethodException e) {-- throw new RuntimeException(e);-- }-+ final Class<? extends SnowballProgram> clazz = methodobject.lookupClass().asSubclass(SnowballProgram.class);-+ if (methodname.length() > 0) {-+ try {-+ this.method = methodobject.findVirtual(clazz, methodname, MethodType.methodType(boolean.class))-+ .asType(MethodType.methodType(boolean.class, SnowballProgram.class));-+ } catch (NoSuchMethodException | IllegalAccessException e) {-+ throw new RuntimeException(String.format(Locale.ENGLISH,-+ "Snowball program '%s' is broken, cannot access method: boolean %s()",-+ clazz.getSimpleName(), methodname-+ ), e);-+ }-+ } else {-+ this.method = null;-+ }- }--- public final char[] s; /* search string */-- public final int substring_i; /* index to longest matching substring */-- public final int result; /* result of the lookup */-- public final Method method; /* method to use if substring matches */-+ final char[] s; /* search string */-+ final int substring_i; /* index to longest matching substring */-+ final int result; /* result of the lookup */-+-+ // Make sure this is not accessible outside package for Java security reasons!-+ final MethodHandle method; /* method to use if substring matches */- };-diff --git a/java/org/tartarus/snowball/SnowballProgram.java b/java/org/tartarus/snowball/SnowballProgram.java-index 1b27b96..94f2d4b 100644---- a/java/org/tartarus/snowball/SnowballProgram.java-+++ b/java/org/tartarus/snowball/SnowballProgram.java-@@ -1,50 +1,84 @@-- package org.tartarus.snowball;--import java.lang.reflect.InvocationTargetException;-+import java.lang.reflect.UndeclaredThrowableException;- import java.io.Serializable;--+/**-+ * Base class for a snowball stemmer-+ */- public class SnowballProgram implements Serializable {- protected SnowballProgram()- {-- current = new StringBuilder();-- init();-+ current = new char[8];-+ setCurrent("");- }-- static final long serialVersionUID = 2016072500L;--- private void init() {-+ /**-+ * Set the current string.-+ */-+ public void setCurrent(String value)-+ {-+ current = value.toCharArray();- cursor = 0;-- limit = current.length();-+ limit = value.length();- limit_backward = 0;- bra = cursor;- ket = limit;- }-- /**-- * Set the current string.-+ * Get the current string.- */-- public void setCurrent(String value)-+ public String getCurrent()- {-- // Make a new StringBuilder. If we reuse the old one, and a user of-- // the library keeps a reference to the buffer returned (for example,-- // by converting it to a String in a way which doesn't force a copy),-- // the buffer size will not decrease, and we will risk wasting a large-- // amount of memory.-- // Thanks to Wolfram Esser for spotting this problem.-- current = new StringBuilder(value);-- init();-+ return new String(current, 0, limit);- }-- /**-- * Get the current string.-+ * Set the current string.-+ * @param text character array containing input-+ * @param length valid length of text.- */-- public String getCurrent()-- {-- return current.toString();-+ public void setCurrent(char[] text, int length) {-+ current = text;-+ cursor = 0;-+ limit = length;-+ limit_backward = 0;-+ bra = cursor;-+ ket = limit;-+ }-+-+ /**-+ * Get the current buffer containing the stem.-+ * <p>-+ * NOTE: this may be a reference to a different character array than the-+ * one originally provided with setCurrent, in the exceptional case that-+ * stemming produced a longer intermediate or result string.-+ * </p>-+ * <p>-+ * It is necessary to use {@link #getCurrentBufferLength()} to determine-+ * the valid length of the returned buffer. For example, many words are-+ * stemmed simply by subtracting from the length to remove suffixes.-+ * </p>-+ * @see #getCurrentBufferLength()-+ */-+ public char[] getCurrentBuffer() {-+ return current;-+ }-+-+ /**-+ * Get the valid length of the character array in-+ * {@link #getCurrentBuffer()}.-+ * @return valid length of the array.-+ */-+ public int getCurrentBufferLength() {-+ return limit;- }-- // current string-- protected StringBuilder current;-+ private char[] current;-- protected int cursor;- protected int limit;-@@ -74,7 +108,7 @@ public class SnowballProgram implements Serializable {- protected boolean in_grouping(char [] s, int min, int max)- {- if (cursor >= limit) return false;-- char ch = current.charAt(cursor);-+ char ch = current[cursor];- if (ch > max || ch < min) return false;- ch -= min;- if ((s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return false;-@@ -85,7 +119,7 @@ public class SnowballProgram implements Serializable {- protected boolean in_grouping_b(char [] s, int min, int max)- {- if (cursor <= limit_backward) return false;-- char ch = current.charAt(cursor - 1);-+ char ch = current[cursor - 1];- if (ch > max || ch < min) return false;- ch -= min;- if ((s[ch >> 3] & (0X1 << (ch & 0X7))) == 0) return false;-@@ -96,7 +130,7 @@ public class SnowballProgram implements Serializable {- protected boolean out_grouping(char [] s, int min, int max)- {- if (cursor >= limit) return false;-- char ch = current.charAt(cursor);-+ char ch = current[cursor];- if (ch > max || ch < min) {- cursor++;- return true;-@@ -112,7 +146,7 @@ public class SnowballProgram implements Serializable {- protected boolean out_grouping_b(char [] s, int min, int max)- {- if (cursor <= limit_backward) return false;-- char ch = current.charAt(cursor - 1);-+ char ch = current[cursor - 1];- if (ch > max || ch < min) {- cursor--;- return true;-@@ -130,7 +164,7 @@ public class SnowballProgram implements Serializable {- if (limit - cursor < s.length()) return false;- int i;- for (i = 0; i != s.length(); i++) {-- if (current.charAt(cursor + i) != s.charAt(i)) return false;-+ if (current[cursor + i] != s.charAt(i)) return false;- }- cursor += s.length();- return true;-@@ -141,7 +175,7 @@ public class SnowballProgram implements Serializable {- if (cursor - limit_backward < s.length()) return false;- int i;- for (i = 0; i != s.length(); i++) {-- if (current.charAt(cursor - s.length() + i) != s.charAt(i)) return false;-+ if (current[cursor - s.length() + i] != s.charAt(i)) return false;- }- cursor -= s.length();- return true;-@@ -171,7 +205,7 @@ public class SnowballProgram implements Serializable {- diff = -1;- break;- }-- diff = current.charAt(c + common) - w.s[i2];-+ diff = current[c + common] - w.s[i2];- if (diff != 0) break;- common++;- }-@@ -199,16 +233,13 @@ public class SnowballProgram implements Serializable {- if (common_i >= w.s.length) {- cursor = c + w.s.length;- if (w.method == null) return w.result;-- boolean res;-+ boolean res = false;- try {-- Object resobj = w.method.invoke(this);-- res = resobj.toString().equals("true");-- } catch (InvocationTargetException e) {-- res = false;-- // FIXME - debug message-- } catch (IllegalAccessException e) {-- res = false;-- // FIXME - debug message-+ res = (boolean) w.method.invokeExact(this);-+ } catch (Error | RuntimeException e) {-+ throw e;-+ } catch (Throwable e) {-+ throw new UndeclaredThrowableException(e);- }- cursor = c + w.s.length;- if (res) return w.result;-@@ -243,7 +274,7 @@ public class SnowballProgram implements Serializable {- diff = -1;- break;- }-- diff = current.charAt(c - 1 - common) - w.s[i2];-+ diff = current[c - 1 - common] - w.s[i2];- if (diff != 0) break;- common++;- }-@@ -267,16 +298,13 @@ public class SnowballProgram implements Serializable {- cursor = c - w.s.length;- if (w.method == null) return w.result;--- boolean res;-+ boolean res = false;- try {-- Object resobj = w.method.invoke(this);-- res = resobj.toString().equals("true");-- } catch (InvocationTargetException e) {-- res = false;-- // FIXME - debug message-- } catch (IllegalAccessException e) {-- res = false;-- // FIXME - debug message-+ res = (boolean) w.method.invokeExact(this);-+ } catch (Error | RuntimeException e) {-+ throw e;-+ } catch (Throwable e) {-+ throw new UndeclaredThrowableException(e);- }- cursor = c - w.s.length;- if (res) return w.result;-@@ -286,13 +314,41 @@ public class SnowballProgram implements Serializable {- }- }--+ // mini version of ArrayUtil.oversize from lucene, specialized to chars-+ static int oversize(int minTargetSize) {-+ int extra = minTargetSize >> 3;-+ if (extra < 3) {-+ extra = 3;-+ }-+ int newSize = minTargetSize + extra;-+ return (newSize + 3) & 0x7ffffffc;-+ }-+- /* to replace chars between c_bra and c_ket in current by the- * chars in s.- */-- protected int replace_s(int c_bra, int c_ket, String s)-+ protected int replace_s(int c_bra, int c_ket, CharSequence s)- {-- int adjustment = s.length() - (c_ket - c_bra);-- current.replace(c_bra, c_ket, s);-+ final int adjustment = s.length() - (c_ket - c_bra);-+ final int newLength = limit + adjustment;-+ //resize if necessary-+ if (newLength > current.length) {-+ char[] newBuffer = new char[oversize(newLength)];-+ System.arraycopy(current, 0, newBuffer, 0, limit);-+ current = newBuffer;-+ }-+ // if the substring being replaced is longer or shorter than the-+ // replacement, need to shift things around-+ if (adjustment != 0 && c_ket < limit) {-+ System.arraycopy(current, c_ket, current, c_bra + s.length(),-+ limit - c_ket);-+ }-+ // insert the replacement text-+ // Note, faster is s.getChars(0, s.length(), current, c_bra);-+ // but would have to duplicate this method for both String and StringBuilder-+ for (int i = 0; i < s.length(); i++)-+ current[c_bra + i] = s.charAt(i);-+- limit += adjustment;- if (cursor >= c_ket) cursor += adjustment;- else if (cursor > c_bra) cursor = c_bra;-@@ -303,57 +359,43 @@ public class SnowballProgram implements Serializable {- {- if (bra < 0 ||- bra > ket ||-- ket > limit ||-- limit > current.length()) // this line could be removed-+ ket > limit)- {-- System.err.println("faulty slice operation");-- // FIXME: report error somehow.-- /*-- fprintf(stderr, "faulty slice operation:\n");-- debug(z, -1, 0);-- exit(1);-- */-+ throw new IllegalArgumentException("faulty slice operation: bra=" + bra + ",ket=" + ket + ",limit=" + limit);- }- }--- protected void slice_from(String s)-+ protected void slice_from(CharSequence s)- {- slice_check();- replace_s(bra, ket, s);- }--- protected void slice_from(CharSequence s)-- {-- slice_from(s.toString());-- }--- protected void slice_del()- {- slice_from("");- }--- protected void insert(int c_bra, int c_ket, String s)-+ protected void insert(int c_bra, int c_ket, CharSequence s)- {- int adjustment = replace_s(c_bra, c_ket, s);- if (c_bra <= bra) bra += adjustment;- if (c_bra <= ket) ket += adjustment;- }--- protected void insert(int c_bra, int c_ket, CharSequence s)-- {-- insert(c_bra, c_ket, s.toString());-- }--- /* Copy the slice into the supplied StringBuilder */- protected void slice_to(StringBuilder s)- {- slice_check();-- s.replace(0, s.length(), current.substring(bra, ket));-+ int len = ket - bra;-+ s.setLength(0);-+ s.append(current, bra, len);- }-- protected void assign_to(StringBuilder s)- {-- s.replace(0, s.length(), current.substring(0, limit));-+ s.setLength(0);-+ s.append(current, 0, limit);- }-- /*-diff --git a/java/org/tartarus/snowball/SnowballStemmer.java b/java/org/tartarus/snowball/SnowballStemmer.java-index 73a81a9..f7772d3 100644---- a/java/org/tartarus/snowball/SnowballStemmer.java-+++ b/java/org/tartarus/snowball/SnowballStemmer.java-@@ -1,6 +1,9 @@-- package org.tartarus.snowball;--+/**-+ * Parent class of all snowball stemmers, which must implement <code>stem</code>-+ */- public abstract class SnowballStemmer extends SnowballProgram {- public abstract boolean stem();--diff --git a/libstemmer/modules.txt b/libstemmer/modules.txtindex cd36a21..5f51287 100644--- a/libstemmer/modules.txt+++ b/libstemmer/modules.txtdiff --git a/gradle/generation/snowball/snowball.sh b/gradle/generation/snowball/snowball.shindex 2cdb3faabbe..ec53f6b7a7f 100644--- a/gradle/generation/snowball/snowball.sh+++ b/gradle/generation/snowball/snowball.sh@@ -18,14 +18,13 @@# remove this script when problems are fixedSRCDIR=$1WWWSRCDIR=$2-TESTSRCDIR=$3-PROJECTDIR=$4+PROJECTDIR=$3DESTDIR="${PROJECTDIR}/src/java/org/tartarus/snowball"WWWDSTDIR="${PROJECTDIR}/src/resources/org/apache/lucene/analysis/snowball"TESTDSTDIR="${PROJECTDIR}/src/test/org/apache/lucene/analysis/snowball"-trap 'echo "usage: ./snowball.sh <snowball> <snowball-website> <snowball-data> <analysis-common>" && exit 2' ERR-test $# -eq 4+trap 'echo "usage: ./snowball.sh <snowball> <snowball-website> <analysis-common>" && exit 2' ERR+test $# -eq 3trap 'echo "*** BUILD FAILED ***" $BASH_SOURCE:$LINENO: error: "$BASH_COMMAND" returned $?' ERRset -eEuo pipefail@@ -58,34 +57,6 @@ for file in ${SRCDIR}/java/org/tartarus/snowball/ext/*.java; docat $file | sed "s/${oldclazz}/${newclazz}/g" > ${DESTDIR}/ext/${newclazz}.javadone-# regenerate test data-rm -f ${TESTDSTDIR}/test_languages.txt-rm -f ${TESTDSTDIR}/*.zip-for file in ${TESTSRCDIR}/*; do- # look for input (voc.txt) and expected output (output.txt) without any special licenses (COPYING)- if [ -f "${file}/voc.txt" ] && [ -f "${file}/output.txt" ] && [ ! -f "${file}/COPYING" ]; then- language=$(basename ${file})- if [ "${language}" == "kraaij_pohlmann" ]; then- language="kp"- fi- # make the .zip reproducible if data hasn't changed.- arbitrary_timestamp="200001010000"- # some test files are yuge, randomly sample up to this amount- row_limit="2000"- tmpdir=$(mktemp -d)- myrandom="openssl enc -aes-256-ctr -k ${arbitrary_timestamp} -nosalt -iv 0 -md md5"- for data in "voc.txt" "output.txt"; do- shuf -n ${row_limit} --random-source=<(${myrandom} < /dev/zero 2>/dev/null) ${file}/${data} > ${tmpdir}/${data} \- && touch -t ${arbitrary_timestamp} ${tmpdir}/${data}- done- # explicitly set permissions in case someone has a crazy umask (otherwise zip will differ)- chmod 644 ${tmpdir}/voc.txt ${tmpdir}/output.txt- zip --quiet --junk-paths -X -9 ${TESTDSTDIR}/${language}.zip ${tmpdir}/voc.txt ${tmpdir}/output.txt- echo "${language}" >> ${TESTDSTDIR}/test_languages.txt- rm -r ${tmpdir}- fi-done-# regenerate stopwords datarm -f ${WWWDSTDIR}/*_stop.txtfor file in ${WWWSRCDIR}/algorithms/*/stop.txt; dodiff --git a/gradle/validation/forbidden-apis.gradle b/gradle/validation/forbidden-apis.gradleindex 1c3d5808e5f..dd5f7de51c5 100644--- a/gradle/validation/forbidden-apis.gradle+++ b/gradle/validation/forbidden-apis.gradle@@ -162,5 +162,10 @@ allprojects { prj ->file("${resources}/defaults.logging.txt"))}++ // disable forbidden apis for snowball code+ if (prj.path == ":lucene:analysis:common") {+ forbiddenApisMain.exclude("org/tartarus/**")+ }})-}\ No newline at end of file+}diff --git a/lucene/analysis/common/src/generated/checksums/snowball.json b/lucene/analysis/common/src/generated/checksums/snowball.jsonindex ffe9bf98462..be3711f5c49 100644--- a/lucene/analysis/common/src/generated/checksums/snowball.json+++ b/lucene/analysis/common/src/generated/checksums/snowball.json@@ -1,39 +1,39 @@{"lucene/analysis/common/src/java/org/tartarus/snowball/Among.java": "5371973cc30637273366f042e1cff920e0dd14f6",- "lucene/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java": "93d77707ddc746aad94c1308d2f6f4321a1aa003",+ "lucene/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java": "ea01ca896689fcd6690c634028b08ef23ef934c3","lucene/analysis/common/src/java/org/tartarus/snowball/SnowballStemmer.java": "85bfc728393d7804f86f0def0467a12fd4b82fd3",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java": "9e41a5a9cb3ab8ae2e3b4aab7762694873293adb",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java": "513d4376d82285807a78c134e26587a07efc975a",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java": "820a005feedf2a5faed7920810dc92efd5f99a3d",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java": "6fad6909ef70835dfa3ce187045a8602df8cad29",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java": "ab354b8402565751cbb5e1cca69e62ed9005dc29",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java": "95c1d52f6b01a32e4ac289f86ce5fe4c040a73d8",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java": "30f88447cd4b051e4ec2d70cabc295ec551ff22b",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java": "35912a764f2500bb18594e06d9ae05c596357f9c",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java": "19540d4ec2522caff3a6e4748ebc17dc6b4b67c1",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java": "3cd8b7d3fcecadafc57d0288020b04c056bbbed4",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java": "d3c76ba45b6b8e016cc35488881e9d1139a62704",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java": "ea3fccdd12b769620d62b5dfbea2c0f2b395465e",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java": "728f6cb684de292dde5e5532835c74dbaa347aba",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java": "604db702d98d44cf6fd70550be3a511011c5737c",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java": "c9061cf6ceac73063732264a4d8997bc112d1514",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java": "1a4455d7b5ff5eac072c3a04b66a64c453720a73","lucene/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java": "d860a3d26d23756ae32feec6c4866666184ab08b",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java": "ddcaab1a9564d9bfe1912990a354bf5b81452a35",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java": "03522e3a705603d66a614b2ef59a2a4a059720c8",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java": "7cb9bd5500b873c387ace3fa5bd0fc06677c9644",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java": "eace09df7fcf65bb1752b394be99b704da0034c9",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java": "29d8dc98725c1a52213a4674d085b91c50df944a",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java": "4d460031c9bb3e66d5f5f4160b52aea3411a8d66","lucene/analysis/common/src/java/org/tartarus/snowball/ext/HindiStemmer.java": "14860ebdc789ed595fa5adbab45606babe8eb915",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java": "73e5303414ab0c049eb99174bd854d76353643cc",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java": "d7abfa02a388f327d619d9a89581166c97af719d","lucene/analysis/common/src/java/org/tartarus/snowball/ext/IndonesianStemmer.java": "bb4763deb4f4ff04e5f27a10f92c0738e345462a",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java": "0128235a133d89fa5dbec0217d8312b23a73dabd",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java": "e240334b4b1020f3d6cb47df2c22ecd39cfad57f",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java": "d01ce3361335502e1d805e1cbf195bd176f3b959",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java": "0523071c86f52a55d994a9eb7223403d2c93f973",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java": "32639d33d64cd0a5cc313e25fb6aedf12337443d",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java": "58fae6d2be188191c86fa408ef38c1d5b0f248e6",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java": "949988e5a423da6f49c47d8a270c62b7d89a8af5",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java": "1529609eab33d9aa9e6d3fc7256e7b0562fd626b","lucene/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java": "0d733741a9bff766a07aea5725cb9bfb07511a4a",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java": "d5a630ed694b0cebc393fa6477f36e22a528ba7a",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java": "7377b9b23d0c2442f91ccf0b58f4f61731e047d1",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java": "482ef025903d9dadc023deccc96991af7b9b4e95",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java": "d919ce99c3d4e681c81e9b7fd185a46e8575f701",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java": "40037c44918a2c4c70727cdd5fb3bc1d3daaa6a2",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java": "4efd7680cfd24851e65849fb8b897b7785c6b9cf",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java": "11cf2272b107ee224649caa3f132907f1ac1157d",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java": "dc4af194219f802dcdd807008c5775da4df0b64e",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java": "f1f655856dc13da742797b2fa5d48562b2ea7590",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java": "269feaa8f014a4952f233730d215b91f46fc9dd9",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java": "517c99669df0a47b4ab10db2aad8e7fa4ec62c30",- "lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java": "55a4bc8ce1f4772de07a7b6e7cf4a32bb77eb051",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java": "28f91d3aaa44e89e420e1e25fc2f70bf2189fd77",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java": "c206634342849a72107703d8ea4e7bc33dcdb0c3",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java": "f8dbfbcfa8a61ad2ebec2c5131d3d21d81239232",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java": "3d3b3ca1f19d3cdf89bfec7a793dbec4c4cfd118",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java": "419e836c26e1aa47d572d91f5af11ff37cfe5ab6",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java": "8bc103e819ef3be555f71c67a59a5ed4a87f8ec1",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java": "58cb7522a07c311aab420674953939d905f7d6d3",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java": "484945a4d68847677c680887f61a7c3d00e6866e",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java": "9afb99e75e15941c757a6bc0123bf9c05fadbe96",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java": "3f5f20f3622716d37935a32616a2afad91a23bc3",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java": "6392c0ac7b041717006e5847450be361f19a1e3f",+ "lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java": "9faaa89e7810fa81ca1f232f5f18bc83fe66c241","lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt": "f3627b9037da730534aa008b9edf32582c16866e","lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt": "3f84f1c2ae282bd1350fa246baaded095bebdecc","lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt": "5822d03de10b6403512774492508f586ea55a7c7",@@ -48,24 +48,5 @@"lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt": "e7579ef190edfc939348353dca480d9cedae1d83","lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt": "cbe87679fbabae13c8ea16be8a11fd78151f8bf7","lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt": "852c0b6520a1d2ac9d2ec189c296c2707b5060aa",- "lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt": "2fcc6906c3d55f8087030c28f0f118be4aed6596",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/danish.zip": "7b95a90a988efd38a37c9f088d4e5b24e8e680c2",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/dutch.zip": "a49dbb48a736476322f1d6a35e919615d720cffb",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/english.zip": "236025f171eaca4b3f2bfaf607c01e1a7c7f90f4",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/finnish.zip": "af5d28a55484999de4ce9311d6e274ff3836f7e7",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/german.zip": "04334e3d91cda6d99ea64c55bfa39c6733d73795",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/hungarian.zip": "f384349d496bbe3815595a589d6d3650a99b27db",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/irish.zip": "d7cbb9f662cce8b6713eaf4ad1c049ec0b456336",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/italian.zip": "2a710ed8c7def75793213f7442ae38d9f7d16298",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/kp.zip": "c2fab3651184017b9d6695fb1fe9520ca64a8ec2",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/lovins.zip": "7f00655ef9073c7dc99d4178e67630f56ddfcf73",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/nepali.zip": "8f5f2cf7c82feaadbab327888d86bd427ba8295e",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/norwegian.zip": "8c195ff5a6519c276e1beccb398264e8b16a82d5",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/porter.zip": "0ceeeeec3a440a033da204f155c3fc37eeac6e66",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/portuguese.zip": "2a79e01a46a0ad4aff06af1b5b9bb431ebe4b835",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/romanian.zip": "f85994ff82aee266322ec8a0e5244ee2500769a6",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/russian.zip": "d7c5ec3032f16fef0c875a285798a5fbbce446d0",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/spanish.zip": "a5f815b75a44d2a9fdf709eb54f849c4e3abe7a8",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/swedish.zip": "2b7e776747cd8c72e6b75fc99423abcb91a81edc",- "lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/turkish.zip": "a10af981f306bdbe39a2b00a6601773a319c4257"+ "lucene/analysis/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt": "2fcc6906c3d55f8087030c28f0f118be4aed6596"}\ No newline at end of filediff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java b/lucene/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.javaindex 78dc51a1b8a..4ff9c5527d9 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java@@ -34,11 +34,11 @@ package org.tartarus.snowball;import java.io.Serializable;import java.lang.reflect.UndeclaredThrowableException;+import java.util.Arrays;/** Base class for a snowball stemmer */public class SnowballProgram implements Serializable {protected SnowballProgram() {- current = new char[8];setCurrent("");}@@ -46,17 +46,12 @@ public class SnowballProgram implements Serializable {/** Set the current string. */public void setCurrent(String value) {- current = value.toCharArray();- cursor = 0;- limit = value.length();- limit_backward = 0;- bra = cursor;- ket = limit;+ setCurrent(value.toCharArray(), value.length());}/** Get the current string. */public String getCurrent() {- return new String(current, 0, limit);+ return new String(current, 0, length);}/**@@ -68,7 +63,7 @@ public class SnowballProgram implements Serializable {public void setCurrent(char[] text, int length) {current = text;cursor = 0;- limit = length;+ this.length = limit = length;limit_backward = 0;bra = cursor;ket = limit;@@ -97,13 +92,14 @@ public class SnowballProgram implements Serializable {* @return valid length of the array.*/public int getCurrentBufferLength() {- return limit;+ return length;}// current stringprivate char[] current;protected int cursor;+ protected int length;protected int limit;protected int limit_backward;protected int bra;@@ -112,6 +108,7 @@ public class SnowballProgram implements Serializable {public SnowballProgram(SnowballProgram other) {current = other.current;cursor = other.cursor;+ length = other.length;limit = other.limit;limit_backward = other.limit_backward;bra = other.bra;@@ -121,6 +118,7 @@ public class SnowballProgram implements Serializable {protected void copy_from(SnowballProgram other) {current = other.current;cursor = other.cursor;+ length = other.length;limit = other.limit;limit_backward = other.limit_backward;bra = other.bra;@@ -328,38 +326,27 @@ public class SnowballProgram implements Serializable {}}- // mini version of ArrayUtil.oversize from lucene, specialized to chars- static int oversize(int minTargetSize) {- int extra = minTargetSize >> 3;- if (extra < 3) {- extra = 3;- }- int newSize = minTargetSize + extra;- return (newSize + 3) & 0x7ffffffc;- }-/* to replace chars between c_bra and c_ket in current by the* chars in s.*/protected int replace_s(int c_bra, int c_ket, CharSequence s) {final int adjustment = s.length() - (c_ket - c_bra);- final int newLength = limit + adjustment;+ final int newLength = length + adjustment;// resize if necessaryif (newLength > current.length) {- char[] newBuffer = new char[oversize(newLength)];- System.arraycopy(current, 0, newBuffer, 0, limit);- current = newBuffer;+ current = Arrays.copyOf(current, newLength);}// if the substring being replaced is longer or shorter than the// replacement, need to shift things around- if (adjustment != 0 && c_ket < limit) {- System.arraycopy(current, c_ket, current, c_bra + s.length(), limit - c_ket);+ if (adjustment != 0 && c_ket < length) {+ System.arraycopy(current, c_ket, current, c_bra + s.length(), length - c_ket);}// insert the replacement text// Note, faster is s.getChars(0, s.length(), current, c_bra);// but would have to duplicate this method for both String and StringBuilderfor (int i = 0; i < s.length(); i++) current[c_bra + i] = s.charAt(i);+ length += adjustment;limit += adjustment;if (cursor >= c_ket) cursor += adjustment;else if (cursor > c_bra) cursor = c_bra;@@ -367,10 +354,10 @@ public class SnowballProgram implements Serializable {}protected void slice_check() {- if (bra < 0 || bra > ket || ket > limit) {- throw new IllegalArgumentException(- "faulty slice operation: bra=" + bra + ",ket=" + ket + ",limit=" + limit);- }+ assert bra >= 0 : "bra=" + bra;+ assert bra <= ket : "bra=" + bra + ",ket=" + ket;+ assert limit <= length : "limit=" + limit + ",length=" + length;+ assert ket <= limit : "ket=" + ket + ",limit=" + limit;}protected void slice_from(CharSequence s) {diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.javaindex a66ee339c30..5689b3e17a8 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u0640", -1, 1),@@ -559,7 +557,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {ket = cursor;switch (among_var) {case 1:- if (limit <= 4) {+ if (length <= 4) {return false;}B_is_noun = true;@@ -567,7 +565,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {B_is_defined = true;break;case 2:- if (limit <= 3) {+ if (length <= 3) {return false;}B_is_noun = true;@@ -588,25 +586,25 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {ket = cursor;switch (among_var) {case 1:- if (limit <= 3) {+ if (length <= 3) {return false;}slice_from("\u0623");break;case 2:- if (limit <= 3) {+ if (length <= 3) {return false;}slice_from("\u0622");break;case 3:- if (limit <= 3) {+ if (length <= 3) {return false;}slice_from("\u0627");break;case 4:- if (limit <= 3) {+ if (length <= 3) {return false;}slice_from("\u0625");@@ -621,7 +619,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}ket = cursor;- if (limit <= 3) {+ if (length <= 3) {return false;}{@@ -649,13 +647,13 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {ket = cursor;switch (among_var) {case 1:- if (limit <= 5) {+ if (length <= 5) {return false;}slice_del();break;case 2:- if (limit <= 4) {+ if (length <= 4) {return false;}slice_del();@@ -674,19 +672,19 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {ket = cursor;switch (among_var) {case 1:- if (limit <= 3) {+ if (length <= 3) {return false;}slice_del();break;case 2:- if (limit <= 3) {+ if (length <= 3) {return false;}slice_from("\u0628");break;case 3:- if (limit <= 3) {+ if (length <= 3) {return false;}slice_from("\u0643");@@ -705,25 +703,25 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {ket = cursor;switch (among_var) {case 1:- if (limit <= 4) {+ if (length <= 4) {return false;}slice_from("\u064A");break;case 2:- if (limit <= 4) {+ if (length <= 4) {return false;}slice_from("\u062A");break;case 3:- if (limit <= 4) {+ if (length <= 4) {return false;}slice_from("\u0646");break;case 4:- if (limit <= 4) {+ if (length <= 4) {return false;}slice_from("\u0623");@@ -738,7 +736,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}ket = cursor;- if (limit <= 4) {+ if (length <= 4) {return false;}B_is_verb = true;@@ -757,19 +755,19 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {bra = cursor;switch (among_var) {case 1:- if (limit < 4) {+ if (length < 4) {return false;}slice_del();break;case 2:- if (limit < 5) {+ if (length < 5) {return false;}slice_del();break;case 3:- if (limit < 6) {+ if (length < 6) {return false;}slice_del();@@ -784,7 +782,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}bra = cursor;- if (limit <= 5) {+ if (length <= 5) {return false;}slice_del();@@ -797,7 +795,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}bra = cursor;- if (limit <= 4) {+ if (length <= 4) {return false;}slice_del();@@ -810,7 +808,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}bra = cursor;- if (limit < 5) {+ if (length < 5) {return false;}slice_del();@@ -823,7 +821,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}bra = cursor;- if (limit < 4) {+ if (length < 4) {return false;}slice_del();@@ -836,7 +834,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}bra = cursor;- if (limit < 4) {+ if (length < 4) {return false;}slice_del();@@ -849,7 +847,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}bra = cursor;- if (limit < 3) {+ if (length < 3) {return false;}slice_del();@@ -866,19 +864,19 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {bra = cursor;switch (among_var) {case 1:- if (limit < 4) {+ if (length < 4) {return false;}slice_del();break;case 2:- if (limit < 5) {+ if (length < 5) {return false;}slice_del();break;case 3:- if (limit < 6) {+ if (length < 6) {return false;}slice_del();@@ -897,25 +895,25 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {bra = cursor;switch (among_var) {case 1:- if (limit < 4) {+ if (length < 4) {return false;}slice_del();break;case 2:- if (limit < 5) {+ if (length < 5) {return false;}slice_del();break;case 3:- if (limit <= 5) {+ if (length <= 5) {return false;}slice_del();break;case 4:- if (limit < 6) {+ if (length < 6) {return false;}slice_del();@@ -930,7 +928,7 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {return false;}bra = cursor;- if (limit < 5) {+ if (length < 5) {return false;}slice_del();@@ -947,13 +945,13 @@ public class ArabicStemmer extends org.tartarus.snowball.SnowballStemmer {bra = cursor;switch (among_var) {case 1:- if (limit < 4) {+ if (length < 4) {return false;}slice_del();break;case 2:- if (limit < 6) {+ if (length < 6) {return false;}slice_del();diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.javaindex 486deab73ea..0b90c8a6436 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class ArmenianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u0580\u0578\u0580\u0564", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.javaindex 03d5bbd2a8b..35aa1268100 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class BasqueStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("idea", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.javaindex 7b2b5b6b8b8..ee7b3be1c31 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class CatalanStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("", -1, 7),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.javaindex 33fe6256459..ca305c60327 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class DanishStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("hed", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.javaindex fd7f2742f5b..2160da4dd88 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class DutchStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("", -1, 6),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.javaindex 71b552161f6..29ca37d1b3a 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class EnglishStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("arsen", -1, -1), new Among("commun", -1, -1), new Among("gener", -1, -1)diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.javaindex f82e18e3476..29b78ef35e9 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class EstonianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("gi", -1, 1), new Among("ki", -1, 2)};diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.javaindex b2c27739df0..601e1c67a78 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class FrenchStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("col", -1, -1), new Among("par", -1, -1), new Among("tap", -1, -1)diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.javaindex 6b954832a9d..b0481b634ee 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class GermanStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("", -1, 5),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.javaindex a88962564e8..77c97f8657b 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class GreekStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("", -1, 25),@@ -1123,7 +1121,7 @@ public class GreekStemmer extends org.tartarus.snowball.SnowballStemmer {private boolean B_test1;private boolean r_has_min_length() {- return limit >= 3;+ return length >= 3;}private boolean r_tolower() {diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.javaindex f07762e4249..624aea0d349 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class HungarianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("cs", -1, -1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.javaindex 153810f4e2f..8b38eb5701a 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class IrishStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("b'", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.javaindex 68d1e95ede6..1335f783302 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class ItalianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("", -1, 7),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.javaindex 504427d6c8f..483e24cf10f 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class KpStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("nde", -1, 7),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.javaindex f18fbc67ac3..cf6d440a76a 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class LithuanianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("a", -1, -1),@@ -437,7 +435,7 @@ public class LithuanianStemmer extends org.tartarus.snowball.SnowballStemmer {break lab1;}cursor = v_3;- if (limit <= 6) {+ if (length <= 6) {cursor = v_2;break lab1;}diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.javaindex c1ec29999a7..b850488ffd6 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class NepaliStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u0932\u093E\u0907", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.javaindex cf11f68db9e..7ebccadbde0 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class NorwegianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("a", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.javaindex dd5cd655a9a..0e0081bcfe8 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class PorterStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("s", -1, 3), new Among("ies", 0, 2), new Among("sses", 0, 1), new Among("ss", 0, -1)diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.javaindex 89b9a6c9014..a1fc5c02879 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class PortugueseStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("", -1, 3), new Among("\u00E3", 0, 1), new Among("\u00F5", 0, 2)diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.javaindex 37d7f83dd6d..923bb7068de 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class RomanianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u015F", -1, 1), new Among("\u0163", -1, 2)};diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.javaindex f025797d8c1..f00490517a7 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class RussianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u0432", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.javaindex 23804c0cd39..736784b5927 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class SerbianStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u0430", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.javaindex 1a8c6a6a99e..e04cc28f30e 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class SpanishStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("", -1, 6),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.javaindex e7deb746cab..fd210747067 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class SwedishStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("a", -1, 1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.javaindex ee266c47a53..bdc8b013ebd 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class TamilStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u0BB5\u0BC1", -1, 3),@@ -353,7 +351,7 @@ public class TamilStemmer extends org.tartarus.snowball.SnowballStemmer {private boolean B_found_a_match;private boolean r_has_min_length() {- return limit > 4;+ return length > 4;}private boolean r_fix_va_start() {@@ -423,7 +421,7 @@ public class TamilStemmer extends org.tartarus.snowball.SnowballStemmer {private boolean r_fix_ending() {int among_var;- if (limit <= 3) {+ if (length <= 3) {return false;}limit_backward = cursor;@@ -763,7 +761,7 @@ public class TamilStemmer extends org.tartarus.snowball.SnowballStemmer {slice_from("\u0BCD");break;case 4:- if (limit < 7) {+ if (length < 7) {break lab1;}slice_from("\u0BCD");diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.javaindex 4fb0c27043a..2e859ebca60 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class TurkishStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("m", -1, -1),diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.javaindex 60f280a9dbc..30bfaee8f90 100644--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java@@ -13,8 +13,6 @@ import org.tartarus.snowball.Among;public class YiddishStemmer extends org.tartarus.snowball.SnowballStemmer {private static final long serialVersionUID = 1L;- private static final java.lang.invoke.MethodHandles.Lookup methodObject =- java.lang.invoke.MethodHandles.lookup();private static final Among a_0[] = {new Among("\u05D5\u05D5", -1, 1),diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.javadeleted file mode 100644index 9f0ea35d051..00000000000--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java+++ /dev/null@@ -1,62 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.lucene.analysis.snowball;--import static org.apache.lucene.tests.analysis.VocabularyAssert.*;--import java.io.IOException;-import java.io.InputStream;-import java.nio.charset.StandardCharsets;-import org.apache.lucene.analysis.Analyzer;-import org.apache.lucene.analysis.Tokenizer;-import org.apache.lucene.analysis.WordlistLoader;-import org.apache.lucene.analysis.core.KeywordTokenizer;-import org.apache.lucene.tests.util.LuceneTestCase;--/** Test the snowball filters against the snowball data tests */-public class TestSnowballVocab extends LuceneTestCase {- /** Run all languages against their snowball vocabulary tests. */- public void testStemmers() throws IOException {- try (InputStream in = getClass().getResourceAsStream("test_languages.txt")) {- for (String datafile : WordlistLoader.getLines(in, StandardCharsets.UTF_8)) {- String language = "" + Character.toUpperCase(datafile.charAt(0)) + datafile.substring(1);- assertCorrectOutput(language, datafile + ".zip");- }- }- }-- /**- * For the supplied language, run the stemmer against all strings in voc.txt The output should be- * the same as the string in output.txt- */- private void assertCorrectOutput(final String snowballLanguage, String zipfile)- throws IOException {- if (VERBOSE) System.out.println("checking snowball language: " + snowballLanguage);-- Analyzer a =- new Analyzer() {- @Override- protected TokenStreamComponents createComponents(String fieldName) {- Tokenizer t = new KeywordTokenizer();- return new TokenStreamComponents(t, new SnowballFilter(t, snowballLanguage));- }- };-- assertVocabulary(a, getDataPath(zipfile), "voc.txt", "output.txt");- a.close();- }-}diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/danish.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/danish.zipdeleted file mode 100644index 9d8de6a0d16..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/danish.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/dutch.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/dutch.zipdeleted file mode 100644index c466e659051..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/dutch.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/english.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/english.zipdeleted file mode 100644index 2f338a4dc90..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/english.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/finnish.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/finnish.zipdeleted file mode 100644index ca05f98b13e..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/finnish.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/german.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/german.zipdeleted file mode 100644index 03fe83238fd..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/german.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/hungarian.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/hungarian.zipdeleted file mode 100644index 0b55a5f3050..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/hungarian.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/irish.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/irish.zipdeleted file mode 100644index ffd29b38361..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/irish.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/italian.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/italian.zipdeleted file mode 100644index 84ee28fe147..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/italian.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/kp.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/kp.zipdeleted file mode 100644index 91cb91d4a90..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/kp.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/lovins.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/lovins.zipdeleted file mode 100644index b1b2fca98f5..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/lovins.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/nepali.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/nepali.zipdeleted file mode 100644index f3e529543b4..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/nepali.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/norwegian.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/norwegian.zipdeleted file mode 100644index cb8436a6c60..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/norwegian.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/porter.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/porter.zipdeleted file mode 100644index cea5e25bc0d..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/porter.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/portuguese.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/portuguese.zipdeleted file mode 100644index 78f97870039..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/portuguese.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/romanian.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/romanian.zipdeleted file mode 100644index 6bdb6dff59e..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/romanian.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/russian.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/russian.zipdeleted file mode 100644index 6f4ed427456..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/russian.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/spanish.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/spanish.zipdeleted file mode 100644index 8de887adaf0..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/spanish.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/swedish.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/swedish.zipdeleted file mode 100644index c1b20ffe5fe..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/swedish.zip and /dev/null differdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/test_languages.txt b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/test_languages.txtdeleted file mode 100644index 17f079c399c..00000000000--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/test_languages.txt+++ /dev/null@@ -1,19 +0,0 @@-danish-dutch-english-finnish-german-hungarian-irish-italian-kp-lovins-nepali-norwegian-porter-portuguese-romanian-russian-spanish-swedish-turkishdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/turkish.zip b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/turkish.zipdeleted file mode 100644index 6e828ff34e4..00000000000Binary files a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/turkish.zip and /dev/null differ