removed deprecated class

liquibase · Aug 1, 2024 · fc45e0d · fc45e0d
1 parent 360dd2e
commit fc45e0d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/src/main/java/liquibase/ext/databricks/datatype/TimestampDatatypeDatabricks.java b/src/main/java/liquibase/ext/databricks/datatype/TimestampDatatypeDatabricks.java
@@ -13,9 +13,9 @@
 import liquibase.datatype.DatabaseDataType;
 import liquibase.exception.DatabaseIncapableOfOperation;
 import liquibase.servicelocator.PrioritizedService;
-import liquibase.util.StringUtil;
 import liquibase.util.grammar.ParseException;
 import liquibase.ext.databricks.database.DatabricksDatabase;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Data type support for TIMESTAMP data types in various DBMS. All DBMS are at least expected to support the
@@ -36,7 +36,7 @@ public class TimestampDatatypeDatabricks extends TimestampType {
      */
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
-        String originalDefinition = StringUtil.trimToEmpty(getRawDefinition());
+        String originalDefinition = StringUtils.trimToEmpty(getRawDefinition());
         // If a fractional precision is given, check is the DBMS supports the length
         if (getParameters().length > 0) {
             Integer desiredLength = null;

diff --git a/src/main/java/liquibase/ext/databricks/snapshot/jvm/ViewSnapshotGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/snapshot/jvm/ViewSnapshotGeneratorDatabricks.java
@@ -14,13 +14,13 @@
 import liquibase.structure.DatabaseObject;
 import liquibase.structure.core.Schema;
 import liquibase.structure.core.View;
-import liquibase.util.StringUtil;
 
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.Map;
 
 import liquibase.ext.databricks.database.DatabricksDatabase;
+import org.apache.commons.lang3.StringUtils;
 
 public class ViewSnapshotGeneratorDatabricks extends ViewSnapshotGenerator {
 
@@ -99,7 +99,7 @@ protected DatabaseObject snapshotObject(DatabaseObject example, DatabaseSnapshot
                     definition = definition.substring(0, length - 1);
                 }
 
-                definition = StringUtil.trimToNull(definition);
+                definition = StringUtils.trimToNull(definition);
                 if (definition == null) {
                     definition = "[CANNOT READ VIEW DEFINITION]";
                 }

diff --git a/src/main/java/liquibase/ext/databricks/sqlgenerator/AddColumnGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/sqlgenerator/AddColumnGeneratorDatabricks.java
@@ -11,7 +11,7 @@
 import liquibase.statement.DatabaseFunction;
 import liquibase.statement.NotNullConstraint;
 import liquibase.statement.core.AddColumnStatement;
-import liquibase.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Iterator;
 
@@ -52,7 +52,7 @@ protected String generateSingleColumnSQL(AddColumnStatement statement, Database
                 ColumnConstraint constraint = var8.next();
                 if (constraint instanceof NotNullConstraint) {
                     NotNullConstraint notNullConstraint = (NotNullConstraint)constraint;
-                    if (StringUtil.isNotEmpty(notNullConstraint.getConstraintName())) {
+                    if (StringUtils.isNotEmpty(notNullConstraint.getConstraintName())) {
                         alterTable.append(" CONSTRAINT ").append(database.escapeConstraintName(notNullConstraint.getConstraintName()));
                         break;
                     }
@@ -75,7 +75,7 @@ protected String generateSingleColumnSQL(AddColumnStatement statement, Database
         }
 
         if (database instanceof MySQLDatabase && statement.getRemarks() != null) {
-            alterTable.append(" COMMENT '").append(database.escapeStringForDatabase(StringUtil.trimToEmpty(statement.getRemarks()))).append("' ");
+            alterTable.append(" COMMENT '").append(database.escapeStringForDatabase(StringUtils.trimToEmpty(statement.getRemarks()))).append("' ");
         }
 
         if (statement.getAddBeforeColumn() != null && !statement.getAddBeforeColumn().isEmpty()) {

diff --git a/src/main/java/liquibase/ext/databricks/sqlgenerator/RenameColumnGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/sqlgenerator/RenameColumnGeneratorDatabricks.java
@@ -12,8 +12,8 @@
 import liquibase.statement.core.RenameColumnStatement;
 import liquibase.structure.core.Column;
 import liquibase.structure.core.Table;
-import liquibase.util.StringUtil;
 import liquibase.sqlgenerator.core.RenameColumnGenerator;
+import org.apache.commons.lang3.StringUtils;
 
 public class RenameColumnGeneratorDatabricks extends RenameColumnGenerator {
 
@@ -36,7 +36,7 @@ public ValidationErrors validate(RenameColumnStatement renameColumnStatement, Da
         validationErrors.checkRequiredField("newColumnName", renameColumnStatement.getNewColumnName());
 
         if (database instanceof MySQLDatabase) {
-            validationErrors.checkRequiredField("columnDataType", StringUtil.trimToNull(renameColumnStatement.getColumnDataType()));
+            validationErrors.checkRequiredField("columnDataType", StringUtils.trimToNull(renameColumnStatement.getColumnDataType()));
         }
 
         return validationErrors;

diff --git a/src/main/java/liquibase/ext/databricks/sqlgenerator/SetColumnRemarksGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/sqlgenerator/SetColumnRemarksGeneratorDatabricks.java
@@ -3,19 +3,16 @@
 import liquibase.ext.databricks.database.DatabricksDatabase;
 import liquibase.database.Database;
 import liquibase.database.core.*;
-import liquibase.datatype.DataTypeFactory;
 import liquibase.exception.ValidationErrors;
 import liquibase.exception.Warnings;
 import liquibase.sql.Sql;
 import liquibase.sql.UnparsedSql;
 import liquibase.sqlgenerator.SqlGeneratorChain;
 import liquibase.statement.core.SetColumnRemarksStatement;
 import liquibase.structure.core.Column;
-import liquibase.structure.core.Data;
 import liquibase.structure.core.Table;
-import liquibase.util.ColumnParentType;
-import liquibase.util.StringUtil;
 import liquibase.sqlgenerator.core.SetColumnRemarksGenerator;
+import org.apache.commons.lang3.StringUtils;
 
 public class SetColumnRemarksGeneratorDatabricks extends SetColumnRemarksGenerator {
 
@@ -37,7 +34,7 @@ public ValidationErrors validate(SetColumnRemarksStatement setColumnRemarksState
         validationErrors.checkRequiredField("columnName", setColumnRemarksStatement.getColumnName());
         validationErrors.checkDisallowedField("catalogName", setColumnRemarksStatement.getCatalogName(), database, MSSQLDatabase.class);
         if (database instanceof MySQLDatabase) {
-            validationErrors.checkRequiredField("columnDataType", StringUtil.trimToNull(setColumnRemarksStatement.getColumnDataType()));
+            validationErrors.checkRequiredField("columnDataType", StringUtils.trimToNull(setColumnRemarksStatement.getColumnDataType()));
         }
         return validationErrors;
     }
@@ -55,7 +52,7 @@ public Warnings warn(SetColumnRemarksStatement statementType, Database database,
     @Override
     public Sql[] generateSql(SetColumnRemarksStatement statement, Database database, SqlGeneratorChain sqlGeneratorChain) {
 
-        String remarksEscaped = database.escapeStringForDatabase(StringUtil.trimToEmpty(statement.getRemarks()));
+        String remarksEscaped = database.escapeStringForDatabase(StringUtils.trimToEmpty(statement.getRemarks()));
 
 
         return new Sql[]{new UnparsedSql("ALTER TABLE " + database.escapeTableName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName())

diff --git a/src/main/java/liquibase/ext/databricks/sqlgenerator/SetTableRemarksGeneratorDatabricks.java b/src/main/java/liquibase/ext/databricks/sqlgenerator/SetTableRemarksGeneratorDatabricks.java
@@ -9,8 +9,8 @@
 import liquibase.statement.core.SetTableRemarksStatement;
 import liquibase.structure.core.Relation;
 import liquibase.structure.core.Table;
-import liquibase.util.StringUtil;
 import liquibase.sqlgenerator.core.SetTableRemarksGenerator;
+import org.apache.commons.lang3.StringUtils;
 
 public class SetTableRemarksGeneratorDatabricks extends SetTableRemarksGenerator {
 
@@ -35,7 +35,7 @@ public ValidationErrors validate(SetTableRemarksStatement setTableRemarksStateme
     @Override
     public Sql[] generateSql(SetTableRemarksStatement statement, Database database, SqlGeneratorChain sqlGeneratorChain) {
         String sql;
-        String remarksEscaped = database.escapeStringForDatabase(StringUtil.trimToEmpty(statement.getRemarks()));
+        String remarksEscaped = database.escapeStringForDatabase(StringUtils.trimToEmpty(statement.getRemarks()));
 
         sql = "COMMENT ON TABLE " + database.escapeTableName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName()) + " IS '"
                     + remarksEscaped + "'";