spring-projects#282 - Implement conjunction of conditions

Author: rchigvintsev

Diff for: src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java

@@ -80,7 +80,7 @@ protected Condition create(Part part, Iterator<Object> iterator) {
 
     @Override
     protected Condition and(Part part, Condition condition, Iterator<Object> iterator) {
-        throw new UnsupportedOperationException();
+        return condition.and(conditionFactory.createCondition(part));
     }
 
     @Override

Diff for: src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryIntegrationTests.java

@@ -50,6 +50,9 @@
  */
 @RunWith(MockitoJUnitRunner.class)
 public class PartTreeR2dbcQueryIntegrationTests {
+    private static final String TABLE = "users";
+    private static final String ALL_FIELDS = TABLE + ".id, " + TABLE + ".first_name, " + TABLE + ".last_name";
+
     @Mock
     private ConnectionFactory connectionFactory;
     @Mock
@@ -82,9 +85,9 @@ public void createsQueryToFindAllEntitiesByStringAttribute() throws Exception {
         R2dbcQueryMethod queryMethod = getQueryMethod("findAllByFirstName", String.class);
         PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
                 dataAccessStrategy);
-        BindableQuery bindableQuery = r2dbcQuery.createQuery(getAccessor(queryMethod, new Object[]{"Matthews"}));
-        assertThat(bindableQuery.get())
-                .isEqualTo("SELECT users.id, users.first_name FROM users WHERE users.first_name = ?");
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(getAccessor(queryMethod, new Object[]{"John"}));
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".first_name = ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
     }
 
     @Test
@@ -93,18 +96,29 @@ public void createsQueryWithIsNullCondition() throws Exception {
         PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
                 dataAccessStrategy);
         BindableQuery bindableQuery = r2dbcQuery.createQuery((getAccessor(queryMethod, new Object[]{null})));
-        assertThat(bindableQuery.get())
-                .isEqualTo("SELECT users.id, users.first_name FROM users WHERE users.first_name IS NULL");
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".first_name IS NULL";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
     }
 
     @Test
     public void createsQueryWithLimitForExistsProjection() throws Exception {
         R2dbcQueryMethod queryMethod = getQueryMethod("existsByFirstName", String.class);
         PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
                 dataAccessStrategy);
-        BindableQuery query = r2dbcQuery.createQuery((getAccessor(queryMethod, new Object[]{"Matthews"})));
-        assertThat(query.get())
-                .isEqualTo("SELECT users.id FROM users WHERE users.first_name = ? LIMIT 1");
+        BindableQuery query = r2dbcQuery.createQuery((getAccessor(queryMethod, new Object[]{"John"})));
+        String expectedSql = "SELECT " + TABLE + ".id FROM " + TABLE + " WHERE " + TABLE + ".first_name = ? LIMIT 1";
+        assertThat(query.get()).isEqualTo(expectedSql);
+    }
+
+    @Test
+    public void createsQueryToFindAllEntitiesByTwoStringAttributes() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findByLastNameAndFirstName", String.class, String.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(getAccessor(queryMethod, new Object[]{"Doe", "John"}));
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE
+                + " WHERE " + TABLE + ".last_name = ? AND " + TABLE + ".first_name = ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
     }
 
     private R2dbcQueryMethod getQueryMethod(String methodName, Class<?>... parameterTypes) throws Exception {
@@ -120,6 +134,8 @@ private RelationalParametersParameterAccessor getAccessor(R2dbcQueryMethod query
     private interface UserRepository extends Repository<User, Long> {
         Flux<User> findAllByFirstName(String firstName);
 
+        Flux<User> findByLastNameAndFirstName(String lastName, String firstName);
+
         Mono<Boolean> existsByFirstName(String firstName);
     }
 
@@ -129,5 +145,6 @@ private static class User {
         @Id
         private Long id;
         private String firstName;
+        private String lastName;
     }
 }