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/10/08 10:39:59 UTC
[1/6] camel git commit: Added todo about naming clash
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 3e920506d -> 8d42d7bed
refs/heads/master f32620dde -> 3ebec4335
Added todo about naming clash
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80a17580
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80a17580
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80a17580
Branch: refs/heads/master
Commit: 80a17580d240651aa7d3fd4ea1f44fe9a33e9d1e
Parents: f32620d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 8 10:23:45 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 8 10:23:45 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/model/LoadBalanceDefinition.java | 1 +
.../org/apache/camel/model/dataformat/DataFormatsDefinition.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/80a17580/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
index 4539c6c..bc9370a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
@@ -51,6 +51,7 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini
@XmlElements({
@XmlElement(required = false, name = "failover", type = FailoverLoadBalancerDefinition.class),
@XmlElement(required = false, name = "random", type = RandomLoadBalancerDefinition.class),
+ // TODO: Camel 3.0 - Should be named customLoadBalancer to avoid naming clash with custom dataformat
@XmlElement(required = false, name = "custom", type = CustomLoadBalancerDefinition.class),
@XmlElement(required = false, name = "roundRobin", type = RoundRobinLoadBalancerDefinition.class),
@XmlElement(required = false, name = "sticky", type = StickyLoadBalancerDefinition.class),
http://git-wip-us.apache.org/repos/asf/camel/blob/80a17580/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index 49d079a..d0ea53b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -47,6 +47,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "castor", type = CastorDataFormat.class),
@XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class),
@XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
+ // TODO: Camel 3.0 - Should be named customDataFormat to avoid naming clash with custom loadbalancer
@XmlElement(required = false, name = "custom", type = CustomDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
[4/6] camel git commit: Added todo about naming clash
Posted by da...@apache.org.
Added todo about naming clash
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5fb2517
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5fb2517
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5fb2517
Branch: refs/heads/camel-2.16.x
Commit: f5fb25173f66b831c72da858ae947eae33d2d6d7
Parents: 3e92050
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 8 10:23:45 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 8 10:41:55 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/model/LoadBalanceDefinition.java | 1 +
.../org/apache/camel/model/dataformat/DataFormatsDefinition.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f5fb2517/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
index 4539c6c..bc9370a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
@@ -51,6 +51,7 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini
@XmlElements({
@XmlElement(required = false, name = "failover", type = FailoverLoadBalancerDefinition.class),
@XmlElement(required = false, name = "random", type = RandomLoadBalancerDefinition.class),
+ // TODO: Camel 3.0 - Should be named customLoadBalancer to avoid naming clash with custom dataformat
@XmlElement(required = false, name = "custom", type = CustomLoadBalancerDefinition.class),
@XmlElement(required = false, name = "roundRobin", type = RoundRobinLoadBalancerDefinition.class),
@XmlElement(required = false, name = "sticky", type = StickyLoadBalancerDefinition.class),
http://git-wip-us.apache.org/repos/asf/camel/blob/f5fb2517/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index 49d079a..d0ea53b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -47,6 +47,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "castor", type = CastorDataFormat.class),
@XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class),
@XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
+ // TODO: Camel 3.0 - Should be named customDataFormat to avoid naming clash with custom loadbalancer
@XmlElement(required = false, name = "custom", type = CustomDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
[6/6] camel git commit: Fixed missing docs in rest model in the
catalog
Posted by da...@apache.org.
Fixed missing docs in rest model in the catalog
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d42d7be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d42d7be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d42d7be
Branch: refs/heads/camel-2.16.x
Commit: 8d42d7bed9279f53ad6a1acb437c051e272ac708
Parents: 2109007
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 8 10:41:27 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 8 10:42:04 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/tools/apt/EipAnnotationProcessor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8d42d7be/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index 8a7d01f..d9aca0a 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -712,6 +712,9 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
*/
private void processVerbs(RoundEnvironment roundEnv, TypeElement originalClassType, XmlElementRef elementRef,
VariableElement fieldElement, String fieldName, Set<EipOption> eipOptions, String prefix) {
+
+ Elements elementUtils = processingEnv.getElementUtils();
+
if ("verbs".equals(fieldName) && supportOutputs(originalClassType)) {
String kind = "element";
String name = elementRef.name();
@@ -722,6 +725,8 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
+ String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, originalClassType, true);
+
// gather oneOf which extends any of the output base classes
Set<String> oneOfTypes = new TreeSet<String>();
// find all classes that has that superClassName
@@ -739,7 +744,7 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
}
}
- EipOption ep = new EipOption(name, kind, fieldTypeName, true, "", "", false, false, null, true, oneOfTypes);
+ EipOption ep = new EipOption(name, kind, fieldTypeName, true, "", docComment, false, false, null, true, oneOfTypes);
eipOptions.add(ep);
}
}
[3/6] camel git commit: Fixed missing docs in rest model in the
catalog
Posted by da...@apache.org.
Fixed missing docs in rest model in the catalog
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ebec433
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ebec433
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ebec433
Branch: refs/heads/master
Commit: 3ebec43350e895374c53585d955d567040b24e69
Parents: e603960
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 8 10:41:27 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 8 10:41:27 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/tools/apt/EipAnnotationProcessor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3ebec433/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index 8a7d01f..d9aca0a 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -712,6 +712,9 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
*/
private void processVerbs(RoundEnvironment roundEnv, TypeElement originalClassType, XmlElementRef elementRef,
VariableElement fieldElement, String fieldName, Set<EipOption> eipOptions, String prefix) {
+
+ Elements elementUtils = processingEnv.getElementUtils();
+
if ("verbs".equals(fieldName) && supportOutputs(originalClassType)) {
String kind = "element";
String name = elementRef.name();
@@ -722,6 +725,8 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
+ String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, originalClassType, true);
+
// gather oneOf which extends any of the output base classes
Set<String> oneOfTypes = new TreeSet<String>();
// find all classes that has that superClassName
@@ -739,7 +744,7 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
}
}
- EipOption ep = new EipOption(name, kind, fieldTypeName, true, "", "", false, false, null, true, oneOfTypes);
+ EipOption ep = new EipOption(name, kind, fieldTypeName, true, "", docComment, false, false, null, true, oneOfTypes);
eipOptions.add(ep);
}
}
[2/6] camel git commit: Add missing javadoc in model
Posted by da...@apache.org.
Add missing javadoc in model
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e603960c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e603960c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e603960c
Branch: refs/heads/master
Commit: e603960c61ad335b9afe377d047932f21f5f92a4
Parents: 80a1758
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 8 10:32:48 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 8 10:32:48 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/model/rest/RestsDefinition.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e603960c/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
index b200537..ad47584 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
@@ -59,6 +59,9 @@ public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinitio
return rests;
}
+ /**
+ * The rest services
+ */
public void setRests(List<RestDefinition> rests) {
this.rests = rests;
}
[5/6] camel git commit: Add missing javadoc in model
Posted by da...@apache.org.
Add missing javadoc in model
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21090076
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21090076
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21090076
Branch: refs/heads/camel-2.16.x
Commit: 210900760466b02598f14ec85d9dc4de15479569
Parents: f5fb251
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 8 10:32:48 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 8 10:42:00 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/model/rest/RestsDefinition.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/21090076/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
index b200537..ad47584 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
@@ -59,6 +59,9 @@ public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinitio
return rests;
}
+ /**
+ * The rest services
+ */
public void setRests(List<RestDefinition> rests) {
this.rests = rests;
}