Skip to content

Commit 695e018

Browse files
nakamura-tonakamura-to
authored
Merge pull request #1147 from momosetkn/feat/improving_generics_doma-kotlin
Improving generics type in doma-kotlin
2 parents 81ef21a + 1020031 commit 695e018

File tree

8 files changed

+66
-66
lines changed

8 files changed

+66
-66
lines changed

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KComparisonDeclaration.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,67 @@ import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel
44

55
abstract class KComparisonDeclaration<DECLARATION : org.seasar.doma.jdbc.criteria.declaration.ComparisonDeclaration>(protected val declaration: DECLARATION) {
66

7-
fun <PROPERTY> eq(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
7+
fun <PROPERTY : Any> eq(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
88
declaration.eq(left, right)
99
}
1010

11-
fun <PROPERTY> eq(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
11+
fun <PROPERTY : Any> eq(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
1212
declaration.eq(left, right)
1313
}
1414

15-
fun <PROPERTY> ne(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
15+
fun <PROPERTY : Any> ne(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
1616
declaration.ne(left, right)
1717
}
1818

19-
fun <PROPERTY> ne(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
19+
fun <PROPERTY : Any> ne(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
2020
declaration.ne(left, right)
2121
}
2222

23-
fun <PROPERTY> gt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
23+
fun <PROPERTY : Any> gt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
2424
declaration.gt(left, right)
2525
}
2626

27-
fun <PROPERTY> gt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
27+
fun <PROPERTY : Any> gt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
2828
declaration.gt(left, right)
2929
}
3030

31-
fun <PROPERTY> ge(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
31+
fun <PROPERTY : Any> ge(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
3232
declaration.ge(left, right)
3333
}
3434

35-
fun <PROPERTY> ge(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
35+
fun <PROPERTY : Any> ge(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
3636
declaration.ge(left, right)
3737
}
3838

39-
fun <PROPERTY> lt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
39+
fun <PROPERTY : Any> lt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
4040
declaration.lt(left, right)
4141
}
4242

43-
fun <PROPERTY> lt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
43+
fun <PROPERTY : Any> lt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
4444
declaration.lt(left, right)
4545
}
4646

47-
fun <PROPERTY> le(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
47+
fun <PROPERTY : Any> le(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
4848
declaration.le(left, right)
4949
}
5050

51-
fun <PROPERTY> le(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
51+
fun <PROPERTY : Any> le(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
5252
declaration.le(left, right)
5353
}
5454

55-
fun <PROPERTY> isNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
55+
fun <PROPERTY : Any> isNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
5656
declaration.isNull(propertyMetamodel)
5757
}
5858

59-
fun <PROPERTY> isNotNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
59+
fun <PROPERTY : Any> isNotNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
6060
declaration.isNotNull(propertyMetamodel)
6161
}
6262

63-
fun <PROPERTY> eqOrIsNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
63+
fun <PROPERTY : Any> eqOrIsNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
6464
declaration.eqOrIsNull(left, right)
6565
}
6666

67-
fun <PROPERTY> neOrIsNotNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
67+
fun <PROPERTY : Any> neOrIsNotNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
6868
declaration.neOrIsNotNull(left, right)
6969
}
7070

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KInsertSelectDeclaration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel
55

66
class KInsertSelectDeclaration {
77

8-
fun <ENTITY> from(entityMetamodel: EntityMetamodel<ENTITY>): KSubSelectFromDeclaration<ENTITY> {
8+
fun <ENTITY : Any> from(entityMetamodel: EntityMetamodel<ENTITY>): KSubSelectFromDeclaration<ENTITY> {
99
val declaration = SubSelectFromDeclaration<ENTITY>(entityMetamodel)
1010
return KSubSelectFromDeclaration(declaration)
1111
}

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KJoinDeclaration.kt‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,162 +10,162 @@ import org.seasar.doma.jdbc.criteria.tuple.Tuple2
1010
import org.seasar.doma.jdbc.criteria.tuple.Tuple3
1111

1212
class KJoinDeclaration(private val declaration: JoinDeclaration) {
13-
fun <PROPERTY> eq(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
13+
fun <PROPERTY : Any> eq(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
1414
declaration.eq(left, right)
1515
}
1616

17-
fun <PROPERTY> eq(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
17+
fun <PROPERTY : Any> eq(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
1818
declaration.eq(left, right)
1919
}
2020

21-
fun <PROPERTY> ne(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
21+
fun <PROPERTY : Any> ne(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
2222
declaration.ne(left, right)
2323
}
2424

25-
fun <PROPERTY> ne(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
25+
fun <PROPERTY : Any> ne(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
2626
declaration.ne(left, right)
2727
}
2828

29-
fun <PROPERTY> gt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
29+
fun <PROPERTY : Any> gt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
3030
declaration.gt(left, right)
3131
}
3232

33-
fun <PROPERTY> gt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
33+
fun <PROPERTY : Any> gt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
3434
declaration.gt(left, right)
3535
}
3636

37-
fun <PROPERTY> ge(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
37+
fun <PROPERTY : Any> ge(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
3838
declaration.ge(left, right)
3939
}
4040

41-
fun <PROPERTY> ge(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
41+
fun <PROPERTY : Any> ge(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
4242
declaration.ge(left, right)
4343
}
4444

45-
fun <PROPERTY> lt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
45+
fun <PROPERTY : Any> lt(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
4646
declaration.lt(left, right)
4747
}
4848

49-
fun <PROPERTY> lt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
49+
fun <PROPERTY : Any> lt(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
5050
declaration.lt(left, right)
5151
}
5252

53-
fun <PROPERTY> le(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
53+
fun <PROPERTY : Any> le(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
5454
declaration.le(left, right)
5555
}
5656

57-
fun <PROPERTY> le(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
57+
fun <PROPERTY : Any> le(left: PropertyMetamodel<PROPERTY>, right: PropertyMetamodel<PROPERTY>) {
5858
declaration.le(left, right)
5959
}
6060

61-
fun <PROPERTY> isNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
61+
fun <PROPERTY : Any> isNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
6262
declaration.isNull(propertyMetamodel)
6363
}
6464

65-
fun <PROPERTY> isNotNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
65+
fun <PROPERTY : Any> isNotNull(propertyMetamodel: PropertyMetamodel<PROPERTY>) {
6666
declaration.isNotNull(propertyMetamodel)
6767
}
6868

69-
fun <PROPERTY> eqOrIsNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
69+
fun <PROPERTY : Any> eqOrIsNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
7070
declaration.eqOrIsNull(left, right)
7171
}
7272

73-
fun <PROPERTY> neOrIsNotNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
73+
fun <PROPERTY : Any> neOrIsNotNull(left: PropertyMetamodel<PROPERTY>, right: PROPERTY) {
7474
declaration.neOrIsNotNull(left, right)
7575
}
7676

77-
fun <PROPERTY> like(left: PropertyMetamodel<PROPERTY>, right: CharSequence) {
77+
fun <PROPERTY : Any> like(left: PropertyMetamodel<PROPERTY>, right: CharSequence) {
7878
declaration.like(left, right)
7979
}
8080

81-
fun <PROPERTY> like(left: PropertyMetamodel<PROPERTY>, right: CharSequence, option: LikeOption) {
81+
fun <PROPERTY : Any> like(left: PropertyMetamodel<PROPERTY>, right: CharSequence, option: LikeOption) {
8282
declaration.like(left, right, option)
8383
}
8484

85-
fun <PROPERTY> notLike(left: PropertyMetamodel<PROPERTY>, right: CharSequence) {
85+
fun <PROPERTY : Any> notLike(left: PropertyMetamodel<PROPERTY>, right: CharSequence) {
8686
declaration.notLike(left, right)
8787
}
8888

89-
fun <PROPERTY> notLike(left: PropertyMetamodel<PROPERTY>, right: CharSequence, option: LikeOption) {
89+
fun <PROPERTY : Any> notLike(left: PropertyMetamodel<PROPERTY>, right: CharSequence, option: LikeOption) {
9090
declaration.notLike(left, right, option)
9191
}
9292

93-
fun <PROPERTY> between(propertyMetamodel: PropertyMetamodel<PROPERTY>, start: PROPERTY, end: PROPERTY) {
93+
fun <PROPERTY : Any> between(propertyMetamodel: PropertyMetamodel<PROPERTY>, start: PROPERTY, end: PROPERTY) {
9494
declaration.between(propertyMetamodel, start, end)
9595
}
9696

97-
fun <PROPERTY> `in`(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>) {
97+
fun <PROPERTY : Any> `in`(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>) {
9898
declaration.`in`(left, right)
9999
}
100100

101-
fun <PROPERTY> notIn(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>) {
101+
fun <PROPERTY : Any> notIn(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>) {
102102
declaration.notIn(left, right)
103103
}
104104

105-
fun <PROPERTY> `in`(
105+
fun <PROPERTY : Any> `in`(
106106
left: PropertyMetamodel<PROPERTY>,
107107
right: SubSelectContext<PropertyMetamodel<PROPERTY>>,
108108
) {
109109
declaration.`in`(left, right)
110110
}
111111

112-
fun <PROPERTY> notIn(
112+
fun <PROPERTY : Any> notIn(
113113
left: PropertyMetamodel<PROPERTY>,
114114
right: SubSelectContext<PropertyMetamodel<PROPERTY>>,
115115
) {
116116
declaration.notIn(left, right)
117117
}
118118

119-
fun <PROPERTY1, PROPERTY2> `in`(
119+
fun <PROPERTY1 : Any, PROPERTY2 : Any> `in`(
120120
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
121121
right: List<Tuple2<PROPERTY1, PROPERTY2>>,
122122
) {
123123
declaration.`in`(left, right)
124124
}
125125

126-
fun <PROPERTY1, PROPERTY2> notIn(
126+
fun <PROPERTY1 : Any, PROPERTY2 : Any> notIn(
127127
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
128128
right: List<Tuple2<PROPERTY1, PROPERTY2>>,
129129
) {
130130
declaration.notIn(left, right)
131131
}
132132

133-
fun <PROPERTY1, PROPERTY2> `in`(
133+
fun <PROPERTY1 : Any, PROPERTY2 : Any> `in`(
134134
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
135135
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>,
136136
) {
137137
declaration.`in`(left, right)
138138
}
139139

140-
fun <PROPERTY1, PROPERTY2> notIn(
140+
fun <PROPERTY1 : Any, PROPERTY2 : Any> notIn(
141141
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
142142
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>,
143143
) {
144144
declaration.notIn(left, right)
145145
}
146146

147-
fun <PROPERTY1, PROPERTY2, PROPERTY3> `in`(
147+
fun <PROPERTY1 : Any, PROPERTY2 : Any, PROPERTY3 : Any> `in`(
148148
left: Tuple3<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>, PropertyMetamodel<PROPERTY3>>,
149149
right: List<Tuple3<PROPERTY1, PROPERTY2, PROPERTY3>>,
150150
) {
151151
declaration.`in`(left, right)
152152
}
153153

154-
fun <PROPERTY1, PROPERTY2, PROPERTY3> notIn(
154+
fun <PROPERTY1 : Any, PROPERTY2 : Any, PROPERTY3 : Any> notIn(
155155
left: Tuple3<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>, PropertyMetamodel<PROPERTY3>>,
156156
right: List<Tuple3<PROPERTY1, PROPERTY2, PROPERTY3>>,
157157
) {
158158
declaration.notIn(left, right)
159159
}
160160

161-
fun <PROPERTY1, PROPERTY2, PROPERTY3> `in`(
161+
fun <PROPERTY1 : Any, PROPERTY2 : Any, PROPERTY3 : Any> `in`(
162162
left: Tuple3<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>, PropertyMetamodel<PROPERTY3>>,
163163
right: SubSelectContext<Tuple3<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>, PropertyMetamodel<PROPERTY3>>>,
164164
) {
165165
declaration.`in`(left, right)
166166
}
167167

168-
fun <PROPERTY1, PROPERTY2, PROPERTY3> notIn(
168+
fun <PROPERTY1 : Any, PROPERTY2 : Any, PROPERTY3 : Any> notIn(
169169
left: Tuple3<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>, PropertyMetamodel<PROPERTY3>>,
170170
right: SubSelectContext<Tuple3<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>, PropertyMetamodel<PROPERTY3>>>,
171171
) {
@@ -184,7 +184,7 @@ class KJoinDeclaration(private val declaration: JoinDeclaration) {
184184
declaration.notExists(subSelectContext)
185185
}
186186

187-
fun <ENTITY> from(
187+
fun <ENTITY : Any> from(
188188
entityMetamodel: EntityMetamodel<ENTITY>,
189189
): SubSelectFromDeclaration<ENTITY> {
190190
return declaration.from(entityMetamodel)

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KSubSelectFromDeclaration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ class KSubSelectFromDeclaration<ENTITY>(private val declaration: SubSelectFromDe
6565
return declaration.select(entityMetamodel)
6666
}
6767

68-
fun <PROPERTY> select(propertyMetamodel: PropertyMetamodel<PROPERTY>): SubSelectContext.Single<PROPERTY> {
68+
fun <PROPERTY : Any> select(propertyMetamodel: PropertyMetamodel<PROPERTY>): SubSelectContext.Single<PROPERTY> {
6969
return declaration.select(propertyMetamodel)
7070
}
7171

72-
fun <PROPERTY1, PROPERTY2> select(
72+
fun <PROPERTY1 : Any, PROPERTY2 : Any> select(
7373
first: PropertyMetamodel<PROPERTY1>,
7474
second: PropertyMetamodel<PROPERTY2>,
7575
): SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>> {

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KValuesDeclaration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel
55

66
class KValuesDeclaration(val declaration: ValuesDeclaration) {
77

8-
fun <PROPERTY> value(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
8+
fun <PROPERTY : Any> value(left: PropertyMetamodel<PROPERTY>, right: PROPERTY?) {
99
declaration.value(left, right)
1010
}
1111
}

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KWhereDeclaration.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,58 +18,58 @@ class KWhereDeclaration(declaration: WhereDeclaration) : org.seasar.doma.kotlin.
1818
declaration.notLike(left, right, option)
1919
}
2020

21-
fun <PROPERTY> between(
21+
fun <PROPERTY : Any> between(
2222
propertyMetamodel: PropertyMetamodel<PROPERTY>,
2323
start: PROPERTY?,
2424
end: PROPERTY?,
2525
) {
2626
declaration.between(propertyMetamodel, start, end)
2727
}
2828

29-
fun <PROPERTY> `in`(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>?) {
29+
fun <PROPERTY : Any> `in`(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>?) {
3030
declaration.`in`(left, right)
3131
}
3232

33-
fun <PROPERTY> notIn(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>?) {
33+
fun <PROPERTY : Any> notIn(left: PropertyMetamodel<PROPERTY>, right: List<PROPERTY>?) {
3434
declaration.notIn(left, right)
3535
}
3636

37-
fun <PROPERTY> `in`(
37+
fun <PROPERTY : Any> `in`(
3838
left: PropertyMetamodel<PROPERTY>,
3939
right: SubSelectContext<PropertyMetamodel<PROPERTY>>,
4040
) {
4141
declaration.`in`(left, right)
4242
}
4343

44-
fun <PROPERTY> notIn(
44+
fun <PROPERTY : Any> notIn(
4545
left: PropertyMetamodel<PROPERTY>,
4646
right: SubSelectContext<PropertyMetamodel<PROPERTY>>,
4747
) {
4848
declaration.notIn(left, right)
4949
}
5050

51-
fun <PROPERTY1, PROPERTY2> `in`(
51+
fun <PROPERTY1 : Any, PROPERTY2 : Any> `in`(
5252
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
5353
right: List<Tuple2<PROPERTY1, PROPERTY2>>?,
5454
) {
5555
declaration.`in`(left, right)
5656
}
5757

58-
fun <PROPERTY1, PROPERTY2> notIn(
58+
fun <PROPERTY1 : Any, PROPERTY2 : Any> notIn(
5959
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
6060
right: List<Tuple2<PROPERTY1, PROPERTY2>>?,
6161
) {
6262
declaration.notIn(left, right)
6363
}
6464

65-
fun <PROPERTY1, PROPERTY2> `in`(
65+
fun <PROPERTY1 : Any, PROPERTY2 : Any> `in`(
6666
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
6767
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>,
6868
) {
6969
declaration.`in`(left, right)
7070
}
7171

72-
fun <PROPERTY1, PROPERTY2> notIn(
72+
fun <PROPERTY1 : Any, PROPERTY2 : Any> notIn(
7373
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
7474
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>,
7575
) {
@@ -84,7 +84,7 @@ class KWhereDeclaration(declaration: WhereDeclaration) : org.seasar.doma.kotlin.
8484
declaration.notExists(subSelectContext)
8585
}
8686

87-
fun <ENTITY> from(entityMetamodel: EntityMetamodel<ENTITY>): KSubSelectFromDeclaration<ENTITY> {
87+
fun <ENTITY : Any> from(entityMetamodel: EntityMetamodel<ENTITY>): KSubSelectFromDeclaration<ENTITY> {
8888
val declaration = SubSelectFromDeclaration<ENTITY>(entityMetamodel)
8989
return KSubSelectFromDeclaration(declaration)
9090
}

0 commit comments

Comments
 (0)