camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-7999: Polished
Date Fri, 20 Feb 2015 14:18:09 GMT
Repository: camel
Updated Branches:
  refs/heads/master f3a5e219a -> 4f98efd44


CAMEL-7999: Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4f98efd4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f98efd4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f98efd4

Branch: refs/heads/master
Commit: 4f98efd44338d6598e0e2e1ad8de1c4e958e0d33
Parents: f3a5e21
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Feb 20 14:11:13 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Feb 20 15:18:36 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/component/bean/BeanEndpoint.java  | 7 ++++---
 .../org/apache/camel/component/binding/BindingEndpoint.java | 5 +++--
 .../org/apache/camel/component/browse/BrowseEndpoint.java   | 3 ++-
 .../camel/component/controlbus/ControlBusEndpoint.java      | 5 +++--
 .../camel/component/dataformat/DataFormatEndpoint.java      | 5 +++--
 .../org/apache/camel/component/dataset/DataSetEndpoint.java | 3 ++-
 .../org/apache/camel/component/direct/DirectEndpoint.java   | 5 +++--
 .../apache/camel/component/directvm/DirectVmEndpoint.java   | 5 +++--
 .../java/org/apache/camel/component/file/FileEndpoint.java  | 4 ++--
 .../apache/camel/component/file/GenericFileEndpoint.java    | 2 +-
 .../apache/camel/component/language/LanguageEndpoint.java   | 7 ++++---
 .../java/org/apache/camel/component/log/LogEndpoint.java    | 3 ++-
 .../java/org/apache/camel/component/mock/MockEndpoint.java  | 3 ++-
 .../java/org/apache/camel/component/ref/RefEndpoint.java    | 3 ++-
 .../java/org/apache/camel/component/seda/SedaEndpoint.java  | 9 +++++----
 .../java/org/apache/camel/component/test/TestEndpoint.java  | 3 ++-
 .../org/apache/camel/component/timer/TimerEndpoint.java     | 5 +++--
 .../apache/camel/component/validator/ValidatorEndpoint.java | 2 +-
 .../java/org/apache/camel/component/xslt/XsltEndpoint.java  | 4 ++--
 ...ataFormatComponentConfigurationAndDocumentationTest.java | 6 +++---
 .../MockComponentConfigurationAndDocumentationTest.java     | 4 ++--
 .../TimerComponentConfigurationAndDocumentationTest.java    | 2 +-
 .../apache/camel/management/ManagedCamelContextTest.java    | 7 ++-----
 23 files changed, 57 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
index 604661a..6da99c1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
@@ -24,6 +24,7 @@ import org.apache.camel.ExchangePattern;
 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;
