Refactor class hierarchy with Claude

glorieux-f · glorieux-f · commit e35678fb6d8e · 2026-05-05T00:00:22.000+02:00
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/DocHilite.java b/common/src/java/com/github/oeuvres/alix/lucene/DocHilite.java
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/LuceneIndex.java b/common/src/java/com/github/oeuvres/alix/lucene/LuceneIndex.java
@@ -17,6 +17,11 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 
+import com.github.oeuvres.alix.lucene.fluc.Fluc;
+import com.github.oeuvres.alix.lucene.fluc.FlucCategory;
+import com.github.oeuvres.alix.lucene.fluc.FlucFacet;
+import com.github.oeuvres.alix.lucene.fluc.FlucNum;
+import com.github.oeuvres.alix.lucene.fluc.FlucText;
 import com.github.oeuvres.alix.util.Dir;
 
 /**
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/Partition.java b/common/src/java/com/github/oeuvres/alix/lucene/Partition.java
@@ -9,6 +9,8 @@
 
 import org.apache.lucene.util.FixedBitSet;
 
+import com.github.oeuvres.alix.lucene.fluc.FlucNum;
+import com.github.oeuvres.alix.lucene.fluc.FlucText;
 import com.github.oeuvres.alix.lucene.terms.FieldStats;
 
 /**
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/TopTerms.java b/common/src/java/com/github/oeuvres/alix/lucene/TopTerms.java
@@ -30,7 +30,7 @@
  *
  * <p>
  * A {@code TopTerms} instance is obtained from
- * {@link com.github.oeuvres.alix.lucene.FlucText#topTerms()} and is bound to
+ * {@link com.github.oeuvres.alix.lucene.fluc.FlucText#topTerms()} and is bound to
  * one field's {@link FieldStats} and {@link TermLexicon}. The instance holds no
  * ranking after construction. A ranking is produced by one of the ranking
  * methods.
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/Fluc.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/Fluc.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -16,6 +16,8 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.LeafReaderContext;
 
+import com.github.oeuvres.alix.lucene.LuceneIndex;
+
 /**
  * Field of a Lucene index, with type-specific cached resources.
  *
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucCategory.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucCategory.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucFacet.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucFacet.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucNum.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucNum.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.IOException;
 import java.util.NoSuchElementException;
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucStored.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucStored.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.IOException;
 import java.util.Set;
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucString.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucString.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucText.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/FlucText.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -13,6 +13,7 @@
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
 
+import com.github.oeuvres.alix.lucene.TopTerms;
 import com.github.oeuvres.alix.lucene.terms.FieldStats;
 import com.github.oeuvres.alix.lucene.terms.TermLexicon;
 import com.github.oeuvres.alix.lucene.terms.TermRail;
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/fluc/LazyResource.java b/common/src/java/com/github/oeuvres/alix/lucene/fluc/LazyResource.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.fluc;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/common/src/java/com/github/oeuvres/alix/lucene/output/HtmlResults.java b/common/src/java/com/github/oeuvres/alix/lucene/output/HtmlResults.java
@@ -1,4 +1,4 @@
-package com.github.oeuvres.alix.lucene;
+package com.github.oeuvres.alix.lucene.output;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/test/src/main/java/com/github/oeuvres/alix/lucene/SpanDemo.java b/test/src/main/java/com/github/oeuvres/alix/lucene/SpanDemo.java
@@ -16,6 +16,7 @@
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.store.FSDirectory;
 
+import com.github.oeuvres.alix.lucene.output.HtmlResults;
 import com.github.oeuvres.alix.lucene.spans.SpanQueryParser;
 import com.github.oeuvres.alix.lucene.spans.SpanWalker;
 
diff --git a/test/src/main/java/com/github/oeuvres/alix/lucene/terms/TermSuggestDemo.java b/test/src/main/java/com/github/oeuvres/alix/lucene/terms/TermSuggestDemo.java
@@ -10,9 +10,9 @@
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.store.FSDirectory;
 
-import com.github.oeuvres.alix.lucene.TermSuggest;
 import com.github.oeuvres.alix.lucene.TopTerms;
 import com.github.oeuvres.alix.lucene.TopTerms.TermEntry;
+import com.github.oeuvres.alix.lucene.output.TermSuggest;
 import com.github.oeuvres.alix.util.Char;
 import com.github.oeuvres.alix.util.Report;
 import com.github.oeuvres.alix.util.Report.ReportConsole;
diff --git a/web/src/main/java/com/github/oeuvres/alix/web/AlixServlet.java b/web/src/main/java/com/github/oeuvres/alix/web/AlixServlet.java
@@ -20,8 +20,9 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
-import com.github.oeuvres.alix.lucene.Fluc;
 import com.github.oeuvres.alix.lucene.LuceneIndex;
+import com.github.oeuvres.alix.lucene.fluc.Fluc;
+import com.github.oeuvres.alix.lucene.fluc.OpTerms;
 
 /**
  * Frontal servlet for the Alix search API.
diff --git a/web/src/main/java/com/github/oeuvres/alix/web/Op.java b/web/src/main/java/com/github/oeuvres/alix/web/Op.java
@@ -20,8 +20,8 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
-import com.github.oeuvres.alix.lucene.FlucNum;
 import com.github.oeuvres.alix.lucene.LuceneIndex;
+import com.github.oeuvres.alix.lucene.fluc.FlucNum;
 import com.github.oeuvres.alix.lucene.spans.SpanQueryParser;
 import com.github.oeuvres.alix.web.util.HttpPars;
 
diff --git a/web/src/main/java/com/github/oeuvres/alix/web/OpResults.java b/web/src/main/java/com/github/oeuvres/alix/web/OpResults.java
@@ -12,11 +12,11 @@
 import org.apache.lucene.util.FixedBitSet;
 
 import com.github.oeuvres.alix.lucene.BitsCollectorManager;
-import com.github.oeuvres.alix.lucene.Fluc;
-import com.github.oeuvres.alix.lucene.FlucNum;
-import com.github.oeuvres.alix.lucene.FlucText;
-import com.github.oeuvres.alix.lucene.HtmlResults;
 import com.github.oeuvres.alix.lucene.LuceneIndex;
+import com.github.oeuvres.alix.lucene.fluc.Fluc;
+import com.github.oeuvres.alix.lucene.fluc.FlucNum;
+import com.github.oeuvres.alix.lucene.fluc.FlucText;
+import com.github.oeuvres.alix.lucene.output.HtmlResults;
 import com.github.oeuvres.alix.lucene.spans.SpanVisitor;
 import com.github.oeuvres.alix.lucene.spans.SpanWalker;
 import com.github.oeuvres.alix.lucene.terms.FieldStats;
diff --git a/web/src/main/java/com/github/oeuvres/alix/web/OpTerms.java b/web/src/main/java/com/github/oeuvres/alix/web/OpTerms.java
@@ -14,12 +14,12 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 import com.github.oeuvres.alix.lucene.BitsCollectorManager;
-import com.github.oeuvres.alix.lucene.FlucNum;
-import com.github.oeuvres.alix.lucene.FlucText;
 import com.github.oeuvres.alix.lucene.LuceneIndex;
 import com.github.oeuvres.alix.lucene.Partition;
 import com.github.oeuvres.alix.lucene.TopTerms;
 import com.github.oeuvres.alix.lucene.TopTerms.TermEntry;
+import com.github.oeuvres.alix.lucene.fluc.FlucNum;
+import com.github.oeuvres.alix.lucene.fluc.FlucText;
 import com.github.oeuvres.alix.lucene.spans.CoocListener;
 import com.github.oeuvres.alix.lucene.spans.SpanWalker;
 import com.github.oeuvres.alix.lucene.terms.KeynessScorer;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* <p>`
`32`	`32`	`* A {@code TopTerms} instance is obtained from`
`33`		`- * {@link com.github.oeuvres.alix.lucene.FlucText#topTerms()} and is bound to`
	`33`	`+ * {@link com.github.oeuvres.alix.lucene.fluc.FlucText#topTerms()} and is bound to`
`34`	`34`	`* one field's {@link FieldStats} and {@link TermLexicon}. The instance holds no`
`35`	`35`	`* ranking after construction. A ranking is produced by one of the ranking`
`36`	`36`	`* methods.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.oeuvres.alix.lucene;`
	`1`	`+package com.github.oeuvres.alix.lucene.fluc;`
`2`	`2`
`3`	`3`	`import java.io.IOException;`
`4`	`4`	`import java.util.Arrays;`