honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix spacing, assert key contains period

This commit is contained in:
George P. Stathis 2016-03-04 19:32:44 -05:00
parent f8d2400ee6
commit 198a79edf5
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java
View File

@ -136,12 +136,13 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
IndexWarmer.INDEX_NORMS_LOADING_SETTING,
// validate that built-in similarities don't get redefined
Setting.groupSetting("index.similarity.", false, Setting.Scope.INDEX, (s) -> {
boolean valid = true;
String similarityName = s.substring(0, s.indexOf("."));
if(SimilarityService.BUILT_IN.keySet().contains(similarityName)) {
throw new IllegalArgumentException("Cannot redefine built-in Similarity [" + similarityName + "]");
}
return valid;
boolean valid = true;
assert(s.indexOf(".") > 1);
String similarityName = s.substring(0, s.indexOf("."));
if(SimilarityService.BUILT_IN.keySet().contains(similarityName)) {
throw new IllegalArgumentException("Cannot redefine built-in Similarity [" + similarityName + "]");
}
return valid;
}), // this allows similarity settings to be passed
Setting.groupSetting("index.analysis.", false, Setting.Scope.INDEX) // this allows analysis settings to be passed

2
core/src/main/java/org/elasticsearch/common/settings/Setting.java
View File

@ -487,7 +487,7 @@ public class Setting<T> extends ToXContentToBytes {
}
public static Setting<Settings> groupSetting(String key, boolean dynamic, Scope scope) {
return groupSetting(key, dynamic, scope, (s) -> true);
return groupSetting(key, dynamic, scope, (s) -> true);
}
public static Setting<Settings> groupSetting(String key, boolean dynamic, Scope scope, Predicate<String> settingsValidator) {

4
core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
View File

@ -114,7 +114,7 @@ public final class SimilarityService extends AbstractIndexComponent {
}
providers.put(name, factory.apply(name, settings));
}
return providers;
return providers;
}
public SimilarityProvider getSimilarity(String name) {
@ -122,7 +122,7 @@ public final class SimilarityService extends AbstractIndexComponent {
}
public SimilarityProvider getDefaultSimilarity() {
return similarities.get("default");
return similarities.get("default");
}
static class PerFieldSimilarity extends PerFieldSimilarityWrapper {

6
core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java
View File

@ -215,10 +215,10 @@ public class ScopedSettingsTests extends ESTestCase {
}
try {
settings.validate("index.similarity.classic.type", Settings.builder().put("index.similarity.classic.type", "mine").build());
fail();
settings.validate("index.similarity.classic.type", Settings.builder().put("index.similarity.classic.type", "mine").build());
fail();
} catch (IllegalArgumentException e) {
assertEquals("Cannot redefine built-in Similarity [classic]", e.getMessage());
assertEquals("Cannot redefine built-in Similarity [classic]", e.getMessage());
}
}