From 0845b13bffa2d3db97325268b97158e47629d2a7 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@gmx.de>
Date: Tue, 2 Jul 2024 11:23:40 +0200
Subject: [PATCH 1/2] Fixed copying of multiple files in the generated
 dockerfiles

---
 .../main/java/org/lflang/generator/docker/DockerGenerator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java b/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java
index 3b3614e6f0..7c886b493c 100644
--- a/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java
@@ -170,7 +170,7 @@ protected String generateCopyOfUserFiles() {
       var name = p.getFileName().toString();
       ret.append(
           String.format(
-              "COPY --from=builder \"lingua-franca/%s/src-gen/%s\" \"./%s\"",
+              "COPY --from=builder \"lingua-franca/%s/src-gen/%s\" \"./%s\"\n",
               context.getFileConfig().name, name, name));
     }
     return ret.toString();

From 8578788da842d6e62de66fa313b32743e22774ad Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 2 Jul 2024 03:17:31 -0700
Subject: [PATCH 2/2] Use stream API to avoid trailing newline

---
 .../generator/docker/DockerGenerator.java     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java b/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java
index 7c886b493c..e794b098cb 100644
--- a/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java
+++ b/core/src/main/java/org/lflang/generator/docker/DockerGenerator.java
@@ -164,16 +164,15 @@ protected String generateCopyOfUserFiles() {
     if (files == null) {
       return "# (No user-specified files to be copied.)";
     }
-    var ret = new StringBuilder();
-    for (var file : files) {
-      var p = Path.of(file);
-      var name = p.getFileName().toString();
-      ret.append(
-          String.format(
-              "COPY --from=builder \"lingua-franca/%s/src-gen/%s\" \"./%s\"\n",
-              context.getFileConfig().name, name, name));
-    }
-    return ret.toString();
+    return files.stream()
+        .map(
+            file -> {
+              var name = Path.of(file).getFileName().toString();
+              return String.format(
+                  "COPY --from=builder \"lingua-franca/%s/src-gen/%s\" \"./%s\"",
+                  context.getFileConfig().name, name, name);
+            })
+        .collect(Collectors.joining("\n"));
   }
 
   /**