Mark Scandinavian analysis components as multi term aware

Author: mikemccand

core/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java

@@ -27,7 +27,7 @@
 /**
  * Factory for {@link ScandinavianFoldingFilter}
  */
-public class ScandinavianFoldingFilterFactory extends AbstractTokenFilterFactory {
+public class ScandinavianFoldingFilterFactory extends AbstractTokenFilterFactory implements MultiTermAwareComponent {
 
     public ScandinavianFoldingFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
         super(indexSettings, name, settings);
@@ -38,4 +38,8 @@ public TokenStream create(TokenStream tokenStream) {
         return new ScandinavianFoldingFilter(tokenStream);
     }
 
+    @Override
+    public Object getMultiTermComponent() {
+        return this;
+    }
 }

core/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java

@@ -27,7 +27,7 @@
 /**
  * Factory for {@link ScandinavianNormalizationFilter}
  */
-public class ScandinavianNormalizationFilterFactory extends AbstractTokenFilterFactory {
+public class ScandinavianNormalizationFilterFactory extends AbstractTokenFilterFactory implements MultiTermAwareComponent {
 
     public ScandinavianNormalizationFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
         super(indexSettings, name, settings);
@@ -38,4 +38,8 @@ public TokenStream create(TokenStream tokenStream) {
         return new ScandinavianNormalizationFilter(tokenStream);
     }
 
+    @Override
+    public Object getMultiTermComponent() {
+        return this;
+    }
 }

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

@@ -229,8 +229,6 @@ public class AnalysisFactoryTestCase extends ESTestCase {
         // for tee-sinks
         .put("daterecognizer",            Void.class)
         .put("minhash",                   Void.class)
-        .put("scandinaviannormalization", Void.class)
-        .put("scandinavianfolding",       Void.class)
 
         .immutableMap();