Merge pull request #509 from dwnusbaum/skip-filter-when-anonymization-disabled

Preserve line endings in `FileContent` when anonymization is disabled and avoid duplicating binary content

Author: Dohbedoh

src/main/java/com/cloudbees/jenkins/support/api/BaseFileContent.java

@@ -124,8 +124,9 @@ protected void writeTo(OutputStream os) throws IOException {
     }
 
     protected void writeTo(OutputStream os, @NonNull ContentFilter filter) throws IOException {
-        if (isBinary) {
+        if (isBinary || filter == ContentFilter.NONE) {
             writeTo(os);
+            return;
         }
 
         try {

src/test/java/com/cloudbees/jenkins/support/api/FileContentTest.java

@@ -26,9 +26,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.cloudbees.jenkins.support.filter.ContentFilter;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -69,4 +72,24 @@ public void encoding() throws Exception {
         new FileContent("-", f).writeTo(baos, input -> input);
         assertTrue(baos.toString().contains("Checking folder"));
     }
+
+    @Test
+    public void normalizesLineEndingsWhenFiltering() throws IOException {
+        File f = tmp.newFile();
+        FileUtils.writeStringToFile(f, "Before\r\nlines\n", StandardCharsets.UTF_8);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        new FileContent("-", f).writeTo(baos, s -> s.replace("Before", "After"));
+        // Note that besides the filtering, \r has been dropped!
+        assertEquals("After\nlines\n", baos.toString());
+    }
+
+    @Test
+    public void preservesLineEndingsWithContentFilterNone() throws IOException {
+        File f = tmp.newFile();
+        FileUtils.writeStringToFile(f, "Cool\r\nlines\n", StandardCharsets.UTF_8);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        new FileContent("-", f).writeTo(baos, ContentFilter.NONE);
+        String x = baos.toString();
+        assertEquals("Cool\r\nlines\n", baos.toString());
+    }
 }