diff --git a/build.gradle b/build.gradle index dd8e79b..05bf4a5 100644 --- a/build.gradle +++ b/build.gradle @@ -25,16 +25,16 @@ def defaultBlank(closure) { ext { deps = [ commons_io: 'commons-io:commons-io:2.4', - commons_lang3: 'org.apache.commons:commons-lang3:3.1', - elasticsearch: 'org.elasticsearch:elasticsearch:0.90.7', - guava: 'com.google.guava:guava:15.0', - httpclient: 'org.apache.httpcomponents:httpclient:4.3.1', - jackson_databind: 'com.fasterxml.jackson.core:jackson-databind:2.3.0', - jsr305: 'com.google.code.findbugs:jsr305:2.0.2', - junit: 'junit:junit:4.11', - reflections: 'org.reflections:reflections:0.9.8', - slf4j_api: 'org.slf4j:slf4j-api:1.7.5', - slf4j_simple: 'org.slf4j:slf4j-simple:1.7.5', + commons_lang3: 'org.apache.commons:commons-lang3:3.4', + elasticsearch: 'org.elasticsearch:elasticsearch:1.7.1', + guava: 'com.google.guava:guava:18.0', + httpclient: 'org.apache.httpcomponents:httpclient:4.5', + jackson_databind: 'com.fasterxml.jackson.core:jackson-databind:2.6.1', + jsr305: 'com.google.code.findbugs:jsr305:3.0.0', + junit: 'junit:junit:4.12', + reflections: 'org.reflections:reflections:0.9.10', + slf4j_api: 'org.slf4j:slf4j-api:1.7.12', + slf4j_simple: 'org.slf4j:slf4j-simple:1.7.12', ] } @@ -48,7 +48,7 @@ buildscript { } dependencies { - classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.5.0' + classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.10.0' } } allprojects { @@ -56,6 +56,7 @@ allprojects { license { header rootProject.file('src/license/HEADER') + exclude '**/*.json' } } @@ -72,8 +73,8 @@ subprojects { // Plugins apply plugin: 'java' - sourceCompatibility = 1.6 - targetCompatibility = 1.6 + sourceCompatibility = 1.7 + targetCompatibility = 1.7 apply plugin: 'maven' apply plugin: 'signing' @@ -172,11 +173,11 @@ subprojects { // Misc task wrapper(type: Wrapper) { - gradleVersion = '1.10' + gradleVersion = '2.6' } idea { project { - languageLevel = '1.6' + languageLevel = '1.7' } } diff --git a/jres-core/src/main/java/com/blacklocus/jres/model/search/Hit.java b/jres-core/src/main/java/com/blacklocus/jres/model/search/Hit.java index 10b3838..00056fb 100644 --- a/jres-core/src/main/java/com/blacklocus/jres/model/search/Hit.java +++ b/jres-core/src/main/java/com/blacklocus/jres/model/search/Hit.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; public class Hit { @@ -76,7 +76,7 @@ public T getSourceAsType(TypeReference typeReference) { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("index", index) .add("type", type) .add("id", id) diff --git a/jres-core/src/main/java/com/blacklocus/jres/request/bulk/JresBulk.java b/jres-core/src/main/java/com/blacklocus/jres/request/bulk/JresBulk.java index 4f6108c..3d9afb8 100644 --- a/jres-core/src/main/java/com/blacklocus/jres/request/bulk/JresBulk.java +++ b/jres-core/src/main/java/com/blacklocus/jres/request/bulk/JresBulk.java @@ -23,8 +23,6 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.io.ByteSource; -import com.google.common.io.ByteStreams; -import com.google.common.io.InputSupplier; import org.apache.http.client.methods.HttpPost; import javax.annotation.Nullable; @@ -63,7 +61,7 @@ public Object getPayload() { // Note that while _bulk requests are made up of JSON, the body as a whole isn't actually valid JSON. final InputStream input; try { - input = ByteStreams.join(Iterables.transform(actions, new PayloadFn())).getInput(); + input = ByteSource.concat(Iterables.transform(actions, new PayloadFn())).openStream(); } catch (IOException e) { throw new RuntimeException(e); } @@ -72,9 +70,9 @@ public Object getPayload() { private static final ByteSource NEW_LINE = ByteSource.wrap("\n".getBytes()); - private static class PayloadFn implements Function> { + private static class PayloadFn implements Function { @Override - public InputSupplier apply(JresBulkable action) { + public ByteSource apply(JresBulkable action) { try { ByteSource lines = ByteSource.concat( diff --git a/jres-core/src/main/java/com/blacklocus/jres/response/common/JresAcknowledgedReply.java b/jres-core/src/main/java/com/blacklocus/jres/response/common/JresAcknowledgedReply.java index 340617a..1ec5505 100644 --- a/jres-core/src/main/java/com/blacklocus/jres/response/common/JresAcknowledgedReply.java +++ b/jres-core/src/main/java/com/blacklocus/jres/response/common/JresAcknowledgedReply.java @@ -27,13 +27,8 @@ */ public class JresAcknowledgedReply extends JresJsonReply { - private Boolean ok; private Boolean acknowledged; - public Boolean getOk() { - return ok; - } - public Boolean getAcknowledged() { return acknowledged; } diff --git a/jres-test/src/test/java/com/blacklocus/jres/JresBulkRequestorTest.java b/jres-test/src/test/java/com/blacklocus/jres/JresBulkRequestorTest.java index c6cc9e2..ef0b945 100644 --- a/jres-test/src/test/java/com/blacklocus/jres/JresBulkRequestorTest.java +++ b/jres-test/src/test/java/com/blacklocus/jres/JresBulkRequestorTest.java @@ -20,7 +20,7 @@ import com.blacklocus.jres.request.index.JresUpdateDocument; import com.blacklocus.jres.request.search.JresSearch; import com.blacklocus.jres.response.search.JresSearchReply; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import org.apache.commons.lang3.RandomStringUtils; import org.junit.Assert; import org.junit.Test; @@ -117,7 +117,7 @@ static class Document { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id) .add("name", name) .add("the_number", the_number) diff --git a/jres-test/src/test/java/com/blacklocus/jres/request/alias/JresDeleteAliasTest.java b/jres-test/src/test/java/com/blacklocus/jres/request/alias/JresDeleteAliasTest.java index 09fae12..8e1f5dd 100644 --- a/jres-test/src/test/java/com/blacklocus/jres/request/alias/JresDeleteAliasTest.java +++ b/jres-test/src/test/java/com/blacklocus/jres/request/alias/JresDeleteAliasTest.java @@ -42,7 +42,7 @@ public void happy() { Assert.assertEquals(Arrays.asList(alias), retrieveAliasesResponse.getAliases(index)); JresAcknowledgedReply response = jres.quest(new JresDeleteAlias(index, alias)); - Assert.assertTrue(response.getOk() && response.getAcknowledged()); + Assert.assertTrue(response.getAcknowledged()); try { retrieveAliasesResponse = jres.quest(new JresRetrieveAliases(index, "*")); Assert.assertEquals(0, retrieveAliasesResponse.getAliases(index).size()); diff --git a/jres-test/src/test/java/com/blacklocus/jres/request/index/JresDeleteIndexTest.java b/jres-test/src/test/java/com/blacklocus/jres/request/index/JresDeleteIndexTest.java index a6162f8..2d6c474 100644 --- a/jres-test/src/test/java/com/blacklocus/jres/request/index/JresDeleteIndexTest.java +++ b/jres-test/src/test/java/com/blacklocus/jres/request/index/JresDeleteIndexTest.java @@ -30,7 +30,6 @@ public void testExisting() { Assert.assertTrue(jres.bool(new JresIndexExists(index)).verity()); JresAcknowledgedReply deleteReply = jres.quest(new JresDeleteIndex(index)); - Assert.assertTrue(deleteReply.getOk()); Assert.assertTrue(deleteReply.getAcknowledged()); } diff --git a/jres-test/src/test/java/com/blacklocus/jres/request/mapping/JresPutMappingTest.java b/jres-test/src/test/java/com/blacklocus/jres/request/mapping/JresPutMappingTest.java index 5366d73..c18ac04 100644 --- a/jres-test/src/test/java/com/blacklocus/jres/request/mapping/JresPutMappingTest.java +++ b/jres-test/src/test/java/com/blacklocus/jres/request/mapping/JresPutMappingTest.java @@ -74,7 +74,7 @@ public void happy() { jres.quest(new JresCreateIndex(index)); { JresAcknowledgedReply response = jres.quest(new JresPutMapping(index, type, "{\"test\":{}}")); - Assert.assertTrue(response.getOk() && response.getAcknowledged()); + Assert.assertTrue(response.getAcknowledged()); } { diff --git a/jres-test/src/test/java/com/blacklocus/jres/request/search/sort/JresFieldSortTest.java b/jres-test/src/test/java/com/blacklocus/jres/request/search/sort/JresFieldSortTest.java index cc76745..6ff3994 100644 --- a/jres-test/src/test/java/com/blacklocus/jres/request/search/sort/JresFieldSortTest.java +++ b/jres-test/src/test/java/com/blacklocus/jres/request/search/sort/JresFieldSortTest.java @@ -20,7 +20,7 @@ import com.blacklocus.jres.request.index.JresRefresh; import com.blacklocus.jres.request.search.JresSearch; import com.blacklocus.jres.request.search.JresSearchBody; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.junit.Assert; @@ -91,7 +91,7 @@ public int hashCode() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("the_answer", the_answer) .toString(); }