From 0e009a4fa3ff41501631ae70f4aeb8b802a540ab Mon Sep 17 00:00:00 2001
From: jlinn <jlinn5732@gmail.com>
Date: Mon, 28 Dec 2015 16:57:01 -0800
Subject: [PATCH] Update to ES v2.1.1

---
 pom.xml                                                |  6 +++---
 .../index/analysis/URLTokenFilterFactory.java          |  6 +++---
 .../index/analysis/URLTokenizerFactory.java            |  6 +++---
 .../index/analysis/url/URLAnalysisTestCase.java        | 10 ++++------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 14eb8bd..826386d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-analysis-url</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <packaging>jar</packaging>
     <description>Elasticsearch URL token filter plugin</description>
 
@@ -18,8 +18,8 @@
 
     <properties>
         <project.build.sourceEncodint>UTF-8</project.build.sourceEncodint>
-        <elasticsearch.version>2.0.0</elasticsearch.version>
-        <lucene.version>5.2.1</lucene.version>
+        <elasticsearch.version>2.1.1</elasticsearch.version>
+        <lucene.version>5.3.1</lucene.version>
         <hamcrest.version>1.3</hamcrest.version>
         <tests.output>onerror</tests.output>
         <tests.shuffle>true</tests.shuffle>
diff --git a/src/main/java/org/elasticsearch/index/analysis/URLTokenFilterFactory.java b/src/main/java/org/elasticsearch/index/analysis/URLTokenFilterFactory.java
index bb9724b..1105dae 100644
--- a/src/main/java/org/elasticsearch/index/analysis/URLTokenFilterFactory.java
+++ b/src/main/java/org/elasticsearch/index/analysis/URLTokenFilterFactory.java
@@ -6,7 +6,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.url.URLTokenFilter;
-import org.elasticsearch.index.settings.IndexSettings;
+import org.elasticsearch.index.settings.IndexSettingsService;
 
 /**
  * Joe Linn
@@ -19,8 +19,8 @@ public class URLTokenFilterFactory extends AbstractTokenFilterFactory {
     private final boolean allowMalformed;
 
     @Inject
-    public URLTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
-        super(index, indexSettings, name, settings);
+    public URLTokenFilterFactory(Index index, IndexSettingsService indexSettings, @Assisted String name, @Assisted Settings settings) {
+        super(index, indexSettings.indexSettings(), name, settings);
 
         this.part = URLPart.fromString(settings.get("part", "whole"));
         this.urlDecode = settings.getAsBoolean("url_decode", false);
diff --git a/src/main/java/org/elasticsearch/index/analysis/URLTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/URLTokenizerFactory.java
index 6ac0dd7..109688a 100644
--- a/src/main/java/org/elasticsearch/index/analysis/URLTokenizerFactory.java
+++ b/src/main/java/org/elasticsearch/index/analysis/URLTokenizerFactory.java
@@ -7,7 +7,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.url.URLTokenizer;
-import org.elasticsearch.index.settings.IndexSettings;
+import org.elasticsearch.index.settings.IndexSettingsService;
 
 /**
  * Joe Linn
@@ -24,8 +24,8 @@ public class URLTokenizerFactory extends AbstractTokenizerFactory {
 
 
     @Inject
-    public URLTokenizerFactory(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
-        super(index, indexSettings, name, settings);
+    public URLTokenizerFactory(Index index, IndexSettingsService indexSettings, @Assisted String name, @Assisted Settings settings) {
+        super(index, indexSettings.indexSettings(), name, settings);
 
         String partString = settings.get("part");
         if (!Strings.isNullOrEmpty(partString)) {
diff --git a/src/test/java/org/elasticsearch/index/analysis/url/URLAnalysisTestCase.java b/src/test/java/org/elasticsearch/index/analysis/url/URLAnalysisTestCase.java
index b93dba9..48646a6 100644
--- a/src/test/java/org/elasticsearch/index/analysis/url/URLAnalysisTestCase.java
+++ b/src/test/java/org/elasticsearch/index/analysis/url/URLAnalysisTestCase.java
@@ -1,12 +1,13 @@
 package org.elasticsearch.index.analysis.url;
 
 import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugin.analysis.AnalysisURLPlugin;
+import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.StreamsUtils;
 import org.junit.Before;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -18,11 +19,8 @@ public abstract class URLAnalysisTestCase extends ESIntegTestCase {
 
 
     @Override
-    protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.builder()
-                .put(super.nodeSettings(nodeOrdinal))
-                .put("plugin.types", AnalysisURLPlugin.class.getName())
-                .build();
+    protected Collection<Class<? extends Plugin>> nodePlugins() {
+        return pluginList(AnalysisURLPlugin.class);
     }
 
     /**