[PATCH] unite RIAK_HOST and RIAK_URL. Hosts.java has server host name and url. this patch for riak-client-0.14.1

addComment.patch

From 59dcb10a3f800ee766388e8484484845bbb800ed Mon, 11 Apr 2011 17:36:52 +0900
From: taichi <ryushi@gmail.com>
Date: Mon, 11 Apr 2011 17:33:49 +0900
Subject: [PATCH] add comment.

diff --git a/src/test/java/com/basho/riak/client/Hosts.java b/src/test/java/com/basho/riak/client/Hosts.java
index 9904504..aed4a9e 100644
--- a/src/test/java/com/basho/riak/client/Hosts.java
+++ b/src/test/java/com/basho/riak/client/Hosts.java
@@ -1,3 +1,16 @@
+/*
+ * This file is provided to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.basho.riak.client;
 
 public class Hosts {
diff --git a/src/test/java/com/basho/riak/client/itest/ITestBasic.java b/src/test/java/com/basho/riak/client/itest/ITestBasic.java
index 6b0559d..6f32a88 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestBasic.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestBasic.java
@@ -31,7 +31,8 @@
 
 /**
  * Basic exercises such as store, fetch, and modify objects for the Riak client.
- * Assumes Riak is reachable at 127.0.0.1:8098/riak.
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_URL }.
+ * @see com.basho.riak.client.Hosts
  */
 public class ITestBasic {
 
diff --git a/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java b/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java
index 22df7de..5dc6066 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java
@@ -26,6 +26,10 @@
 import com.basho.riak.client.RiakClient;
 import com.basho.riak.client.RiakObject;
 
+/**
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_URL }.
+ * @see com.basho.riak.client.Hosts
+ */
 public class ITestDataLoad {
 
     final String BUCKET = "test_data_load";
diff --git a/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java b/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java
index 2abe0b6..fc73461 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java
@@ -38,7 +38,8 @@
 
 /**
  * Exercises map/reduce features of the Riak client.
- * Assumes Riak is reachable at 127.0.0.1:8098/riak.
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_URL }.
+ * @see com.basho.riak.client.Hosts
  */
 public class ITestMapReduce {
 
diff --git a/src/test/java/com/basho/riak/client/itest/ITestStreaming.java b/src/test/java/com/basho/riak/client/itest/ITestStreaming.java
index 73dc79b..a04f43f 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestStreaming.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestStreaming.java
@@ -34,6 +34,10 @@
 import com.basho.riak.client.util.ClientUtils;
 import com.basho.riak.client.util.Constants;
 
+/**
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_URL }.
+ * @see com.basho.riak.client.Hosts
+ */
 public class ITestStreaming {
 
     @Test public void stream_keys() {
diff --git a/src/test/java/com/basho/riak/client/itest/ITestWalk.java b/src/test/java/com/basho/riak/client/itest/ITestWalk.java
index 7308747..8ec9f5a 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestWalk.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestWalk.java
@@ -27,6 +27,10 @@
 import com.basho.riak.client.RiakObject;
 import com.basho.riak.client.response.WalkResponse;
 
+/**
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_URL }.
+ * @see com.basho.riak.client.Hosts
+ */
 public class ITestWalk {
     
     @Test
diff --git a/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java b/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java
index d84c624..86ea5ab 100644
--- a/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java
+++ b/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java
@@ -34,8 +34,9 @@
 import com.google.protobuf.ByteString;
 
 /**
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_HOST }.
+ * @see com.basho.riak.client.Hosts
  * @author russell
- *
  */
 public class ITestBasic {
 
diff --git a/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java b/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java
index 8bb66c4..cf34426 100644
--- a/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java
+++ b/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java
@@ -35,6 +35,10 @@
 import com.basho.riak.test.util.ExpectedValues;
 import com.google.protobuf.ByteString;
 
+/**
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_HOST }.
+ * @see com.basho.riak.client.Hosts
+ */
 public class ITestDataLoad {
 
     private static final String BUCKET = "__itest_java_pbc_dataload__";
diff --git a/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java b/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java
index 186aab5..7d7fde2 100644
--- a/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java
+++ b/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java
@@ -37,7 +37,8 @@
 
 /**
  * Exercises map/reduce features of the Riak client.
- * Assumes Riak is reachable at 127.0.0.1:8097.
+ * Assumes Riak is reachable at {code com.basho.riak.client.Hosts#RIAK_HOST }.
+ * @see com.basho.riak.client.Hosts
  */
 public class ITestMapReduce {
 

app.config

modify app.config

from 
{http, [ {"127.0.0.1", 8098 } ]},
to
{http, [ {"127.0.0.1", 8098 },{"192.168.0.2",8098} ]},


from
{pb_ip,    "127.0.0.1" },
to
{pb_ip,    "192.168.0.2" },


192.168.0.2 is your riak host.

uniteHostAndURL.patch

From fc9318090cb18366651469ef6bc76293425ddf8f Mon, 11 Apr 2011 17:11:11 +0900
From: taichi <ryushi@gmail.com>
Date: Mon, 11 Apr 2011 17:10:23 +0900
Subject: [PATCH] unite RIAK_HOST and RIAK_URL. Hosts.java has server host name and url.

diff --git a/src/test/java/com/basho/riak/client/Hosts.java b/src/test/java/com/basho/riak/client/Hosts.java
new file mode 100644
index 0000000..9904504
--- /dev/null
+++ b/src/test/java/com/basho/riak/client/Hosts.java
@@ -0,0 +1,9 @@
+package com.basho.riak.client;
+
+public class Hosts {
+
+	public static final String RIAK_HOST = "127.0.0.1";
+
+	public static final String RIAK_URL = "http://" + RIAK_HOST + ":8098/riak";
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/basho/riak/client/itest/ITestBasic.java b/src/test/java/com/basho/riak/client/itest/ITestBasic.java
index e01ad49..6b0559d 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestBasic.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestBasic.java
@@ -15,6 +15,7 @@
 
 import static com.basho.riak.client.itest.Utils.*;
 import static org.junit.Assert.*;
+import static com.basho.riak.client.Hosts.*;
 
 import java.util.UUID;
 
@@ -33,8 +34,6 @@
  * Assumes Riak is reachable at 127.0.0.1:8098/riak.
  */
 public class ITestBasic {
-
-    public static String RIAK_URL = "http://127.0.0.1:8098/riak";
 
     @Test public void store_fetch_modify() {
         final RiakClient c = new RiakClient(RIAK_URL);
diff --git a/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java b/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java
index 47fc906..22df7de 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestDataLoad.java
@@ -14,6 +14,7 @@
 package com.basho.riak.client.itest;
 
 import static org.junit.Assert.*;
+import static com.basho.riak.client.Hosts.*;
 
 import java.util.Random;
 import java.util.UUID;
@@ -27,7 +28,6 @@
 
 public class ITestDataLoad {
 
-    final String RIAK_URL = "http://127.0.0.1:8098/riak";
     final String BUCKET = "test_data_load";
     final int NUM_VALUES = 10;
     final int VALUE_LENGTH = 512;
diff --git a/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java b/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java
index fc51192..2abe0b6 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestMapReduce.java
@@ -15,6 +15,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static com.basho.riak.client.Hosts.*;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,7 +42,6 @@
  */
 public class ITestMapReduce {
 
-    public static String RIAK_URL = "http://127.0.0.1:8098/riak";
     public static String BUCKET_NAME = "mr_test_java";
     public static int TEST_ITEMS = 200;
     
diff --git a/src/test/java/com/basho/riak/client/itest/ITestStreaming.java b/src/test/java/com/basho/riak/client/itest/ITestStreaming.java
index 828ddea..73dc79b 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestStreaming.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestStreaming.java
@@ -14,6 +14,7 @@
 package com.basho.riak.client.itest;
 
 import static com.basho.riak.client.itest.Utils.*;
+import static com.basho.riak.client.Hosts.*;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayOutputStream;
@@ -35,8 +36,6 @@
 
 public class ITestStreaming {
 
-    static String RIAK_URL = "http://127.0.0.1:8098/riak";
-    
     @Test public void stream_keys() {
         final RiakClient c = new RiakClient(RIAK_URL);
         final String BUCKET = "test_stream_keys";
diff --git a/src/test/java/com/basho/riak/client/itest/ITestWalk.java b/src/test/java/com/basho/riak/client/itest/ITestWalk.java
index 9080ed1..7308747 100644
--- a/src/test/java/com/basho/riak/client/itest/ITestWalk.java
+++ b/src/test/java/com/basho/riak/client/itest/ITestWalk.java
@@ -14,6 +14,7 @@
 package com.basho.riak.client.itest;
 
 import static com.basho.riak.client.itest.Utils.*;
+import static com.basho.riak.client.Hosts.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;
@@ -28,8 +29,6 @@
 
 public class ITestWalk {
     
-    public static String RIAK_URL = "http://127.0.0.1:8098/riak";
-
     @Test
     public void test_walk() {
         final RiakClient c = new RiakClient(RIAK_URL);
diff --git a/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java b/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java
index ba05f8c..d84c624 100644
--- a/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java
+++ b/src/test/java/com/basho/riak/pbc/itest/ITestBasic.java
@@ -14,6 +14,7 @@
 package com.basho.riak.pbc.itest;
 
 import static com.google.protobuf.ByteString.copyFromUtf8;
+import static com.basho.riak.client.Hosts.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -38,7 +39,6 @@
  */
 public class ITestBasic {
 
-    private static final String RIAK_HOST = "127.0.0.1";
     private static final String BUCKET = "__itest_java_pbc__";
 
     /*
diff --git a/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java b/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java
index c7c63b4..8bb66c4 100644
--- a/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java
+++ b/src/test/java/com/basho/riak/pbc/itest/ITestDataLoad.java
@@ -15,6 +15,7 @@
 
 import static com.google.protobuf.ByteString.copyFrom;
 import static com.google.protobuf.ByteString.copyFromUtf8;
+import static com.basho.riak.client.Hosts.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -36,7 +37,6 @@
 
 public class ITestDataLoad {
 
-    private static final String RIAK_HOST = "127.0.0.1";
     private static final String BUCKET = "__itest_java_pbc_dataload__";
     final int NUM_VALUES = 10;
     final int VALUE_LENGTH = 512;
diff --git a/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java b/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java
index db2d2d9..186aab5 100644
--- a/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java
+++ b/src/test/java/com/basho/riak/pbc/itest/ITestMapReduce.java
@@ -15,6 +15,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static com.basho.riak.client.Hosts.*;
 
 import java.io.IOException;
 
@@ -42,7 +43,6 @@
 
     private static final String KEY_PREFIX = "pbc_java_";
     private static final String TAG = "test";
-    public static String RIAK_HOST = "127.0.0.1";
     public static String BUCKET = "pbc_mr_test_java";
     public static int TEST_ITEMS = 200;