Skip to content

Commit f55b103

Browse files
committed
refactor: support covariance for fieldTypeHandler
1 parent 34d16f0 commit f55b103

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main/kotlin/team/yi/rsql/querydsl/QuerydslRsql.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,13 @@ class QuerydslRsql<E> private constructor(builder: Builder<E>) {
256256
fun operator(vararg operator: RsqlOperator): BuildBuilder<E> = this.apply { super.rsqlConfig.operators = operator.toList() }
257257
fun operators(operators: List<RsqlOperator>): BuildBuilder<E> = this.apply { super.rsqlConfig.operators = operators.toList() }
258258

259-
fun fieldTypeHandler(vararg typeHandler: Class<FieldTypeHandler<E>>): BuildBuilder<E> = this.apply { super.rsqlConfig.addFieldTypeHandler(*typeHandler) }
259+
fun fieldTypeHandler(vararg typeHandler: Class<out FieldTypeHandler<E>>): BuildBuilder<E> = this.apply {
260+
super.rsqlConfig.addFieldTypeHandler(*typeHandler)
261+
}
260262

261-
fun sortFieldTypeHandler(vararg typeHandler: Class<SortFieldTypeHandler<E>>): BuildBuilder<E> = this.apply { super.rsqlConfig.addSortFieldTypeHandler(*typeHandler) }
263+
fun sortFieldTypeHandler(vararg typeHandler: Class<out SortFieldTypeHandler<E>>): BuildBuilder<E> = this.apply {
264+
super.rsqlConfig.addSortFieldTypeHandler(*typeHandler)
265+
}
262266

263267
fun dateFormat(dateFormat: String): BuildBuilder<E> = this.apply { super.rsqlConfig.dateFormat = dateFormat }
264268
}

src/test/java/team/yi/rsql/querydsl/test/javatest/QuerydslRsqlTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class QuerydslRsqlTest extends BaseRsqlTest {
3434
@Autowired
3535
private EntityManager entityManager;
3636

37-
private PathFactory pathFactory = new PathFactory();
37+
private final PathFactory pathFactory = new PathFactory();
3838

3939
@Test
4040
public void shouldReadRsqlConfig() {

0 commit comments

Comments
 (0)