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/03/01 08:42:33 UTC
[06/11] camel git commit: CAMEL-8320: Component doc to include
endpoint syntax.
CAMEL-8320: Component doc to include endpoint syntax.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f511c452
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f511c452
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f511c452
Branch: refs/heads/master
Commit: f511c452fc2930028d5a9173d2b7f5eb7dcc07a0
Parents: caf545f
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 28 18:49:36 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 28 18:49:36 2015 +0100
----------------------------------------------------------------------
.../component/olingo2/Olingo2Component.java | 2 --
.../camel/component/olingo2/Olingo2Endpoint.java | 2 +-
.../component/openshift/OpenShiftEndpoint.java | 11 ++++++-----
.../optaplanner/OptaPlannerEndpoint.java | 2 +-
.../component/paxlogging/PaxLoggingEndpoint.java | 5 +++--
.../camel/component/pgevent/PgEventEndpoint.java | 11 ++++++-----
.../camel/component/printer/PrinterEndpoint.java | 2 +-
.../camel/component/quartz/QuartzEndpoint.java | 11 ++++++-----
.../camel/component/quartz2/QuartzEndpoint.java | 19 ++++++++++---------
.../component/quickfixj/QuickfixjEndpoint.java | 5 +++--
.../component/rabbitmq/RabbitMQEndpoint.java | 17 +++++++++--------
.../camel/component/restlet/RestletEndpoint.java | 13 +++++++------
.../apache/camel/component/rmi/RmiEndpoint.java | 12 +++++++++---
13 files changed, 62 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
index 69faa56..2cbfd2b 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
@@ -25,7 +25,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.component.olingo2.api.impl.Olingo2AppImpl;
import org.apache.camel.component.olingo2.internal.Olingo2ApiCollection;
import org.apache.camel.component.olingo2.internal.Olingo2ApiName;
-import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.component.AbstractApiComponent;
import org.apache.camel.util.jsse.SSLContextParameters;
@@ -36,7 +35,6 @@ import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
/**
* Represents the component that manages {@link Olingo2Endpoint}.
*/
-@UriEndpoint(scheme = "olingo2", consumerClass = Olingo2Consumer.class, consumerPrefix = "consumer")
public class Olingo2Component extends AbstractApiComponent<Olingo2ApiName, Olingo2Configuration, Olingo2ApiCollection> {
// component level shared proxy
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
index f77f764..c5007bb 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
@@ -37,7 +37,7 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* Represents a Olingo2 endpoint.
*/
-@UriEndpoint(scheme = "olingo2", consumerClass = Olingo2Consumer.class, consumerPrefix = "consumer")
+@UriEndpoint(scheme = "olingo2", syntax = "olingo2:apiName/methodName", consumerClass = Olingo2Consumer.class, consumerPrefix = "consumer")
public class Olingo2Endpoint extends AbstractApiEndpoint<Olingo2ApiName, Olingo2Configuration> {
protected static final String RESOURCE_PATH_PROPERTY = "resourcePath";
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java
index 489d0d0..356b3e4 100644
--- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java
+++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftEndpoint.java
@@ -24,25 +24,26 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.ScheduledPollEndpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
-@UriEndpoint(scheme = "openshift", consumerClass = OpenShiftConsumer.class, label = "cloud")
+@UriEndpoint(scheme = "openshift", syntax = "openshift:clientId", consumerClass = OpenShiftConsumer.class, label = "cloud")
public class OpenShiftEndpoint extends ScheduledPollEndpoint {
- @UriPath
+ @UriPath @Metadata(required = "true")
private String clientId;
- @UriParam
+ @UriPath @Metadata(required = "true")
private String username;
- @UriParam
+ @UriPath @Metadata(required = "true")
private String password;
@UriParam
private String domain;
@UriParam
private String server;
- @UriParam
+ @UriParam(enums = "list,start,stop,restart,state")
private String operation;
@UriParam
private String application;
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
index 715e64b..452685a 100644
--- a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
+++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
@@ -29,7 +29,7 @@ import org.optaplanner.core.api.solver.SolverFactory;
/**
* OptaPlanner endpoint for Camel
*/
-@UriEndpoint(scheme = "optaplanner", producerOnly = true, label = "engine,planning")
+@UriEndpoint(scheme = "optaplanner", syntax = "optaplanner:resourceUri", producerOnly = true, label = "engine,planning")
public class OptaPlannerEndpoint extends ResourceEndpoint {
private SolverFactory solverFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
index e0e60e3..d9fd526 100644
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
+++ b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
@@ -21,16 +21,17 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriPath;
/**
* Paxlogging endpoint.
*/
-@UriEndpoint(scheme = "paxlogging", consumerOnly = true, consumerClass = PaxLoggingConsumer.class, label = "monitoring")
+@UriEndpoint(scheme = "paxlogging", syntax = "paxlogging:appender", consumerOnly = true, consumerClass = PaxLoggingConsumer.class, label = "monitoring")
public class PaxLoggingEndpoint extends DefaultEndpoint {
- @UriPath
+ @UriPath @Metadata(required = "true")
private final String appender;
public PaxLoggingEndpoint(String uri, PaxLoggingComponent component, String appender) {
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
index ba8e368..38cc196 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
@@ -28,6 +28,7 @@ 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.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
@@ -38,7 +39,7 @@ import org.slf4j.LoggerFactory;
/**
* Represents a PgEvent endpoint.
*/
-@UriEndpoint(scheme = "pgevent", consumerClass = PgEventConsumer.class, label = "database,sql")
+@UriEndpoint(scheme = "pgevent", syntax = "pgevent:host:port/database/channel", consumerClass = PgEventConsumer.class, label = "database,sql")
public class PgEventEndpoint extends DefaultEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(PgEventEndpoint.class);
@@ -47,13 +48,13 @@ public class PgEventEndpoint extends DefaultEndpoint {
private static final String FORMAT3 = "^pgevent:///(\\w+)/(\\w+).*$";
private static final String FORMAT4 = "^pgevent:(\\w+)/(\\w+)/(\\w+).*$";
- @UriPath
+ @UriPath(defaultValue = "localhost")
private String host = "localhost";
- @UriPath
+ @UriPath(defaultValue = "5432")
private Integer port = 5432;
- @UriPath
+ @UriPath @Metadata(required = "true")
private String database;
- @UriPath
+ @UriPath @Metadata(required = "true")
private String channel;
@UriParam(defaultValue = "postgres")
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
index d48dc61..651d19d 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
@@ -24,7 +24,7 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
-@UriEndpoint(scheme = "printer", producerOnly = true, label = "printing")
+@UriEndpoint(scheme = "lpr", syntax = "lpr:hostname:port/printername", producerOnly = true, label = "printing")
public class PrinterEndpoint extends DefaultEndpoint {
public static final String JOB_NAME = "PrinterJobName";
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
index 1f569c2..a4decec 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
@@ -26,6 +26,7 @@ import org.apache.camel.ShutdownableService;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-@UriEndpoint(scheme = "quartz", consumerOnly = true, consumerClass = QuartzConsumer.class, label = "scheduling")
+@UriEndpoint(scheme = "quartz", syntax = "quartz:groupName/timerName", consumerOnly = true, consumerClass = QuartzConsumer.class, label = "scheduling")
public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableService {
private static final Logger LOG = LoggerFactory.getLogger(QuartzEndpoint.class);
@@ -53,15 +54,15 @@ public class QuartzEndpoint extends DefaultEndpoint implements ShutdownableServi
private Trigger trigger;
private JobDetail jobDetail = new JobDetail();
private volatile boolean started;
- @UriPath
+ @UriPath(defaultValue = "Camel")
private String groupName;
- @UriPath
+ @UriPath @Metadata(required = "true")
private String timerName;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean stateful;
@UriParam(defaultValue = "true")
private boolean deleteJob = true;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean pauseJob;
/** If it is true, the CamelContext name is used,
* if it is false, use the CamelContext management name which could be changed during the deploy time
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
index a124d20..1fd9d62 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
@@ -29,6 +29,7 @@ import org.apache.camel.Route;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
@@ -54,30 +55,30 @@ import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
* call back into {@link #onConsumerStart(QuartzConsumer)} to add/resume or {@link #onConsumerStop(QuartzConsumer)}
* to pause the scheduler trigger.
*/
-@UriEndpoint(scheme = "quartz2", consumerOnly = true, consumerClass = QuartzComponent.class, label = "scheduling")
+@UriEndpoint(scheme = "quartz2", syntax = "quartz2:groupName/triggerName", consumerOnly = true, consumerClass = QuartzComponent.class, label = "scheduling")
public class QuartzEndpoint extends DefaultEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(QuartzEndpoint.class);
private TriggerKey triggerKey;
- @UriPath
+ @UriPath(defaultValue = "Camel")
private String groupName;
- @UriPath
+ @UriPath @Metadata(required = "true")
private String triggerName;
@UriParam
private String cron;
private LoadBalancer consumerLoadBalancer;
private Map<String, Object> triggerParameters;
private Map<String, Object> jobParameters;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean stateful;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean fireNow;
@UriParam(defaultValue = "true")
private boolean deleteJob = true;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean pauseJob;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean durableJob;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean recoverableJob;
/** In case of scheduler has already started, we want the trigger start slightly after current time to
* ensure endpoint is fully started before the job kicks in. */
@@ -86,7 +87,7 @@ public class QuartzEndpoint extends DefaultEndpoint {
/** If it is true, the CamelContext name is used,
* if it is false, use the CamelContext management name which could be changed during the deploy time
**/
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean usingFixedCamelContextName;
// An internal variables to track whether a job has been in scheduler or not, and has it paused or not.
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
index 9c6cc1e..1b38c7c 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
@@ -29,6 +29,7 @@ import org.apache.camel.Producer;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.quickfixj.converter.QuickfixjConverters;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriPath;
import org.slf4j.Logger;
@@ -36,7 +37,7 @@ import org.slf4j.LoggerFactory;
import quickfix.Message;
import quickfix.SessionID;
-@UriEndpoint(scheme = "quickfix", consumerClass = QuickfixjConsumer.class, label = "engine,messaging")
+@UriEndpoint(scheme = "quickfix", syntax = "quickfix:configurationName", consumerClass = QuickfixjConsumer.class, label = "engine,messaging")
public class QuickfixjEndpoint extends DefaultEndpoint implements QuickfixjEventListener, MultipleConsumersSupport {
public static final String EVENT_CATEGORY_KEY = "EventCategory";
public static final String SESSION_ID_KEY = "SessionID";
@@ -48,7 +49,7 @@ public class QuickfixjEndpoint extends DefaultEndpoint implements QuickfixjEvent
private SessionID sessionID;
private final List<QuickfixjConsumer> consumers = new CopyOnWriteArrayList<QuickfixjConsumer>();
- @UriPath
+ @UriPath @Metadata(required = "true")
private String configurationName;
private final QuickfixjEngine engine;
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index c69d952..f6e4198 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -42,18 +42,19 @@ import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultMessage;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
-@UriEndpoint(scheme = "rabbitmq", consumerClass = RabbitMQConsumer.class, label = "messaging")
+@UriEndpoint(scheme = "rabbitmq", syntax = "rabbitmq:hostname:portNumber/exchangeName", consumerClass = RabbitMQConsumer.class, label = "messaging")
public class RabbitMQEndpoint extends DefaultEndpoint {
- @UriPath
+ @UriPath @Metadata(required = "true")
private String hostname;
- @UriPath
+ @UriPath @Metadata(required = "true")
private int portNumber;
- @UriPath
+ @UriPath @Metadata(required = "true")
private String exchangeName;
@UriParam(defaultValue = ConnectionFactory.DEFAULT_USER)
private String username = ConnectionFactory.DEFAULT_USER;
@@ -94,14 +95,14 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
private Map<String, Object> clientProperties;
@UriParam
private ConnectionFactory connectionFactory;
- @UriParam(defaultValue = "false")
+ @UriParam
private Boolean automaticRecoveryEnabled;
@UriParam
private Integer networkRecoveryInterval;
- @UriParam(defaultValue = "false")
+ @UriParam
private Boolean topologyRecoveryEnabled;
//If it is true, prefetchSize, prefetchCount, prefetchGlobal will be used for basicOqs before starting RabbitMQConsumer
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean prefetchEnabled;
//Default in RabbitMq is 0.
@UriParam
@@ -109,7 +110,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
@UriParam
private int prefetchCount;
//Default value in RabbitMQ is false.
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean prefetchGlobal;
/**
* Number of concurrent consumer threads
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
index a845197..4b27293 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
@@ -27,6 +27,7 @@ import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
@@ -39,7 +40,7 @@ import org.restlet.data.Method;
*
* @version
*/
-@UriEndpoint(scheme = "restlet", consumerClass = RestletConsumer.class, label = "http,rest")
+@UriEndpoint(scheme = "restlet", syntax = "restlet:protocol:host:port/uriPattern", consumerClass = RestletConsumer.class, label = "http,rest")
public class RestletEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
private static final int DEFAULT_PORT = 80;
@@ -48,13 +49,13 @@ public class RestletEndpoint extends DefaultEndpoint implements HeaderFilterStra
private static final int DEFAULT_SOCKET_TIMEOUT = 30000;
private static final int DEFAULT_CONNECT_TIMEOUT = 30000;
- @UriPath
+ @UriPath(enums = "http") @Metadata(required = "true")
private String protocol = DEFAULT_PROTOCOL;
- @UriPath
+ @UriPath @Metadata(required = "true")
private String host = DEFAULT_HOST;
- @UriPath
+ @UriPath(defaultValue = "80")
private int port = DEFAULT_PORT;
- @UriPath
+ @UriPath @Metadata(required = "true")
private String uriPattern;
@UriParam(defaultValue = "" + DEFAULT_SOCKET_TIMEOUT)
private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
@@ -78,7 +79,7 @@ public class RestletEndpoint extends DefaultEndpoint implements HeaderFilterStra
private RestletBinding restletBinding;
@UriParam(defaultValue = "true")
private boolean throwExceptionOnFailure = true;
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean disableStreamCache;
@UriParam
private SSLContextParameters sslContextParameters;
http://git-wip-us.apache.org/repos/asf/camel/blob/f511c452/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java b/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
index ffb1eb0..40e9a07 100644
--- a/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
+++ b/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
@@ -28,6 +28,7 @@ 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.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
@@ -36,13 +37,18 @@ import org.apache.camel.util.ObjectHelper;
/**
* @version
*/
-@UriEndpoint(scheme = "rmi", consumerClass = RmiConsumer.class, label = "messaging")
+@UriEndpoint(scheme = "rmi", syntax = "rmi:hostname:port/name", consumerClass = RmiConsumer.class, label = "messaging")
public class RmiEndpoint extends DefaultEndpoint {
private ClassLoader classLoader;
- private int port;
- @UriPath
private URI uri;
+
+ @UriPath
+ private String hostname;
+ @UriPath
+ private int port;
+ @UriPath @Metadata(required = "true")
+ private String name;
@UriParam
private List<Class<?>> remoteInterfaces;
@UriParam