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/12/21 13:42:55 UTC

[1/8] camel git commit: That option is default falsE

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 43775d084 -> 882ea2a71
  refs/heads/master 4973759b9 -> dda5d5b46


That option is default falsE


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dda5d5b4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dda5d5b4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dda5d5b4

Branch: refs/heads/master
Commit: dda5d5b465133312b993ad04f208ab222baa6757
Parents: 4973759
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 21 13:40:54 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:40:54 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/jms/JmsConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dda5d5b4/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 342029e..1537aae 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -122,7 +122,7 @@ public class JmsConfiguration implements Cloneable {
     @UriParam(label = "producer")
     private int replyToMaxConcurrentConsumers;
     // JmsTemplate only
-    @UriParam(label = "producer")
+    @UriParam(label = "producer", defaultValue = "false")
     private Boolean explicitQosEnabled;
     @UriParam(defaultValue = "true", label = "producer")
     private boolean deliveryPersistent = true;


[8/8] camel git commit: That option is default falsE

Posted by da...@apache.org.
That option is default falsE


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/882ea2a7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/882ea2a7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/882ea2a7

Branch: refs/heads/camel-2.16.x
Commit: 882ea2a71592c29bed13f99e13ef4d0f7dea4454
Parents: 521424b
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 21 13:40:54 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:42:45 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/jms/JmsConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/882ea2a7/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index aea53f1..1f1037d 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -122,7 +122,7 @@ public class JmsConfiguration implements Cloneable {
     @UriParam(label = "producer")
     private int replyToMaxConcurrentConsumers;
     // JmsTemplate only
-    @UriParam(label = "producer")
+    @UriParam(label = "producer", defaultValue = "false")
     private Boolean explicitQosEnabled;
     @UriParam(defaultValue = "true", label = "producer")
     private boolean deliveryPersistent = true;


[2/8] camel git commit: Camel catalog - Add api to validate endpoint uri

Posted by da...@apache.org.
Camel catalog - Add api to validate endpoint uri


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13ebce9b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13ebce9b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13ebce9b

Branch: refs/heads/camel-2.16.x
Commit: 13ebce9b3b9bb4456e8688f8c95d0ae71cee29cc
Parents: 43775d0
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 19 14:49:43 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:42:01 2015 +0100

----------------------------------------------------------------------
 .../org/apache/camel/catalog/CamelCatalog.java  |  11 ++
 .../camel/catalog/DefaultCamelCatalog.java      | 117 +++++++++++++++++++
 .../apache/camel/catalog/JSonSchemaHelper.java  |  78 +++++++++++++
 .../apache/camel/catalog/CamelCatalogTest.java  |  45 ++++++-
 4 files changed, 250 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/13ebce9b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 7dc67a0..dc1a3ca 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -170,6 +170,17 @@ public interface CamelCatalog {
     Map<String, String> endpointProperties(String uri) throws URISyntaxException;
 
     /**
+     * Parses and validates the endpoint uri and constructs a key/value properties of each option
+     *
+     * @param uri  the endpoint uri
+     * @return invalid properties as key/value properties of each invalid option, returns an empty map if no validation errors
+     */
+    Map<String, String> validateProperties(String uri) throws URISyntaxException;
+
+    // TODO: json with error instead of map
+    // with description of the error, index, etc
+
+    /**
      * Returns the component name from the given endpoint uri
      *
      * @param uri  the endpoint uri

http://git-wip-us.apache.org/repos/asf/camel/blob/13ebce9b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 870bc0f..13b3052 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -42,8 +42,14 @@ import org.w3c.dom.Document;
 
 import static org.apache.camel.catalog.CatalogHelper.after;
 import static org.apache.camel.catalog.JSonSchemaHelper.getPropertyDefaultValue;
+import static org.apache.camel.catalog.JSonSchemaHelper.getPropertyEnum;
+import static org.apache.camel.catalog.JSonSchemaHelper.getRow;
+import static org.apache.camel.catalog.JSonSchemaHelper.isPropertyBoolean;
+import static org.apache.camel.catalog.JSonSchemaHelper.isPropertyInteger;
+import static org.apache.camel.catalog.JSonSchemaHelper.isPropertyNumber;
 import static org.apache.camel.catalog.JSonSchemaHelper.isPropertyRequired;
 import static org.apache.camel.catalog.URISupport.createQueryString;
+import static org.apache.camel.catalog.URISupport.isEmpty;
 import static org.apache.camel.catalog.URISupport.normalizeUri;
 import static org.apache.camel.catalog.URISupport.stripQuery;
 
@@ -72,9 +78,17 @@ public class DefaultCamelCatalog implements CamelCatalog {
 
     private boolean caching;
 
+    /**
+     * Creates the {@link CamelCatalog} without caching enabled.
+     */
     public DefaultCamelCatalog() {
     }
 
+    /**
+     * Creates the {@link CamelCatalog}
+     *
+     * @param caching  whether to use cache
+     */
     public DefaultCamelCatalog(boolean caching) {
         this.caching = caching;
     }
@@ -632,6 +646,109 @@ public class DefaultCamelCatalog implements CamelCatalog {
     }
 
     @Override
+    public Map<String, String> validateProperties(String uri) throws URISyntaxException {
+        Map<String, String> answer = new LinkedHashMap<String, String>();
+
+        // parse the uri
+        URI u = normalizeUri(uri);
+        String scheme = u.getScheme();
+        String json = componentJSonSchema(scheme);
+        List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
+
+        // parse into a map of properties of the uri, and look for options that are invalid
+        Map<String, String> properties = endpointProperties(uri);
+        for (Map.Entry<String, String> property : properties.entrySet()) {
+            String name = property.getKey();
+            String value = property.getValue();
+            boolean placeholder = value.startsWith("{{") || value.startsWith("${") || value.startsWith("$simple{");
+
+            Map<String, String> row = getRow(rows, name);
+            // unknown option
+            if (row == null) {
+                answer.put(name, property.getValue());
+            } else {
+                // invalid value/type
+
+                // is required but the value is empty
+                boolean required = isPropertyRequired(rows, name);
+                if (required && isEmpty(value)) {
+                    answer.put(name, value);
+                }
+
+                // is enum but the value is not within the enum range
+                // but we can only check if the value is not a placeholder
+                String enums = getPropertyEnum(rows, name);
+                if (!placeholder && enums != null) {
+                    boolean found = false;
+                    for (String s : enums.split(",")) {
+                        if (value.equalsIgnoreCase(s)) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        answer.put(name, value);
+                    }
+                }
+
+                // is boolean
+                if (!placeholder && isPropertyBoolean(rows, name)) {
+                    // value must be a boolean
+                    boolean bool = "true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value);
+                    if (!bool) {
+                        answer.put(name, value);
+                    }
+                }
+
+                // is integer
+                if (!placeholder && isPropertyInteger(rows, name)) {
+                    // value must be an integer
+                    boolean valid = false;
+                    try {
+                        valid = Integer.valueOf(value) != null;
+                    } catch (Exception e) {
+                        // ignore
+                    }
+                    if (!valid) {
+                        answer.put(name, value);
+                    }
+                }
+
+                // is number
+                if (!placeholder && isPropertyNumber(rows, name)) {
+                    // value must be an number
+                    boolean valid = false;
+                    try {
+                        valid = Double.valueOf(value).isNaN() == false || Float.valueOf(value).isNaN() == false;
+                    } catch (Exception e) {
+                        // ignore
+                    }
+                    if (!valid) {
+                        answer.put(name, value);
+                    }
+                }
+            }
+        }
+
+        // now check if all required values are there, and that a default value does not exists
+        for (Map<String, String> row : rows) {
+            String name = row.get("name");
+            boolean required = isPropertyRequired(rows, name);
+            if (required) {
+                String value = properties.get(name);
+                if (isEmpty(value)) {
+                    value = getPropertyDefaultValue(rows, name);
+                }
+                if (isEmpty(value)) {
+                    answer.put(name, value);
+                }
+            }
+        }
+
+        return answer;
+    }
+
+    @Override
     public Map<String, String> endpointProperties(String uri) throws URISyntaxException {
         // NOTICE: This logic is similar to org.apache.camel.util.EndpointHelper#endpointProperties
         // as the catalog also offers similar functionality (without having camel-core on classpath)

http://git-wip-us.apache.org/repos/asf/camel/blob/13ebce9b/platforms/catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
index 17e0f85..e3e4beb 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/JSonSchemaHelper.java
@@ -129,6 +129,57 @@ public final class JSonSchemaHelper {
         return false;
     }
 
+    public static boolean isPropertyBoolean(List<Map<String, String>> rows, String name) {
+        for (Map<String, String> row : rows) {
+            String type = null;
+            boolean found = false;
+            if (row.containsKey("name")) {
+                found = name.equals(row.get("name"));
+            }
+            if (row.containsKey("type")) {
+                type = row.get("type");
+            }
+            if (found) {
+                return "boolean".equals(type);
+            }
+        }
+        return false;
+    }
+
+    public static boolean isPropertyInteger(List<Map<String, String>> rows, String name) {
+        for (Map<String, String> row : rows) {
+            String type = null;
+            boolean found = false;
+            if (row.containsKey("name")) {
+                found = name.equals(row.get("name"));
+            }
+            if (row.containsKey("type")) {
+                type = row.get("type");
+            }
+            if (found) {
+                return "integer".equals(type);
+            }
+        }
+        return false;
+    }
+
+    public static boolean isPropertyNumber(List<Map<String, String>> rows, String name) {
+        for (Map<String, String> row : rows) {
+            String type = null;
+            boolean found = false;
+            if (row.containsKey("name")) {
+                found = name.equals(row.get("name"));
+            }
+            if (row.containsKey("type")) {
+                type = row.get("type");
+            }
+            if (found) {
+                return "number".equals(type);
+            }
+        }
+        return false;
+    }
+
     public static String getPropertyDefaultValue(List<Map<String, String>> rows, String name) {
         for (Map<String, String> row : rows) {
             String defaultValue = null;
@@ -146,4 +197,31 @@ public final class JSonSchemaHelper {
         return null;
     }
 
+    public static String getPropertyEnum(List<Map<String, String>> rows, String name) {
+        for (Map<String, String> row : rows) {
+            String enums = null;
+            String defaultValue = null;
+            boolean found = false;
+            if (row.containsKey("name")) {
+                found = name.equals(row.get("name"));
+            }
+            if (row.containsKey("enum")) {
+                enums = row.get("enum");
+            }
+            if (found) {
+                return enums;
+            }
+        }
+        return null;
+    }
+
+    public static Map<String, String> getRow(List<Map<String, String>> rows, String key) {
+        for (Map<String, String> row : rows) {
+            if (key.equals(row.get("name"))) {
+                return row;
+            }
+        }
+        return null;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/13ebce9b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 324362f..4c020da 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -22,7 +22,6 @@ import java.util.Map;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -388,6 +387,50 @@ public class CamelCatalogTest {
     }
 
     @Test
+    public void validateProperties() throws Exception {
+        // valid
+        Map<String, String> map = catalog.validateProperties("log:mylog");
+        assertNotNull(map);
+        assertEquals(0, map.size());
+
+        // unknown
+        map = catalog.validateProperties("log:mylog?level=WARN&foo=bar");
+        assertNotNull(map);
+        assertEquals(1, map.size());
+        assertEquals("bar", map.get("foo"));
+
+        // enum
+        map = catalog.validateProperties("jms:unknown:myqueue");
+        assertNotNull(map);
+        assertEquals(1, map.size());
+
+        // okay
+        map = catalog.validateProperties("yammer:MESSAGES?accessToken=aaa&consumerKey=bbb&consumerSecret=ccc&useJson=true&initialDelay=500");
+        assertNotNull(map);
+        assertEquals(0, map.size());
+
+        // required / boolean / integer
+        map = catalog.validateProperties("yammer:MESSAGES?accessToken=aaa&consumerKey=&useJson=no&initialDelay=five");
+        assertNotNull(map);
+        assertEquals(4, map.size());
+        assertEquals(null, map.get("consumerKey"));
+        assertEquals(null, map.get("consumerSecret"));
+        assertEquals("no", map.get("useJson"));
+        assertEquals("five", map.get("initialDelay"));
+
+        // okay
+        map = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=2.5");
+        assertNotNull(map);
+        assertEquals(0, map.size());
+
+        // number
+        map = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=five");
+        assertNotNull(map);
+        assertEquals(1, map.size());
+        assertEquals("five", map.get("reconnectBackOffMultiplier"));
+    }
+
+    @Test
     public void testEndpointComponentName() throws Exception {
         String name = catalog.endpointComponentName("jms:queue:foo");
         assertEquals("jms", name);


[6/8] camel git commit: Camel catalog - Add api to validate endpoint uri

Posted by da...@apache.org.
Camel catalog - Add api to validate endpoint uri


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7caf775d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7caf775d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7caf775d

Branch: refs/heads/camel-2.16.x
Commit: 7caf775d9a49d172615fbaaa64400ee1a1f8cac8
Parents: e22c1ee
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Dec 20 13:27:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:42:32 2015 +0100

----------------------------------------------------------------------
 .../camel/catalog/DefaultCamelCatalog.java      |  2 +-
 .../apache/camel/catalog/ValidationResult.java  | 77 ++++++++++++++++++++
 .../apache/camel/catalog/CamelCatalogTest.java  | 17 +++++
 3 files changed, 95 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7caf775d/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index a5385cb..2580536 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -647,7 +647,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
 
     @Override
     public ValidationResult validateProperties(String uri) {
-        ValidationResult result = new ValidationResult();
+        ValidationResult result = new ValidationResult(uri);
 
         Map<String, String> properties;
         List<Map<String, String>> rows;

http://git-wip-us.apache.org/repos/asf/camel/blob/7caf775d/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
index 78952cd..4450133 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
@@ -24,6 +24,8 @@ import java.util.Set;
 
 public class ValidationResult implements Serializable {
 
+    private final String uri;
+
     // component
     private String syntaxError;
     private String unknownComponent;
@@ -36,6 +38,10 @@ public class ValidationResult implements Serializable {
     private Map<String, String> invalidInteger;
     private Map<String, String> invalidNumber;
 
+    public ValidationResult(String uri) {
+        this.uri = uri;
+    }
+
     public boolean isSuccess() {
         return syntaxError == null && unknownComponent == null
                 && unknown == null && required == null && invalidEnum == null
@@ -123,4 +129,75 @@ public class ValidationResult implements Serializable {
     public Map<String, String> getInvalidNumber() {
         return invalidNumber;
     }
+
+    /**
+     * A human readable summary of the validation errors.
+     *
+     * @return the summary, or <tt>null</tt> if no validation errors
+     */
+    public String summaryErrorMessage() {
+        if (isSuccess()) {
+            return null;
+        }
+
+        if (syntaxError != null) {
+            return "Syntax error " + syntaxError;
+        } else if (unknownComponent != null) {
+            return "Unknown component " + unknownComponent;
+        }
+
+        // for each invalid option build a reason message
+        Map<String, String> options = new LinkedHashMap<String, String>();
+        if (unknown != null) {
+            for (String name : unknown) {
+                options.put(name, "Unknown field");
+            }
+        }
+        if (required != null) {
+            for (String name : required) {
+                options.put(name, "Missing required field");
+            }
+        }
+        if (invalidEnum != null) {
+            for (Map.Entry<String, String> entry : invalidEnum.entrySet()) {
+                options.put(entry.getKey(), "Invalid enum value: " + entry.getValue());
+            }
+        }
+        if (invalidBoolean != null) {
+            for (Map.Entry<String, String> entry : invalidBoolean.entrySet()) {
+                options.put(entry.getKey(), "Invalid boolean value: " + entry.getValue());
+            }
+        }
+        if (invalidInteger != null) {
+            for (Map.Entry<String, String> entry : invalidInteger.entrySet()) {
+                options.put(entry.getKey(), "Invalid integer value: " + entry.getValue());
+            }
+        }
+        if (invalidNumber != null) {
+            for (Map.Entry<String, String> entry : invalidNumber.entrySet()) {
+                options.put(entry.getKey(), "Invalid number value: " + entry.getValue());
+            }
+        }
+
+        // build a table with the error summary nicely formatted
+        // lets use 24 as min length
+        int maxLen = 24;
+        for (String key : options.keySet()) {
+            maxLen = Math.max(maxLen, key.length());
+        }
+        String format = "%" + maxLen + "s    %s";
+
+        // build the human error summary
+        StringBuilder sb = new StringBuilder();
+        sb.append("Endpoint validator error\n");
+        sb.append("---------------------------------------------------------------------------------------------------------------------------------------\n");
+        sb.append("\n\t").append(uri).append("\n");
+        for (Map.Entry<String, String> option : options.entrySet()) {
+            String out = String.format(format, option.getKey(), option.getValue());
+            sb.append("\n\t").append(out);
+        }
+        sb.append("\n\n");
+
+        return sb.toString();
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7caf775d/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 6862fc8..b33ad5c 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.camel.catalog.CatalogHelper.loadText;
 import static org.junit.Assert.assertEquals;
@@ -33,6 +35,8 @@ import static org.junit.Assert.assertTrue;
 
 public class CamelCatalogTest {
 
+    private static final Logger LOG = LoggerFactory.getLogger(CamelCatalogTest.class);
+
     static CamelCatalog catalog;
 
     @BeforeClass
@@ -431,6 +435,19 @@ public class CamelCatalogTest {
     }
 
     @Test
+    public void validatePropertiesSummary() throws Exception {
+        ValidationResult result = catalog.validateProperties("yammer:MESSAGES?blah=yada&accessToken=aaa&consumerKey=&useJson=no&initialDelay=five");
+        assertFalse(result.isSuccess());
+        String reason = result.summaryErrorMessage();
+        LOG.info(reason);
+
+        result = catalog.validateProperties("jms:unknown:myqueue");
+        assertFalse(result.isSuccess());
+        reason = result.summaryErrorMessage();
+        LOG.info(reason);
+    }
+
+    @Test
     public void testEndpointComponentName() throws Exception {
         String name = catalog.endpointComponentName("jms:queue:foo");
         assertEquals("jms", name);


[3/8] camel git commit: Camel catalog - Add api to validate endpoint uri

Posted by da...@apache.org.
Camel catalog - Add api to validate endpoint uri


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a40ecb6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a40ecb6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a40ecb6

Branch: refs/heads/camel-2.16.x
Commit: 4a40ecb60693825a970765f8cda8b267699bf3c2
Parents: 13ebce9
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 19 17:03:35 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:42:07 2015 +0100

----------------------------------------------------------------------
 .../org/apache/camel/catalog/CamelCatalog.java  |   7 +-
 .../camel/catalog/DefaultCamelCatalog.java      |  22 ++--
 .../apache/camel/catalog/ValidationResult.java  | 102 +++++++++++++++++++
 .../apache/camel/catalog/CamelCatalogTest.java  |  49 ++++-----
 4 files changed, 137 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4a40ecb6/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index dc1a3ca..ac01b51 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -173,12 +173,9 @@ public interface CamelCatalog {
      * Parses and validates the endpoint uri and constructs a key/value properties of each option
      *
      * @param uri  the endpoint uri
-     * @return invalid properties as key/value properties of each invalid option, returns an empty map if no validation errors
+     * @return validation result
      */
-    Map<String, String> validateProperties(String uri) throws URISyntaxException;
-
-    // TODO: json with error instead of map
-    // with description of the error, index, etc
+    ValidationResult validateProperties(String uri) throws URISyntaxException;
 
     /**
      * Returns the component name from the given endpoint uri

http://git-wip-us.apache.org/repos/asf/camel/blob/4a40ecb6/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 13b3052..f0e4c3c 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -646,8 +646,8 @@ public class DefaultCamelCatalog implements CamelCatalog {
     }
 
     @Override
-    public Map<String, String> validateProperties(String uri) throws URISyntaxException {
-        Map<String, String> answer = new LinkedHashMap<String, String>();
+    public ValidationResult validateProperties(String uri) throws URISyntaxException {
+        ValidationResult result = new ValidationResult();
 
         // parse the uri
         URI u = normalizeUri(uri);
@@ -665,14 +665,14 @@ public class DefaultCamelCatalog implements CamelCatalog {
             Map<String, String> row = getRow(rows, name);
             // unknown option
             if (row == null) {
-                answer.put(name, property.getValue());
+                result.addUnknown(name);
             } else {
                 // invalid value/type
 
                 // is required but the value is empty
                 boolean required = isPropertyRequired(rows, name);
                 if (required && isEmpty(value)) {
-                    answer.put(name, value);
+                    result.addRequired(name);
                 }
 
                 // is enum but the value is not within the enum range
@@ -687,7 +687,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                         }
                     }
                     if (!found) {
-                        answer.put(name, value);
+                        result.addInvalidEnum(name);
                     }
                 }
 
@@ -696,7 +696,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                     // value must be a boolean
                     boolean bool = "true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value);
                     if (!bool) {
-                        answer.put(name, value);
+                        result.addInvalidBoolean(name);
                     }
                 }
 
@@ -710,7 +710,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                         // ignore
                     }
                     if (!valid) {
-                        answer.put(name, value);
+                        result.addInvalidInteger(name);
                     }
                 }
 
@@ -719,12 +719,12 @@ public class DefaultCamelCatalog implements CamelCatalog {
                     // value must be an number
                     boolean valid = false;
                     try {
-                        valid = Double.valueOf(value).isNaN() == false || Float.valueOf(value).isNaN() == false;
+                        valid = !Double.valueOf(value).isNaN() || !Float.valueOf(value).isNaN();
                     } catch (Exception e) {
                         // ignore
                     }
                     if (!valid) {
-                        answer.put(name, value);
+                        result.addInvalidNumber(name);
                     }
                 }
             }
@@ -740,12 +740,12 @@ public class DefaultCamelCatalog implements CamelCatalog {
                     value = getPropertyDefaultValue(rows, name);
                 }
                 if (isEmpty(value)) {
-                    answer.put(name, value);
+                    result.addRequired(name);
                 }
             }
         }
 
-        return answer;
+        return result;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/4a40ecb6/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
new file mode 100644
index 0000000..2ea9528
--- /dev/null
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
@@ -0,0 +1,102 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.catalog;
+
+import java.io.Serializable;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class ValidationResult implements Serializable {
+
+    private Set<String> unknown;
+    private Set<String> required;
+    private Set<String> invalidEnum;
+    private Set<String> invalidBoolean;
+    private Set<String> invalidInteger;
+    private Set<String> invalidNumber;
+
+    public boolean isSuccess() {
+        return unknown == null && required == null && invalidEnum == null
+                && invalidBoolean == null && invalidInteger == null && invalidNumber == null;
+    }
+
+    public void addUnknown(String name) {
+        if (unknown == null) {
+            unknown = new LinkedHashSet<String>();
+        }
+        unknown.add(name);
+    }
+
+    public void addRequired(String name) {
+        if (required == null) {
+            required = new LinkedHashSet<String>();
+        }
+        required.add(name);
+    }
+
+    public void addInvalidEnum(String name) {
+        if (invalidEnum == null) {
+            invalidEnum = new LinkedHashSet<String>();
+        }
+        invalidEnum.add(name);
+    }
+
+    public void addInvalidBoolean(String name) {
+        if (invalidBoolean == null) {
+            invalidBoolean = new LinkedHashSet<String>();
+        }
+        invalidBoolean.add(name);
+    }
+
+    public void addInvalidInteger(String name) {
+        if (invalidInteger == null) {
+            invalidInteger = new LinkedHashSet<String>();
+        }
+        invalidInteger.add(name);
+    }
+
+    public void addInvalidNumber(String name) {
+        if (invalidNumber == null) {
+            invalidNumber = new LinkedHashSet<String>();
+        }
+        invalidNumber.add(name);
+    }
+
+    public Set<String> getUnknown() {
+        return unknown;
+    }
+
+    public Set<String> getRequired() {
+        return required;
+    }
+
+    public Set<String> getInvalidEnum() {
+        return invalidEnum;
+    }
+
+    public Set<String> getInvalidBoolean() {
+        return invalidBoolean;
+    }
+
+    public Set<String> getInvalidInteger() {
+        return invalidInteger;
+    }
+
+    public Set<String> getInvalidNumber() {
+        return invalidNumber;
+    }
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/4a40ecb6/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 4c020da..59ec112 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import static org.apache.camel.catalog.CatalogHelper.loadText;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -389,45 +390,39 @@ public class CamelCatalogTest {
     @Test
     public void validateProperties() throws Exception {
         // valid
-        Map<String, String> map = catalog.validateProperties("log:mylog");
-        assertNotNull(map);
-        assertEquals(0, map.size());
+        ValidationResult result = catalog.validateProperties("log:mylog");
+        assertTrue(result.isSuccess());
 
         // unknown
-        map = catalog.validateProperties("log:mylog?level=WARN&foo=bar");
-        assertNotNull(map);
-        assertEquals(1, map.size());
-        assertEquals("bar", map.get("foo"));
+        result = catalog.validateProperties("log:mylog?level=WARN&foo=bar");
+        assertFalse(result.isSuccess());
+        assertTrue(result.getUnknown().contains("foo"));
 
         // enum
-        map = catalog.validateProperties("jms:unknown:myqueue");
-        assertNotNull(map);
-        assertEquals(1, map.size());
+        result = catalog.validateProperties("jms:unknown:myqueue");
+        assertFalse(result.isSuccess());
+        assertTrue(result.getInvalidEnum().contains("destinationType"));
 
         // okay
-        map = catalog.validateProperties("yammer:MESSAGES?accessToken=aaa&consumerKey=bbb&consumerSecret=ccc&useJson=true&initialDelay=500");
-        assertNotNull(map);
-        assertEquals(0, map.size());
+        result = catalog.validateProperties("yammer:MESSAGES?accessToken=aaa&consumerKey=bbb&consumerSecret=ccc&useJson=true&initialDelay=500");
+        assertTrue(result.isSuccess());
 
         // required / boolean / integer
-        map = catalog.validateProperties("yammer:MESSAGES?accessToken=aaa&consumerKey=&useJson=no&initialDelay=five");
-        assertNotNull(map);
-        assertEquals(4, map.size());
-        assertEquals(null, map.get("consumerKey"));
-        assertEquals(null, map.get("consumerSecret"));
-        assertEquals("no", map.get("useJson"));
-        assertEquals("five", map.get("initialDelay"));
+        result = catalog.validateProperties("yammer:MESSAGES?accessToken=aaa&consumerKey=&useJson=no&initialDelay=five");
+        assertFalse(result.isSuccess());
+        assertTrue(result.getRequired().contains("consumerKey"));
+        assertTrue(result.getRequired().contains("consumerSecret"));
+        assertTrue(result.getInvalidBoolean().contains("useJson"));
+        assertTrue(result.getInvalidInteger().contains("initialDelay"));
 
         // okay
-        map = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=2.5");
-        assertNotNull(map);
-        assertEquals(0, map.size());
+        result = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=2.5");
+        assertTrue(result.isSuccess());
 
         // number
-        map = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=five");
-        assertNotNull(map);
-        assertEquals(1, map.size());
-        assertEquals("five", map.get("reconnectBackOffMultiplier"));
+        result = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=five");
+        assertFalse(result.isSuccess());
+        assertTrue(result.getInvalidNumber().contains("reconnectBackOffMultiplier"));
     }
 
     @Test


[4/8] camel git commit: Camel catalog - Add api to validate endpoint uri

Posted by da...@apache.org.
Camel catalog - Add api to validate endpoint uri


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38480fc1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38480fc1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38480fc1

Branch: refs/heads/camel-2.16.x
Commit: 38480fc1ca42167211478337b212ed9d2b585252
Parents: 4a40ecb
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Dec 20 09:17:12 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:42:16 2015 +0100

----------------------------------------------------------------------
 .../org/apache/camel/catalog/CamelCatalog.java  |  2 +-
 .../camel/catalog/DefaultCamelCatalog.java      | 28 ++++++++++++++------
 .../apache/camel/catalog/ValidationResult.java  | 24 ++++++++++++++++-
 .../apache/camel/catalog/CamelCatalogTest.java  |  5 ++++
 4 files changed, 49 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/38480fc1/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index ac01b51..f3ce3a1 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -175,7 +175,7 @@ public interface CamelCatalog {
      * @param uri  the endpoint uri
      * @return validation result
      */
-    ValidationResult validateProperties(String uri) throws URISyntaxException;
+    ValidationResult validateProperties(String uri);
 
     /**
      * Returns the component name from the given endpoint uri

http://git-wip-us.apache.org/repos/asf/camel/blob/38480fc1/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index f0e4c3c..2725ffa 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -646,17 +646,29 @@ public class DefaultCamelCatalog implements CamelCatalog {
     }
 
     @Override
-    public ValidationResult validateProperties(String uri) throws URISyntaxException {
+    public ValidationResult validateProperties(String uri) {
         ValidationResult result = new ValidationResult();
 
-        // parse the uri
-        URI u = normalizeUri(uri);
-        String scheme = u.getScheme();
-        String json = componentJSonSchema(scheme);
-        List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
+        Map<String, String> properties;
+        List<Map<String, String>> rows;
+
+        try {
+            // parse the uri
+            URI u = normalizeUri(uri);
+            String scheme = u.getScheme();
+            String json = componentJSonSchema(scheme);
+            if (json == null) {
+                result.addUnknownComponent(scheme);
+                return result;
+            }
+            rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
+            properties = endpointProperties(uri);
+        } catch (URISyntaxException e) {
+            result.addSyntaxError(e.getMessage());
+            return result;
+        }
 
-        // parse into a map of properties of the uri, and look for options that are invalid
-        Map<String, String> properties = endpointProperties(uri);
+        // validate all the options
         for (Map.Entry<String, String> property : properties.entrySet()) {
             String name = property.getKey();
             String value = property.getValue();

http://git-wip-us.apache.org/repos/asf/camel/blob/38480fc1/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
index 2ea9528..1c8dc4e 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
@@ -22,6 +22,11 @@ import java.util.Set;
 
 public class ValidationResult implements Serializable {
 
+    // component
+    private String syntaxError;
+    private String unknownComponent;
+
+    // options
     private Set<String> unknown;
     private Set<String> required;
     private Set<String> invalidEnum;
@@ -30,10 +35,19 @@ public class ValidationResult implements Serializable {
     private Set<String> invalidNumber;
 
     public boolean isSuccess() {
-        return unknown == null && required == null && invalidEnum == null
+        return syntaxError == null && unknownComponent == null
+                && unknown == null && required == null && invalidEnum == null
                 && invalidBoolean == null && invalidInteger == null && invalidNumber == null;
     }
 
+    public void addSyntaxError(String syntaxError) {
+        this.syntaxError = syntaxError;
+    }
+
+    public void addUnknownComponent(String name) {
+        this.unknownComponent = name;
+    }
+
     public void addUnknown(String name) {
         if (unknown == null) {
             unknown = new LinkedHashSet<String>();
@@ -76,10 +90,18 @@ public class ValidationResult implements Serializable {
         invalidNumber.add(name);
     }
 
+    public String getSyntaxError() {
+        return syntaxError;
+    }
+
     public Set<String> getUnknown() {
         return unknown;
     }
 
+    public String getUnknownComponent() {
+        return unknownComponent;
+    }
+
     public Set<String> getRequired() {
         return required;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/38480fc1/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 59ec112..f1fd778 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -423,6 +423,11 @@ public class CamelCatalogTest {
         result = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=five");
         assertFalse(result.isSuccess());
         assertTrue(result.getInvalidNumber().contains("reconnectBackOffMultiplier"));
+
+        // unknown component
+        result = catalog.validateProperties("foo:bar?me=you");
+        assertFalse(result.isSuccess());
+        assertTrue(result.getUnknownComponent().equals("foo"));
     }
 
     @Test


[5/8] camel git commit: Camel catalog - Add api to validate endpoint uri

Posted by da...@apache.org.
Camel catalog - Add api to validate endpoint uri


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e22c1eed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e22c1eed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e22c1eed

Branch: refs/heads/camel-2.16.x
Commit: e22c1eed1c0eee19e3b375442b64b1861aba6a08
Parents: 38480fc
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Dec 20 12:58:08 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:42:25 2015 +0100

----------------------------------------------------------------------
 .../camel/catalog/DefaultCamelCatalog.java      |  8 ++--
 .../apache/camel/catalog/ValidationResult.java  | 42 ++++++++++----------
 .../apache/camel/catalog/CamelCatalogTest.java  |  8 ++--
 3 files changed, 30 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e22c1eed/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 2725ffa..a5385cb 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -699,7 +699,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                         }
                     }
                     if (!found) {
-                        result.addInvalidEnum(name);
+                        result.addInvalidEnum(name, value);
                     }
                 }
 
@@ -708,7 +708,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                     // value must be a boolean
                     boolean bool = "true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value);
                     if (!bool) {
-                        result.addInvalidBoolean(name);
+                        result.addInvalidBoolean(name, value);
                     }
                 }
 
@@ -722,7 +722,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                         // ignore
                     }
                     if (!valid) {
-                        result.addInvalidInteger(name);
+                        result.addInvalidInteger(name, value);
                     }
                 }
 
@@ -736,7 +736,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                         // ignore
                     }
                     if (!valid) {
-                        result.addInvalidNumber(name);
+                        result.addInvalidNumber(name, value);
                     }
                 }
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e22c1eed/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
index 1c8dc4e..78952cd 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
@@ -17,7 +17,9 @@
 package org.apache.camel.catalog;
 
 import java.io.Serializable;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 
 public class ValidationResult implements Serializable {
@@ -29,10 +31,10 @@ public class ValidationResult implements Serializable {
     // options
     private Set<String> unknown;
     private Set<String> required;
-    private Set<String> invalidEnum;
-    private Set<String> invalidBoolean;
-    private Set<String> invalidInteger;
-    private Set<String> invalidNumber;
+    private Map<String, String> invalidEnum;
+    private Map<String, String> invalidBoolean;
+    private Map<String, String> invalidInteger;
+    private Map<String, String> invalidNumber;
 
     public boolean isSuccess() {
         return syntaxError == null && unknownComponent == null
@@ -62,32 +64,32 @@ public class ValidationResult implements Serializable {
         required.add(name);
     }
 
-    public void addInvalidEnum(String name) {
+    public void addInvalidEnum(String name, String value) {
         if (invalidEnum == null) {
-            invalidEnum = new LinkedHashSet<String>();
+            invalidEnum = new LinkedHashMap<String, String>();
         }
-        invalidEnum.add(name);
+        invalidEnum.put(name, value);
     }
 
-    public void addInvalidBoolean(String name) {
+    public void addInvalidBoolean(String name, String value) {
         if (invalidBoolean == null) {
-            invalidBoolean = new LinkedHashSet<String>();
+            invalidBoolean = new LinkedHashMap<String, String>();;
         }
-        invalidBoolean.add(name);
+        invalidBoolean.put(name, value);
     }
 
-    public void addInvalidInteger(String name) {
+    public void addInvalidInteger(String name, String value) {
         if (invalidInteger == null) {
-            invalidInteger = new LinkedHashSet<String>();
+            invalidInteger = new LinkedHashMap<String, String>();;
         }
-        invalidInteger.add(name);
+        invalidInteger.put(name, value);
     }
 
-    public void addInvalidNumber(String name) {
+    public void addInvalidNumber(String name, String value) {
         if (invalidNumber == null) {
-            invalidNumber = new LinkedHashSet<String>();
+            invalidNumber = new LinkedHashMap<String, String>();;
         }
-        invalidNumber.add(name);
+        invalidNumber.put(name, value);
     }
 
     public String getSyntaxError() {
@@ -106,19 +108,19 @@ public class ValidationResult implements Serializable {
         return required;
     }
 
-    public Set<String> getInvalidEnum() {
+    public Map<String, String> getInvalidEnum() {
         return invalidEnum;
     }
 
-    public Set<String> getInvalidBoolean() {
+    public Map<String, String> getInvalidBoolean() {
         return invalidBoolean;
     }
 
-    public Set<String> getInvalidInteger() {
+    public Map<String, String> getInvalidInteger() {
         return invalidInteger;
     }
 
-    public Set<String> getInvalidNumber() {
+    public Map<String, String> getInvalidNumber() {
         return invalidNumber;
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e22c1eed/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index f1fd778..6862fc8 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -401,7 +401,7 @@ public class CamelCatalogTest {
         // enum
         result = catalog.validateProperties("jms:unknown:myqueue");
         assertFalse(result.isSuccess());
-        assertTrue(result.getInvalidEnum().contains("destinationType"));
+        assertEquals("unknown", result.getInvalidEnum().get("destinationType"));
 
         // okay
         result = catalog.validateProperties("yammer:MESSAGES?accessToken=aaa&consumerKey=bbb&consumerSecret=ccc&useJson=true&initialDelay=500");
@@ -412,8 +412,8 @@ public class CamelCatalogTest {
         assertFalse(result.isSuccess());
         assertTrue(result.getRequired().contains("consumerKey"));
         assertTrue(result.getRequired().contains("consumerSecret"));
-        assertTrue(result.getInvalidBoolean().contains("useJson"));
-        assertTrue(result.getInvalidInteger().contains("initialDelay"));
+        assertEquals("no", result.getInvalidBoolean().get("useJson"));
+        assertEquals("five", result.getInvalidInteger().get("initialDelay"));
 
         // okay
         result = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=2.5");
@@ -422,7 +422,7 @@ public class CamelCatalogTest {
         // number
         result = catalog.validateProperties("mqtt:myqtt?reconnectBackOffMultiplier=five");
         assertFalse(result.isSuccess());
-        assertTrue(result.getInvalidNumber().contains("reconnectBackOffMultiplier"));
+        assertEquals("five", result.getInvalidNumber().get("reconnectBackOffMultiplier"));
 
         // unknown component
         result = catalog.validateProperties("foo:bar?me=you");


[7/8] camel git commit: Camel catalog - Add api to validate endpoint uri

Posted by da...@apache.org.
Camel catalog - Add api to validate endpoint uri


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/521424b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/521424b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/521424b7

Branch: refs/heads/camel-2.16.x
Commit: 521424b7cadde6e76ebd77470624e9c4a561f473
Parents: 7caf775
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Dec 20 15:59:02 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 21 13:42:38 2015 +0100

----------------------------------------------------------------------
 .../apache/camel/catalog/DefaultCamelCatalog.java |  4 +++-
 .../apache/camel/catalog/ValidationResult.java    | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/521424b7/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 2580536..efb5db4 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -691,8 +691,9 @@ public class DefaultCamelCatalog implements CamelCatalog {
                 // but we can only check if the value is not a placeholder
                 String enums = getPropertyEnum(rows, name);
                 if (!placeholder && enums != null) {
+                    String[] choices = enums.split(",");
                     boolean found = false;
-                    for (String s : enums.split(",")) {
+                    for (String s : choices) {
                         if (value.equalsIgnoreCase(s)) {
                             found = true;
                             break;
@@ -700,6 +701,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
                     }
                     if (!found) {
                         result.addInvalidEnum(name, value);
+                        result.addInvalidEnumChoices(name, choices);
                     }
                 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/521424b7/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
index 4450133..40aacb3 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/ValidationResult.java
@@ -17,11 +17,15 @@
 package org.apache.camel.catalog;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * Details result of validating endpoint uri.
+ */
 public class ValidationResult implements Serializable {
 
     private final String uri;
@@ -34,6 +38,7 @@ public class ValidationResult implements Serializable {
     private Set<String> unknown;
     private Set<String> required;
     private Map<String, String> invalidEnum;
+    private Map<String, String[]> invalidEnumChoices;
     private Map<String, String> invalidBoolean;
     private Map<String, String> invalidInteger;
     private Map<String, String> invalidNumber;
@@ -44,7 +49,7 @@ public class ValidationResult implements Serializable {
 
     public boolean isSuccess() {
         return syntaxError == null && unknownComponent == null
-                && unknown == null && required == null && invalidEnum == null
+                && unknown == null && required == null && invalidEnum == null && invalidEnumChoices == null
                 && invalidBoolean == null && invalidInteger == null && invalidNumber == null;
     }
 
@@ -77,6 +82,13 @@ public class ValidationResult implements Serializable {
         invalidEnum.put(name, value);
     }
 
+    public void addInvalidEnumChoices(String name, String[] choices) {
+        if (invalidEnumChoices == null) {
+            invalidEnumChoices = new LinkedHashMap<String, String[]>();
+        }
+        invalidEnumChoices.put(name, choices);
+    }
+
     public void addInvalidBoolean(String name, String value) {
         if (invalidBoolean == null) {
             invalidBoolean = new LinkedHashMap<String, String>();;
@@ -160,7 +172,9 @@ public class ValidationResult implements Serializable {
         }
         if (invalidEnum != null) {
             for (Map.Entry<String, String> entry : invalidEnum.entrySet()) {
-                options.put(entry.getKey(), "Invalid enum value: " + entry.getValue());
+                String[] choices = invalidEnumChoices.get(entry.getKey());
+                String str = Arrays.asList(choices).toString();
+                options.put(entry.getKey(), "Invalid enum value: " + entry.getValue() + ". Possible values: " + str);
             }
         }
         if (invalidBoolean != null) {