Skip to content

Commit 14e26ae

Browse files
Arshia MalkaniArshia Malkani
authored andcommitted
generics
1 parent f935c0d commit 14e26ae

42 files changed

Lines changed: 192 additions & 133 deletions

Some content is hidden

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

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

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

24+
import net.sf.jsqlparser.genericClass;
2425
import net.sf.jsqlparser.statement.select.SubSelect;
2526

2627
public class AllComparisonExpression implements Expression {
@@ -57,16 +58,16 @@ public String getExpressionType() {
5758
return expressionType;
5859
}
5960

60-
public Object logicalType;
61+
public genericClass logicalType = new genericClass();
6162

6263
@Override
6364
public void setLogicalType(Object inputLogicalType) {
64-
logicalType = inputLogicalType;
65+
logicalType.setLogicalType(inputLogicalType);
6566
}
6667

6768
@Override
6869
public Object getLogicalType() {
69-
return expressionType;
70+
return logicalType.getLogicalType();
7071
}
7172

7273
}

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

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

24+
import net.sf.jsqlparser.genericClass;
2425
import net.sf.jsqlparser.statement.select.OrderByElement;
2526

2627
import java.util.List;
@@ -192,16 +193,16 @@ public String getExpressionType() {
192193
return expressionType;
193194
}
194195

195-
public Object logicalType;
196+
public genericClass logicalType = new genericClass();
196197

197198
@Override
198199
public void setLogicalType(Object inputLogicalType) {
199-
logicalType = inputLogicalType;
200+
logicalType.setLogicalType(inputLogicalType);
200201
}
201202

202203
@Override
203204
public Object getLogicalType() {
204-
return expressionType;
205+
return logicalType.getLogicalType();
205206
}
206207

207208

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

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

24+
import net.sf.jsqlparser.genericClass;
2425
import net.sf.jsqlparser.statement.select.SubSelect;
2526

2627
/**
@@ -68,16 +69,16 @@ public String getExpressionType() {
6869
return expressionType;
6970
}
7071

71-
public Object logicalType;
72+
public genericClass logicalType = new genericClass();
7273

7374
@Override
7475
public void setLogicalType(Object inputLogicalType) {
75-
logicalType = inputLogicalType;
76+
logicalType.setLogicalType(inputLogicalType);
7677
}
7778

7879
@Override
7980
public Object getLogicalType() {
80-
return expressionType;
81+
return logicalType.getLogicalType();
8182
}
8283

8384

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

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

24+
import net.sf.jsqlparser.genericClass;
25+
2426
/**
2527
* A basic class for binary expressions, that is expressions having a left member and a right member
2628
* which are in turn expressions.
@@ -81,16 +83,16 @@ public String getExpressionType() {
8183
return expressionType;
8284
}
8385

84-
public Object logicalType;
86+
public genericClass logicalType = new genericClass();
8587

8688
@Override
8789
public void setLogicalType(Object inputLogicalType) {
88-
logicalType = inputLogicalType;
90+
logicalType.setLogicalType(inputLogicalType);
8991
}
9092

9193
@Override
9294
public Object getLogicalType() {
93-
return expressionType;
95+
return logicalType.getLogicalType();
9496
}
9597

9698

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.util.List;
2525

26+
import net.sf.jsqlparser.genericClass;
2627
import net.sf.jsqlparser.statement.select.PlainSelect;
2728

2829
/**
@@ -128,16 +129,16 @@ public String getExpressionType() {
128129
return expressionType;
129130
}
130131

131-
public Object logicalType;
132+
public genericClass logicalType = new genericClass();
132133

133134
@Override
134135
public void setLogicalType(Object inputLogicalType) {
135-
logicalType = inputLogicalType;
136+
logicalType.setLogicalType(inputLogicalType);
136137
}
137138

138139
@Override
139140
public Object getLogicalType() {
140-
return expressionType;
141+
return logicalType.getLogicalType();
141142
}
142143

143144

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

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

24+
import net.sf.jsqlparser.genericClass;
2425
import net.sf.jsqlparser.statement.create.table.ColDataType;
2526

2627
/**
@@ -83,16 +84,16 @@ public String getExpressionType() {
8384
return expressionType;
8485
}
8586

86-
public Object logicalType;
87+
public genericClass logicalType = new genericClass();
8788

8889
@Override
8990
public void setLogicalType(Object inputLogicalType) {
90-
logicalType = inputLogicalType;
91+
logicalType.setLogicalType(inputLogicalType);
9192
}
9293

9394
@Override
9495
public Object getLogicalType() {
95-
return expressionType;
96+
return logicalType.getLogicalType();
9697
}
9798

9899

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
*/
4040
package net.sf.jsqlparser.expression;
4141

42+
import net.sf.jsqlparser.genericClass;
43+
4244
/**
4345
*
4446
* @author toben
@@ -90,16 +92,16 @@ public String getExpressionType() {
9092
return expressionType;
9193
}
9294

93-
public Object logicalType;
95+
public genericClass logicalType = new genericClass();
9496

9597
@Override
9698
public void setLogicalType(Object inputLogicalType) {
97-
logicalType = inputLogicalType;
99+
logicalType.setLogicalType(inputLogicalType);
98100
}
99101

100102
@Override
101103
public Object getLogicalType() {
102-
return expressionType;
104+
return logicalType.getLogicalType();
103105
}
104106

105107
}

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

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

24+
import net.sf.jsqlparser.genericClass;
25+
2426
import java.sql.Date;
2527

2628
/**
@@ -64,16 +66,16 @@ public String getExpressionType() {
6466
return expressionType;
6567
}
6668

67-
public Object logicalType;
69+
public genericClass logicalType = new genericClass();
6870

6971
@Override
7072
public void setLogicalType(Object inputLogicalType) {
71-
logicalType = inputLogicalType;
73+
logicalType.setLogicalType(inputLogicalType);
7274
}
7375

7476
@Override
7577
public Object getLogicalType() {
76-
return expressionType;
78+
return logicalType.getLogicalType();
7779
}
7880

7981

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

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

24+
import net.sf.jsqlparser.genericClass;
25+
2426
/**
2527
* Every number with a point or a exponential format is a DoubleValue
2628
*/
@@ -68,16 +70,16 @@ public String getExpressionType() {
6870
return expressionType;
6971
}
7072

71-
public Object logicalType;
73+
public genericClass logicalType = new genericClass();
7274

7375
@Override
7476
public void setLogicalType(Object inputLogicalType) {
75-
logicalType = inputLogicalType;
77+
logicalType.setLogicalType(inputLogicalType);
7678
}
7779

7880
@Override
7981
public Object getLogicalType() {
80-
return expressionType;
82+
return logicalType.getLogicalType();
8183
}
8284

8385
}

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

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

24+
import net.sf.jsqlparser.genericClass;
25+
2426
/**
2527
* Extract value from date/time expression. The name stores the part - name to get from the
2628
* following date/time expression.
@@ -70,16 +72,16 @@ public String getExpressionType() {
7072
return expressionType;
7173
}
7274

73-
public Object logicalType;
75+
public genericClass logicalType = new genericClass();
7476

7577
@Override
7678
public void setLogicalType(Object inputLogicalType) {
77-
logicalType = inputLogicalType;
79+
logicalType.setLogicalType(inputLogicalType);
7880
}
7981

8082
@Override
8183
public Object getLogicalType() {
82-
return expressionType;
84+
return logicalType.getLogicalType();
8385
}
8486

8587
}

0 commit comments

Comments
 (0)