Merge DataPlatform Java Client

.gitattributes

@@ -6,3 +6,4 @@
 
 *.png binary
 *.jpg binary
+*.jar binary

.gitignore

@@ -3,7 +3,6 @@ lib
 classes
 target
 .settings
-*.jar
 .classpath
 .project
 .idea

.travis.yml

@@ -1,10 +1,3 @@
 language: java
-script: mvn -Pitest -DargLine="-Dcom.basho.riak.search=true -Dcom.basho.riak.2i=true" clean verify
-notifications:
-  # Email notifications are disabled to not annoy anybody.
-  # See http://about.travis-ci.org/docs/user/build-configuration/ to learn more
-  # about configuring notification recipients and more.
-  webhooks: http://basho-engbot.herokuapp.com/travis?key=a8f477c8cdaabc8118d2a650281ff4a71eff875f
-  email: false
-services:
-  - riak
+script:
+- "mvn deploy -DskipTests"

README.md

@@ -62,7 +62,7 @@ To build the Riak Java Client, you must have the correct version of the riak_pb
 
 ```
 git clone https://github.com/basho/riak_pb
-git checkout java-2.1.1.0
+git checkout 2.1.2.0
 mvn clean install
 ```
 

pom.xml

@@ -159,6 +159,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>release</id>
             <activation>

src/main/java/com/basho/riak/client/api/annotations/RiakIndex.java

@@ -71,7 +71,8 @@
  * @author Brian Roach <roach at basho dot com>
  * @since 1.0
 */
-@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakIndex {
+@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakIndex
+{
     /**
      * @return the index name
      */

src/main/java/com/basho/riak/client/api/annotations/RiakKey.java

@@ -53,6 +53,6 @@
  * @author Brian Roach <roach at basho dot com>
  * @since 1.0
  */
-@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakKey {
-
+@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakKey
+{
 }

src/main/java/com/basho/riak/client/api/annotations/RiakLinks.java

@@ -55,5 +55,6 @@
  * @author Brian Roach <roach at basho dot com>
  * @since 1.0
 */
-@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakLinks {
+@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakLinks
+{
 }

src/main/java/com/basho/riak/client/api/annotations/RiakTombstone.java

@@ -52,6 +52,6 @@
  * @since 2.0
  */
 
-@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakTombstone {
-
+@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakTombstone
+{
 }

src/main/java/com/basho/riak/client/api/annotations/RiakUsermeta.java

@@ -74,7 +74,8 @@
  * @author Brian Roach <roach at basho dot com>
  * @since 1.0
  */
-@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakUsermeta {
+@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakUsermeta
+{
     /**
      * Use a lower case key. The riak HTTP API *will* lower case key names.
      * @return the key for the user meta item

src/main/java/com/basho/riak/client/api/annotations/RiakVClock.java

@@ -53,6 +53,6 @@
  * @since 1.4
  */
 
-@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakVClock {
-
+@Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD}) public @interface RiakVClock
+{
 }

src/main/java/com/basho/riak/client/api/cap/BasicVClock.java

@@ -33,8 +33,10 @@ public class BasicVClock implements VClock
      * @param value the vector clock bytes. NOTE: copies the value
      * @throws IllegalArgumentException if <code>value</code> is null
      */
-    public BasicVClock(final byte[] value) {
-        if (value == null) {
+    public BasicVClock(final byte[] value)
+    {
+        if (value == null)
+        {
             throw new IllegalArgumentException("VClock value cannot be null");
         }
         this.value = Arrays.copyOf(value, value.length);
@@ -47,7 +49,8 @@ public BasicVClock(final byte[] value) {
      */
     public BasicVClock(String vclock)
     {
-        if (vclock == null) {
+        if (vclock == null)
+        {
             throw new IllegalArgumentException("VClock value cannot be null");
         }
         this.value = vclock.getBytes(Charset.forName("UTF-8"));

src/main/java/com/basho/riak/client/api/cap/Quorum.java

@@ -45,7 +45,8 @@
  * @since 2.0
  * @see <a href="http://docs.basho.com/riak/latest/dev/advanced/cap-controls/">CAP Controls</a>
  */
-public final class Quorum {
+public final class Quorum
+{
 
     public static final String ONE = "one";
     public static final String QUORUM = "quorum";
@@ -59,7 +60,8 @@ public final class Quorum {
      * 
      * @param i the quorum value
      */
-    public Quorum(int i) {
+    public Quorum(int i)
+    {
         if (i < -5 || i == -1)
         {
             throw new IllegalArgumentException("Illegal value for quorum: " + i);
@@ -108,7 +110,8 @@ public static Quorum defaultQuorum()
      * @return true if this Quorum represents a symbolic value, false if literal
      *         integer value
      */
-    public boolean isSymbolic() {
+    public boolean isSymbolic()
+    {
         switch(i)
         {
             case -2: // "one"
@@ -127,7 +130,8 @@ public boolean isSymbolic() {
      * 
      * @return the int value. Will be a negative number for symbolic values.
      */
-    public int getIntValue() {
+    public int getIntValue()
+    {
         return i;
     }
 
@@ -164,25 +168,31 @@ public String toString()
         return quorum;
     }
 
-    @Override public int hashCode() {
+    @Override public int hashCode()
+    {
         final int prime = 31;
         int result = 1;
         result = prime * result + i;
         return result;
     }
 
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
+    @Override public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
             return true;
         }
-        if (obj == null) {
+        if (obj == null)
+        {
             return false;
         }
-        if (!(obj instanceof Quorum)) {
+        if (!(obj instanceof Quorum))
+        {
             return false;
         }
         Quorum other = (Quorum) obj;
-        if (i != other.i) {
+        if (i != other.i)
+        {
             return false;
         }
 

src/main/java/com/basho/riak/client/api/cap/UnresolvedConflictException.java

@@ -25,7 +25,8 @@
  * @author Russell Brown <russelldb at basho dot com>
  * @since 1.0
  */
-public class UnresolvedConflictException extends ExecutionException {
+public class UnresolvedConflictException extends ExecutionException
+{
 
     /**
      * eclipse generated id
@@ -44,7 +45,8 @@ public class UnresolvedConflictException extends ExecutionException {
      * @param siblings
      *            the list of siblings
      */
-    public UnresolvedConflictException(Throwable cause, String message, List<? extends Object> siblings) {
+    public UnresolvedConflictException(Throwable cause, String message, List<? extends Object> siblings)
+    {
         super(message, cause);
         this.siblings = siblings;
     }
@@ -57,7 +59,8 @@ public UnresolvedConflictException(Throwable cause, String message, List<? exten
      * @param siblings
      *            the list of siblings
      */
-    public UnresolvedConflictException(String message, List<? extends Object> siblings) {
+    public UnresolvedConflictException(String message, List<? extends Object> siblings)
+    {
         super(message);
         this.siblings = siblings;
     }
@@ -66,7 +69,8 @@ public UnresolvedConflictException(String message, List<? extends Object> siblin
      * Get the siblings that could not be resolved.
      * @return the siblings
      */
-    public List<? extends Object> getSiblings() {
+    public List<? extends Object> getSiblings()
+    {
         return siblings;
     }
 }

src/main/java/com/basho/riak/client/api/commands/buckets/ListBuckets.java

@@ -108,7 +108,8 @@ private ListBucketsOperation buildCoreOperation()
      * </pre>
      * </p>
      */
-    public static class Response implements Iterable<Namespace> {
+    public static class Response implements Iterable<Namespace>
+    {
 
         private final BinaryValue type;
         private final List<BinaryValue> buckets;

src/main/java/com/basho/riak/client/api/commands/buckets/ResetBucketProperties.java

@@ -26,7 +26,8 @@ public class ResetBucketProperties extends RiakCommand<Void, Namespace>
 
     private final Namespace namespace;
 
-    public ResetBucketProperties(Builder builder) {
+    public ResetBucketProperties(Builder builder)
+    {
         this.namespace = builder.namespace;
     }
 
@@ -55,14 +56,16 @@ protected Namespace convertQueryInfo(Namespace coreQueryInfo)
         return future;
     }
 
-    private ResetBucketPropsOperation buildCoreOperation() {
+    private ResetBucketPropsOperation buildCoreOperation()
+    {
         ResetBucketPropsOperation.Builder builder =
                 new ResetBucketPropsOperation.Builder(namespace);
 
         return builder.build();
     }
 
-    public static class Builder {
+    public static class Builder
+    {
 
         private final Namespace namespace;
 

src/main/java/com/basho/riak/client/api/commands/datatypes/FetchCounter.java

@@ -54,30 +54,30 @@ protected final RiakFuture<FetchCounter.Response, Location> executeAsync(RiakClu
             cluster.execute(buildCoreOperation());
 
         CoreFutureAdapter<FetchCounter.Response, Location, DtFetchOperation.Response, Location> future =
-            new CoreFutureAdapter<FetchCounter.Response, Location, DtFetchOperation.Response, Location>(coreFuture) {
-
-            @Override
-            protected FetchCounter.Response convertResponse(DtFetchOperation.Response coreResponse)
+            new CoreFutureAdapter<FetchCounter.Response, Location, DtFetchOperation.Response, Location>(coreFuture)
             {
-                RiakDatatype element = coreResponse.getCrdtElement();
-
-                Context context = null;
-                if (coreResponse.hasContext())
+                @Override
+                protected FetchCounter.Response convertResponse(DtFetchOperation.Response coreResponse)
                 {
-                    context = new Context(coreResponse.getContext());
-                }
-
-                RiakCounter datatype = extractDatatype(element);
+                    RiakDatatype element = coreResponse.getCrdtElement();
 
-                return new Response(datatype, context);
-            }
+                    Context context = null;
+                    if (coreResponse.hasContext())
+                    {
+                        context = new Context(coreResponse.getContext());
+                    }
 
-            @Override
-            protected Location convertQueryInfo(Location coreQueryInfo)
-            {
-                return coreQueryInfo;
-            }
-        };
+                    RiakCounter datatype = extractDatatype(element);
+
+                    return new Response(datatype, context);
+                }
+
+                @Override
+                protected Location convertQueryInfo(Location coreQueryInfo)
+                {
+                    return coreQueryInfo;
+                }
+            };
         coreFuture.addListener(future);
         return future;
     }

src/main/java/com/basho/riak/client/api/commands/datatypes/FetchDatatype.java

@@ -105,7 +105,8 @@ else if (entry.getKey() == Option.INCLUDE_CONTEXT)
      * @author Dave Rusek <drusek at basho dot com>
      * @since 2.0
      */
-    public static final class Option<T> extends RiakOption<T> {
+    public static final class Option<T> extends RiakOption<T>
+    {
 
         /**
          * Read Quorum.
@@ -146,7 +147,8 @@ public static final class Option<T> extends RiakOption<T> {
          */
         public static final Option<Boolean> INCLUDE_CONTEXT = new Option<Boolean>("INCLUDE_CONTEXT");
 
-        public Option(String name) {
+        public Option(String name)
+        {
             super(name);
         }
     }