[camel] branch master updated: Make it compile with java 8

[davsclaus]

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 41c303d  Make it compile with java 8
41c303d is described below

commit 41c303d1da2ecff661bbacd35a520469067db572
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed May 20 08:23:30 2020 +0200

    Make it compile with java 8
---
 .../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index b37e79f..4e12fd9 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -452,7 +452,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 boolean multiValued = option.isMultiValue();
                 if (multiValued) {
                     // multi value option that takes one value
-                    String desc = baseDesc.replaceFirst("@@REPLACE_ME@@", 
"\nThe option is a: <code>" + ogtype.toString().replace("<", 
"&lt;").replace(">", "&gt;") + "</code> type.");
+                    String desc = baseDesc.replace("@@REPLACE_ME@@", "\nThe 
option is a: <code>" + ogtype.toString().replace("<", "&lt;").replace(">", 
"&gt;") + "</code> type.");
                     Method fluent = 
target.addMethod().setDefault().setName(option.getName()).setReturnType(new 
GenericType(loadClass(target.getCanonicalName())))
                             .addParameter(new GenericType(String.class), "key")
                             .addParameter(new GenericType(Object.class), 
"value")
@@ -471,7 +471,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                     fluent.getJavaDoc().setFullText(desc);
                 } else {
                     // regular option
-                    String desc = baseDesc.replaceFirst("@@REPLACE_ME@@", 
"\nThe option is a: <code>" + ogtype.toString().replace("<", 
"&lt;").replace(">", "&gt;") + "</code> type.");
+                    String desc = baseDesc.replace("@@REPLACE_ME@@", "\nThe 
option is a: <code>" + ogtype.toString().replace("<", "&lt;").replace(">", 
"&gt;") + "</code> type.");
                     Method fluent = 
target.addMethod().setDefault().setName(option.getName()).setReturnType(new 
GenericType(loadClass(target.getCanonicalName())))
                             .addParameter(isPrimitive(ogtype.toString()) ? 
ogtype : gtype, option.getName())
                             .setBody("doSetProperty(\"" + option.getName() + 
"\", " + option.getName() + ");", "return this;\n");