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 06:24:55 UTC
[camel-kafka-connector] 02/03: Catalog API: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch issue-542
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 33bb1706ca40e09cbf6f000f7c076e4ec40adef9
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();