You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/08/15 16:59:19 UTC
svn commit: r1373442 - in /camel/trunk/components/camel-hbase: ./
src/main/java/org/apache/camel/component/hbase/
src/main/java/org/apache/camel/component/hbase/filters/
src/main/java/org/apache/camel/component/hbase/mapping/
src/main/java/org/apache/c...
Author: davsclaus
Date: Wed Aug 15 14:59:18 2012
New Revision: 1373442
URL: http://svn.apache.org/viewvc?rev=1373442&view=rev
Log:
CAMEL-5506: Fixed table name configuration for camel-hbase. Thanks to Claudio Corsi for the patch. I polished the javadoc of the component as well.
Modified:
camel/trunk/components/camel-hbase/pom.xml
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseContats.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseDeleteHandler.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseHelper.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseRemoveHandler.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HbaseAttribute.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareColumnMatchingFilter.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategy.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
camel/trunk/components/camel-hbase/src/test/resources/hbase-site.xml
Modified: camel/trunk/components/camel-hbase/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/pom.xml?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/pom.xml (original)
+++ camel/trunk/components/camel-hbase/pom.xml Wed Aug 15 14:59:18 2012
@@ -16,45 +16,25 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<artifactId>components</artifactId>
<groupId>org.apache.camel</groupId>
<version>2.11-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.camel</groupId>
<artifactId>camel-hbase</artifactId>
<packaging>bundle</packaging>
-
<name>Camel :: Hbase</name>
+ <description>Camel HBase component</description>
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.hbase.*</camel.osgi.export.pkg>
</properties>
- <build>
- <testResources>
- <testResource>
- <directory>${project.basedir}/src/test/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- This is required by the hbase testing utility -->
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -64,17 +44,15 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
+ <!-- This is required since using pre-0.92.x with 0.92.x or greater will cause an IllegalArgumentException Not a host:port pair: -->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+
<!-- testing -->
<dependency>
<groupId>junit</groupId>
@@ -116,4 +94,25 @@
</dependency>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- This is required by the hbase testing utility -->
+ <forkMode>always</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java Wed Aug 15 14:59:18 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.hbase;
-import java.net.URI;
import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.component.hbase.model.HBaseCell;
@@ -51,8 +50,7 @@ public class HBaseComponent extends Defa
}
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- URI endpointUri = new URI(uri);
- String tableName = endpointUri.getHost();
+ String tableName = remaining;
HBaseEndpoint endpoint = new HBaseEndpoint(uri, this, tablePool, tableName);
HBaseRow parameterRowModel = createRowModel(parameters);
@@ -63,12 +61,8 @@ public class HBaseComponent extends Defa
return endpoint;
}
-
/**
* Creates an {@link HBaseRow} model from the specified endpoint parameters.
- *
- * @param parameters
- * @return
*/
public HBaseRow createRowModel(Map<String, Object> parameters) {
HBaseRow rowModel = new HBaseRow();
@@ -90,13 +84,11 @@ public class HBaseComponent extends Defa
rowModel.setRowType(getCamelContext().getClassResolver().resolveClass(valueType));
}
}
-
rowModel.getCells().add(cellModel);
}
return rowModel;
}
-
public Configuration getConfiguration() {
return configuration;
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java Wed Aug 15 14:59:18 2012
@@ -51,7 +51,6 @@ public class HBaseConsumer extends Sched
private static final Logger LOG = LoggerFactory.getLogger(HBaseConsumer.class);
private String tableName;
-
private final HBaseEndpoint endpoint;
private HTablePool tablePool;
private HBaseRow rowModel;
@@ -64,12 +63,10 @@ public class HBaseConsumer extends Sched
this.rowModel = endpoint.getRowModel();
}
-
@Override
protected int poll() throws Exception {
- HTableInterface table = null;
+ HTableInterface table = tablePool.getTable(tableName);
try {
- table = tablePool.getTable(tableName);
shutdownRunningTask = null;
pendingExchanges = 0;
@@ -154,7 +151,6 @@ public class HBaseConsumer extends Sched
// update pending number of exchanges
pendingExchanges = total - index - 1;
-
LOG.trace("Processing exchange [{}]...", exchange);
getProcessor().process(exchange);
if (exchange.getException() != null) {
@@ -171,9 +167,7 @@ public class HBaseConsumer extends Sched
}
/**
- * Delegates to the {@link HBaseRemoveHandler }.
- *
- * @param row
+ * Delegates to the {@link HBaseRemoveHandler}.
*/
private void remove(byte[] row) throws IOException {
HTableInterface table = null;
@@ -181,11 +175,12 @@ public class HBaseConsumer extends Sched
table = tablePool.getTable(tableName);
endpoint.getRemoveHandler().remove(table, row);
} finally {
- table.close();
+ if (table != null) {
+ table.close();
+ }
}
}
-
public HBaseRow getRowModel() {
return rowModel;
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseContats.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseContats.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseContats.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseContats.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
public final class HBaseContats {
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseDeleteHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseDeleteHandler.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseDeleteHandler.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseDeleteHandler.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import java.io.IOException;
@@ -29,9 +28,6 @@ public class HBaseDeleteHandler implemen
/**
* Performs a {@link Delete} of the specified row.
- *
- * @param table
- * @param row
*/
@Override
public void remove(HTableInterface table, byte[] row) {
@@ -39,7 +35,7 @@ public class HBaseDeleteHandler implemen
try {
table.delete(delete);
} catch (IOException e) {
- LOG.warn("Failed to delete row from table", e);
+ LOG.warn("Failed to delete row from table. This exception will be ignored.", e);
}
}
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java Wed Aug 15 14:59:18 2012
@@ -34,32 +34,29 @@ import org.apache.hadoop.hbase.filter.Fi
public class HBaseEndpoint extends DefaultEndpoint {
private Configuration configuration;
- private String tableName;
+ private final String tableName;
+ private final HTablePool tablePool;
private HBaseAdmin admin;
- private HTablePool tablePool;
//Operation properties.
private int maxResults = 100;
private List<Filter> filters;
private String operation;
private boolean remove = true;
-
private String mappingStrategyName;
private String mappingStrategyClassName;
private CellMappingStrategyFactory cellMappingStrategyFactory = new CellMappingStrategyFactory();
private HBaseRemoveHandler removeHandler = new HBaseDeleteHandler();
private HBaseRow rowModel;
-
private int maxMessagesPerPoll;
-
- public HBaseEndpoint() {
- }
-
public HBaseEndpoint(String uri, HBaseComponent component, HTablePool tablePool, String tableName) {
super(uri, component);
this.tableName = tableName;
this.tablePool = tablePool;
+ if (this.tableName == null) {
+ throw new IllegalArgumentException("Table name can not be null");
+ }
}
public Producer createProducer() throws Exception {
@@ -72,7 +69,6 @@ public class HBaseEndpoint extends Defau
return consumer;
}
-
public boolean isSingleton() {
return true;
}
@@ -149,7 +145,6 @@ public class HBaseEndpoint extends Defau
this.rowModel = rowModel;
}
-
public boolean isRemove() {
return remove;
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseHelper.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseHelper.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseHelper.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import java.io.ByteArrayInputStream;
@@ -50,7 +49,6 @@ public final class HBaseHelper {
return name;
}
-
public static byte[] toBytes(Object obj) {
if (obj instanceof byte[]) {
return (byte[]) obj;
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseRemoveHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseRemoveHandler.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseRemoveHandler.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseRemoveHandler.java Wed Aug 15 14:59:18 2012
@@ -14,18 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import org.apache.hadoop.hbase.client.HTableInterface;
public interface HBaseRemoveHandler {
+
/**
* 'Removes' a row from the table.
* The removal is not necessarily physical remove.
* The implementation decides how a row can be considered as removed.
- * @param table
- * @param row
*/
void remove(HTableInterface table, byte[] row);
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HbaseAttribute.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HbaseAttribute.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HbaseAttribute.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HbaseAttribute.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
public enum HbaseAttribute {
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareColumnMatchingFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareColumnMatchingFilter.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareColumnMatchingFilter.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareColumnMatchingFilter.java Wed Aug 15 14:59:18 2012
@@ -36,13 +36,8 @@ public class ModelAwareColumnMatchingFil
public ModelAwareColumnMatchingFilter() {
}
-
-
/**
* Applies the message to {@link org.apache.hadoop.hbase.filter.Filter} to context.
- *
- * @param context
- * @param rowModel
*/
@Override
public void apply(CamelContext context, HBaseRow rowModel) {
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java Wed Aug 15 14:59:18 2012
@@ -24,8 +24,6 @@ public interface ModelAwareFilter<T exte
/**
* Applies the message to {@link Filter} to context.
- * @param context
- * @param rowModel
*/
void apply(CamelContext context, HBaseRow rowModel);
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java Wed Aug 15 14:59:18 2012
@@ -62,9 +62,6 @@ public class ModelAwareFilterList extend
/**
* Applies the message to {@link org.apache.hadoop.hbase.filter.Filter} to context.
- *
- * @param context
- * @param rowModel
*/
@Override
public void apply(CamelContext context, HBaseRow rowModel) {
@@ -77,8 +74,6 @@ public class ModelAwareFilterList extend
/**
* Wraps an existing {@link FilterList} filter into a {@link ModelAwareFilterList}.
- * @param filter
- * @return
*/
public ModelAwareFilterList wrap(FilterList filter) {
return new ModelAwareFilterList(filter.getOperator(), filter.getFilters());
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java Wed Aug 15 14:59:18 2012
@@ -23,7 +23,6 @@ import org.apache.hadoop.hbase.filter.Sk
public class ModelAwareSkipFilter extends SkipFilter implements ModelAwareFilter<SkipFilter> {
-
public ModelAwareSkipFilter() {
}
@@ -33,9 +32,6 @@ public class ModelAwareSkipFilter extend
/**
* Applies the message to {@link org.apache.hadoop.hbase.filter.Filter} to context.
- *
- * @param context
- * @param rowModel
*/
@Override
public void apply(CamelContext context, HBaseRow rowModel) {
@@ -44,12 +40,8 @@ public class ModelAwareSkipFilter extend
}
}
-
/**
* Wraps an existing {@link SkipFilter} filter into a {@link ModelAwareSkipFilter}.
- *
- * @param filter
- * @return
*/
public ModelAwareSkipFilter wrap(SkipFilter filter) {
return new ModelAwareSkipFilter(filter.getFilter());
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java Wed Aug 15 14:59:18 2012
@@ -32,9 +32,6 @@ public class ModelAwareWhileMatchFilter
/**
* Applies the message to {@link org.apache.hadoop.hbase.filter.Filter} to context.
- *
- * @param context
- * @param rowModel
*/
@Override
public void apply(CamelContext context, HBaseRow rowModel) {
@@ -45,9 +42,6 @@ public class ModelAwareWhileMatchFilter
/**
* Wraps an existing {@link WhileMatchFilter} filter into a {@link ModelAwareWhileMatchFilter}.
- *
- * @param filter
- * @return
*/
public ModelAwareWhileMatchFilter wrap(WhileMatchFilter filter) {
return new ModelAwareWhileMatchFilter(filter.getFilter());
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java Wed Aug 15 14:59:18 2012
@@ -14,40 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase.mapping;
import org.apache.camel.Message;
import org.apache.camel.component.hbase.model.HBaseData;
/**
- * A {@link org.apache.camel.component.hbase.mapping.CellMappingStrategy} implementation.
+ * A {@link org.apache.camel.component.hbase.mapping.CellMappingStrategy} implementation.
* It distinguishes between multiple cell, by reading headers with index suffix.
* <p/>
* In case of multiple headers:
- * <p>First header is expected to have no suffix</p>.
- * <p>Suffixes start from number 2</p>.
- * <p>Suffixes need to be sequential</p>.
+ * <ul>
+ * <li>First header is expected to have no suffix</li>
+ * <li>Suffixes start from number 2</li>
+ * <li>Suffixes need to be sequential</li>
+ * </ul>
*/
public class BodyMappingStrategy implements CellMappingStrategy {
/**
* Resolves the cells that the {@link org.apache.camel.Exchange} refers to.
- *
- * @param message
- * @return
*/
@Override
public HBaseData resolveModel(Message message) {
return message.getBody(HBaseData.class);
}
-
/**
* Applies the cells to the {@link org.apache.camel.Exchange}.
- *
- * @param message
- * @param data
*/
public void applyGetResults(Message message, HBaseData data) {
if (data == null) {
@@ -56,12 +50,8 @@ public class BodyMappingStrategy impleme
message.setBody(data);
}
-
/**
* Applies the cells to the {@link org.apache.camel.Exchange}.
- *
- * @param message
- * @param data
*/
public void applyScanResults(Message message, HBaseData data) {
if (data == null) {
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategy.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategy.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategy.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase.mapping;
import org.apache.camel.Exchange;
@@ -24,20 +23,16 @@ import org.apache.camel.component.hbase.
/**
* A Cell resolver is responsible on identifying the cells, to which the Echange refers to.
* Is used for all types of operations (Put, Get etc).
- * It is allowed that an exchange refers to more than once cells. This happens if headers for multiple cells are present in the {@Exchange}.
+ * It is allowed that an exchange refers to more than once cells. This happens if headers
+ * for multiple cells are present in the {@link Exchange}.
*/
public interface CellMappingStrategy {
/**
* Resolves the cell that the {@link Exchange} refers to.
- *
- * @param message
- * @return
*/
-
HBaseData resolveModel(Message message);
-
/**
* Applies the KeyValues of a get opration to the {@link Exchange}.
*
@@ -48,9 +43,6 @@ public interface CellMappingStrategy {
/**
* Applies the KeyValues of a scan operation to the {@link Exchange}.
- *
- * @param message
- * @param rows
*/
void applyScanResults(Message message, HBaseData data);
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java Wed Aug 15 14:59:18 2012
@@ -47,7 +47,7 @@ public class CellMappingStrategyFactory
}
if (strategy == null && message.getHeader(STRATEGY_CLASS_NAME) != null) {
- strategy = loadStrategyfromClassName(message.getHeader(STRATEGY_CLASS_NAME, String.class));
+ strategy = loadStrategyFromClassName(message.getHeader(STRATEGY_CLASS_NAME, String.class));
}
if (strategy != null) {
@@ -58,8 +58,8 @@ public class CellMappingStrategyFactory
return DEFAULT_STRATIGIES.get(HEADER);
}
-
- private CellMappingStrategy loadStrategyfromClassName(String strategyClassName) {
+ private CellMappingStrategy loadStrategyFromClassName(String strategyClassName) {
+ // TODO: We ought to use ClassResolver from CamelContext API
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
if (classLoader != null) {
try {
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase.mapping;
import java.util.LinkedHashMap;
@@ -27,24 +26,21 @@ import org.apache.camel.component.hbase.
import org.apache.camel.component.hbase.model.HBaseData;
import org.apache.camel.component.hbase.model.HBaseRow;
-
/**
* A default {@link CellMappingStrategy} implementation.
* It distinguishes between multiple cell, by reading headers with index suffix.
* <p/>
* In case of multiple headers:
- * <p>First header is expected to have no suffix</p>.
- * <p>Suffixes start from number 2</p>.
- * <p>Suffixes need to be sequential</p>.
+ * <ul>
+ * <li>First header is expected to have no suffix</li>
+ * <li>Suffixes start from number 2</li>
+ * <li>Suffixes need to be sequential</li>
+ * </ul>
*/
public class HeaderMappingStrategy implements CellMappingStrategy {
/**
* Resolves the cell that the {@link Exchange} refers to.
- *
- * @param message
- * @param index
- * @return
*/
private HBaseRow resolveRow(Message message, int index) {
HBaseRow hRow = new HBaseRow();
@@ -79,9 +75,6 @@ public class HeaderMappingStrategy imple
/**
* Resolves the cells that the {@link org.apache.camel.Exchange} refers to.
- *
- * @param message
- * @return
*/
@Override
public HBaseData resolveModel(Message message) {
@@ -106,12 +99,8 @@ public class HeaderMappingStrategy imple
return data;
}
-
/**
* Applies the cells to the {@link org.apache.camel.Exchange}.
- *
- * @param message
- * @param hRows
*/
public void applyGetResults(Message message, HBaseData data) {
int index = 1;
@@ -132,8 +121,6 @@ public class HeaderMappingStrategy imple
/**
* Applies the cells to the {@link org.apache.camel.Exchange}.
- *
- * @param message
*/
public void applyScanResults(Message message, HBaseData data) {
int index = 1;
@@ -148,7 +135,6 @@ public class HeaderMappingStrategy imple
message.setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(index), cell.getFamily());
message.setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(index), cell.getQualifier());
message.setHeader(HbaseAttribute.HBASE_VALUE.asHeader(index), cell.getValue());
-
}
index++;
}
@@ -156,11 +142,6 @@ public class HeaderMappingStrategy imple
/**
* Searches a list of cells and returns the value, if family/column matches with the specified.
- *
- * @param family
- * @param qualifier
- * @param cells
- * @return
*/
private Object getValueForColumn(Set<HBaseCell> cells, String family, String qualifier) {
if (cells != null) {
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase.model;
import javax.xml.bind.annotation.XmlAttribute;
@@ -50,7 +49,6 @@ public class HBaseCell {
this.qualifier = qualifier;
}
-
public Object getValue() {
return value;
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseData.java Wed Aug 15 14:59:18 2012
@@ -25,7 +25,6 @@ public class HBaseData {
private List<HBaseRow> rows = new LinkedList<HBaseRow>();
-
public HBaseData() {
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java Wed Aug 15 14:59:18 2012
@@ -29,18 +29,10 @@ public class HBaseRow implements Cloneab
private Class<?> rowType = String.class;
private Set<HBaseCell> cells;
- /**
- * Constructor
- */
public HBaseRow() {
- cells = new LinkedHashSet<HBaseCell>();
+ this(new LinkedHashSet<HBaseCell>());
}
- /**
- * Constructor
- *
- * @param cells
- */
public HBaseRow(Set<HBaseCell> cells) {
this.cells = cells;
}
@@ -70,7 +62,6 @@ public class HBaseRow implements Cloneab
this.cells = cells;
}
-
public boolean isEmpty() {
return cells.isEmpty();
}
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java (original)
+++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java Wed Aug 15 14:59:18 2012
@@ -48,7 +48,6 @@ public class HBaseIdempotentRepository e
this.table = new HTable(configuration, tableName);
}
-
@Override
public boolean add(Object o) {
try {
@@ -106,12 +105,12 @@ public class HBaseIdempotentRepository e
@Override
protected void doStart() throws Exception {
-
+ // noop
}
@Override
protected void doStop() throws Exception {
-
+ // noop
}
private byte[] toBytes(Object obj) {
Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java (original)
+++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import java.io.IOException;
Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java (original)
+++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import java.util.HashMap;
Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java (original)
+++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import java.util.HashMap;
Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java (original)
+++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import java.util.Arrays;
Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java (original)
+++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import org.apache.camel.spring.SpringCamelContext;
Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java (original)
+++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase;
import org.apache.camel.spring.SpringCamelContext;
Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java (original)
+++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java Wed Aug 15 14:59:18 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.hbase.processor.idempotent;
import org.apache.camel.CamelContext;
Modified: camel/trunk/components/camel-hbase/src/test/resources/hbase-site.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/resources/hbase-site.xml?rev=1373442&r1=1373441&r2=1373442&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/src/test/resources/hbase-site.xml (original)
+++ camel/trunk/components/camel-hbase/src/test/resources/hbase-site.xml Wed Aug 15 14:59:18 2012
@@ -1,26 +1,21 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
-/**
- * Copyright 2007 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * 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.
- */
--->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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.
+ -->
<configuration>
<property>
<name>hbase.regionserver.msginterval</name>