[camel-kafka-connector] branch camel-kafka-connector-0.6.x updated: Avoid NPE on Windows for Catalog initialization #697

[valdar]

This is an automated email from the ASF dual-hosted git repository.

valdar pushed a commit to branch camel-kafka-connector-0.6.x
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git


The following commit(s) were added to refs/heads/camel-kafka-connector-0.6.x by 
this push:
     new 3605e5f  Avoid NPE on Windows for Catalog initialization #697
3605e5f is described below

commit 3605e5f9ce7f6a967d714a8491b36aadab120f55
Author: Aurélien Pupier <apup...@redhat.com>
AuthorDate: Tue Nov 10 09:15:30 2020 +0100

    Avoid NPE on Windows for Catalog initialization #697
    
    path inside bundles are always using "/", it is a resource path, not a
    file path. i tis then not using a file separator.
    
    Signed-off-by: Aurélien Pupier <apup...@redhat.com>
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalog.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 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 7009c58..567fdbd 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,7 +17,6 @@
 package org.apache.camel.kafkaconnector.catalog;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -60,8 +59,7 @@ public class CamelKafkaConnectorCatalog {
     }
 
     private void initCatalog() {
-        try (InputStream input = 
CamelKafkaConnectorCatalog.class.getResourceAsStream(File.separator + 
DESCRIPTORS_DIR + File.separator + CONNECTORS_PROPERTIES)) {
-
+        try (InputStream input = 
CamelKafkaConnectorCatalog.class.getResourceAsStream("/" + DESCRIPTORS_DIR + 
"/" + CONNECTORS_PROPERTIES)) {
             BufferedReader reader = new BufferedReader(new 
InputStreamReader(input));
 
             while (reader.ready()) {
@@ -87,7 +85,7 @@ public class CamelKafkaConnectorCatalog {
 
     private String loadConnectorAsJsonFromEmbeddedCatalog(String 
connectorName) {
         String result = null;
-        try (InputStream connectorModelInputSream = 
CamelKafkaConnectorCatalog.class.getResourceAsStream(File.separator + 
CONNECTORS_DIR + File.separator + connectorName + ".json")) {
+        try (InputStream connectorModelInputSream = 
CamelKafkaConnectorCatalog.class.getResourceAsStream("/" + CONNECTORS_DIR + "/" 
+ connectorName + ".json")) {
             result = new BufferedReader(new 
InputStreamReader(connectorModelInputSream, StandardCharsets.UTF_8))
                 .lines()
                 .map(String::trim) // to change line