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/27 15:06:57 UTC
[1/2] camel git commit: CAMEL-7999: apt plugin should let boolean
types as false for default values if not specified as true.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x b7e4d5666 -> 900001d0b
refs/heads/master 867040d6b -> 93a7beba0
CAMEL-7999: apt plugin should let boolean types as false for default values if not specified as true.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93a7beba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93a7beba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93a7beba
Branch: refs/heads/master
Commit: 93a7beba0ea45f19affec3f900f5344f884ccd1b
Parents: 867040d
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 27 15:08:18 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 27 15:08:18 2015 +0100
----------------------------------------------------------------------
.../component/file/GenericFileEndpoint.java | 14 ++++++-------
.../tools/apt/EndpointAnnotationProcessor.java | 21 +++++++++++++++++---
2 files changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/93a7beba/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 a6b6200..cb0f963 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
@@ -87,11 +87,11 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
protected Expression tempFileName;
@UriParam(label = "producer", defaultValue = "true")
protected boolean eagerDeleteTargetFile = true;
- @UriParam(defaultValue = "false", label = "producer")
+ @UriParam(label = "producer")
protected boolean keepLastModified;
@UriParam(label = "producer")
protected String doneFileName;
- @UriParam(label = "producer", defaultValue = "false")
+ @UriParam(label = "producer")
protected boolean allowNullBody;
@UriParam(label = "producer")
protected String chmod;
@@ -106,15 +106,15 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
protected IdempotentRepository<String> inProgressRepository = new MemoryIdempotentRepository();
@UriParam(label = "consumer")
protected String localWorkDirectory;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean startingDirectoryMustExist;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean directoryMustExist;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean noop;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean recursive;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean delete;
@UriParam(label = "consumer")
protected int maxMessagesPerPoll;
http://git-wip-us.apache.org/repos/asf/camel/blob/93a7beba/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 fa7c7d3..f7a228d 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
@@ -216,8 +216,13 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
String doc = entry.getDocumentationWithNotes();
doc = sanitizeDescription(doc, false);
Boolean required = entry.getRequired() != null ? Boolean.valueOf(entry.getRequired()) : null;
+ String defaultValue = entry.getDefaultValue();
+ if (Strings.isNullOrEmpty(defaultValue) && "boolean".equals(entry.getType())) {
+ // fallback as false for boolean types
+ defaultValue = "false";
+ }
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), "property", required, entry.getType(), entry.getDefaultValue(), doc,
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), "property", required, entry.getType(), defaultValue, doc,
entry.isDeprecated(), entry.getLabel(), entry.isEnumType(), entry.getEnums(), false, null));
}
buffer.append("\n },");
@@ -246,8 +251,13 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
String doc = entry.getDocumentation();
doc = sanitizeDescription(doc, false);
Boolean required = entry.getRequired() != null ? Boolean.valueOf(entry.getRequired()) : null;
+ String defaultValue = entry.getDefaultValue();
+ if (Strings.isNullOrEmpty(defaultValue) && "boolean".equals(entry.getType())) {
+ // fallback as false for boolean types
+ defaultValue = "false";
+ }
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), "path", required, entry.getType(), entry.getDefaultValue(), doc,
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), "path", required, entry.getType(), defaultValue, doc,
entry.isDeprecated(), label, entry.isEnumType(), entry.getEnums(), false, null));
}
@@ -273,8 +283,13 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
String doc = entry.getDocumentationWithNotes();
doc = sanitizeDescription(doc, false);
Boolean required = entry.getRequired() != null ? Boolean.valueOf(entry.getRequired()) : null;
+ String defaultValue = entry.getDefaultValue();
+ if (Strings.isNullOrEmpty(defaultValue) && "boolean".equals(entry.getType())) {
+ // fallback as false for boolean types
+ defaultValue = "false";
+ }
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), "parameter", required, entry.getType(), entry.getDefaultValue(),
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), "parameter", required, entry.getType(), defaultValue,
doc, entry.isDeprecated(), label, entry.isEnumType(), entry.getEnums(), false, null));
}
buffer.append("\n }");
[2/2] camel git commit: CAMEL-7999: apt plugin should let boolean
types as false for default values if not specified as true.
Posted by da...@apache.org.
CAMEL-7999: apt plugin should let boolean types as false for default values if not specified as true.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/900001d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/900001d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/900001d0
Branch: refs/heads/camel-2.15.x
Commit: 900001d0bf06c2a268ddee03bb5e7ef6e9eb5266
Parents: b7e4d56
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 27 15:08:18 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 27 15:09:06 2015 +0100
----------------------------------------------------------------------
.../component/file/GenericFileEndpoint.java | 14 ++++++-------
.../tools/apt/EndpointAnnotationProcessor.java | 21 +++++++++++++++++---
2 files changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/900001d0/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 a6b6200..cb0f963 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
@@ -87,11 +87,11 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
protected Expression tempFileName;
@UriParam(label = "producer", defaultValue = "true")
protected boolean eagerDeleteTargetFile = true;
- @UriParam(defaultValue = "false", label = "producer")
+ @UriParam(label = "producer")
protected boolean keepLastModified;
@UriParam(label = "producer")
protected String doneFileName;
- @UriParam(label = "producer", defaultValue = "false")
+ @UriParam(label = "producer")
protected boolean allowNullBody;
@UriParam(label = "producer")
protected String chmod;
@@ -106,15 +106,15 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
protected IdempotentRepository<String> inProgressRepository = new MemoryIdempotentRepository();
@UriParam(label = "consumer")
protected String localWorkDirectory;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean startingDirectoryMustExist;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean directoryMustExist;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean noop;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean recursive;
- @UriParam(label = "consumer", defaultValue = "false")
+ @UriParam(label = "consumer")
protected boolean delete;
@UriParam(label = "consumer")
protected int maxMessagesPerPoll;
http://git-wip-us.apache.org/repos/asf/camel/blob/900001d0/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 fa7c7d3..f7a228d 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
@@ -216,8 +216,13 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
String doc = entry.getDocumentationWithNotes();
doc = sanitizeDescription(doc, false);
Boolean required = entry.getRequired() != null ? Boolean.valueOf(entry.getRequired()) : null;
+ String defaultValue = entry.getDefaultValue();
+ if (Strings.isNullOrEmpty(defaultValue) && "boolean".equals(entry.getType())) {
+ // fallback as false for boolean types
+ defaultValue = "false";
+ }
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), "property", required, entry.getType(), entry.getDefaultValue(), doc,
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), "property", required, entry.getType(), defaultValue, doc,
entry.isDeprecated(), entry.getLabel(), entry.isEnumType(), entry.getEnums(), false, null));
}
buffer.append("\n },");
@@ -246,8 +251,13 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
String doc = entry.getDocumentation();
doc = sanitizeDescription(doc, false);
Boolean required = entry.getRequired() != null ? Boolean.valueOf(entry.getRequired()) : null;
+ String defaultValue = entry.getDefaultValue();
+ if (Strings.isNullOrEmpty(defaultValue) && "boolean".equals(entry.getType())) {
+ // fallback as false for boolean types
+ defaultValue = "false";
+ }
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), "path", required, entry.getType(), entry.getDefaultValue(), doc,
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), "path", required, entry.getType(), defaultValue, doc,
entry.isDeprecated(), label, entry.isEnumType(), entry.getEnums(), false, null));
}
@@ -273,8 +283,13 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor {
String doc = entry.getDocumentationWithNotes();
doc = sanitizeDescription(doc, false);
Boolean required = entry.getRequired() != null ? Boolean.valueOf(entry.getRequired()) : null;
+ String defaultValue = entry.getDefaultValue();
+ if (Strings.isNullOrEmpty(defaultValue) && "boolean".equals(entry.getType())) {
+ // fallback as false for boolean types
+ defaultValue = "false";
+ }
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), "parameter", required, entry.getType(), entry.getDefaultValue(),
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), "parameter", required, entry.getType(), defaultValue,
doc, entry.isDeprecated(), label, entry.isEnumType(), entry.getEnums(), false, null));
}
buffer.append("\n }");