Fixed CS. This closes #823. This closes #832. This closes #831. This closes #828.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7d5436d0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7d5436d0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7d5436d0 Branch: refs/heads/master Commit: 7d5436d0d1dd94e1789b4f175c830a393b267f3e Parents: 280d55d Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Feb 11 09:12:19 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Feb 11 09:14:09 2016 +0100 ---------------------------------------------------------------------- components/camel-hbase/pom.xml | 1 - .../org/apache/camel/component/hbase/HBaseProducer.java | 10 +++++----- .../camel/component/hbase/filters/ModelAwareFilter.java | 2 -- .../component/hbase/filters/ModelAwareFilterList.java | 8 ++++---- .../component/hbase/filters/ModelAwareSkipFilter.java | 8 ++++---- .../hbase/filters/ModelAwareWhileMatchFilter.java | 8 ++++---- 6 files changed, 17 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml index 2c0d530..545a7d0 100644 --- a/components/camel-hbase/pom.xml +++ b/components/camel-hbase/pom.xml @@ -28,7 +28,6 @@ <packaging>bundle</packaging> <name>Camel :: Hbase</name> <description>Camel HBase component</description> - <properties> <camel.osgi.import.before.defaults> org.apache.hadoop.conf;version="[2,3)", http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java index 8f35342..93f8bb0 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java @@ -205,12 +205,12 @@ public class HBaseProducer extends DefaultProducer implements ServicePoolAware { } else { scan = new Scan(); } - + if (filters != null && !filters.isEmpty()) { - for (int i=0;i<filters.size();i++){ - ((ModelAwareFilter<?>) filters.get(i)).apply(endpoint.getCamelContext(), model); - scan.setFilter(new FilterList(FilterList.Operator.MUST_PASS_ALL, ((ModelAwareFilter<?>) filters.get(i)).getFilteredList())); - } + for (int i = 0; i < filters.size(); i++) { + ((ModelAwareFilter<?>) filters.get(i)).apply(endpoint.getCamelContext(), model); + scan.setFilter(new FilterList(FilterList.Operator.MUST_PASS_ALL, ((ModelAwareFilter<?>) filters.get(i)).getFilteredList())); + } } Set<HBaseCell> cellModels = model.getCells(); http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java ---------------------------------------------------------------------- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java index 327c102..185b634 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilter.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.hbase.filters; -import java.util.List; - import org.apache.camel.CamelContext; import org.apache.camel.component.hbase.model.HBaseRow; import org.apache.hadoop.hbase.filter.Filter; http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java ---------------------------------------------------------------------- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java index bf2da0e..d0a1ca7 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareFilterList.java @@ -90,8 +90,8 @@ public class ModelAwareFilterList implements ModelAwareFilter<FilterList> { getFilters().add(filter); } - @Override - public FilterList getFilteredList() { - return fl; - } + @Override + public FilterList getFilteredList() { + return fl; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java ---------------------------------------------------------------------- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java index 161be6c..4ae1939 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareSkipFilter.java @@ -46,8 +46,8 @@ public class ModelAwareSkipFilter extends SkipFilter implements ModelAwareFilter return new ModelAwareSkipFilter(filter.getFilter()); } - @Override - public FilterList getFilteredList() { - return null; - } + @Override + public FilterList getFilteredList() { + return null; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/7d5436d0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java ---------------------------------------------------------------------- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java index c16a470..a4d06f4 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/filters/ModelAwareWhileMatchFilter.java @@ -45,9 +45,9 @@ public class ModelAwareWhileMatchFilter extends WhileMatchFilter implements Mode return new ModelAwareWhileMatchFilter(filter.getFilter()); } - @Override - public FilterList getFilteredList() { - return null; - } + @Override + public FilterList getFilteredList() { + return null; + } }
