Skip to content

Commit 612560a

Browse files
jeanbisuttijeanbisutti
authored
Add spotless
1 parent f04055f commit 612560a

73 files changed

Lines changed: 5723 additions & 5890 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,38 @@
297297
</issueManagement>
298298

299299
<profiles>
300+
<profile>
301+
<id>spotless</id>
302+
<activation>
303+
<!-- google-java-format 1.25.2 requires JVM 17+ to run
304+
but formats Java 8 source code correctly -->
305+
<jdk>17</jdk>
306+
</activation>
307+
<build>
308+
<plugins>
309+
<plugin>
310+
<groupId>com.diffplug.spotless</groupId>
311+
<artifactId>spotless-maven-plugin</artifactId>
312+
<version>2.44.3</version>
313+
<configuration>
314+
<java>
315+
<googleJavaFormat>
316+
<version>1.25.2</version>
317+
</googleJavaFormat>
318+
</java>
319+
</configuration>
320+
<executions>
321+
<execution>
322+
<goals>
323+
<goal>check</goal>
324+
</goals>
325+
<phase>verify</phase>
326+
</execution>
327+
</executions>
328+
</plugin>
329+
</plugins>
330+
</build>
331+
</profile>
300332
<profile>
301333
<id>release</id>
302334
<build>

‎src/main/java/org/qstd/ColumnMappingPart.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,17 @@
1414

1515
public class ColumnMappingPart {
1616

17-
final String tableName;
18-
final String tableColumn;
19-
private final String tableSchema;
17+
final String tableName;
18+
final String tableColumn;
19+
private final String tableSchema;
2020

21-
public ColumnMappingPart(String tableSchema, String tableName, String tableColumn) {
22-
this.tableSchema = tableSchema;
23-
this.tableName = tableName;
24-
this.tableColumn = tableColumn;
25-
}
26-
27-
boolean hasColumn(String columnName) {
28-
return tableColumn.equals(columnName);
29-
}
21+
public ColumnMappingPart(String tableSchema, String tableName, String tableColumn) {
22+
this.tableSchema = tableSchema;
23+
this.tableName = tableName;
24+
this.tableColumn = tableColumn;
25+
}
3026

27+
boolean hasColumn(String columnName) {
28+
return tableColumn.equals(columnName);
29+
}
3130
}

‎src/main/java/org/qstd/ColumnNamesComparator.java‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,31 @@
1919

