Updated to liquibase 4.0.0-beta1

pom.xml

@@ -115,7 +115,7 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>3.8.9</version>
+            <version>4.0.0-beta1</version>
         </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>

src/main/java/liquibase/ext/vertica/change/AddVerticaColumnChange.java

@@ -8,7 +8,7 @@
 import liquibase.statement.*;
 import liquibase.statement.core.SetColumnRemarksStatement;
 import liquibase.statement.core.UpdateStatement;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -87,7 +87,7 @@ public SqlStatement[] generateStatements(Database database) {
         }
 
         for (ColumnConfig column : getColumns()) {
-            String columnRemarks = StringUtils.trimToNull(column.getRemarks());
+            String columnRemarks = StringUtil.trimToNull(column.getRemarks());
             if (columnRemarks != null) {
                 SetColumnRemarksStatement remarksStatement = new SetColumnRemarksStatement("", getSchemaName(), getTableName(), column.getName(), columnRemarks);
                 if (SqlGeneratorFactory.getInstance().supports(remarksStatement, database)) {

src/main/java/liquibase/ext/vertica/change/CreateProjectionChange.java

@@ -8,7 +8,7 @@
 import liquibase.ext.vertica.structure.GroupedColumns;
 import liquibase.ext.vertica.structure.Segmentation;
 import liquibase.statement.SqlStatement;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -88,7 +88,7 @@ public void setProjectionName(String projectionName) {
     }
 
     public void setSchemaName(String schemaName) {
-        this.schemaName = StringUtils.trimToNull(schemaName);
+        this.schemaName = StringUtil.trimToNull(schemaName);
     }
 
     public String getTableName() {
@@ -178,7 +178,7 @@ public String getConfirmationMessage() {
             names.add(col.getName() + "(" + col.getType() + ")");
         }
 
-        return "Columns " + StringUtils.join(names, ",") + " of " + getTableName() + " modified";*/
+        return "Columns " + StringUtil.join(names, ",") + " of " + getTableName() + " modified";*/
         return "Projection " + getProjectionName() + " has been created";
     }
 

src/main/java/liquibase/ext/vertica/change/CreateTableChangeVertica.java

@@ -14,7 +14,7 @@
 import liquibase.statement.*;
 import liquibase.statement.core.SetColumnRemarksStatement;
 import liquibase.statement.core.SetTableRemarksStatement;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -132,7 +132,7 @@ public SqlStatement[] generateStatements(Database database) {
 
                 if (constraints.getReferences() != null ||
                         (constraints.getReferencedTableName() != null && constraints.getReferencedColumnNames() != null)) {
-                    if (StringUtils.trimToNull(constraints.getForeignKeyName()) == null) {
+                    if (StringUtil.trimToNull(constraints.getForeignKeyName()) == null) {
                         throw new UnexpectedLiquibaseException("createTable with references requires foreignKeyName");
                     }
                     ForeignKeyConstraint fkConstraint = new ForeignKeyConstraint(constraints.getForeignKeyName(),
@@ -154,7 +154,7 @@ public SqlStatement[] generateStatements(Database database) {
             }
         }
 
-        statement.setTablespace(StringUtils.trimToNull(getTablespace()));
+        statement.setTablespace(StringUtil.trimToNull(getTablespace()));
         statement.setSegmentation(getSegmentation());
         statement.setPartitionby(getPartitionby());
         statement.setOrderby(getOrderby());
@@ -163,15 +163,15 @@ public SqlStatement[] generateStatements(Database database) {
         List<SqlStatement> statements = new ArrayList<SqlStatement>();
         statements.add(statement);
 
-        if (StringUtils.trimToNull(remarks) != null) {
+        if (StringUtil.trimToNull(remarks) != null) {
             SetTableRemarksStatement remarksStatement = new SetTableRemarksStatement("", schemaName, tableName, remarks);
             if (SqlGeneratorFactory.getInstance().supports(remarksStatement, database)) {
                 statements.add(remarksStatement);
             }
         }
 
         for (ColumnConfig column : getColumns()) {
-            String columnRemarks = StringUtils.trimToNull(column.getRemarks());
+            String columnRemarks = StringUtil.trimToNull(column.getRemarks());
             if (columnRemarks != null) {
                 SetColumnRemarksStatement remarksStatement = new SetColumnRemarksStatement("", schemaName, tableName, column.getName(), columnRemarks);
                 if (SqlGeneratorFactory.getInstance().supports(remarksStatement, database)) {

src/main/java/liquibase/ext/vertica/change/CreateTempTableChangeVertica.java

@@ -15,7 +15,7 @@
 import liquibase.statement.*;
 import liquibase.statement.core.SetColumnRemarksStatement;
 import liquibase.statement.core.SetTableRemarksStatement;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -131,7 +131,7 @@ public SqlStatement[] generateStatements(Database database) {
 
                 if (constraints.getReferences() != null ||
                         (constraints.getReferencedTableName() != null && constraints.getReferencedColumnNames() != null)) {
-                    if (StringUtils.trimToNull(constraints.getForeignKeyName()) == null) {
+                    if (StringUtil.trimToNull(constraints.getForeignKeyName()) == null) {
                         throw new UnexpectedLiquibaseException("createTable with references requires foreignKeyName");
                     }
                     ForeignKeyConstraint fkConstraint = new ForeignKeyConstraint(constraints.getForeignKeyName(),
@@ -153,7 +153,7 @@ public SqlStatement[] generateStatements(Database database) {
             }
         }
 
-        statement.setTablespace(StringUtils.trimToNull(getTablespace()));
+        statement.setTablespace(StringUtil.trimToNull(getTablespace()));
         statement.setSegmentation(getSegmentation());
         statement.setPartitionby(getPartitionby());
         statement.setOrderby(getOrderby());
@@ -164,15 +164,15 @@ public SqlStatement[] generateStatements(Database database) {
         List<SqlStatement> statements = new ArrayList<SqlStatement>();
         statements.add(statement);
 
-        if (StringUtils.trimToNull(remarks) != null) {
+        if (StringUtil.trimToNull(remarks) != null) {
             SetTableRemarksStatement remarksStatement = new SetTableRemarksStatement("", schemaName, tableName, remarks);
             if (SqlGeneratorFactory.getInstance().supports(remarksStatement, database)) {
                 statements.add(remarksStatement);
             }
         }
 
         for (ColumnConfig column : getColumns()) {
-            String columnRemarks = StringUtils.trimToNull(column.getRemarks());
+            String columnRemarks = StringUtil.trimToNull(column.getRemarks());
             if (columnRemarks != null) {
                 SetColumnRemarksStatement remarksStatement = new SetColumnRemarksStatement("", schemaName, tableName, column.getName(), columnRemarks);
                 if (SqlGeneratorFactory.getInstance().supports(remarksStatement, database)) {

src/main/java/liquibase/ext/vertica/database/VerticaDatabase.java

@@ -1,6 +1,7 @@
 package liquibase.ext.vertica.database;
 
 import liquibase.CatalogAndSchema;
+import liquibase.Scope;
 import liquibase.database.AbstractJdbcDatabase;
 import liquibase.database.DatabaseConnection;
 import liquibase.database.ObjectQuotingStrategy;
@@ -13,7 +14,7 @@
 import liquibase.statement.core.RawSqlStatement;
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.core.Table;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 import java.math.BigInteger;
 import java.sql.ResultSet;
@@ -231,7 +232,7 @@ public CatalogAndSchema correctSchema(final CatalogAndSchema schema) {
         if (schema == null) {
             return new CatalogAndSchema(null, getDefaultSchemaName());
         }
-        String schemaName = StringUtils.trimToNull(schema.getSchemaName());
+        String schemaName = StringUtil.trimToNull(schema.getSchemaName());
 
         if (schemaName == null) {
             schemaName = getDefaultSchemaName();
@@ -252,7 +253,7 @@ protected boolean hasMixedCase(String tableName) {
             if (tableName == null) {
                 return false;
             }
-            return StringUtils.hasUpperCase(tableName) && StringUtils.hasLowerCase(tableName);
+            return StringUtil.hasUpperCase(tableName) && StringUtil.hasLowerCase(tableName);
         }
 
     @Override
@@ -296,7 +297,7 @@ private List<String> getSearchPaths() {
             } catch (Exception e) {
                 // TODO: Something?
                 e.printStackTrace();
-                LogFactory.getLogger().severe("Failed to get default catalog name from vertica", e);
+                Scope.getCurrentScope().getLog(getClass()).severe("Failed to get default catalog name from vertica", e);
             }
 
             return searchPaths;
@@ -315,7 +316,7 @@ protected String getConnectionSchemaName() {
                 System.out.println("schema_name: "+schema);
                 return schema;
             } catch (Exception e) {
-                LogFactory.getLogger().info("Error getting default schema", e);
+                Scope.getCurrentScope().getLog(getClass()).info("Error getting default schema", e);
             }
             return null;
         }
@@ -335,7 +336,7 @@ public String executeSQL(String query) {
             if (res!=null)
                 return res.toString();
         } catch (Exception e) {
-            LogFactory.getLogger().info("Error got exception when running: " + query, e);
+            Scope.getCurrentScope().getLog(getClass()).info("Error got exception when running: " + query, e);
         }
         return null;
     }

src/main/java/liquibase/ext/vertica/datatype/BinaryType.java

@@ -6,7 +6,7 @@
 import liquibase.datatype.DatabaseDataType;
 import liquibase.datatype.LiquibaseDataType;
 import liquibase.ext.vertica.database.VerticaDatabase;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 /**
  * Created by vesterma on 23/01/14.
@@ -17,7 +17,7 @@ public class BinaryType extends LiquibaseDataType {
 
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
-        String originalDefinition = StringUtils.trimToEmpty(this.originalDefinition);
+        String originalDefinition = StringUtil.trimToEmpty(this.originalDefinition);
 
         if (database instanceof VerticaDatabase) {
             return new DatabaseDataType("BINARY", getParameters());

src/main/java/liquibase/ext/vertica/datatype/LongBinaryType.java

@@ -6,7 +6,7 @@
 import liquibase.datatype.DatabaseDataType;
 import liquibase.datatype.LiquibaseDataType;
 import liquibase.ext.vertica.database.VerticaDatabase;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 /**
  * Created by vesterma on 23/01/14.
@@ -17,7 +17,7 @@ public class LongBinaryType extends LiquibaseDataType {
 
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
-        String originalDefinition = StringUtils.trimToEmpty(this.originalDefinition);
+        String originalDefinition = StringUtil.trimToEmpty(this.originalDefinition);
 
         if (database instanceof VerticaDatabase) {
             return new DatabaseDataType("LONG VARBINARY", getParameters());

src/main/java/liquibase/ext/vertica/datatype/LongVarcharType.java

@@ -6,7 +6,7 @@
 import liquibase.datatype.DatabaseDataType;
 import liquibase.datatype.LiquibaseDataType;
 import liquibase.ext.vertica.database.VerticaDatabase;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 /**
  * Created by vesterma on 23/01/14.
@@ -18,7 +18,7 @@ public class LongVarcharType extends LiquibaseDataType {
 
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
-        String originalDefinition = StringUtils.trimToEmpty(this.originalDefinition);
+        String originalDefinition = StringUtil.trimToEmpty(this.originalDefinition);
 
         if (database instanceof VerticaDatabase) {
             return new DatabaseDataType("LONG VARCHAR", getParameters());

src/main/java/liquibase/ext/vertica/datatype/VarBinaryType.java

@@ -6,7 +6,7 @@
 import liquibase.datatype.DatabaseDataType;
 import liquibase.datatype.LiquibaseDataType;
 import liquibase.ext.vertica.database.VerticaDatabase;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 /**
  * Created by vesterma on 23/01/14.
@@ -18,7 +18,7 @@ public class VarBinaryType extends LiquibaseDataType {
 
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
-        String originalDefinition = StringUtils.trimToEmpty(this.originalDefinition);
+        String originalDefinition = StringUtil.trimToEmpty(this.originalDefinition);
 
         if (database instanceof VerticaDatabase) {
             return new DatabaseDataType("VARBINARY", getParameters());

src/main/java/liquibase/ext/vertica/diff/output/changelog/DiffToChangeSetLog.java

@@ -18,7 +18,7 @@
 import liquibase.snapshot.SnapshotGeneratorFactory;
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.DatabaseObjectComparator;
-import liquibase.util.StringUtils;
+import liquibase.util.StringUtil;
 
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
@@ -121,7 +121,7 @@ public static void doGenerateChangeLog(String changeLogFile, Database originalDa
         changeLogWriter.setChangeSetAuthor(author);
         changeLogWriter.setChangeSetContext(context);
 
-        if (StringUtils.trimToNull(changeLogFile) != null) {
+        if (StringUtil.trimToNull(changeLogFile) != null) {
             changeLogWriter.print(changeLogFile);
         } else {
             PrintStream outputStream = System.out;

src/main/java/liquibase/ext/vertica/precondition/ColumnExistsPrecondition.java

@@ -2,6 +2,7 @@
 
 
 
+        import liquibase.Scope;
         import liquibase.changelog.ChangeSet;
         import liquibase.changelog.DatabaseChangeLog;
         import liquibase.changelog.visitor.ChangeExecListener;
@@ -22,7 +23,7 @@
         import liquibase.structure.core.Schema;
         import liquibase.structure.core.Table;
         import liquibase.util.JdbcUtils;
-        import liquibase.util.StringUtils;
+        import liquibase.util.StringUtil;
 
         import java.sql.ResultSet;
         import java.sql.Statement;
@@ -88,7 +89,7 @@ public ValidationErrors validate(Database database) {
     @Override
     public void check(Database database, DatabaseChangeLog changeLog, ChangeSet changeSet, ChangeExecListener changeExecListener) throws PreconditionFailedException, PreconditionErrorException {
         Column example = new Column();
-        if (StringUtils.trimToNull(getTableName()) != null) {
+        if (StringUtil.trimToNull(getTableName()) != null) {
             example.setRelation(new Table().setName(getTableName()).setSchema(new Schema(getCatalogName(), getSchemaName())));
         }
         example.setName(getColumnName());
@@ -105,7 +106,7 @@ public void check(Database database, DatabaseChangeLog changeLog, ChangeSet chan
 
         }else {
             if (columnExists.get(getTableName()).get(getColumnName())==null){
-                LogFactory.getLogger().debug("Column found in cache :"+ getColumnName());
+                Scope.getCurrentScope().getLog(getClass()).fine("Column found in cache :"+ getColumnName());
                 throw new PreconditionFailedException("Column '" + database.escapeColumnName(catalogName, schemaName, getTableName(), getColumnName()) + "' does not exist", changeLog, this);
             }
         }
@@ -170,7 +171,7 @@ private void createExistingColumnsMap(JdbcConnection dbConn,Map tableColumnsExis
             }
             columnExists.put(getTableName(),tableColumnsExists);
         } catch (Exception e) {
-            LogFactory.getLogger().info("Error fetching columns name from metadata ", e);
+            Scope.getCurrentScope().getLog(getClass()).info("Error fetching columns name from metadata ", e);
             throw new RuntimeException("Error fetching columns name from metadata ", e);
         } finally {
             JdbcUtils.closeResultSet(rs);