From 95041946dbfee017408f383d9f1da4348d22fc1f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Sep 2018 14:02:39 +0200 Subject: [PATCH] DATACASS-595 - Fix Kotlin Query extension. We now accept CriteriaDefinition when creating a single-criteria query in the Kotlin extension. Previously, we only accepted Criteria which is a concrete implementation type. --- .../data/cassandra/core/query/QueryExtensions.kt | 2 +- .../data/cassandra/core/query/QueryExtensionsUnitTests.kt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt b/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt index 688617708..509fdefa3 100644 --- a/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt +++ b/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt @@ -25,7 +25,7 @@ package org.springframework.data.cassandra.core.query /** * Extension for [Query.query] providing a global query alias for an improved DSL. */ -fun query(criteria: Criteria): Query = Query.query(criteria) +fun query(criteria: CriteriaDefinition): Query = Query.query(criteria) /** * Extension for [Query.query] providing a global query alias for an improved DSL. diff --git a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt index 983dad7ac..abd909252 100644 --- a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt +++ b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt @@ -25,6 +25,14 @@ import org.junit.Test */ class QueryExtensionsUnitTests { + @Test + fun `should create query from single criteria`() { + + val query = query(where("jedi").isEqualTo(true)) + + assertThat(query.toString()).contains("jedi = true") + } + @Test fun `should create query from concatenated criteria`() {