[DAT-18844] resolved some sonar issues

src/main/java/liquibase/ext/databricks/change/addCheckConstraint/AddCheckConstraintChangeDatabricks.java

@@ -51,6 +51,7 @@ public String getConfirmationMessage() {
                 getConstraintName());
     }
 
+    @Override
     protected Change[] createInverses() {
         DropCheckConstraintChangeDatabricks inverse = new DropCheckConstraintChangeDatabricks();
         inverse.setTableName(getTableName());

src/main/java/liquibase/ext/databricks/change/addCheckConstraint/AddCheckConstraintGeneratorDatabricks.java

@@ -35,7 +35,7 @@ public Sql[] generateSql(AddCheckConstraintStatementDatabricks statement, Databa
 
         sql.append(" ADD CONSTRAINT ");
 
-        // Constrinat Name
+        // Constraint Name
         sql.append(statement.getConstraintName());
 
         sql.append(" CHECK (").append(statement.getConstraintBody()).append(")");

src/main/java/liquibase/ext/databricks/change/addLookupTable/AddLookupTableChangeDatabricks.java

@@ -24,6 +24,7 @@
         description = "Creates a lookup table containing values stored in a column and creates a foreign key to the new table.")
 public class AddLookupTableChangeDatabricks extends AddLookupTableChange {
 
+    @Override
     public String getFinalConstraintName() {
         if (getConstraintName() == null) {
             return ("fk_" + getExistingTableName() + "_" + getNewTableName()).toLowerCase();

src/main/java/liquibase/ext/databricks/change/alterCluster/AlterClusterChangeDatabricks.java

@@ -7,11 +7,13 @@
 import liquibase.exception.ValidationErrors;
 import liquibase.servicelocator.PrioritizedService;
 import liquibase.statement.SqlStatement;
+import lombok.Setter;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+@Setter
 @DatabaseChange(name = "alterCluster", description = "Alter Cluster", priority = PrioritizedService.PRIORITY_DATABASE +500)
 public class AlterClusterChangeDatabricks extends AbstractChange {
 
@@ -59,10 +61,6 @@ public String getTableName() {
         return tableName;
     }
 
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
-    }
-
     @DatabaseChangeProperty
     public List<ColumnConfig> getColumns() {
         if (columns == null) {
@@ -71,28 +69,16 @@ public List<ColumnConfig> getColumns() {
         return columns;
     }
 
-    public void setColumns(List<ColumnConfig> columns) {
-        this.columns = columns;
-    }
-
     @DatabaseChangeProperty
     public String getCatalogName() {
         return catalogName;
     }
 
-    public void setCatalogName(String catalogName) {
-        this.catalogName = catalogName;
-    }
-
     @DatabaseChangeProperty
     public String getSchemaName() {
         return schemaName;
     }
 
-    public void setSchemaName(String schemaName) {
-        this.schemaName = schemaName;
-    }
-
     @DatabaseChangeProperty
     public List<NoneConfig> getClusterBy() {
         if (clusterBy == null) {
@@ -101,7 +87,4 @@ public List<NoneConfig> getClusterBy() {
         return clusterBy;
     }
 
-    public void setClusterBy(List<NoneConfig> clusterBy) {
-        this.clusterBy = clusterBy;
-    }
 }

src/main/java/liquibase/ext/databricks/change/alterCluster/AlterClusterDatabricksStatement.java

@@ -1,9 +1,13 @@
 package liquibase.ext.databricks.change.alterCluster;
 
 import liquibase.statement.AbstractSqlStatement;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
+@Getter
+@Setter
 public class AlterClusterDatabricksStatement extends AbstractSqlStatement {
 
     private String tableName;
@@ -17,44 +21,4 @@ public AlterClusterDatabricksStatement(String tableName, String catalogName, Str
         this.catalogName = catalogName;
         this.schemaName = schemaName;
     }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
-    }
-
-    public List<ColumnConfig> getColumns() {
-        return columns;
-    }
-
-    public void setColumns(List<ColumnConfig> columns) {
-        this.columns = columns;
-    }
-
-    public String getCatalogName() {
-        return catalogName;
-    }
-
-    public void setCatalogName(String catalogName) {
-        this.catalogName = catalogName;
-    }
-
-    public String getSchemaName() {
-        return schemaName;
-    }
-
-    public void setSchemaName(String schemaName) {
-        this.schemaName = schemaName;
-    }
-
-    public List<NoneConfig> getClusterBy() {
-        return clusterBy;
-    }
-
-    public void setClusterBy(List<NoneConfig> clusterBy) {
-        this.clusterBy = clusterBy;
-    }
 }

src/main/java/liquibase/ext/databricks/change/alterCluster/ColumnConfig.java

@@ -1,7 +1,11 @@
 package liquibase.ext.databricks.change.alterCluster;
 
 import liquibase.serializer.AbstractLiquibaseSerializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class ColumnConfig extends AbstractLiquibaseSerializable {
 
     private String name;
@@ -15,12 +19,4 @@ public String getSerializedObjectName() {
     public String getSerializedObjectNamespace() {
         return "http://www.liquibase.org/xml/ns/databricks";
     }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }

src/main/java/liquibase/ext/databricks/change/alterCluster/NoneConfig.java

@@ -1,7 +1,11 @@
 package liquibase.ext.databricks.change.alterCluster;
 
 import liquibase.serializer.AbstractLiquibaseSerializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 public class NoneConfig extends AbstractLiquibaseSerializable {
 
     private String none;
@@ -16,11 +20,4 @@ public String getSerializedObjectNamespace() {
         return "http://www.liquibase.org/xml/ns/databricks";
     }
 
-    public String getNone() {
-        return none;
-    }
-
-    public void setNone(String none) {
-        this.none = none;
-    }
 }

src/main/java/liquibase/ext/databricks/change/alterTableProperties/AlterTablePropertiesChangeDatabricks.java

@@ -4,7 +4,6 @@
 import liquibase.change.DatabaseChangeProperty;
 import liquibase.database.Database;
 import liquibase.ext.databricks.change.AbstractAlterPropertiesChangeDatabricks;
-import liquibase.ext.databricks.database.DatabricksDatabase;
 import liquibase.servicelocator.PrioritizedService;
 import liquibase.statement.SqlStatement;
 import lombok.Setter;
@@ -16,11 +15,6 @@ public class AlterTablePropertiesChangeDatabricks extends AbstractAlterPropertie
     private static final String CHANGE_TYPE_SUBJECT = "Table";
     private String tableName;
 
-    @Override
-    public boolean supports(Database database) {
-        return database instanceof DatabricksDatabase;
-    }
-
     @Override
     protected String getNoPropertiesErrorMessage() {
         return applySubjectToErrorPattern(CHANGE_TYPE_SUBJECT);

src/main/java/liquibase/ext/databricks/change/alterViewProperties/AlterViewPropertiesChangeDatabricks.java

@@ -4,7 +4,6 @@
 import liquibase.change.DatabaseChangeProperty;
 import liquibase.database.Database;
 import liquibase.ext.databricks.change.AbstractAlterPropertiesChangeDatabricks;
-import liquibase.ext.databricks.database.DatabricksDatabase;
 import liquibase.servicelocator.PrioritizedService;
 import liquibase.statement.SqlStatement;
 import lombok.Setter;
@@ -16,11 +15,6 @@ public class AlterViewPropertiesChangeDatabricks extends AbstractAlterProperties
     private static final String CHANGE_TYPE_SUBJECT = "View";
     private String viewName;
 
-    @Override
-    public boolean supports(Database database) {
-        return database instanceof DatabricksDatabase;
-    }
-
     @Override
     protected String getNoPropertiesErrorMessage() {
         return applySubjectToErrorPattern(CHANGE_TYPE_SUBJECT);

src/main/java/liquibase/ext/databricks/change/analyzeTable/AnalyzeTableChange.java

@@ -8,11 +8,17 @@
 import liquibase.ext.databricks.database.DatabricksDatabase;
 import liquibase.servicelocator.PrioritizedService;
 import liquibase.statement.SqlStatement;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Collections;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
+@Getter
+@Setter
 @DatabaseChange(name = "analyzeTable", description = "Analyze Table Stats", priority =  PrioritizedService.PRIORITY_DATABASE)
 public class AnalyzeTableChange extends AbstractChange {
 
@@ -21,39 +27,7 @@ public class AnalyzeTableChange extends AbstractChange {
     private String tableName;
     private Map<String, String> partition = Collections.emptyMap();
 
-    private ArrayList<String> analyzeColumns = new ArrayList<>();
-
-    public String getCatalogName() {
-        return catalogName;
-    }
-
-    public void setCatalogName (String catalogName) {
-        this.catalogName = catalogName;
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public void setTableName (String tableName) {
-        this.tableName = tableName;
-    }
-
-    public String getSchemaName() {
-        return schemaName;
-    }
-
-    public void setSchemaName (String schemaName) {
-        this.schemaName = schemaName;
-    }
-
-    public Map<String, String> getPartition () {return this.partition;}
-
-    public ArrayList<String> getAnalyzeColumns () {return this.analyzeColumns;}
-
-    public void setPartition (Map<String, String> partition) {this.partition = partition;}
-
-    public void setAnalyzeColumns (ArrayList<String> analyzeColumns) {this.analyzeColumns = analyzeColumns;}
+    private List<String> analyzeColumns = new ArrayList<>();
 
     @Override
     public boolean supports(Database database) {
@@ -67,7 +41,7 @@ public String getConfirmationMessage() {
 
     @Override
     protected Change[] createInverses() {
-        // No Op for Databricks ANALYZE statement. there is no rolling this back. Its just a stats collection operation
+        // No Op for Databricks ANALYZE statement. there is no rolling this back. It's just a stats collection operation
         return new Change[]{
         };
     }
@@ -88,14 +62,13 @@ public SqlStatement[] generateStatements(Database database) {
         }
 
         if (getAnalyzeColumns() == null) {
-            ArrayList<String> noColsArray = new ArrayList<> ();
+            List<String> noColsArray = new ArrayList<> ();
 
             statement.setAnalyzeColumns(noColsArray);
         } else {
             statement.setAnalyzeColumns(getAnalyzeColumns());
         }
-        SqlStatement[] builtStatement = new SqlStatement[] {statement};
 
-        return builtStatement;
+        return new SqlStatement[] {statement};
     }
 }

src/main/java/liquibase/ext/databricks/change/analyzeTable/AnalyzeTableGenerator.java

@@ -27,7 +27,7 @@ public ValidationErrors validate(AnalyzeTableStatement statement, Database datab
         validationErrors.checkRequiredField("tableName", statement.getTableName());
 
         // if analyzeColumns columns if null, dont add to sql statement - just use defaults (all columns)
-        // If parititon is null, skip
+        // If partition is null, skip
         return validationErrors;
     }
 
@@ -46,13 +46,13 @@ public Sql[] generateSql(AnalyzeTableStatement statement, Database database, Sql
              String partitionColumnValue = partitionMap.getValue();
 
             // append partition column for each map element, but there should only be one
-            sql.append(" PARTITION (" + partitionColumnName + " = '" + partitionColumnValue + "') ");
+            sql.append(" PARTITION (").append(partitionColumnName).append(" = '").append(partitionColumnValue).append("') ");
 
 
         }
 
         if (!statement.getAnalyzeColumns().isEmpty()) {
-            sql.append("COMPUTE STATISTICS FOR COLUMNS  (" + String.join(", ", statement.getAnalyzeColumns()) + ")");
+            sql.append("COMPUTE STATISTICS FOR COLUMNS  (").append(String.join(", ", statement.getAnalyzeColumns())).append(")");
         }
         else {
             sql.append(" COMPUTE STATISTICS");

src/main/java/liquibase/ext/databricks/change/analyzeTable/AnalyzeTableStatement.java

@@ -1,39 +1,22 @@
 package liquibase.ext.databricks.change.analyzeTable;
 
 import liquibase.statement.AbstractSqlStatement;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Collections;
 
+@Getter
+@Setter
 public class AnalyzeTableStatement extends AbstractSqlStatement {
 
     private String catalogName;
-
     private String schemaName;
-
     private String tableName;
-
-    private ArrayList<String> analyzeColumns = new ArrayList<>();
-
+    private List<String> analyzeColumns = new ArrayList<>();
     private Map<String, String> partition = Collections.emptyMap();
 
-    public String getCatalogName() {return catalogName;}
-
-    public String getSchemaName() {return schemaName;}
-
-    public String getTableName() {return tableName;}
-
-    public ArrayList<String> getAnalyzeColumns() {return analyzeColumns;}
-
-    public Map<String, String> getPartition() {return partition;}
-    public void setCatalogName(String catalogName) { this.catalogName = catalogName;}
-
-    public void setSchemaName(String schemaName) { this.schemaName = schemaName;}
-
-    public void setTableName(String tableName) {this.tableName = tableName;}
-
-    public void setAnalyzeColumns(ArrayList<String> analyzeColumns) {this.analyzeColumns = analyzeColumns;}
-
-    public void setPartition(Map<String, String> partition) {this.partition = partition;}
-
 }