#342 - Move off deprecated Criteria and Update.

src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java

@@ -34,8 +34,8 @@ import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.r2dbc.query.Criteria;
-import org.springframework.data.r2dbc.query.Update;
+import org.springframework.data.relational.core.query.Criteria;
+import org.springframework.data.relational.core.query.Update;
 import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;
 import org.springframework.data.relational.core.mapping.Table;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -44,6 +44,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
  * Integration tests for {@link DatabaseClient}.
  *
  * @author Mark Paluch
+ * @author Mingyuan Wu
  */
 public abstract class AbstractDatabaseClientIntegrationTests extends R2dbcIntegrationTestSupport {
 

src/test/java/org/springframework/data/r2dbc/core/MariaDbDatabaseClientIntegrationTests.java

@@ -36,7 +36,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.r2dbc.dialect.MySqlDialect;
-import org.springframework.data.r2dbc.query.Criteria;
+import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.r2dbc.testing.ExternalDatabase;
 import org.springframework.data.r2dbc.testing.MariaDbTestSupport;
 import org.springframework.data.relational.core.mapping.Table;
@@ -46,6 +46,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
  * Integration tests for {@link DatabaseClient} against MariaDB.
  *
  * @author Mark Paluch
+ * @author Mingyuan Wu
  */
 public class MariaDbDatabaseClientIntegrationTests extends AbstractDatabaseClientIntegrationTests {
 

src/test/java/org/springframework/data/r2dbc/core/MySqlDatabaseClientIntegrationTests.java

@@ -36,7 +36,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.r2dbc.dialect.MySqlDialect;
-import org.springframework.data.r2dbc.query.Criteria;
+import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.r2dbc.testing.ExternalDatabase;
 import org.springframework.data.r2dbc.testing.MySqlTestSupport;
 import org.springframework.data.relational.core.mapping.Table;
@@ -46,6 +46,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
  * Integration tests for {@link DatabaseClient} against MySQL.
  *
  * @author Mark Paluch
+ * @author Mingyuan Wu
  */
 public class MySqlDatabaseClientIntegrationTests extends AbstractDatabaseClientIntegrationTests {
 

src/test/java/org/springframework/data/r2dbc/query/CriteriaUnitTests.java

@@ -16,7 +16,8 @@
 package org.springframework.data.r2dbc.query;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.springframework.data.r2dbc.query.Criteria.*;
+import static org.springframework.data.relational.core.query.Criteria.*;
+import org.springframework.data.relational.core.query.Criteria;
 
 import java.util.Arrays;
 
@@ -29,6 +30,7 @@ import org.springframework.data.relational.core.sql.SqlIdentifier;
  * Unit tests for {@link Criteria}.
  *
  * @author Mark Paluch
+ * @author Mingyuan Wu
  */
 public class CriteriaUnitTests {
 

src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java

@@ -34,11 +34,13 @@ import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.sql.Expression;
 import org.springframework.data.relational.core.sql.Functions;
 import org.springframework.data.relational.core.sql.Table;
+import org.springframework.data.relational.core.query.Criteria;
 
 /**
  * Unit tests for {@link QueryMapper}.
  *
  * @author Mark Paluch
+ * @author Mingyuan Wu
  */
 public class QueryMapperUnitTests {
 

src/test/java/org/springframework/data/r2dbc/query/UpdateMapperUnitTests.java

@@ -31,6 +31,7 @@ import org.springframework.data.r2dbc.dialect.PostgresDialect;
 import org.springframework.data.r2dbc.mapping.R2dbcMappingContext;
 import org.springframework.data.r2dbc.mapping.SettableValue;
 import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.query.Update;
 import org.springframework.data.relational.core.sql.AssignValue;
 import org.springframework.data.relational.core.sql.Expression;
 import org.springframework.data.relational.core.sql.SQL;
@@ -41,6 +42,7 @@ import org.springframework.data.relational.core.sql.Table;
  * Unit tests for {@link UpdateMapper}.
  *
  * @author Mark Paluch
+ * @author Mingyuan Wu
  */
 public class UpdateMapperUnitTests {
 

src/test/kotlin/org/springframework/data/r2dbc/core/CriteriaStepExtensionsTests.kt

@@ -26,6 +26,7 @@ import org.springframework.data.r2dbc.query.Criteria
  * Unit tests for [Criteria.CriteriaStep] extensions.
  *
  * @author Jonas Bark
+ * @author Mingyuan Wu
  */
 class CriteriaStepExtensionsTests {
 
@@ -73,4 +74,49 @@ class CriteriaStepExtensionsTests {
 			spec.`in`(listOf("test"))
 		}
 	}
+
+	@Test // gh-122
+	fun eqIsCriteriaStepForSpringData2() {
+
+		val spec = mockk<org.springframework.data.relational.core.query.Criteria.CriteriaStep>()
+		val criteria = mockk<org.springframework.data.relational.core.query.Criteria>()
+
+		every { spec.`is`("test") } returns criteria
+
+		assertThat(spec isEquals "test").isEqualTo(criteria)
+
+		verify {
+			spec.`is`("test")
+		}
+	}
+
+	@Test // gh-122
+	fun inVarargCriteriaStepForSpringData2() {
+
+		val spec = mockk<org.springframework.data.relational.core.query.Criteria.CriteriaStep>()
+		val criteria = mockk<org.springframework.data.relational.core.query.Criteria>()
+
+		every { spec.`in`(any() as Array<Any>) } returns criteria
+
+		assertThat(spec.isIn("test")).isEqualTo(criteria)
+
+		verify {
+			spec.`in`(arrayOf("test"))
+		}
+	}
+
+	@Test // gh-122
+	fun inListCriteriaStepForSpringData2() {
+
+		val spec = mockk<org.springframework.data.relational.core.query.Criteria.CriteriaStep>()
+		val criteria = mockk<org.springframework.data.relational.core.query.Criteria>()
+
+		every { spec.`in`(listOf("test")) } returns criteria
+
+		assertThat(spec.isIn(listOf("test"))).isEqualTo(criteria)
+
+		verify {
+			spec.`in`(listOf("test"))
+		}
+	}
 }