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 2017/03/08 19:43:18 UTC

camel git commit: camel-catalog-connector - Polished

Repository: camel
Updated Branches:
  refs/heads/master ad64a54ec -> f03a47a0e


camel-catalog-connector - Polished


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

Branch: refs/heads/master
Commit: f03a47a0e2ed398fbcf2ea87dd5725b9bae6d278
Parents: ad64a54
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 8 20:43:11 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 8 20:43:11 2017 +0100

----------------------------------------------------------------------
 .../connector/DefaultCamelConnectorCatalog.java | 12 +++++++++--
 .../connector/CamelConnectorCatalogTest.java    | 22 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f03a47a0/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 e25af70..c4fd39a 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
@@ -70,11 +70,19 @@ public class DefaultCamelConnectorCatalog implements CamelConnectorCatalog {
 
     @Override
     public String connectorJSon(String groupId, String artifactId, String version) {
-        return null;
+        ConnectorDto dto = new ConnectorDto();
+        dto.setGroupId(groupId);
+        dto.setArtifactId(artifactId);
+        dto.setVersion(version);
+        return dataStore.connectorJSon(dto);
     }
 
     @Override
     public String connectorSchemaJSon(String groupId, String artifactId, String version) {
-        return null;
+        ConnectorDto dto = new ConnectorDto();
+        dto.setGroupId(groupId);
+        dto.setArtifactId(artifactId);
+        dto.setVersion(version);
+        return dataStore.connectorSchemaJSon(dto);
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/f03a47a0/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 2970fdd..65afe56 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
@@ -53,6 +53,28 @@ public class CamelConnectorCatalogTest {
     }
 
     @Test
+    public void testConnectorJson() throws Exception {
+        CamelConnectorCatalog catalog = new DefaultCamelConnectorCatalog();
+
+        catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0",
+            "MyFoo", "Something cool", "foo,timer", "foo", "bar");
+
+        String json = catalog.connectorJSon("org.apache.camel", "myfoo-connector", "2.19.0");
+        assertEquals("foo", json);
+    }
+
+    @Test
+    public void testConnectorSchemaJson() throws Exception {
+        CamelConnectorCatalog catalog = new DefaultCamelConnectorCatalog();
+
+        catalog.addConnector("org.apache.camel", "myfoo-connector", "2.19.0",
+            "MyFoo", "Something cool", "foo,timer", "foo", "bar");
+
+        String json = catalog.connectorSchemaJSon("org.apache.camel", "myfoo-connector", "2.19.0");
+        assertEquals("bar", json);
+    }
+
+    @Test
     public void testRemoveConnector() throws Exception {
         CamelConnectorCatalog catalog = new DefaultCamelConnectorCatalog();