diff --git a/gradle/generation/kuromoji.gradle b/gradle/generation/kuromoji.gradle index 5754bd68d6d..ec1c14c0a45 100644 --- a/gradle/generation/kuromoji.gradle +++ b/gradle/generation/kuromoji.gradle @@ -19,7 +19,7 @@ def recompileDictionary(project, dictionaryName, Closure closure) { project.javaexec { - main = "org.apache.lucene.analysis.ja.util.DictionaryBuilder" + main = "org.apache.lucene.analysis.ja.dict.DictionaryBuilder" classpath = project.sourceSets.main.runtimeClasspath jvmArgs '-Xmx1G' diff --git a/gradle/generation/nori.gradle b/gradle/generation/nori.gradle index fc10f0f561e..63a857e4a73 100644 --- a/gradle/generation/nori.gradle +++ b/gradle/generation/nori.gradle @@ -19,7 +19,7 @@ def recompileDictionary(project, dictionaryName, Closure closure) { project.javaexec { - main = "org.apache.lucene.analysis.ko.util.DictionaryBuilder" + main = "org.apache.lucene.analysis.ko.dict.DictionaryBuilder" classpath = project.sourceSets.main.runtimeClasspath jvmArgs '-Xmx1G' diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index dab729056d5..e59fa96d290 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -52,6 +52,10 @@ Other * LUCENE-10393: Unify binary dictionary and dictionary writer in Kuromoji and Nori. (Tomoko Uchida, Robert Muir) +* LUCENE-10475: Merge dictionary builders in `util` package into `dict` package in Kuromoji and Nori. + All classes in `org.apache.lucene.analysis.[ja|ko].util` was moved to `org.apache.lucene.analysis.[ja|ko].dict`. + (Tomoko Uchida) + ======================= Lucene 9.2.0 ======================= API Changes --------------------- diff --git a/lucene/analysis/kuromoji/src/java/module-info.java b/lucene/analysis/kuromoji/src/java/module-info.java index 0cd096087f1..f2040f628a1 100644 --- a/lucene/analysis/kuromoji/src/java/module-info.java +++ b/lucene/analysis/kuromoji/src/java/module-info.java @@ -24,7 +24,6 @@ module org.apache.lucene.analysis.kuromoji { exports org.apache.lucene.analysis.ja.completion; exports org.apache.lucene.analysis.ja.dict; exports org.apache.lucene.analysis.ja.tokenattributes; - exports org.apache.lucene.analysis.ja.util; opens org.apache.lucene.analysis.ja to org.apache.lucene.core; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java index dcc80296e37..046eeb30a31 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java @@ -19,8 +19,8 @@ package org.apache.lucene.analysis.ja; import java.io.IOException; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.ja.dict.ToStringUtil; import org.apache.lucene.analysis.ja.tokenattributes.ReadingAttribute; -import org.apache.lucene.analysis.ja.util.ToStringUtil; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; /** diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java index a933525b2f0..13d50272d32 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java @@ -265,7 +265,7 @@ public final class JapaneseTokenizer extends Tokenizer { * Create a new JapaneseTokenizer, supplying a custom system dictionary and unknown dictionary. * This constructor provides an entry point for users that want to construct custom language * models that can be used as input to {@link - * org.apache.lucene.analysis.ja.util.DictionaryBuilder}. + * org.apache.lucene.analysis.ja.dict.DictionaryBuilder}. * * @param factory the AttributeFactory to use * @param systemDictionary a custom known token dictionary diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CSVUtil.java similarity index 98% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CSVUtil.java index 6b66c56ece6..e3662f291ca 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CSVUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.util.ArrayList; import java.util.regex.Matcher; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCostsBuilder.java similarity index 95% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCostsBuilder.java index bfd8dd0d17c..1580fb4a329 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCostsBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.IOException; import java.io.LineNumberReader; @@ -22,7 +22,6 @@ import java.io.Reader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.analysis.ja.dict.ConnectionCosts; import org.apache.lucene.analysis.morph.ConnectionCostsWriter; class ConnectionCostsBuilder { diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/DictionaryBuilder.java similarity index 96% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/DictionaryBuilder.java index d547dcb122d..cf5183dfddf 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/DictionaryBuilder.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Locale; -import org.apache.lucene.analysis.ja.dict.DictionaryConstants; /** * Tool to build dictionaries. Usage: diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/DictionaryConstants.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/DictionaryConstants.java index 3046beef3e6..f58a1521c1b 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/DictionaryConstants.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/DictionaryConstants.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.ja.dict; /** Dictionary constants */ -public final class DictionaryConstants { +final class DictionaryConstants { /** Codec header of the dictionary file. */ public static final String DICT_HEADER = "kuromoji_dict"; /** Codec header of the dictionary mapping file. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ToStringUtil.java similarity index 99% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ToStringUtil.java index cb2da9035f1..a3ae57dedad 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ToStringUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryBuilder.java similarity index 95% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryBuilder.java index 2f34384c267..80b1cef6c32 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.BufferedReader; import java.io.IOException; @@ -28,7 +28,6 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.lucene.analysis.ja.util.DictionaryBuilder.DictionaryFormat; import org.apache.lucene.util.IntsRefBuilder; import org.apache.lucene.util.fst.FST; import org.apache.lucene.util.fst.FSTCompiler; @@ -39,7 +38,7 @@ class TokenInfoDictionaryBuilder { private final String encoding; private final Normalizer.Form normalForm; - private final DictionaryFormat format; + private final DictionaryBuilder.DictionaryFormat format; /** * Internal word id - incrementally assigned as entries are read and added. This will be byte @@ -48,7 +47,7 @@ class TokenInfoDictionaryBuilder { private int offset = 0; public TokenInfoDictionaryBuilder( - DictionaryFormat format, String encoding, boolean normalizeEntries) { + DictionaryBuilder.DictionaryFormat format, String encoding, boolean normalizeEntries) { this.format = format; this.encoding = encoding; normalForm = normalizeEntries ? Normalizer.Form.NFKC : null; @@ -159,7 +158,7 @@ class TokenInfoDictionaryBuilder { */ private String[] formatEntry(String[] features) { - if (this.format == DictionaryFormat.IPADIC) { + if (this.format == DictionaryBuilder.DictionaryFormat.IPADIC) { return features; } else { String[] features2 = new String[13]; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryEntryWriter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryEntryWriter.java similarity index 98% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryEntryWriter.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryEntryWriter.java index 618047825f2..e5270b32844 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryEntryWriter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryEntryWriter.java @@ -14,12 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; -import org.apache.lucene.analysis.ja.dict.TokenInfoMorphData; import org.apache.lucene.analysis.morph.DictionaryEntryWriter; import org.apache.lucene.store.DataOutput; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryWriter.java similarity index 92% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryWriter.java index fbdf65f34ce..dda849b67d4 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryWriter.java @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; -import org.apache.lucene.analysis.ja.dict.DictionaryConstants; -import org.apache.lucene.analysis.ja.dict.TokenInfoDictionary; import org.apache.lucene.util.fst.FST; class TokenInfoDictionaryWriter diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoMorphData.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoMorphData.java index d743a7faca6..ab31e097e6f 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoMorphData.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoMorphData.java @@ -26,7 +26,7 @@ import org.apache.lucene.store.InputStreamDataInput; import org.apache.lucene.util.IOSupplier; /** Morphological information for system dictionary. */ -public class TokenInfoMorphData implements JaMorphData { +class TokenInfoMorphData implements JaMorphData { private final ByteBuffer buffer; private final String[] posDict; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionaryBuilder.java similarity index 97% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionaryBuilder.java index e2a4338d0ec..a367c49ca4d 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionaryBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.IOException; import java.io.LineNumberReader; @@ -25,7 +25,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.apache.lucene.analysis.ja.dict.CharacterDefinition; class UnknownDictionaryBuilder { private static final String NGRAM_DICTIONARY_ENTRY = "NGRAM,5,5,-32768,記号,一般,*,*,*,*,*,*,*"; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionaryWriter.java similarity index 92% rename from lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java rename to lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionaryWriter.java index 84000fdf0de..eb41296e12e 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionaryWriter.java @@ -14,13 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.io.IOException; import java.nio.file.Path; -import org.apache.lucene.analysis.ja.dict.CharacterDefinition; -import org.apache.lucene.analysis.ja.dict.DictionaryConstants; -import org.apache.lucene.analysis.ja.dict.UnknownDictionary; import org.apache.lucene.analysis.morph.BinaryDictionaryWriter; import org.apache.lucene.analysis.morph.CharacterDefinitionWriter; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java index 12dd27d9584..52604c4e195 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java @@ -25,7 +25,6 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.lucene.analysis.ja.util.CSVUtil; import org.apache.lucene.analysis.morph.Dictionary; import org.apache.lucene.util.IntsRefBuilder; import org.apache.lucene.util.fst.FST; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserMorphData.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserMorphData.java index 1f6907052e0..be895f1268a 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserMorphData.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserMorphData.java @@ -19,8 +19,6 @@ package org.apache.lucene.analysis.ja.dict; import static org.apache.lucene.analysis.ja.dict.UserDictionary.CUSTOM_DICTIONARY_WORD_ID_OFFSET; import static org.apache.lucene.analysis.ja.dict.UserDictionary.INTERNAL_SEPARATOR; -import org.apache.lucene.analysis.ja.util.CSVUtil; - /** Morphological information for user dictionary. */ final class UserMorphData implements JaMorphData { public static final int WORD_COST = -100000; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java index 36a04dce089..01857e3a4c8 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.ja.tokenattributes; import org.apache.lucene.analysis.ja.Token; -import org.apache.lucene.analysis.ja.util.ToStringUtil; +import org.apache.lucene.analysis.ja.dict.ToStringUtil; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java index 464adbdf7ad..9dbea1a9944 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.ja.tokenattributes; import org.apache.lucene.analysis.ja.Token; -import org.apache.lucene.analysis.ja.util.ToStringUtil; +import org.apache.lucene.analysis.ja.dict.ToStringUtil; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java index bada2421bed..b3a72154540 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.ja.tokenattributes; import org.apache.lucene.analysis.ja.Token; -import org.apache.lucene.analysis.ja.util.ToStringUtil; +import org.apache.lucene.analysis.ja.dict.ToStringUtil; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java deleted file mode 100644 index e0abc576d83..00000000000 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java +++ /dev/null @@ -1,19 +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. - */ - -/** Kuromoji utility classes. */ -package org.apache.lucene.analysis.ja.util; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java index 072a93726d8..8cc6fb66e5a 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.ja; import java.io.IOException; -import org.apache.lucene.analysis.ja.util.CSVUtil; +import org.apache.lucene.analysis.ja.dict.CSVUtil; import org.apache.lucene.tests.util.LuceneTestCase; /* diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestExternalDictionary.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestExternalDictionary.java index 5423d7a76cb..6aaae0cc7ce 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestExternalDictionary.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestExternalDictionary.java @@ -25,7 +25,6 @@ import java.io.BufferedWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.analysis.ja.util.DictionaryBuilder; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Before; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestToStringUtil.java similarity index 99% rename from lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java rename to lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestToStringUtil.java index cbe0554a971..1650aa7ec05 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestToStringUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import java.util.HashMap; import java.util.Map; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java index 0320d6e5f13..d365ca096c8 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java @@ -27,9 +27,6 @@ import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.analysis.ja.util.DictionaryBuilder; -import org.apache.lucene.analysis.ja.util.DictionaryBuilder.DictionaryFormat; -import org.apache.lucene.analysis.ja.util.ToStringUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; @@ -77,7 +74,7 @@ public class TestTokenInfoDictionary extends LuceneTestCase { new PrintWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) { printer.println("1 1"); } - DictionaryBuilder.build(DictionaryFormat.IPADIC, dir, dir, "utf-8", true); + DictionaryBuilder.build(DictionaryBuilder.DictionaryFormat.IPADIC, dir, dir, "utf-8", true); String dictionaryPath = TokenInfoDictionary.class.getName().replace('.', '/'); // We must also load the other files (in BinaryDictionary) from the correct path return new TokenInfoDictionary( diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUnknownDictionary.java similarity index 98% rename from lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java rename to lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUnknownDictionary.java index a2e74c710f7..5ccdaa6b926 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUnknownDictionary.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ja.util; +package org.apache.lucene.analysis.ja.dict; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/analysis/nori/src/java/module-info.java b/lucene/analysis/nori/src/java/module-info.java index 77e67801524..49edd98a7ff 100644 --- a/lucene/analysis/nori/src/java/module-info.java +++ b/lucene/analysis/nori/src/java/module-info.java @@ -23,7 +23,6 @@ module org.apache.lucene.analysis.nori { exports org.apache.lucene.analysis.ko; exports org.apache.lucene.analysis.ko.dict; exports org.apache.lucene.analysis.ko.tokenattributes; - exports org.apache.lucene.analysis.ko.util; provides org.apache.lucene.analysis.TokenizerFactory with org.apache.lucene.analysis.ko.KoreanTokenizerFactory; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizer.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizer.java index 028d9dd54d1..ae64076ce43 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizer.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizer.java @@ -26,6 +26,7 @@ import java.util.List; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ko.dict.CharacterDefinition; import org.apache.lucene.analysis.ko.dict.ConnectionCosts; +import org.apache.lucene.analysis.ko.dict.DictionaryBuilder; import org.apache.lucene.analysis.ko.dict.KoMorphData; import org.apache.lucene.analysis.ko.dict.TokenInfoDictionary; import org.apache.lucene.analysis.ko.dict.TokenInfoFST; @@ -197,7 +198,7 @@ public final class KoreanTokenizer extends Tokenizer { /** * Create a new KoreanTokenizer supplying a custom system dictionary and unknown dictionary. This * constructor provides an entry point for users that want to construct custom language models - * that can be used as input to {@link org.apache.lucene.analysis.ko.util.DictionaryBuilder}. + * that can be used as input to {@link DictionaryBuilder}. * * @param factory the AttributeFactory to use * @param systemDictionary a custom known token dictionary diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/CSVUtil.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/CSVUtil.java similarity index 98% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/CSVUtil.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/CSVUtil.java index 40b179a9ea4..b9e3ff9483b 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/CSVUtil.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/CSVUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.util.ArrayList; import java.util.regex.Matcher; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/ConnectionCostsBuilder.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/ConnectionCostsBuilder.java similarity index 95% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/ConnectionCostsBuilder.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/ConnectionCostsBuilder.java index 31505fb45c8..0509fa10109 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/ConnectionCostsBuilder.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/ConnectionCostsBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.io.IOException; import java.io.LineNumberReader; @@ -22,7 +22,6 @@ import java.io.Reader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.analysis.ko.dict.ConnectionCosts; import org.apache.lucene.analysis.morph.ConnectionCostsWriter; class ConnectionCostsBuilder { diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/DictionaryBuilder.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/DictionaryBuilder.java similarity index 94% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/DictionaryBuilder.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/DictionaryBuilder.java index 0e8f11f0cf8..fab44beb92a 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/DictionaryBuilder.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/DictionaryBuilder.java @@ -14,12 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.apache.lucene.analysis.ko.dict.DictionaryConstants; /** Tool to build dictionaries. */ public class DictionaryBuilder { diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/DictionaryConstants.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/DictionaryConstants.java index 4f8761e59e7..aee489eb880 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/DictionaryConstants.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/DictionaryConstants.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.ko.dict; /** Dictionary constants */ -public final class DictionaryConstants { +final class DictionaryConstants { /** Codec header of the dictionary file. */ public static final String DICT_HEADER = "ko_dict"; /** Codec header of the dictionary mapping file. */ diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryBuilder.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryBuilder.java similarity index 99% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryBuilder.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryBuilder.java index 020d241e4ec..3726f9e6673 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryBuilder.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryEntryWriter.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryEntryWriter.java similarity index 97% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryEntryWriter.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryEntryWriter.java index e18cae357d3..f7ee696a197 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryEntryWriter.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryEntryWriter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.io.IOException; import java.io.OutputStream; @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.apache.lucene.analysis.ko.POS; -import org.apache.lucene.analysis.ko.dict.KoMorphData; -import org.apache.lucene.analysis.ko.dict.TokenInfoMorphData; import org.apache.lucene.analysis.morph.DictionaryEntryWriter; import org.apache.lucene.store.DataOutput; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryWriter.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryWriter.java similarity index 92% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryWriter.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryWriter.java index 78a9acaff8a..d0465ed12b7 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/TokenInfoDictionaryWriter.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryWriter.java @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; -import org.apache.lucene.analysis.ko.dict.DictionaryConstants; -import org.apache.lucene.analysis.ko.dict.TokenInfoDictionary; import org.apache.lucene.analysis.morph.BinaryDictionaryWriter; import org.apache.lucene.util.fst.FST; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoMorphData.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoMorphData.java index c8046b2e604..b23be046b0c 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoMorphData.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/TokenInfoMorphData.java @@ -27,7 +27,7 @@ import org.apache.lucene.store.InputStreamDataInput; import org.apache.lucene.util.IOSupplier; /** Morphological information for system dictionary. */ -public class TokenInfoMorphData implements KoMorphData { +class TokenInfoMorphData implements KoMorphData { private final ByteBuffer buffer; private final POS.Tag[] posDict; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/UnknownDictionaryBuilder.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UnknownDictionaryBuilder.java similarity index 97% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/UnknownDictionaryBuilder.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UnknownDictionaryBuilder.java index 634c2a599ee..1004ab89581 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/UnknownDictionaryBuilder.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UnknownDictionaryBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.io.IOException; import java.io.LineNumberReader; @@ -25,7 +25,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.apache.lucene.analysis.ko.dict.CharacterDefinition; class UnknownDictionaryBuilder { private static final String NGRAM_DICTIONARY_ENTRY = "NGRAM,1801,3559,3677,SY,*,*,*,*,*,*,*"; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/UnknownDictionaryWriter.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UnknownDictionaryWriter.java similarity index 92% rename from lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/UnknownDictionaryWriter.java rename to lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UnknownDictionaryWriter.java index 82285e1c78b..3169744c2ec 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/UnknownDictionaryWriter.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/dict/UnknownDictionaryWriter.java @@ -14,13 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import java.io.IOException; import java.nio.file.Path; -import org.apache.lucene.analysis.ko.dict.CharacterDefinition; -import org.apache.lucene.analysis.ko.dict.DictionaryConstants; -import org.apache.lucene.analysis.ko.dict.UnknownDictionary; import org.apache.lucene.analysis.morph.BinaryDictionaryWriter; import org.apache.lucene.analysis.morph.CharacterDefinitionWriter; diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/package-info.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/package-info.java deleted file mode 100644 index 99241d63370..00000000000 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/util/package-info.java +++ /dev/null @@ -1,19 +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. - */ - -/** Nori utility classes. */ -package org.apache.lucene.analysis.ko.util; diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestExternalDictionary.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestExternalDictionary.java index 2ba7cee6a37..b8d84f91666 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestExternalDictionary.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestExternalDictionary.java @@ -25,7 +25,6 @@ import java.io.BufferedWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.analysis.ko.util.DictionaryBuilder; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Before; diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java index 6948c4aa851..46c54271532 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java @@ -28,7 +28,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import org.apache.lucene.analysis.ko.POS; -import org.apache.lucene.analysis.ko.util.DictionaryBuilder; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUnknownDictionary.java similarity index 98% rename from lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java rename to lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUnknownDictionary.java index c619ad36072..dbce890deda 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUnknownDictionary.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.ko.util; +package org.apache.lucene.analysis.ko.dict; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test;