2020
class ColumnNamesComparator implements Comparator<String> {
2121

22-
private final Map<String, Integer> positionByColumnName;
22+
private final Map<String, Integer> positionByColumnName;
2323

24-
private ColumnNamesComparator(Map<String, Integer> positionByColumnName) {
25-
this.positionByColumnName = positionByColumnName;
26-
}
24+
private ColumnNamesComparator(Map<String, Integer> positionByColumnName) {
25+
this.positionByColumnName = positionByColumnName;
26+
}
2727

28-
public static ColumnNamesComparator from(List<String> orderedColumns) {
29-
Map<String, Integer> positionByColumnName = buildIndexByColumnName(orderedColumns);
30-
return new ColumnNamesComparator(positionByColumnName);
31-
}
28+
public static ColumnNamesComparator from(List<String> orderedColumns) {
29+
Map<String, Integer> positionByColumnName = buildIndexByColumnName(orderedColumns);
30+
return new ColumnNamesComparator(positionByColumnName);
31+
}
3232

33-
private static Map<String, Integer> buildIndexByColumnName(List<String> orderedColumns) {
34-
final Map<String, Integer> positionByColumnName = new HashMap<>();
35-
for (int i = 0; i < orderedColumns.size(); i++) {
36-
positionByColumnName.put(orderedColumns.get(i), i + 1);
37-
}
38-
return positionByColumnName;
33+
private static Map<String, Integer> buildIndexByColumnName(List<String> orderedColumns) {
34+
final Map<String, Integer> positionByColumnName = new HashMap<>();
35+
for (int i = 0; i < orderedColumns.size(); i++) {
36+
positionByColumnName.put(orderedColumns.get(i), i + 1);
3937
}
38+
return positionByColumnName;
39+
}
4040

41-
@Override
42-
public int compare(String colName1, String colName2) {
43-
return findPositionOf(colName1) - findPositionOf(colName2);
44-
}
45-
46-
private int findPositionOf(String colName1) {
47-
return positionByColumnName.get(colName1);
48-
}
41+
@Override
42+
public int compare(String colName1, String colName2) {
43+
return findPositionOf(colName1) - findPositionOf(colName2);
44+
}
4945

46+
private int findPositionOf(String colName1) {
47+
return positionByColumnName.get(colName1);
48+
}
5049
}

‎src/main/java/org/qstd/ColumnNamesExtractor.java‎

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,64 +12,60 @@
1212
*/
1313
package org.qstd;
1414

15-
import net.sf.jsqlparser.expression.BinaryExpression;
16-
import net.sf.jsqlparser.expression.Expression;
17-
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
18-
import net.sf.jsqlparser.schema.Column;
19-
2015
import java.util.ArrayList;
2116
import java.util.Collection;
2217
import java.util.HashSet;
2318
import java.util.Set;
19+
import net.sf.jsqlparser.expression.BinaryExpression;
20+
import net.sf.jsqlparser.expression.Expression;
21+
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
22+
import net.sf.jsqlparser.schema.Column;
2423

2524
class ColumnNamesExtractor {
2625

27-
static final ColumnNamesExtractor INSTANCE = new ColumnNamesExtractor();
28-
29-
private ColumnNamesExtractor() {
30-
}
31-
32-
private static class ColumnExpressionVisitor extends ExpressionVisitorAdapter {
26+
static final ColumnNamesExtractor INSTANCE = new ColumnNamesExtractor();
3327

34-
private String visitedColumnName;
28+
private ColumnNamesExtractor() {}
3529

36-
@Override
37-
public void visit(Column column) {
38-
this.visitedColumnName = column.getColumnName();
39-
}
30+
private static class ColumnExpressionVisitor extends ExpressionVisitorAdapter {
4031

41-
String getVisitedColumnName() {
42-
return visitedColumnName;
43-
}
32+
private String visitedColumnName;
4433

34+
@Override
35+
public void visit(Column column) {
36+
this.visitedColumnName = column.getColumnName();
4537
}
4638

47-
Set<String> findColumnNamesOf(Expression expression) {
48-
Set<String> columnNames = new HashSet<>();
49-
if (expression instanceof BinaryExpression) {
50-
// AndExpression, OrExpression, LikeExpression, ...
51-
BinaryExpression binaryExpression = (BinaryExpression) expression;
52-
Collection<String> leftRightColumnNames = extractColumnNamesOf(binaryExpression);
53-
columnNames.addAll(leftRightColumnNames);
54-
} else if (expression != null) {
55-
// Column names
56-
ColumnExpressionVisitor columnExpressionVisitor = new ColumnExpressionVisitor();
57-
expression.accept(columnExpressionVisitor);
58-
String visitedColumnName = columnExpressionVisitor.getVisitedColumnName();
59-
if(visitedColumnName != null) {
60-
columnNames.add(visitedColumnName);
61-
}
62-
}
63-
return columnNames;
39+
String getVisitedColumnName() {
40+
return visitedColumnName;
6441
}
42+
}
6543

66-
private Collection<String> extractColumnNamesOf(BinaryExpression binaryExpression) {
67-
Collection<String> leftRightColumnNames = new ArrayList<>();
68-
Collection<String> leftColumnNames = findColumnNamesOf(binaryExpression.getLeftExpression());
69-
Collection<String> rightColumnNames = findColumnNamesOf(binaryExpression.getRightExpression());
70-
leftRightColumnNames.addAll(leftColumnNames);
71-
leftRightColumnNames.addAll(rightColumnNames);
72-
return leftRightColumnNames;
44+
Set<String> findColumnNamesOf(Expression expression) {
45+
Set<String> columnNames = new HashSet<>();
46+
if (expression instanceof BinaryExpression) {
47+
// AndExpression, OrExpression, LikeExpression, ...
48+
BinaryExpression binaryExpression = (BinaryExpression) expression;
49+
Collection<String> leftRightColumnNames = extractColumnNamesOf(binaryExpression);
50+
columnNames.addAll(leftRightColumnNames);
51+
} else if (expression != null) {
52+
// Column names
53+
ColumnExpressionVisitor columnExpressionVisitor = new ColumnExpressionVisitor();
54+
expression.accept(columnExpressionVisitor);
55+
String visitedColumnName = columnExpressionVisitor.getVisitedColumnName();
56+
if (visitedColumnName != null) {
57+
columnNames.add(visitedColumnName);
58+
}
7359
}
60+
return columnNames;
61+
}
7462

63+
private Collection<String> extractColumnNamesOf(BinaryExpression binaryExpression) {
64+
Collection<String> leftRightColumnNames = new ArrayList<>();
65+
Collection<String> leftColumnNames = findColumnNamesOf(binaryExpression.getLeftExpression());
66+
Collection<String> rightColumnNames = findColumnNamesOf(binaryExpression.getRightExpression());
67+
leftRightColumnNames.addAll(leftColumnNames);
68+
leftRightColumnNames.addAll(rightColumnNames);
69+
return leftRightColumnNames;
70+
}
7571
}

‎src/main/java/org/qstd/ColumnOrdersFinder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616

1717
public interface ColumnOrdersFinder {
1818

19-
List<String> findDatabaseColumnOrdersOf(String tableName);
20-
19+
List<String> findDatabaseColumnOrdersOf(String tableName);
2120
}

0 commit comments

Comments
 (0)