Scan TestFramework assembly in analysis discovery tests, #1126 (#1333)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Shad Storhaug <shad@shadstorhaug.com>

Author: 3 people

src/Lucene.Net.Analysis.Common/Analysis/Util/AnalysisSPILoader.cs

@@ -128,9 +128,10 @@ public Type LookupClass(string name)
             }
             else
             {
+                // LUCENENET Specific: Sort the keys for better error message readability
                 throw new ArgumentException("A SPI class of type " + clazz.Name + " with name '" + name + "' does not exist. " +
                     "You need to add the corresponding reference supporting this SPI to your project or AppDomain. " +
-                    "The current classpath supports the following names: " + string.Format(J2N.Text.StringFormatter.InvariantCulture, "{0}", AvailableServices));
+                    "The current classpath supports the following names: " + new JCG.SortedSet<string>(AvailableServices));
             }
         }
 

src/Lucene.Net.Analysis.Kuromoji/GraphvizFormatter.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 using JCG = J2N.Collections.Generic;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {
@@ -46,7 +47,7 @@ public class GraphvizFormatter
 
         public GraphvizFormatter(ConnectionCosts costs)
         {
-            this.costs = costs;
+            this.costs = costs ?? throw new ArgumentNullException(nameof(costs)); // LUCENENET: Added guard clause
             this.bestPathMap = new JCG.Dictionary<string, string>();
             sb.Append(FormatHeader());
             sb.Append("  init [style=invis]\n");
@@ -136,7 +137,7 @@ private string FormatNodes(JapaneseTokenizer tok, WrappedPositionArray positions
                     sb.Append(toNodeID);
 
                     string attrs;
-                    bestPathMap.TryGetValue(fromNodeID, out string path);
+                    bestPathMap.TryGetValue(fromNodeID, out string? path);
                     if (toNodeID.Equals(path, StringComparison.Ordinal))
                     {
                         // This arc is on best path

src/Lucene.Net.Analysis.Kuromoji/JapaneseAnalyzer.cs

@@ -1,4 +1,3 @@
-using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Analysis.Cjk;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Ja.Dict;
@@ -8,6 +7,7 @@
 using System.Collections.Generic;
 using System.IO;
 using JCG = J2N.Collections.Generic;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {
@@ -36,19 +36,19 @@ public class JapaneseAnalyzer : StopwordAnalyzerBase
     {
         private readonly JapaneseTokenizerMode mode;
         private readonly ISet<string> stoptags;
-        private readonly UserDictionary userDict;
+        private readonly UserDictionary? userDict;
 
         public JapaneseAnalyzer(LuceneVersion matchVersion)
             : this(matchVersion, null, JapaneseTokenizer.DEFAULT_MODE, DefaultSetHolder.DEFAULT_STOP_SET, DefaultSetHolder.DEFAULT_STOP_TAGS)
         {
         }
 
-        public JapaneseAnalyzer(LuceneVersion matchVersion, UserDictionary userDict, JapaneseTokenizerMode mode, CharArraySet stopwords, ISet<string> stoptags)
+        public JapaneseAnalyzer(LuceneVersion matchVersion, UserDictionary? userDict, JapaneseTokenizerMode mode, CharArraySet stopwords, ISet<string> stoptags)
             : base(matchVersion, stopwords)
         {
             this.userDict = userDict;
             this.mode = mode;
-            this.stoptags = stoptags;
+            this.stoptags = stoptags ?? throw new ArgumentNullException(nameof(stoptags));
         }
 
         [Obsolete("Use DefaultStopSet instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]

src/Lucene.Net.Analysis.Kuromoji/JapaneseBaseFormFilter.cs

@@ -1,6 +1,7 @@
 using Lucene.Net.Analysis.Ja.TokenAttributes;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.TokenAttributes.Extensions;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {
@@ -49,7 +50,7 @@ public override bool IncrementToken()
             {
                 if (!keywordAtt.IsKeyword)
                 {
-                    string baseForm = basicFormAtt.GetBaseForm();
+                    string? baseForm = basicFormAtt.GetBaseForm();
                     if (baseForm != null)
                     {
                         termAtt.SetEmpty().Append(baseForm);

src/Lucene.Net.Analysis.Kuromoji/JapaneseBaseFormFilterFactory.cs

@@ -1,6 +1,7 @@
 using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {

src/Lucene.Net.Analysis.Kuromoji/JapaneseIterationMarkCharFilter.cs

@@ -1,6 +1,7 @@
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
 using System.IO;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {

src/Lucene.Net.Analysis.Kuromoji/JapaneseIterationMarkCharFilterFactory.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {
@@ -58,7 +59,7 @@ public override TextReader Create(TextReader input)
             return new JapaneseIterationMarkCharFilter(input, normalizeKanji, normalizeKana);
         }
 
-        public virtual AbstractAnalysisFactory GetMultiTermComponent()
+        public virtual AbstractAnalysisFactory? GetMultiTermComponent()
         {
             return this;
         }

src/Lucene.Net.Analysis.Kuromoji/JapaneseKatakanaStemFilter.cs

@@ -1,5 +1,7 @@
 using Lucene.Net.Analysis.TokenAttributes;
+using System;
 using System.Text.RegularExpressions;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {
@@ -49,6 +51,10 @@ public sealed class JapaneseKatakanaStemFilter : TokenFilter
         public JapaneseKatakanaStemFilter(TokenStream input, int minimumLength)
             : base(input)
         {
+            // LUCENENET: Added guard clause
+            if (minimumLength < 0)
+                throw new ArgumentOutOfRangeException(nameof(minimumLength), "Minimum length must be a non-negative integer.");
+
             this.minimumKatakanaLength = minimumLength;
             this.termAttr = AddAttribute<ICharTermAttribute>();
             this.keywordAttr = AddAttribute<IKeywordAttribute>();

src/Lucene.Net.Analysis.Kuromoji/JapaneseKatakanaStemFilterFactory.cs

@@ -1,6 +1,7 @@
 using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {

src/Lucene.Net.Analysis.Kuromoji/JapanesePartOfSpeechStopFilter.cs

@@ -3,6 +3,7 @@
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
+#nullable enable
 
 namespace Lucene.Net.Analysis.Ja
 {
@@ -33,9 +34,9 @@ public sealed class JapanesePartOfSpeechStopFilter : FilteringTokenFilter
 
         [Obsolete("EnablePositionIncrements=false is not supported anymore as of Lucene 4.4.")]
         public JapanesePartOfSpeechStopFilter(LuceneVersion version, bool enablePositionIncrements, TokenStream input, ISet<string> stopTags)
-                  : base(version, enablePositionIncrements, input)
+            : base(version, enablePositionIncrements, input)
         {
-            this.stopTags = stopTags;
+            this.stopTags = stopTags ?? throw new ArgumentNullException(nameof(stopTags));
             this.posAtt = AddAttribute<IPartOfSpeechAttribute>();
         }
 
@@ -48,13 +49,13 @@ public JapanesePartOfSpeechStopFilter(LuceneVersion version, bool enablePosition
         public JapanesePartOfSpeechStopFilter(LuceneVersion version, TokenStream input, ISet<string> stopTags)
             : base(version, input)
         {
-            this.stopTags = stopTags;
+            this.stopTags = stopTags ?? throw new ArgumentNullException(nameof(stopTags));
             this.posAtt = AddAttribute<IPartOfSpeechAttribute>();
         }
 
         protected override bool Accept()
         {
-            string pos = posAtt.GetPartOfSpeech();
+            string? pos = posAtt.GetPartOfSpeech();
             return pos is null || !stopTags.Contains(pos);
         }
     }