[camel-kafka-connector] branch master updated: Factorize code in CollectConnectorDescriptorMojo

[acosentino]

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 8c5141a  Factorize code in CollectConnectorDescriptorMojo
8c5141a is described below

commit 8c5141a73a8253e523e3b4820097ff889cea7e71
Author: Aurélien Pupier <apup...@redhat.com>
AuthorDate: Wed Dec 9 10:24:46 2020 +0100

    Factorize code in CollectConnectorDescriptorMojo
    
    Signed-off-by: Aurélien Pupier <apup...@redhat.com>
---
 .../descriptor/CollectConnectorDescriptorMojo.java | 42 ++++++++++------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git 
a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java
 
b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java
index ce4d87e..1a9f4d8 100644
--- 
a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java
+++ 
b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.stream.Stream;
 
@@ -80,30 +81,8 @@ public class CollectConnectorDescriptorMojo extends 
AbstractMojo {
                 for (int i = 0; i < files.length; i++) {
                     File file = files[i];
                     if (file.isDirectory()) {
-                        File fileSource = FileUtils.getFile(file, 
"src/generated/descriptors/connector-source.properties");
-                        File fileSink = FileUtils.getFile(file, 
"src/generated/descriptors/connector-sink.properties");
-                        if (fileSource.exists()) {
-                            try (BufferedReader br = new BufferedReader(new 
InputStreamReader(new FileInputStream(fileSource), "UTF-8"))) {
-                                String line = null;
-                                while ((line = br.readLine()) != null) {
-                                    sb.append(line);
-                                    sb.append(System.lineSeparator());
-                                }
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                        if (fileSink.exists()) {
-                            try (BufferedReader br = new BufferedReader(new 
InputStreamReader(new FileInputStream(fileSink), "UTF-8"))) {
-                                String line = null;
-                                while ((line = br.readLine()) != null) {
-                                    sb.append(line);
-                                    sb.append(System.lineSeparator());
-                                }
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                        }
+                        fillStringBuilderWithContentOf(sb, file, 
"src/generated/descriptors/connector-source.properties");
+                        fillStringBuilderWithContentOf(sb, file, 
"src/generated/descriptors/connector-sink.properties");
                     }
                 }
                 File file = FileUtils.getFile(catalogDescriptorDir, 
"connectors.properties");
@@ -115,4 +94,19 @@ public class CollectConnectorDescriptorMojo extends 
AbstractMojo {
             }
         }
     }
+
+    private void fillStringBuilderWithContentOf(StringBuilder sb, File file, 
String path) {
+        File fileToRead = FileUtils.getFile(file, path);
+        if (fileToRead.exists()) {
+            try (BufferedReader br = new BufferedReader(new 
InputStreamReader(new FileInputStream(fileToRead), StandardCharsets.UTF_8))) {
+                String line = null;
+                while ((line = br.readLine()) != null) {
+                    sb.append(line);
+                    sb.append(System.lineSeparator());
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }