SWEEP: Reviewed all catch blocks where Lucene uses IllegalArgumentExc…

…eption and converted them to use our IsIllegalArgumentException() extension method (see apache#446).
NightOwl888 · Apr 14, 2021 · 0756ba7 · 0756ba7
1 parent afe277f
commit 0756ba7
Show file tree

Hide file tree

Showing 171 changed files with 509 additions and 715 deletions.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SolrSynonymParser.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SolrSynonymParser.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
@@ -134,7 +134,7 @@ public override void Parse(TextReader @in)
                     }
                 }
             }
-            catch (ArgumentException e)
+            catch (Exception e) when (e.IsIllegalArgumentException())
             {
                 throw new Exception("Invalid synonym rule at line " + lineNumber, e);
                 //ex.initCause(e);

diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/WordnetSynonymParser.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/WordnetSynonymParser.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Util;
 using System;
 using System.IO;
@@ -78,7 +78,7 @@ public override void Parse(TextReader @in)
                 // final synset in the file
                 AddInternal(synset, synsetSize);
             }
-            catch (ArgumentException e)
+            catch (Exception e) when (e.IsIllegalArgumentException())
             {
                 throw new Exception("Invalid synonym rule at line " + lineNumber.ToString(), e);
             }

diff --git a/src/Lucene.Net.Analysis.Phonetic/Language/Bm/Rule.cs b/src/Lucene.Net.Analysis.Phonetic/Language/Bm/Rule.cs
@@ -507,7 +507,7 @@ private static IDictionary<string, IList<Rule>> ParseRules(TextReader reader, st
                                         }
                                         rules.Add(r);
                                     }
-                                    catch (ArgumentException e)
+                                    catch (Exception e) when (e.IsIllegalArgumentException())
                                     {
                                         throw new InvalidOperationException("Problem parsing line '" + currentLine + "' in " +
                                                                         location, e);

diff --git a/src/Lucene.Net.Analysis.Phonetic/Language/DaitchMokotoffSoundex.cs b/src/Lucene.Net.Analysis.Phonetic/Language/DaitchMokotoffSoundex.cs
@@ -363,7 +363,7 @@ private static void ParseRules(TextReader scanner, string location,
                                 }
                                 rules.Add(r);
                             }
-                            catch (ArgumentException e)
+                            catch (Exception e) when (e.IsIllegalArgumentException())
                             {
                                 throw new InvalidOperationException(
                                         "Problem parsing line '" + currentLine + "' in " + location, e);

diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs
@@ -304,7 +304,7 @@ public override void SetParams(string @params)
                                         clazz = LookupAnalysisClass(argName, typeof(CharFilterFactory));
                                         CreateAnalysisPipelineComponent(stok, clazz);
                                     }
