Skip to content

Commit 6f5f12c

Browse files
MpdreamzMpdreamz
committed
Merge pull request #1779 from elastic/fix/naming-convention-tests
Uncomment and fix naming convention unit tests
2 parents 26546c7 + e633862 commit 6f5f12c

File tree

199 files changed

+460
-410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+460
-410
lines changed

‎src/Nest/Aggregations/AggregationContainer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Nest
88
{
99
[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
10-
public class AggregationDictionary : IsADictionary<string, IAggregationContainer>
10+
public class AggregationDictionary : IsADictionaryBase<string, IAggregationContainer>
1111
{
1212
public AggregationDictionary() : base() { }
1313
public AggregationDictionary(IDictionary<string, IAggregationContainer> container) : base(container) { }

‎src/Nest/Aggregations/Bucket/Filters/NamedFiltersContainer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public interface INamedFiltersContainer : IIsADictionary<string, IQueryContainer
1111
{
1212
}
1313

14-
public class NamedFiltersContainer: IsADictionary<string, IQueryContainer>, INamedFiltersContainer
14+
public class NamedFiltersContainer: IsADictionaryBase<string, IQueryContainer>, INamedFiltersContainer
1515
{
1616
public NamedFiltersContainer() : base() { }
1717
public NamedFiltersContainer(IDictionary<string, IQueryContainer> container) : base(container) { }
@@ -23,7 +23,7 @@ public NamedFiltersContainer(Dictionary<string, QueryContainer> container)
2323
public void Add(string name, QueryContainer filter) => BackingDictionary.Add(name, filter);
2424
}
2525

26-
public class NamedFiltersContainerDescriptor<T> : IsADictionaryDescriptor<NamedFiltersContainerDescriptor<T>, INamedFiltersContainer, string, IQueryContainer>
26+
public class NamedFiltersContainerDescriptor<T> : IsADictionaryDescriptorBase<NamedFiltersContainerDescriptor<T>, INamedFiltersContainer, string, IQueryContainer>
2727
where T : class
2828
{
2929
public NamedFiltersContainerDescriptor() : base(new NamedFiltersContainer()) { }

‎src/Nest/Aggregations/Pipeline/BucketsPath.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public SingleBucketsPath(string bucketsPath)
2222

2323
public interface IMultiBucketsPath : IIsADictionary<string, string>, IBucketsPath { }
2424

25-
public class MultiBucketsPath : IsADictionary<string, string>, IMultiBucketsPath
25+
public class MultiBucketsPath : IsADictionaryBase<string, string>, IMultiBucketsPath
2626
{
2727
public MultiBucketsPath() : base() { }
2828
public MultiBucketsPath(IDictionary<string, string> container) : base(container) { }
@@ -36,7 +36,7 @@ public MultiBucketsPath(Dictionary<string, string> container)
3636
}
3737

3838
public class MultiBucketsPathDescriptor
39-
: IsADictionaryDescriptor<MultiBucketsPathDescriptor, IMultiBucketsPath, string, string>
39+
: IsADictionaryDescriptorBase<MultiBucketsPathDescriptor, IMultiBucketsPath, string, string>
4040
{
4141
public MultiBucketsPathDescriptor() : base(new MultiBucketsPath()) { }
4242

‎src/Nest/Analysis/Analyzers/Analyzers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Nest
88
[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<Analyzers, string, IAnalyzer>))]
99
public interface IAnalyzers : IIsADictionary<string, IAnalyzer> { }
1010

11-
public class Analyzers : IsADictionary<string, IAnalyzer>, IAnalyzers
11+
public class Analyzers : IsADictionaryBase<string, IAnalyzer>, IAnalyzers
1212
{
1313
public Analyzers() : base() { }
1414
public Analyzers(IDictionary<string, IAnalyzer> container) : base(container) { }
@@ -19,7 +19,7 @@ public Analyzers(Dictionary<string, IAnalyzer> container)
1919
public void Add(string name, IAnalyzer analyzer) => BackingDictionary.Add(name, analyzer);
2020
}
2121

22-
public class AnalyzersDescriptor : IsADictionaryDescriptor<AnalyzersDescriptor, IAnalyzers, string, IAnalyzer>
22+
public class AnalyzersDescriptor : IsADictionaryDescriptorBase<AnalyzersDescriptor, IAnalyzers, string, IAnalyzer>
2323
{
2424
public AnalyzersDescriptor() : base(new Analyzers()) { }
2525

‎src/Nest/Analysis/CharFilters/CharFilters.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Nest
88
[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<CharFilters, string, ICharFilter>))]
99
public interface ICharFilters : IIsADictionary<string, ICharFilter> { }
1010

11-
public class CharFilters : IsADictionary<string, ICharFilter>, ICharFilters
11+
public class CharFilters : IsADictionaryBase<string, ICharFilter>, ICharFilters
1212
{
1313
public CharFilters() : base() { }
1414
public CharFilters(IDictionary<string, ICharFilter> container) : base(container) { }
@@ -19,7 +19,7 @@ public CharFilters(Dictionary<string, ICharFilter> container)
1919
public void Add(string name, ICharFilter analyzer) => BackingDictionary.Add(name, analyzer);
2020
}
2121

22-
public class CharFiltersDescriptor : IsADictionaryDescriptor<CharFiltersDescriptor, ICharFilters, string, ICharFilter>
22+
public class CharFiltersDescriptor : IsADictionaryDescriptorBase<CharFiltersDescriptor, ICharFilters, string, ICharFilter>
2323
{
2424
public CharFiltersDescriptor() : base(new CharFilters()) { }
2525

‎src/Nest/Analysis/TokenFilters/CompoundWord/CompoundWordTokenFilter.cs‎ renamed to ‎src/Nest/Analysis/TokenFilters/CompoundWord/CompoundWordTokenFilterBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public interface ICompoundWordTokenFilter : ITokenFilter
5151
bool? OnlyLongestMatch { get; set; }
5252
}
5353

54-
public abstract class CompoundWordTokenFilter : TokenFilterBase, ICompoundWordTokenFilter
54+
public abstract class CompoundWordTokenFilterBase : TokenFilterBase, ICompoundWordTokenFilter
5555
{
56-
protected CompoundWordTokenFilter(string type) : base(type) { }
56+
protected CompoundWordTokenFilterBase(string type) : base(type) { }
5757

5858
/// <inheritdoc/>
5959
public IEnumerable<string> WordList { get; set; }

‎src/Nest/Analysis/TokenFilters/CompoundWord/DictionaryDecompounderTokenFilter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace Nest
22
{
33
public interface IDictionaryDecompounderTokenFilter : ICompoundWordTokenFilter { }
44
/// <inheritdoc/>
5-
public class DictionaryDecompounderTokenFilter : CompoundWordTokenFilter, IDictionaryDecompounderTokenFilter
5+
public class DictionaryDecompounderTokenFilter : CompoundWordTokenFilterBase, IDictionaryDecompounderTokenFilter
66
{
77
public DictionaryDecompounderTokenFilter() : base("dictionary_decompounder") { }
88
}

‎src/Nest/Analysis/TokenFilters/CompoundWord/HyphenationDecompounderTokenFilter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Nest
55
/// </summary>
66
public interface IHyphenationDecompounderTokenFilter : ICompoundWordTokenFilter { }
77
/// <inheritdoc/>
8-
public class HyphenationDecompounderTokenFilter : CompoundWordTokenFilter, IHyphenationDecompounderTokenFilter
8+
public class HyphenationDecompounderTokenFilter : CompoundWordTokenFilterBase, IHyphenationDecompounderTokenFilter
99
{
1010
public HyphenationDecompounderTokenFilter() : base("hyphenation_decompounder") { }
1111
}

‎src/Nest/Analysis/TokenFilters/TokenFilters.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Nest
88
[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<TokenFilters, string, ITokenFilter>))]
99
public interface ITokenFilters : IIsADictionary<string, ITokenFilter> { }
1010

11-
public class TokenFilters : IsADictionary<string, ITokenFilter>, ITokenFilters
11+
public class TokenFilters : IsADictionaryBase<string, ITokenFilter>, ITokenFilters
1212
{
1313
public TokenFilters() : base() { }
1414
public TokenFilters(IDictionary<string, ITokenFilter> container) : base(container) { }
@@ -19,7 +19,7 @@ public TokenFilters(Dictionary<string, ITokenFilter> container)
1919
public void Add(string name, ITokenFilter analyzer) => BackingDictionary.Add(name, analyzer);
2020
}
2121

22-
public class TokenFiltersDescriptor : IsADictionaryDescriptor<TokenFiltersDescriptor, ITokenFilters, string, ITokenFilter>
22+
public class TokenFiltersDescriptor : IsADictionaryDescriptorBase<TokenFiltersDescriptor, ITokenFilters, string, ITokenFilter>
2323
{
2424
public TokenFiltersDescriptor() : base(new TokenFilters()) { }
2525

‎src/Nest/Analysis/Tokenizers/Tokenizers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Nest
88
[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<Tokenizers, string, ITokenizer>))]
99
public interface ITokenizers : IIsADictionary<string, ITokenizer> { }
1010

11-
public class Tokenizers : IsADictionary<string, ITokenizer>, ITokenizers
11+
public class Tokenizers : IsADictionaryBase<string, ITokenizer>, ITokenizers
1212
{
1313
public Tokenizers() : base() { }
1414
public Tokenizers(IDictionary<string, ITokenizer> container) : base(container) { }
@@ -19,7 +19,7 @@ public Tokenizers(Dictionary<string, ITokenizer> container)
1919
public void Add(string name, ITokenizer analyzer) => BackingDictionary.Add(name, analyzer);
2020
}
2121

22-
public class TokenizersDescriptor :IsADictionaryDescriptor<TokenizersDescriptor, ITokenizers, string, ITokenizer>
22+
public class TokenizersDescriptor :IsADictionaryDescriptorBase<TokenizersDescriptor, ITokenizers, string, ITokenizer>
2323
{
2424
public TokenizersDescriptor() : base(new Tokenizers()) { }
2525

0 commit comments

Comments
 (0)