You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/05/23 03:37:51 UTC

[james-project] 03/14: JAMES-2764 Refactor case insensitive analyzer into a normalizer

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 69f005e64465338bf209b9ba619a398a96bfdc34
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon May 20 17:03:25 2019 +0700

    JAMES-2764 Refactor case insensitive analyzer into a normalizer
---
 .../org/apache/james/backends/es/v6/IndexCreationFactory.java    | 9 +++++++--
 .../java/org/apache/james/backends/es/v6/NodeMappingFactory.java | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/IndexCreationFactory.java b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/IndexCreationFactory.java
index 111bbcf..8c281d0 100644
--- a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/IndexCreationFactory.java
+++ b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/IndexCreationFactory.java
@@ -131,13 +131,18 @@ public class IndexCreationFactory {
                         .field("number_of_shards", nbShards)
                         .field("number_of_replicas", nbReplica)
                         .startObject("analysis")
-                            .startObject("analyzer")
+                            .startObject("normalizer")
                                 .startObject(CASE_INSENSITIVE)
-                                    .field("tokenizer", "keyword")
+                                    .field("type", "custom")
+                                    .startArray("char_filter")
+                                    .endArray()
                                     .startArray("filter")
                                         .value("lowercase")
+                                        .value("asciifolding")
                                     .endArray()
                                 .endObject()
+                            .endObject()
+                            .startObject("analyzer")
                                 .startObject(KEEP_MAIL_AND_URL)
                                     .field("tokenizer", "uax_url_email")
                                     .startArray("filter")
diff --git a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/NodeMappingFactory.java b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/NodeMappingFactory.java
index 237f7fa..5fc2df1 100644
--- a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/NodeMappingFactory.java
+++ b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/NodeMappingFactory.java
@@ -48,6 +48,7 @@ public class NodeMappingFactory {
     public static final String RAW = "raw";
     public static final String SPLIT_EMAIL = "splitEmail";
     public static final String ANALYZER = "analyzer";
+    public static final String NORMALIZER = "normalizer";
     public static final String SEARCH_ANALYZER = "search_analyzer";
     public static final String SNOWBALL = "snowball";
     public static final String IGNORE_ABOVE = "ignore_above";


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org