update to Elasticsaerch 2.1.0

Author: jprante

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>org.xbib.elasticsearch.plugin</groupId>
     <artifactId>elasticsearch-knapsack</artifactId>
-    <version>2.0.1.0</version>
+    <version>2.1.0.0</version>
 
     <packaging>jar</packaging>
 
@@ -58,7 +58,7 @@
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.compiler.version>1.7</java.compiler.version>
-        <elasticsearch.version>2.0.1</elasticsearch.version>
+        <elasticsearch.version>2.1.0</elasticsearch.version>
     </properties>
 
     <dependencies>

src/main/java/org/xbib/elasticsearch/action/knapsack/state/KnapsackStateRequestBuilder.java

@@ -15,7 +15,6 @@
  */
 package org.xbib.elasticsearch.action.knapsack.state;
 
-import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.client.ElasticsearchClient;
 

src/main/java/org/xbib/elasticsearch/knapsack/KnapsackService.java

@@ -32,6 +32,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -144,6 +145,9 @@ public void removeExport(KnapsackState targetExport) throws IOException {
 
     private void add(String name, List<KnapsackState> values, KnapsackState targetValue) throws IOException {
         logger.debug("add: {} -> {}", name, values);
+        if (values == null) {
+            values = Collections.emptyList();
+        }
         put(name, generate(ImmutableList.<KnapsackState>builder()
                 .addAll(values)
                 .add(targetValue)

src/test/java/org/elasticsearch/node/MockNode.java

@@ -0,0 +1,16 @@
+
+package org.elasticsearch.node;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.plugins.Plugin;
+
+import java.util.Collection;
+
+public class MockNode extends Node {
+
+    public MockNode(Settings settings, Collection<Class<? extends Plugin>> classpathPlugins) {
+        super(settings, Version.CURRENT, classpathPlugins);
+    }
+
+}

src/test/java/org/xbib/elasticsearch/plugin/helper/AbstractNodeTestHelper.java

@@ -8,8 +8,8 @@
 import org.xbib.elasticsearch.action.knapsack.exp.KnapsackExportResponse;
 import org.xbib.elasticsearch.action.knapsack.state.KnapsackStateRequestBuilder;
 import org.xbib.elasticsearch.action.knapsack.state.KnapsackStateResponse;
-import org.xbib.elasticsearch.plugin.helper.AbstractNodeTestHelper;
 import org.xbib.elasticsearch.support.client.ClientHelper;
+import org.xbib.elasticsearch.util.NodeTestUtils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class KnapsackExportTests extends AbstractNodeTestHelper {
+public class KnapsackExportTests extends NodeTestUtils {
 
     private final static ESLogger logger = ESLoggerFactory.getLogger(KnapsackExportTests.class.getName());
 

src/test/java/org/xbib/elasticsearch/plugin/knapsack/KnapsackExportTests.java

@@ -12,7 +12,7 @@
 import org.xbib.elasticsearch.action.knapsack.imp.KnapsackImportResponse;
 import org.xbib.elasticsearch.action.knapsack.state.KnapsackStateRequestBuilder;
 import org.xbib.elasticsearch.action.knapsack.state.KnapsackStateResponse;
-import org.xbib.elasticsearch.plugin.helper.AbstractNodeTestHelper;
+import org.xbib.elasticsearch.util.NodeTestUtils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -25,7 +25,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class KnapsackImportTests extends AbstractNodeTestHelper {
+public class KnapsackImportTests extends NodeTestUtils {
 
     private final static ESLogger logger = ESLoggerFactory.getLogger(KnapsackImportTests.class.getName());
 

src/test/java/org/xbib/elasticsearch/plugin/knapsack/KnapsackImportTests.java

@@ -5,9 +5,9 @@
 import org.xbib.elasticsearch.action.knapsack.exp.KnapsackExportResponse;
 import org.xbib.elasticsearch.action.knapsack.imp.KnapsackImportRequestBuilder;
 import org.xbib.elasticsearch.action.knapsack.imp.KnapsackImportResponse;
-import org.xbib.elasticsearch.plugin.helper.AbstractNodeTestHelper;
+import org.xbib.elasticsearch.util.NodeTestUtils;
 
-public class KnapsackNodeTest extends AbstractNodeTestHelper {
+public class KnapsackNodeTest extends NodeTestUtils {
 
     @Test
     public void testNodeExport() throws Exception {

src/test/java/org/xbib/elasticsearch/plugin/knapsack/KnapsackNodeTest.java

@@ -5,9 +5,9 @@
 import org.xbib.elasticsearch.action.knapsack.exp.KnapsackExportResponse;
 import org.xbib.elasticsearch.action.knapsack.imp.KnapsackImportRequestBuilder;
 import org.xbib.elasticsearch.action.knapsack.imp.KnapsackImportResponse;
-import org.xbib.elasticsearch.plugin.helper.AbstractNodeTestHelper;
+import org.xbib.elasticsearch.util.NodeTestUtils;
 
-public class KnapsackSimpleTests extends AbstractNodeTestHelper {
+public class KnapsackSimpleTests extends NodeTestUtils {
 
     @Test
     public void testSimpleEmptyExport() throws Exception {

src/test/java/org/xbib/elasticsearch/plugin/knapsack/KnapsackSimpleTests.java

@@ -13,7 +13,7 @@
 import org.xbib.elasticsearch.action.knapsack.imp.KnapsackImportResponse;
 import org.xbib.elasticsearch.action.knapsack.state.KnapsackStateRequestBuilder;
 import org.xbib.elasticsearch.action.knapsack.state.KnapsackStateResponse;
-import org.xbib.elasticsearch.plugin.helper.AbstractNodeTestHelper;
+import org.xbib.elasticsearch.util.NodeTestUtils;
 
 import java.io.File;
 import java.net.URI;
@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class KnapsackSplitTests extends AbstractNodeTestHelper {
+public class KnapsackSplitTests extends NodeTestUtils {
 
     private final static Logger logger = LogManager.getLogger(KnapsackSplitTests.class);