Address reviewer comments

apache · Jun 12, 2023 · b333725 · b333725
1 parent e111cc8
commit b333725
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
@@ -80,8 +80,6 @@ Bug Fixes
 
 * GITHUB#12220: Hunspell: disallow hidden title-case entries from compound middle/end
 
-* LUCENE-10181: Restrict GraphTokenStreamFiniteStrings#articulationPointsRecurse recursion depth. (Chris Fournier)
-
 Other
 ---------------------
 
@@ -128,7 +126,9 @@ Optimizations
 
 Bug Fixes
 ---------------------
-(No changes)
+
+* LUCENE-10181: Restrict GraphTokenStreamFiniteStrings#articulationPointsRecurse recursion depth. (Chris Fournier)
+
 
 Other
 ---------------------

diff --git a/lucene/core/src/java/org/apache/lucene/util/graph/GraphTokenStreamFiniteStrings.java b/lucene/core/src/java/org/apache/lucene/util/graph/GraphTokenStreamFiniteStrings.java
@@ -275,7 +275,8 @@ private static void articulationPointsRecurse(
         if (d < MAX_RECURSION_LEVEL) {
           articulationPointsRecurse(a, t.dest, d + 1, depth, low, parent, visited, points);
         } else {
-          throw new IllegalArgumentException("Exceeded maximum recursion level during graph analysis");
+          throw new IllegalArgumentException(
+              "Exceeded maximum recursion level during graph analysis");
         }
         childCount++;
         if (low[t.dest] >= depth[state]) {

diff --git a/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java b/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java
@@ -16,8 +16,6 @@
  */
 package org.apache.lucene.util.graph;
 
-import static org.apache.lucene.util.automaton.Operations.MAX_RECURSION_LEVEL;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import org.apache.lucene.analysis.TokenStream;
@@ -677,13 +675,13 @@ public void testLongTokenStreamStackOverflowError() throws Exception {
         };
 
     // Add in too many tokens to get a high depth graph
-    for (int i = 0; i < 1024 * 10; i++) {
+    for (int i = 0; i < 1024 + 1; i++) {
       tokens.add(token("network", 1, 1));
     }
 
     TokenStream ts = new CannedTokenStream(tokens.toArray(new Token[0]));
     GraphTokenStreamFiniteStrings graph = new GraphTokenStreamFiniteStrings(ts);
 
-    assertThrows(IllegalArgumentException.class, () -> graph.articulationPoints());
+    assertThrows(IllegalArgumentException.class, graph::articulationPoints);
   }
 }