Clean up code

schemacrawler-api/src/main/java/schemacrawler/schemacrawler/SchemaRetrievalOptionsBuilder.java

@@ -174,8 +174,7 @@ public SchemaRetrievalOptionsBuilder with(
 
  if (metadataRetrievalStrategy == null) {
  // Reset to default
- metadataRetrievalStrategyMap.put(
- schemaInfoMetadataRetrievalStrategy, MetadataRetrievalStrategy.metadata);
+ metadataRetrievalStrategyMap.put(schemaInfoMetadataRetrievalStrategy, metadata);
  } else {
  metadataRetrievalStrategyMap.put(
  schemaInfoMetadataRetrievalStrategy, metadataRetrievalStrategy);

schemacrawler-api/src/main/java/schemacrawler/utility/TypeMap.java

@@ -79,7 +79,7 @@ private static Map<SQLType, Class<?>> createDefaultTypeMap() {
  defaultTypeMap.put(JDBCType.OTHER, Object.class);
  defaultTypeMap.put(JDBCType.REAL, Float.class);
  defaultTypeMap.put(JDBCType.REF, java.sql.Ref.class);
- defaultTypeMap.put(JDBCType.REF_CURSOR, java.lang.Object.class);
+ defaultTypeMap.put(JDBCType.REF_CURSOR, Object.class);
  defaultTypeMap.put(JDBCType.ROWID, java.sql.RowId.class);
  defaultTypeMap.put(JDBCType.SMALLINT, Integer.class);
  defaultTypeMap.put(JDBCType.SQLXML, java.sql.SQLXML.class);

schemacrawler-commandline/src/main/java/schemacrawler/tools/commandline/SchemaCrawlerCommandLine.java

@@ -39,6 +39,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import picocli.CommandLine;
+import picocli.CommandLine.PicocliException;
 import schemacrawler.tools.commandline.state.ShellState;
 import schemacrawler.tools.commandline.state.StateFactory;
 import schemacrawler.tools.commandline.utility.CommandLineLogger;
@@ -103,7 +104,7 @@ private static void executeCommandLine(final CommandLine commandLine) {
 
  private static String extractErrorMessage(final Throwable throwable) {
  final String errorMessage;
- if (throwable instanceof picocli.CommandLine.PicocliException) {
+ if (throwable instanceof PicocliException) {
  final Throwable cause = throwable.getCause();
  if (cause != null && !isBlank(cause.getMessage())) {
  errorMessage = cause.getMessage();

schemacrawler-commandline/src/main/java/schemacrawler/tools/commandline/SchemaCrawlerShell.java

@@ -54,6 +54,7 @@
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
 import picocli.CommandLine;
+import picocli.CommandLine.PicocliException;
 import picocli.shell.jline3.PicocliCommands;
 import picocli.shell.jline3.PicocliCommands.PicocliCommandsFactory;
 import schemacrawler.tools.commandline.state.ShellState;
@@ -159,7 +160,7 @@ private static void handleFatalError(
  commandLineLogger.logState(state);
 
  final String errorMessage;
- if (throwable instanceof picocli.CommandLine.PicocliException) {
+ if (throwable instanceof PicocliException) {
  final Throwable cause = throwable.getCause();
  if (cause != null && !isBlank(cause.getMessage())) {
  errorMessage = cause.getMessage();

schemacrawler-lint/src/main/java/schemacrawler/tools/lint/BaseLinter.java

@@ -29,7 +29,6 @@
 package schemacrawler.tools.lint;
 
 import static java.util.Objects.requireNonNull;
-
 import java.io.Serializable;
 import java.sql.Connection;
 import java.util.ArrayList;
@@ -38,7 +37,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import schemacrawler.filter.TableTypesFilter;
 import schemacrawler.inclusionrule.IncludeAll;
 import schemacrawler.inclusionrule.InclusionRule;
@@ -87,7 +85,9 @@ protected final <V extends Serializable> void addTableLint(
  addLint(LintObjectType.table, table, message, value);
  }
 
- protected void end(final Connection connection) {}
+ protected void end(final Connection connection) {
+ // Default implementation - NO-OP
+ }
 
  protected final List<Column> getColumns(final Table table) {
  if (table == null) {
@@ -130,7 +130,9 @@ protected final void setTableTypesFilter(final TableTypesFilter tableTypesFilter
  }
  }
 
- protected void start(final Connection connection) {}
+ protected void start(final Connection connection) {
+ // Default implementation - NO-OP
+ }
 
  @Override
  final void configure(final LinterConfig linterConfig) {

schemacrawler-lint/src/main/java/schemacrawler/tools/linter/LinterTableWithIncrementingColumns.java

@@ -31,7 +31,6 @@
 import static java.util.Comparator.naturalOrder;
 import static java.util.Objects.requireNonNull;
 import static us.fatehi.utility.Utility.convertForComparison;
-
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,17 +40,15 @@
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import schemacrawler.schema.Column;
 import schemacrawler.schema.ColumnDataType;
 import schemacrawler.schema.Table;
 import schemacrawler.tools.lint.BaseLinter;
 import us.fatehi.utility.Multimap;
-import us.fatehi.utility.Utility;
 
 public class LinterTableWithIncrementingColumns extends BaseLinter {
 
- private class IncrementingColumn {
+ private static class IncrementingColumn {
  private final int columnIncrement;
  private final Column column;
 
@@ -162,7 +159,7 @@ private Multimap<String, IncrementingColumn> findIncrementingColumns(final List<
  final Multimap<String, IncrementingColumn> incrementingColumns = new Multimap<>();
 
  for (final Column column : columns) {
- final String columnName = Utility.convertForComparison(column.getName());
+ final String columnName = convertForComparison(column.getName());
  if (incrementingColumnsMap.containsKey(columnName)) {
  incrementingColumns.add(columnName, new IncrementingColumn("0", column));
  }

schemacrawler-loader/src/main/java/schemacrawler/loader/attributes/model/CatalogAttributes.java

@@ -30,9 +30,7 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
-
 import java.beans.ConstructorProperties;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -61,7 +59,7 @@ public CatalogAttributes(
  final List<AlternateKeyAttributes> alternateKeys) {
  super(name, remarks, attributes);
  if (tables == null) {
- this.tables = Collections.emptyList();
+ this.tables = emptyList();
  } else {
  this.tables = unmodifiableList(tables);
  }

schemacrawler-text/src/main/java/schemacrawler/tools/text/formatter/base/BaseTabularFormatter.java

@@ -196,13 +196,19 @@ public void handle(final JdbcDriverInfo driverInfo) {
  }
 
  @Override
- public final void handleHeaderEnd() {}
+ public final void handleHeaderEnd() {
+ // Default implementation - NO-OP
+ }
 
  @Override
- public final void handleHeaderStart() {}
+ public final void handleHeaderStart() {
+ // Default implementation - NO-OP
+ }
 
  @Override
- public final void handleInfoEnd() {}
+ public final void handleInfoEnd() {
+ // Default implementation - NO-OP
+ }
 
  @Override
  public final void handleInfoStart() {

schemacrawler-tools/src/main/java/schemacrawler/tools/executable/commandline/PluginCommand.java

@@ -34,7 +34,6 @@
 import static schemacrawler.tools.executable.commandline.PluginCommandType.server;
 import static schemacrawler.tools.executable.commandline.PluginCommandType.unknown;
 import static us.fatehi.utility.Utility.isBlank;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -154,7 +153,7 @@ public boolean hasHelpDescription() {
  }
 
  public boolean hasHelpFooter() {
- return helpFooter != null || type != PluginCommandType.unknown;
+ return helpFooter != null || type != unknown;
  }
 
  public boolean isEmpty() {