[camel] branch master updated: camel-catalog - Should also validate the new camel-main configuration properties.

[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 52419de  camel-catalog - Should also validate the new camel-main 
configuration properties.
52419de is described below

commit 52419deaf1aa29f7d5bf6662d8bbf726d1014f77
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 19 07:41:11 2020 +0200

    camel-catalog - Should also validate the new camel-main configuration 
properties.
---
 .../org/apache/camel/catalog/CamelCatalogTest.java | 22 ++++++++++++++++++++++
 .../camel/catalog/impl/AbstractCamelCatalog.java   |  8 ++++++++
 2 files changed, 30 insertions(+)

diff --git 
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
 
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index b091f46..b7b4a4f 100644
--- 
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ 
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -1448,6 +1448,28 @@ public class CamelCatalogTest {
         result = catalog.validateConfigurationProperty(text);
         assertFalse(result.isSuccess());
         assertEquals("12x5", 
result.getInvalidNumber().get("camel.resilience4j.slow-call-rate-threshold"));
+
+        text = "camel.faulttolerance.timeoutPoolSize=5";
+        result = catalog.validateConfigurationProperty(text);
+        assertTrue(result.isSuccess());
+
+        text = "camel.lra.coordinatorUrl=foobar";
+        result = catalog.validateConfigurationProperty(text);
+        assertTrue(result.isSuccess());
+
+        text = "camel.threadpool.maxQueueSize=123";
+        result = catalog.validateConfigurationProperty(text);
+        assertTrue(result.isSuccess());
+
+        text = "camel.threadpool.maxQueueSize=12x5";
+        result = catalog.validateConfigurationProperty(text);
+        assertFalse(result.isSuccess());
+        assertEquals("12x5", 
result.getInvalidInteger().get("camel.threadpool.maxQueueSize"));
+
+        text = "camel.health.routesEnabled=abc";
+        result = catalog.validateConfigurationProperty(text);
+        assertFalse(result.isSuccess());
+        assertEquals("abc", 
result.getInvalidBoolean().get("camel.health.routesEnabled"));
     }
 
     @Test
diff --git 
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
 
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index 3a57294..1ad77e4 100644
--- 
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ 
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -933,6 +933,10 @@ public abstract class AbstractCamelCatalog {
         } else if (key.startsWith("main.")
                 || key.startsWith("hystrix.")
                 || key.startsWith("resilience4j.")
+                || key.startsWith("faulttolerance.")
+                || key.startsWith("threadpool.")
+                || key.startsWith("lra.")
+                || key.startsWith("health.")
                 || key.startsWith("rest.")) {
             int idx = key.indexOf('.');
             String name = key.substring(0, idx);
@@ -1103,6 +1107,10 @@ public abstract class AbstractCamelCatalog {
             || key.startsWith("camel.main.")
             || key.startsWith("camel.hystrix.")
             || key.startsWith("camel.resilience4j.")
+            || key.startsWith("camel.faulttolerance.")
+            || key.startsWith("camel.threadpool.")
+            || key.startsWith("camel.health.")
+            || key.startsWith("camel.lra.")
             || key.startsWith("camel.rest.");
     }