From 5eb66e337836637168c6d38bf0fc592ac05ece3a Mon Sep 17 00:00:00 2001
From: Mike McCandless <mikemccand@apache.org>
Date: Wed, 24 Aug 2016 19:50:25 -0400
Subject: [PATCH] Mark Scandinavian analysis components as multi term aware

---
 .../index/analysis/ScandinavianFoldingFilterFactory.java    | 6 +++++-
 .../analysis/ScandinavianNormalizationFilterFactory.java    | 6 +++++-
 .../java/org/elasticsearch/AnalysisFactoryTestCase.java     | 2 --
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java
index dc6e83860b5..c55b487fe79 100644
--- a/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java
+++ b/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java
@@ -27,7 +27,7 @@ import org.elasticsearch.index.IndexSettings;
 /**
  * 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 class ScandinavianFoldingFilterFactory extends AbstractTokenFilterFactory
         return new ScandinavianFoldingFilter(tokenStream);
     }
 
+    @Override
+    public Object getMultiTermComponent() {
+        return this;
+    }
 }
diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java
index 71ac62c68ce..72c96dd0c29 100644
--- a/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java
+++ b/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java
@@ -27,7 +27,7 @@ import org.elasticsearch.index.IndexSettings;
 /**
  * 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 class ScandinavianNormalizationFilterFactory extends AbstractTokenFilterF
         return new ScandinavianNormalizationFilter(tokenStream);
     }
 
+    @Override
+    public Object getMultiTermComponent() {
+        return this;
+    }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/elasticsearch/AnalysisFactoryTestCase.java
index 97c2354dac4..1b4fcd2922a 100644
--- a/test/framework/src/main/java/org/elasticsearch/AnalysisFactoryTestCase.java
+++ b/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();