spring-projects#282 - Add support of 'IS (NOT) NULL' and '(NOT) LIKE' operators

Author: rchigvintsev

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

@@ -88,6 +88,22 @@ public Condition createCondition(Part part) {
                 BindMarker bindMarker = createBindMarker(parameterMetadataProvider.next(part));
                 return Conditions.isLessOrEqualTo(pathExpression, bindMarker);
             }
+            case IS_NULL: {
+                return Conditions.isNull(createPropertyPathExpression(part.getProperty()));
+            }
+            case IS_NOT_NULL: {
+                return Conditions.isNull(createPropertyPathExpression(part.getProperty())).not();
+            }
+            case LIKE: {
+                Expression pathExpression = createPropertyPathExpression(part.getProperty());
+                BindMarker bindMarker = createBindMarker(parameterMetadataProvider.next(part));
+                return Conditions.like(pathExpression, bindMarker);
+            }
+            case NOT_LIKE: {
+                Expression pathExpression = createPropertyPathExpression(part.getProperty());
+                BindMarker bindMarker = createBindMarker(parameterMetadataProvider.next(part));
+                return NotLike.create(pathExpression, bindMarker);
+            }
             case SIMPLE_PROPERTY: {
                 Expression pathExpression = createPropertyPathExpression(part.getProperty());
                 ParameterMetadata parameterMetadata = parameterMetadataProvider.next(part);
@@ -118,4 +134,45 @@ private BindMarker createBindMarker(ParameterMetadata parameterMetadata) {
         }
         return SQL.bindMarker();
     }
+
+    // TODO: include support of NOT LIKE operator into spring-data-relational
+    private static class NotLike implements Segment, Condition {
+        private final Comparison delegate;
+
+        private NotLike(Expression leftColumnOrExpression, Expression rightColumnOrExpression) {
+            this.delegate = Comparison.create(leftColumnOrExpression, "NOT LIKE", rightColumnOrExpression);
+        }
+
+        /**
+         * Creates new instance of this class with the given {@link Expression}s.
+         *
+         * @param leftColumnOrExpression the left {@link Expression}
+         * @param rightColumnOrExpression the right {@link Expression}
+         * @return {@link NotLike} condition
+         */
+        public static NotLike create(Expression leftColumnOrExpression, Expression rightColumnOrExpression) {
+            Assert.notNull(leftColumnOrExpression, "Left expression must not be null!");
+            Assert.notNull(rightColumnOrExpression, "Right expression must not be null!");
+            return new NotLike(leftColumnOrExpression, rightColumnOrExpression);
+        }
+
+        @Override
+        public void visit(Visitor visitor) {
+            Assert.notNull(visitor, "Visitor must not be null!");
+            delegate.visit(visitor);
+        }
+
+        public Expression getLeft() {
+            return delegate.getLeft();
+        }
+
+        public Expression getRight() {
+            return delegate.getRight();
+        }
+
+        @Override
+        public String toString() {
+            return getLeft().toString() + " NOT LIKE " + getRight();
+        }
+    }
 }

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

@@ -215,6 +215,50 @@ public void createsQueryToFindAllEntitiesByDateAttributeBefore() throws Exceptio
         assertThat(bindableQuery.get()).isEqualTo(expectedSql);
     }
 
+    @Test
+    public void createsQueryToFindAllEntitiesByIntegerAttributeIsNull() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByAgeIsNull");
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[0]);
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".age IS NULL";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
+    @Test
+    public void createsQueryToFindAllEntitiesByIntegerAttributeIsNotNull() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByAgeIsNotNull");
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[0]);
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".age IS NOT NULL";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
+    @Test
+    public void createsQueryToFindAllEntitiesByStringAttributeLike() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByFirstNameLike", String.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[] {"%John%"});
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".first_name LIKE ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
+    @Test
+    public void createsQueryToFindAllEntitiesByStringAttributeNotLike() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByFirstNameNotLike", String.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[] {"%John%"});
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".first_name NOT LIKE ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
     private R2dbcQueryMethod getQueryMethod(String methodName, Class<?>... parameterTypes) throws Exception {
         Method method = UserRepository.class.getMethod(methodName, parameterTypes);
         return new R2dbcQueryMethod(method, new DefaultRepositoryMetadata(UserRepository.class),
@@ -247,6 +291,14 @@ private interface UserRepository extends Repository<User, Long> {
         Flux<User> findAllByDateOfBirthAfter(Date date);
 
         Flux<User> findAllByDateOfBirthBefore(Date date);
+
+        Flux<User> findAllByAgeIsNull();
+
+        Flux<User> findAllByAgeIsNotNull();
+
+        Flux<User> findAllByFirstNameLike(String like);
+
+        Flux<User> findAllByFirstNameNotLike(String like);
     }
 
     @Table("users")