Skip to content

Commit fed74ae

Browse files
author
Florent Bécart
committed
Code reformat
1 parent b9ce35c commit fed74ae

File tree

99 files changed

+1224
-1172
lines changed

Some content is hidden

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

99 files changed

+1224
-1172
lines changed

src/net/sf/jsqlparser/JSQLParserException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
package net.sf.jsqlparser;
2424

25-
2625
/**
2726
* An exception class with stack trace informations
2827
*/
@@ -45,7 +44,7 @@ public JSQLParserException(String arg0, Throwable arg1) {
4544
super(arg0);
4645
this.cause = arg1;
4746
}
48-
47+
4948
public Throwable getCause() {
5049
return cause;
5150
}

src/net/sf/jsqlparser/expression/AllComparisonExpression.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
public class AllComparisonExpression implements Expression {
66
private SubSelect subSelect;
7-
7+
88
public AllComparisonExpression(SubSelect subSelect) {
99
this.subSelect = subSelect;
1010
}
11-
11+
1212
public SubSelect GetSubSelect() {
1313
return subSelect;
1414
}
15-
15+
1616
public void accept(ExpressionVisitor expressionVisitor) {
1717
expressionVisitor.visit(this);
1818
}

src/net/sf/jsqlparser/expression/AnyComparisonExpression.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
public class AnyComparisonExpression implements Expression {
66
private SubSelect subSelect;
7-
7+
88
public AnyComparisonExpression(SubSelect subSelect) {
99
this.subSelect = subSelect;
1010
}
11-
11+
1212
public SubSelect GetSubSelect() {
1313
return subSelect;
1414
}

src/net/sf/jsqlparser/expression/BinaryExpression.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222

2323
package net.sf.jsqlparser.expression;
2424

25-
2625
/**
27-
* A basic class for binary expressions, that is expressions having a left member and a right member
28-
* which are in turn expressions.
26+
* A basic class for binary expressions, that is expressions having a left member and a right member which are in turn
27+
* expressions.
2928
*/
3029
public abstract class BinaryExpression implements Expression {
3130
private Expression leftExpression;
@@ -34,7 +33,6 @@ public abstract class BinaryExpression implements Expression {
3433

3534
public BinaryExpression() {
3635
}
37-
3836

3937
public Expression getLeftExpression() {
4038
return leftExpression;
@@ -61,9 +59,9 @@ public boolean isNot() {
6159
}
6260

6361
public String toString() {
64-
return (not? "NOT ":"") + getLeftExpression()+" "+getStringExpression()+" "+getRightExpression();
62+
return (not ? "NOT " : "") + getLeftExpression() + " " + getStringExpression() + " " + getRightExpression();
6563
}
6664

6765
public abstract String getStringExpression();
68-
66+
6967
}

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

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
/**
3030
* CASE/WHEN expression.
3131
*
32-
* Syntax:
33-
* <code><pre>
32+
* Syntax: <code><pre>
3433
* CASE
3534
* WHEN condition THEN expression
3635
* [WHEN condition THEN expression]...
@@ -49,72 +48,79 @@
4948
* [ELSE expression]
5049
* END
5150
* </pre></code>
52-
*
53-
* See also:
54-
* https://aurora.vcu.edu/db2help/db2s0/frame3.htm#casexp
55-
* http://sybooks.sybase.com/onlinebooks/group-as/asg1251e/commands/@ebt-link;pt=5954?target=%25N%15_52628_START_RESTART_N%25
56-
*
57-
*
51+
*
52+
* See also: https://aurora.vcu.edu/db2help/db2s0/frame3.htm#casexp
53+
* http://sybooks.sybase.com/onlinebooks/group-as/asg1251e
54+
* /commands/@ebt-link;pt=5954?target=%25N%15_52628_START_RESTART_N%25
55+
*
56+
*
5857
* @author Havard Rast Blok
5958
*/
6059
public class CaseExpression implements Expression {
6160

6261
private Expression switchExpression;
63-
62+
6463
private List whenClauses;
65-
64+
6665
private Expression elseExpression;
67-
68-
/* (non-Javadoc)
66+
67+
/*
68+
* (non-Javadoc)
69+
*
6970
* @see net.sf.jsqlparser.expression.Expression#accept(net.sf.jsqlparser.expression.ExpressionVisitor)
7071
*/
7172
public void accept(ExpressionVisitor expressionVisitor) {
7273
expressionVisitor.visit(this);
7374
}
74-
75+
7576
/**
7677
* @return Returns the switchExpression.
7778
*/
7879
public Expression getSwitchExpression() {
7980
return switchExpression;
8081
}
82+
8183
/**
82-
* @param switchExpression The switchExpression to set.
84+
* @param switchExpression
85+
* The switchExpression to set.
8386
*/
8487
public void setSwitchExpression(Expression switchExpression) {
8588
this.switchExpression = switchExpression;
8689
}
87-
90+
8891
/**
8992
* @return Returns the elseExpression.
9093
*/
9194
public Expression getElseExpression() {
9295
return elseExpression;
9396
}
97+
9498
/**
95-
* @param elseExpression The elseExpression to set.
99+
* @param elseExpression
100+
* The elseExpression to set.
96101
*/
97102
public void setElseExpression(Expression elseExpression) {
98103
this.elseExpression = elseExpression;
99104
}
105+
100106
/**
101107
* @return Returns the whenClauses.
102108
*/
103109
public List getWhenClauses() {
104110
return whenClauses;
105111
}
106-
112+
107113
/**
108-
* @param whenClauses The whenClauses to set.
114+
* @param whenClauses
115+
* The whenClauses to set.
109116
*/
110117
public void setWhenClauses(List whenClauses) {
111118
this.whenClauses = whenClauses;
112119
}
113-
120+
114121
public String toString() {
115-
return "CASE "+((switchExpression!=null)?switchExpression+" ":"")+
116-
PlainSelect.getStringList(whenClauses,false, false)+" "+
117-
((elseExpression!=null)?"ELSE "+elseExpression+" ":"")+
118-
"END";
122+
return "CASE " + ((switchExpression != null) ? switchExpression + " " : "")
123+
+ PlainSelect.getStringList(whenClauses, false, false) + " "
124+
+ ((elseExpression != null) ? "ELSE " + elseExpression + " " : "") + "END";
119125
}
120126
}

src/net/sf/jsqlparser/expression/DateValue.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,20 @@
2424
import java.sql.Date;
2525
import java.text.SimpleDateFormat;
2626

27-
2827
/**
2928
* A Date in the form {d 'yyyy-mm-dd'}
3029
*/
3130
public class DateValue implements Expression {
3231
private Date value;
3332

3433
public DateValue(String value) {
35-
this.value = Date.valueOf(value.substring(1, value.length()-1));
34+
this.value = Date.valueOf(value.substring(1, value.length() - 1));
3635
}
37-
36+
3837
public void accept(ExpressionVisitor expressionVisitor) {
3938
expressionVisitor.visit(this);
4039
}
4140

42-
4341
public Date getValue() {
4442
return value;
4543
}
@@ -48,5 +46,4 @@ public void setValue(Date d) {
4846
value = d;
4947
}
5048

51-
5249
}

src/net/sf/jsqlparser/expression/DoubleValue.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
*/
2222
package net.sf.jsqlparser.expression;
2323

24-
2524
/**
2625
* Every number with a point or a exponential format is a DoubleValue
2726
*/
@@ -30,18 +29,17 @@ public class DoubleValue implements Expression {
3029
private String stringValue;
3130

3231
public DoubleValue(String value) {
33-
if (value.charAt(0) == '+') {
34-
value = value.substring(1);
35-
}
32+
if (value.charAt(0) == '+') {
33+
value = value.substring(1);
34+
}
3635
this.value = Double.parseDouble(value);
3736
this.stringValue = value;
3837
}
39-
38+
4039
public void accept(ExpressionVisitor expressionVisitor) {
4140
expressionVisitor.visit(this);
4241
}
4342

44-
4543
public double getValue() {
4644
return value;
4745
}

src/net/sf/jsqlparser/expression/Expression.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
* library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
2020
* Boston, MA 02111-1307, USA.
2121
*/
22-
23-
package net.sf.jsqlparser.expression;
2422

23+
package net.sf.jsqlparser.expression;
2524

2625
public interface Expression {
2726
public void accept(ExpressionVisitor expressionVisitor);

src/net/sf/jsqlparser/expression/ExpressionVisitor.java

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
2020
* Boston, MA 02111-1307, USA.
2121
*/
22-
23-
package net.sf.jsqlparser.expression;
22+
23+
package net.sf.jsqlparser.expression;
2424

2525
import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
2626
import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
@@ -49,44 +49,81 @@
4949

5050
public interface ExpressionVisitor {
5151
public void visit(NullValue nullValue);
52+
5253
public void visit(Function function);
54+
5355
public void visit(InverseExpression inverseExpression);
56+
5457
public void visit(JdbcParameter jdbcParameter);
58+
5559
public void visit(DoubleValue doubleValue);
60+
5661
public void visit(LongValue longValue);
62+
5763
public void visit(DateValue dateValue);
64+
5865
public void visit(TimeValue timeValue);
66+
5967
public void visit(TimestampValue timestampValue);
68+
6069
public void visit(Parenthesis parenthesis);
70+
6171
public void visit(StringValue stringValue);
72+
6273
public void visit(Addition addition);
74+
6375
public void visit(Division division);
76+
6477
public void visit(Multiplication multiplication);
78+
6579
public void visit(Subtraction subtraction);
80+
6681
public void visit(AndExpression andExpression);
82+
6783
public void visit(OrExpression orExpression);
84+
6885
public void visit(Between between);
86+
6987
public void visit(EqualsTo equalsTo);
88+
7089
public void visit(GreaterThan greaterThan);
90+
7191
public void visit(GreaterThanEquals greaterThanEquals);
92+
7293
public void visit(InExpression inExpression);
94+
7395
public void visit(IsNullExpression isNullExpression);
96+
7497
public void visit(LikeExpression likeExpression);
98+
7599
public void visit(MinorThan minorThan);
100+
76101
public void visit(MinorThanEquals minorThanEquals);
102+
77103
public void visit(NotEqualsTo notEqualsTo);
104+
78105
public void visit(Column tableColumn);
106+
79107
public void visit(SubSelect subSelect);
108+
80109
public void visit(CaseExpression caseExpression);
110+
81111
public void visit(WhenClause whenClause);
112+
82113
public void visit(ExistsExpression existsExpression);
114+
83115
public void visit(AllComparisonExpression allComparisonExpression);
116+
84117
public void visit(AnyComparisonExpression anyComparisonExpression);
118+
85119
public void visit(Concat concat);
120+
86121
public void visit(Matches matches);
122+
87123
public void visit(BitwiseAnd bitwiseAnd);
124+
88125
public void visit(BitwiseOr bitwiseOr);
89-
public void visit(BitwiseXor bitwiseXor);
90126

127+
public void visit(BitwiseXor bitwiseXor);
91128

92129
}

0 commit comments

Comments
 (0)