Repository: camel Updated Branches: refs/heads/master f03a47a0e -> 9c5cf5f85
camel-catalog-connector - Improved Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9c5cf5f8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c5cf5f8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c5cf5f8 Branch: refs/heads/master Commit: 9c5cf5f85f89372aa9e1e78b8d74cce06b5215a8 Parents: f03a47a Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 8 21:15:34 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 8 21:15:34 2017 +0100 ---------------------------------------------------------------------- .../connector/CamelConnectorCatalog.java | 3 ++- .../camel/catalog/connector/ConnectorDto.java | 10 ++++++++++ .../connector/DefaultCamelConnectorCatalog.java | 3 ++- .../connector/CamelConnectorCatalogTest.java | 20 ++++++++++---------- .../maven/DefaultMavenArtifactProvider.java | 4 +++- 5 files changed, 27 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9c5cf5f8/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/CamelConnectorCatalog.java ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/CamelConnectorCatalog.java b/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/CamelConnectorCatalog.java index c3b288f..6923b51 100644 --- a/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/CamelConnectorCatalog.java +++ b/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/CamelConnectorCatalog.java @@ -47,12 +47,13 @@ public interface CamelConnectorCatalog { * @param artifactId maven artifact id * @param version maven version * @param name name of connector + * @param scheme scheme of connector * @param description description of connector * @param labels labels (separated by comma) of connector * @param connectorJson the <tt>camel-connector</tt> json file * @param connectorSchemaJson the <tt>camel-connector-schema</tt> json file */ - void addConnector(String groupId, String artifactId, String version, String name, String description, String labels, + void addConnector(String groupId, String artifactId, String version, String name, String scheme, String description, String labels, String connectorJson, String connectorSchemaJson); /** http://git-wip-us.apache.org/repos/asf/camel/blob/9c5cf5f8/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/ConnectorDto.java ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/ConnectorDto.java b/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/ConnectorDto.java index 80ab8fb..87e96c0 100644 --- a/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/ConnectorDto.java +++ b/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/ConnectorDto.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; public class ConnectorDto { private String name; + private String scheme; private String description; private String labels; @@ -41,6 +42,14 @@ public class ConnectorDto { this.name = name; } + public String getScheme() { + return scheme; + } + + public void setScheme(String scheme) { + this.scheme = scheme; + } + public String getDescription() { return description; } @@ -113,6 +122,7 @@ public class ConnectorDto { public String toString() { return "ConnectorDto[" + "name='" + name + '\'' + + ", scheme='" + scheme + '\'' + ", groupId='" + groupId + '\'' + ", artifactId='" + artifactId + '\'' + ", version='" + version + '\'' http://git-wip-us.apache.org/repos/asf/camel/blob/9c5cf5f8/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/DefaultCamelConnectorCatalog.java ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/DefaultCamelConnectorCatalog.java b/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/DefaultCamelConnectorCatalog.java index c4fd39a..82d7d8d 100644 --- a/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/DefaultCamelConnectorCatalog.java +++ b/platforms/camel-catalog-connector/src/main/java/org/apache/camel/catalog/connector/DefaultCamelConnectorCatalog.java @@ -37,13 +37,14 @@ public class DefaultCamelConnectorCatalog implements CamelConnectorCatalog { } @Override - public void addConnector(String groupId, String artifactId, String version, String name, String description, String labels, + public void addConnector(String groupId, String artifactId, String version, String name, String scheme, String description, String labels, String connectorJson, String connectorSchemaJson) { ConnectorDto dto = new ConnectorDto(); dto.setGroupId(groupId); dto.setArtifactId(artifactId); dto.setVersion(version); dto.setName(name); + dto.setScheme(scheme); dto.setDescription(description); dto.setLabels(labels); dataStore.addConnector(dto, connectorJson, connectorSchemaJson); http://git-wip-us.apache.org/repos/asf/camel/blob/9c5cf5f8/platforms/camel-catalog-connector/src/test/java/org/apache/camel/catalog/connector/CamelConnectorCatalogTest.java ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog-connector/src/test/java/org/apache/camel/catalog/connector/CamelConnectorCatalogTest.java b/platforms/camel-catalog-connector/src/test/java/org/apache/camel/catalog/connector/CamelConnectorCatalogTest.java index 65afe56..4b802d6 100644 --- a/platforms/camel-catalog-connector/src/test/java/org/apache/camel/catalog/connector/CamelConnectorCatalogTest.java +++ b/platforms/camel-catalog-connector/src/test/java/org/apache/camel/catalog/connector/CamelConnectorCatalogTest.java @@ -31,7 +31,7 @@ public class CamelConnectorCatalogTest { assertEquals(0, catalog.findConnector(false).size()); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", null, null); + "MyFoo", "my-foo","Something cool", "foo,timer", null, null); assertEquals(1, catalog.findConnector(false).size()); } @@ -45,7 +45,7 @@ public class CamelConnectorCatalogTest { assertFalse(catalog.hasConnector("org.apache.camel", "myfoo-connector", "2.19.0")); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", null, null); + "MyFoo", "my-foo", "Something cool", "foo,timer", null, null); assertEquals(1, catalog.findConnector(false).size()); @@ -57,7 +57,7 @@ public class CamelConnectorCatalogTest { CamelConnectorCatalog catalog = new DefaultCamelConnectorCatalog(); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", "foo", "bar"); + "MyFoo", "my-foo", "Something cool", "foo,timer", "foo", "bar"); String json = catalog.connectorJSon("org.apache.camel", "myfoo-connector", "2.19.0"); assertEquals("foo", json); @@ -68,7 +68,7 @@ public class CamelConnectorCatalogTest { CamelConnectorCatalog catalog = new DefaultCamelConnectorCatalog(); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", "foo", "bar"); + "MyFoo", "my-foo", "Something cool", "foo,timer", "foo", "bar"); String json = catalog.connectorSchemaJSon("org.apache.camel", "myfoo-connector", "2.19.0"); assertEquals("bar", json); @@ -81,7 +81,7 @@ public class CamelConnectorCatalogTest { assertEquals(0, catalog.findConnector(false).size()); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", null, null); + "MyFoo", "my-foo", "Something cool", "foo,timer", null, null); assertEquals(1, catalog.findConnector(false).size()); @@ -97,7 +97,7 @@ public class CamelConnectorCatalogTest { assertEquals(0, catalog.findConnector(false).size()); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", null, null); + "MyFoo", "my-foo", "Something cool", "foo,timer", null, null); assertEquals(1, catalog.findConnector("foo", false).size()); assertEquals(0, catalog.findConnector("bar", false).size()); @@ -110,10 +110,10 @@ public class CamelConnectorCatalogTest { assertEquals(0, catalog.findConnector(false).size()); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", null, null); + "MyFoo", "my-foo", "Something cool", "foo,timer", null, null); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.1", - "MyFoo", "Something more cool", "foo,timer", null, null); + "MyFoo", "my-foo", "Something more cool", "foo,timer", null, null); assertEquals(1, catalog.findConnector("foo", true).size()); assertEquals(0, catalog.findConnector("bar", true).size()); @@ -129,10 +129,10 @@ public class CamelConnectorCatalogTest { assertEquals(0, catalog.findConnector(false).size()); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0", - "MyFoo", "Something cool", "foo,timer", null, null); + "MyFoo", "my-foo", "Something cool", "foo,timer", null, null); catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.1", - "MyFoo", "Something more cool", "foo,timer", null, null); + "MyFoo", "my-foo", "Something more cool", "foo,timer", null, null); assertEquals(2, catalog.findConnector("foo", false).size()); assertEquals(0, catalog.findConnector("bar", false).size()); http://git-wip-us.apache.org/repos/asf/camel/blob/9c5cf5f8/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java index 733264d..6fa68d6 100644 --- a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java +++ b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java @@ -124,6 +124,7 @@ public class DefaultMavenArtifactProvider implements MavenArtifactProvider { ObjectMapper mapper = new ObjectMapper(); JsonNode tree = mapper.readTree(json[0]); String name = tree.get("name").textValue(); + String scheme = tree.get("scheme").textValue(); String description = tree.get("description").textValue(); Iterator<JsonNode> it = tree.withArray("labels").iterator(); @@ -133,8 +134,9 @@ public class DefaultMavenArtifactProvider implements MavenArtifactProvider { csb.append(text); } + LOG.debug("Adding connector: {} with scheme: {}", name, scheme); camelConnectorCatalog.addConnector(groupId, artifactId, version, - name, description, csb.toString(), json[0], json[1]); + name, scheme, description, csb.toString(), json[0], json[1]); names.add(name); } catch (Throwable e) {
