From 1e3df1dcc8456c6f1df160eb346afd2385eaa00b Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Sun, 25 Nov 2018 21:55:07 +0100 Subject: remove references to IOExceptionUtil --- .../yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java | 2 +- .../hosted/node/admin/maintenance/coredump/CoredumpHandler.java | 2 +- .../com/yahoo/vespa/hosted/node/admin/task/util/file/Editor.java | 2 +- .../yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectory.java | 2 +- .../com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java | 4 +++- .../com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java | 5 +++-- .../vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java | 2 +- .../hosted/node/admin/task/util/process/ProcessFactoryImpl.java | 2 +- .../hosted/node/admin/task/util/process/ProcessStarterImpl.java | 2 +- .../yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java | 2 +- .../vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java | 2 +- .../hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java | 2 +- 12 files changed, 16 insertions(+), 13 deletions(-) (limited to 'node-admin/src') diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index 6e3419813a7..2fd40a1b486 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.nameMatches; import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.olderThan; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; import static com.yahoo.vespa.hosted.node.admin.util.SecretAgentCheckConfig.nodeTypeToRole; /** diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java index a9d61d20f5b..13a1311b86f 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.nameEndsWith; import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.nameMatches; import static com.yahoo.vespa.hosted.node.admin.task.util.file.FileFinder.nameStartsWith; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; /** * Finds coredumps, collects metadata and reports them diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Editor.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Editor.java index 7dcae199858..bbc3427433b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Editor.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Editor.java @@ -13,7 +13,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; import java.util.logging.Logger; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; /** * An editor meant to edit small line-based files like /etc/fstab. diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectory.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectory.java index 2a88387f8fc..5f72ed7e9b8 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectory.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/MakeDirectory.java @@ -49,7 +49,7 @@ public class MakeDirectory { } } else { if (createParents) { - // We'll skip logginer system modification here, as we'll log about the creation + // We'll skip logging system modification here, as we'll log about the creation // of the directory next. path.createParents(); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java index 14fea240baa..cef35803e98 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java @@ -9,6 +9,8 @@ import java.io.StringWriter; import java.nio.file.Files; import java.nio.file.Path; +import static com.yahoo.yolean.Exceptions.uncheck; + /** * Uses the Velocity engine to render a template, to and from both String and Path objects. * @@ -30,7 +32,7 @@ public class Template { } public static Template at(Path templatePath) { - return of(IOExceptionUtil.uncheck(() -> new String(Files.readAllBytes(templatePath)))); + return of(uncheck(() -> new String(Files.readAllBytes(templatePath)))); } public static Template of(String template) { diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java index 4bd3aad3f52..073d50aeb5d 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPath.java @@ -26,7 +26,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.ifExists; +import static com.yahoo.yolean.Exceptions.uncheck; /** * Thin wrapper around java.nio.file.Path, especially nice for UNIX-specific features. @@ -127,7 +128,7 @@ public class UnixPath { } public Optional getAttributesIfExists() { - return IOExceptionUtil.ifExists(this::getAttributes); + return ifExists(this::getAttributes); } public UnixPath createNewFile() { diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java index 67020270a99..6c8b15b10a6 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ChildProcess2Impl.java @@ -12,7 +12,7 @@ import java.time.Instant; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; /** * @author hakonhall diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java index 1c7a60a13fc..78c25897e1d 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImpl.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Set; import java.util.logging.Logger; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; /** * @author hakonhall diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessStarterImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessStarterImpl.java index 43105f43dc0..3d2caaa2ce9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessStarterImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessStarterImpl.java @@ -6,7 +6,7 @@ import com.yahoo.log.LogLevel; import java.util.logging.Logger; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; /** * @author hakonhall diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java index e22606104f1..db8520c63a8 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java @@ -34,7 +34,7 @@ import java.util.Optional; import java.util.function.Function; import java.util.logging.Logger; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java index c8d5292889b..9ea5c87511b 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java @@ -34,7 +34,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java index 8d599660ace..7779a74ae03 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; -import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.uncheck; +import static com.yahoo.yolean.Exceptions.uncheck; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.any; -- cgit v1.2.3