You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2016/07/04 07:49:56 UTC
[4/4] lucene-solr:branch_6x: LUCENE-7353: ScandinavianFoldingFilterFactory and ScandinavianNormalizationFilterFactory now implement MultiTermAwareComponent.

LUCENE-7353: ScandinavianFoldingFilterFactory and ScandinavianNormalizationFilterFactory now implement MultiTermAwareComponent.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/64780b75
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/64780b75
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/64780b75

Branch: refs/heads/branch_6x
Commit: 64780b759202136041884bf822bb1d324460c26b
Parents: 01de73b
Author: Adrien Grand <jp...@gmail.com>
Authored: Mon Jul 4 09:42:28 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Mon Jul 4 09:49:26 2016 +0200

----------------------------------------------------------------------
 lucene/CHANGES.txt                                        |  4 ++++
 .../miscellaneous/ScandinavianFoldingFilterFactory.java   | 10 +++++++++-
 .../ScandinavianNormalizationFilterFactory.java           | 10 +++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/64780b75/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index ce6e60b2..3d29039 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -58,6 +58,10 @@ Improvements
 
 * LUCENE-7359: Add equals() and hashCode() to Explanation (Alan Woodward)
 
+* LUCENE-7353: ScandinavianFoldingFilterFactory and
+  ScandinavianNormalizationFilterFactory now implement MultiTermAwareComponent.
+  (Adrien Grand)
+
 Optimizations
 
 * LUCENE-7330, LUCENE-7339: Speed up conjunction queries. (Adrien Grand)

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/64780b75/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java
index 6f2ae12..cd98ecd 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java
@@ -18,6 +18,8 @@ package org.apache.lucene.analysis.miscellaneous;
 
 
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
+import org.apache.lucene.analysis.util.MultiTermAwareComponent;
 import org.apache.lucene.analysis.util.TokenFilterFactory;
 
 import java.util.Map;
@@ -32,7 +34,8 @@ import java.util.Map;
  *   &lt;/analyzer&gt;
  * &lt;/fieldType&gt;</pre>
  */
-public class ScandinavianFoldingFilterFactory extends TokenFilterFactory {
+public class ScandinavianFoldingFilterFactory extends TokenFilterFactory
+    implements MultiTermAwareComponent {
 
   public ScandinavianFoldingFilterFactory(Map<String,String> args) {
     super(args);
@@ -45,4 +48,9 @@ public class ScandinavianFoldingFilterFactory extends TokenFilterFactory {
   public ScandinavianFoldingFilter create(TokenStream input) {
     return new ScandinavianFoldingFilter(input);
   }
+
+  @Override
+  public AbstractAnalysisFactory getMultiTermComponent() {
+    return this;
+  }
 }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/64780b75/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java
index 1873c8d..fa9c830 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java
@@ -18,6 +18,8 @@ package org.apache.lucene.analysis.miscellaneous;
 
 
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
+import org.apache.lucene.analysis.util.MultiTermAwareComponent;
 import org.apache.lucene.analysis.util.TokenFilterFactory;
 
 import java.util.Map;
@@ -32,7 +34,8 @@ import java.util.Map;
  *   &lt;/analyzer&gt;
  * &lt;/fieldType&gt;</pre>
  */
-public class ScandinavianNormalizationFilterFactory extends TokenFilterFactory {
+public class ScandinavianNormalizationFilterFactory extends TokenFilterFactory
+    implements MultiTermAwareComponent {
 
   public ScandinavianNormalizationFilterFactory(Map<String, String> args) {
     super(args);
@@ -45,4 +48,9 @@ public class ScandinavianNormalizationFilterFactory extends TokenFilterFactory {
   public ScandinavianNormalizationFilter create(TokenStream input) {
     return new ScandinavianNormalizationFilter(input);
   }
+
+  @Override
+  public AbstractAnalysisFactory getMultiTermComponent() {
+    return this;
+  }
 }