Skip to content

Commit 8165e29

Browse files
authored
Addons/fixes for Fluent API (#1049)
* fix unittests for setter/wither methods with primitive arguments * add missing withAscDescPresent
1 parent 3f51651 commit 8165e29

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
public class OrderByElement {
1515

1616
public enum NullOrdering {
17-
1817
NULLS_FIRST,
1918
NULLS_LAST
2019
}
2120

2221
private Expression expression;
2322
private boolean asc = true;
23+
private boolean ascDescPresent = false;
2424
private NullOrdering nullOrdering;
25-
private boolean ascDesc = false;
2625

2726
public boolean isAsc() {
2827
return asc;
@@ -36,16 +35,16 @@ public void setNullOrdering(NullOrdering nullOrdering) {
3635
this.nullOrdering = nullOrdering;
3736
}
3837

39-
public void setAsc(boolean b) {
40-
asc = b;
38+
public void setAsc(boolean asc) {
39+
this.asc = asc;
4140
}
4241

43-
public void setAscDescPresent(boolean b) {
44-
ascDesc = b;
42+
public void setAscDescPresent(boolean ascDescPresent) {
43+
this.ascDescPresent = ascDescPresent;
4544
}
4645

4746
public boolean isAscDescPresent() {
48-
return ascDesc;
47+
return ascDescPresent;
4948
}
5049

5150
public void accept(OrderByVisitor orderByVisitor) {
@@ -67,7 +66,7 @@ public String toString() {
6766

6867
if (!asc) {
6968
b.append(" DESC");
70-
} else if (ascDesc) {
69+
} else if (ascDescPresent) {
7170
b.append(" ASC");
7271
}
7372

@@ -88,6 +87,11 @@ public OrderByElement withAsc(boolean asc) {
8887
return this;
8988
}
9089

90+
public OrderByElement withAscDescPresent(boolean ascDescPresent) {
91+
this.setAscDescPresent(ascDescPresent);
92+
return this;
93+
}
94+
9195
public OrderByElement withNullOrdering(NullOrdering nullOrdering) {
9296
this.setNullOrdering(nullOrdering);
9397
return this;

src/test/java/net/sf/jsqlparser/util/RandomUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,11 @@ public static <T> T getRandomValueForType(Class<T> type) {
140140
}
141141
}
142142
}
143-
return type.cast(value);
143+
// do not use type.cast (does not support primitive types and
144+
// autoboxing/unboxing
145+
@SuppressWarnings("unchecked")
146+
T t = (T) value;
147+
return t;
144148
}
145149

146150
}

0 commit comments

Comments
 (0)