Revert Use PathHandler for writing log files (#3420)

Revert "Use PathHandler for writing log files, which allows using S3 and other extensions (DAT-11515) (#3387)"

This reverts commit 4d1bb4d.

liquibase-cli/src/main/java/liquibase/integration/commandline/CommandRunner.java

@@ -6,7 +6,6 @@
 import liquibase.command.CommonArgumentNames;
 import liquibase.exception.CommandValidationException;
 import liquibase.exception.MissingRequiredArgumentException;
-import liquibase.resource.OpenOptions;
 import liquibase.resource.PathHandlerFactory;
 import liquibase.util.StringUtil;
 import picocli.CommandLine;
@@ -48,7 +47,7 @@ public CommandResults call() throws Exception {
         try {
             if (outputFile != null) {
                 final PathHandlerFactory pathHandlerFactory = Scope.getCurrentScope().getSingleton(PathHandlerFactory.class);
-                outputStream = pathHandlerFactory.openResourceOutputStream(outputFile, new OpenOptions());
+                outputStream = pathHandlerFactory.openResourceOutputStream(outputFile, true);
                 commandScope.setOutput(outputStream);
             }
 

liquibase-cli/src/main/java/liquibase/integration/commandline/LiquibaseCommandLine.java

@@ -60,7 +60,7 @@ public class LiquibaseCommandLine {
     private Level configuredLogLevel;
 
     private final CommandLine commandLine;
-    private Handler fileHandler;
+    private FileHandler fileHandler;
 
     private final ResourceBundle coreBundle = getBundle("liquibase/i18n/liquibase-core");
 
@@ -89,6 +89,7 @@ public static void main(String[] args) {
     private void cleanup() {
         if (fileHandler != null) {
             fileHandler.flush();
+            fileHandler.close();
         }
     }
 
@@ -352,9 +353,9 @@ public int execute(String[] args) {
                     int response = commandLine.execute(finalArgs);
 
                     if (!wasHelpOrVersionRequested()) {
-                        final ConfiguredValue<String> logFile = LiquibaseCommandLineConfiguration.LOG_FILE.getCurrentConfiguredValue();
+                        final ConfiguredValue<File> logFile = LiquibaseCommandLineConfiguration.LOG_FILE.getCurrentConfiguredValue();
                         if (logFile.found()) {
-                            Scope.getCurrentScope().getUI().sendMessage("Logs saved to " + logFile.getValue());
+                            Scope.getCurrentScope().getUI().sendMessage("Logs saved to " + logFile.getValue().getAbsolutePath());
                         }
 
                         final ConfiguredValue<String> outputFile = LiquibaseCommandLineConfiguration.OUTPUT_FILE.getCurrentConfiguredValue();
@@ -610,7 +611,7 @@ private void configureVersionInfo() {
     protected Map<String, Object> configureLogging() throws IOException {
         Map<String, Object> returnMap = new HashMap<>();
         final ConfiguredValue<Level> currentConfiguredValue = LiquibaseCommandLineConfiguration.LOG_LEVEL.getCurrentConfiguredValue();
-        final String logFile = LiquibaseCommandLineConfiguration.LOG_FILE.getCurrentValue();
+        final File logFile = LiquibaseCommandLineConfiguration.LOG_FILE.getCurrentValue();
 
         Level logLevel = Level.OFF;
         if (!currentConfiguredValue.wasDefaultValueUsed()) {
@@ -629,7 +630,7 @@ protected Map<String, Object> configureLogging() throws IOException {
         return returnMap;
     }
 
-    private void configureLogging(Level logLevel, String logFile) throws IOException {
+    private void configureLogging(Level logLevel, File logFile) throws IOException {
         configuredLogLevel = logLevel;
 
         final JavaLogService logService = (JavaLogService) Scope.getCurrentScope().get(Scope.Attr.logService, LogService.class);
@@ -643,9 +644,8 @@ private void configureLogging(Level logLevel, String logFile) throws IOException
 
         if (logFile != null) {
             if (fileHandler == null) {
-                final PathHandlerFactory pathHandlerFactory = Scope.getCurrentScope().getSingleton(PathHandlerFactory.class);
-                OutputStream outputStream = pathHandlerFactory.openResourceOutputStream(logFile, new OpenOptions().setAppend(true));
-                fileHandler = new StreamHandler(outputStream, new SimpleFormatter());
+                fileHandler = new FileHandler(logFile.getAbsolutePath(), true);
+                fileHandler.setFormatter(new SimpleFormatter());
                 rootLogger.addHandler(fileHandler);
             }
 

liquibase-core/src/main/java/liquibase/changelog/ChangelogRewriter.java

@@ -1,16 +1,15 @@
 package liquibase.changelog;
 
-import liquibase.GlobalConfiguration;
 import liquibase.Scope;
+import liquibase.GlobalConfiguration;
 import liquibase.parser.core.xml.XMLChangeLogSAXParser;
-import liquibase.resource.OpenOptions;
+import liquibase.resource.PathHandlerFactory;
 import liquibase.resource.Resource;
 import liquibase.resource.ResourceAccessor;
 import liquibase.util.StreamUtil;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.util.SortedSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -74,7 +73,7 @@ public static ChangeLogRewriterResult removeChangeLogId(String changeLogFile, St
                 }
             }
 
-            try (OutputStream outputStream = resource.openOutputStream(new OpenOptions())) {
+            try (OutputStream outputStream = resource.openOutputStream(true)) {
                 outputStream.write(changeLogString.getBytes(encoding));
             }
 
@@ -171,7 +170,7 @@ public static ChangeLogRewriterResult addChangeLogId(String changeLogFile, Strin
             //
             // Write out the file again
             //
-            try (OutputStream outputStream = resource.openOutputStream(new OpenOptions())) {
+            try (OutputStream outputStream = resource.openOutputStream(true)) {
                 outputStream.write(changeLogString.getBytes(encoding));
             }
 

liquibase-core/src/main/java/liquibase/changelog/visitor/DBDocVisitor.java

@@ -7,7 +7,6 @@
 import liquibase.database.Database;
 import liquibase.dbdoc.*;
 import liquibase.exception.LiquibaseException;
-import liquibase.resource.OpenOptions;
 import liquibase.resource.Resource;
 import liquibase.resource.ResourceAccessor;
 import liquibase.snapshot.DatabaseSnapshot;
@@ -177,7 +176,7 @@ private void copyFile(String fileToCopy, Resource rootOutputDir) throws IOExcept
             if (inputStream == null) {
                 throw new IOException("Can not find " + fileToCopy);
             }
-            outputStream = rootOutputDir.resolve(fileToCopy.replaceFirst(".*\\/", "")).openOutputStream(new OpenOptions());
+            outputStream = rootOutputDir.resolve(fileToCopy.replaceFirst(".*\\/", "")).openOutputStream(true);
             StreamUtil.copy(inputStream, outputStream);
         } finally {
             if (outputStream != null) {

liquibase-core/src/main/java/liquibase/dbdoc/ChangeLogWriter.java

@@ -1,7 +1,6 @@
 package liquibase.dbdoc;
 
 import liquibase.GlobalConfiguration;
-import liquibase.resource.OpenOptions;
 import liquibase.resource.Resource;
 import liquibase.resource.ResourceAccessor;
 import liquibase.util.StreamUtil;
@@ -21,7 +20,7 @@ public void writeChangeLog(String changeLog, String physicalFilePath) throws IOE
         String changeLogOutFile = changeLog.replace(":", "_");
         Resource xmlFile = outputDir.resolve(changeLogOutFile.toLowerCase() + ".html");
 
-        try (BufferedWriter changeLogStream = new BufferedWriter(new OutputStreamWriter(xmlFile.openOutputStream(new OpenOptions()),
+        try (BufferedWriter changeLogStream = new BufferedWriter(new OutputStreamWriter(xmlFile.openOutputStream(true),
                 GlobalConfiguration.OUTPUT_FILE_ENCODING.getCurrentValue()))) {
             Resource stylesheet = resourceAccessor.get(physicalFilePath);
             if (stylesheet == null) {

liquibase-core/src/main/java/liquibase/dbdoc/HTMLListWriter.java

@@ -1,7 +1,6 @@
 package liquibase.dbdoc;
 
 import liquibase.GlobalConfiguration;
-import liquibase.resource.OpenOptions;
 import liquibase.resource.Resource;
 import liquibase.util.StringUtil;
 
@@ -22,7 +21,7 @@ public HTMLListWriter(String title, String filename, String subdir, Resource out
     }
 
     public void writeHTML(SortedSet objects) throws IOException {
-        Writer fileWriter = new OutputStreamWriter(outputDir.resolve(filename).openOutputStream(new OpenOptions()), GlobalConfiguration.OUTPUT_FILE_ENCODING.getCurrentValue());
+        Writer fileWriter = new OutputStreamWriter(outputDir.resolve(filename).openOutputStream(true), GlobalConfiguration.OUTPUT_FILE_ENCODING.getCurrentValue());
 
         try {
             fileWriter.append("<HTML>\n" + "<HEAD><meta charset=\"utf-8\"/>\n" + "<TITLE>\n");

liquibase-core/src/main/java/liquibase/dbdoc/HTMLWriter.java

@@ -2,17 +2,15 @@
 
 import liquibase.change.Change;
 import liquibase.changelog.ChangeSet;
+import liquibase.GlobalConfiguration;
 import liquibase.database.Database;
 import liquibase.exception.DatabaseException;
 import liquibase.exception.DatabaseHistoryException;
-import liquibase.resource.OpenOptions;
 import liquibase.resource.Resource;
 import liquibase.util.LiquibaseUtil;
 import liquibase.util.StringUtil;
 
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.*;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.List;
@@ -29,7 +27,7 @@ public HTMLWriter(Resource outputDir, Database database) {
     protected abstract void writeCustomHTML(Writer fileWriter, Object object, List<Change> changes, Database database) throws IOException;
 
     private Writer createFileWriter(Object object) throws IOException {
-        return new OutputStreamWriter(outputDir.resolve(DBDocUtil.toFileName(object.toString().toLowerCase()) + ".html").openOutputStream(new OpenOptions()));
+        return new OutputStreamWriter(outputDir.resolve(DBDocUtil.toFileName(object.toString().toLowerCase()) + ".html").openOutputStream(true));
     }
 
     public void writeHTML(Object object, List<Change> ranChanges, List<Change> changesToRun, String changeLog) throws IOException, DatabaseHistoryException, DatabaseException {

liquibase-core/src/main/java/liquibase/diff/output/changelog/DiffToChangeLog.java

@@ -16,7 +16,6 @@
 import liquibase.exception.UnexpectedLiquibaseException;
 import liquibase.executor.Executor;
 import liquibase.executor.ExecutorService;
-import liquibase.resource.OpenOptions;
 import liquibase.resource.PathHandlerFactory;
 import liquibase.resource.Resource;
 import liquibase.serializer.ChangeLogSerializer;
@@ -158,7 +157,7 @@ public void run() {
                                 String toInsert = "    " + innerXml + lineSeparator;
                                 fileContents.insert(endTagIndex, toInsert);
                             }
-                            try (OutputStream outputStream = file.openOutputStream(new OpenOptions())) {
+                            try (OutputStream outputStream = file.openOutputStream(true)) {
                                 outputStream.write(fileContents.toString().getBytes());
                             }
                         }
@@ -212,7 +211,7 @@ public void printNew(ChangeLogSerializer changeLogSerializer, Resource file) thr
             Scope.getCurrentScope().getLog(getClass()).info(file + " does not exist, creating and adding " + changeSets.size() + " changesets.");
         }
 
-        try (OutputStream stream = file.openOutputStream(new OpenOptions());
+        try (OutputStream stream = file.openOutputStream(true);
              PrintStream out = new PrintStream(stream, true, GlobalConfiguration.OUTPUT_FILE_ENCODING.getCurrentValue())) {
             changeLogSerializer.write(changeSets, out);
         }

liquibase-core/src/main/java/liquibase/diff/output/changelog/core/MissingDataExternalFileChangeGenerator.java

@@ -10,7 +10,6 @@
 import liquibase.diff.output.DiffOutputControl;
 import liquibase.diff.output.changelog.ChangeGeneratorChain;
 import liquibase.exception.UnexpectedLiquibaseException;
-import liquibase.resource.OpenOptions;
 import liquibase.resource.PathHandlerFactory;
 import liquibase.resource.Resource;
 import liquibase.servicelocator.LiquibaseService;
@@ -85,7 +84,7 @@ public Change[] fixMissing(DatabaseObject missingObject, DiffOutputControl outpu
 
                 String[] dataTypes = new String[0];
                 try (
-                        OutputStream fileOutputStream = externalFileResource.openOutputStream(new OpenOptions());
+                        OutputStream fileOutputStream = externalFileResource.openOutputStream(true);
                         OutputStreamWriter outputStreamWriter = new OutputStreamWriter(
                                 fileOutputStream, GlobalConfiguration.OUTPUT_FILE_ENCODING.getCurrentValue());
                         CSVWriter outputFile = new CSVWriter(new BufferedWriter(outputStreamWriter));

liquibase-core/src/main/java/liquibase/integration/commandline/LiquibaseCommandLineConfiguration.java

@@ -22,7 +22,7 @@ public class LiquibaseCommandLineConfiguration implements AutoloadedConfiguratio
     public static final ConfigurationDefinition<String> DEFAULTS_FILE;
     public static final ConfigurationDefinition<Level> LOG_LEVEL;
     public static final ConfigurationDefinition<String> LOG_CHANNELS;
-    public static final ConfigurationDefinition<String> LOG_FILE;
+    public static final ConfigurationDefinition<File> LOG_FILE;
     public static final ConfigurationDefinition<String> OUTPUT_FILE;
     public static final ConfigurationDefinition<Boolean> SHOULD_RUN;
     public static final ConfigurationDefinition<ArgumentConverter> ARGUMENT_CONVERTER;
@@ -66,7 +66,7 @@ public class LiquibaseCommandLineConfiguration implements AutoloadedConfiguratio
                 .setDefaultValue("liquibase", "Controls which log channels have their level set by the liquibase.logLevel setting. Comma separate multiple values. To set the level of all channels, use 'all'. Example: liquibase,org.mariadb.jdbc")
                 .build();
 
-        LOG_FILE = builder.define("logFile", String.class).build();
+        LOG_FILE = builder.define("logFile", File.class).build();
         OUTPUT_FILE = builder.define("outputFile", String.class).build();
 
         MONITOR_PERFORMANCE = builder.define("monitorPerformance", String.class)

liquibase-core/src/main/java/liquibase/integration/spring/SpringResource.java

@@ -1,7 +1,6 @@
 package liquibase.integration.spring;
 
 import liquibase.exception.UnexpectedLiquibaseException;
-import liquibase.resource.OpenOptions;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.WritableResource;
 
@@ -60,13 +59,10 @@ public InputStream openInputStream() throws IOException {
     }
 
     @Override
-    public OutputStream openOutputStream(OpenOptions openOptions) throws IOException {
-        if (!resource.exists() && !openOptions.isCreateIfNeeded()) {
+    public OutputStream openOutputStream(boolean createIfNeeded) throws IOException {
+        if (!resource.exists() && !createIfNeeded) {
             throw new IOException("Resource "+getUri()+" does not exist");
         }
-        if (openOptions != null && openOptions.isAppend() && exists()) {
-            throw new IOException("Spring only supports truncating the existing resources.");
-        }
         if (resource instanceof WritableResource) {
             return ((WritableResource) resource).getOutputStream();
         }

liquibase-core/src/main/java/liquibase/resource/AbstractResource.java

@@ -1,5 +1,7 @@
 package liquibase.resource;
 
+import liquibase.util.StringUtil;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
@@ -38,7 +40,7 @@ public boolean isWritable() {
     }
 
     @Override
-    public OutputStream openOutputStream(OpenOptions openOptions) throws IOException {
+    public OutputStream openOutputStream(boolean createIfNeeded) throws IOException {
         if (!isWritable()) {
             throw new IOException("Read only");
         }

liquibase-core/src/main/java/liquibase/resource/PathHandlerFactory.java

@@ -1,5 +1,6 @@
 package liquibase.resource;
 
+import liquibase.Scope;
 import liquibase.exception.UnexpectedLiquibaseException;
 import liquibase.plugin.AbstractPluginFactory;
 
@@ -74,30 +75,17 @@ public Resource getResource(String resourcePath) throws IOException {
      *
      * @return null if resourcePath does not exist and createIfNotExists is false
      * @throws IOException if there is an error opening the stream
-     *
-     * @deprecated use {@link #openResourceOutputStream(String, OpenOptions)}
      */
-    @Deprecated
     public OutputStream openResourceOutputStream(String resourcePath, boolean createIfNotExists) throws IOException {
-        return openResourceOutputStream(resourcePath, new OpenOptions().setCreateIfNeeded(createIfNotExists));
-    }
-
-    /**
-     * Returns the outputStream from {@link #getResource(String)}, using settings from the passed {@link OpenOptions}.
-     *
-     * @return null if resourcePath does not exist and {@link OpenOptions#isCreateIfNeeded()} is false
-     * @throws IOException if there is an error opening the stream
-     */
-    public OutputStream openResourceOutputStream(String resourcePath, OpenOptions openOptions) throws IOException {
         Resource resource = getResource(resourcePath);
         if (!resource.exists()) {
-            if (openOptions.isCreateIfNeeded()) {
+            if (createIfNotExists) {
                 return createResource(resourcePath);
             } else {
                 return null;
             }
         }
-        return resource.openOutputStream(openOptions);
+        return resource.openOutputStream(createIfNotExists);
     }
 
     /**