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 2015/01/04 11:54:03 UTC
[1/2] camel git commit: CAMEL-7999: More components include
documentation
Repository: camel
Updated Branches:
refs/heads/master 678006152 -> f561a8b7e
CAMEL-7999: More components include documentation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d39e91a0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d39e91a0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d39e91a0
Branch: refs/heads/master
Commit: d39e91a059d1f95e351fc446be55400597cc0bf7
Parents: 6780061
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 4 11:47:59 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 4 11:47:59 2015 +0100
----------------------------------------------------------------------
.../camel/component/hbase/HBaseComponent.java | 9 +++++++--
.../apache/camel/component/hbase/HBaseEndpoint.java | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d39e91a0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
index 48d08fa..a402b6f 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
@@ -17,10 +17,11 @@
package org.apache.camel.component.hbase;
import java.util.Map;
+
import org.apache.camel.Endpoint;
import org.apache.camel.component.hbase.model.HBaseCell;
import org.apache.camel.component.hbase.model.HBaseRow;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.client.HTablePool;
@@ -28,12 +29,16 @@ import org.apache.hadoop.hbase.client.HTablePool;
/**
* Represents the component that manages {@link HBaseEndpoint}.
*/
-public class HBaseComponent extends DefaultComponent {
+public class HBaseComponent extends UriEndpointComponent {
private Configuration configuration;
private HTablePool tablePool;
private int poolMaxSize = 10;
+ public HBaseComponent() {
+ super(HBaseEndpoint.class);
+ }
+
@Override
protected void doStart() throws Exception {
if (configuration == null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d39e91a0/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
index 7704200..ff547ef 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
@@ -17,12 +17,16 @@
package org.apache.camel.component.hbase;
import java.util.List;
+
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.hbase.mapping.CellMappingStrategyFactory;
import org.apache.camel.component.hbase.model.HBaseRow;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTablePool;
@@ -31,23 +35,35 @@ import org.apache.hadoop.hbase.filter.Filter;
/**
* Represents an HBase endpoint.
*/
+@UriEndpoint(scheme = "hbase", consumerClass = HBaseConsumer.class, label = "hadoop")
public class HBaseEndpoint extends DefaultEndpoint {
private Configuration configuration;
+ @UriPath
private final String tableName;
private final HTablePool tablePool;
private HBaseAdmin admin;
//Operation properties.
+ @UriParam(defaultValue = "100")
private int maxResults = 100;
+ @UriParam
private List<Filter> filters;
+ @UriParam
private String operation;
+ @UriParam(defaultValue = "true")
private boolean remove = true;
+ @UriParam
private String mappingStrategyName;
+ @UriParam
private String mappingStrategyClassName;
+ @UriParam
private CellMappingStrategyFactory cellMappingStrategyFactory = new CellMappingStrategyFactory();
+ @UriParam
private HBaseRemoveHandler removeHandler = new HBaseDeleteHandler();
+ @UriParam
private HBaseRow rowModel;
+ @UriParam
private int maxMessagesPerPoll;
public HBaseEndpoint(String uri, HBaseComponent component, HTablePool tablePool, String tableName) {
[2/2] camel git commit: CAMEL-7999: More components include
documentation
Posted by da...@apache.org.
CAMEL-7999: More components include documentation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f561a8b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f561a8b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f561a8b7
Branch: refs/heads/master
Commit: f561a8b7ecaac36cc3a79f2ffb8803b2da40d6f9
Parents: d39e91a
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 4 11:53:36 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 4 11:53:36 2015 +0100
----------------------------------------------------------------------
.../camel/component/gora/GoraComponent.java | 9 +++--
.../camel/component/gora/GoraConfiguration.java | 36 +++++++++++++++++++-
.../camel/component/gora/GoraEndpoint.java | 4 +++
3 files changed, 46 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f561a8b7/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraComponent.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraComponent.java
index 6a2a063..c2f899d 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraComponent.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraComponent.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
import org.apache.gora.persistency.Persistent;
import org.apache.gora.store.DataStore;
import org.apache.gora.store.DataStoreFactory;
@@ -34,7 +34,7 @@ import static org.apache.camel.component.gora.GoraConstants.GORA_DEFAULT_DATASTO
* Camel-Gora {@link Endpoint}.
*
*/
-public class GoraComponent extends DefaultComponent {
+public class GoraComponent extends UriEndpointComponent {
/**
* GORA datastore
@@ -51,6 +51,10 @@ public class GoraComponent extends DefaultComponent {
*/
private Configuration configuration;
+ public GoraComponent() {
+ super(GoraEndpoint.class);
+ }
+
/**
*
* Initialize class and create DataStore instance
@@ -79,6 +83,7 @@ public class GoraComponent extends DefaultComponent {
final GoraConfiguration config = new GoraConfiguration();
setProperties(config, parameters);
+ config.setName(remaining);
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/f561a8b7/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConfiguration.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConfiguration.java
index 5456522..d583ec4 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConfiguration.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConfiguration.java
@@ -18,6 +18,9 @@
package org.apache.camel.component.gora;
import com.google.common.base.Strings;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriParams;
+import org.apache.camel.spi.UriPath;
import org.apache.hadoop.conf.Configuration;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -28,26 +31,34 @@ import static com.google.common.base.Strings.isNullOrEmpty;
* Gora Configuration.
*
*/
+@UriParams
public class GoraConfiguration {
+ @UriPath
+ private String name;
+
/**
* key type
*/
+ @UriParam
private String keyClass;
/**
* configuration
*/
+ @UriParam
private Configuration hadoopConfiguration;
/**
* value type
*/
+ @UriParam
private String valueClass;
/**
* dataStore type
*/
+ @UriParam
private String dataStoreClass;
/** Consumer only properties! */
@@ -55,57 +66,67 @@ public class GoraConfiguration {
/**
* Gora Query Start Time attribute
*/
+ @UriParam
private long startTime;
/**
* Gora Query End Time attribute
*/
+ @UriParam
private long endTime;
/**
* Gora Query Time Range From attribute
*/
+ @UriParam
private long timeRangeFrom;
/**
* Gora Query Key Range To attribute
*/
+ @UriParam
private long timeRangeTo;
/**
* Gora Query Limit attribute
*/
+ @UriParam
private long limit;
/**
* Gora Query Timestamp attribute
*/
+ @UriParam
private long timestamp;
/**
* Gora Query Start Key attribute
*/
+ @UriParam
private Object startKey;
/**
* Gora Query End Key attribute
*/
+ @UriParam
private Object endKey;
/**
* Gora Query Key Range From attribute
*/
+ @UriParam
private Object keyRangeFrom;
/**
* Gora Query Key Range To attribute
*/
+ @UriParam
private Object keyRangeTo;
-
/**
* Gora Query Fields attribute
*/
+ @UriParam
private Strings fields;
/**
@@ -113,6 +134,7 @@ public class GoraConfiguration {
*
* <b>NOTE:<b/> used only by consumer
*/
+ @UriParam(defaultValue = "1")
private int concurrentConsumers = 1;
/**
@@ -120,6 +142,7 @@ public class GoraConfiguration {
*
* <b>NOTE:<b/> used only by producer
*/
+ @UriParam(defaultValue = "true")
private boolean flushOnEveryOperation = true;
/**
@@ -469,4 +492,15 @@ public class GoraConfiguration {
checkNotNull(hadoopConfiguration, "Hadoop Configuration could not be null!");
this.hadoopConfiguration = hadoopConfiguration;
}
+
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Instance name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f561a8b7/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
index aedbd45..b6fa98c 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
@@ -21,6 +21,8 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
import org.apache.gora.persistency.Persistent;
import org.apache.gora.store.DataStore;
import org.slf4j.Logger;
@@ -29,6 +31,7 @@ import org.slf4j.LoggerFactory;
/**
* Gora endpoint
*/
+@UriEndpoint(scheme = "gora", consumerClass = GoraConsumer.class, label = "database,hadoop,nosql")
public class GoraEndpoint extends DefaultEndpoint {
/**
@@ -44,6 +47,7 @@ public class GoraEndpoint extends DefaultEndpoint {
/**
* Camel-Gora Endpoint Configuratopn
*/
+ @UriParam
private GoraConfiguration configuration;
/**