house keeping

Author: glorieux-f

analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/AnalyzerCloud.java

@@ -37,7 +37,6 @@
 import org.apache.lucene.analysis.Tokenizer;
 
 import com.github.oeuvres.alix.lucene.analysis.FilterCloud;
-import com.github.oeuvres.alix.lucene.analysis.FilterLemmatize;
 import com.github.oeuvres.alix.lucene.analysis.FilterLocution;
 import com.github.oeuvres.alix.lucene.analysis.MLFilter;
 import com.github.oeuvres.alix.lucene.analysis.MLTokenizer;

analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/AnalyzerFind.java

@@ -38,7 +38,6 @@
 import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
 
 import com.github.oeuvres.alix.lucene.analysis.FilterFind;
-import com.github.oeuvres.alix.lucene.analysis.FilterLemmatize;
 import com.github.oeuvres.alix.lucene.analysis.MLFilter;
 import com.github.oeuvres.alix.lucene.analysis.MLTokenizer;
 

analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/AnalyzerOrth.java

@@ -36,7 +36,6 @@
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 
-import com.github.oeuvres.alix.lucene.analysis.FilterLemmatize;
 import com.github.oeuvres.alix.lucene.analysis.FilterLocution;
 import com.github.oeuvres.alix.lucene.analysis.FilterOrth;
 import com.github.oeuvres.alix.lucene.analysis.MLFilter;

analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/AnalyzerQuery.java

@@ -38,7 +38,6 @@
 import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
 
 import com.github.oeuvres.alix.lucene.analysis.FilterFind;
-import com.github.oeuvres.alix.lucene.analysis.FilterLemmatize;
 import com.github.oeuvres.alix.lucene.analysis.MLTokenizer;
 
 /**

…lix/lucene/analysis/FilterLemmatize.java …/lucene/analysis/fr/FilterLemmatize.javaanalysis/src/java/com/github/oeuvres/alix/lucene/analysis/FilterLemmatize.java renamed to analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/FilterLemmatize.java analysis/src/java/com/github/oeuvres/alix/lucene/analysis/FilterLemmatize.java renamed to analysis/src/java/com/github/oeuvres/alix/lucene/analysis/fr/FilterLemmatize.java

@@ -30,7 +30,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.github.oeuvres.alix.lucene.analysis;
+package com.github.oeuvres.alix.lucene.analysis.fr;
 
 import java.io.IOException;
 
@@ -42,6 +42,7 @@
 import com.github.oeuvres.alix.common.Upos;
 import static com.github.oeuvres.alix.common.Upos.*;
 
+import com.github.oeuvres.alix.lucene.analysis.FilterCloud;
 import com.github.oeuvres.alix.lucene.analysis.tokenattributes.CharsAttImpl;
 import com.github.oeuvres.alix.lucene.analysis.tokenattributes.LemAtt;
 import com.github.oeuvres.alix.lucene.analysis.tokenattributes.OrthAtt;

test/src/main/java/com/github/oeuvres/alix/lucene/analysis/RewriteFilterBenchmark.java

@@ -52,7 +52,7 @@ public class RewriteFilterBenchmark
     public void setup() throws Exception
     {
         termMap = new CharArrayMap<char[]>(1000, false);
-        Lexicons.fillMap(termMap, Path.of(mappingCsv), false);
+        Lexicons.loadMap(termMap, Path.of(mappingCsv), false);
         synMap = buildSynonymMap(termMap);
 
         // Load tokens once; one token per line.

test/src/test/java/com/github/oeuvres/alix/lucene/analysis/TokenStreamsTest.java

@@ -23,6 +23,7 @@
 import com.github.oeuvres.alix.fr.TagFr;
 import com.github.oeuvres.alix.lucene.analysis.fr.AnalyzerAlix;
 import com.github.oeuvres.alix.lucene.analysis.fr.AnalyzerCloud;
+import com.github.oeuvres.alix.lucene.analysis.fr.FilterLemmatize;
 import com.github.oeuvres.alix.lucene.analysis.tokenattributes.CharsAttImpl;
 import com.github.oeuvres.alix.lucene.analysis.tokenattributes.LemAtt;
 import com.github.oeuvres.alix.lucene.analysis.tokenattributes.OrthAtt;