Skip to content

Commit b7564f2

Browse files
committed
Fix a generics type
1 parent c037073 commit b7564f2

File tree

1 file changed

+33
-33
lines changed
  • doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/expression

1 file changed

+33
-33
lines changed

doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/expression/KExpressions.kt

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -81,163 +81,163 @@ object KExpressions {
8181
return Expressions.literal(value)
8282
}
8383

84-
fun <PROPERTY> add(
84+
fun <PROPERTY : Any> add(
8585
left: PropertyMetamodel<PROPERTY>,
8686
right: PROPERTY,
8787
): Add<PROPERTY> {
8888
return Expressions.add(left, right)
8989
}
9090

91-
fun <PROPERTY> add(
91+
fun <PROPERTY : Any> add(
9292
left: PROPERTY,
9393
right: PropertyMetamodel<PROPERTY>,
9494
): Add<PROPERTY> {
9595
return Expressions.add(left, right)
9696
}
9797

98-
fun <PROPERTY> add(
98+
fun <PROPERTY : Any> add(
9999
left: PropertyMetamodel<PROPERTY>,
100100
right: PropertyMetamodel<PROPERTY>,
101101
): Add<PROPERTY> {
102102
return Expressions.add(left, right)
103103
}
104104

105-
fun <PROPERTY> sub(
105+
fun <PROPERTY : Any> sub(
106106
left: PropertyMetamodel<PROPERTY>,
107107
right: PROPERTY,
108108
): Sub<PROPERTY> {
109109
return Expressions.sub(left, right)
110110
}
111111

112-
fun <PROPERTY> sub(
112+
fun <PROPERTY : Any> sub(
113113
left: PROPERTY,
114114
right: PropertyMetamodel<PROPERTY>,
115115
): Sub<PROPERTY> {
116116
return Expressions.sub(left, right)
117117
}
118118

119-
fun <PROPERTY> sub(
119+
fun <PROPERTY : Any> sub(
120120
left: PropertyMetamodel<PROPERTY>,
121121
right: PropertyMetamodel<PROPERTY>,
122122
): Sub<PROPERTY> {
123123
return Expressions.sub(left, right)
124124
}
125125

126-
fun <PROPERTY> mul(
126+
fun <PROPERTY : Any> mul(
127127
left: PropertyMetamodel<PROPERTY>,
128128
right: PROPERTY,
129129
): Mul<PROPERTY> {
130130
return Expressions.mul(left, right)
131131
}
132132

133-
fun <PROPERTY> mul(
133+
fun <PROPERTY : Any> mul(
134134
left: PROPERTY,
135135
right: PropertyMetamodel<PROPERTY>,
136136
): Mul<PROPERTY> {
137137
return Expressions.mul(left, right)
138138
}
139139

140-
fun <PROPERTY> mul(
140+
fun <PROPERTY : Any> mul(
141141
left: PropertyMetamodel<PROPERTY>,
142142
right: PropertyMetamodel<PROPERTY>,
143143
): Mul<PROPERTY> {
144144
return Expressions.mul(left, right)
145145
}
146146

147-
fun <PROPERTY> div(
147+
fun <PROPERTY : Any> div(
148148
left: PropertyMetamodel<PROPERTY>,
149149
right: PROPERTY,
150150
): ArithmeticExpression.Div<PROPERTY> {
151151
return Expressions.div(left, right)
152152
}
153153

154-
fun <PROPERTY> div(
154+
fun <PROPERTY : Any> div(
155155
left: PROPERTY,
156156
right: PropertyMetamodel<PROPERTY>,
157157
): ArithmeticExpression.Div<PROPERTY> {
158158
return Expressions.div(left, right)
159159
}
160160

161-
fun <PROPERTY> div(
161+
fun <PROPERTY : Any> div(
162162
left: PropertyMetamodel<PROPERTY>,
163163
right: PropertyMetamodel<PROPERTY>,
164164
): ArithmeticExpression.Div<PROPERTY> {
165165
return Expressions.div(left, right)
166166
}
167167

168-
fun <PROPERTY> mod(
168+
fun <PROPERTY : Any> mod(
169169
left: PropertyMetamodel<PROPERTY>,
170170
right: PROPERTY,
171171
): ArithmeticExpression.Mod<PROPERTY> {
172172
return Expressions.mod(left, right)
173173
}
174174

175-
fun <PROPERTY> mod(
175+
fun <PROPERTY : Any> mod(
176176
left: PROPERTY,
177177
right: PropertyMetamodel<PROPERTY>,
178178
): ArithmeticExpression.Mod<PROPERTY> {
179179
return Expressions.mod(left, right)
180180
}
181181

182-
fun <PROPERTY> mod(
182+
fun <PROPERTY : Any> mod(
183183
left: PropertyMetamodel<PROPERTY>,
184184
right: PropertyMetamodel<PROPERTY>,
185185
): ArithmeticExpression.Mod<PROPERTY> {
186186
return Expressions.mod(left, right)
187187
}
188188

189-
fun <PROPERTY> concat(
189+
fun <PROPERTY : Any> concat(
190190
left: PropertyMetamodel<PROPERTY>,
191191
right: PROPERTY,
192192
): Concat<PROPERTY> {
193193
return Expressions.concat(left, right)
194194
}
195195

196-
fun <PROPERTY> concat(
196+
fun <PROPERTY : Any> concat(
197197
left: PROPERTY,
198198
right: PropertyMetamodel<PROPERTY>,
199199
): Concat<PROPERTY> {
200200
return Expressions.concat(left, right)
201201
}
202202

203-
fun <PROPERTY> concat(
203+
fun <PROPERTY : Any> concat(
204204
left: PropertyMetamodel<PROPERTY>,
205205
right: PropertyMetamodel<PROPERTY>,
206206
): Concat<PROPERTY> {
207207
return Expressions.concat(left, right)
208208
}
209209

210-
fun <PROPERTY> lower(
210+
fun <PROPERTY : Any> lower(
211211
propertyMetamodel: PropertyMetamodel<PROPERTY>,
212212
): StringExpression.Lower<PROPERTY> {
213213
return Expressions.lower(propertyMetamodel)
214214
}
215215

216-
fun <PROPERTY> ltrim(
216+
fun <PROPERTY : Any> ltrim(
217217
propertyMetamodel: PropertyMetamodel<PROPERTY>,
218218
): Ltrim<PROPERTY> {
219219
return Expressions.ltrim(propertyMetamodel)
220220
}
221221

222-
fun <PROPERTY> rtrim(
222+
fun <PROPERTY : Any> rtrim(
223223
propertyMetamodel: PropertyMetamodel<PROPERTY>,
224224
): Rtrim<PROPERTY> {
225225
return Expressions.rtrim(propertyMetamodel)
226226
}
227227

228-
fun <PROPERTY> trim(
228+
fun <PROPERTY : Any> trim(
229229
propertyMetamodel: PropertyMetamodel<PROPERTY>,
230230
): Trim<PROPERTY> {
231231
return Expressions.trim(propertyMetamodel)
232232
}
233233

234-
fun <PROPERTY> upper(
234+
fun <PROPERTY : Any> upper(
235235
propertyMetamodel: PropertyMetamodel<PROPERTY>,
236236
): Upper<PROPERTY> {
237237
return Expressions.upper(propertyMetamodel)
238238
}
239239

240-
fun <PROPERTY> avg(
240+
fun <PROPERTY : Any> avg(
241241
propertyMetamodel: PropertyMetamodel<PROPERTY>,
242242
): Avg<PROPERTY> {
243243
return Expressions.avg(propertyMetamodel)
@@ -261,54 +261,54 @@ object KExpressions {
261261
return Expressions.countDistinct(propertyMetamodel)
262262
}
263263

264-
fun <PROPERTY> max(
264+
fun <PROPERTY : Any> max(
265265
propertyMetamodel: PropertyMetamodel<PROPERTY>,
266266
): Max<PROPERTY> {
267267
return Expressions.max(propertyMetamodel)
268268
}
269269

270-
fun <PROPERTY> min(
270+
fun <PROPERTY : Any> min(
271271
propertyMetamodel: PropertyMetamodel<PROPERTY>,
272272
): Min<PROPERTY> {
273273
return Expressions.min(propertyMetamodel)
274274
}
275275

276-
fun <PROPERTY> sum(
276+
fun <PROPERTY : Any> sum(
277277
propertyMetamodel: PropertyMetamodel<PROPERTY>,
278278
): Sum<PROPERTY> {
279279
return Expressions.sum(propertyMetamodel)
280280
}
281281

282-
fun <PROPERTY> case(
282+
fun <PROPERTY : Any> case(
283283
block: CaseExpression<PROPERTY>.Declaration.() -> Unit,
284284
otherwise: PropertyMetamodel<PROPERTY>,
285285
): CaseExpression<PROPERTY> {
286286
return Expressions.`when`(block, otherwise)
287287
}
288288

289-
fun <PROPERTY> select(
289+
fun <PROPERTY : Any> select(
290290
block: KSelectExpression.Declaration.() -> SubSelectContext.Single<PROPERTY>,
291291
): SelectExpression<PROPERTY> {
292292
return Expressions.select { block(KSelectExpression.Declaration()) }
293293
}
294294

295-
inline fun <reified PROPERTY> userDefined(
295+
inline fun <reified PROPERTY : Any> userDefined(
296296
name: String,
297297
operands: List<PropertyMetamodel<*>>,
298298
noinline block: UserDefinedExpression.Declaration.() -> Unit,
299299
): UserDefinedExpression<PROPERTY> {
300300
return Expressions.userDefined(PROPERTY::class.java, name, operands, block)
301301
}
302302

303-
inline fun <reified PROPERTY> userDefined(
303+
inline fun <reified PROPERTY : Any> userDefined(
304304
name: String,
305305
vararg operands: PropertyMetamodel<*>,
306306
noinline block: UserDefinedExpression.Declaration.() -> Unit,
307307
): UserDefinedExpression<PROPERTY> {
308308
return Expressions.userDefined(PROPERTY::class.java, name, operands.toList(), block)
309309
}
310310

311-
fun <PROPERTY> userDefined(
311+
fun <PROPERTY : Any> userDefined(
312312
resultPropertyMetamodel: PropertyMetamodel<PROPERTY>,
313313
name: String,
314314
operands: List<PropertyMetamodel<*>>,
@@ -317,7 +317,7 @@ object KExpressions {
317317
return Expressions.userDefined(resultPropertyMetamodel, name, operands, block)
318318
}
319319

320-
fun <PROPERTY> userDefined(
320+
fun <PROPERTY : Any> userDefined(
321321
resultPropertyMetamodel: PropertyMetamodel<PROPERTY>,
322322
name: String,
323323
vararg operands: PropertyMetamodel<*>,

0 commit comments

Comments
 (0)