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 09:34:24 UTC
[camel-kafka-connector] branch master updated: Have
CamelKafkaConnectorCatalog working with bundled jar
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
The following commit(s) were added to refs/heads/master by this push:
new 0c6871f Have CamelKafkaConnectorCatalog working with bundled jar
0c6871f is described below
commit 0c6871f86a9d71d47bd7144c2e636509d0a80fac
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Fri Oct 9 10:39:55 2020 +0200
Have CamelKafkaConnectorCatalog working with bundled jar
Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
.../catalog/CamelKafkaConnectorCatalog.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 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 7e4f27e..b9718b5 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
@@ -18,12 +18,11 @@ 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;
+import java.io.InputStream;
import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -43,8 +42,8 @@ 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_DIR = "connectors";
+ private static final String DESCRIPTORS_DIR = "descriptors";
private static final String CONNECTORS_PROPERTIES = "connectors.properties";
public CamelKafkaConnectorCatalog() {
@@ -59,7 +58,7 @@ public class CamelKafkaConnectorCatalog {
}
private void initCatalog() {
- try (FileInputStream input = new FileInputStream(DESCRIPTORS_DIR + File.separator + CONNECTORS_PROPERTIES)) {
+ try (InputStream input = CamelKafkaConnectorCatalog.class.getResourceAsStream(File.separator + DESCRIPTORS_DIR + File.separator + CONNECTORS_PROPERTIES)) {
BufferedReader reader = new BufferedReader(new InputStreamReader(input));
@@ -86,10 +85,9 @@ public class CamelKafkaConnectorCatalog {
public String getConnectorAsJson(String connectorName) {
String result = null;
- try {
- result = Files.lines(Paths.get(CONNECTORS_DIR + File.separator + connectorName + ".json")).parallel() // for
- // parallel
- // processing
+ try (InputStream connectorModelInputSream = CamelKafkaConnectorCatalog.class.getResourceAsStream(File.separator + CONNECTORS_DIR + File.separator + connectorName + ".json")) {
+ result = new BufferedReader(new InputStreamReader(connectorModelInputSream, StandardCharsets.UTF_8))
+ .lines()
.map(String::trim) // to change line
.collect(Collectors.joining());
} catch (IOException e) {