Refactor design smells

src/main/java/net/sf/jsqlparser/expression/CaseExpression.java

@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.Optional;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
-import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.util.SelectUtils;
 
 /**
  * CASE/WHEN expression.
@@ -112,7 +112,7 @@ public void setWhenClauses(List<WhenClause> whenClauses) {
  public String toString() {
  return (usingBrackets ? "(" : "") + "CASE "
  + ((switchExpression != null) ? switchExpression + " " : "")
- + PlainSelect.getStringList(whenClauses, false, false) + " "
+ + SelectUtils.getStringList(whenClauses, false, false) + " "
  + ((elseExpression != null) ? "ELSE " + elseExpression + " " : "") + "END"
  + (usingBrackets ? ")" : "");
  }

src/main/java/net/sf/jsqlparser/expression/CastExpression.java

@@ -12,7 +12,7 @@
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
-import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.util.SelectUtils;
 
 import java.util.ArrayList;
 
@@ -110,7 +110,7 @@ public String toString() {
  if (keyword != null && !keyword.isEmpty()) {
  return columnDefinitions.size() > 1
  ? keyword + "(" + leftExpression + " AS ROW("
- + Select.getStringList(columnDefinitions) + ")" + formatStr + ")"
+ + SelectUtils.getStringList(columnDefinitions) + ")" + formatStr + ")"
  : keyword + "(" + leftExpression + " AS " + colDataType.toString() + formatStr
  + ")";
  } else {

src/main/java/net/sf/jsqlparser/expression/PartitionByClause.java

@@ -10,7 +10,7 @@
 package net.sf.jsqlparser.expression;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.util.SelectUtils;
 
 import java.io.Serializable;
 
@@ -34,7 +34,7 @@ public void setPartitionExpressionList(ExpressionList partitionExpressionList, b
  public void toStringPartitionBy(StringBuilder b) {
  if (partitionExpressionList != null && !partitionExpressionList.getExpressions().isEmpty()) {
  b.append("PARTITION BY ");
- b.append(PlainSelect.
+ b.append(SelectUtils.
  getStringList(partitionExpressionList.getExpressions(), true, brackets));
  b.append(" ");
  }

src/main/java/net/sf/jsqlparser/expression/operators/relational/ParenthesedExpressionList.java

@@ -10,7 +10,7 @@
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.util.SelectUtils;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -36,6 +36,6 @@ public static ParenthesedExpressionList<?> from(ExpressionList<?> expressions) {
 
  @Override
  public String toString() {
- return PlainSelect.getStringList(this, true, true);
+ return SelectUtils.getStringList(this, true, true);
  }
 }

src/main/java/net/sf/jsqlparser/parser/IndexIds.java

@@ -0,0 +1,27 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2024 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.parser;
+
+public enum IndexIds {
+
+ NAME(0),
+ SCHEMA(1),
+ DATABASE(2),
+ SERVER(3);
+ private int id;
+
+ IndexIds(int id) {
+ this.id = id;
+ }
+
+ public int getID() {
+ return id;
+ }
+}

src/main/java/net/sf/jsqlparser/schema/Sequence.java

@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.schema;
 
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+import net.sf.jsqlparser.parser.IndexIds;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,10 +23,6 @@
  */
 public class Sequence extends ASTNodeAccessImpl implements MultiPartName {
 
- private static final int NAME_IDX = 0;
- private static final int SCHEMA_IDX = 1;
- private static final int DATABASE_IDX = 2;
- private static final int SERVER_IDX = 3;
  private List<String> partItems = new ArrayList<>();
 
  private List<Parameter> parameters;
@@ -46,13 +43,13 @@ public List<Parameter> getParameters() {
  }
 
  public Database getDatabase() {
- return new Database(getIndex(DATABASE_IDX));
+ return new Database(getIndex(IndexIds.DATABASE.getID()));
  }
 
  public void setDatabase(Database database) {
- setIndex(DATABASE_IDX, database.getDatabaseName());
+ setIndex(IndexIds.DATABASE.getID(), database.getDatabaseName());
  if (database.getServer() != null) {
- setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());
+ setIndex(IndexIds.SERVER.getID(), database.getServer().getFullyQualifiedName());
  }
  }
 
