Fix #211: Append System.lineSeparator() to last line (#212)

primefaces-extensions · Oct 1, 2024 · 6cffca4 · 6cffca4
1 parent 92b5223
commit 6cffca4
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/src/main/java/org/primefaces/extensions/optimizerplugin/optimizer/AbstractOptimizer.java b/src/main/java/org/primefaces/extensions/optimizerplugin/optimizer/AbstractOptimizer.java
@@ -18,20 +18,27 @@
 
 package org.primefaces.extensions.optimizerplugin.optimizer;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.Objects;
 
+import com.google.common.io.CharSink;
+import com.google.common.io.FileWriteMode;
+import com.google.common.io.Files;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.primefaces.extensions.optimizerplugin.util.ResourcesSetAdapter;
 
-import com.google.common.io.FileWriteMode;
-import com.google.common.io.Files;
-
 /**
  * Basis abstract class for Google Closure Compiler / YUI Compressor Optimizers.
  *
@@ -91,21 +98,23 @@ protected File aggregateFiles(ResourcesSetAdapter rsa, Charset cset, boolean del
                 StringWriter writer = new StringWriter();
                 IOUtil.copy(in, writer);
 
+                CharSink charSink = Files.asCharSink(outputFile, cset, FileWriteMode.APPEND);
+                charSink.write(System.lineSeparator());
                 if (delimeters && outputFile.length() > 0) {
                     // append semicolon to the new file in order to avoid invalid JS code
-                    Files.asCharSink(outputFile, cset, FileWriteMode.APPEND).write(";");
+                    charSink.write(";");
                 }
 
                 // write / append content into / to the new file
-                Files.asCharSink(outputFile, cset, FileWriteMode.APPEND).write(writer.toString());
+                charSink.write(writer.toString());
             }
         }
 
         return outputFile;
     }
 
     protected void deleteFilesIfNecessary(ResourcesSetAdapter rsa) {
-        if (rsa.getAggregation().isRemoveIncluded() && rsa.getFiles().size() > 0) {
+        if (rsa.getAggregation().isRemoveIncluded() && !rsa.getFiles().isEmpty()) {
             for (File file : rsa.getFiles()) {
                 if (file.exists() && !file.delete()) {
                     log.warn("File " + file.getName() + " could not be deleted after aggregation.");
@@ -115,7 +124,7 @@ protected void deleteFilesIfNecessary(ResourcesSetAdapter rsa) {
     }
 
     protected void deleteDirectoryIfNecessary(ResourcesSetAdapter rsa) {
-        if (rsa.getAggregation().isRemoveEmptyDirectories() && rsa.getFiles().size() > 0) {
+        if (rsa.getAggregation().isRemoveEmptyDirectories() && !rsa.getFiles().isEmpty()) {
             for (File file : rsa.getFiles()) {
                 File directory = file.isDirectory() ? file : file.getParentFile();
                 while (directory != null && directory.isDirectory() &&
@@ -142,7 +151,7 @@ protected void prependFile(File prependedFile, File outputFile, Charset cset,
             StringWriter writer = new StringWriter();
             IOUtil.copy(in, writer);
 
-            writer.write(System.getProperty("line.separator"));
+            writer.write(System.lineSeparator());
 
             // write / append compiled content into / to the new file
             Files.asCharSink(outputFile, cset, FileWriteMode.APPEND).write(writer.toString());
@@ -185,4 +194,4 @@ protected void addToOptimizedSize(File file) {
     protected void addToOptimizedSize(long size) {
         sizeTotalOptimized = sizeTotalOptimized + size;
     }
-}
+}