[camel] branch master updated: camel-main - Thread pool rejected policy should be enum in json model

[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 ff91269  camel-main - Thread pool rejected policy should be enum in 
json model
ff91269 is described below

commit ff91269f43273df043d2ba6c71228c2832eed353
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 19 07:51:48 2020 +0200

    camel-main - Thread pool rejected policy should be enum in json model
---
 .../generated/resources/META-INF/camel-main-configuration-metadata.json | 2 +-
 .../java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
 
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 7dd47c3..0a2a1d6 100644
--- 
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++ 
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -198,7 +198,7 @@
     { "name": "camel.threadpool.maxPoolSize", "description": "Sets the default 
maximum pool size", "sourceType": 
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "integer", 
"javaType": "java.lang.Integer" },
     { "name": "camel.threadpool.maxQueueSize", "description": "Sets the 
default maximum number of tasks in the work queue. Use -1 or an unbounded 
queue", "sourceType": 
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "integer", 
"javaType": "java.lang.Integer" },
     { "name": "camel.threadpool.poolSize", "description": "Sets the default 
core pool size (threads to keep minimum in pool)", "sourceType": 
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "integer", 
"javaType": "java.lang.Integer" },
-    { "name": "camel.threadpool.rejectedPolicy", "description": "Sets the 
default handler for tasks which cannot be executed by the thread pool.", 
"sourceType": "org.apache.camel.main.ThreadPoolConfigurationProperties", 
"type": "object", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy" },
+    { "name": "camel.threadpool.rejectedPolicy", "description": "Sets the 
default handler for tasks which cannot be executed by the thread pool.", 
"sourceType": "org.apache.camel.main.ThreadPoolConfigurationProperties", 
"type": "object", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ] },
     { "name": "camel.threadpool.timeUnit", "description": "Sets the default 
time unit used for keep alive time", "sourceType": 
"org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "object", 
"javaType": "java.util.concurrent.TimeUnit" }
   ]
 }
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
index 523fa8b..b7e3669 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
@@ -107,6 +107,8 @@ public class PrepareCamelMainMojo extends 
AbstractGeneratorMojo {
                     enums = 
Arrays.asList("auto,off,json,xml,json_xml".split(","));
                 } else if 
("org.apache.camel.spi.RestHostNameResolver".equals(javaType)) {
                     enums = 
Arrays.asList("allLocalIp,localIp,localHostName".split(","));
+                } else if 
("org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy".equals(javaType)) {
+                    enums = 
Arrays.asList("Abort,CallerRuns,DiscardOldest,Discard".split(","));
                 }
                 model.setEnums(enums);
                 answer.add(model);