iter

Author: Christoph Büscher

server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java

@@ -46,6 +46,11 @@ public AnalyzerComponents getComponents() {
         return this.components;
     }
 
+    @Override
+    public int getPositionIncrementGap(String fieldName) {
+        return this.components.getPositionIncrementGap();
+    }
+
     @Override
     public int getOffsetGap(String field) {
         if (this.components.getOffsetGap() < 0) {
@@ -83,10 +88,10 @@ protected Reader initReader(String fieldName, Reader reader) {
     @Override
     protected Reader initReaderForNormalization(String fieldName, Reader reader) {
         final AnalyzerComponents components = getComponents();
-      for (CharFilterFactory charFilter : components.getCharFilters()) {
-          reader = charFilter.normalize(reader);
-      }
-      return reader;
+        for (CharFilterFactory charFilter : components.getCharFilters()) {
+            reader = charFilter.normalize(reader);
+        }
+        return reader;
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java

@@ -50,11 +50,11 @@ void build(final Map<String, TokenizerFactory> tokenizers,
         customAnalyzer = CustomAnalyzer.create(components);
     }
 
-    static AnalyzerComponents createComponents(String name, Settings settings,
+    static AnalyzerComponents createComponents(String name, Settings analyzerSettings,
                                                       final Map<String, TokenizerFactory> tokenizers,
                                                       final Map<String, CharFilterFactory> charFilters,
                                                       final Map<String, TokenFilterFactory> tokenFilters) {
-        String tokenizerName = settings.get("tokenizer");
+        String tokenizerName = analyzerSettings.get("tokenizer");
         if (tokenizerName == null) {
             throw new IllegalArgumentException("Custom Analyzer [" + name + "] must be configured with a tokenizer");
         }
@@ -65,7 +65,7 @@ static AnalyzerComponents createComponents(String name, Settings settings,
                 "[" + tokenizerName + "]");
         }
 
-        List<String> charFilterNames = settings.getAsList("char_filter");
+        List<String> charFilterNames = analyzerSettings.getAsList("char_filter");
         List<CharFilterFactory> charFiltersList = new ArrayList<>(charFilterNames.size());
         for (String charFilterName : charFilterNames) {
             CharFilterFactory charFilter = charFilters.get(charFilterName);
@@ -78,11 +78,11 @@ static AnalyzerComponents createComponents(String name, Settings settings,
 
         int positionIncrementGap = TextFieldMapper.Defaults.POSITION_INCREMENT_GAP;
 
-        positionIncrementGap = settings.getAsInt("position_increment_gap", positionIncrementGap);
+        positionIncrementGap = analyzerSettings.getAsInt("position_increment_gap", positionIncrementGap);
 
-        int offsetGap = settings.getAsInt("offset_gap", -1);
+        int offsetGap = analyzerSettings.getAsInt("offset_gap", -1);
 
-        List<String> tokenFilterNames = settings.getAsList("filter");
+        List<String> tokenFilterNames = analyzerSettings.getAsList("filter");
         List<TokenFilterFactory> tokenFilterList = new ArrayList<>(tokenFilterNames.size());
         for (String tokenFilterName : tokenFilterNames) {
             TokenFilterFactory tokenFilter = tokenFilters.get(tokenFilterName);
@@ -142,7 +142,7 @@ public CharFilterFactory[] getCharFilters() {
             return charFilters;
         }
 
-        public int getPositionIncrementGap(String fieldName) {
+        public int getPositionIncrementGap() {
             return positionIncrementGap;
         }
 

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

@@ -29,7 +29,6 @@
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 import com.carrotsearch.randomizedtesting.generators.RandomStrings;
 import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter;
-
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;