Skip to content

Add spotless #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeanbisutti merged 2 commits into from
Mar 17, 2026
Merged

Add spotless #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
720a359
Add spotless
jeanbisutti Mar 17, 2026
7f16ada
Restrict spotless profile to Java 17 only
jeanbisutti Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,38 @@
</issueManagement>

<profiles>
<profile>
<id>spotless</id>
<activation>
<!-- google-java-format 1.25.2 requires JVM 17+ to run
but formats Java 8 source code correctly -->
<jdk>17</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.44.3</version>
<configuration>
<java>
<googleJavaFormat>
<version>1.25.2</version>
</googleJavaFormat>
</java>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
Expand Down
23 changes: 11 additions & 12 deletions src/main/java/org/qstd/ColumnMappingPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,17 @@

public class ColumnMappingPart {

final String tableName;
final String tableColumn;
private final String tableSchema;
final String tableName;
final String tableColumn;
private final String tableSchema;

public ColumnMappingPart(String tableSchema, String tableName, String tableColumn) {
this.tableSchema = tableSchema;
this.tableName = tableName;
this.tableColumn = tableColumn;
}

boolean hasColumn(String columnName) {
return tableColumn.equals(columnName);
}
public ColumnMappingPart(String tableSchema, String tableName, String tableColumn) {
this.tableSchema = tableSchema;
this.tableName = tableName;
this.tableColumn = tableColumn;
}

boolean hasColumn(String columnName) {
return tableColumn.equals(columnName);
}
}
43 changes: 21 additions & 22 deletions src/main/java/org/qstd/ColumnNamesComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,31 @@

class ColumnNamesComparator implements Comparator<String> {

private final Map<String, Integer> positionByColumnName;
private final Map<String, Integer> positionByColumnName;

private ColumnNamesComparator(Map<String, Integer> positionByColumnName) {
this.positionByColumnName = positionByColumnName;
}
private ColumnNamesComparator(Map<String, Integer> positionByColumnName) {
this.positionByColumnName = positionByColumnName;
}

public static ColumnNamesComparator from(List<String> orderedColumns) {
Map<String, Integer> positionByColumnName = buildIndexByColumnName(orderedColumns);
return new ColumnNamesComparator(positionByColumnName);
}
public static ColumnNamesComparator from(List<String> orderedColumns) {
Map<String, Integer> positionByColumnName = buildIndexByColumnName(orderedColumns);
return new ColumnNamesComparator(positionByColumnName);
}

private static Map<String, Integer> buildIndexByColumnName(List<String> orderedColumns) {
final Map<String, Integer> positionByColumnName = new HashMap<>();
for (int i = 0; i < orderedColumns.size(); i++) {
positionByColumnName.put(orderedColumns.get(i), i + 1);
}
return positionByColumnName;
private static Map<String, Integer> buildIndexByColumnName(List<String> orderedColumns) {
final Map<String, Integer> positionByColumnName = new HashMap<>();
for (int i = 0; i < orderedColumns.size(); i++) {
positionByColumnName.put(orderedColumns.get(i), i + 1);
}
return positionByColumnName;
}

@Override
public int compare(String colName1, String colName2) {
return findPositionOf(colName1) - findPositionOf(colName2);
}

private int findPositionOf(String colName1) {
return positionByColumnName.get(colName1);
}
@Override
public int compare(String colName1, String colName2) {
return findPositionOf(colName1) - findPositionOf(colName2);
}

private int findPositionOf(String colName1) {
return positionByColumnName.get(colName1);
}
}
82 changes: 39 additions & 43 deletions src/main/java/org/qstd/ColumnNamesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,64 +12,60 @@
*/
package org.qstd;

import net.sf.jsqlparser.expression.BinaryExpression;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
import net.sf.jsqlparser.schema.Column;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import net.sf.jsqlparser.expression.BinaryExpression;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
import net.sf.jsqlparser.schema.Column;

class ColumnNamesExtractor {

static final ColumnNamesExtractor INSTANCE = new ColumnNamesExtractor();

private ColumnNamesExtractor() {
}

private static class ColumnExpressionVisitor extends ExpressionVisitorAdapter {
static final ColumnNamesExtractor INSTANCE = new ColumnNamesExtractor();

private String visitedColumnName;
private ColumnNamesExtractor() {}

@Override
public void visit(Column column) {
this.visitedColumnName = column.getColumnName();
}
private static class ColumnExpressionVisitor extends ExpressionVisitorAdapter {

String getVisitedColumnName() {
return visitedColumnName;
}
private String visitedColumnName;

@Override
public void visit(Column column) {
this.visitedColumnName = column.getColumnName();
}

Set<String> findColumnNamesOf(Expression expression) {
Set<String> columnNames = new HashSet<>();
if (expression instanceof BinaryExpression) {
// AndExpression, OrExpression, LikeExpression, ...
BinaryExpression binaryExpression = (BinaryExpression) expression;
Collection<String> leftRightColumnNames = extractColumnNamesOf(binaryExpression);
columnNames.addAll(leftRightColumnNames);
} else if (expression != null) {
// Column names
ColumnExpressionVisitor columnExpressionVisitor = new ColumnExpressionVisitor();
expression.accept(columnExpressionVisitor);
String visitedColumnName = columnExpressionVisitor.getVisitedColumnName();
if(visitedColumnName != null) {
columnNames.add(visitedColumnName);
}
}
return columnNames;
String getVisitedColumnName() {
return visitedColumnName;
}
}

private Collection<String> extractColumnNamesOf(BinaryExpression binaryExpression) {
Collection<String> leftRightColumnNames = new ArrayList<>();
Collection<String> leftColumnNames = findColumnNamesOf(binaryExpression.getLeftExpression());
Collection<String> rightColumnNames = findColumnNamesOf(binaryExpression.getRightExpression());
leftRightColumnNames.addAll(leftColumnNames);
leftRightColumnNames.addAll(rightColumnNames);
return leftRightColumnNames;
Set<String> findColumnNamesOf(Expression expression) {
Set<String> columnNames = new HashSet<>();
if (expression instanceof BinaryExpression) {
// AndExpression, OrExpression, LikeExpression, ...
BinaryExpression binaryExpression = (BinaryExpression) expression;
Collection<String> leftRightColumnNames = extractColumnNamesOf(binaryExpression);
columnNames.addAll(leftRightColumnNames);
} else if (expression != null) {
// Column names
ColumnExpressionVisitor columnExpressionVisitor = new ColumnExpressionVisitor();
expression.accept(columnExpressionVisitor);
String visitedColumnName = columnExpressionVisitor.getVisitedColumnName();
if (visitedColumnName != null) {
columnNames.add(visitedColumnName);
}
}
return columnNames;
}

private Collection<String> extractColumnNamesOf(BinaryExpression binaryExpression) {
Collection<String> leftRightColumnNames = new ArrayList<>();
Collection<String> leftColumnNames = findColumnNamesOf(binaryExpression.getLeftExpression());
Collection<String> rightColumnNames = findColumnNamesOf(binaryExpression.getRightExpression());
leftRightColumnNames.addAll(leftColumnNames);
leftRightColumnNames.addAll(rightColumnNames);
return leftRightColumnNames;
}
}
3 changes: 1 addition & 2 deletions src/main/java/org/qstd/ColumnOrdersFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@

public interface ColumnOrdersFinder {

List<String> findDatabaseColumnOrdersOf(String tableName);

List<String> findDatabaseColumnOrdersOf(String tableName);
}
Loading
Loading