[camel-karavan] branch main updated: Fix generator 15 (#311)

[marat]

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

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new eb03829  Fix generator 15 (#311)
eb03829 is described below

commit eb038297d33bc9b304f6c507938ce9a1308576fe
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Tue Apr 12 11:28:23 2022 -0400

    Fix generator 15 (#311)
    
    * Update CamelComponentsGenerator.java
    
    * Update KameletGenerator.java
---
 .../camel/karavan/generator/CamelComponentsGenerator.java     | 11 ++++-------
 .../org/apache/camel/karavan/generator/KameletGenerator.java  | 10 ++++------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git 
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java
 
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java
index e2f78c1..488db8d 100644
--- 
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java
+++ 
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelComponentsGenerator.java
@@ -48,9 +48,8 @@ public final class CamelComponentsGenerator {
         g.createCreateComponents("karavan-vscode/components");
     }
 
-    private void createCreateComponents(String path) throws IOException {
-        deleteDirectory(Paths.get(path).toFile());
-        Files.createDirectory(Paths.get(path));
+    private void createCreateComponents(String path) {
+        clearDirectory(Paths.get(path).toFile());
         List<String> components = getComponents();
         StringBuilder list = new StringBuilder();
         components.forEach(name -> {
@@ -99,14 +98,12 @@ public final class CamelComponentsGenerator {
         }
     }
 
-    boolean deleteDirectory(File directoryToBeDeleted) {
+    void clearDirectory(File directoryToBeDeleted) {
         File[] allContents = directoryToBeDeleted.listFiles();
         if (allContents != null) {
             for (File file : allContents) {
-                deleteDirectory(file);
+                if (!file.getName().endsWith("gitignore")) file.delete();
             }
         }
-        return directoryToBeDeleted.delete();
     }
-
 }
diff --git 
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java
 
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java
index a993d60..f2eea28 100644
--- 
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java
+++ 
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/KameletGenerator.java
@@ -43,10 +43,9 @@ public class KameletGenerator {
         g.createKamelets("karavan-designer/public/kamelets");
     }
 
-    public void createKamelets(String folder) throws IOException {
+    public void createKamelets(String folder) {
         LOGGER.info("Creating default Kamelets");
-        deleteDirectory(Paths.get(folder).toFile());
-        Files.createDirectory(Paths.get(folder));
+        clearDirectory(Paths.get(folder).toFile());
         KameletsCatalog catalog = new KameletsCatalog();
         catalog.getKamelets().entrySet().stream()
                 .map(k -> k.getValue().getMetadata().getName())
@@ -73,13 +72,12 @@ public class KameletGenerator {
             }
         }
     }
-    boolean deleteDirectory(File directoryToBeDeleted) {
+    void clearDirectory(File directoryToBeDeleted) {
         File[] allContents = directoryToBeDeleted.listFiles();
         if (allContents != null) {
             for (File file : allContents) {
-                deleteDirectory(file);
+                if (!file.getName().endsWith("gitignore")) file.delete();
             }
         }
-        return directoryToBeDeleted.delete();
     }
 }