Issue 2340

- add new java client version
- add update process for RiakObjects to TastOfRiak.java
- add update process for POJOs to TasteOfRiak.java

Author: Mike Dotson

Diff for: content/riak/kv/2.2.0/developing/getting-started/java.md

@@ -31,7 +31,7 @@ project's dependencies. Here is a Maven example:
   <dependency>
     <groupId>com.basho.riak</groupId>
     <artifactId>riak-client</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.1</version>
   </dependency
 </dependencies>
 ```

Diff for: content/riak/kv/2.2.0/developing/getting-started/java/crud-operations.md

@@ -30,7 +30,7 @@ StoreValue storeOp = new StoreValue.Builder(quoteObject)
         .build();
 ```
 
-In line 76 we use our `client` object to execute the storage operation:
+We then use our `client` object to execute the storage operation:
 
 ```java
 StoreValue.Response response = client.execute(storeOp);
@@ -53,6 +53,24 @@ If the values are equal, as they should be, the Java client will say
 `Success!  The object we created and the object we fetched have the same
 value`. If not, then the client will throw an exception.
 
+## Updating Objects
+
+Once we've read the object back in from Riak, we can update the object
+and store it back as we did before with the `StoreValue` object:
+
+```java
+fetchedObject.setValue(BinaryValue.create("You can be my wingman any time.\n"));
+StoreValue updateOp = new StoreValue.Builder(fetchedObject)
+        .withLocation(quoteObjectLocation)
+        .build();
+StoreValue.Response updateOpResp = client.execute(updateOp);
+```
+
+For more in depth information on updating objects and sibling resolution in
+Riak, see [Updating Objects](/riak/kv/2.2.0/developing/usage/updating-objects/)
+and [Conflict Resolution](/riak/kv/2.2.0/developing/usage/conflict-resolution/)
+documentation.
+
 ## Deleting Objects
 
 Now that we've stored and then fetched the object, we can delete it by
@@ -117,3 +135,48 @@ If we fetch the object (using the same method we showed up above and in
   "copiesOwned": 3
 }
 ```
+
+Since we really like Moby Dick, let's buy a couple more copies
+and update the POJO.
+
+To update the POJO, we would use `UpdateValue` by
+extending a new `BookUpdate` class as follows:
+
+```java
+public static class BookUpdate extends UpdateValue.Update<Book> {
+    private final Book update;
+    public BookUpdate(Book update){
+        this.update = update;
+    }
+
+    @Override
+    public Book apply(Book t) {
+        if(t == null) {
+            t = new Book();
+        }
+
+        t.author = update.author;
+        t.body = update.body;
+        t.copiesOwned = update.copiesOwned;
+        t.isbn = update.isbn;
+        t.title = update.title;
+
+        return t;
+    }
+}
+```
+
+Then using the `BookUpdate` class with our `mobyDick` object:
+
+```java
+mobyDick.copiesOwned = 5;
+UpdateBook updatedBook = new BookUpdate(mobyDick);
+
+UpdateValue updateValue = new UpdateValue.Builder(mobyDickLocation).withUpdate(updatedBook).build();
+UpdateValue.Response response = client.execute(updateValue);
+```
+
+For more in depth information on updating objects and sibling resolution in
+Riak, see [Updating Objects](/riak/kv/2.2.0/developing/usage/updating-objects/)
+and [Conflict Resolution](/riak/kv/2.2.0/developing/usage/conflict-resolution/)
+documention.

Diff for: extras/code-examples/TasteOfRiak.java

@@ -2,6 +2,7 @@
 import com.basho.riak.client.api.commands.kv.DeleteValue;
 import com.basho.riak.client.api.commands.kv.FetchValue;
 import com.basho.riak.client.api.commands.kv.StoreValue;
+import com.basho.riak.client.api.commands.kv.UpdateValue;
 import com.basho.riak.client.core.RiakCluster;
 import com.basho.riak.client.core.RiakNode;
 import com.basho.riak.client.core.query.Location;
@@ -21,6 +22,30 @@ public static class Book {
         public Integer copiesOwned;
     }
 
+    // This will allow us to update the book object handling the
+    // entire fetch/modify/update cycle.
+    public static class BookUpdate extends UpdateValue.Update<Book> {
+        private final Book update;
+        public BookUpdate(Book update){
+            this.update = update;
+        }
+
+        @Override
+        public Book apply(Book t) {
+            if(t == null) {
+                t = new Book();
+            }
+
+            t.author = update.author;
+            t.body = update.body;
+            t.copiesOwned = update.copiesOwned;
+            t.isbn = update.isbn;
+            t.title = update.title;
+
+            return t;
+        }
+    }
+
     // This will create a client object that we can use to interact with Riak
     private static RiakCluster setUpCluster() throws UnknownHostException {
         // This example will use only one node listening on localhost:10017
@@ -84,6 +109,14 @@ public static void main( String[] args ) {
             assert(fetchedObject.getValue().equals(quoteObject.getValue()));
             System.out.println("Success! The object we created and the object we fetched have the same value");
 
+            // Now update the fetched object
+            fetchedObject.setValue(BinaryValue.create("You can be my wingman any time."));
+            StoreValue updateOp = new StoreValue.Builder(fetchedObject)
+                    .withLocation(quoteObjectLocation)
+                    .build();
+            StoreValue.Response updateOpResp = client.execute(updateOp);
+            updateOpResp = client.execute(updateOp);
+
             // And we'll delete the object
             DeleteValue deleteOp = new DeleteValue.Builder(quoteObjectLocation)
                     .build();
@@ -119,6 +152,14 @@ public static void main( String[] args ) {
             assert(mobyDick.title.equals(fetchedBook.title));
             assert(mobyDick.author.equals(fetchedBook.author));
             // And so on...
+
+            // Now to update the book with additional copies
+            mobyDick.copiesOwned = 5;
+            BookUpdate updatedBook = new BookUpdate(mobyDick);
+            UpdateValue updateValue = new UpdateValue.Builder(mobyDickLocation)
+                    .withUpdate(updatedBook).build();
+            UpdateValue.Response response = client.execute(updateValue);
+
             System.out.println("Success! All of our tests check out");
 
             // Now that we're all finished, we should shut our cluster object down