This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 3858ec95e2fcb90fdd2e0ad0b997ef4e2655708c Author: Shad Storhaug <[email protected]> AuthorDate: Sun Jun 28 19:58:33 2020 +0700 SWEEP: Removed all calls to Type.GetTypeInfo() extension method, which is costing a few ns each time it is called. --- .../Analysis/Snowball/SnowballFilter.cs | 2 +- .../Snowball/SnowballPorterFilterFactory.cs | 2 +- .../Analysis/Util/ClasspathResourceLoader.cs | 4 +- .../Collation/CollationAttributeFactory.cs | 2 +- .../Collation/ICUCollationAttributeFactory.cs | 2 +- .../ByTask/Feeds/ContentItemsSource.cs | 2 +- .../ByTask/Tasks/AnalyzerFactoryTask.cs | 12 +-- src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs | 2 +- .../SimpleText/SimpleTextStoredFieldsReader.cs | 2 +- .../SimpleText/SimpleTextTermVectorsReader.cs | 2 +- .../JS/JavascriptCompiler.cs | 6 +- .../Taxonomy/Directory/DirectoryTaxonomyWriter.cs | 2 +- src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs | 2 +- src/Lucene.Net.Grouping/SearchGroup.cs | 2 +- src/Lucene.Net.Grouping/TopGroups.cs | 2 +- .../Flexible/Core/Builders/QueryTreeBuilder.cs | 2 +- src/Lucene.Net.Suggest/Spell/SpellChecker.cs | 4 +- .../Analysis/MockBytesAttributeFactory.cs | 2 +- .../Support/ApiScanTestBase.cs | 114 ++++++++++----------- .../Support/Codecs/TestCodecFactory.cs | 2 +- .../Support/Codecs/TestDocValuesFormatFactory.cs | 2 +- .../Support/Codecs/TestPostingsFormatFactory.cs | 2 +- .../Attributes/SeedDecoratorAttribute.cs | 2 +- .../Support/Randomized/RandomizedRunner.cs | 2 +- .../Util/LuceneTestCase.cs | 8 +- .../Util/TestRuleSetupAndRestoreClassEnv.cs | 2 +- .../Analysis/Core/TestAllAnalyzersHaveFactories.cs | 10 +- .../Analysis/Core/TestRandomChains.cs | 6 +- .../Analysis/Hunspell/TestAllDictionaries.cs | 2 +- .../Analysis/Hunspell/TestAllDictionaries2.cs | 2 +- .../Analysis/Synonym/TestSynonymFilterFactory.cs | 2 +- .../ByTask/Tasks/Alt/AltPackageTaskTest.cs | 2 +- src/Lucene.Net.Tests.Demo/TestDemo.cs | 2 +- .../AllGroupHeadsCollectorTest.cs | 2 +- .../Classic/TestQueryParser.cs | 4 +- src/Lucene.Net.Tests/Index/Test2BTerms.cs | 2 +- .../Index/TestFilterAtomicReader.cs | 2 +- src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs | 2 +- src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs | 2 +- src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs | 2 +- .../Support/Codecs/TestDefaultCodecFactory.cs | 2 +- .../Codecs/TestDefaultDocValuesFormatFactory.cs | 2 +- .../Codecs/TestDefaultPostingsFormatFactory.cs | 2 +- src/Lucene.Net.Tests/Util/TestVersion.cs | 2 +- src/Lucene.Net/Analysis/Analyzer.cs | 2 +- src/Lucene.Net/Analysis/NumericTokenStream.cs | 2 +- src/Lucene.Net/Analysis/Token.cs | 2 +- src/Lucene.Net/Codecs/Codec.cs | 2 +- .../Compressing/CompressingStoredFieldsReader.cs | 2 +- .../Compressing/CompressingTermVectorsReader.cs | 2 +- src/Lucene.Net/Codecs/DocValuesFormat.cs | 2 +- .../Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs | 2 +- .../Codecs/Lucene40/Lucene40StoredFieldsReader.cs | 2 +- src/Lucene.Net/Codecs/PostingsFormat.cs | 2 +- src/Lucene.Net/Index/CompositeReader.cs | 2 +- src/Lucene.Net/Index/DocumentsWriter.cs | 2 +- src/Lucene.Net/Index/IndexFileDeleter.cs | 2 +- src/Lucene.Net/Index/IndexReader.cs | 6 +- src/Lucene.Net/Index/IndexWriter.cs | 2 +- src/Lucene.Net/Index/SegmentCoreReaders.cs | 2 +- src/Lucene.Net/Search/ReferenceManager.cs | 4 +- src/Lucene.Net/Search/SearcherLifetimeManager.cs | 2 +- src/Lucene.Net/Store/BaseDirectory.cs | 2 +- src/Lucene.Net/Store/ByteBufferIndexInput.cs | 6 +- src/Lucene.Net/Store/CompoundFileWriter.cs | 2 +- .../Support/Codecs/DefaultCodecFactory.cs | 2 +- .../Codecs/DefaultDocValuesFormatFactory.cs | 2 +- .../Support/Codecs/DefaultPostingsFormatFactory.cs | 2 +- src/Lucene.Net/Support/Collections.cs | 8 +- .../Support/Util/BundleResourceManagerFactory.cs | 2 +- src/Lucene.Net/Support/Util/NamedServiceFactory.cs | 14 +-- src/Lucene.Net/Util/ArrayUtil.cs | 2 +- src/Lucene.Net/Util/AttributeSource.cs | 4 +- src/Lucene.Net/Util/Fst/FST.cs | 4 +- src/Lucene.Net/Util/Fst/NodeHash.cs | 2 +- src/Lucene.Net/Util/NamedSPILoader.cs | 2 +- src/Lucene.Net/Util/PrintStreamInfoStream.cs | 2 +- src/Lucene.Net/Util/RamUsageEstimator.cs | 14 +-- src/Lucene.Net/Util/SPIClassIterator.cs | 4 +- src/Lucene.Net/Util/VirtualMethod.cs | 4 +- src/dotnet/tools/lucene-cli/ConfigurationBase.cs | 2 +- 81 files changed, 180 insertions(+), 180 deletions(-) diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs index 8ac2021..ef70225 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs @@ -73,7 +73,7 @@ namespace Lucene.Net.Analysis.Snowball try { string className = typeof(SnowballProgram).Namespace + ".Ext." + - name + "Stemmer, " + this.GetType().GetTypeInfo().Assembly.GetName().Name; + name + "Stemmer, " + this.GetType().Assembly.GetName().Name; Type stemClass = Type.GetType(className); stemmer = (SnowballProgram)Activator.CreateInstance(stemClass); diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs index 312a21e..1558c69 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs @@ -62,7 +62,7 @@ namespace Lucene.Net.Analysis.Snowball public virtual void Inform(IResourceLoader loader) { string className = typeof(SnowballProgram).Namespace + ".Ext." + - language + "Stemmer, " + this.GetType().GetTypeInfo().Assembly.GetName().Name; + language + "Stemmer, " + this.GetType().Assembly.GetName().Name; stemClass = Type.GetType(className); if (wordFiles != null) diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs index d7db1c0..c479f76 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs @@ -48,7 +48,7 @@ namespace Lucene.Net.Analysis.Util // Stream stream = this.clazz.FindAndGetManifestResourceStream(resource); // causes TestMappingCharFilter.TestRandomMaps2 to run 2-3 times slower. // So, we are using the long-hand syntax in this one place. - Stream stream = this.clazz.GetTypeInfo().Assembly.FindAndGetManifestResourceStream(clazz, resource); + Stream stream = this.clazz.Assembly.FindAndGetManifestResourceStream(clazz, resource); if (stream == null) { throw new IOException("Resource not found: " + resource); @@ -70,7 +70,7 @@ namespace Lucene.Net.Analysis.Util return Type.GetType(cname); } - return this.clazz.GetTypeInfo().Assembly.GetType(cname, true); + return this.clazz.Assembly.GetType(cname, true); } catch (Exception e) { diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs index 7129b20..b7bcee7 100644 --- a/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs @@ -95,7 +95,7 @@ namespace Lucene.Net.Collation public override Attribute CreateAttributeInstance<T>() { - return typeof(T).GetTypeInfo().IsAssignableFrom(typeof(CollatedTermAttributeImpl)) + return typeof(T).IsAssignableFrom(typeof(CollatedTermAttributeImpl)) ? new CollatedTermAttributeImpl(this.collator) : [email protected]<T>(); } diff --git a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs index 67cc473..e1c288a 100644 --- a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs +++ b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs @@ -85,7 +85,7 @@ namespace Lucene.Net.Collation public override Util.Attribute CreateAttributeInstance<T>() { - return typeof(T).GetTypeInfo().IsAssignableFrom(typeof(ICUCollatedTermAttribute)) + return typeof(T).IsAssignableFrom(typeof(ICUCollatedTermAttribute)) ? new ICUCollatedTermAttribute(collator) : @delegate.CreateAttributeInstance<T>(); } diff --git a/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs b/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs index ef9db09..9abc77f 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs @@ -198,7 +198,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds string col = " "; StringBuilder sb = new StringBuilder(); string newline = Environment.NewLine; - sb.Append("------------> ").Append(GetType().GetTypeInfo().Name).Append(" statistics (").Append(printNum).Append("): ").Append(newline); + sb.Append("------------> ").Append(GetType().Name).Append(" statistics (").Append(printNum).Append("): ").Append(newline); int nut = TotalItemsCount; if (nut > lastPrintedNumUniqueTexts) { diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs index dc1174a..f284b6d 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs @@ -486,15 +486,15 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks DirectoryInfo baseDir = new DirectoryInfo(RunData.Config.Get("work.dir", "work")); ((IResourceLoaderAware)instance).Inform(new FilesystemResourceLoader(baseDir)); } - if (typeof(CharFilterFactory).GetTypeInfo().IsAssignableFrom(clazz)) + if (typeof(CharFilterFactory).IsAssignableFrom(clazz)) { charFilterFactories.Add((CharFilterFactory)instance); } - else if (typeof(TokenizerFactory).GetTypeInfo().IsAssignableFrom(clazz)) + else if (typeof(TokenizerFactory).IsAssignableFrom(clazz)) { tokenizerFactory = (TokenizerFactory)instance; } - else if (typeof(TokenFilterFactory).GetTypeInfo().IsAssignableFrom(clazz)) + else if (typeof(TokenFilterFactory).IsAssignableFrom(clazz)) { tokenFilterFactories.Add((TokenFilterFactory)instance); } @@ -551,15 +551,15 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks } // No dot - use analysis SPI lookup string analysisComponentName = ANALYSIS_COMPONENT_SUFFIX_PATTERN.Replace(className, "", 1); - if (typeof(CharFilterFactory).GetTypeInfo().IsAssignableFrom(expectedType)) + if (typeof(CharFilterFactory).IsAssignableFrom(expectedType)) { return CharFilterFactory.LookupClass(analysisComponentName); } - else if (typeof(TokenizerFactory).GetTypeInfo().IsAssignableFrom(expectedType)) + else if (typeof(TokenizerFactory).IsAssignableFrom(expectedType)) { return TokenizerFactory.LookupClass(analysisComponentName); } - else if (typeof(TokenFilterFactory).GetTypeInfo().IsAssignableFrom(expectedType)) + else if (typeof(TokenFilterFactory).IsAssignableFrom(expectedType)) { return TokenFilterFactory.LookupClass(analysisComponentName); } diff --git a/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs b/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs index fb1261a..e8141c3 100644 --- a/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs +++ b/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs @@ -366,7 +366,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils ISet<string> result = new JCG.HashSet<string>(); string alts = config.Get("alt.tasks.packages", null); - string dfltPkg = typeof(PerfTask).GetTypeInfo().Assembly.GetName().Name; + string dfltPkg = typeof(PerfTask).Assembly.GetName().Name; string[] referencedAssemblies = AssemblyUtils.GetReferencedAssemblies().Select(a => a.GetName().Name).ToArray(); result.Add(dfltPkg); diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs index 03a0b51..2a113a6 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs @@ -224,7 +224,7 @@ namespace Lucene.Net.Codecs.SimpleText { if (_input == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this FieldsReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this FieldsReader is closed"); } return new SimpleTextStoredFieldsReader(_offsets, (IndexInput) _input.Clone(), _fieldInfos); } diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs index 4758b97..20be1d8 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs @@ -234,7 +234,7 @@ namespace Lucene.Net.Codecs.SimpleText { if (_input == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this TermVectorsReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this TermVectorsReader is closed"); } return new SimpleTextTermVectorsReader(_offsets, (IndexInput)_input.Clone()); } diff --git a/src/Lucene.Net.Expressions/JS/JavascriptCompiler.cs b/src/Lucene.Net.Expressions/JS/JavascriptCompiler.cs index 4af7815..12eba40 100644 --- a/src/Lucene.Net.Expressions/JS/JavascriptCompiler.cs +++ b/src/Lucene.Net.Expressions/JS/JavascriptCompiler.cs @@ -660,7 +660,7 @@ namespace Lucene.Net.Expressions.JS #if NETSTANDARD var settings = new Dictionary<string, string>(); var type = typeof(JavascriptCompiler); - using (var reader = new StreamReader(type.FindAndGetManifestResourceStream(type.GetTypeInfo().Name + ".properties"))) + using (var reader = new StreamReader(type.FindAndGetManifestResourceStream(type.Name + ".properties"))) { string line; while(!string.IsNullOrWhiteSpace(line = reader.ReadLine())) @@ -695,10 +695,10 @@ namespace Lucene.Net.Expressions.JS { throw new ArgumentException(method + " is not public."); } - if (!method.DeclaringType.GetTypeInfo().IsPublic) + if (!method.DeclaringType.IsPublic) { //.NET Port. Inner class is being returned as not public even when declared public - if (method.DeclaringType.GetTypeInfo().IsNestedAssembly) + if (method.DeclaringType.IsNestedAssembly) { throw new ArgumentException(method.DeclaringType.FullName + " is not public."); } diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs index 3712fd3..2f3f523 100644 --- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs +++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs @@ -541,7 +541,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory { if (isClosed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "The taxonomy writer has already been closed"); + throw new ObjectDisposedException(this.GetType().FullName, "The taxonomy writer has already been closed"); } } diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs index 92ac4d3..964e3c6 100644 --- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs +++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyReader.cs @@ -165,7 +165,7 @@ namespace Lucene.Net.Facet.Taxonomy { if (RefCount <= 0) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this TaxonomyReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this TaxonomyReader is closed"); } } diff --git a/src/Lucene.Net.Grouping/SearchGroup.cs b/src/Lucene.Net.Grouping/SearchGroup.cs index 50b40db..2ddf83e 100644 --- a/src/Lucene.Net.Grouping/SearchGroup.cs +++ b/src/Lucene.Net.Grouping/SearchGroup.cs @@ -184,7 +184,7 @@ namespace Lucene.Net.Search.Grouping // LUCENENET specific - store whether T is value type // for optimization of GetHashCode() and Equals() - private readonly static bool groupValueIsValueType = typeof(T).GetTypeInfo().IsValueType; + private readonly static bool groupValueIsValueType = typeof(T).IsValueType; public MergedGroup(T groupValue) { diff --git a/src/Lucene.Net.Grouping/TopGroups.cs b/src/Lucene.Net.Grouping/TopGroups.cs index 007f0c9..494332e 100644 --- a/src/Lucene.Net.Grouping/TopGroups.cs +++ b/src/Lucene.Net.Grouping/TopGroups.cs @@ -148,7 +148,7 @@ namespace Lucene.Net.Search.Grouping // LUCENENET specific - store whether T is value type // for optimization of GetHashCode() and Equals() - bool shardGroupsIsValueType = typeof(T).GetTypeInfo().IsValueType; + bool shardGroupsIsValueType = typeof(T).IsValueType; int totalHitCount = 0; int totalGroupedHitCount = 0; diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Builders/QueryTreeBuilder.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Builders/QueryTreeBuilder.cs index 442dcfb..4d23937 100644 --- a/src/Lucene.Net.QueryParser/Flexible/Core/Builders/QueryTreeBuilder.cs +++ b/src/Lucene.Net.QueryParser/Flexible/Core/Builders/QueryTreeBuilder.cs @@ -154,7 +154,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Builders } } } - } while (builder == null && (clazz = clazz.GetTypeInfo().BaseType) != null); + } while (builder == null && (clazz = clazz.BaseType) != null); } return builder; diff --git a/src/Lucene.Net.Suggest/Spell/SpellChecker.cs b/src/Lucene.Net.Suggest/Spell/SpellChecker.cs index 5cebc1a..835c5f7 100644 --- a/src/Lucene.Net.Suggest/Spell/SpellChecker.cs +++ b/src/Lucene.Net.Suggest/Spell/SpellChecker.cs @@ -668,7 +668,7 @@ namespace Lucene.Net.Search.Spell { if (disposed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "Spellchecker has been closed"); + throw new ObjectDisposedException(this.GetType().FullName, "Spellchecker has been closed"); } } @@ -705,7 +705,7 @@ namespace Lucene.Net.Search.Spell if (disposed) { indexSearcher.IndexReader.Dispose(); - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "Spellchecker has been closed"); + throw new ObjectDisposedException(this.GetType().FullName, "Spellchecker has been closed"); } if (searcher != null) { diff --git a/src/Lucene.Net.TestFramework/Analysis/MockBytesAttributeFactory.cs b/src/Lucene.Net.TestFramework/Analysis/MockBytesAttributeFactory.cs index 641d770..7109d9e 100644 --- a/src/Lucene.Net.TestFramework/Analysis/MockBytesAttributeFactory.cs +++ b/src/Lucene.Net.TestFramework/Analysis/MockBytesAttributeFactory.cs @@ -32,7 +32,7 @@ namespace Lucene.Net.Analysis public override Attribute CreateAttributeInstance<T>() { var attClass = typeof(T); - return attClass.GetTypeInfo().IsAssignableFrom(typeof(MockUTF16TermAttributeImpl)) + return attClass.IsAssignableFrom(typeof(MockUTF16TermAttributeImpl)) ? new MockUTF16TermAttributeImpl() : @delegate.CreateAttributeInstance<T>(); } diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs index b0f6a1b..1a48b30 100644 --- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs +++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs @@ -101,7 +101,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestProtectedFieldNames(Type typeFromTargetAssembly) { - var names = GetInvalidProtectedFields(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetInvalidProtectedFields(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -124,7 +124,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestPrivateFieldNames(Type typeFromTargetAssembly, string exceptionRegex) { - var names = GetInvalidPrivateFields(typeFromTargetAssembly.GetTypeInfo().Assembly, exceptionRegex); + var names = GetInvalidPrivateFields(typeFromTargetAssembly.Assembly, exceptionRegex); //if (VERBOSE) //{ @@ -141,7 +141,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestPublicFields(Type typeFromTargetAssembly) { - var names = GetInvalidPublicFields(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetInvalidPublicFields(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -158,7 +158,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestMethodParameterNames(Type typeFromTargetAssembly) { - var names = GetInvalidMethodParameterNames(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetInvalidMethodParameterNames(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -175,7 +175,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestInterfaceNames(Type typeFromTargetAssembly) { - var names = GetInvalidInterfaceNames(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetInvalidInterfaceNames(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -192,7 +192,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestClassNames(Type typeFromTargetAssembly) { - var names = GetInvalidClassNames(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetInvalidClassNames(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -210,7 +210,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForPropertiesWithNoGetter(Type typeFromTargetAssembly) { - var names = GetPropertiesWithNoGetter(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetPropertiesWithNoGetter(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -228,7 +228,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForPropertiesThatReturnArray(Type typeFromTargetAssembly) { - var names = GetPropertiesThatReturnArray(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetPropertiesThatReturnArray(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -249,7 +249,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly) { - var names = GetMethodsThatReturnWritableArray(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetMethodsThatReturnWritableArray(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -270,8 +270,8 @@ namespace Lucene.Net.Util { var names = new List<string>(); - names.AddRange(GetProtectedFieldsContainingComparer(typeFromTargetAssembly.GetTypeInfo().Assembly)); - names.AddRange(GetMembersContainingComparer(typeFromTargetAssembly.GetTypeInfo().Assembly)); + names.AddRange(GetProtectedFieldsContainingComparer(typeFromTargetAssembly.Assembly)); + names.AddRange(GetMembersContainingComparer(typeFromTargetAssembly.Assembly)); //if (VERBOSE) //{ @@ -288,7 +288,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForPublicMembersNamedSize(Type typeFromTargetAssembly) { - var names = GetMembersNamedSize(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetMembersNamedSize(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -308,7 +308,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForPublicMembersContainingNonNetNumeric(Type typeFromTargetAssembly) { - var names = GetMembersContainingNonNetNumeric(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetMembersContainingNonNetNumeric(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -326,7 +326,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForTypesContainingNonNetNumeric(Type typeFromTargetAssembly) { - var names = GetTypesContainingNonNetNumeric(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetTypesContainingNonNetNumeric(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -345,7 +345,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForPublicMembersWithNullableEnum(Type typeFromTargetAssembly) { - var names = GetPublicNullableEnumMembers(typeFromTargetAssembly.GetTypeInfo().Assembly); + var names = GetPublicNullableEnumMembers(typeFromTargetAssembly.Assembly); //if (VERBOSE) //{ @@ -370,7 +370,7 @@ namespace Lucene.Net.Util //[Test, LuceneNetSpecific] public virtual void TestForMembersAcceptingOrReturningIEnumerable(Type typeFromTargetAssembly, string exceptionRegex) { - var names = GetMembersAcceptingOrReturningType(typeof(IEnumerable<>), typeFromTargetAssembly.GetTypeInfo().Assembly, false, exceptionRegex); + var names = GetMembersAcceptingOrReturningType(typeof(IEnumerable<>), typeFromTargetAssembly.Assembly, false, exceptionRegex); //if (VERBOSE) //{ @@ -393,8 +393,8 @@ namespace Lucene.Net.Util public virtual void TestForMembersAcceptingOrReturningListOrDictionary(Type typeFromTargetAssembly, string exceptionRegex) { var names = new List<string>(); - names.AddRange(GetMembersAcceptingOrReturningType(typeof(List<>), typeFromTargetAssembly.GetTypeInfo().Assembly, true, exceptionRegex)); - names.AddRange(GetMembersAcceptingOrReturningType(typeof(Dictionary<,>), typeFromTargetAssembly.GetTypeInfo().Assembly, true, exceptionRegex)); + names.AddRange(GetMembersAcceptingOrReturningType(typeof(List<>), typeFromTargetAssembly.Assembly, true, exceptionRegex)); + names.AddRange(GetMembersAcceptingOrReturningType(typeof(Dictionary<,>), typeFromTargetAssembly.Assembly, true, exceptionRegex)); //if (VERBOSE) //{ @@ -412,7 +412,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -430,7 +430,7 @@ namespace Lucene.Net.Util continue; } - if ((field.IsPrivate || field.IsAssembly) && !PrivateFieldName.IsMatch(field.Name) && field.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + if ((field.IsPrivate || field.IsAssembly) && !PrivateFieldName.IsMatch(field.Name) && field.DeclaringType.Equals(c.UnderlyingSystemType)) { var name = string.Concat(c.FullName, ".", field.Name); //bool hasExceptions = !string.IsNullOrWhiteSpace(exceptionRegex); @@ -453,7 +453,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -480,7 +480,7 @@ namespace Lucene.Net.Util continue; } - if ((field.IsFamily || field.IsFamilyOrAssembly) && !ProtectedFieldName.IsMatch(field.Name) && field.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + if ((field.IsFamily || field.IsFamilyOrAssembly) && !ProtectedFieldName.IsMatch(field.Name) && field.DeclaringType.Equals(c.UnderlyingSystemType)) { result.Add(string.Concat(c.FullName, ".", field.Name)); } @@ -499,7 +499,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -527,7 +527,7 @@ namespace Lucene.Net.Util continue; } - if (field.IsPublic && field.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + if (field.IsPublic && field.DeclaringType.Equals(c.UnderlyingSystemType)) { result.Add(string.Concat(c.FullName, ".", field.Name)); } @@ -541,7 +541,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -558,7 +558,7 @@ namespace Lucene.Net.Util foreach (var parameter in parameters) { - if (!MethodParameterName.IsMatch(parameter.Name) && method.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + if (!MethodParameterName.IsMatch(parameter.Name) && method.DeclaringType.Equals(c.UnderlyingSystemType)) { result.Add(string.Concat(c.FullName, ".", method.Name, " -parameter- ", parameter.Name)); } @@ -573,7 +573,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var interfaces = assembly.GetTypes().Where(t => t.GetTypeInfo().IsInterface); + var interfaces = assembly.GetTypes().Where(t => t.IsInterface); foreach (var i in interfaces) { @@ -590,7 +590,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -599,7 +599,7 @@ namespace Lucene.Net.Util continue; } - if (c.GetTypeInfo().IsDefined(typeof(ExceptionToClassNameConventionAttribute))) + if (c.IsDefined(typeof(ExceptionToClassNameConventionAttribute))) { continue; } @@ -617,7 +617,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -625,7 +625,7 @@ namespace Lucene.Net.Util foreach (var property in properties) { - if (property.GetSetMethod(true) != null && property.GetGetMethod(true) == null && property.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + if (property.GetSetMethod(true) != null && property.GetGetMethod(true) == null && property.DeclaringType.Equals(c.UnderlyingSystemType)) { result.Add(string.Concat(c.FullName, ".", property.Name)); } @@ -639,7 +639,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -658,7 +658,7 @@ namespace Lucene.Net.Util var getMethod = property.GetGetMethod(); - if (getMethod != null && getMethod.ReturnParameter != null && getMethod.ReturnParameter.ParameterType.IsArray && property.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + if (getMethod != null && getMethod.ReturnParameter != null && getMethod.ReturnParameter.ParameterType.IsArray && property.DeclaringType.Equals(c.UnderlyingSystemType)) { result.Add(string.Concat(c.FullName, ".", property.Name)); } @@ -673,7 +673,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -691,7 +691,7 @@ namespace Lucene.Net.Util continue; } - if ((field.IsFamily || field.IsFamilyOrAssembly) && ContainsComparer.IsMatch(field.Name) && field.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + if ((field.IsFamily || field.IsFamilyOrAssembly) && ContainsComparer.IsMatch(field.Name) && field.DeclaringType.Equals(c.UnderlyingSystemType)) { result.Add(string.Concat(c.FullName, ".", field.Name)); } @@ -709,7 +709,7 @@ namespace Lucene.Net.Util foreach (var t in types) { - if (ContainsComparer.IsMatch(t.Name) && t.GetTypeInfo().IsVisible) + if (ContainsComparer.IsMatch(t.Name) && t.IsVisible) { result.Add(t.FullName); } @@ -718,7 +718,7 @@ namespace Lucene.Net.Util foreach (var member in members) { - if (ContainsComparer.IsMatch(member.Name) && member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + if (ContainsComparer.IsMatch(member.Name) && member.DeclaringType.Equals(t.UnderlyingSystemType)) { if (member.MemberType == MemberTypes.Method && !(member.Name.StartsWith("get_", StringComparison.Ordinal) || member.Name.StartsWith("set_", StringComparison.Ordinal))) { @@ -751,7 +751,7 @@ namespace Lucene.Net.Util foreach (var member in members) { - if ("Size".Equals(member.Name, StringComparison.OrdinalIgnoreCase) && member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + if ("Size".Equals(member.Name, StringComparison.OrdinalIgnoreCase) && member.DeclaringType.Equals(t.UnderlyingSystemType)) { if (member.MemberType == MemberTypes.Method && !(member.Name.StartsWith("get_", StringComparison.Ordinal) || member.Name.StartsWith("set_", StringComparison.Ordinal))) { @@ -797,7 +797,7 @@ namespace Lucene.Net.Util continue; } - if (ContainsNonNetNumeric.IsMatch(member.Name) && member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + if (ContainsNonNetNumeric.IsMatch(member.Name) && member.DeclaringType.Equals(t.UnderlyingSystemType)) { if (member.MemberType == MemberTypes.Method && !(member.Name.StartsWith("get_", StringComparison.Ordinal) || member.Name.StartsWith("set_", StringComparison.Ordinal))) { @@ -826,7 +826,7 @@ namespace Lucene.Net.Util foreach (var t in types) { - if (t.GetTypeInfo().IsDefined(typeof(ExceptionToNetNumericConventionAttribute))) + if (t.IsDefined(typeof(ExceptionToNetNumericConventionAttribute))) { continue; } @@ -845,7 +845,7 @@ namespace Lucene.Net.Util { var result = new List<string>(); - var classes = assembly.GetTypes().Where(t => t.GetTypeInfo().IsClass); + var classes = assembly.GetTypes().Where(t => t.IsClass); foreach (var c in classes) { @@ -875,7 +875,7 @@ namespace Lucene.Net.Util if (method != null && method.ReturnParameter != null && method.ReturnParameter.ParameterType.IsArray - && method.DeclaringType.Equals(c.GetTypeInfo().UnderlyingSystemType)) + && method.DeclaringType.Equals(c.UnderlyingSystemType)) { var methodBody = method.GetMethodBody(); @@ -919,7 +919,7 @@ namespace Lucene.Net.Util continue; } - if (member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + if (member.DeclaringType.Equals(t.UnderlyingSystemType)) { if (member.MemberType == MemberTypes.Method && !(member.Name.StartsWith("get_", StringComparison.Ordinal) || member.Name.StartsWith("set_", StringComparison.Ordinal))) { @@ -929,7 +929,7 @@ namespace Lucene.Net.Util { if (method.ReturnParameter != null && Nullable.GetUnderlyingType(method.ReturnParameter.ParameterType) != null - && method.ReturnParameter.ParameterType.GetGenericArguments()[0].GetTypeInfo().IsEnum) + && method.ReturnParameter.ParameterType.GetGenericArguments()[0].IsEnum) { result.Add(string.Concat(t.FullName, ".", member.Name, "()")); } @@ -939,8 +939,8 @@ namespace Lucene.Net.Util foreach (var parameter in parameters) { if (Nullable.GetUnderlyingType(parameter.ParameterType) != null - && parameter.ParameterType.GetGenericArguments()[0].GetTypeInfo().IsEnum - && member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + && parameter.ParameterType.GetGenericArguments()[0].IsEnum + && member.DeclaringType.Equals(t.UnderlyingSystemType)) { result.Add(string.Concat(t.FullName, ".", member.Name, "()", " -parameter- ", parameter.Name)); } @@ -958,8 +958,8 @@ namespace Lucene.Net.Util foreach (var parameter in parameters) { if (Nullable.GetUnderlyingType(parameter.ParameterType) != null - && parameter.ParameterType.GetGenericArguments()[0].GetTypeInfo().IsEnum - && member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + && parameter.ParameterType.GetGenericArguments()[0].IsEnum + && member.DeclaringType.Equals(t.UnderlyingSystemType)) { result.Add(string.Concat(t.FullName, ".", member.Name, "()", " -parameter- ", parameter.Name)); } @@ -968,14 +968,14 @@ namespace Lucene.Net.Util } else if (member.MemberType == MemberTypes.Property && Nullable.GetUnderlyingType(((PropertyInfo)member).PropertyType) != null - && ((PropertyInfo)member).PropertyType.GetGenericArguments()[0].GetTypeInfo().IsEnum + && ((PropertyInfo)member).PropertyType.GetGenericArguments()[0].IsEnum && IsNonPrivateProperty((PropertyInfo)member)) { result.Add(string.Concat(t.FullName, ".", member.Name)); } else if (member.MemberType == MemberTypes.Field && Nullable.GetUnderlyingType(((FieldInfo)member).FieldType) != null - && ((FieldInfo)member).FieldType.GetGenericArguments()[0].GetTypeInfo().IsEnum + && ((FieldInfo)member).FieldType.GetGenericArguments()[0].IsEnum && (((FieldInfo)member).IsFamily || ((FieldInfo)member).IsFamilyOrAssembly)) { result.Add(string.Concat(t.FullName, ".", member.Name, " (field)")); @@ -1025,7 +1025,7 @@ namespace Lucene.Net.Util continue; } - if (member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + if (member.DeclaringType.Equals(t.UnderlyingSystemType)) { if (member.MemberType == MemberTypes.Method && !(member.Name.StartsWith("get_", StringComparison.Ordinal) || member.Name.StartsWith("set_", StringComparison.Ordinal))) { @@ -1035,7 +1035,7 @@ namespace Lucene.Net.Util { if (method.ReturnParameter != null - && method.ReturnParameter.ParameterType.GetTypeInfo().IsGenericType + && method.ReturnParameter.ParameterType.IsGenericType && method.ReturnParameter.ParameterType.GetGenericTypeDefinition().IsAssignableFrom(lookFor)) { var name = string.Concat(t.FullName, ".", member.Name, "()"); @@ -1050,9 +1050,9 @@ namespace Lucene.Net.Util foreach (var parameter in parameters) { - if (parameter.ParameterType.GetTypeInfo().IsGenericType + if (parameter.ParameterType.IsGenericType && parameter.ParameterType.GetGenericTypeDefinition().IsAssignableFrom(lookFor) - && member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + && member.DeclaringType.Equals(t.UnderlyingSystemType)) { var name = string.Concat(t.FullName, ".", member.Name, "()", " -parameter- ", parameter.Name); @@ -1074,9 +1074,9 @@ namespace Lucene.Net.Util foreach (var parameter in parameters) { - if (parameter.ParameterType.GetTypeInfo().IsGenericType + if (parameter.ParameterType.IsGenericType && parameter.ParameterType.GetGenericTypeDefinition().IsAssignableFrom(lookFor) - && member.DeclaringType.Equals(t.GetTypeInfo().UnderlyingSystemType)) + && member.DeclaringType.Equals(t.UnderlyingSystemType)) { var name = string.Concat(t.FullName, ".", member.Name, "()", " -parameter- ", parameter.Name); @@ -1089,7 +1089,7 @@ namespace Lucene.Net.Util } } else if (member.MemberType == MemberTypes.Property - && ((PropertyInfo)member).PropertyType.GetTypeInfo().IsGenericType + && ((PropertyInfo)member).PropertyType.IsGenericType && ((PropertyInfo)member).PropertyType.GetGenericTypeDefinition().IsAssignableFrom(lookFor) && (!publiclyVisibleOnly || IsNonPrivateProperty((PropertyInfo)member))) { diff --git a/src/Lucene.Net.TestFramework/Support/Codecs/TestCodecFactory.cs b/src/Lucene.Net.TestFramework/Support/Codecs/TestCodecFactory.cs index 5188ba7..07e4369 100644 --- a/src/Lucene.Net.TestFramework/Support/Codecs/TestCodecFactory.cs +++ b/src/Lucene.Net.TestFramework/Support/Codecs/TestCodecFactory.cs @@ -28,7 +28,7 @@ namespace Lucene.Net.Codecs protected override void Initialize() { base.Initialize(); - base.ScanForCodecs(this.GetType().GetTypeInfo().Assembly); + base.ScanForCodecs(this.GetType().Assembly); } protected override bool IsServiceType(Type type) diff --git a/src/Lucene.Net.TestFramework/Support/Codecs/TestDocValuesFormatFactory.cs b/src/Lucene.Net.TestFramework/Support/Codecs/TestDocValuesFormatFactory.cs index df70c28..04460c6 100644 --- a/src/Lucene.Net.TestFramework/Support/Codecs/TestDocValuesFormatFactory.cs +++ b/src/Lucene.Net.TestFramework/Support/Codecs/TestDocValuesFormatFactory.cs @@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs protected override void Initialize() { base.Initialize(); - base.ScanForDocValuesFormats(this.GetType().GetTypeInfo().Assembly); + base.ScanForDocValuesFormats(this.GetType().Assembly); } } } diff --git a/src/Lucene.Net.TestFramework/Support/Codecs/TestPostingsFormatFactory.cs b/src/Lucene.Net.TestFramework/Support/Codecs/TestPostingsFormatFactory.cs index ea070d9..70ef02f 100644 --- a/src/Lucene.Net.TestFramework/Support/Codecs/TestPostingsFormatFactory.cs +++ b/src/Lucene.Net.TestFramework/Support/Codecs/TestPostingsFormatFactory.cs @@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs protected override void Initialize() { base.Initialize(); - base.ScanForPostingsFormats(this.GetType().GetTypeInfo().Assembly); + base.ScanForPostingsFormats(this.GetType().Assembly); } } } diff --git a/src/Lucene.Net.TestFramework/Support/Randomized/Attributes/SeedDecoratorAttribute.cs b/src/Lucene.Net.TestFramework/Support/Randomized/Attributes/SeedDecoratorAttribute.cs index 2985d9b..ed778ae 100644 --- a/src/Lucene.Net.TestFramework/Support/Randomized/Attributes/SeedDecoratorAttribute.cs +++ b/src/Lucene.Net.TestFramework/Support/Randomized/Attributes/SeedDecoratorAttribute.cs @@ -36,7 +36,7 @@ namespace Lucene.Net.Randomized.Attributes foreach (Type item in decorators) { - if (item.GetTypeInfo().ImplementedInterfaces.Contains(typeof(ISeedDecorator))) + if (item.ImplementedInterfaces.Contains(typeof(ISeedDecorator))) this.Decorators.Add(item); } } diff --git a/src/Lucene.Net.TestFramework/Support/Randomized/RandomizedRunner.cs b/src/Lucene.Net.TestFramework/Support/Randomized/RandomizedRunner.cs index c7f34a8..8b01f33 100644 --- a/src/Lucene.Net.TestFramework/Support/Randomized/RandomizedRunner.cs +++ b/src/Lucene.Net.TestFramework/Support/Randomized/RandomizedRunner.cs @@ -38,7 +38,7 @@ namespace Lucene.Net.Randomized this.suiteClass = testClass; var list = new List<ISeedDecorator>(); - var attrs = this.suiteClass.GetTypeInfo().GetCustomAttributes<SeedDecoratorAttribute>(true); + var attrs = this.suiteClass.GetCustomAttributes<SeedDecoratorAttribute>(true); foreach (var attr in attrs) { foreach (var decoratorType in attr.Decorators) diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs index f74ef81..a05084f 100644 --- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs +++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs @@ -927,7 +927,7 @@ namespace Lucene.Net.Util return _testName; #else //return ThreadAndTestNameRule.TestMethodName; - return this.GetType().GetTypeInfo().Name; // LUCENENET TODO: return the current test method name if the test framework supports such a thing. + return this.GetType().Name; // LUCENENET TODO: return the current test method name if the test framework supports such a thing. #endif } } @@ -1250,8 +1250,8 @@ namespace Lucene.Net.Util { //// Retrieve the package-private setIndexerThreadPool //// method: - ////MethodInfo setIndexerThreadPoolMethod = typeof(IndexWriterConfig).GetTypeInfo().GetMethod("SetIndexerThreadPool", new Type[] { typeof(DocumentsWriterPerThreadPool) }); - //MethodInfo setIndexerThreadPoolMethod = typeof(IndexWriterConfig).GetTypeInfo().GetMethod( + ////MethodInfo setIndexerThreadPoolMethod = typeof(IndexWriterConfig).GetMethod("SetIndexerThreadPool", new Type[] { typeof(DocumentsWriterPerThreadPool) }); + //MethodInfo setIndexerThreadPoolMethod = typeof(IndexWriterConfig).GetMethod( // "SetIndexerThreadPool", // BindingFlags.NonPublic | BindingFlags.Instance, // null, @@ -1259,7 +1259,7 @@ namespace Lucene.Net.Util // null); ////setIndexerThreadPoolMethod.setAccessible(true); //Type clazz = typeof(RandomDocumentsWriterPerThreadPool); - //ConstructorInfo ctor = clazz.GetTypeInfo().GetConstructor(new[] { typeof(int), typeof(Random) }); + //ConstructorInfo ctor = clazz.GetConstructor(new[] { typeof(int), typeof(Random) }); ////ctor.Accessible = true; //// random thread pool //setIndexerThreadPoolMethod.Invoke(c, new[] { ctor.Invoke(new object[] { maxNumThreadStates, r }) }); diff --git a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs index aff4c43..6aa0faf 100644 --- a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs +++ b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs @@ -153,7 +153,7 @@ namespace Lucene.Net.Util Type targetClass = testInstance?.GetType() ?? LuceneTestCase.GetTestClass(); avoidCodecs = new JCG.HashSet<string>(); - var suppressCodecsAttribute = targetClass.GetTypeInfo().GetCustomAttribute<LuceneTestCase.SuppressCodecsAttribute>(); + var suppressCodecsAttribute = targetClass.GetCustomAttribute<LuceneTestCase.SuppressCodecsAttribute>(); if (suppressCodecsAttribute != null) { avoidCodecs.UnionWith(suppressCodecsAttribute.Value); diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs index 968ec64..57bb59b 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs @@ -98,10 +98,10 @@ namespace Lucene.Net.Analysis.Core [Test] public virtual void Test() { - IList<Type> analysisClasses = typeof(StandardAnalyzer).GetTypeInfo().Assembly.GetTypes() + IList<Type> analysisClasses = typeof(StandardAnalyzer).Assembly.GetTypes() .Where(c => { - var typeInfo = c.GetTypeInfo(); + var typeInfo = c; return !typeInfo.IsAbstract && typeInfo.IsPublic && !typeInfo.IsInterface && typeInfo.IsClass && (typeInfo.GetCustomAttribute<ObsoleteAttribute>() == null) && !testComponents.Contains(c) && !crazyComponents.Contains(c) && !oddlyNamedComponents.Contains(c) && !deprecatedDuplicatedComponents.Contains(c) @@ -116,7 +116,7 @@ namespace Lucene.Net.Analysis.Core IDictionary<string, string> args = new Dictionary<string, string>(); args["luceneMatchVersion"] = TEST_VERSION_CURRENT.ToString(); - if (c.GetTypeInfo().IsSubclassOf(typeof(Tokenizer))) + if (c.IsSubclassOf(typeof(Tokenizer))) { string clazzName = c.Name; assertTrue(clazzName.EndsWith("Tokenizer", StringComparison.Ordinal)); @@ -143,7 +143,7 @@ namespace Lucene.Net.Analysis.Core // TODO: For now pass because some factories have not yet a default config that always works } } - else if (c.GetTypeInfo().IsSubclassOf(typeof(TokenFilter))) + else if (c.IsSubclassOf(typeof(TokenFilter))) { string clazzName = c.Name; assertTrue(clazzName.EndsWith("Filter", StringComparison.Ordinal)); @@ -175,7 +175,7 @@ namespace Lucene.Net.Analysis.Core // TODO: For now pass because some factories have not yet a default config that always works } } - else if (c.GetTypeInfo().IsSubclassOf(typeof(CharFilter))) + else if (c.IsSubclassOf(typeof(CharFilter))) { string clazzName = c.Name; assertTrue(clazzName.EndsWith("CharFilter", StringComparison.Ordinal)); diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs index c59ed19..a159fae 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs @@ -196,9 +196,9 @@ namespace Lucene.Net.Analysis.Core { base.BeforeClass(); - IEnumerable<Type> analysisClasses = typeof(StandardAnalyzer).GetTypeInfo().Assembly.GetTypes() + IEnumerable<Type> analysisClasses = typeof(StandardAnalyzer).Assembly.GetTypes() .Where(c => { - var typeInfo = c.GetTypeInfo(); + var typeInfo = c; return !typeInfo.IsAbstract && typeInfo.IsPublic && !typeInfo.IsInterface && typeInfo.IsClass && (typeInfo.GetCustomAttribute<ObsoleteAttribute>() == null) @@ -217,7 +217,7 @@ namespace Lucene.Net.Analysis.Core continue; } - var typeInfo = c.GetTypeInfo(); + var typeInfo = c; if (typeInfo.IsSubclassOf(typeof(Tokenizer))) { diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs index 3cd3001..af41a6d 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs @@ -47,7 +47,7 @@ namespace Lucene.Net.Analysis.Hunspell // set this to the location of where you downloaded all the files internal static readonly DirectoryInfo DICTIONARY_HOME = new DirectoryInfo( - System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).GetTypeInfo().Assembly.Location).Parent.Parent.Parent.Parent.Parent.FullName, + System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).Assembly.Location).Parent.Parent.Parent.Parent.Parent.FullName, @"test-files\analysis\data\dictionaries")); internal readonly string[] tests = new string[] diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs index d16d07a..c3b243b 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs @@ -43,7 +43,7 @@ namespace Lucene.Net.Analysis.Hunspell // set this to the location of where you downloaded all the files internal static readonly DirectoryInfo DICTIONARY_HOME = new DirectoryInfo( - System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).GetTypeInfo().Assembly.Location).Parent.Parent.Parent.Parent.Parent.FullName, + System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).Assembly.Location).Parent.Parent.Parent.Parent.Parent.FullName, @"test-files\analysis\data\thunderbirdDicts")); internal readonly string[] tests = new string[] diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs index 058c27d..6d637fa 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs @@ -187,7 +187,7 @@ namespace Lucene.Net.Analysis.Synonym object delegator = synFac.Delegator; #pragma warning restore 612, 618 assertNotNull(delegator); - assertTrue("delegator not expected class: " + delegator.GetType(), delegatorClass.GetTypeInfo().IsInstanceOfType(delegator)); + assertTrue("delegator not expected class: " + delegator.GetType(), delegatorClass.IsInstanceOfType(delegator)); } } diff --git a/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/Alt/AltPackageTaskTest.cs b/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/Alt/AltPackageTaskTest.cs index c8f4c79..f647649 100644 --- a/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/Alt/AltPackageTaskTest.cs +++ b/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/Alt/AltPackageTaskTest.cs @@ -58,7 +58,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks.Alt if (allowAlt) { return new String[] { - "alt.tasks.packages = " +this.GetType().GetTypeInfo().Assembly.GetName().Name, + "alt.tasks.packages = " +this.GetType().Assembly.GetName().Name, altTask }; } diff --git a/src/Lucene.Net.Tests.Demo/TestDemo.cs b/src/Lucene.Net.Tests.Demo/TestDemo.cs index 02a18a7..e30f826 100644 --- a/src/Lucene.Net.Tests.Demo/TestDemo.cs +++ b/src/Lucene.Net.Tests.Demo/TestDemo.cs @@ -63,7 +63,7 @@ namespace Lucene.Net.Demo // file location, we first extract the files to the disk // from embedded resources. Then we know the exact location // where they are and it can't fail. - var thisAssembly = this.GetType().GetTypeInfo().Assembly; + var thisAssembly = this.GetType().Assembly; string embeddedDocsLocation = "Test_Files.Docs."; foreach (var file in thisAssembly.GetManifestResourceNames()) { diff --git a/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs index 6f73ce0..58cee00 100644 --- a/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs +++ b/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs @@ -326,7 +326,7 @@ namespace Lucene.Net.Search.Grouping try { IndexSearcher s = NewSearcher(r); - if (typeof(SlowCompositeReaderWrapper).GetTypeInfo().IsAssignableFrom(s.IndexReader.GetType())) + if (typeof(SlowCompositeReaderWrapper).IsAssignableFrom(s.IndexReader.GetType())) { canUseIDV = false; } diff --git a/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs index 95818a7..9e21454 100644 --- a/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs +++ b/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs @@ -145,7 +145,7 @@ namespace Lucene.Net.QueryParsers.Classic { try { - typeof(QueryParser).GetTypeInfo().GetConstructor(new Type[] { typeof(ICharStream) }); + typeof(QueryParser).GetConstructor(new Type[] { typeof(ICharStream) }); fail("please switch public QueryParser(CharStream) to be protected"); } catch (Exception /*nsme*/) @@ -154,7 +154,7 @@ namespace Lucene.Net.QueryParsers.Classic } try { - typeof(QueryParser).GetTypeInfo().GetConstructor(new Type[] { typeof(QueryParserTokenManager) }); + typeof(QueryParser).GetConstructor(new Type[] { typeof(QueryParserTokenManager) }); fail("please switch public QueryParser(QueryParserTokenManager) to be protected"); } catch (Exception /*nsme*/) diff --git a/src/Lucene.Net.Tests/Index/Test2BTerms.cs b/src/Lucene.Net.Tests/Index/Test2BTerms.cs index 58903f7..0ff1b95 100644 --- a/src/Lucene.Net.Tests/Index/Test2BTerms.cs +++ b/src/Lucene.Net.Tests/Index/Test2BTerms.cs @@ -160,7 +160,7 @@ namespace Lucene.Net.Index { return new MyTermAttributeImpl(); } - if (attClass.GetTypeInfo().IsSubclassOf(typeof(CharTermAttribute))) + if (attClass.IsSubclassOf(typeof(CharTermAttribute))) { throw new System.ArgumentException("no"); } diff --git a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs index 8726726..bd26583 100644 --- a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs +++ b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs @@ -188,7 +188,7 @@ namespace Lucene.Net.Index private static void CheckOverrideMethods(Type clazz) { - Type superClazz = clazz.GetTypeInfo().BaseType; + Type superClazz = clazz.BaseType; foreach (MethodInfo m in superClazz.GetMethods()) { // LUCENENET specific - since we changed to using a property for Attributes rather than a method, diff --git a/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs index 704ca5c..ec30513 100644 --- a/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs +++ b/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs @@ -45,7 +45,7 @@ namespace Lucene.Net.Index [Test] public virtual void TestFinalSingleton() { - assertTrue(typeof(NoDeletionPolicy).GetTypeInfo().IsSealed); + assertTrue(typeof(NoDeletionPolicy).IsSealed); ConstructorInfo[] ctors = typeof(NoDeletionPolicy).GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | diff --git a/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs b/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs index 2c0a8c8..2081780 100644 --- a/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs +++ b/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs @@ -48,7 +48,7 @@ namespace Lucene.Net.Index [Test] public virtual void TestFinalSingleton() { - assertTrue(typeof(NoMergePolicy).GetTypeInfo().IsSealed); + assertTrue(typeof(NoMergePolicy).IsSealed); ConstructorInfo[] ctors = typeof(NoMergePolicy).GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | diff --git a/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs index 1c526f2..f5a10e4 100644 --- a/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs +++ b/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs @@ -40,7 +40,7 @@ namespace Lucene.Net.Index [Test] public virtual void TestFinalSingleton() { - assertTrue(typeof(NoMergeScheduler).GetTypeInfo().IsSealed); + assertTrue(typeof(NoMergeScheduler).IsSealed); ConstructorInfo[] ctors = typeof(NoMergeScheduler).GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | diff --git a/src/Lucene.Net.Tests/Support/Codecs/TestDefaultCodecFactory.cs b/src/Lucene.Net.Tests/Support/Codecs/TestDefaultCodecFactory.cs index 32ae0f2..3c4e0b8 100644 --- a/src/Lucene.Net.Tests/Support/Codecs/TestDefaultCodecFactory.cs +++ b/src/Lucene.Net.Tests/Support/Codecs/TestDefaultCodecFactory.cs @@ -48,7 +48,7 @@ namespace Lucene.Net.Codecs protected override void Initialize() { base.Initialize(); - base.ScanForCodecs(this.GetType().GetTypeInfo().Assembly); + base.ScanForCodecs(this.GetType().Assembly); } } diff --git a/src/Lucene.Net.Tests/Support/Codecs/TestDefaultDocValuesFormatFactory.cs b/src/Lucene.Net.Tests/Support/Codecs/TestDefaultDocValuesFormatFactory.cs index 0b80555..d4e086d 100644 --- a/src/Lucene.Net.Tests/Support/Codecs/TestDefaultDocValuesFormatFactory.cs +++ b/src/Lucene.Net.Tests/Support/Codecs/TestDefaultDocValuesFormatFactory.cs @@ -49,7 +49,7 @@ namespace Lucene.Net.Codecs protected override void Initialize() { base.Initialize(); - base.ScanForDocValuesFormats(this.GetType().GetTypeInfo().Assembly); + base.ScanForDocValuesFormats(this.GetType().Assembly); } } diff --git a/src/Lucene.Net.Tests/Support/Codecs/TestDefaultPostingsFormatFactory.cs b/src/Lucene.Net.Tests/Support/Codecs/TestDefaultPostingsFormatFactory.cs index 888c951..34da52f 100644 --- a/src/Lucene.Net.Tests/Support/Codecs/TestDefaultPostingsFormatFactory.cs +++ b/src/Lucene.Net.Tests/Support/Codecs/TestDefaultPostingsFormatFactory.cs @@ -52,7 +52,7 @@ namespace Lucene.Net.Codecs protected override void Initialize() { base.Initialize(); - base.ScanForPostingsFormats(this.GetType().GetTypeInfo().Assembly); + base.ScanForPostingsFormats(this.GetType().Assembly); } } diff --git a/src/Lucene.Net.Tests/Util/TestVersion.cs b/src/Lucene.Net.Tests/Util/TestVersion.cs index e5978f2..f7ea668 100644 --- a/src/Lucene.Net.Tests/Util/TestVersion.cs +++ b/src/Lucene.Net.Tests/Util/TestVersion.cs @@ -58,7 +58,7 @@ namespace Lucene.Net.Util { Assert.AreEqual(LuceneVersion.LUCENE_CURRENT, values[i], "Last constant must be LUCENE_CURRENT"); } - bool dep = typeof(LuceneVersion).GetTypeInfo().GetField(values[i].ToString()).GetCustomAttributes(typeof(ObsoleteAttribute), false).Any(); + bool dep = typeof(LuceneVersion).GetField(values[i].ToString()).GetCustomAttributes(typeof(ObsoleteAttribute), false).Any(); if (i + 2 != values.Length) { assertTrue(values[i].ToString() + " should be deprecated", dep); diff --git a/src/Lucene.Net/Analysis/Analyzer.cs b/src/Lucene.Net/Analysis/Analyzer.cs index d4dc06b..50a06b0 100644 --- a/src/Lucene.Net/Analysis/Analyzer.cs +++ b/src/Lucene.Net/Analysis/Analyzer.cs @@ -632,7 +632,7 @@ namespace Lucene.Net.Analysis { if (analyzer.storedValue == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this Analyzer is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this Analyzer is closed"); } return analyzer.storedValue.Get(); } diff --git a/src/Lucene.Net/Analysis/NumericTokenStream.cs b/src/Lucene.Net/Analysis/NumericTokenStream.cs index c4bf124..beec1d6 100644 --- a/src/Lucene.Net/Analysis/NumericTokenStream.cs +++ b/src/Lucene.Net/Analysis/NumericTokenStream.cs @@ -145,7 +145,7 @@ namespace Lucene.Net.Analysis public override Util.Attribute CreateAttributeInstance<T>() { var attClass = typeof(T); - if (typeof(ICharTermAttribute).GetTypeInfo().IsAssignableFrom(attClass.GetTypeInfo())) + if (typeof(ICharTermAttribute).IsAssignableFrom(attClass)) { throw new System.ArgumentException("NumericTokenStream does not support CharTermAttribute."); } diff --git a/src/Lucene.Net/Analysis/Token.cs b/src/Lucene.Net/Analysis/Token.cs index 985e292..6fe489d 100644 --- a/src/Lucene.Net/Analysis/Token.cs +++ b/src/Lucene.Net/Analysis/Token.cs @@ -694,7 +694,7 @@ namespace Lucene.Net.Analysis public override Attribute CreateAttributeInstance<T>() { var attClass = typeof(T); - return attClass.GetTypeInfo().IsAssignableFrom(typeof(Token).GetTypeInfo()) ? new Token() : @delegate.CreateAttributeInstance<T>(); + return attClass.IsAssignableFrom(typeof(Token)) ? new Token() : @delegate.CreateAttributeInstance<T>(); } public override bool Equals(object other) diff --git a/src/Lucene.Net/Codecs/Codec.cs b/src/Lucene.Net/Codecs/Codec.cs index 4b20111..acfda87 100644 --- a/src/Lucene.Net/Codecs/Codec.cs +++ b/src/Lucene.Net/Codecs/Codec.cs @@ -33,7 +33,7 @@ namespace Lucene.Net.Codecs /// <list type="number"> /// <item><description>Subclass this class.</description></item> /// <item><description>Subclass <see cref="DefaultCodecFactory"/>, override the <see cref="DefaultCodecFactory.Initialize()"/> method, - /// and add the line <c>base.ScanForCodecs(typeof(YourCodec).GetTypeInfo().Assembly)</c>. + /// and add the line <c>base.ScanForCodecs(typeof(YourCodec).Assembly)</c>. /// If you have any codec classes in your assembly /// that are not meant for reading, you can add the <see cref="ExcludeCodecFromScanAttribute"/> /// to them so they are ignored by the scan.</description></item> diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs index 5476bca..ed4a033 100644 --- a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs +++ b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs @@ -169,7 +169,7 @@ namespace Lucene.Net.Codecs.Compressing { if (closed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this FieldsReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this FieldsReader is closed"); } } diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs index 96f0430..7eedc6f 100644 --- a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs +++ b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs @@ -179,7 +179,7 @@ namespace Lucene.Net.Codecs.Compressing { if (closed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this FieldsReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this FieldsReader is closed"); } } diff --git a/src/Lucene.Net/Codecs/DocValuesFormat.cs b/src/Lucene.Net/Codecs/DocValuesFormat.cs index 78361a3..455417f 100644 --- a/src/Lucene.Net/Codecs/DocValuesFormat.cs +++ b/src/Lucene.Net/Codecs/DocValuesFormat.cs @@ -36,7 +36,7 @@ namespace Lucene.Net.Codecs /// <list type="number"> /// <item><description>Subclass this class.</description></item> /// <item><description>Subclass <see cref="DefaultDocValuesFormatFactory"/>, override the <see cref="DefaultDocValuesFormatFactory.Initialize()"/> method, - /// and add the line <c>base.ScanForDocValuesFormats(typeof(YourDocValuesFormat).GetTypeInfo().Assembly)</c>. + /// and add the line <c>base.ScanForDocValuesFormats(typeof(YourDocValuesFormat).Assembly)</c>. /// If you have any format classes in your assembly /// that are not meant for reading, you can add the <see cref="ExcludeDocValuesFormatFromScanAttribute"/> /// to them so they are ignored by the scan.</description></item> diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs index 4d534f6..b3f1332 100644 --- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs +++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xStoredFieldsReader.cs @@ -235,7 +235,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (closed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this FieldsReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this FieldsReader is closed"); } } diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs index faaa64c..bac3500 100644 --- a/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs +++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40StoredFieldsReader.cs @@ -128,7 +128,7 @@ namespace Lucene.Net.Codecs.Lucene40 { if (closed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this FieldsReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this FieldsReader is closed"); } } diff --git a/src/Lucene.Net/Codecs/PostingsFormat.cs b/src/Lucene.Net/Codecs/PostingsFormat.cs index 1fc3c61..2749a2a 100644 --- a/src/Lucene.Net/Codecs/PostingsFormat.cs +++ b/src/Lucene.Net/Codecs/PostingsFormat.cs @@ -34,7 +34,7 @@ namespace Lucene.Net.Codecs /// <list type="number"> /// <item><description>Subclass this class.</description></item> /// <item><description>Subclass <see cref="DefaultPostingsFormatFactory"/>, override <see cref="DefaultPostingsFormatFactory.Initialize()"/>, - /// and add the line <c>base.ScanForPostingsFormats(typeof(YourPostingsFormat).GetTypeInfo().Assembly)</c>. + /// and add the line <c>base.ScanForPostingsFormats(typeof(YourPostingsFormat).Assembly)</c>. /// If you have any format classes in your assembly /// that are not meant for reading, you can add the <see cref="ExcludePostingsFormatFromScanAttribute"/> /// to them so they are ignored by the scan.</description></item> diff --git a/src/Lucene.Net/Index/CompositeReader.cs b/src/Lucene.Net/Index/CompositeReader.cs index de5ef2c..313e981 100644 --- a/src/Lucene.Net/Index/CompositeReader.cs +++ b/src/Lucene.Net/Index/CompositeReader.cs @@ -72,7 +72,7 @@ namespace Lucene.Net.Index { StringBuilder buffer = new StringBuilder(); // walk up through class hierarchy to get a non-empty simple name (anonymous classes have no name): - for (Type clazz = this.GetType(); clazz != null; clazz = clazz.GetTypeInfo().BaseType) + for (Type clazz = this.GetType(); clazz != null; clazz = clazz.BaseType) { if (clazz.Name != null) { diff --git a/src/Lucene.Net/Index/DocumentsWriter.cs b/src/Lucene.Net/Index/DocumentsWriter.cs index 2be4322..4012dda 100644 --- a/src/Lucene.Net/Index/DocumentsWriter.cs +++ b/src/Lucene.Net/Index/DocumentsWriter.cs @@ -233,7 +233,7 @@ namespace Lucene.Net.Index { if (closed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this IndexWriter is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this IndexWriter is closed"); } } diff --git a/src/Lucene.Net/Index/IndexFileDeleter.cs b/src/Lucene.Net/Index/IndexFileDeleter.cs index 504983d..ac42918 100644 --- a/src/Lucene.Net/Index/IndexFileDeleter.cs +++ b/src/Lucene.Net/Index/IndexFileDeleter.cs @@ -336,7 +336,7 @@ namespace Lucene.Net.Index { if (writer == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this IndexWriter is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this IndexWriter is closed"); } else { diff --git a/src/Lucene.Net/Index/IndexReader.cs b/src/Lucene.Net/Index/IndexReader.cs index 1ae639e..78a6cec 100644 --- a/src/Lucene.Net/Index/IndexReader.cs +++ b/src/Lucene.Net/Index/IndexReader.cs @@ -270,7 +270,7 @@ namespace Lucene.Net.Index // still close the reader if it was made invalid by a child: if (refCount <= 0) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this IndexReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this IndexReader is closed"); } int rc = refCount.DecrementAndGet(); @@ -312,13 +312,13 @@ namespace Lucene.Net.Index { if (refCount <= 0) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this IndexReader is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this IndexReader is closed"); } // the happens before rule on reading the refCount, which must be after the fake write, // ensures that we see the value: if (closedByChild) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this IndexReader cannot be used anymore as one of its child readers was closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this IndexReader cannot be used anymore as one of its child readers was closed"); } } diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs index 33c2260..51409e1 100644 --- a/src/Lucene.Net/Index/IndexWriter.cs +++ b/src/Lucene.Net/Index/IndexWriter.cs @@ -772,7 +772,7 @@ namespace Lucene.Net.Index { if (closed || (failIfDisposing && closing)) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this IndexWriter is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this IndexWriter is closed"); } } diff --git a/src/Lucene.Net/Index/SegmentCoreReaders.cs b/src/Lucene.Net/Index/SegmentCoreReaders.cs index a9a2f08..b8f1c37 100644 --- a/src/Lucene.Net/Index/SegmentCoreReaders.cs +++ b/src/Lucene.Net/Index/SegmentCoreReaders.cs @@ -198,7 +198,7 @@ namespace Lucene.Net.Index return; } } - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "SegmentCoreReaders is already closed"); + throw new ObjectDisposedException(this.GetType().FullName, "SegmentCoreReaders is already closed"); } internal NumericDocValues GetNormValues(FieldInfo fi) diff --git a/src/Lucene.Net/Search/ReferenceManager.cs b/src/Lucene.Net/Search/ReferenceManager.cs index e1d5ac8..90f6faf 100644 --- a/src/Lucene.Net/Search/ReferenceManager.cs +++ b/src/Lucene.Net/Search/ReferenceManager.cs @@ -63,7 +63,7 @@ namespace Lucene.Net.Search { if (current == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, REFERENCE_MANAGER_IS_CLOSED_MSG); + throw new ObjectDisposedException(this.GetType().FullName, REFERENCE_MANAGER_IS_CLOSED_MSG); } } @@ -110,7 +110,7 @@ namespace Lucene.Net.Search { if ((@ref = current) == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, REFERENCE_MANAGER_IS_CLOSED_MSG); + throw new ObjectDisposedException(this.GetType().FullName, REFERENCE_MANAGER_IS_CLOSED_MSG); } if (TryIncRef(@ref)) { diff --git a/src/Lucene.Net/Search/SearcherLifetimeManager.cs b/src/Lucene.Net/Search/SearcherLifetimeManager.cs index 062b673..db58172 100644 --- a/src/Lucene.Net/Search/SearcherLifetimeManager.cs +++ b/src/Lucene.Net/Search/SearcherLifetimeManager.cs @@ -146,7 +146,7 @@ namespace Lucene.Net.Search { if (_closed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this SearcherLifetimeManager instance is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this SearcherLifetimeManager instance is closed"); } } diff --git a/src/Lucene.Net/Store/BaseDirectory.cs b/src/Lucene.Net/Store/BaseDirectory.cs index 6c0592e..111f740 100644 --- a/src/Lucene.Net/Store/BaseDirectory.cs +++ b/src/Lucene.Net/Store/BaseDirectory.cs @@ -84,7 +84,7 @@ namespace Lucene.Net.Store { if (!IsOpen) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "this Directory is closed"); + throw new ObjectDisposedException(this.GetType().FullName, "this Directory is closed"); } } } diff --git a/src/Lucene.Net/Store/ByteBufferIndexInput.cs b/src/Lucene.Net/Store/ByteBufferIndexInput.cs index 341d370..6c8c94b 100644 --- a/src/Lucene.Net/Store/ByteBufferIndexInput.cs +++ b/src/Lucene.Net/Store/ByteBufferIndexInput.cs @@ -241,7 +241,7 @@ namespace Lucene.Net.Store } catch (NullReferenceException) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "Already closed: " + this); + throw new ObjectDisposedException(this.GetType().FullName, "Already closed: " + this); } } @@ -292,7 +292,7 @@ namespace Lucene.Net.Store { if (buffers == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "Already closed: " + this); + throw new ObjectDisposedException(this.GetType().FullName, "Already closed: " + this); } if (offset < 0 || length < 0 || offset + length > this.length) { @@ -358,7 +358,7 @@ namespace Lucene.Net.Store { if (buffers == null || curBuf == null) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "Already closed: " + this); + throw new ObjectDisposedException(this.GetType().FullName, "Already closed: " + this); } } diff --git a/src/Lucene.Net/Store/CompoundFileWriter.cs b/src/Lucene.Net/Store/CompoundFileWriter.cs index 7f72c9c..33bb64e 100644 --- a/src/Lucene.Net/Store/CompoundFileWriter.cs +++ b/src/Lucene.Net/Store/CompoundFileWriter.cs @@ -203,7 +203,7 @@ namespace Lucene.Net.Store { if (closed) { - throw new ObjectDisposedException(this.GetType().GetTypeInfo().FullName, "CFS Directory is already closed"); + throw new ObjectDisposedException(this.GetType().FullName, "CFS Directory is already closed"); } } diff --git a/src/Lucene.Net/Support/Codecs/DefaultCodecFactory.cs b/src/Lucene.Net/Support/Codecs/DefaultCodecFactory.cs index 02931f5..70ed399 100644 --- a/src/Lucene.Net/Support/Codecs/DefaultCodecFactory.cs +++ b/src/Lucene.Net/Support/Codecs/DefaultCodecFactory.cs @@ -152,7 +152,7 @@ namespace Lucene.Net.Codecs { if (codec == null) throw new ArgumentNullException(nameof(codec)); - if (!typeof(Codec).GetTypeInfo().IsAssignableFrom(codec)) + if (!typeof(Codec).IsAssignableFrom(codec)) throw new ArgumentException($"The supplied type {codec.AssemblyQualifiedName} does not subclass {nameof(Codec)}."); PutCodecTypeImpl(codec); diff --git a/src/Lucene.Net/Support/Codecs/DefaultDocValuesFormatFactory.cs b/src/Lucene.Net/Support/Codecs/DefaultDocValuesFormatFactory.cs index 95beae1..43386e0 100644 --- a/src/Lucene.Net/Support/Codecs/DefaultDocValuesFormatFactory.cs +++ b/src/Lucene.Net/Support/Codecs/DefaultDocValuesFormatFactory.cs @@ -149,7 +149,7 @@ namespace Lucene.Net.Codecs { if (docValuesFormat == null) throw new ArgumentNullException(nameof(docValuesFormat)); - if (!typeof(DocValuesFormat).GetTypeInfo().IsAssignableFrom(docValuesFormat)) + if (!typeof(DocValuesFormat).IsAssignableFrom(docValuesFormat)) throw new ArgumentException($"The supplied type {docValuesFormat.AssemblyQualifiedName} does not subclass {nameof(DocValuesFormat)}."); PutDocValuesFormatTypeImpl(docValuesFormat); diff --git a/src/Lucene.Net/Support/Codecs/DefaultPostingsFormatFactory.cs b/src/Lucene.Net/Support/Codecs/DefaultPostingsFormatFactory.cs index f377d75..796f866 100644 --- a/src/Lucene.Net/Support/Codecs/DefaultPostingsFormatFactory.cs +++ b/src/Lucene.Net/Support/Codecs/DefaultPostingsFormatFactory.cs @@ -149,7 +149,7 @@ namespace Lucene.Net.Codecs { if (postingsFormat == null) throw new ArgumentNullException(nameof(postingsFormat)); - if (!typeof(PostingsFormat).GetTypeInfo().IsAssignableFrom(postingsFormat)) + if (!typeof(PostingsFormat).IsAssignableFrom(postingsFormat)) throw new ArgumentException($"The supplied type {postingsFormat.AssemblyQualifiedName} does not subclass {nameof(PostingsFormat)}."); PutPostingsFormatTypeImpl(postingsFormat); diff --git a/src/Lucene.Net/Support/Collections.cs b/src/Lucene.Net/Support/Collections.cs index 6370d32..3dd5373 100644 --- a/src/Lucene.Net/Support/Collections.cs +++ b/src/Lucene.Net/Support/Collections.cs @@ -82,7 +82,7 @@ namespace Lucene.Net.Support return "[]"; } - bool isValueType = typeof(T).GetTypeInfo().IsValueType; + bool isValueType = typeof(T).IsValueType; using (var it = collection.GetEnumerator()) { StringBuilder sb = new StringBuilder(); @@ -126,8 +126,8 @@ namespace Lucene.Net.Support return "{}"; } - bool keyIsValueType = typeof(TKey).GetTypeInfo().IsValueType; - bool valueIsValueType = typeof(TValue).GetTypeInfo().IsValueType; + bool keyIsValueType = typeof(TKey).IsValueType; + bool valueIsValueType = typeof(TValue).IsValueType; using (var i = dictionary.GetEnumerator()) { StringBuilder sb = new StringBuilder(); @@ -171,7 +171,7 @@ namespace Lucene.Net.Support public static string ToString(object obj) { Type t = obj.GetType(); - if (t.GetTypeInfo().IsGenericType + if (t.IsGenericType && (t.ImplementsGenericInterface(typeof(ICollection<>))) || t.ImplementsGenericInterface(typeof(IDictionary<,>))) { diff --git a/src/Lucene.Net/Support/Util/BundleResourceManagerFactory.cs b/src/Lucene.Net/Support/Util/BundleResourceManagerFactory.cs index 28c134c..539c120 100644 --- a/src/Lucene.Net/Support/Util/BundleResourceManagerFactory.cs +++ b/src/Lucene.Net/Support/Util/BundleResourceManagerFactory.cs @@ -47,7 +47,7 @@ namespace Lucene.Net.Util /// <returns>A new <see cref="ResourceManager"/> instance.</returns> public virtual ResourceManager Create(Type resourceSource) { - return new ResourceManager(GetResourceName(resourceSource), resourceSource.GetTypeInfo().Assembly); + return new ResourceManager(GetResourceName(resourceSource), resourceSource.Assembly); } /// <summary> diff --git a/src/Lucene.Net/Support/Util/NamedServiceFactory.cs b/src/Lucene.Net/Support/Util/NamedServiceFactory.cs index 67d4e35..62f3645 100644 --- a/src/Lucene.Net/Support/Util/NamedServiceFactory.cs +++ b/src/Lucene.Net/Support/Util/NamedServiceFactory.cs @@ -67,7 +67,7 @@ namespace Lucene.Net.Util Type simpleTextType = Type.GetType("Lucene.Net.Codecs.SimpleText.SimpleTextCodec, Lucene.Net.Codecs"); if (simpleTextType != null) { - codecsAssembly = simpleTextType.GetTypeInfo().Assembly; + codecsAssembly = simpleTextType.Assembly; } } @@ -85,10 +85,10 @@ namespace Lucene.Net.Util { return type != null && - type.GetTypeInfo().IsPublic && - !type.GetTypeInfo().IsAbstract && - typeof(TService).GetTypeInfo().IsAssignableFrom(type) && - type.GetTypeInfo().GetCustomAttribute<ExcludeServiceAttribute>(inherit: true) == null; + type.IsPublic && + !type.IsAbstract && + typeof(TService).IsAssignableFrom(type) && + type.GetCustomAttribute<ExcludeServiceAttribute>(inherit: true) == null; } /// <summary> @@ -99,7 +99,7 @@ namespace Lucene.Net.Util public static string GetServiceName(Type type) { // Check for ServiceName attribute - var nameAttributes = type.GetTypeInfo().GetCustomAttributes(typeof(ServiceNameAttribute), inherit: true); + var nameAttributes = type.GetCustomAttributes(typeof(ServiceNameAttribute), inherit: true); if (nameAttributes.Any()) { ServiceNameAttribute nameAttribute = nameAttributes.FirstOrDefault() as ServiceNameAttribute; @@ -131,7 +131,7 @@ namespace Lucene.Net.Util genericSuffix = "Generic" + name.Substring(genericIndex + 1); name = name.Substring(0, genericIndex); } - string serviceName = typeof(TService).GetTypeInfo().Name; + string serviceName = typeof(TService).Name; if (name.EndsWith(serviceName, StringComparison.Ordinal)) { name = name.Substring(0, name.Length - serviceName.Length); diff --git a/src/Lucene.Net/Util/ArrayUtil.cs b/src/Lucene.Net/Util/ArrayUtil.cs index de8b2d4..38f9640 100644 --- a/src/Lucene.Net/Util/ArrayUtil.cs +++ b/src/Lucene.Net/Util/ArrayUtil.cs @@ -839,7 +839,7 @@ namespace Lucene.Net.Util // implements IComparable<T>, otherwise use Comparer<T>.Default. // This allows the comparison to be customized, but it is not mandatory // to implement IComparable<T>. - else if (typeof(IComparable<T>).GetTypeInfo().IsAssignableFrom(genericClosingType)) + else if (typeof(IComparable<T>).IsAssignableFrom(genericClosingType)) { return new NaturalComparer<T>(); } diff --git a/src/Lucene.Net/Util/AttributeSource.cs b/src/Lucene.Net/Util/AttributeSource.cs index 60bf2b9..17435dd 100644 --- a/src/Lucene.Net/Util/AttributeSource.cs +++ b/src/Lucene.Net/Util/AttributeSource.cs @@ -310,7 +310,7 @@ namespace Lucene.Net.Util foundInterfaces.AddLast(new WeakReference<Type>(curInterface)); } } - actClazz = actClazz.GetTypeInfo().BaseType; + actClazz = actClazz.BaseType; } while (actClazz != null); return foundInterfaces; @@ -367,7 +367,7 @@ namespace Lucene.Net.Util var attClass = typeof(T); if (!attributes.ContainsKey(attClass)) { - if (!(attClass.GetTypeInfo().IsInterface && typeof(IAttribute).IsAssignableFrom(attClass))) + if (!(attClass.IsInterface && typeof(IAttribute).IsAssignableFrom(attClass))) { throw new ArgumentException("AddAttribute() only accepts an interface that extends IAttribute, but " + attClass.FullName + " does not fulfil this contract."); } diff --git a/src/Lucene.Net/Util/Fst/FST.cs b/src/Lucene.Net/Util/Fst/FST.cs index c884a80..ffb4661 100644 --- a/src/Lucene.Net/Util/Fst/FST.cs +++ b/src/Lucene.Net/Util/Fst/FST.cs @@ -452,12 +452,12 @@ namespace Lucene.Net.Util.Fst // LUCENENET NOTE: In .NET, IEnumerable will not equal another identical IEnumerable // because it checks for reference equality, not that the list contents // are the same. StructuralEqualityComparer.Default.Equals() will make that check. - Debug.Assert(typeof(T).GetTypeInfo().IsValueType + Debug.Assert(typeof(T).IsValueType ? JCG.EqualityComparer<T>.Default.Equals(root.NextFinalOutput, asserting.NextFinalOutput) : StructuralEqualityComparer.Default.Equals(root.NextFinalOutput, asserting.NextFinalOutput)); Debug.Assert(root.Node == asserting.Node); Debug.Assert(root.NumArcs == asserting.NumArcs); - Debug.Assert(typeof(T).GetTypeInfo().IsValueType + Debug.Assert(typeof(T).IsValueType ? JCG.EqualityComparer<T>.Default.Equals(root.Output, asserting.Output) : StructuralEqualityComparer.Default.Equals(root.Output, asserting.Output)); Debug.Assert(root.PosArcsStart == asserting.PosArcsStart); diff --git a/src/Lucene.Net/Util/Fst/NodeHash.cs b/src/Lucene.Net/Util/Fst/NodeHash.cs index 6efa2a2..9968355 100644 --- a/src/Lucene.Net/Util/Fst/NodeHash.cs +++ b/src/Lucene.Net/Util/Fst/NodeHash.cs @@ -39,7 +39,7 @@ namespace Lucene.Net.Util.Fst // LUCENENET specific - optimize the Hash methods // by only calling StructuralEqualityComparer.GetHashCode() if the value is a reference type - private readonly static bool tIsValueType = typeof(T).GetTypeInfo().IsValueType; + private readonly static bool tIsValueType = typeof(T).IsValueType; public NodeHash(FST<T> fst, FST.BytesReader input) { diff --git a/src/Lucene.Net/Util/NamedSPILoader.cs b/src/Lucene.Net/Util/NamedSPILoader.cs index be3e628..b4225e3 100644 --- a/src/Lucene.Net/Util/NamedSPILoader.cs +++ b/src/Lucene.Net/Util/NamedSPILoader.cs @@ -66,7 +66,7 @@ // SPIClassIterator<S> loader = SPIClassIterator<S>.Get(); // // Ensure there is a default constructor (the SPIClassIterator contains types that don't) -// foreach (Type c in loader.Where(t => t.GetTypeInfo().GetConstructor(Type.EmptyTypes) != null)) +// foreach (Type c in loader.Where(t => t.GetConstructor(Type.EmptyTypes) != null)) // { // try // { diff --git a/src/Lucene.Net/Util/PrintStreamInfoStream.cs b/src/Lucene.Net/Util/PrintStreamInfoStream.cs index 435477c..5668627 100644 --- a/src/Lucene.Net/Util/PrintStreamInfoStream.cs +++ b/src/Lucene.Net/Util/PrintStreamInfoStream.cs @@ -68,7 +68,7 @@ namespace Lucene.Net.Util // after calling Dispose(), we need to determine whether it is a system stream // here instead of on demand. this.isSystemStream = stream == Console.Out || stream == Console.Error; - this.m_stream = typeof(SafeTextWriterWrapper).GetTypeInfo().IsAssignableFrom(stream.GetType()) ? stream : new SafeTextWriterWrapper(stream); + this.m_stream = typeof(SafeTextWriterWrapper).IsAssignableFrom(stream.GetType()) ? stream : new SafeTextWriterWrapper(stream); this.m_messageID = messageID; } diff --git a/src/Lucene.Net/Util/RamUsageEstimator.cs b/src/Lucene.Net/Util/RamUsageEstimator.cs index a462e22..607edc6 100644 --- a/src/Lucene.Net/Util/RamUsageEstimator.cs +++ b/src/Lucene.Net/Util/RamUsageEstimator.cs @@ -427,7 +427,7 @@ namespace Lucene.Net.Util { throw new System.ArgumentException("this method does not work with array classes."); } - if (clazz.GetTypeInfo().IsPrimitive) + if (clazz.IsPrimitive) { return primitiveSizes[clazz]; } @@ -435,7 +435,7 @@ namespace Lucene.Net.Util long size = NUM_BYTES_OBJECT_HEADER; // Walk type hierarchy - for (; clazz != null; clazz = clazz.GetTypeInfo().BaseType) + for (; clazz != null; clazz = clazz.BaseType) { FieldInfo[] fields = clazz.GetFields( BindingFlags.Instance | @@ -464,7 +464,7 @@ namespace Lucene.Net.Util if (len > 0) { Type arrayElementClazz = array.GetType().GetElementType(); - if (arrayElementClazz.GetTypeInfo().IsPrimitive) + if (arrayElementClazz.IsPrimitive) { size += (long)len * primitiveSizes[arrayElementClazz]; } @@ -525,7 +525,7 @@ namespace Lucene.Net.Util if (len > 0) { Type componentClazz = obClazz.GetElementType(); - if (componentClazz.GetTypeInfo().IsPrimitive) + if (componentClazz.IsPrimitive) { size += (long)len * primitiveSizes[componentClazz]; } @@ -596,7 +596,7 @@ namespace Lucene.Net.Util ClassCache cachedInfo; long shallowInstanceSize = NUM_BYTES_OBJECT_HEADER; List<FieldInfo> referenceFields = new List<FieldInfo>(32); - for (Type c = clazz; c != null; c = c.GetTypeInfo().BaseType) + for (Type c = clazz; c != null; c = c.BaseType) { FieldInfo[] fields = c.GetFields( BindingFlags.Instance | @@ -610,7 +610,7 @@ namespace Lucene.Net.Util { shallowInstanceSize = AdjustForField(shallowInstanceSize, f); - if (!f.FieldType.GetTypeInfo().IsPrimitive) + if (!f.FieldType.IsPrimitive) { referenceFields.Add(f); } @@ -635,7 +635,7 @@ namespace Lucene.Net.Util int fsize = 0; if (!typeof(IntPtr).Equals(type) && !typeof(UIntPtr).Equals(type)) - fsize = type.GetTypeInfo().IsPrimitive ? primitiveSizes[type] : NUM_BYTES_OBJECT_REF; + fsize = type.IsPrimitive ? primitiveSizes[type] : NUM_BYTES_OBJECT_REF; // LUCENENET NOTE: I dont think this will ever not be null //if (ObjectFieldOffsetMethod != null) diff --git a/src/Lucene.Net/Util/SPIClassIterator.cs b/src/Lucene.Net/Util/SPIClassIterator.cs index a257710..4976418 100644 --- a/src/Lucene.Net/Util/SPIClassIterator.cs +++ b/src/Lucene.Net/Util/SPIClassIterator.cs @@ -61,7 +61,7 @@ namespace Lucene.Net.Util { try { - foreach (var type in assembly.GetTypes().Where(x => x.GetTypeInfo().IsPublic)) + foreach (var type in assembly.GetTypes().Where(x => x.IsPublic)) { try { @@ -109,7 +109,7 @@ namespace Lucene.Net.Util internal static bool IsInvokableSubclassOf<T>(Type type) { - return typeof(T).IsAssignableFrom(type) && !type.GetTypeInfo().IsAbstract && !type.GetTypeInfo().IsInterface; + return typeof(T).IsAssignableFrom(type) && !type.IsAbstract && !type.IsInterface; } public static SPIClassIterator<S> Get() diff --git a/src/Lucene.Net/Util/VirtualMethod.cs b/src/Lucene.Net/Util/VirtualMethod.cs index 975c250..fbf8610 100644 --- a/src/Lucene.Net/Util/VirtualMethod.cs +++ b/src/Lucene.Net/Util/VirtualMethod.cs @@ -169,13 +169,13 @@ namespace Lucene.Net.Util private int ReflectImplementationDistance(Type subclazz) { - if (!baseClass.GetTypeInfo().IsAssignableFrom(subclazz)) + if (!baseClass.IsAssignableFrom(subclazz)) { throw new System.ArgumentException(subclazz.Name + " is not a subclass of " + baseClass.Name); } bool overridden = false; int distance = 0; - for (Type clazz = subclazz; clazz != baseClass && clazz != null; clazz = clazz.GetTypeInfo().BaseType) + for (Type clazz = subclazz; clazz != baseClass && clazz != null; clazz = clazz.BaseType) { // lookup method, if success mark as overridden if (!overridden) diff --git a/src/dotnet/tools/lucene-cli/ConfigurationBase.cs b/src/dotnet/tools/lucene-cli/ConfigurationBase.cs index 5aacf4e..4f3cb00 100644 --- a/src/dotnet/tools/lucene-cli/ConfigurationBase.cs +++ b/src/dotnet/tools/lucene-cli/ConfigurationBase.cs @@ -25,7 +25,7 @@ namespace Lucene.Net.Cli public abstract class ConfigurationBase : CommandLineApplication { - private static Assembly thisAssembly = typeof(ConfigurationBase).GetTypeInfo().Assembly; + private static Assembly thisAssembly = typeof(ConfigurationBase).Assembly; protected static string HELP_VALUE_NAME = "help"; protected ConfigurationBase()
