Prefer Java exceptions (#2362)

Author: sualeh

schemacrawler-commandline/src/main/java/schemacrawler/tools/commandline/command/PasswordOptions.java

@@ -13,9 +13,9 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import picocli.CommandLine.Option;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import us.fatehi.utility.ioresource.FileInputResource;
 
 public final class PasswordOptions {
@@ -95,7 +95,7 @@ private String getPasswordFromFile() {
         return reader.readLine();
       }
     } catch (final IOException e) {
-      throw new IORuntimeException(
+      throw new UncheckedIOException(
           "Password could not be read from file <%s>".formatted(passwordFile), e);
     }
   }

schemacrawler-commandline/src/main/java/schemacrawler/tools/commandline/command/UserOptions.java

@@ -13,9 +13,9 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import picocli.CommandLine.Option;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import us.fatehi.utility.ioresource.FileInputResource;
 
 public final class UserOptions {
@@ -95,7 +95,8 @@ private String getUserFromFile() {
         return reader.readLine();
       }
     } catch (final IOException e) {
-      throw new IORuntimeException("User could not be read from file <%s>".formatted(userFile), e);
+      throw new UncheckedIOException(
+          "User could not be read from file <%s>".formatted(userFile), e);
     }
   }
 

schemacrawler-commandline/src/main/java/schemacrawler/tools/commandline/utility/GenerateCliSupport.java

@@ -9,6 +9,7 @@
 package schemacrawler.tools.commandline.utility;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -18,7 +19,6 @@
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.codegen.docgen.manpage.ManPageGenerator;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.schemacrawler.exceptions.InternalRuntimeException;
 import schemacrawler.tools.commandline.SchemaCrawlerCommandLineCommands;
 import schemacrawler.tools.commandline.command.ConfigFileCommand;
@@ -77,7 +77,7 @@ protected Path createOutputDirectory() {
       try {
         Files.createDirectories(outputDir);
       } catch (final IOException e) {
-        throw new IORuntimeException("Could not create output directory", e);
+        throw new UncheckedIOException("Could not create output directory", e);
       }
       return outputDir.toAbsolutePath();
     }

schemacrawler-diagram/src/main/java/schemacrawler/tools/command/text/diagram/AbstractGraphProcessExecutor.java

@@ -12,8 +12,9 @@
 import static us.fatehi.utility.IOUtility.isFileReadable;
 import static us.fatehi.utility.IOUtility.isFileWritable;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat;
 
 abstract class AbstractGraphProcessExecutor implements GraphExecutor {
@@ -33,11 +34,15 @@ protected AbstractGraphProcessExecutor(
     this.diagramOutputFormat = diagramOutputFormat;
 
     if (!isFileReadable(this.dotFile)) {
-      throw new IORuntimeException("Cannot read DOT file <%s>".formatted(this.dotFile));
+      final IOException cause =
+          new IOException("Cannot read DOT file <%s>".formatted(this.dotFile));
+      throw new UncheckedIOException(cause);
     }
 
     if (!isFileWritable(this.outputFile)) {
-      throw new IORuntimeException("Cannot write output file <%s>".formatted(this.outputFile));
+      final IOException cause =
+          new IOException("Cannot write output file <%s>".formatted(this.outputFile));
+      throw new UncheckedIOException(cause);
     }
   }
 }

schemacrawler-diagram/src/main/java/schemacrawler/tools/command/text/diagram/DiagramRenderer.java

@@ -14,9 +14,9 @@
 import static us.fatehi.utility.IOUtility.readResourceFully;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import schemacrawler.schemacrawler.exceptions.ExecutionRuntimeException;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.schemacrawler.exceptions.SchemaCrawlerException;
 import schemacrawler.tools.command.AbstractSchemaCrawlerCommand;
 import schemacrawler.tools.command.text.diagram.options.DiagramOptions;
