From c583dd15df0ad3f1f5e37702ee47027aca182717 Mon Sep 17 00:00:00 2001
From: Yannick Welsch <yannick@elastic.co>
Date: Wed, 6 Jan 2016 11:11:43 +0100
Subject: [PATCH] Add PathHierarchy type back to path_hierarchy tokenizer for
 backward compatibility with 1.x

Closes #15785
---
 .../java/org/elasticsearch/index/analysis/AnalysisModule.java  | 3 ++-
 .../elasticsearch/indices/analysis/IndicesAnalysisService.java | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java
index 6ebe7134544fb..e2167f4a46d42 100644
--- a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java
+++ b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java
@@ -381,6 +381,7 @@ public void processTokenizers(TokenizersBindings tokenizersBindings) {
             tokenizersBindings.processTokenizer("standard", StandardTokenizerFactory.class);
             tokenizersBindings.processTokenizer("uax_url_email", UAX29URLEmailTokenizerFactory.class);
             tokenizersBindings.processTokenizer("path_hierarchy", PathHierarchyTokenizerFactory.class);
+            tokenizersBindings.processTokenizer("PathHierarchy", PathHierarchyTokenizerFactory.class);
             tokenizersBindings.processTokenizer("keyword", KeywordTokenizerFactory.class);
             tokenizersBindings.processTokenizer("letter", LetterTokenizerFactory.class);
             tokenizersBindings.processTokenizer("lowercase", LowerCaseTokenizerFactory.class);
@@ -450,7 +451,7 @@ public void processTokenFilters(TokenFiltersBindings tokenFiltersBindings) {
             tokenFiltersBindings.processTokenFilter("hunspell", HunspellTokenFilterFactory.class);
             tokenFiltersBindings.processTokenFilter("cjk_bigram", CJKBigramFilterFactory.class);
             tokenFiltersBindings.processTokenFilter("cjk_width", CJKWidthFilterFactory.class);
-            
+
             tokenFiltersBindings.processTokenFilter("apostrophe", ApostropheFilterFactory.class);
             tokenFiltersBindings.processTokenFilter("classic", ClassicFilterFactory.class);
             tokenFiltersBindings.processTokenFilter("decimal_digit", DecimalDigitFilterFactory.class);
diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java b/core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
index 9acdce3f8ab23..e422200f286e5 100644
--- a/core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
+++ b/core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
@@ -66,6 +66,7 @@ public IndicesAnalysisService(Settings settings) {
         // Tokenizer aliases
         tokenizerFactories.put("nGram", new PreBuiltTokenizerFactoryFactory(PreBuiltTokenizers.NGRAM.getTokenizerFactory(Version.CURRENT)));
         tokenizerFactories.put("edgeNGram", new PreBuiltTokenizerFactoryFactory(PreBuiltTokenizers.EDGE_NGRAM.getTokenizerFactory(Version.CURRENT)));
+        tokenizerFactories.put("PathHierarchy", new PreBuiltTokenizerFactoryFactory(PreBuiltTokenizers.PATH_HIERARCHY.getTokenizerFactory(Version.CURRENT)));
 
 
         // Token filters