From 1922fa8ebed69c2c0e93c333463417707410029f Mon Sep 17 00:00:00 2001 From: Claus Stadler Date: Tue, 26 Mar 2024 13:26:05 +0100 Subject: [PATCH] Renamed OverwriteAction to OverwriteMode --- .../java/org/aksw/commons/io/util/FileUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aksw-commons-io-parent/aksw-commons-io-utils/src/main/java/org/aksw/commons/io/util/FileUtils.java b/aksw-commons-io-parent/aksw-commons-io-utils/src/main/java/org/aksw/commons/io/util/FileUtils.java index 9c597481..b50aca95 100644 --- a/aksw-commons-io-parent/aksw-commons-io-utils/src/main/java/org/aksw/commons/io/util/FileUtils.java +++ b/aksw-commons-io-parent/aksw-commons-io-utils/src/main/java/org/aksw/commons/io/util/FileUtils.java @@ -120,7 +120,7 @@ public interface IOWriter { } /** Actions if the target already exists */ - public static enum OverwriteAction { + public static enum OverwriteMode { /** Raise an error */ ERROR, @@ -131,29 +131,29 @@ public static enum OverwriteAction { SKIP } - public static void safeCreate(Path target, OverwriteAction overwriteAction, IOWriter writer) throws IOException { + public static void safeCreate(Path target, OverwriteMode overwriteAction, IOWriter writer) throws IOException { Objects.requireNonNull(overwriteAction); String fileName = target.getFileName().toString(); String tmpFileName = "." + fileName + ".tmp"; // + new Random().nextInt(); Path tmpFile = target.resolveSibling(tmpFileName); - Boolean fileExists = OverwriteAction.SKIP.equals(overwriteAction) || OverwriteAction.ERROR.equals(overwriteAction) + Boolean fileExists = OverwriteMode.SKIP.equals(overwriteAction) || OverwriteMode.ERROR.equals(overwriteAction) ? Files.exists(target) : null; // Check whether the target already exists before we start writing the tmpFile - if (Boolean.TRUE.equals(fileExists) && OverwriteAction.ERROR.equals(overwriteAction)) { + if (Boolean.TRUE.equals(fileExists) && OverwriteMode.ERROR.equals(overwriteAction)) { throw new FileAlreadyExistsException(target.toAbsolutePath().toString()); } - if (!(Boolean.TRUE.equals(fileExists) && OverwriteAction.SKIP.equals(overwriteAction))) { + if (!(Boolean.TRUE.equals(fileExists) && OverwriteMode.SKIP.equals(overwriteAction))) { Path parent = target.getParent(); if (parent != null) { Files.createDirectories(parent); } - boolean allowOverwrite = OverwriteAction.OVERWRITE.equals(overwriteAction); + boolean allowOverwrite = OverwriteMode.OVERWRITE.equals(overwriteAction); // What to do if the tmp file already exists? try (OutputStream out = Files.newOutputStream(tmpFile, allowOverwrite ? StandardOpenOption.CREATE : StandardOpenOption.CREATE_NEW)) { writer.write(out);