-
Notifications
You must be signed in to change notification settings - Fork 24.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change IndexAnalyzers default analyzer access (#42011)
Currently IndexAnalyzers keeps the three default as separate class members although they should refer to the same analyzers held in the additional analyzers map under the default names. This assumption should be made more explicit by keeping all analyzers in the map. This change adapts the constructor to check all the default entries are there and the getters to reach into the map with the default names when needed.
- Loading branch information
Christoph Büscher
committed
May 10, 2019
1 parent
31a7df8
commit eb42fa8
Showing
7 changed files
with
144 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
server/src/test/java/org/elasticsearch/index/analysis/IndexAnalyzersTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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. | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.analysis; | ||
|
|
||
| import org.apache.lucene.analysis.standard.StandardAnalyzer; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.test.IndexSettingsModule; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class IndexAnalyzersTests extends ESTestCase { | ||
|
|
||
| /** | ||
| * test the checks in the constructor | ||
| */ | ||
| public void testAnalyzerMapChecks() { | ||
| Map<String, NamedAnalyzer> analyzers = new HashMap<>(); | ||
| { | ||
| NullPointerException ex = expectThrows(NullPointerException.class, | ||
| () -> new IndexAnalyzers(IndexSettingsModule.newIndexSettings("index", Settings.EMPTY), analyzers, | ||
| Collections.emptyMap(), Collections.emptyMap())); | ||
| assertEquals("the default analyzer must be set", ex.getMessage()); | ||
| } | ||
| { | ||
| analyzers.put(AnalysisRegistry.DEFAULT_ANALYZER_NAME, | ||
| new NamedAnalyzer("otherName", AnalyzerScope.INDEX, new StandardAnalyzer())); | ||
| IllegalStateException ex = expectThrows(IllegalStateException.class, | ||
| () -> new IndexAnalyzers(IndexSettingsModule.newIndexSettings("index", Settings.EMPTY), analyzers, | ||
| Collections.emptyMap(), Collections.emptyMap())); | ||
| assertEquals("default analyzer must have the name [default] but was: [otherName]", ex.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| public void testAnalyzerDefaults() throws IOException { | ||
| Map<String, NamedAnalyzer> analyzers = new HashMap<>(); | ||
| NamedAnalyzer analyzer = new NamedAnalyzer("default", AnalyzerScope.INDEX, new StandardAnalyzer()); | ||
| analyzers.put(AnalysisRegistry.DEFAULT_ANALYZER_NAME, analyzer); | ||
|
|
||
| // if only "default" is set in the map, all getters should return the same analyzer | ||
| try (IndexAnalyzers indexAnalyzers = new IndexAnalyzers(IndexSettingsModule.newIndexSettings("index", Settings.EMPTY), analyzers, | ||
| Collections.emptyMap(), Collections.emptyMap())) { | ||
| assertSame(analyzer, indexAnalyzers.getDefaultIndexAnalyzer()); | ||
| assertSame(analyzer, indexAnalyzers.getDefaultSearchAnalyzer()); | ||
| assertSame(analyzer, indexAnalyzers.getDefaultSearchQuoteAnalyzer()); | ||
| } | ||
|
|
||
| analyzers.put(AnalysisRegistry.DEFAULT_SEARCH_ANALYZER_NAME, | ||
| new NamedAnalyzer("my_search_analyzer", AnalyzerScope.INDEX, new StandardAnalyzer())); | ||
| try (IndexAnalyzers indexAnalyzers = new IndexAnalyzers(IndexSettingsModule.newIndexSettings("index", Settings.EMPTY), analyzers, | ||
| Collections.emptyMap(), Collections.emptyMap())) { | ||
| assertSame(analyzer, indexAnalyzers.getDefaultIndexAnalyzer()); | ||
| assertEquals("my_search_analyzer", indexAnalyzers.getDefaultSearchAnalyzer().name()); | ||
| assertEquals("my_search_analyzer", indexAnalyzers.getDefaultSearchQuoteAnalyzer().name()); | ||
| } | ||
|
|
||
| analyzers.put(AnalysisRegistry.DEFAULT_SEARCH_QUOTED_ANALYZER_NAME, | ||
| new NamedAnalyzer("my_search_quote_analyzer", AnalyzerScope.INDEX, new StandardAnalyzer())); | ||
| try (IndexAnalyzers indexAnalyzers = new IndexAnalyzers(IndexSettingsModule.newIndexSettings("index", Settings.EMPTY), analyzers, | ||
| Collections.emptyMap(), Collections.emptyMap())) { | ||
| assertSame(analyzer, indexAnalyzers.getDefaultIndexAnalyzer()); | ||
| assertEquals("my_search_analyzer", indexAnalyzers.getDefaultSearchAnalyzer().name()); | ||
| assertEquals("my_search_quote_analyzer", indexAnalyzers.getDefaultSearchQuoteAnalyzer().name()); | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.