Merge branch '2.3.0' into HEAD

Conflicts:
	README.md
	pom.xml

Author: jlinn

README.md

@@ -9,8 +9,8 @@ This plugin enables URL tokenization and token filtering by URL part.
 
 | Elasticsearch Version | Plugin Version |
 |-----------------------|----------------|
-| 2.3.1 | 2.3.1 |
-| 2.3.0 | 2.3.0 |
+| 2.3.1 | 2.3.1.1 |
+| 2.3.0 | 2.3.0.1 |
 | 2.2.2 | 2.2.3 |
 | 2.2.1 | 2.2.2 |
 | 2.2.0 | 2.2.1 |
@@ -24,7 +24,7 @@ This plugin enables URL tokenization and token filtering by URL part.
 
 ## Installation
 ```bash
-bin/plugin install https://github.com/jlinn/elasticsearch-analysis-url/releases/download/v2.3.1/elasticsearch-analysis-url-2.3.1.zip
+bin/plugin install https://github.com/jlinn/elasticsearch-analysis-url/releases/download/v2.3.1.1/elasticsearch-analysis-url-2.3.1.1.zip
 ```
 
 ## Usage

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-analysis-url</artifactId>
-    <version>2.3.1</version>
+    <version>2.3.1.1</version>
     <packaging>jar</packaging>
     <description>Elasticsearch URL token filter plugin</description>
 

src/main/java/org/elasticsearch/index/analysis/url/URLTokenFilter.java

@@ -130,6 +130,9 @@ private boolean advance() throws IOException {
                 }
                 throw e;
             }
+            if (tokens.isEmpty()) {
+                return false;
+            }
             iterator = tokens.iterator();
             return true;
         } else {

src/test/java/org/elasticsearch/index/analysis/url/URLTokenFilterTest.java

@@ -12,6 +12,7 @@
 
 public class URLTokenFilterTest extends BaseTokenStreamTestCase {
     public static final String TEST_HTTP_URL = "http://www.foo.bar.com:9200/index_name/type_name/_search.html?foo=bar&baz=bat#tag";
+    public static final String TEST_HTTP_URL2 = "http://www.foo.bar.com";
     public static final String TEST_HTTPS_URL = "https://www.foo.bar.com:9200/index_name/type_name/_search.html?foo=bar&baz=bat#tag";
 
     @Test
@@ -36,6 +37,7 @@ public void testFilterPort() throws IOException {
     @Test
     public void testFilterPath() throws IOException {
         assertTokenStreamContents(createFilter(TEST_HTTP_URL, URLPart.PATH).setTokenizePath(false), "/index_name/type_name/_search.html");
+        assertTokenStreamContents(createFilter(TEST_HTTP_URL2, URLPart.PATH).setTokenizePath(false), new String[]{});
     }
 
     @Test

src/test/java/org/elasticsearch/index/analysis/url/URLTokenizerTest.java

@@ -83,6 +83,14 @@ public void testTokenizePath() throws IOException {
     }
 
 
+    @Test
+    public void testTokenizeNoPath() throws Exception {
+        final String url = "http://www.foo.bar.com:9200";
+        URLTokenizer tokenizer = createTokenizer(url, URLPart.PATH);
+        assertTokenStreamContents(tokenizer, stringArray());
+    }
+
+
     @Test
     public void testTokenizeQuery() throws IOException {
         URLTokenizer tokenizer = createTokenizer(TEST_HTTP_URL, URLPart.QUERY);