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 2014/11/09 11:18:50 UTC
[1/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
Repository: camel
Updated Branches:
refs/heads/master d3a69dc81 -> 9b61389d4
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da782074
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da782074
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da782074
Branch: refs/heads/master
Commit: da7820746a14a45bc0b08ba4a7e1177a81e7507d
Parents: d3a69dc
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 9 10:26:36 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 9 10:26:36 2014 +0100
----------------------------------------------------------------------
.../tools/apt/EndpointAnnotationProcessor.java | 30 ++++++++++++++++----
.../java/org/apache/camel/spi/UriEndpoint.java | 1 +
.../java/org/apache/camel/spi/UriParam.java | 17 ++++++++++-
.../java/org/apache/camel/spi/UriParams.java | 1 +
4 files changed, 43 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/da782074/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 0db4b60..7d90b1a 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -192,13 +192,15 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
writer.println(" <tr>");
writer.println(" <th>Name</th>");
writer.println(" <th>Type</th>");
+ writer.println(" <th>Default Value</th>");
writer.println(" <th>Description</th>");
writer.println(" </tr>");
for (EndpointOption option : endpointOptions) {
writer.println(" <tr>");
writer.println(" <td>" + option.getName() + "</td>");
writer.println(" <td>" + option.getType() + "</td>");
- writer.println(" <td>" + option.getDocumentation() + "</td>");
+ writer.println(" <td>" + option.getDefaultValue() + "</td>");
+ writer.println(" <td>" + option.getDocumentationWithNotes() + "</td>");
writer.println(" </tr>");
}
writer.println("</table>");
@@ -221,6 +223,10 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
name = fieldName;
}
name = prefix + name;
+
+ String defaultValue = param.defaultValue();
+ String defaultValueNote = param.defaultValueNote();
+
// if the field type is a nested parameter then iterate through its fields
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
@@ -275,9 +281,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
}
- // we could likely detect if the type is collection based?
-
- EndpointOption option = new EndpointOption(name, fieldTypeName, docComment.trim(), isEnum, enums);
+ EndpointOption option = new EndpointOption(name, fieldTypeName, defaultValue, defaultValueNote, docComment.trim(), isEnum, enums);
endpointOptions.add(option);
}
}
@@ -377,13 +381,18 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
private String name;
private String type;
+ private String defaultValue;
+ private String defaultValueNote;
private String documentation;
private boolean enumType;
private Set<String> enums;
- private EndpointOption(String name, String type, String documentation, boolean enumType, Set<String> enums) {
+ private EndpointOption(String name, String type, String defaultValue, String defaultValueNote,
+ String documentation, boolean enumType, Set<String> enums) {
this.name = name;
this.type = type;
+ this.defaultValue = defaultValue;
+ this.defaultValueNote = defaultValueNote;
this.documentation = documentation;
this.enumType = enumType;
this.enums = enums;
@@ -397,10 +406,21 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
return type;
}
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+
public String getDocumentation() {
return documentation;
}
+ public String getDocumentationWithNotes() {
+ if (defaultValueNote != null) {
+ return documentation + ". Default value notice: " + defaultValueNote;
+ }
+ return documentation;
+ }
+
public boolean isEnumType() {
return enumType;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/da782074/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
----------------------------------------------------------------------
diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
index 60da8f0..9342431 100644
--- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
+++ b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriEndpoint.java
@@ -31,6 +31,7 @@ import java.lang.annotation.Target;
@Documented
@Target({ElementType.TYPE})
public @interface UriEndpoint {
+
/**
* Represents the URI scheme name of this endpoint
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/da782074/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
----------------------------------------------------------------------
diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
index 5e360da..5caac4c 100644
--- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
+++ b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
@@ -29,11 +29,26 @@ import java.lang.annotation.Target;
@Documented
@Target({ElementType.FIELD })
public @interface UriParam {
+
/**
* Returns the name of the parameter.
- *
+ * <p/>
* If this is not specified then the name of the field or property which has this annotation is used.
*/
String name() default "";
+ /**
+ * The default value of the parameter.
+ * <p/>
+ * Note that this attribute is only for documentation purpose. The default value in use at runtime is the value the Java field was assigned.
+ */
+ String defaultValue();
+
+ /**
+ * A special note about the default value.
+ * <p/>
+ * This can be used to document special cases about the default value.
+ */
+ String defaultValueNote();
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/da782074/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParams.java
----------------------------------------------------------------------
diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParams.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParams.java
index 66c0051..fed7f7e 100644
--- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParams.java
+++ b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParams.java
@@ -30,6 +30,7 @@ import java.lang.annotation.Target;
@Documented
@Target({ElementType.TYPE })
public @interface UriParams {
+
/**
* Returns the prefix used to access nested properties of this configuration object
*/
[2/5] camel git commit: Removed duplicate camel-docker
Posted by da...@apache.org.
Removed duplicate camel-docker
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82124427
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82124427
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82124427
Branch: refs/heads/master
Commit: 821244276a768c437a9d34deefb1a7cb81994490
Parents: da78207
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 9 10:27:08 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 9 10:27:08 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/82124427/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2765f68..6efd4ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -722,11 +722,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-docker</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-dozer</artifactId>
<version>${project.version}</version>
</dependency>
[3/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
Posted by da...@apache.org.
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/03dd3cc0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/03dd3cc0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/03dd3cc0
Branch: refs/heads/master
Commit: 03dd3cc0a6b5d5604f17cfaeb3424433a39b7ef9
Parents: 8212442
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 9 10:54:30 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 9 10:54:30 2014 +0100
----------------------------------------------------------------------
.../camel/component/bean/BeanEndpoint.java | 4 +--
.../controlbus/ControlBusEndpoint.java | 4 +--
.../component/dataset/DataSetEndpoint.java | 10 +++---
.../camel/component/direct/DirectEndpoint.java | 4 +--
.../component/directvm/DirectVmEndpoint.java | 4 +--
.../camel/component/file/FileEndpoint.java | 6 ++--
.../component/file/GenericFileEndpoint.java | 38 ++++++++++----------
.../component/language/LanguageEndpoint.java | 8 ++---
.../camel/component/seda/SedaEndpoint.java | 16 ++++-----
.../camel/component/test/TestEndpoint.java | 2 +-
.../camel/component/timer/TimerEndpoint.java | 10 +++---
.../camel/component/xslt/XsltEndpoint.java | 2 +-
.../org/apache/camel/impl/DefaultEndpoint.java | 4 +--
.../tools/apt/EndpointAnnotationProcessor.java | 21 +++++------
.../camel/tools/apt/JsonSchemaHelper.java | 7 +++-
.../java/org/apache/camel/spi/UriParam.java | 4 +--
16 files changed, 75 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 c6933ae..cdb770f 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
@@ -31,9 +31,9 @@ import org.apache.camel.spi.UriParam;
@UriEndpoint(scheme = "bean")
public class BeanEndpoint extends ProcessorEndpoint {
private BeanHolder beanHolder;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean cache;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean multiParameterArray;
@UriParam
private String beanName;
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 daacd7c..f1fd3df 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
@@ -39,9 +39,9 @@ public class ControlBusEndpoint extends DefaultEndpoint {
private String routeId;
@UriParam
private String action;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean async;
- @UriParam
+ @UriParam(defaultValue = "INFO")
private LoggingLevel loggingLevel = LoggingLevel.INFO;
public ControlBusEndpoint(String endpointUri, Component component) {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 6999452..57f30fe 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
@@ -45,15 +45,15 @@ public class DataSetEndpoint extends MockEndpoint implements Service {
private final transient Logger log;
private volatile DataSet dataSet;
private final AtomicInteger receivedCounter = new AtomicInteger();
- @UriParam
+ @UriParam(defaultValue = "0")
private int minRate;
- @UriParam
+ @UriParam(defaultValue = "3")
private long produceDelay = 3;
- @UriParam
+ @UriParam(defaultValue = "0")
private long consumeDelay;
- @UriParam
+ @UriParam(defaultValue = "0")
private long preloadSize;
- @UriParam
+ @UriParam(defaultValue = "1000")
private long initialDelay = 1000;
@Deprecated
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 855f275..fa59de6 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
@@ -38,9 +38,9 @@ import org.apache.camel.util.ObjectHelper;
public class DirectEndpoint extends DefaultEndpoint {
private volatile Map<String, DirectConsumer> consumers;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean block;
- @UriParam
+ @UriParam(defaultValue = "30000")
private long timeout = 30000L;
public DirectEndpoint() {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 9a090b5..e8af675 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
@@ -30,9 +30,9 @@ import org.apache.camel.spi.UriParam;
@UriEndpoint(scheme = "direct-vm", consumerClass = DirectConsumer.class)
public class DirectVmEndpoint extends DefaultEndpoint {
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean block;
- @UriParam
+ @UriParam(defaultValue = "30000")
private long timeout = 30000L;
public DirectVmEndpoint(String endpointUri, DirectVmComponent component) {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 4e0a920..4177f5d 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
@@ -38,11 +38,11 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
private final FileOperations operations = new FileOperations(this);
@UriPath
private File file;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean copyAndDeleteOnRenameFail = true;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean renameUsingCopy;
- @UriParam
+ @UriParam(defaultValue = "true")
private boolean forceWrites = true;
public FileEndpoint() {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 b3e96e7..0f0c424 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
@@ -72,29 +72,29 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
protected IdempotentRepository<String> inProgressRepository = new MemoryIdempotentRepository();
@UriParam
protected String localWorkDirectory;
- @UriParam
+ @UriParam(defaultValue = "true")
protected boolean autoCreate = true;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean startingDirectoryMustExist;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean directoryMustExist;
- @UriParam
+ @UriParam(defaultValue = "" + FileUtil.BUFFER_SIZE)
protected int bufferSize = FileUtil.BUFFER_SIZE;
- @UriParam
+ @UriParam(defaultValue = "Override")
protected GenericFileExist fileExist = GenericFileExist.Override;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean noop;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean recursive;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean delete;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean flatten;
@UriParam
protected int maxMessagesPerPoll;
- @UriParam
+ @UriParam(defaultValue = "true")
protected boolean eagerMaxMessagesPerPoll = true;
- @UriParam
+ @UriParam(defaultValue = "" + Integer.MAX_VALUE)
protected int maxDepth = Integer.MAX_VALUE;
@UriParam
protected int minDepth;
@@ -102,7 +102,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
protected String tempPrefix;
@UriParam
protected Expression tempFileName;
- @UriParam
+ @UriParam(defaultValue = "true")
protected boolean eagerDeleteTargetFile = true;
@UriParam
protected String include;
@@ -136,23 +136,23 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
protected Comparator<Exchange> sortBy;
@UriParam
protected String readLock = "none";
- @UriParam
+ @UriParam(defaultValue = "1000")
protected long readLockCheckInterval = 1000;
- @UriParam
+ @UriParam(defaultValue = "10000")
protected long readLockTimeout = 10000;
- @UriParam
+ @UriParam(defaultValue = "true")
protected boolean readLockMarkerFile = true;
- @UriParam
+ @UriParam(defaultValue = "WARN")
protected LoggingLevel readLockLoggingLevel = LoggingLevel.WARN;
- @UriParam
+ @UriParam(defaultValue = "1")
protected long readLockMinLength = 1;
@UriParam
protected GenericFileExclusiveReadLockStrategy<T> exclusiveReadLockStrategy;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean keepLastModified;
@UriParam
protected String doneFileName;
- @UriParam
+ @UriParam(defaultValue = "false")
protected boolean allowNullBody;
@UriParam
protected String chmod;
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 71261ff..3701149 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
@@ -48,13 +48,13 @@ public class LanguageEndpoint extends ResourceEndpoint {
private String languageName;
@UriParam
private String script;
- @UriParam
+ @UriParam(defaultValue = "true")
private boolean transform = true;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean binary;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean contentResolvedFromResource;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean cacheScript;
public LanguageEndpoint() {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 f6e3843..f5043fa 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
@@ -63,21 +63,21 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
private volatile MulticastProcessor consumerMulticastProcessor;
private volatile boolean multicastStarted;
private volatile ExecutorService multicastExecutor;
- @UriParam
+ @UriParam(defaultValue = "" + Integer.MAX_VALUE)
private int size = Integer.MAX_VALUE;
- @UriParam
+ @UriParam(defaultValue = "1")
private int concurrentConsumers = 1;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean multipleConsumers;
- @UriParam
+ @UriParam(defaultValue = "IfReplyExpected")
private WaitForTaskToComplete waitForTaskToComplete = WaitForTaskToComplete.IfReplyExpected;
- @UriParam
+ @UriParam(defaultValue = "30000")
private long timeout = 30000;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean blockWhenFull;
- @UriParam
+ @UriParam(defaultValue = "1000")
private int pollTimeout = 1000;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean purgeWhenStopping;
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 62401ed..ce3c50d 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
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
public class TestEndpoint extends MockEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(TestEndpoint.class);
private final Endpoint expectedMessageEndpoint;
- @UriParam
+ @UriParam(defaultValue = "2000")
private long timeout = 2000L;
public TestEndpoint(String endpointUri, Component component, Endpoint expectedMessageEndpoint) {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 321167e..d2d6bb8 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
@@ -43,17 +43,17 @@ public class TimerEndpoint extends DefaultEndpoint implements MultipleConsumersS
private String timerName;
@UriParam
private Date time;
- @UriParam
+ @UriParam(defaultValue = "1000")
private long period = 1000;
- @UriParam
+ @UriParam(defaultValue = "1000")
private long delay = 1000;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean fixedRate;
- @UriParam
+ @UriParam(defaultValue = "true")
private boolean daemon = true;
@UriParam
private Timer timer;
- @UriParam
+ @UriParam(defaultValue = "false")
private long repeatCount;
public TimerEndpoint() {
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/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 ea0fa26..003f2b6 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
@@ -43,7 +43,7 @@ public class XsltEndpoint extends ProcessorEndpoint {
private XsltBuilder xslt;
@UriParam
private String resourceUri;
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean cacheStylesheet;
public XsltEndpoint(String endpointUri, Component component, XsltBuilder xslt, String resourceUri,
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
index 2a6c5b0..b5dba17 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
@@ -59,11 +59,11 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
private EndpointConfiguration endpointConfiguration;
private CamelContext camelContext;
private Component component;
- @UriParam
+ @UriParam(defaultValue = "InOnly")
private ExchangePattern exchangePattern = ExchangePattern.InOnly;
// option to allow end user to dictate whether async processing should be
// used or not (if possible)
- @UriParam
+ @UriParam(defaultValue = "false")
private boolean synchronous;
private final String id = EndpointHelper.createEndpointId();
private Map<String, Object> consumerProperties;
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 7d90b1a..c825bf4 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -50,6 +50,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import static org.apache.camel.tools.apt.Strings.canonicalClassName;
+import static org.apache.camel.tools.apt.Strings.isNullOrEmpty;
/**
* Processes all Camel {@link UriEndpoint}s and generate json schema and html documentation for the endpoint/component.
@@ -74,7 +75,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
final UriEndpoint uriEndpoint = classElement.getAnnotation(UriEndpoint.class);
if (uriEndpoint != null) {
String scheme = uriEndpoint.scheme();
- if (!Strings.isNullOrEmpty(scheme)) {
+ if (!isNullOrEmpty(scheme)) {
// write html documentation
String name = canonicalClassName(classElement.getQualifiedName().toString());
String packageName = name.substring(0, name.lastIndexOf("."));
@@ -145,7 +146,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
String scheme = uriEndpoint.scheme();
String classDoc = processingEnv.getElementUtils().getDocComment(classElement);
- if (!Strings.isNullOrEmpty(classDoc)) {
+ if (!isNullOrEmpty(classDoc)) {
classDoc = JsonSchemaHelper.sanitizeDescription(classDoc);
}
@@ -170,7 +171,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
buffer.append(",");
}
buffer.append("\n ");
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getType(), entry.getDocumentation(), entry.isEnumType(), entry.getEnums()));
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getType(), entry.getDefaultValue(), entry.getDocumentationWithNotes(), entry.isEnumType(), entry.getEnums()));
}
buffer.append("\n }\n}\n");
return buffer.toString();
@@ -178,7 +179,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
protected void showDocumentationAndFieldInjections(PrintWriter writer, RoundEnvironment roundEnv, TypeElement classElement, String prefix) {
String classDoc = processingEnv.getElementUtils().getDocComment(classElement);
- if (!Strings.isNullOrEmpty(classDoc)) {
+ if (!isNullOrEmpty(classDoc)) {
// remove dodgy @version that we may have in class javadoc
classDoc = classDoc.replaceFirst("\\@version", "");
classDoc = classDoc.trim();
@@ -219,7 +220,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
String fieldName = fieldElement.getSimpleName().toString();
if (param != null) {
String name = param.name();
- if (Strings.isNullOrEmpty(name)) {
+ if (isNullOrEmpty(name)) {
name = fieldName;
}
name = prefix + name;
@@ -238,13 +239,13 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
if (fieldParams != null) {
String nestedPrefix = prefix;
String extraPrefix = fieldParams.prefix();
- if (!Strings.isNullOrEmpty(extraPrefix)) {
+ if (!isNullOrEmpty(extraPrefix)) {
nestedPrefix += extraPrefix;
}
findClassProperties(roundEnv, endpointOptions, fieldTypeElement, nestedPrefix);
} else {
String docComment = elementUtils.getDocComment(fieldElement);
- if (Strings.isNullOrEmpty(docComment)) {
+ if (isNullOrEmpty(docComment)) {
String setter = "set" + fieldName.substring(0, 1).toUpperCase();
if (fieldName.length() > 1) {
setter += fieldName.substring(1);
@@ -255,7 +256,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
String methodName = method.getSimpleName().toString();
if (setter.equals(methodName) && method.getParameters().size() == 1) {
String doc = elementUtils.getDocComment(method);
- if (!Strings.isNullOrEmpty(doc)) {
+ if (!isNullOrEmpty(doc)) {
docComment = doc;
break;
}
@@ -301,7 +302,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
protected TypeElement findTypeElement(RoundEnvironment roundEnv, String className) {
- if (!Strings.isNullOrEmpty(className) && !"java.lang.Object".equals(className)) {
+ if (!isNullOrEmpty(className) && !"java.lang.Object".equals(className)) {
Set<? extends Element> rootElements = roundEnv.getRootElements();
for (Element rootElement : rootElements) {
if (rootElement instanceof TypeElement) {
@@ -415,7 +416,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
public String getDocumentationWithNotes() {
- if (defaultValueNote != null) {
+ if (!isNullOrEmpty(defaultValueNote)) {
return documentation + ". Default value notice: " + defaultValueNote;
}
return documentation;
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java
index ba60328..f396bef 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java
@@ -26,7 +26,7 @@ final class JsonSchemaHelper {
private JsonSchemaHelper() {
}
- public static String toJson(String name, String type, String description, boolean enumType, Set<String> enums) {
+ public static String toJson(String name, String type, String defaultValue, String description, boolean enumType, Set<String> enums) {
String typeName = JsonSchemaHelper.getType(type, enumType);
StringBuilder sb = new StringBuilder();
@@ -51,6 +51,11 @@ final class JsonSchemaHelper {
sb.append(", \"javaType\": \"" + type + "\"");
}
+ if (!Strings.isNullOrEmpty(defaultValue)) {
+ sb.append(", \"defaultValue\": ");
+ sb.append(Strings.doubleQuote(defaultValue));
+ }
+
if (!Strings.isNullOrEmpty(description)) {
sb.append(", \"description\": ");
String text = sanitizeDescription(description);
http://git-wip-us.apache.org/repos/asf/camel/blob/03dd3cc0/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
----------------------------------------------------------------------
diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
index 5caac4c..2724999 100644
--- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
+++ b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/UriParam.java
@@ -42,13 +42,13 @@ public @interface UriParam {
* <p/>
* Note that this attribute is only for documentation purpose. The default value in use at runtime is the value the Java field was assigned.
*/
- String defaultValue();
+ String defaultValue() default "";
/**
* A special note about the default value.
* <p/>
* This can be used to document special cases about the default value.
*/
- String defaultValueNote();
+ String defaultValueNote() default "";
}
\ No newline at end of file
[4/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
Posted by da...@apache.org.
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc152202
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc152202
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc152202
Branch: refs/heads/master
Commit: fc152202f5f412f95778b736ed48442d7adff584
Parents: 03dd3cc
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 9 11:10:24 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 9 11:10:24 2014 +0100
----------------------------------------------------------------------
.../api/management/mbean/CamelOpenMBeanTypes.java | 8 ++++----
.../api/management/mbean/ManagedEndpointMBean.java | 2 +-
.../org/apache/camel/component/log/LogEndpoint.java | 4 ++--
.../org/apache/camel/impl/DefaultCamelContext.java | 13 ++++++++++---
.../apache/camel/management/mbean/ManagedEndpoint.java | 5 +++--
.../camel/management/ManagedEndpointExplainTest.java | 8 ++++----
6 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
index fc75bdd..da19b08 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
@@ -66,13 +66,13 @@ public final class CamelOpenMBeanTypes {
public static TabularType explainEndpointTabularType() throws OpenDataException {
CompositeType ct = explainEndpointsCompositeType();
- return new TabularType("explainEndpoint", "Explain how this endpoint is configured", ct, new String[]{"option", "type", "java type", "value", "description"});
+ return new TabularType("explainEndpoint", "Explain how this endpoint is configured", ct, new String[]{"option", "type", "java type", "value", "default value", "description"});
}
public static CompositeType explainEndpointsCompositeType() throws OpenDataException {
- return new CompositeType("endpoint", "Explain Endpoint", new String[]{"option", "type", "java type", "value", "description"},
- new String[]{"Option", "Type", "Java Type", "Value", "Description"},
- new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
+ return new CompositeType("endpoint", "Explain Endpoint", new String[]{"option", "type", "java type", "value", "default value", "description"},
+ new String[]{"Option", "Type", "Java Type", "Value", "Default Value", "Description"},
+ new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
index fd49aee..fa25f43 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
@@ -38,7 +38,7 @@ public interface ManagedEndpointMBean {
@ManagedAttribute(description = "Endpoint State")
String getState();
- @ManagedOperation(description = "Explain how this endpoint is configured (option, value, description)")
+ @ManagedOperation(description = "Explain how this endpoint is configured")
TabularData explain(boolean allOptions);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/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 c5e96b5..7aeac00 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
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
public class LogEndpoint extends ProcessorEndpoint {
private volatile Processor logger;
- @UriParam
+ @UriParam(defaultValue = "INFO")
private String level;
@UriParam
private String marker;
@@ -45,7 +45,7 @@ public class LogEndpoint extends ProcessorEndpoint {
private Integer groupSize;
@UriParam
private Long groupInterval;
- @UriParam
+ @UriParam(defaultValue = "true")
private Boolean groupActiveOnly;
@UriParam
private Long groupDelay;
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 76bc0d8..01cdefb 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -1175,18 +1175,20 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// find type and description from the json schema
String type = null;
String javaType = null;
+ String defaultValue = null;
String description = null;
for (Map<String, String> row : rows) {
if (name.equals(row.get("name"))) {
type = row.get("type");
javaType = row.get("javaType");
+ defaultValue = row.get("defaultValue");
description = row.get("description");
break;
}
}
// add as selected row
- selected.put(name, new String[]{name, type, javaType, value, description});
+ selected.put(name, new String[]{name, type, javaType, value, defaultValue, description});
}
if (includeAllOptions) {
@@ -1194,6 +1196,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
for (Map<String, String> row : rows) {
String name = row.get("name");
String value = row.get("value");
+ String defaultValue = row.get("defaultValue");
String type = row.get("type");
String javaType = row.get("javaType");
value = URISupport.sanitizePath(value);
@@ -1201,7 +1204,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// add as selected row
if (!selected.containsKey(name)) {
- selected.put(name, new String[]{name, type, javaType, value, description});
+ selected.put(name, new String[]{name, type, javaType, value, defaultValue, description});
}
}
}
@@ -1221,7 +1224,8 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
String type = row[1];
String javaType = row[2];
String value = row[3];
- String description = row[4];
+ String defaultValue = row[4];
+ String description = row[5];
// add json of the option
buffer.append(doubleQuote(name) + ": { ");
@@ -1235,6 +1239,9 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (value != null) {
csb.append("\"value\": \"" + value + "\"");
}
+ if (defaultValue != null) {
+ csb.append("\"defaultValue\": \"" + defaultValue + "\"");
+ }
if (description != null) {
csb.append("\"description\": \"" + description + "\"");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
index 3e2b881..e6ae3e3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
@@ -96,12 +96,13 @@ public class ManagedEndpoint implements ManagedInstance, ManagedEndpointMBean {
String type = row.get("type");
String javaType = row.get("javaType");
String value = row.get("value") != null ? row.get("value") : "";
+ String defaultValue = row.get("defaultValue") != null ? row.get("defaultValue") : "";
String description = row.get("description") != null ? row.get("description") : "";
CompositeType ct = CamelOpenMBeanTypes.explainEndpointsCompositeType();
CompositeData data = new CompositeDataSupport(ct,
- new String[]{"option", "type", "java type", "value", "description"},
- new Object[]{option, type, javaType, value, description});
+ new String[]{"option", "type", "java type", "value", "default value", "description"},
+ new Object[]{option, type, javaType, value, defaultValue, description});
answer.put(data);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc152202/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
index 3f7908e..2b6d75a 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
@@ -41,12 +41,12 @@ public class ManagedEndpointExplainTest extends ManagementTestSupport {
on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"mock://result\"");
assertTrue(mbeanServer.isRegistered(on));
- on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"log://foo\\?groupDelay=2000&groupSize=5\"");
+ on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=endpoints,name=\"log://foo\\?groupDelay=2000&groupSize=5&level=WARN\"");
assertTrue(mbeanServer.isRegistered(on));
- // there should be 2 options
+ // there should be 3 options
TabularData data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{false}, new String[]{"boolean"});
- assertEquals(2, data.size());
+ assertEquals(3, data.size());
// there should be 6 options
data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{true}, new String[]{"boolean"});
@@ -59,7 +59,7 @@ public class ManagedEndpointExplainTest extends ManagementTestSupport {
@Override
public void configure() throws Exception {
from("seda:test")
- .to("log:foo?groupDelay=2000&groupSize=5")
+ .to("log:foo?groupDelay=2000&groupSize=5&level=WARN")
.to("mock:result");
}
};
[5/5] camel git commit: CAMEL-7999: Add defaultValue to @UriParam
Posted by da...@apache.org.
CAMEL-7999: Add defaultValue to @UriParam
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b61389d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b61389d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b61389d
Branch: refs/heads/master
Commit: 9b61389d4e745184629f7793dc9a61957c4d8bc9
Parents: fc15220
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 9 11:18:39 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 9 11:18:39 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/karaf/commands/EndpointExplain.java | 5 +++++
.../main/java/org/apache/camel/karaf/commands/EndpointList.java | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9b61389d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
index 895083f..40c62c7 100644
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
+++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java
@@ -111,6 +111,11 @@ public class EndpointExplain extends CamelCommandSupport {
out.print("Value:\t\t");
out.println(value);
}
+ String defaultValue = option.get("defaultValue");
+ if (defaultValue != null) {
+ out.print("Default Value:\t");
+ out.println(defaultValue);
+ }
String description = option.get("description");
if (description != null) {
out.print("Description:\t");
http://git-wip-us.apache.org/repos/asf/camel/blob/9b61389d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
index 2ec9d6c..caed7ab 100644
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
+++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java
@@ -28,6 +28,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
import org.apache.camel.util.JsonSchemaHelper;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
@@ -110,6 +111,9 @@ public class EndpointList extends CamelCommandSupport {
String type = option.get("type");
String javaType = option.get("javaType");
String value = option.get("value");
+ if (ObjectHelper.isEmpty(value)) {
+ value = option.get("defaultValue");
+ }
String desc = option.get("description");
if (key != null && value != null) {
if (first) {