-                                    catch (ArgumentException /*e*/)
+                                    catch (Exception e) when (e.IsIllegalArgumentException())
                                     {
                                         try
                                         {
@@ -313,7 +313,7 @@ public override void SetParams(string @params)
                                             CreateAnalysisPipelineComponent(stok, clazz);
                                             expectedArgType = ArgType.TOKENFILTER;
                                         }
-                                        catch (ArgumentException e2)
+                                        catch (Exception e2) when (e2.IsIllegalArgumentException())
                                         {
                                             throw new Exception("Line #" + GetLineNumber(stok) + ": Can't find class '"
                                                                        + argName + "' as CharFilterFactory or TokenizerFactory", e2);
@@ -328,7 +328,7 @@ public override void SetParams(string @params)
                                     {
                                         clazz = LookupAnalysisClass(className, typeof(TokenFilterFactory));
                                     }
-                                    catch (ArgumentException e)
+                                    catch (Exception e) when (e.IsIllegalArgumentException())
                                     {
                                         throw new Exception
                                             ("Line #" + GetLineNumber(stok) + ": Can't find class '" + className + "' as TokenFilterFactory", e);

diff --git a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
@@ -3076,7 +3076,7 @@ public virtual void TestHugeBinaryValues()
                             {
                                 w.AddDocument(doc);
                             }
-                            catch (ArgumentException iae)
+                            catch (Exception iae) when (iae.IsIllegalArgumentException())
                             {
                                 if (iae.Message.IndexOf("is too large", StringComparison.Ordinal) == -1)
                                 {
@@ -3099,7 +3099,7 @@ public virtual void TestHugeBinaryValues()
                         {
                             r = w.GetReader();
                         }
-                        catch (ArgumentException iae)
+                        catch (Exception iae) when (iae.IsIllegalArgumentException())
                         {
                             if (iae.Message.IndexOf("is too large", StringComparison.Ordinal) == -1)
                             {

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicFilters.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicFilters.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -86,7 +86,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("ArabicNormalization", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }
@@ -96,7 +96,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("Arabicstem", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }
@@ -106,7 +106,7 @@ public virtual void TestBogusArguments()
                 CharFilterFactory("Persian", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }
@@ -116,7 +116,7 @@ public virtual void TestBogusArguments()
                 TokenizerFactory("ArabicLetter", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -50,7 +50,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("BulgarianStem", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -50,7 +50,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("BrazilianStem", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestHTMLStripCharFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestHTMLStripCharFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -105,7 +105,7 @@ public virtual void TestBogusArguments()
                 CharFilterFactory("HTMLStrip", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -35,7 +35,7 @@ public virtual void TestParseString()
                 f.ParseString("\\");
                 fail("escape character cannot be alone.");
             }
-            catch (ArgumentException)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
             }
 
@@ -48,7 +48,7 @@ public virtual void TestParseString()
                 f.ParseString("\\u000");
                 fail("invalid length check.");
             }
-            catch (ArgumentException)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
             }
 
@@ -72,7 +72,7 @@ public virtual void TestBogusArguments()
                 CharFilterFactory("Mapping", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using System;
 using NUnit.Framework;
 using Lucene.Net.Analysis.Util;
@@ -65,7 +65,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("CJKBigram", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizerFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -50,7 +50,7 @@ public virtual void TestBogusArguments()
                 TokenizerFactory("CJK", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -47,7 +47,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("CJKWidth", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -48,7 +48,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("SoraniNormalization", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -48,7 +48,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("SoraniStem", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using System;
 using System.IO;
 using NUnit.Framework;
@@ -50,7 +50,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("Chinese", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizerFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using System;
 using System.IO;
 using NUnit.Framework;
@@ -49,7 +49,7 @@ public virtual void TestBogusArguments()
                 TokenizerFactory("Chinese", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
@@ -89,7 +89,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("CommonGrams", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/...ucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsQueryFilterFactory.cs b/...ucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsQueryFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
@@ -89,7 +89,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("CommonGramsQuery", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/...t.Tests.Analysis.Common/Analysis/Compound/TestDictionaryCompoundWordTokenFilterFactory.cs b/...t.Tests.Analysis.Common/Analysis/Compound/TestDictionaryCompoundWordTokenFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using System;
 using System.IO;
@@ -50,7 +50,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("DictionaryCompoundWord", "dictionary", "compoundDictionary.txt", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }

diff --git a/....Tests.Analysis.Common/Analysis/Compound/TestHyphenationCompoundWordTokenFilterFactory.cs b/....Tests.Analysis.Common/Analysis/Compound/TestHyphenationCompoundWordTokenFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
@@ -66,7 +66,7 @@ public virtual void TestBogusArguments()
                 TokenFilterFactory("HyphenationCompoundWord", "hyphenator", "da_UTF8.xml", "bogusArg", "bogusValue");
                 fail();
             }
-            catch (ArgumentException expected)
+            catch (Exception expected) when (expected.IsIllegalArgumentException())
             {
                 assertTrue(expected.Message.Contains("Unknown parameters"));
             }