Merge pull request #239 from mbarre/schemacrawler_16.9.5

fix imports due to change in schemacrawler
mbarre · Sep 22, 2020 · 0d29a33 · 0d29a33
2 parents 8508be5 + e31ee96
commit 0d29a33
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 65 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@ License along with this program.  If not, see
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.mbarre</groupId>
 	<artifactId>schemacrawler-additional-lints</artifactId>
-	<version>1.06.01</version>
+	<version>1.06.02</version>
 	<name>Additional SchemaCrawler Lints</name>
 	<description>Some additional lints for Schemacrawler</description>
 	<inceptionYear>2015</inceptionYear>
@@ -135,7 +135,7 @@ License along with this program.  If not, see
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<schemacrawler.version>16.9.4</schemacrawler.version>
+		<schemacrawler.version>16.9.5</schemacrawler.version>
 		<java.version>1.8</java.version>
 		<java.version.short>8</java.version.short>
 		<hsqldb.version>2.3.2</hsqldb.version>

diff --git a/...ain/java/io/github/mbarre/schemacrawler/tool/linter/LinterColumnContentNotNormalized.java b/...ain/java/io/github/mbarre/schemacrawler/tool/linter/LinterColumnContentNotNormalized.java
@@ -25,10 +25,10 @@
 import io.github.mbarre.schemacrawler.utils.LintUtils;
 import schemacrawler.schema.Column;
 import schemacrawler.schema.Table;
-import schemacrawler.schemacrawler.Config;
 import schemacrawler.schemacrawler.SchemaCrawlerException;
 import schemacrawler.tools.lint.BaseLinter;
 import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

diff --git a/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterColumnSize.java b/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterColumnSize.java
@@ -25,10 +25,10 @@
 import io.github.mbarre.schemacrawler.utils.LintUtils;
 import schemacrawler.schema.Column;
 import schemacrawler.schema.Table;
-import schemacrawler.schemacrawler.Config;
 import schemacrawler.schemacrawler.SchemaCrawlerException;
 import schemacrawler.tools.lint.BaseLinter;
 import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

diff --git a/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterCompressBlob.java b/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterCompressBlob.java
@@ -22,32 +22,23 @@
  * #L%
  */
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.io.IOUtils;
 import schemacrawler.schema.Column;
 import schemacrawler.schema.Table;
-import schemacrawler.schemacrawler.Config;
 import schemacrawler.schemacrawler.SchemaCrawlerException;
 import schemacrawler.tools.lint.BaseLinter;
 import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
+
+import java.io.*;
+import java.sql.*;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Created by barmi83 on 3/24/17.

diff --git a/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterForeignKeyName.java b/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterForeignKeyName.java
@@ -22,19 +22,15 @@
  * #L%
  */
 
+import schemacrawler.schema.*;
+import schemacrawler.tools.lint.BaseLinter;
+import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
+
 import java.sql.Connection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import schemacrawler.schema.Column;
-import schemacrawler.schema.ForeignKey;
-import schemacrawler.schema.ForeignKeyColumnReference;
-import schemacrawler.schema.Table;
-import schemacrawler.schema.View;
-import schemacrawler.schemacrawler.Config;
-import schemacrawler.tools.lint.BaseLinter;
-import schemacrawler.tools.lint.LintSeverity;
-
 import static java.util.Objects.requireNonNull;
 
 /**

diff --git a/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterJsonContent.java b/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterJsonContent.java
@@ -22,22 +22,22 @@
  * #L%
  */
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import io.github.mbarre.schemacrawler.utils.JSonUtils;
 import io.github.mbarre.schemacrawler.utils.LintUtils;
 import schemacrawler.schema.Column;
 import schemacrawler.schema.Table;
-import schemacrawler.schemacrawler.Config;
 import schemacrawler.schemacrawler.SchemaCrawlerException;
 import schemacrawler.tools.lint.BaseLinter;
 import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Linter to check if non JSONB type is used whereas JSON data is store in column

diff --git a/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterLeftSpacePadding.java b/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterLeftSpacePadding.java
@@ -22,6 +22,14 @@
  * #L%
  */
 
+import io.github.mbarre.schemacrawler.utils.LintUtils;
+import schemacrawler.schema.Column;
+import schemacrawler.schema.Table;
+import schemacrawler.schemacrawler.SchemaCrawlerException;
+import schemacrawler.tools.lint.BaseLinter;
+import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -31,14 +39,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import io.github.mbarre.schemacrawler.utils.LintUtils;
-import schemacrawler.schema.Column;
-import schemacrawler.schema.Table;
-import schemacrawler.schemacrawler.Config;
-import schemacrawler.schemacrawler.SchemaCrawlerException;
-import schemacrawler.tools.lint.BaseLinter;
-import schemacrawler.tools.lint.LintSeverity;
-
 public class LinterLeftSpacePadding extends BaseLinter {
 	public static final String SAMPLE_SIZE_PARAM = "sampleSize";
 	private static final Logger LOGGER = Logger.getLogger(LinterLeftSpacePadding.class.getName());

diff --git a/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterRightSpacePadding.java b/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterRightSpacePadding.java
@@ -22,6 +22,14 @@
  * #L%
  */
 
+import io.github.mbarre.schemacrawler.utils.LintUtils;
+import schemacrawler.schema.Column;
+import schemacrawler.schema.Table;
+import schemacrawler.schemacrawler.SchemaCrawlerException;
+import schemacrawler.tools.lint.BaseLinter;
+import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -31,14 +39,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import io.github.mbarre.schemacrawler.utils.LintUtils;
-import schemacrawler.schema.Column;
-import schemacrawler.schema.Table;
-import schemacrawler.schemacrawler.Config;
-import schemacrawler.schemacrawler.SchemaCrawlerException;
-import schemacrawler.tools.lint.BaseLinter;
-import schemacrawler.tools.lint.LintSeverity;
-
 /**
  * Linter to check if text column has length(rtrim(column)) == length(column)
  */

diff --git a/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterXmlContent.java b/src/main/java/io/github/mbarre/schemacrawler/tool/linter/LinterXmlContent.java
@@ -22,24 +22,20 @@
  * #L%
  */
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import io.github.mbarre.schemacrawler.utils.LintUtils;
 import io.github.mbarre.schemacrawler.utils.XmlUtils;
 import schemacrawler.schema.Column;
 import schemacrawler.schema.Table;
-import schemacrawler.schemacrawler.Config;
 import schemacrawler.schemacrawler.SchemaCrawlerException;
 import schemacrawler.tools.lint.BaseLinter;
 import schemacrawler.tools.lint.LintSeverity;
+import schemacrawler.tools.options.Config;
+
+import java.sql.*;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Linter to check if non XML type is used whereas XML data is store in column