@@ -62,11 +59,11 @@ public Sequence withDatabase(Database database) {
  }
 
  public String getSchemaName() {
- return getIndex(SCHEMA_IDX);
+ return getIndex(IndexIds.SCHEMA.getID());
  }
 
  public void setSchemaName(String string) {
- setIndex(SCHEMA_IDX, string);
+ setIndex(IndexIds.SCHEMA.getID(), string);
  }
 
  public Sequence withSchemaName(String string) {
@@ -75,11 +72,11 @@ public Sequence withSchemaName(String string) {
  }
 
  public String getName() {
- return getIndex(NAME_IDX);
+ return getIndex(IndexIds.NAME.getID());
  }
 
  public void setName(String string) {
- setIndex(NAME_IDX, string);
+ setIndex(IndexIds.NAME.getID(), string);
  }
 
  public Sequence withName(String string) {

src/main/java/net/sf/jsqlparser/statement/OutputClause.java

@@ -11,8 +11,8 @@
 
 import net.sf.jsqlparser.expression.UserVariable;
 import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.SelectItem;
+import net.sf.jsqlparser.util.SelectUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -89,15 +89,15 @@ public void setColumnList(List<String> columnList) {
 
  public StringBuilder appendTo(StringBuilder builder) {
  builder.append(" OUTPUT ");
- PlainSelect.appendStringListTo(builder, selectItemList, true, false);
+ SelectUtils.appendStringListTo(builder, selectItemList, true, false);
 
  if (tableVariable != null) {
  builder.append(" INTO ").append(tableVariable);
  } else if (outputTable != null) {
  builder.append(" INTO ").append(outputTable);
  }
 
- PlainSelect.appendStringListTo(builder, columnList, true, false);
+ SelectUtils.appendStringListTo(builder, columnList, true, false);
 
  return builder.append(" ");
  }

src/main/java/net/sf/jsqlparser/statement/SetStatement.java

@@ -11,7 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.util.SelectUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -106,7 +106,7 @@ public void setExpressions(ExpressionList<?> expressions) {
 
  private String toString(NameExpr ne) {
  return ne.name + (ne.useEqual ? " = " : " ")
- + PlainSelect.getStringList(ne.expressions, true, false);
+ + SelectUtils.getStringList(ne.expressions, true, false);
  }
 
  @Override

src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java

@@ -24,7 +24,7 @@
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
 import net.sf.jsqlparser.statement.create.table.Index;
-import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.util.SelectUtils;
 
 @SuppressWarnings({"PMD.CyclomaticComplexity"})
 public class AlterExpression implements Serializable {
@@ -463,14 +463,14 @@ public String toString() {
  b.append("DROP PRIMARY KEY ");
  } else if (operation == AlterOperation.DROP_UNIQUE) {
 
- b.append("DROP UNIQUE (").append(PlainSelect.getStringList(pkColumns)).append(')');
+ b.append("DROP UNIQUE (").append(SelectUtils.getStringList(pkColumns)).append(')');
  } else if (operation == AlterOperation.DROP_FOREIGN_KEY) {
 
- b.append("DROP FOREIGN KEY (").append(PlainSelect.getStringList(pkColumns)).append(')');
+ b.append("DROP FOREIGN KEY (").append(SelectUtils.getStringList(pkColumns)).append(')');
  } else if (operation == AlterOperation.DROP && columnName == null && pkColumns != null
  && !pkColumns.isEmpty()) {
  // Oracle Multi Column Drop
- b.append("DROP (").append(PlainSelect.getStringList(pkColumns)).append(')');
+ b.append("DROP (").append(SelectUtils.getStringList(pkColumns)).append(')');
  } else if (operation == AlterOperation.TRUNCATE_PARTITION
  && truncatePartitionName != null) {
  b.append("TRUNCATE PARTITION ").append(truncatePartitionName);
@@ -516,7 +516,7 @@ public String toString() {
  if (useBrackets && colDataTypeList.size() == 1) {
  b.append(" ( ");
  }
- b.append(PlainSelect.getStringList(colDataTypeList));
+ b.append(SelectUtils.getStringList(colDataTypeList));
  if (useBrackets && colDataTypeList.size() == 1) {
  b.append(" ) ");
  }
@@ -525,18 +525,18 @@ public String toString() {
  }
  } else if (getColumnDropNotNullList() != null) {
  b.append("COLUMN ");
- b.append(PlainSelect.getStringList(columnDropNotNullList));
+ b.append(SelectUtils.getStringList(columnDropNotNullList));
  } else if (columnDropDefaultList != null && !columnDropDefaultList.isEmpty()) {
  b.append("COLUMN ");
- b.append(PlainSelect.getStringList(columnDropDefaultList));
+ b.append(SelectUtils.getStringList(columnDropDefaultList));
  } else if (constraintName != null) {
  b.append("CONSTRAINT ");
  if (usingIfExists) {
  b.append("IF EXISTS ");
  }
  b.append(constraintName);
  } else if (pkColumns != null) {
- b.append("PRIMARY KEY (").append(PlainSelect.getStringList(pkColumns)).append(')');
+ b.append("PRIMARY KEY (").append(SelectUtils.getStringList(pkColumns)).append(')');
  } else if (ukColumns != null) {
  b.append("UNIQUE");
  if (ukName != null) {
@@ -547,18 +547,18 @@ public String toString() {
  }
  b.append(ukName);
  }
- b.append(" (").append(PlainSelect.getStringList(ukColumns)).append(")");
+ b.append(" (").append(SelectUtils.getStringList(ukColumns)).append(")");
  } else if (fkColumns != null) {
  b.append("FOREIGN KEY (")
- .append(PlainSelect.getStringList(fkColumns))
+ .append(SelectUtils.getStringList(fkColumns))
  .append(") REFERENCES ")
  .append(
  fkSourceSchema != null && fkSourceSchema.trim().length() > 0
  ? fkSourceSchema + "."
  : "")
  .append(fkSourceTable)
  .append(" (")
- .append(PlainSelect.getStringList(fkSourceColumns))
+ .append(SelectUtils.getStringList(fkSourceColumns))
  .append(")");
  referentialActions.forEach(b::append);
  } else if (index != null) {
@@ -567,15 +567,15 @@ public String toString() {
 
 
  if (getConstraints() != null && !getConstraints().isEmpty()) {
- b.append(' ').append(PlainSelect.getStringList(constraints, false, false));
+ b.append(' ').append(SelectUtils.getStringList(constraints, false, false));
  }
  if (getUseEqual()) {
  b.append('=');
  }
  }
 
  if (parameters != null && !parameters.isEmpty()) {
- b.append(' ').append(PlainSelect.getStringList(parameters, false, false));
+ b.append(' ').append(SelectUtils.getStringList(parameters, false, false));
  }
 
  if (index != null && index.getCommentText() != null) {

src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java

@@ -16,7 +16,8 @@
 import java.util.List;
 import java.util.Optional;
 import static java.util.stream.Collectors.joining;
-import net.sf.jsqlparser.statement.select.PlainSelect;
+
+import net.sf.jsqlparser.util.SelectUtils;
 
 public class ColDataType implements Serializable {
 
@@ -80,7 +81,7 @@ public String toString() {
  arraySpec.append("]");
  }
  return dataType
- + (argumentsStringList != null ? " " + PlainSelect.
+ + (argumentsStringList != null ? " " + SelectUtils.
  getStringList(argumentsStringList, true, true) : "")
  + arraySpec.toString()
  + (characterSet != null ? " CHARACTER SET " + characterSet : "");

src/main/java/net/sf/jsqlparser/statement/create/table/ColumnDefinition.java

@@ -9,7 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.table;
 
-import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.util.SelectUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -71,7 +71,7 @@ public String toString() {
  public String toStringDataTypeAndSpec() {
  return (colDataType == null ? "" : colDataType)
  + (columnSpecs != null && !columnSpecs.isEmpty()
- ? " " + PlainSelect.getStringList(columnSpecs, false, false)
+ ? " " + SelectUtils.getStringList(columnSpecs, false, false)
  : "");
  }
 

src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java

@@ -19,8 +19,8 @@
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
-import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.util.SelectUtils;
 
 public class CreateTable implements Statement {
 
@@ -167,7 +167,7 @@ public void setRowMovement(RowMovement rowMovement) {
  @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
  public String toString() {
  String sql;
- String createOps = PlainSelect.getStringList(createOptionsStrings, false, false);
+ String createOps = SelectUtils.getStringList(createOptionsStrings, false, false);
 
  sql = "CREATE " + (unlogged ? "UNLOGGED " : "")
  + (!"".equals(createOps) ? createOps + " " : "")
@@ -176,19 +176,19 @@ public String toString() {
 
  if (columns != null && !columns.isEmpty()) {
  sql += " ";
- sql += PlainSelect.getStringList(columns, true, true);
+ sql += SelectUtils.getStringList(columns, true, true);
  }
  if (columnDefinitions != null && !columnDefinitions.isEmpty()) {
  sql += " (";
 
- sql += PlainSelect.getStringList(columnDefinitions, true, false);
+ sql += SelectUtils.getStringList(columnDefinitions, true, false);
  if (indexes != null && !indexes.isEmpty()) {
  sql += ", ";
- sql += PlainSelect.getStringList(indexes);
+ sql += SelectUtils.getStringList(indexes);
  }
  sql += ")";
  }
- String options = PlainSelect.getStringList(tableOptionsStrings, false, false);
+ String options = SelectUtils.getStringList(tableOptionsStrings, false, false);
  if (options != null && options.length() > 0) {
  sql += " " + options;
  }