This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f468b22 CAMEL-13980: Deprecate watermarks in model files and change
return unchanged javaType
f468b22 is described below
commit f468b2299db21b7c0c44c4dfdde9c8bfa8f23e99
Author: Omar Al-Safi <[email protected]>
AuthorDate: Tue Sep 17 11:53:23 2019 +0200
CAMEL-13980: Deprecate watermarks in model files and change return
unchanged javaType
Signed-off-by: Omar Al-Safi <[email protected]>
---
.../org/apache/camel/maven/packaging/model/ComponentOptionModel.java | 1 +
.../java/org/apache/camel/maven/packaging/model/EipOptionModel.java | 4 ++--
.../org/apache/camel/maven/packaging/model/EndpointOptionModel.java | 4 ++--
.../java/org/apache/camel/maven/packaging/model/OtherOptionModel.java | 4 ++--
.../maven/packaging/model/SpringBootAutoConfigureOptionModel.java | 3 ++-
.../src/main/resources/component-options.mvel | 2 +-
.../camel-package-maven-plugin/src/main/resources/eip-options.mvel | 2 +-
.../src/main/resources/endpoint-options.mvel | 4 ++--
.../src/main/resources/spring-boot-auto-configure-options.mvel | 2 +-
9 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
index 6810e7f..e9def7c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java
@@ -155,6 +155,7 @@ public class ComponentOptionModel {
return StringHelper.getClassShortName(javaType);
}
+ @Deprecated
public String getShortJavaType(int watermark) {
String text = StringHelper.getClassShortName(javaType);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
index 6e91489..5f90ade 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EipOptionModel.java
@@ -149,10 +149,10 @@ public class EipOptionModel {
}
public String getShortJavaType() {
- // TODO: use watermark in the others
- return getShortJavaType(40);
+ return StringHelper.getClassShortName(javaType);
}
+ @Deprecated
public String getShortJavaType(int watermark) {
String text = StringHelper.getClassShortName(javaType);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
index 3416df5..35eed00 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/EndpointOptionModel.java
@@ -188,10 +188,10 @@ public class EndpointOptionModel {
}
public String getShortJavaType() {
- // TODO: use watermark in the others
- return getShortJavaType(40);
+ return StringHelper.getClassShortName(javaType);
}
+ @Deprecated
public String getShortJavaType(int watermark) {
String text = StringHelper.getClassShortName(javaType);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
index 38d0ec1..19bc8f3 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherOptionModel.java
@@ -152,10 +152,10 @@ public class OtherOptionModel {
}
public String getShortJavaType() {
- // TODO: use watermark in the others
- return getShortJavaType(40);
+ return StringHelper.getClassShortName(javaType);
}
+ @Deprecated
public String getShortJavaType(int watermark) {
String text = StringHelper.getClassShortName(javaType);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootAutoConfigureOptionModel.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootAutoConfigureOptionModel.java
index 4d85bfa..5efb0f6 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootAutoConfigureOptionModel.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/SpringBootAutoConfigureOptionModel.java
@@ -60,9 +60,10 @@ public class SpringBootAutoConfigureOptionModel {
}
public String getShortJavaType() {
- return getShortJavaType(40);
+ return StringHelper.getClassShortName(javaType);
}
+ @Deprecated
public String getShortJavaType(int watermark) {
String text = StringHelper.getClassShortName(javaType);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
index 27f0ef6..8165777 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
+++
b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
@@ -8,6 +8,6 @@ The @{title} component supports @{componentOptions.size()}
options, which are li
[width="100%",cols="2,5,^1,2",options="header"]
|===@comment{ Render table cells. If description contains newline, prefix cell
with `a`, so the content is rendered with formatting. }
| Name | Description | Default | Type
-@foreach{row : componentOptions}| *@{row.getShortName(25)}*
(@{row.shortGroup}) @{row.description.?contains("\n") ? "a" : ""}|
@{util.escape(row.description)} | @{row.getShortDefaultValue(20)} |
@{row.getShortJavaType(25)}
+@foreach{row : componentOptions}| *@{row.getShortName(25)}*
(@{row.shortGroup}) @{row.description.?contains("\n") ? "a" : ""}|
@{util.escape(row.description)} | @{row.getShortDefaultValue(20)} |
@{row.getShortJavaType()}
@end{}|===
@end{}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
index fdd022c..424d590 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
+++
b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
@@ -6,6 +6,6 @@ The @{title} EIP supports @{eipOptions.size()} options which
are listed below:
[width="100%",cols="2,5,^1,2",options="header"]
|===@comment{ Render table cells. If description contains newline, prefix cell
with `a`, so the content is rendered with formatting. }
| Name | Description | Default | Type
-@foreach{row : eipOptions}| *@{row.getShortName(30)}*
@{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)}
| @{row.getShortDefaultValue(20)} | @{row.getShortJavaType(25)}
+@foreach{row : eipOptions}| *@{row.getShortName(30)}*
@{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)}
| @{row.getShortDefaultValue(20)} | @{row.getShortJavaType()}
@end{}|===
@end{}
\ No newline at end of file
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
index 3387047..d109e7d 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
+++
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
@@ -14,7 +14,7 @@ The @{title} endpoint has no path parameters.
[width="100%",cols="2,5,^1,2",options="header"]
|===@comment{ Render table cells. If description contains newline, prefix cell
with `a`, so the content is rendered with formatting. }
| Name | Description | Default | Type
-@foreach{row : endpointPathOptions}| *@{row.getShortName(30)}*
@{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)}
| @{row.getShortDefaultValue(20)} | @{row.getShortJavaType(25)}
+@foreach{row : endpointPathOptions}| *@{row.getShortName(30)}*
@{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)}
| @{row.getShortDefaultValue(20)} | @{row.getShortJavaType()}
@end{}|===
@end{}
@@ -26,6 +26,6 @@ The @{title} endpoint has no query parameters.
[width="100%",cols="2,5,^1,2",options="header"]
|===@comment{ Render table cells. If description contains newline, prefix cell
with `a`, so the content is rendered with formatting. }
| Name | Description | Default | Type
-@foreach{row : endpointOptions}| *@{row.getShortName(30)}* (@{row.shortGroup})
@{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)}
| @{row.getShortDefaultValue(20)} | @{row.getShortJavaType(25)}
+@foreach{row : endpointOptions}| *@{row.getShortName(30)}* (@{row.shortGroup})
@{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)}
| @{row.getShortDefaultValue(20)} | @{row.getShortJavaType()}
@end{}|===
@end{}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-auto-configure-options.mvel
b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-auto-configure-options.mvel
index 77a93a0..23366cf 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-auto-configure-options.mvel
+++
b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-auto-configure-options.mvel
@@ -22,6 +22,6 @@ The component supports @{options.size()} options, which are
listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-@foreach{row : options}| *@{row.name}* | @{util.escape(row.description)} |
@{row.getShortDefaultValue(20)} | @{row.getShortJavaType(25)}
+@foreach{row : options}| *@{row.name}* | @{util.escape(row.description)} |
@{row.getShortDefaultValue(20)} | @{row.getShortJavaType()}
@end{}|===
@end{}
