update to ES 1.4

Author: jprante

README.md

@@ -8,19 +8,21 @@ indexes.
 
 | Elasticsearch  | Plugin       | Release date |
 | -------------- | ------------ | ------------ |
+| 1.4.0          | 1.4.0.0      | Nov 18, 2014 |
 | 1.3.2          | 1.3.0.0      | Aug 21, 2014 |
 | 1.2.1          | 1.2.1.0      | Jul  3, 2014 |
 
 ## Installation
 
-    ./bin/plugin -install index-termlist -url http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-index-termlist/1.3.0.0/elasticsearch-index-termlist-1.3.0.0-plugin.zip
+    ./bin/plugin -install index-termlist -url http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-index-termlist/1.4.0.0/elasticsearch-index-termlist-1.4.0.0-plugin.zip
 
 Do not forget to restart the node after installing.
 
 ## Checksum
 
 | File                                              | SHA1                                     |
 | ------------------------------------------------- | -----------------------------------------|
+| elasticsearch-index-termlist-1.4.0.0-plugin.zip   | 6595b09ecb8b31e4c0d7416d0cb4d3a6b3dac9ee |
 | elasticsearch-index-termlist-1.3.0.0-plugin.zip   | 07ea40e85584c9887337c14ec5cca098a31089b5 |
 | elasticsearch-index-termlist-1.2.1.0-plugin.zip   | c51a8d626b32a4a6cd2ac4335b5578f0e5cccaa6 |
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.xbib.elasticsearch.plugin</groupId>
     <artifactId>elasticsearch-index-termlist</artifactId>
-    <version>1.3.0.0</version>
+    <version>1.4.0.0</version>
 
     <packaging>jar</packaging>
 
@@ -49,7 +49,7 @@
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.compile.version>1.7</java.compile.version>
-        <elasticsearch.version>1.3.2</elasticsearch.version>
+        <elasticsearch.version>1.4.0</elasticsearch.version>
     </properties>
 
     <dependencies>
@@ -271,5 +271,30 @@
             </plugin>
         </plugins>
     </reporting>
+    <profiles>
+
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <os>
+                    <name>mac os x</name>
+                </os>
+                <jdk>[1.8,</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <javadocExecutable>/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/bin/javadoc</javadocExecutable>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
 
 </project>

src/main/java/org/xbib/elasticsearch/action/termlist/ShardTermlistRequest.java

@@ -3,11 +3,14 @@
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.index.shard.ShardId;
 
 import java.io.IOException;
 
 class ShardTermlistRequest extends BroadcastShardOperationRequest {
 
+    private String index;
+
     private String field;
 
     private String term;
@@ -23,8 +26,9 @@ class ShardTermlistRequest extends BroadcastShardOperationRequest {
     ShardTermlistRequest() {
     }
 
-    public ShardTermlistRequest(String index, int shardId, TermlistRequest request) {
-        super(index, shardId, request);
+    public ShardTermlistRequest(String index, ShardId shardId, TermlistRequest request) {
+        super(shardId, request);
+        this.index = index;
         this.field = request.getField();
         this.term = request.getTerm();
         this.from = request.getFrom();
@@ -33,6 +37,10 @@ public ShardTermlistRequest(String index, int shardId, TermlistRequest request)
         this.withTotalFreq = request.getWithTotalFreq();
     }
 
+    public String getIndex() {
+        return index;
+    }
+
     public void setField(String field) {
         this.field = field;
     }
@@ -84,6 +92,7 @@ public boolean getWithTotalFreq() {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
+        index = in.readString();
         field = in.readString();
         term = in.readString();
         from = in.readInt();
@@ -95,6 +104,7 @@ public void readFrom(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
+        out.writeString(index);
         out.writeString(field);
         out.writeString(term);
         out.writeInt(from);

src/main/java/org/xbib/elasticsearch/action/termlist/ShardTermlistResponse.java

@@ -3,23 +3,31 @@
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.index.shard.ShardId;
 import org.xbib.elasticsearch.common.termlist.CompactHashMap;
 
 import java.io.IOException;
 import java.util.Map;
 
 class ShardTermlistResponse extends BroadcastShardOperationResponse {
 
+    private String index;
+
     private Map<String, TermInfo> map;
 
     ShardTermlistResponse() {
     }
 
-    public ShardTermlistResponse(String index, int shardId, Map<String, TermInfo> map) {
-        super(index, shardId);
+    public ShardTermlistResponse(String index, ShardId shardId, Map<String, TermInfo> map) {
+        super(shardId);
+        this.index = index;
         this.map = map;
     }
 
+    public String getIndex() {
+        return index;
+    }
+
     public Map<String, TermInfo> getTermList() {
         return map;
     }

src/main/java/org/xbib/elasticsearch/action/termlist/TransportTermlistAction.java

@@ -17,6 +17,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
@@ -47,8 +48,9 @@ public class TransportTermlistAction
 
     @Inject
     public TransportTermlistAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
-                                   TransportService transportService, IndicesService indicesService) {
-        super(settings, TermlistAction.NAME, threadPool, clusterService, transportService);
+                                   TransportService transportService, IndicesService indicesService,
+                                   ActionFilters actionFilters) {
+        super(settings, TermlistAction.NAME, threadPool, clusterService, transportService, actionFilters);
         this.indicesService = indicesService;
     }
 
@@ -100,7 +102,7 @@ protected ShardTermlistRequest newShardRequest() {
 
     @Override
     protected ShardTermlistRequest newShardRequest(int numShards, ShardRouting shard, TermlistRequest request) {
-        return new ShardTermlistRequest(shard.index(), shard.id(), request);
+        return new ShardTermlistRequest(shard.getIndex(), shard.shardId(), request);
     }
 
     @Override
@@ -128,7 +130,7 @@ protected ClusterBlockException checkRequestBlock(ClusterState state, TermlistRe
 
     @Override
     protected ShardTermlistResponse shardOperation(ShardTermlistRequest request) throws ElasticsearchException {
-        InternalIndexShard indexShard = (InternalIndexShard) indicesService.indexServiceSafe(request.index()).shardSafe(request.shardId());
+        InternalIndexShard indexShard = (InternalIndexShard) indicesService.indexServiceSafe(request.getIndex()).shardSafe(request.shardId().id());
         Engine.Searcher searcher = indexShard.engine().acquireSearcher("termlist");
         try {
             Map<String, TermInfo> map = new CompactHashMap<String, TermInfo>();
@@ -169,7 +171,7 @@ protected ShardTermlistResponse shardOperation(ShardTermlistRequest request) thr
                     }
                 }
             }
-            return new ShardTermlistResponse(request.index(), request.shardId(), map);
+            return new ShardTermlistResponse(request.getIndex(), request.shardId(), map);
         } catch (IOException ex) {
             throw new ElasticsearchException(ex.getMessage(), ex);
         } finally {

src/main/java/org/xbib/elasticsearch/rest/action/termlist/RestTermlistAction.java

@@ -27,7 +27,7 @@ public class RestTermlistAction extends BaseRestHandler {
 
     @Inject
     public RestTermlistAction(Settings settings, Client client, RestController controller) {
-        super(settings, client);
+        super(settings, controller, client);
         controller.registerHandler(GET, "/_termlist", this);
         controller.registerHandler(GET, "/{index}/_termlist", this);
         controller.registerHandler(GET, "/{index}/{field}/_termlist", this);