@@ -37,11 +38,11 @@ import org.apache.camel.spi.UriPath;
 public class BeanEndpoint extends DefaultEndpoint {
     private transient BeanHolder beanHolder;
     private transient BeanProcessor processor;
-    @UriPath
+    @UriPath @Metadata(required = "true")
     private String beanName;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean cache;
-    @UriParam(defaultValue = "false")
+    @UriParam
     @Deprecated
     private boolean multiParameterArray;
     @UriParam

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
index 4ab848d..e9a1ad6 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
@@ -27,6 +27,7 @@ import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.processor.PipelineHelper;
 import org.apache.camel.spi.Binding;
 import org.apache.camel.spi.HasBinding;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.CamelContextHelper;
@@ -42,9 +43,9 @@ import static org.apache.camel.util.CamelContextHelper.getMandatoryEndpoint;
 @UriEndpoint(scheme = "binding", consumerClass = BindingConsumerProcessor.class, label =
"core,transformation")
 public class BindingEndpoint extends DefaultEndpoint implements HasBinding {
 
-    @UriPath
+    @UriPath @Metadata(required = "true")
     private final String bindingName;
-    @UriPath
+    @UriPath @Metadata(required = "true")
     private final String delegateUri;
     private Binding binding;
     private Endpoint delegate;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
index a0a8391..3cfac6f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
@@ -30,6 +30,7 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer;
 import org.apache.camel.processor.loadbalancer.LoadBalancerConsumer;
 import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
 import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriPath;
 
@@ -42,7 +43,7 @@ import org.apache.camel.spi.UriPath;
 @UriEndpoint(scheme = "browse", label = "core,monitoring")
 public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
 
-    @UriPath(description = "A name which can be any string to uniquely identify the endpoint")
+    @UriPath(description = "A name which can be any string to uniquely identify the endpoint")
@Metadata(required = "true")
     private String name;
 
     private List<Exchange> exchanges;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
index b33ef7c..d90c2c0 100644
--- a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
@@ -24,6 +24,7 @@ import org.apache.camel.Producer;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.spi.Language;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
@@ -35,7 +36,7 @@ import org.apache.camel.util.CamelLogger;
 @UriEndpoint(scheme = "controlbus", producerOnly = true, label = "core,monitoring")
 public class ControlBusEndpoint extends DefaultEndpoint {
 
-    @UriPath(description = "Command can be either route or language", enums = "route,language")
+    @UriPath(description = "Command can be either route or language", enums = "route,language")
@Metadata(required = "true")
     private String command;
     @UriPath
     private Language language;
@@ -43,7 +44,7 @@ public class ControlBusEndpoint extends DefaultEndpoint {
     private String routeId;
     @UriParam(enums = "start,stop,suspend,resume,status")
     private String action;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean async;
     @UriParam(defaultValue = "INFO")
     private LoggingLevel loggingLevel = LoggingLevel.INFO;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
index 60f6e8b..0fb1d02 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatEndpoint.java
@@ -27,6 +27,7 @@ import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.processor.MarshalProcessor;
 import org.apache.camel.processor.UnmarshalProcessor;
 import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.ServiceHelper;
@@ -38,9 +39,9 @@ public class DataFormatEndpoint extends DefaultEndpoint {
     private UnmarshalProcessor unmarshal;
     private DataFormat dataFormat;
 
-    @UriPath(description = "Name of data format")
+    @UriPath(description = "Name of data format") @Metadata(required = "true")
     private String name;
-    @UriPath(enums = "marshal,unmarshal")
+    @UriPath(enums = "marshal,unmarshal") @Metadata(required = "true")
     private String operation;
 
     public DataFormatEndpoint() {

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index a628605..0aca20c 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -26,6 +26,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.Service;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.ThroughputLogger;
+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;
 public class DataSetEndpoint extends MockEndpoint implements Service {
     private final transient Logger log;
     private final AtomicInteger receivedCounter = new AtomicInteger();
-    @UriPath(name = "name", description = "Name of DataSet to lookup in the registry")
+    @UriPath(name = "name", description = "Name of DataSet to lookup in the registry") @Metadata(required
= "true")
     private volatile DataSet dataSet;
     @UriParam(defaultValue = "0")
     private int minRate;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
index e29e01d..c2c4af7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
@@ -24,6 +24,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;
@@ -40,10 +41,10 @@ public class DirectEndpoint extends DefaultEndpoint {
 
     private volatile Map<String, DirectConsumer> consumers;
 
-    @UriPath(description = "Name of direct endpoint")
+    @UriPath(description = "Name of direct endpoint") @Metadata(required = "true")
     private String name;
 
-    @UriParam(label = "producer", defaultValue = "false")
+    @UriParam(label = "producer")
     private boolean block;
     @UriParam(label = "producer", defaultValue = "30000")
     private long timeout = 30000L;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
index 57733c5..332989d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
@@ -21,6 +21,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.component.direct.DirectConsumer;
 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;
@@ -31,10 +32,10 @@ import org.apache.camel.spi.UriPath;
 @UriEndpoint(scheme = "direct-vm", consumerClass = DirectConsumer.class, label = "core,endpoint")
 public class DirectVmEndpoint extends DefaultEndpoint {
 
-    @UriPath(description = "Name of direct-vm endpoint")
+    @UriPath(description = "Name of direct-vm endpoint") @Metadata(required = "true")
     private String name;
 
-    @UriParam(label = "producer", defaultValue = "false")
+    @UriParam(label = "producer")
     private boolean block;
     @UriParam(label = "producer", defaultValue = "30000")
     private long timeout = 30000L;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index f02e69e..0137864 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -40,9 +40,9 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
 
     @UriPath(name = "directoryName") @Metadata(required = "true")
     private File file;
-    @UriParam(defaultValue = "false")
+    @UriParam(defaultValue = "true")
     private boolean copyAndDeleteOnRenameFail = true;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean renameUsingCopy;
     @UriParam(label = "producer", defaultValue = "true")
     private boolean forceWrites = true;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 3dad350..fc8590d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -71,7 +71,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint
imple
     protected boolean autoCreate = true;
     @UriParam(defaultValue = "" + FileUtil.BUFFER_SIZE)
     protected int bufferSize = FileUtil.BUFFER_SIZE;
-    @UriParam(defaultValue = "false")
+    @UriParam
     protected boolean flatten;
     @UriParam
     protected String charset;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
index bf0f810..6346873 100644
--- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
@@ -29,6 +29,7 @@ import org.apache.camel.Producer;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.ResourceEndpoint;
 import org.apache.camel.spi.Language;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
@@ -46,15 +47,15 @@ public class LanguageEndpoint extends ResourceEndpoint {
     private Language language;
     private Expression expression;
     private boolean contentResolvedFromResource;
-    @UriPath
+    @UriPath @Metadata(required = "true")
     private String languageName;
     @UriParam
     private String script;
     @UriParam(defaultValue = "true")
     private boolean transform = true;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean binary;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean cacheScript;
 
     public LanguageEndpoint() {

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
index 49a93b5..dd2de3c 100644
--- a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
@@ -24,6 +24,7 @@ import org.apache.camel.impl.ProcessorEndpoint;
 import org.apache.camel.processor.CamelLogProcessor;
 import org.apache.camel.processor.ThroughputLogger;
 import org.apache.camel.spi.ExchangeFormatter;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
@@ -40,7 +41,7 @@ public class LogEndpoint extends ProcessorEndpoint {
     private volatile Processor logger;
     private Logger providedLogger;
     private ExchangeFormatter localFormatter;
-    @UriPath(description = "Name of the logging category to use")
+    @UriPath(description = "Name of the logging category to use") @Metadata(required = "true")
     private String loggerName;
     @UriParam(defaultValue = "INFO", enums = "ERROR,WARN,INFO,DEBUG,TRACE,OFF")
     private String level;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index a185a98..de3dcb2 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -49,6 +49,7 @@ import org.apache.camel.impl.DefaultAsyncProducer;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.InterceptSendToEndpoint;
 import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
@@ -110,7 +111,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint
{
 
     private volatile int counter;
 
-    @UriPath(description = "Name of mock endpoint")
+    @UriPath(description = "Name of mock endpoint") @Metadata(required = "true")
     private String name;
     @UriParam(defaultValue = "-1")
     private int expectedCount;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/ref/RefEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
index 4e0fceb..5aef973 100644
--- a/camel-core/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
@@ -23,6 +23,7 @@ import org.apache.camel.Endpoint;
 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.UriPath;
 import org.apache.camel.util.CamelContextHelper;
@@ -32,7 +33,7 @@ public class RefEndpoint extends DefaultEndpoint implements DelegateEndpoint
{
 
     private volatile Endpoint endpoint;
 
-    @UriPath
+    @UriPath @Metadata(required = "true")
     private String name;
 
     public RefEndpoint(String endpointUri, Component component) {

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 6f42b4f..f21242f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -39,6 +39,7 @@ import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.processor.MulticastProcessor;
 import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
@@ -65,16 +66,16 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
     private volatile boolean multicastStarted;
     private volatile ExecutorService multicastExecutor;
 
-    @UriPath(description = "Name of queue")
+    @UriPath(description = "Name of queue") @Metadata(required = "true")
     private String name;
     @UriParam(defaultValue = "" + Integer.MAX_VALUE)
     private int size = Integer.MAX_VALUE;
 
     @UriParam(label = "consumer", defaultValue = "1")
     private int concurrentConsumers = 1;
-    @UriParam(label = "consumer", defaultValue = "false")
+    @UriParam(label = "consumer")
     private boolean multipleConsumers;
-    @UriParam(label = "consumer", defaultValue = "false")
+    @UriParam(label = "consumer")
     private boolean purgeWhenStopping;
     @UriParam(label = "consumer", defaultValue = "1000")
     private int pollTimeout = 1000;
@@ -83,7 +84,7 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
     private WaitForTaskToComplete waitForTaskToComplete = WaitForTaskToComplete.IfReplyExpected;
     @UriParam(label = "producer", defaultValue = "30000")
     private long timeout = 30000;
-    @UriParam(label = "producer", defaultValue = "false")
+    @UriParam(label = "producer")
     private boolean blockWhenFull;
     @UriParam(label = "producer")
     private boolean failIfNoConsumers;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
index 6f47ed7..0619550 100644
--- a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
@@ -24,6 +24,7 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
 public class TestEndpoint extends MockEndpoint {
     private static final Logger LOG = LoggerFactory.getLogger(TestEndpoint.class);
     private final Endpoint expectedMessageEndpoint;
-    @UriPath(description = "Name of endpoint to lookup in the registry to use for polling
messages used for testing")
+    @UriPath(description = "Name of endpoint to lookup in the registry to use for polling
messages used for testing") @Metadata(required = "true")
     private String name;
     @UriParam(defaultValue = "2000")
     private long timeout = 2000L;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
index 66796d3..b900c0d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
@@ -28,6 +28,7 @@ import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedResource;
 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;
@@ -40,7 +41,7 @@ import org.apache.camel.spi.UriPath;
 @ManagedResource(description = "Managed TimerEndpoint")
 @UriEndpoint(scheme = "timer", consumerOnly = true, consumerClass = TimerConsumer.class,
label = "core,scheduling")
 public class TimerEndpoint extends DefaultEndpoint implements MultipleConsumersSupport {
-    @UriPath
+    @UriPath @Metadata(required = "true")
     private String timerName;
     @UriParam
     private Date time;
@@ -48,7 +49,7 @@ public class TimerEndpoint extends DefaultEndpoint implements MultipleConsumersS
     private long period = 1000;
     @UriParam(defaultValue = "1000")
     private long delay = 1000;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean fixedRate;
     @UriParam(defaultValue = "true")
     private boolean daemon = true;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorEndpoint.java
index 9100125..24957fd 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorEndpoint.java
@@ -53,7 +53,7 @@ public class ValidatorEndpoint extends DefaultEndpoint {
     private SchemaFactory schemaFactory;
     @UriParam
     private ValidatorErrorHandler errorHandler = new DefaultValidationErrorHandler();
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean useDom;
     @UriParam(defaultValue = "true")
     private boolean useSharedSchema = true;

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
index 381a10d..da89bad 100644
--- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
@@ -64,7 +64,7 @@ public class XsltEndpoint extends ProcessorEndpoint {
     private String transformerFactoryClass;
     @UriParam
     private TransformerFactory transformerFactory;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean saxon;
     @UriParam
     private ResultHandlerFactory resultHandlerFactory;
@@ -80,7 +80,7 @@ public class XsltEndpoint extends ProcessorEndpoint {
     private URIResolver uriResolver;
     @UriParam(defaultValue = "true")
     private boolean allowStAX = true;
-    @UriParam(defaultValue = "false")
+    @UriParam
     private boolean deleteOutputFile;
 
     @Deprecated

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java
b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java
index 443e659..afd2f87 100644
--- a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java
@@ -45,9 +45,9 @@ public class DataFormatComponentConfigurationAndDocumentationTest extends
Contex
         String json = compConf.createParameterJsonSchema();
         assertNotNull(json);
 
-        assertTrue(json.contains("\"name\": { \"kind\": \"path\", \"type\": \"string\", \"javaType\":
\"java.lang.String\","
-                + " \"deprecated\": \"false\", \"description\": \"Name of data format\" }"));
-        assertTrue(json.contains("\"operation\": { \"kind\": \"path\", \"type\": \"string\""));
+        assertTrue(json.contains("\"name\": { \"kind\": \"path\", \"required\": \"true\",
\"type\": \"string\", \"javaType\": \"java.lang.String\","
+                        + " \"deprecated\": \"false\", \"description\": \"Name of data format\"
}"));
+        assertTrue(json.contains("\"operation\": { \"kind\": \"path\", \"required\": \"true\",
\"type\": \"string\""));
         assertTrue(json.contains("\"synchronous\": { \"kind\": \"parameter\", \"type\": \"boolean\""));
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java
b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java
index 2cab36c..e5bea1d 100644
--- a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java
@@ -41,7 +41,7 @@ public class MockComponentConfigurationAndDocumentationTest extends ContextTestS
         String json = compConf.createParameterJsonSchema();
         assertNotNull(json);
 
-        assertTrue(json.contains("\"name\": { \"kind\": \"path\", \"type\": \"string\""));
+        assertTrue(json.contains("\"name\": { \"kind\": \"path\", \"required\": \"true\",
\"type\": \"string\""));
         assertTrue(json.contains("\"expectedCount\": { \"kind\": \"parameter\", \"type\":
\"integer\""));
         assertTrue(json.contains("\"retainFirst\": { \"kind\": \"parameter\", \"type\": \"integer\""));
     }
@@ -51,7 +51,7 @@ public class MockComponentConfigurationAndDocumentationTest extends ContextTestS
         String json = context.explainEndpointJson("mock:foo?retainFirst=10", true);
         assertNotNull(json);
 
-        assertTrue(json.contains("\"name\": { \"kind\": \"path\", \"type\": \"string\", \"javaType\":
\"java.lang.String\","
+        assertTrue(json.contains("\"name\": { \"kind\": \"path\", \"required\": \"true\",
\"type\": \"string\", \"javaType\": \"java.lang.String\","
                 + " \"deprecated\": \"false\", \"value\": \"foo\", \"description\": \"Name
of mock endpoint\""));
         assertTrue(json.contains("\"expectedCount\": { \"kind\": \"parameter\", \"type\":
\"integer\""));
         assertTrue(json.contains("\"retainFirst\": { \"kind\": \"parameter\", \"type\": \"integer\""));

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
index 4fffa87..141f8ea 100644
--- a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
@@ -41,7 +41,7 @@ public class TimerComponentConfigurationAndDocumentationTest extends ContextTest
         String json = compConf.createParameterJsonSchema();
         assertNotNull(json);
 
-        assertTrue(json.contains("\"timerName\": { \"kind\": \"path\", \"type\": \"string\",
\"javaType\": \"java.lang.String\""
+        assertTrue(json.contains("\"timerName\": { \"kind\": \"path\", \"required\": \"true\",
\"type\": \"string\", \"javaType\": \"java.lang.String\""
                 + ", \"deprecated\": \"false\", \"description\": \"The name of the timer\"
}"));
         assertTrue(json.contains("\"delay\": { \"kind\": \"parameter\", \"type\": \"integer\""));
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/4f98efd4/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index c6e4f1e..c92eead 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -246,14 +246,13 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
         assertEquals(8, StringHelper.countChar(json, '}'));
 
         assertTrue(json.contains("\"scheme\": \"log\""));
-        assertTrue(json.contains("\"description\": \"The Log Component is for logging message
exchanges via the underlying logging mechanism.\""));
         assertTrue(json.contains("\"label\": \"core,monitoring\""));
 
         assertTrue(json.contains("\"groupDelay\": { \"kind\": \"parameter\", \"type\": \"integer\",
\"javaType\": \"java.lang.Long\", \"deprecated\": \"false\", \"value\": \"2000\","
                 + " \"description\": \"Set the initial delay for stats (in millis)\" },"));
         assertTrue(json.contains("\"groupSize\": { \"kind\": \"parameter\", \"type\": \"integer\",
\"javaType\": \"java.lang.Integer\", \"deprecated\": \"false\", \"value\": \"5\","
                 + " \"description\": \"An integer that specifies a group size for throughput
logging.\" }"));
-        assertTrue(json.contains("\"loggerName\": { \"kind\": \"path\", \"type\": \"string\",
\"javaType\": \"java.lang.String\", \"deprecated\": \"false\","
+        assertTrue(json.contains("\"loggerName\": { \"kind\": \"path\", \"required\": \"true\",
\"type\": \"string\", \"javaType\": \"java.lang.String\", \"deprecated\": \"false\","
                 + " \"value\": \"foo\", \"description\": \"The logger name to use\" }"));
         // and we should also have the javadoc documentation
         assertTrue(json.contains("Set the initial delay for stats (in millis)"));
@@ -277,14 +276,13 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
         assertEquals(14, StringHelper.countChar(json, '}'));
 
         assertTrue(json.contains("\"scheme\": \"log\""));
-        assertTrue(json.contains("\"description\": \"The Log Component is for logging message
exchanges via the underlying logging mechanism.\""));
         assertTrue(json.contains("\"label\": \"core,monitoring\""));
 
         assertTrue(json.contains("\"groupDelay\": { \"kind\": \"parameter\", \"type\": \"integer\",
\"javaType\": \"java.lang.Long\", \"deprecated\": \"false\", \"value\": \"2000\","
                 + " \"description\": \"Set the initial delay for stats (in millis)\" },"));
         assertTrue(json.contains("\"groupSize\": { \"kind\": \"parameter\", \"type\": \"integer\",
\"javaType\": \"java.lang.Integer\", \"deprecated\": \"false\", \"value\": \"5\","
                 + " \"description\": \"An integer that specifies a group size for throughput
logging.\" }"));
-        assertTrue(json.contains("\"loggerName\": { \"kind\": \"path\", \"type\": \"string\",
\"javaType\": \"java.lang.String\", \"deprecated\": \"false\","
+        assertTrue(json.contains("\"loggerName\": { \"kind\": \"path\", \"required\": \"true\",
\"type\": \"string\", \"javaType\": \"java.lang.String\", \"deprecated\": \"false\","
                 + " \"value\": \"foo\", \"description\": \"The logger name to use\" }"));
         assertTrue(json.contains("\"marker\": { \"kind\": \"parameter\", \"type\": \"string\",
\"javaType\": \"java.lang.String\""));
         // and we should also have the javadoc documentation
@@ -363,7 +361,6 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
         String json = (String) mbeanServer.invoke(on, "explainComponentJson", new Object[]{"seda",
false}, new String[]{"java.lang.String", "boolean"});
         assertNotNull(json);
 
-        assertTrue(json.contains("\"description\": \"The SEDA Component is for asynchronous
SEDA exchanges on a BlockingQueue within a CamelContext\""));
         assertTrue(json.contains("\"label\": \"core,endpoint\""));
         assertTrue(json.contains("\"defaultQueueFactory\": { \"kind\": \"property\", \"type\":
\"object\", \"javaType\":"
             + " \"org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>\","));


Mime
View raw message