CAMEL-10842: Adjust connector to new JSon schema
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6c9a7a42 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6c9a7a42 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6c9a7a42 Branch: refs/heads/master Commit: 6c9a7a425155d24ed237a0e4f096e0e1505359e4 Parents: 1abdcc0 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Feb 16 16:17:28 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Feb 16 16:17:28 2017 +0100 ---------------------------------------------------------------------- .../apache/camel/maven/connector/ConnectorMojo.java | 13 ++++++++----- .../src/main/resources/camel-connector-schema.json | 8 ++++---- .../src/main/resources/camel-connector-schema.json | 8 ++++---- .../src/main/resources/camel-connector-schema.json | 8 ++++---- .../src/main/resources/camel-connector-schema.json | 8 ++++---- 5 files changed, 24 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6c9a7a42/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java ---------------------------------------------------------------------- diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java index bd3f681..b60244c 100644 --- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java +++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java @@ -337,6 +337,7 @@ public class ConnectorMojo extends AbstractJarMojo { String producerOnly = "To".equalsIgnoreCase(pattern) ? "true" : null; String consumerOnly = "From".equalsIgnoreCase(pattern) ? "true" : null; String lenientProperties = getOption(rows, "lenientProperties"); + String deprecated = getOption(rows, "deprecated"); String javaType = extractJavaType(scheme); String groupId = getProject().getGroupId(); String artifactId = getProject().getArtifactId(); @@ -358,17 +359,19 @@ public class ConnectorMojo extends AbstractJarMojo { if (label != null) { sb.append(" \"label\": \"" + label + "\",\n"); } - sb.append(" \"deprecated\": \"false\",\n"); + if (deprecated != null) { + sb.append(" \"deprecated\": " + deprecated + ",\n"); + } if (async != null) { - sb.append(" \"async\": \"" + async + "\",\n"); + sb.append(" \"async\": " + async + ",\n"); } if (producerOnly != null) { - sb.append(" \"producerOnly\": \"" + producerOnly + "\",\n"); + sb.append(" \"producerOnly\": " + producerOnly + ",\n"); } else if (consumerOnly != null) { - sb.append(" \"consumerOnly\": \"" + consumerOnly + "\",\n"); + sb.append(" \"consumerOnly\": " + consumerOnly + ",\n"); } if (lenientProperties != null) { - sb.append(" \"lenientProperties\": \"" + lenientProperties + "\",\n"); + sb.append(" \"lenientProperties\": " + lenientProperties + ",\n"); } sb.append(" \"javaType\": \"" + javaType + "\",\n"); sb.append(" \"groupId\": \"" + groupId + "\",\n"); http://git-wip-us.apache.org/repos/asf/camel/blob/6c9a7a42/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json index 397e12e..8f64200 100644 --- a/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json @@ -7,10 +7,10 @@ "title": "Bar", "description": "To order drinks from the bar", "label": "bar", - "deprecated": "false", - "async": "false", - "producerOnly": "true", - "lenientProperties": "false", + "deprecated": false, + "async": false, + "producerOnly": true, + "lenientProperties": false, "javaType": "org.foo.connector.BarComponent", "groupId": "org.foo", "artifactId": "bar-connector", http://git-wip-us.apache.org/repos/asf/camel/blob/6c9a7a42/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json index 4286b5f..1654293 100644 --- a/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json @@ -7,10 +7,10 @@ "title": "Foo", "description": "Something cool", "label": "foo,timer", - "deprecated": "false", - "async": "false", - "consumerOnly": "true", - "lenientProperties": "false", + "deprecated": false, + "async": false, + "consumerOnly": true, + "lenientProperties": false, "javaType": "org.foo.connector.FooComponent", "groupId": "org.foo", "artifactId": "foo-connector", http://git-wip-us.apache.org/repos/asf/camel/blob/6c9a7a42/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json index e40470b..f139cac 100644 --- a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json @@ -7,10 +7,10 @@ "title": "TwitterMention", "description": "Connection from twitter when anyone mention you", "label": "twitter", - "deprecated": "false", - "async": "false", - "consumerOnly": "true", - "lenientProperties": "false", + "deprecated": false, + "async": false, + "consumerOnly": true, + "lenientProperties": false, "javaType": "org.foo.mention.TwitterMentionComponent", "groupId": "org.foo", "artifactId": "twitter-mention-connector", http://git-wip-us.apache.org/repos/asf/camel/blob/6c9a7a42/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json index d2d4f1c..1c9e31b 100644 --- a/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json @@ -7,10 +7,10 @@ "title": "Wine", "description": "To order wine from the bar", "label": "bar", - "deprecated": "false", - "async": "false", - "producerOnly": "true", - "lenientProperties": "false", + "deprecated": false, + "async": false, + "producerOnly": true, + "lenientProperties": false, "javaType": "org.foo.connector.WineComponent", "groupId": "org.foo", "artifactId": "wine-connector",
