Author: iocanel
Date: Thu Sep 27 10:21:23 2012
New Revision: 1390929
URL: http://svn.apache.org/viewvc?rev=1390929&view=rev
Log:
[CAMEL-5652] Refactored camel-hbase unit tests to use person as the target
domain.
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/consumer.xml
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/producer.xml
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
Thu Sep 27 10:21:23 2012
@@ -40,7 +40,7 @@ public class CamelHBaseFilterTest extend
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE), families);
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE), families);
} catch (TableExistsException ex) {
//Ignore if table exists
}
@@ -52,7 +52,7 @@ public class CamelHBaseFilterTest extend
@After
public void tearDown() throws Exception {
if (systemReady) {
- hbaseUtil.deleteTable(DEFAULTTABLE.getBytes());
+ hbaseUtil.deleteTable(PERSON_TABLE.getBytes());
super.tearDown();
}
}
@@ -74,11 +74,11 @@ public class CamelHBaseFilterTest extend
Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(),
family[0]);
-
exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0]);
- exchange.getIn().setHeader(HbaseAttribute.HBASE_VALUE.asHeader(),
body[0]);
+
exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0][0]);
+ exchange.getIn().setHeader(HbaseAttribute.HBASE_VALUE.asHeader(),
body[0][0][0]);
Exchange resp = template.send(endpoint, exchange);
Message out = resp.getOut();
- assertTrue(out.getHeaders().containsValue(body[0]) &&
!out.getHeaders().containsValue(body[1]) &&
!out.getHeaders().containsValue(body[2]));
+ assertTrue(out.getHeaders().containsValue(body[0][0][0]) &&
!out.getHeaders().containsValue(body[1][0][0]) &&
!out.getHeaders().containsValue(body[2][0][0]));
}
}
@@ -93,9 +93,9 @@ public class CamelHBaseFilterTest extend
@Override
public void configure() {
from("direct:start")
- .to("hbase://" + DEFAULTTABLE);
+ .to("hbase://" + PERSON_TABLE);
from("direct:scan")
- .to("hbase://" + DEFAULTTABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2&filters=#myFilters");
+ .to("hbase://" + PERSON_TABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2&filters=#myFilters");
}
};
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
Thu Sep 27 10:21:23 2012
@@ -35,14 +35,27 @@ public abstract class CamelHBaseTestSupp
protected static HBaseTestingUtility hbaseUtil = new HBaseTestingUtility();
protected static int numServers = 1;
- protected static final String DEFAULTTABLE = "DEFAULTTABLE";
- protected static final String DEFAULTFAMILY = "DEFAULTFAMILY";
+ protected static final String PERSON_TABLE = "person";
+ protected static final String INFO_FAMILY = "info";
protected String[] key = {"1", "2", "3"};
- protected final String[] body = {"Hello Hbase", "Hi HBase", "Yo HBase"};
- protected final String[] family = {"family1", "family2", "family3"};
- protected final String[] column = {"mycolumn1", "mycolumn2", "mycolumn3"};
- protected final byte[][] families = {DEFAULTFAMILY.getBytes(),
+ protected final String[] family = {"info", "birthdate", "address"};
+ //comlumn[family][column]
+ protected final String[][] column = {
+ {"firstName", "middleName", "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"}}
+ };
+
+
+ protected final byte[][] families = {
family[0].getBytes(),
family[1].getBytes(),
family[2].getBytes()};
@@ -75,10 +88,10 @@ public abstract class CamelHBaseTestSupp
protected void putMultipleRows() throws IOException {
Configuration configuration =
hbaseUtil.getHBaseAdmin().getConfiguration();
- HTable table = new HTable(configuration, DEFAULTTABLE.getBytes());
+ HTable table = new HTable(configuration, PERSON_TABLE.getBytes());
for (int r = 0; r < key.length; r++) {
Put put = new Put(key[r].getBytes());
- put.add(family[0].getBytes(), column[0].getBytes(),
body[r].getBytes());
+ put.add(family[0].getBytes(), column[0][0].getBytes(),
body[r][0][0].getBytes());
table.put(put);
}
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
Thu Sep 27 10:21:23 2012
@@ -32,7 +32,7 @@ public class HBaseConsumerTest extends C
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE), families);
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE), families);
} catch (TableExistsException ex) {
//Ignore if table exists
}
@@ -54,20 +54,13 @@ public class HBaseConsumerTest extends C
if (systemReady) {
ProducerTemplate template = context.createProducerTemplate();
Map<String, Object> headers = new HashMap<String, Object>();
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(), body[0]);
-
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(2), key[1]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(2), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(2), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(2), body[1]);
-
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(3), key[2]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(3), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(3), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(3), body[2]);
+
+ 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]);
+ headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(row + 1),
column[0][0]);
+ headers.put(HbaseAttribute.HBASE_VALUE.asHeader(row + 1),
body[row][0][0]);
+ }
headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
@@ -90,9 +83,9 @@ public class HBaseConsumerTest extends C
@Override
public void configure() {
from("direct:start")
- .to("hbase://" + DEFAULTTABLE);
+ .to("hbase://" + PERSON_TABLE);
- from("hbase://" + DEFAULTTABLE)
+ from("hbase://" + PERSON_TABLE)
.to("mock:result");
}
};
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
Thu Sep 27 10:21:23 2012
@@ -35,13 +35,13 @@ public class HBaseConvertionsTest extend
protected Object[] key = {1, "2", "3"};
protected final Object[] body = {1L, false, "3"};
protected final String[] column = {"DEFAULTCOLUMN"};
- protected final byte[][] families = {DEFAULTFAMILY.getBytes()};
+ protected final byte[][] families = {INFO_FAMILY.getBytes()};
@Before
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE), families);
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE), families);
} catch (TableExistsException ex) {
//Ignore if table exists
}
@@ -53,7 +53,7 @@ public class HBaseConvertionsTest extend
@After
public void tearDown() throws Exception {
if (systemReady) {
- hbaseUtil.deleteTable(DEFAULTTABLE.getBytes());
+ hbaseUtil.deleteTable(PERSON_TABLE.getBytes());
super.tearDown();
}
}
@@ -64,17 +64,17 @@ public class HBaseConvertionsTest extend
ProducerTemplate template = context.createProducerTemplate();
Map<String, Object> headers = new HashMap<String, Object>();
headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(), DEFAULTFAMILY);
+ headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(), INFO_FAMILY);
headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0]);
headers.put(HbaseAttribute.HBASE_VALUE.asHeader(), body[0]);
headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(2), key[1]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(2),
DEFAULTFAMILY);
+ headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(2), INFO_FAMILY);
headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(2), column[0]);
headers.put(HbaseAttribute.HBASE_VALUE.asHeader(2), body[1]);
headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(3), key[2]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(3),
DEFAULTFAMILY);
+ headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(3), INFO_FAMILY);
headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(3), column[0]);
headers.put(HbaseAttribute.HBASE_VALUE.asHeader(3), body[2]);
@@ -83,25 +83,25 @@ public class HBaseConvertionsTest extend
template.sendBodyAndHeaders("direct:start", null, headers);
Configuration configuration =
hbaseUtil.getHBaseAdmin().getConfiguration();
- HTable bar = new HTable(configuration, DEFAULTTABLE.getBytes());
+ HTable bar = new HTable(configuration, PERSON_TABLE.getBytes());
Get get = new Get(Bytes.toBytes((Integer) key[0]));
//Check row 1
- get.addColumn(DEFAULTFAMILY.getBytes(), column[0].getBytes());
+ get.addColumn(INFO_FAMILY.getBytes(), column[0].getBytes());
Result result = bar.get(get);
byte[] resultValue = result.value();
assertArrayEquals(Bytes.toBytes((Long) body[0]), resultValue);
//Check row 2
get = new Get(Bytes.toBytes((String) key[1]));
- get.addColumn(DEFAULTFAMILY.getBytes(), column[0].getBytes());
+ get.addColumn(INFO_FAMILY.getBytes(), column[0].getBytes());
result = bar.get(get);
resultValue = result.value();
assertArrayEquals(Bytes.toBytes((Boolean) body[1]), resultValue);
//Check row 3
get = new Get(Bytes.toBytes((String) key[2]));
- get.addColumn(DEFAULTFAMILY.getBytes(), column[0].getBytes());
+ get.addColumn(INFO_FAMILY.getBytes(), column[0].getBytes());
result = bar.get(get);
resultValue = result.value();
assertArrayEquals(Bytes.toBytes((String) body[2]), resultValue);
@@ -119,10 +119,10 @@ public class HBaseConvertionsTest extend
@Override
public void configure() {
from("direct:start")
- .to("hbase://" + DEFAULTTABLE);
+ .to("hbase://" + PERSON_TABLE);
from("direct:scan")
- .to("hbase://" + DEFAULTTABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2&family=family1&qualifier=column1");
+ .to("hbase://" + PERSON_TABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2&family=family1&qualifier=column1");
}
};
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
Thu Sep 27 10:21:23 2012
@@ -40,7 +40,7 @@ public class HBaseProducerTest extends C
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE), families);
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE), families);
} catch (TableExistsException ex) {
//Ignore if table exists
}
@@ -52,7 +52,7 @@ public class HBaseProducerTest extends C
@After
public void tearDown() throws Exception {
if (systemReady) {
- hbaseUtil.deleteTable(DEFAULTTABLE.getBytes());
+ hbaseUtil.deleteTable(PERSON_TABLE.getBytes());
super.tearDown();
}
}
@@ -64,19 +64,19 @@ public class HBaseProducerTest extends C
Map<String, Object> headers = new HashMap<String, Object>();
headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(), body[0]);
+ headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0][0]);
+ headers.put(HbaseAttribute.HBASE_VALUE.asHeader(), body[0][0][0]);
headers.put(HBaseConstants.OPERATION, HBaseConstants.PUT);
template.sendBodyAndHeaders("direct:start", null, headers);
Configuration configuration =
hbaseUtil.getHBaseAdmin().getConfiguration();
- HTable table = new HTable(configuration, DEFAULTTABLE.getBytes());
+ HTable table = new HTable(configuration, PERSON_TABLE.getBytes());
Get get = new Get(key[0].getBytes());
- get.addColumn(family[0].getBytes(), column[0].getBytes());
+ get.addColumn(family[0].getBytes(), column[0][0].getBytes());
Result result = table.get(get);
byte[] resultValue = result.value();
- assertArrayEquals(body[0].getBytes(), resultValue);
+ assertArrayEquals(body[0][0][0].getBytes(), resultValue);
}
}
@@ -90,10 +90,44 @@ public class HBaseProducerTest extends C
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]);
+
exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0][0]);
exchange.getIn().setHeader(HBaseConstants.OPERATION,
HBaseConstants.GET);
Exchange resp = template.send(endpoint, exchange);
- assertEquals(body[0],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
+ assertEquals(body[0][0][0],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
+ }
+ }
+
+ @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);
+
+ 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]);
+ }
+ }
+ }
+ 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(HbaseAttribute.HBASE_FAMILY.asHeader(),
family[0]);
+
getExchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0][0]);
+ getExchange.getIn().setHeader(HBaseConstants.OPERATION,
HBaseConstants.GET);
+ Exchange resp = template.send(startWithModelEndpoint, getExchange);
+
+ 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)));
}
}
@@ -103,48 +137,28 @@ public class HBaseProducerTest extends C
if (systemReady) {
ProducerTemplate template = context.createProducerTemplate();
Map<String, Object> headers = new HashMap<String, Object>();
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(), body[0]);
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(2), key[1]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(2), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(2), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(2), body[1]);
-
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(3), key[2]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(3), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(3), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(3), body[2]);
+ 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]);
+ headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(row + 1),
column[0][0]);
+ 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();
- HTable bar = new HTable(configuration, DEFAULTTABLE.getBytes());
- Get get = new Get(key[0].getBytes());
+ HTable bar = new HTable(configuration, PERSON_TABLE.getBytes());
//Check row 1
- get.addColumn(family[0].getBytes(), column[0].getBytes());
- Result result = bar.get(get);
- byte[] resultValue = result.value();
- assertArrayEquals(body[0].getBytes(), resultValue);
-
- //Check row 2
- get = new Get(key[1].getBytes());
- get.addColumn(family[0].getBytes(), column[0].getBytes());
- result = bar.get(get);
- resultValue = result.value();
- assertArrayEquals(body[1].getBytes(), resultValue);
-
- //Check row 3
- get = new Get(key[2].getBytes());
- get.addColumn(family[0].getBytes(), column[0].getBytes());
- result = bar.get(get);
- resultValue = result.value();
- assertArrayEquals(body[2].getBytes(), resultValue);
+ for (int row = 0; row < key.length; row++) {
+ Get get = new Get(key[row].getBytes());
+ get.addColumn(family[0].getBytes(), column[0][0].getBytes());
+ Result result = bar.get(get);
+ byte[] resultValue = result.value();
+ assertArrayEquals(body[row][0][0].getBytes(), resultValue);
+ }
}
}
@@ -155,18 +169,16 @@ public class HBaseProducerTest extends C
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]);
-
-
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]);
-
+ 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);
- assertEquals(body[0],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
- assertEquals(body[1],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2)));
+ for (int row = 0; row < key.length; row++) {
+ assertEquals(body[row][0][0],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(row + 1)));
+ }
}
}
@@ -176,36 +188,27 @@ public class HBaseProducerTest extends C
if (systemReady) {
ProducerTemplate template = context.createProducerTemplate();
Map<String, Object> headers = new HashMap<String, Object>();
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(), family[0]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(), column[0]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(), body[0]);
- headers.put(HbaseAttribute.HBASE_ROW_ID.asHeader(2), key[0]);
- headers.put(HbaseAttribute.HBASE_FAMILY.asHeader(2), family[1]);
- headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(2), column[1]);
- headers.put(HbaseAttribute.HBASE_VALUE.asHeader(2), body[1]);
+ 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]);
+ headers.put(HbaseAttribute.HBASE_QUALIFIER.asHeader(col + 1),
column[0][col]);
+ 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();
- HTable bar = new HTable(configuration, DEFAULTTABLE.getBytes());
- Get get = new Get(key[0].getBytes());
+ HTable bar = new HTable(configuration, PERSON_TABLE.getBytes());
- //Check column 1
- get.addColumn(family[0].getBytes(), column[0].getBytes());
- Result result = bar.get(get);
- byte[] resultValue = result.value();
- assertArrayEquals(body[0].getBytes(), resultValue);
-
- //Check column 2
- get = new Get(key[0].getBytes());
- get.addColumn(family[1].getBytes(), column[1].getBytes());
- result = bar.get(get);
- resultValue = result.value();
- assertArrayEquals(body[1].getBytes(), resultValue);
+ for (int col = 0; col < column[0].length; col++) {
+ Get get = new Get(key[0].getBytes());
+ get.addColumn(family[0].getBytes(), column[0][col].getBytes());
+ Result result = bar.get(get);
+ byte[] resultValue = result.value();
+ assertArrayEquals(body[0][col][0].getBytes(), resultValue);
+ }
}
}
@@ -217,18 +220,17 @@ public class HBaseProducerTest extends C
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]);
-
-
exchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(2), key[0]);
-
exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(2), family[1]);
-
exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(2),
column[1]);
+ 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);
- assertEquals(body[0],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
- assertEquals(body[1],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2)));
+ for (int col = 0; col < column[0].length; col++) {
+ assertEquals(body[0][col][0],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(col + 1)));
+ }
}
}
@@ -248,15 +250,15 @@ public class HBaseProducerTest extends C
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]);
+
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]);
+
exchange2.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(2),
column[0][0]);
exchange2.getIn().setHeader(HBaseConstants.OPERATION,
HBaseConstants.GET);
Exchange resp = template.send(endpoint, exchange2);
assertEquals(null,
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader()));
- assertEquals(body[1],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2)));
+ assertEquals(body[1][0][0],
resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2)));
}
}
@@ -269,13 +271,13 @@ public class HBaseProducerTest extends C
Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(),
family[0]);
-
exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[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));
- List<?> bodies = Arrays.asList(body);
+ List<?> bodies = Arrays.asList(body[0][0][0], body[1][0][0],
body[2][0][0]);
assertTrue(bodies.contains(result1) && bodies.contains(result2) &&
bodies.contains(result3));
}
@@ -291,10 +293,13 @@ public class HBaseProducerTest extends C
@Override
public void configure() {
from("direct:start")
- .to("hbase://" + DEFAULTTABLE);
+ .to("hbase://" + PERSON_TABLE);
+
+ from("direct:start-with-model")
+ .to("hbase://" + PERSON_TABLE +
"?family=info&qualifier=firstName&family2=birthdate&qualifier2=year");
from("direct:scan")
- .to("hbase://" + DEFAULTTABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2");
+ .to("hbase://" + PERSON_TABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2");
}
};
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
Thu Sep 27 10:21:23 2012
@@ -32,7 +32,7 @@ public class HBaseSpringConsumerTest ext
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE), families);
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE), families);
} catch (TableExistsException ex) {
//Ignore if table exists
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
Thu Sep 27 10:21:23 2012
@@ -32,7 +32,7 @@ public class HBaseSpringProducerTest ext
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE), families);
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE), families);
} catch (TableExistsException ex) {
//Ignore if table exists
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
Thu Sep 27 10:21:23 2012
@@ -41,12 +41,12 @@ public class HBaseIdempotentRepositoryTe
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE),
HBaseHelper.getHBaseFieldAsBytes(DEFAULTFAMILY));
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE),
HBaseHelper.getHBaseFieldAsBytes(INFO_FAMILY));
} catch (TableExistsException ex) {
//Ignore if table exists
}
- this.repository = new
HBaseIdempotentRepository(hbaseUtil.getConfiguration(), DEFAULTTABLE,
DEFAULTFAMILY, "mycolumn");
- table = new HTable(hbaseUtil.getConfiguration(), DEFAULTTABLE);
+ this.repository = new
HBaseIdempotentRepository(hbaseUtil.getConfiguration(), PERSON_TABLE,
INFO_FAMILY, "mycolumn");
+ table = new HTable(hbaseUtil.getConfiguration(), PERSON_TABLE);
super.setUp();
}
}
@@ -54,7 +54,7 @@ public class HBaseIdempotentRepositoryTe
@After
public void tearDown() throws Exception {
if (systemReady) {
-
hbaseUtil.deleteTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE));
+
hbaseUtil.deleteTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE));
super.setUp();
}
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/consumer.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/consumer.xml?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/consumer.xml
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/consumer.xml
Thu Sep 27 10:21:23 2012
@@ -25,10 +25,10 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="direct:start"/>
- <to uri="hbase://DEFAULTTABLE"/>
+ <to uri="hbase://person"/>
</route>
<route>
- <from uri="hbase://DEFAULTTABLE"/>
+ <from uri="hbase://person"/>
<to uri="mock:result"/>
</route>
</camelContext>
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/producer.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/producer.xml?rev=1390929&r1=1390928&r2=1390929&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/producer.xml
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/producer.xml
Thu Sep 27 10:21:23 2012
@@ -25,11 +25,15 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="direct:start"/>
- <to uri="hbase://DEFAULTTABLE"/>
+ <to uri="hbase://person"/>
+ </route>
+ <route>
+ <from uri="direct:start-with-model"/>
+ <to
uri="hbase://person?family=info&qualifier=firstName&family2=birthdate&qualifier2=year"/>
</route>
<route>
<from uri="direct:scan"/>
- <to
uri="hbase://DEFAULTTABLE?operation=CamelHBaseScan&maxResults=2"/>
+ <to
uri="hbase://person?operation=CamelHBaseScan&maxResults=2"/>
</route>
</camelContext>
