You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/09 07:02:32 UTC
[camel-kafka-connector] branch master updated (f6b0b34 -> c792fd5)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from f6b0b34 Updated CHANGELOG.md
new 1071a86 Catalog: expose an API for consuming connectors catalog metadata and options
new 9b7c6bc Catalog API: Fixed CS
new c792fd5 Catalog: expose an API for consuming connectors catalog metadata and options, some little adjustments
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-kafka-connector-catalog/pom.xml | 34 +++++
.../catalog/CamelKafkaConnectorCatalog.java | 138 +++++++++++++++++++++
.../catalog/CamelKafkaConnectorCatalogTest.java | 58 +++++++++
3 files changed, 230 insertions(+)
create mode 100644 camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
create mode 100644 camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
[camel-kafka-connector] 01/03: Catalog: expose an API for consuming
connectors catalog metadata and options
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 1071a86cbb7044dde320cee0b5e09430c5bcf8da
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 8 20:42:31 2020 +0200
Catalog: expose an API for consuming connectors catalog metadata and options
---
camel-kafka-connector-catalog/pom.xml | 34 ++++++
.../catalog/CamelKafkaConnectorCatalog.java | 134 +++++++++++++++++++++
.../catalog/CamelKafkaConnectorCatalogTest.java | 58 +++++++++
3 files changed, 226 insertions(+)
diff --git a/camel-kafka-connector-catalog/pom.xml b/camel-kafka-connector-catalog/pom.xml
index faee857..5742bdd 100644
--- a/camel-kafka-connector-catalog/pom.xml
+++ b/camel-kafka-connector-catalog/pom.xml
@@ -44,6 +44,40 @@
<artifactId>camel-tooling-model</artifactId>
<version>${camel.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.kafkaconnector</groupId>
+ <artifactId>camel-kafka-connector-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-catalog</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
new file mode 100644
index 0000000..43e5bb6
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
@@ -0,0 +1,134 @@
+/*
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.kafkaconnector.catalog;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorModel;
+import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorOptionModel;
+import org.apache.camel.tooling.model.JsonMapper;
+import org.apache.camel.util.json.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CamelKafkaConnectorCatalog {
+
+ private static final Logger LOG = LoggerFactory.getLogger(CamelKafkaConnectorCatalog.class);
+
+ static List<String> connectorsName = new ArrayList<String>();
+ static Map<String, CamelKafkaConnectorModel> connectorsModel = new HashMap<String, CamelKafkaConnectorModel>();
+
+ public CamelKafkaConnectorCatalog() {
+ initCatalog();
+ generateModel();
+ }
+
+ private void generateModel() {
+ for (String connector : connectorsName) {
+ connectorsModel.put(connector, getConnectorModel(connector));
+ }
+ }
+
+ private void initCatalog() {
+ try(FileInputStream input = new FileInputStream("src/generated/resources/descriptors/connectors.properties")) {
+
+ BufferedReader reader = new BufferedReader(new InputStreamReader(input));
+
+ while(reader.ready()) {
+ String connector = reader.readLine();
+ if (connector.equalsIgnoreCase("camel-coap-tcp-source")) {
+ connectorsName.add("camel-coap+tcp-source");
+ } else if (connector.equalsIgnoreCase("camel-coaps-tcp-source")) {
+ connectorsName.add("camel-coaps+tcp-source");
+ } else if (connector.equalsIgnoreCase("camel-coaps-tcp-sink")) {
+ connectorsName.add("camel-coaps+tcp-sink");
+ } else if (connector.equalsIgnoreCase("camel-coap-tcp-sink")) {
+ connectorsName.add("camel-coap+tcp-sink");
+ }else {
+ connectorsName.add(connector);
+ }
+ }
+ } catch (FileNotFoundException e) {
+ LOG.error("Cannot find file: {}", e.getMessage(), e);
+ } catch (IOException e) {
+ LOG.error("IO Exception: {}", e.getMessage(), e);
+ }
+ }
+
+ public String getConnectorAsJson(String connectorName) {
+ String result = null;
+ try {
+ result = Files.lines(Paths.get("src/generated/resources/connectors/" + connectorName + ".json"))
+ .parallel() // for parallel processing
+ .map(String::trim) // to change line
+ .collect(Collectors.joining());
+ } catch (IOException e) {
+ LOG.error("IO Exception: {}", e.getMessage(), e);
+ }
+ return result;
+ }
+
+ private CamelKafkaConnectorModel getConnectorModel(String connectorName) {
+ CamelKafkaConnectorModel model = new CamelKafkaConnectorModel();
+ String json = getConnectorAsJson(connectorName);
+ JsonObject obj = JsonMapper.deserialize(json);
+ JsonObject wrapper = (JsonObject) obj.get("connector");
+ model.setConnectorClass((String) wrapper.get("class"));
+ model.setArtifactId((String) wrapper.get("artifactId"));
+ model.setGroupId((String) wrapper.get("groupId"));
+ model.setType((String) wrapper.get("type"));
+ model.setVersion((String) wrapper.get("version"));
+ model.setOptions((List<CamelKafkaConnectorOptionModel>) getConnectorOptionModel(obj));
+ return model;
+ }
+
+ private List<CamelKafkaConnectorOptionModel> getConnectorOptionModel(JsonObject obj) {
+ List<CamelKafkaConnectorOptionModel> model = new ArrayList<CamelKafkaConnectorOptionModel>();
+ JsonObject wrapper = (JsonObject) obj.get("properties");
+ Set<String> options = wrapper.keySet();
+ for (String string : options) {
+ JsonObject object = (JsonObject) wrapper.get(string);
+ CamelKafkaConnectorOptionModel singleModel = new CamelKafkaConnectorOptionModel();
+ singleModel.setDefaultValue((String) object.get("defaultValue"));
+ singleModel.setPriority((String) object.get("priority"));
+ singleModel.setDescription((String) object.get("description"));
+ singleModel.setName((String) object.get("name"));
+ model.add(singleModel);
+ }
+ return model;
+ }
+
+ public List<String> getConnectorsName() {
+ return connectorsName;
+ }
+
+ public static Map<String, CamelKafkaConnectorModel> getConnectorsModel() {
+ return connectorsModel;
+ }
+}
diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
new file mode 100644
index 0000000..af68e88
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.kafkaconnector.catalog;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorModel;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class CamelKafkaConnectorCatalogTest {
+
+ static CamelKafkaConnectorCatalog catalog;
+
+ @BeforeAll
+ public static void createCamelCatalog() {
+ catalog = new CamelKafkaConnectorCatalog();
+ }
+
+ @Test
+ public void testConnectors() throws Exception {
+ List<String> list = catalog.getConnectorsName();
+ assertTrue(list.contains("camel-aws2-s3-sink"));
+ assertTrue(list.contains("camel-aws2-s3-source"));
+ }
+
+ @Test
+ public void testOptions() throws Exception {
+ Map<String, CamelKafkaConnectorModel> p = catalog.getConnectorsModel();
+ CamelKafkaConnectorModel model = p.get("camel-aws2-s3-sink");
+ assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
+ assertEquals("sink", model.getType());
+ assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
+ assertEquals(61, model.getOptions().size());
+ assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
+ assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
+ assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
+ }
+
+}
[camel-kafka-connector] 03/03: Catalog: expose an API for consuming
connectors catalog metadata and options, some little adjustments
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit c792fd559c5c76ce533c99577055bfce31cda204
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 9 08:21:38 2020 +0200
Catalog: expose an API for consuming connectors catalog metadata and options, some little adjustments
---
.../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
index cb92dd5..77d5d4c 100644
--- a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
+++ b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
@@ -17,6 +17,7 @@
package org.apache.camel.kafkaconnector.catalog;
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -42,6 +43,9 @@ public class CamelKafkaConnectorCatalog {
static List<String> connectorsName = new ArrayList<String>();
static Map<String, CamelKafkaConnectorModel> connectorsModel = new HashMap<String, CamelKafkaConnectorModel>();
private static final Logger LOG = LoggerFactory.getLogger(CamelKafkaConnectorCatalog.class);
+ private static final String CONNECTORS_DIR = "src/generated/resources/connectors";
+ private static final String DESCRIPTORS_DIR = "src/generated/resources/descriptors";
+ private static final String CONNECTORS_PROPERTIES = "connectors.properties";
public CamelKafkaConnectorCatalog() {
initCatalog();
@@ -55,7 +59,7 @@ public class CamelKafkaConnectorCatalog {
}
private void initCatalog() {
- try (FileInputStream input = new FileInputStream("src/generated/resources/descriptors/connectors.properties")) {
+ try (FileInputStream input = new FileInputStream(DESCRIPTORS_DIR + File.separator + CONNECTORS_PROPERTIES)) {
BufferedReader reader = new BufferedReader(new InputStreamReader(input));
@@ -83,7 +87,7 @@ public class CamelKafkaConnectorCatalog {
public String getConnectorAsJson(String connectorName) {
String result = null;
try {
- result = Files.lines(Paths.get("src/generated/resources/connectors/" + connectorName + ".json")).parallel() // for
+ result = Files.lines(Paths.get(CONNECTORS_DIR + File.separator + connectorName + ".json")).parallel() // for
// parallel
// processing
.map(String::trim) // to change line
[camel-kafka-connector] 02/03: Catalog API: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 9b7c6bcd909db84fdd270e3a8f96b35fa3a8497b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 9 08:17:17 2020 +0200
Catalog API: Fixed CS
---
.../catalog/CamelKafkaConnectorCatalog.java | 164 ++++++++++-----------
.../catalog/CamelKafkaConnectorCatalogTest.java | 8 +-
2 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
index 43e5bb6..cb92dd5 100644
--- a/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
+++ b/camel-kafka-connector-catalog/src/main/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java
@@ -38,97 +38,97 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CamelKafkaConnectorCatalog {
-
- private static final Logger LOG = LoggerFactory.getLogger(CamelKafkaConnectorCatalog.class);
-
- static List<String> connectorsName = new ArrayList<String>();
- static Map<String, CamelKafkaConnectorModel> connectorsModel = new HashMap<String, CamelKafkaConnectorModel>();
- public CamelKafkaConnectorCatalog() {
- initCatalog();
- generateModel();
- }
+ static List<String> connectorsName = new ArrayList<String>();
+ static Map<String, CamelKafkaConnectorModel> connectorsModel = new HashMap<String, CamelKafkaConnectorModel>();
+ private static final Logger LOG = LoggerFactory.getLogger(CamelKafkaConnectorCatalog.class);
- private void generateModel() {
- for (String connector : connectorsName) {
- connectorsModel.put(connector, getConnectorModel(connector));
- }
- }
+ public CamelKafkaConnectorCatalog() {
+ initCatalog();
+ generateModel();
+ }
- private void initCatalog() {
- try(FileInputStream input = new FileInputStream("src/generated/resources/descriptors/connectors.properties")) {
+ private void generateModel() {
+ for (String connector : connectorsName) {
+ connectorsModel.put(connector, getConnectorModel(connector));
+ }
+ }
- BufferedReader reader = new BufferedReader(new InputStreamReader(input));
+ private void initCatalog() {
+ try (FileInputStream input = new FileInputStream("src/generated/resources/descriptors/connectors.properties")) {
- while(reader.ready()) {
- String connector = reader.readLine();
- if (connector.equalsIgnoreCase("camel-coap-tcp-source")) {
- connectorsName.add("camel-coap+tcp-source");
- } else if (connector.equalsIgnoreCase("camel-coaps-tcp-source")) {
- connectorsName.add("camel-coaps+tcp-source");
- } else if (connector.equalsIgnoreCase("camel-coaps-tcp-sink")) {
- connectorsName.add("camel-coaps+tcp-sink");
- } else if (connector.equalsIgnoreCase("camel-coap-tcp-sink")) {
- connectorsName.add("camel-coap+tcp-sink");
- }else {
- connectorsName.add(connector);
- }
- }
- } catch (FileNotFoundException e) {
- LOG.error("Cannot find file: {}", e.getMessage(), e);
- } catch (IOException e) {
- LOG.error("IO Exception: {}", e.getMessage(), e);
- }
- }
-
- public String getConnectorAsJson(String connectorName) {
- String result = null;
- try {
- result = Files.lines(Paths.get("src/generated/resources/connectors/" + connectorName + ".json"))
- .parallel() // for parallel processing
- .map(String::trim) // to change line
- .collect(Collectors.joining());
- } catch (IOException e) {
- LOG.error("IO Exception: {}", e.getMessage(), e);
- }
- return result;
- }
-
- private CamelKafkaConnectorModel getConnectorModel(String connectorName) {
- CamelKafkaConnectorModel model = new CamelKafkaConnectorModel();
- String json = getConnectorAsJson(connectorName);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(input));
+
+ while (reader.ready()) {
+ String connector = reader.readLine();
+ if (connector.equalsIgnoreCase("camel-coap-tcp-source")) {
+ connectorsName.add("camel-coap+tcp-source");
+ } else if (connector.equalsIgnoreCase("camel-coaps-tcp-source")) {
+ connectorsName.add("camel-coaps+tcp-source");
+ } else if (connector.equalsIgnoreCase("camel-coaps-tcp-sink")) {
+ connectorsName.add("camel-coaps+tcp-sink");
+ } else if (connector.equalsIgnoreCase("camel-coap-tcp-sink")) {
+ connectorsName.add("camel-coap+tcp-sink");
+ } else {
+ connectorsName.add(connector);
+ }
+ }
+ } catch (FileNotFoundException e) {
+ LOG.error("Cannot find file: {}", e.getMessage(), e);
+ } catch (IOException e) {
+ LOG.error("IO Exception: {}", e.getMessage(), e);
+ }
+ }
+
+ public String getConnectorAsJson(String connectorName) {
+ String result = null;
+ try {
+ result = Files.lines(Paths.get("src/generated/resources/connectors/" + connectorName + ".json")).parallel() // for
+ // parallel
+ // processing
+ .map(String::trim) // to change line
+ .collect(Collectors.joining());
+ } catch (IOException e) {
+ LOG.error("IO Exception: {}", e.getMessage(), e);
+ }
+ return result;
+ }
+
+ private CamelKafkaConnectorModel getConnectorModel(String connectorName) {
+ CamelKafkaConnectorModel model = new CamelKafkaConnectorModel();
+ String json = getConnectorAsJson(connectorName);
JsonObject obj = JsonMapper.deserialize(json);
- JsonObject wrapper = (JsonObject) obj.get("connector");
- model.setConnectorClass((String) wrapper.get("class"));
- model.setArtifactId((String) wrapper.get("artifactId"));
- model.setGroupId((String) wrapper.get("groupId"));
- model.setType((String) wrapper.get("type"));
- model.setVersion((String) wrapper.get("version"));
- model.setOptions((List<CamelKafkaConnectorOptionModel>) getConnectorOptionModel(obj));
- return model;
- }
-
- private List<CamelKafkaConnectorOptionModel> getConnectorOptionModel(JsonObject obj) {
+ JsonObject wrapper = (JsonObject)obj.get("connector");
+ model.setConnectorClass((String)wrapper.get("class"));
+ model.setArtifactId((String)wrapper.get("artifactId"));
+ model.setGroupId((String)wrapper.get("groupId"));
+ model.setType((String)wrapper.get("type"));
+ model.setVersion((String)wrapper.get("version"));
+ model.setOptions((List<CamelKafkaConnectorOptionModel>)getConnectorOptionModel(obj));
+ return model;
+ }
+
+ private List<CamelKafkaConnectorOptionModel> getConnectorOptionModel(JsonObject obj) {
List<CamelKafkaConnectorOptionModel> model = new ArrayList<CamelKafkaConnectorOptionModel>();
- JsonObject wrapper = (JsonObject) obj.get("properties");
+ JsonObject wrapper = (JsonObject)obj.get("properties");
Set<String> options = wrapper.keySet();
for (String string : options) {
- JsonObject object = (JsonObject) wrapper.get(string);
- CamelKafkaConnectorOptionModel singleModel = new CamelKafkaConnectorOptionModel();
- singleModel.setDefaultValue((String) object.get("defaultValue"));
- singleModel.setPriority((String) object.get("priority"));
- singleModel.setDescription((String) object.get("description"));
- singleModel.setName((String) object.get("name"));
- model.add(singleModel);
- }
- return model;
- }
+ JsonObject object = (JsonObject)wrapper.get(string);
+ CamelKafkaConnectorOptionModel singleModel = new CamelKafkaConnectorOptionModel();
+ singleModel.setDefaultValue((String)object.get("defaultValue"));
+ singleModel.setPriority((String)object.get("priority"));
+ singleModel.setDescription((String)object.get("description"));
+ singleModel.setName((String)object.get("name"));
+ model.add(singleModel);
+ }
+ return model;
+ }
- public List<String> getConnectorsName() {
- return connectorsName;
- }
+ public List<String> getConnectorsName() {
+ return connectorsName;
+ }
- public static Map<String, CamelKafkaConnectorModel> getConnectorsModel() {
- return connectorsModel;
- }
+ public static Map<String, CamelKafkaConnectorModel> getConnectorsModel() {
+ return connectorsModel;
+ }
}
diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index af68e88..bbbed25 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -27,9 +27,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelKafkaConnectorCatalogTest {
-
- static CamelKafkaConnectorCatalog catalog;
-
+
+ static CamelKafkaConnectorCatalog catalog;
+
@BeforeAll
public static void createCamelCatalog() {
catalog = new CamelKafkaConnectorCatalog();
@@ -41,7 +41,7 @@ public class CamelKafkaConnectorCatalogTest {
assertTrue(list.contains("camel-aws2-s3-sink"));
assertTrue(list.contains("camel-aws2-s3-source"));
}
-
+
@Test
public void testOptions() throws Exception {
Map<String, CamelKafkaConnectorModel> p = catalog.getConnectorsModel();