You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/06/27 12:46:47 UTC
git commit: polished the code a bit more and added a unit test based
on a user forum reported issue
Repository: camel
Updated Branches:
refs/heads/master 30545df97 -> 5e97f9238
polished the code a bit more and added a unit test based on a user forum reported issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e97f923
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e97f923
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e97f923
Branch: refs/heads/master
Commit: 5e97f9238fc292cc6fde3d75d8b98d4b26b7e66d
Parents: 30545df
Author: cmueller <cm...@apache.org>
Authored: Fri Jun 27 12:46:10 2014 +0200
Committer: cmueller <cm...@apache.org>
Committed: Fri Jun 27 12:46:36 2014 +0200
----------------------------------------------------------------------
.../component/hbase/CamelHBaseTestSupport.java | 8 +-
.../component/hbase/HBaseProducerTest.java | 182 +++++++++++--------
2 files changed, 110 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5e97f923/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
index 26ff675..ac533f9 100644
--- a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
+++ b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
@@ -51,16 +51,16 @@ public abstract class CamelHBaseTestSupport extends CamelTestSupport {
protected final String[] family = {"info", "birthdate", "address"};
//comlumn[family][column]
protected final String[][] column = {
- {"firstName", "middleName", "lastName"},
+ {"id", "firstName", "lastName"},
{"day", "month", "year"},
{"street", "number", "zip"}
};
//body[row][family][column]
protected final String[][][] body = {
- {{"Ioannis", "D.", "Canellos"}, {"09", "03", "1980"}, {"Awesome Street", "23", "15344"}},
- {{"John", "", "Dow"}, {"01", "01", "1979"}, {"Unknown Street", "1", "1010"}},
- {{"Jane", "", "Dow"}, {"09", "01", "1979"}, {"Another Unknown Street", "14", "2020"}}
+ {{"1", "Ioannis", "Canellos"}, {"09", "03", "1980"}, {"Awesome Street", "23", "15344"}},
+ {{"2", "John", "Dow"}, {"01", "01", "1979"}, {"Unknown Street", "1", "1010"}},
+ {{"3", "Christian", "Mueller"}, {"09", "01", "1979"}, {"Another Unknown Street", "14", "2020"}}
};
protected final byte[][] families = {
http://git-wip-us.apache.org/repos/asf/camel/blob/5e97f923/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
index c66b993..bb5041e 100644
--- a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
+++ b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
@@ -21,10 +21,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.ProducerTemplate;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.IOHelper;
import org.apache.hadoop.conf.Configuration;
@@ -63,14 +61,15 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
public void testPutAndGet() throws Exception {
testPut();
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
- Endpoint endpoint = context.getEndpoint("direct:start");
- Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0][0]);
- exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
- Exchange resp = template.send(endpoint, exchange);
+ Exchange resp = template.request("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0][0]);
+ exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
+ }
+ });
+
assertEquals(body[0][0][0], resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
}
}
@@ -78,29 +77,28 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
@Test
public void testPutAndGetWithModel() throws Exception {
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
- Endpoint startEndpoint = context.getEndpoint("direct:start");
- Endpoint startWithModelEndpoint = context.getEndpoint("direct:start-with-model");
- Exchange putExchange = startEndpoint.createExchange(ExchangePattern.InOut);
-
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
int index = 1;
for (int row = 0; row < key.length; row++) {
for (int fam = 0; fam < family.length; fam++) {
for (int col = 0; col < column[fam].length; col++) {
- putExchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(index), key[row]);
- putExchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(index), family[fam]);
- putExchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(index), column[fam][col]);
- putExchange.getIn().setHeader(HbaseAttribute.HBASE_VALUE.asHeader(index++), body[row][fam][col]);
+ headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(index), key[row]);
+ headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(index), family[fam]);
+ headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(index), column[fam][col]);
+ headers.put(HbaseAttribute.HBASE_VALUE.asHeader(index++), body[row][fam][col]);
}
}
}
- putExchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.PUT);
- template.send(startEndpoint, putExchange);
- Exchange getExchange = startWithModelEndpoint.createExchange(ExchangePattern.InOut);
- getExchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- getExchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
- Exchange resp = template.send(startWithModelEndpoint, getExchange);
+ template.sendBodyAndHeaders("direct:start", null, headers);
+
+ Exchange resp = template.request("direct:start-with-model", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
+ exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
+ }
+ });
assertEquals(body[0][0][0], resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
assertEquals(body[0][1][2], resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2)));
@@ -110,9 +108,8 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
@Test
public void testPutMultiRows() throws Exception {
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
Map<String, Object> headers = new HashMap<String, Object>();
-
+ headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
for (int row = 0; row < key.length; row++) {
headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(row + 1), key[row]);
headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(row + 1), family[0]);
@@ -120,7 +117,6 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
headers.put(HbaseAttribute.HBASE_VALUE.asHeader(row + 1), body[row][0][0]);
}
- headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
template.sendBodyAndHeaders("direct:start", null, headers);
Configuration configuration = hbaseUtil.getHBaseAdmin().getConfiguration();
@@ -143,16 +139,17 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
public void testPutAndGetMultiRows() throws Exception {
testPutMultiRows();
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
- Endpoint endpoint = context.getEndpoint("direct:start");
- Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
- for (int row = 0; row < key.length; row++) {
- exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(row + 1), key[row]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(row + 1), family[0]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(row + 1), column[0][0]);
- }
- exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
- Exchange resp = template.send(endpoint, exchange);
+ Exchange resp = template.request("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
+ for (int row = 0; row < key.length; row++) {
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(row + 1), key[row]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(row + 1), family[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(row + 1), column[0][0]);
+ }
+ }
+ });
+
for (int row = 0; row < key.length; row++) {
assertEquals(body[row][0][0], resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(row + 1)));
}
@@ -162,9 +159,8 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
@Test
public void testPutMultiColumns() throws Exception {
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
Map<String, Object> headers = new HashMap<String, Object>();
-
+ headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
for (int col = 0; col < column[0].length; col++) {
headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(col + 1), key[0]);
headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(col + 1), family[0]);
@@ -172,7 +168,6 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
headers.put(HbaseAttribute.HBASE_VALUE.asHeader(col + 1), body[0][col][0]);
}
- headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
template.sendBodyAndHeaders("direct:start", null, headers);
Configuration configuration = hbaseUtil.getHBaseAdmin().getConfiguration();
@@ -194,17 +189,17 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
public void testPutAndGetMultiColumns() throws Exception {
testPutMultiColumns();
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
- Endpoint endpoint = context.getEndpoint("direct:start");
- Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
- for (int col = 0; col < column[0].length; col++) {
- exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(col + 1), key[0]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(col + 1), family[0]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(col + 1), column[0][col]);
- }
+ Exchange resp = template.request("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
+ for (int col = 0; col < column[0].length; col++) {
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(col + 1), key[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(col + 1), family[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(col + 1), column[0][col]);
+ }
+ }
+ });
- exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
- Exchange resp = template.send(endpoint, exchange);
for (int col = 0; col < column[0].length; col++) {
assertEquals(body[0][col][0], resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(col + 1)));
}
@@ -215,24 +210,23 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
public void testPutAndGetAndDeleteMultiRows() throws Exception {
testPutMultiRows();
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
- Endpoint endpoint = context.getEndpoint("direct:start");
-
- Exchange exchange1 = endpoint.createExchange(ExchangePattern.InOnly);
- exchange1.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- exchange1.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.DELETE);
- template.send(endpoint, exchange1);
-
- Exchange exchange2 = endpoint.createExchange(ExchangePattern.InOut);
- exchange2.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- exchange2.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
- exchange2.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0][0]);
-
- exchange2.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(2), key[1]);
- exchange2.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(2), family[0]);
- exchange2.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(2), column[0][0]);
- exchange2.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
- Exchange resp = template.send(endpoint, exchange2);
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put(HBaseConstants.OPERATION, HBaseConstants.DELETE);
+ headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
+ template.sendBodyAndHeaders("direct:start", null, headers);
+
+ Exchange resp = template.request("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HBaseConstants.OPERATION, HBaseConstants.GET);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0][0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(2), key[1]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(2), family[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(2), column[0][0]);
+ }
+ });
+
assertEquals(null, resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
assertEquals(body[1][0][0], resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2)));
}
@@ -242,13 +236,13 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
public void testPutMultiRowsAndScan() throws Exception {
testPutMultiRows();
if (systemReady) {
- ProducerTemplate template = context.createProducerTemplate();
- Endpoint endpoint = context.getEndpoint("direct:scan");
+ Exchange resp = template.request("direct:scan", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0][0]);
+ }
+ });
- Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0][0]);
- Exchange resp = template.send(endpoint, exchange);
Object result1 = resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(1));
Object result2 = resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2));
Object result3 = resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(3));
@@ -258,6 +252,42 @@ public class HBaseProducerTest extends CamelHBaseTestSupport {
}
}
+ @Test
+ public void testPutAndScan() throws Exception {
+ if (systemReady) {
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
+ headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(), "1");
+ headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(), "info");
+ headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(), "id");
+ headers.put(HbaseAttribute.HBASE_VALUE.asHeader(), "3");
+
+ template.sendBodyAndHeaders("direct:start", null, headers);
+
+ Configuration configuration = hbaseUtil.getHBaseAdmin().getConfiguration();
+ HTable bar = new HTable(configuration, PERSON_TABLE.getBytes());
+ Get get = new Get("1".getBytes());
+ get.addColumn("info".getBytes(), "id".getBytes());
+ Result result = bar.get(get);
+
+ assertArrayEquals("3".getBytes(), result.value());
+
+ IOHelper.close(bar);
+
+ Exchange resp = template.request("direct:scan", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), "info");
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), "id");
+ }
+ });
+
+ assertEquals("1", resp.getOut().getHeader(HbaseAttribute.HBASE_ROW_ID.asHeader()));
+ assertEquals("info", resp.getOut().getHeader(HbaseAttribute.HBASE_FAMILY.asHeader()));
+ assertEquals("id", resp.getOut().getHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader()));
+ assertEquals("3", resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
+ }
+ }
+
/**
* Factory method which derived classes can use to create a {@link org.apache.camel.builder.RouteBuilder}
* to define the routes for testing