@@ -60,7 +60,7 @@ public void execute() {
     try {
       dotFile = createTempFilePath("schemacrawler.", "dot");
     } catch (final IOException e) {
-      throw new IORuntimeException("Could not create temporary DOT file", e);
+      throw new UncheckedIOException("Could not create temporary DOT file", e);
     }
     final OutputOptions dotFileOutputOptions;
     if (diagramOutputFormat == scdot) {

schemacrawler-diagram/src/main/java/schemacrawler/tools/command/text/embeddeddiagram/EmbeddedDiagramRenderer.java

@@ -24,11 +24,11 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.nio.file.Path;
 import java.util.regex.Pattern;
 import schemacrawler.schemacrawler.exceptions.ExecutionRuntimeException;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.schemacrawler.exceptions.SchemaCrawlerException;
 import schemacrawler.tools.command.AbstractSchemaCrawlerCommand;
 import schemacrawler.tools.command.SchemaCrawlerCommand;
@@ -110,7 +110,7 @@ public void execute() {
         copy(newBufferedReader(finalHtmlFile, UTF_8), writer);
       }
     } catch (final IOException e) {
-      throw new IORuntimeException("Could not create embedded diagram", e);
+      throw new UncheckedIOException("Could not create embedded diagram", e);
     } catch (final SchemaCrawlerException e) {
       throw e;
     } catch (final Exception e) {

schemacrawler-diagram/src/test/java/schemacrawler/integration/test/DiagramOutputTest.java

@@ -10,7 +10,7 @@
 
 import static java.nio.file.Files.createDirectories;
 import static org.apache.commons.io.FileUtils.deleteDirectory;
-import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -22,6 +22,7 @@
 import static us.fatehi.test.utility.extensions.FileHasContent.classpathResource;
 import static us.fatehi.test.utility.extensions.FileHasContent.outputOf;
 
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import java.util.List;
 import org.junit.jupiter.api.BeforeAll;
@@ -37,7 +38,6 @@
 import schemacrawler.schemacrawler.SchemaRetrievalOptions;
 import schemacrawler.schemacrawler.SchemaRetrievalOptionsBuilder;
 import schemacrawler.schemacrawler.exceptions.ExecutionRuntimeException;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.test.utility.DatabaseTestUtility;
 import schemacrawler.test.utility.WithTestDatabase;
 import schemacrawler.tools.command.text.diagram.options.DiagramOptions;
@@ -181,8 +181,8 @@ public void executableForDiagram_badOutputFile(
     final ExecutionRuntimeException runtimeException =
         assertThrows(ExecutionRuntimeException.class, () -> executable.execute());
     final Throwable exception = runtimeException.getCause();
-    assertThat(exception, instanceOf(IORuntimeException.class));
-    assertThat(exception.getMessage(), startsWith("Cannot write output file"));
+    assertThat(exception, instanceOf(UncheckedIOException.class));
+    assertThat(exception.getMessage(), containsString("Cannot write output file"));
   }
 
   @Test

schemacrawler-diagram/src/test/java/schemacrawler/tools/command/text/diagram/GraphProcessExecutorTest.java

@@ -19,11 +19,11 @@
 import static us.fatehi.test.utility.extensions.FileHasContent.outputOf;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat;
 import us.fatehi.test.utility.extensions.CaptureSystemStreams;
 import us.fatehi.test.utility.extensions.CapturedSystemStreams;
@@ -63,18 +63,18 @@ public void constructorGraphProcessExecutor() throws IOException {
         is(not(nullValue())));
 
     // DOT file not readable
-    final IORuntimeException exception1 =
+    final UncheckedIOException exception1 =
         assertThrows(
-            IORuntimeException.class,
+            UncheckedIOException.class,
             () ->
                 new TestGraphProcessExecutor(
                     IOUtility.createTempFilePath("sc", "data"), outputFile, diagramOutputFormat));
     assertThat(exception1.getMessage(), containsString("Cannot read DOT file"));
 
     // Output file not writable
-    final IORuntimeException exception2 =
+    final UncheckedIOException exception2 =
         assertThrows(
-            IORuntimeException.class,
+            UncheckedIOException.class,
             () ->
                 new TestGraphProcessExecutor(
                     dotFile, Path.of("/not_a_directory/unwritable_file.dat"), diagramOutputFormat));

schemacrawler-scripting/src/main/java/schemacrawler/tools/command/script/GraalScriptExecutor.java

@@ -14,6 +14,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +24,6 @@
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.tools.command.script.options.ScriptLanguageType;
 
 /** Main executor for the Graal Polyglot integration. */
@@ -121,7 +121,7 @@ public void run() {
       // Evaluate the script
       graalPolyglotContext.eval(sourceCode);
     } catch (final IOException e) {
-      throw new IORuntimeException(e.getMessage(), e);
+      throw new UncheckedIOException(e.getMessage(), e);
     }
   }
 }

schemacrawler-scripting/src/main/java/schemacrawler/tools/command/serialize/SerializationCommand.java

@@ -15,10 +15,10 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.nio.file.Path;
 import java.util.zip.GZIPOutputStream;
-import schemacrawler.schemacrawler.exceptions.IORuntimeException;
 import schemacrawler.tools.command.AbstractSchemaCrawlerCommand;
 import schemacrawler.tools.command.serialize.options.SerializationFormat;
 import schemacrawler.tools.command.serialize.options.SerializationOptions;
@@ -57,7 +57,7 @@ public void execute() {
           new GZIPOutputStream(newOutputStream(outputFile, WRITE, CREATE, TRUNCATE_EXISTING))) {
         catalogSerializer.save(out);
       } catch (final IOException e) {
-        throw new IORuntimeException("Could not save catalog", e);
+        throw new UncheckedIOException("Could not save catalog", e);
       }
     } else {
       final Writer out = outputOptions.openNewOutputWriter();