You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by io...@apache.org on 2012/09/27 12:22:02 UTC
svn commit: r1390930 - in
/camel/branches/camel-2.10.x/components/camel-hbase/src:
main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
Author: iocanel
Date: Thu Sep 27 10:22:02 2012
New Revision: 1390930
URL: http://svn.apache.org/viewvc?rev=1390930&view=rev
Log:
[CAMEL-5653] camel-hbase header mapping strategy will skip null family/qualifier pairs.
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
Modified: camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java?rev=1390930&r1=1390929&r2=1390930&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java (original)
+++ camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java Thu Sep 27 10:22:02 2012
@@ -64,12 +64,14 @@ public class HeaderMappingStrategy imple
hRow.setId(id);
hRow.setRowType(rowClass);
- hCell.setQualifier(columnName);
- hCell.setFamily(columnFamily);
- hCell.setValue(value);
- // String is the default value type
- hCell.setValueType((valueClass != null) ? valueClass : String.class);
- hRow.getCells().add(hCell);
+ if (columnFamily != null && columnName != null) {
+ hCell.setQualifier(columnName);
+ hCell.setFamily(columnFamily);
+ hCell.setValue(value);
+ // String is the default value type
+ hCell.setValueType((valueClass != null) ? valueClass : String.class);
+ hRow.getCells().add(hCell);
+ }
}
return hRow;
}
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=1390930&r1=1390929&r2=1390930&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:22:02 2012
@@ -121,8 +121,6 @@ public class HBaseProducerTest extends C
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);