Minor cleanup and bump version to 2.0.0

johnulist · Oct 18, 2015 · 2bf7e5c · 2bf7e5c
1 parent 65b55e5
commit 2bf7e5c
Show file tree

Hide file tree

Showing 21 changed files with 14 additions and 66 deletions.
diff --git a/jest-common/pom.xml b/jest-common/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.searchbox</groupId>
     <artifactId>jest-common</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Jest Common Jar</name>
     <description>ElasticSearch Java REST client - shared library package</description>
     <url>https://github.com/searchbox-io/Jest</url>
@@ -47,7 +47,7 @@
     <parent>
         <groupId>io.searchbox</groupId>
         <artifactId>jest-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java b/jest-common/src/main/java/io/searchbox/cluster/UpdateSettings.java
@@ -52,7 +52,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        UpdateSettings rhs = (UpdateSettings) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/Count.java b/jest-common/src/main/java/io/searchbox/core/Count.java
@@ -58,7 +58,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        Count rhs = (Count) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java b/jest-common/src/main/java/io/searchbox/core/DeleteByQuery.java
@@ -6,8 +6,12 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
+ * Delete By Query API  is removed in Elasticsearch version 2.0.
+ * You need to install the plugin with the same name for this action to work.
+ *
  * @author Dogukan Sonmez
  * @author cihat keser
+ * @see <a href="https://www.elastic.co/blog/core-delete-by-query-is-a-plugin">Delete By Query is now a plugin</a>
  */
 public class DeleteByQuery extends GenericResultAbstractAction {
 
@@ -52,7 +56,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        DeleteByQuery rhs = (DeleteByQuery) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/Explain.java b/jest-common/src/main/java/io/searchbox/core/Explain.java
@@ -45,7 +45,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        Explain rhs = (Explain) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/Index.java b/jest-common/src/main/java/io/searchbox/core/Index.java
@@ -63,7 +63,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        Index rhs = (Index) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/MultiGet.java b/jest-common/src/main/java/io/searchbox/core/MultiGet.java
@@ -73,7 +73,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        MultiGet rhs = (MultiGet) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/Percolate.java b/jest-common/src/main/java/io/searchbox/core/Percolate.java
@@ -50,7 +50,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        Percolate rhs = (Percolate) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/SearchScroll.java b/jest-common/src/main/java/io/searchbox/core/SearchScroll.java
@@ -62,7 +62,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        SearchScroll rhs = (SearchScroll) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/Suggest.java b/jest-common/src/main/java/io/searchbox/core/Suggest.java
@@ -57,7 +57,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        Suggest rhs = (Suggest) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/core/Validate.java b/jest-common/src/main/java/io/searchbox/core/Validate.java
@@ -53,7 +53,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        Validate rhs = (Validate) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/indices/Analyze.java b/jest-common/src/main/java/io/searchbox/indices/Analyze.java
@@ -55,7 +55,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        Analyze rhs = (Analyze) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java b/jest-common/src/main/java/io/searchbox/indices/aliases/ModifyAliases.java
@@ -55,7 +55,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        ModifyAliases rhs = (ModifyAliases) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java b/jest-common/src/main/java/io/searchbox/indices/mapping/PutMapping.java
@@ -48,7 +48,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        PutMapping rhs = (PutMapping) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/indices/settings/UpdateSettings.java b/jest-common/src/main/java/io/searchbox/indices/settings/UpdateSettings.java
@@ -41,7 +41,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        UpdateSettings rhs = (UpdateSettings) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-common/src/main/java/io/searchbox/indices/template/PutTemplate.java b/jest-common/src/main/java/io/searchbox/indices/template/PutTemplate.java
@@ -40,7 +40,6 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        PutTemplate rhs = (PutTemplate) obj;
         return new EqualsBuilder()
                 .appendSuper(super.equals(obj))
                 .isEquals();

diff --git a/jest-droid/pom.xml b/jest-droid/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.searchbox</groupId>
     <artifactId>jest-droid</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Jest Android Jar</name>
     <description>ElasticSearch Java REST client - Android library package</description>
     <url>https://github.com/searchbox-io/Jest</url>
@@ -47,7 +47,7 @@
     <parent>
         <groupId>io.searchbox</groupId>
         <artifactId>jest-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/jest/pom.xml b/jest/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.searchbox</groupId>
     <artifactId>jest</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Jest Apache HC Jar</name>
     <description>ElasticSearch Java REST client - Apache HTTP Client package</description>
     <url>https://github.com/searchbox-io/Jest</url>
@@ -47,7 +47,7 @@
     <parent>
         <groupId>io.searchbox</groupId>
         <artifactId>jest-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/jest/src/test/java/io/searchbox/common/CommonIntegrationTest.java b/jest/src/test/java/io/searchbox/common/CommonIntegrationTest.java
diff --git a/jest/src/test/java/io/searchbox/core/DeleteIntegrationTest.java b/jest/src/test/java/io/searchbox/core/DeleteIntegrationTest.java
@@ -17,10 +17,8 @@
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 1)
 public class DeleteIntegrationTest extends AbstractIntegrationTest {
 
-    private final static Logger log = LoggerFactory.getLogger(DeleteIntegrationTest.class);
-
     @Test
-    public void deleteDocument() throws IOException {
+    public void deleteNonExistingDocument() throws IOException {
         DocumentResult result = client.execute(new Delete.Builder("1")
                 .index("twitter")
                 .type("tweet")

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.searchbox</groupId>
     <artifactId>jest-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Jest Parent POM</name>
     <description>Parent POM for Jest - ElasticSearch Java rest client</description>
     <url>https://github.com/searchbox-io/Jest</url>
@@ -72,7 +72,7 @@
 
         <lucene.version>5.2.1</lucene.version>
         <hamcrest.version>1.3</hamcrest.version>
-        <randomizedtesting.version>2.1.14</randomizedtesting.version>
+        <randomizedtesting.version>2.1.16</randomizedtesting.version>
         <groovy.version>2.4.4</groovy.version>
 
         <httpcore.version>4.4.1</httpcore.version>
@@ -246,7 +246,7 @@
             <dependency>
                 <groupId>io.searchbox</groupId>
                 <artifactId>jest-common</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Testing Dependencies -->