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 22d52a9ab0b947f42a818193af00c805f53515eb Author: Shad Storhaug <s...@shadstorhaug.com> AuthorDate: Thu Feb 6 23:45:53 2020 +0700 BREAKING: Lucene.Net.Support: Marked DictionaryExtensions, EnumerableExtensions, and SetExtensions internal --- .../Highlight/HighlighterTest.cs | 2 +- .../Highlight/OffsetLimitTokenFilterTest.cs | 2 +- .../VectorHighlight/AbstractTestCase.cs | 2 +- .../VectorHighlight/IndexTimeSynonymTest.cs | 2 +- src/Lucene.Net/Properties/AssemblyInfo.cs | 3 ++ src/Lucene.Net/Support/DictionaryExtensions.cs | 2 +- src/Lucene.Net/Support/EnumerableExtensions.cs | 32 +++++++++++----------- src/Lucene.Net/Support/SetExtensions.cs | 2 +- 8 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs index f6ddcdb..6ddccf4 100644 --- a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs +++ b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs @@ -2064,7 +2064,7 @@ namespace Lucene.Net.Search.Highlight * java.io.Reader) */ - protected override TokenStreamComponents CreateComponents(String arg0, TextReader arg1) + protected internal override TokenStreamComponents CreateComponents(String arg0, TextReader arg1) { Tokenizer stream = new MockTokenizer(arg1, MockTokenizer.SIMPLE, true); stream.AddAttribute<ICharTermAttribute>(); diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs index 0e0d585..c7a19cc 100644 --- a/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs +++ b/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs @@ -56,7 +56,7 @@ namespace Lucene.Net.Search.Highlight internal class AnalyzerAnonymousHelper : Analyzer { - protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader) + protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader) { MockTokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); tokenizer.EnableChecks = (false); diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs index 1e84a3d..4159eb2 100644 --- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs +++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs @@ -209,7 +209,7 @@ namespace Lucene.Net.Search.VectorHighlight internal sealed class BigramAnalyzer : Analyzer { - protected override TokenStreamComponents CreateComponents(String fieldName, TextReader reader) + protected internal override TokenStreamComponents CreateComponents(String fieldName, TextReader reader) { return new TokenStreamComponents(new BasicNGramTokenizer(reader)); } diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs index 7620a60..231da1f 100644 --- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs +++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs @@ -366,7 +366,7 @@ namespace Lucene.Net.Search.VectorHighlight this.tokens = tokens; } - protected override TokenStreamComponents CreateComponents(String fieldName, TextReader reader) + protected internal override TokenStreamComponents CreateComponents(String fieldName, TextReader reader) { Tokenizer ts = new TokenizerAnonymousHelper(Token.TOKEN_ATTRIBUTE_FACTORY, reader, tokens); return new TokenStreamComponents(ts); diff --git a/src/Lucene.Net/Properties/AssemblyInfo.cs b/src/Lucene.Net/Properties/AssemblyInfo.cs index db154e2..b3d4cca 100644 --- a/src/Lucene.Net/Properties/AssemblyInfo.cs +++ b/src/Lucene.Net/Properties/AssemblyInfo.cs @@ -68,9 +68,12 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Lucene.Net.TestFramework.NUnit, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.TestFramework.xUnit, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.Analysis.Common, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests.Analysis.Kuromoji, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests.Analysis.Phonetic, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.Expressions, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.Facet, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.Grouping, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests.Highlighter, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.ICU, PublicKey=" + AssemblyKeys.PublicKey)] // For Analysis.Util.TestSegmentingTokenizerBase [assembly: InternalsVisibleTo("Lucene.Net.Tests.Misc, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.QueryParser, PublicKey=" + AssemblyKeys.PublicKey)] diff --git a/src/Lucene.Net/Support/DictionaryExtensions.cs b/src/Lucene.Net/Support/DictionaryExtensions.cs index ea67408..8b22c1f 100644 --- a/src/Lucene.Net/Support/DictionaryExtensions.cs +++ b/src/Lucene.Net/Support/DictionaryExtensions.cs @@ -20,7 +20,7 @@ namespace Lucene.Net.Support * limitations under the License. */ - public static class DictionaryExtensions + internal static class DictionaryExtensions { public static void PutAll<TKey, TValue>(this IDictionary<TKey, TValue> dict, IEnumerable<KeyValuePair<TKey, TValue>> kvps) { diff --git a/src/Lucene.Net/Support/EnumerableExtensions.cs b/src/Lucene.Net/Support/EnumerableExtensions.cs index 546ffe0..3c9d472 100644 --- a/src/Lucene.Net/Support/EnumerableExtensions.cs +++ b/src/Lucene.Net/Support/EnumerableExtensions.cs @@ -4,27 +4,27 @@ using System.Collections.Generic; namespace Lucene.Net.Support { /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /// <summary> /// .NET Specific Helper Extensions for IEnumerable /// </summary> //Note: LUCENENET specific - public static class EnumerableExtensions + internal static class EnumerableExtensions { /// <summary> /// Enumerates a sequence in pairs diff --git a/src/Lucene.Net/Support/SetExtensions.cs b/src/Lucene.Net/Support/SetExtensions.cs index 130010a..4ab38e9 100644 --- a/src/Lucene.Net/Support/SetExtensions.cs +++ b/src/Lucene.Net/Support/SetExtensions.cs @@ -22,7 +22,7 @@ namespace Lucene.Net.Support * limitations under the License. */ - public static class SetExtensions + internal static class SetExtensions { [DebuggerStepThrough] public static void RemoveAll<T>(this ICollection<T> theSet, IEnumerable<T> removeList)