LPD-31818 I misunderstood the odata spec

rotty3000 · Jul 22, 2024 · 6f168e4 · 6f168e4
1 parent 3cfaa75
commit 6f168e4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/...feray/object/odata/filter/expression/field/predicate/provider/FieldPredicateProvider.java b/...feray/object/odata/filter/expression/field/predicate/provider/FieldPredicateProvider.java
@@ -33,7 +33,7 @@ public Predicate getInPredicate(
 		Function<String, Column<?, ?>> objectDefinitionColumnSupplier,
 		Object left, List<Object> rights);
 
-	public Predicate getIsEmptyPredicate(
+	public Predicate getIsNotEmptyPredicate(
 		String fieldName,
 		Function<String, Column<?, ?>> objectDefinitionColumnSupplier);
 

diff --git a/.../liferay/object/rest/internal/odata/filter/expression/PredicateExpressionVisitorImpl.java b/.../liferay/object/rest/internal/odata/filter/expression/PredicateExpressionVisitorImpl.java
@@ -809,7 +809,7 @@ private Predicate _visitCollectionPropertyExpression(
 				_getFieldPredicateProvider(
 					collectionPropertyExpression.getName(), objectDefinition);
 
-			return fieldPredicateProvider.getIsEmptyPredicate(
+			return fieldPredicateProvider.getIsNotEmptyPredicate(
 				collectionPropertyExpression.getName(),
 				name -> _getColumn(name, objectDefinition));
 		}

diff --git a/...rnal/odata/filter/expression/field/predicate/provider/KeywordsFieldPredicateProvider.java b/...rnal/odata/filter/expression/field/predicate/provider/KeywordsFieldPredicateProvider.java
@@ -80,13 +80,13 @@ public Predicate getInPredicate(
 	}
 
 	@Override
-	public Predicate getIsEmptyPredicate(
+	public Predicate getIsNotEmptyPredicate(
 		String fieldName,
 		Function<String, Column<?, ?>> objectDefinitionColumnSupplier) {
 
 		Column<?, ?> column = objectDefinitionColumnSupplier.apply("id");
 
-		return column.notIn(
+		return column.in(
 			DSLQueryFactoryUtil.select(
 				AssetEntryTable.INSTANCE.classPK
 			).from(

diff --git a/...filter/expression/field/predicate/provider/MultiselectPicklistFieldPredicateProvider.java b/...filter/expression/field/predicate/provider/MultiselectPicklistFieldPredicateProvider.java
@@ -103,13 +103,13 @@ public Predicate getInPredicate(
 	}
 
 	@Override
-	public Predicate getIsEmptyPredicate(
+	public Predicate getIsNotEmptyPredicate(
 		String fieldName,
 		Function<String, Column<?, ?>> objectDefinitionColumnSupplier) {
 
 		return objectDefinitionColumnSupplier.apply(
 			fieldName
-		).isNull();
+		).isNotNull();
 	}
 
 	@Override

diff --git a/...filter/expression/field/predicate/provider/TaxonomyCategoryIdsFieldPredicateProvider.java b/...filter/expression/field/predicate/provider/TaxonomyCategoryIdsFieldPredicateProvider.java
@@ -67,13 +67,13 @@ public Predicate getInPredicate(
 	}
 
 	@Override
-	public Predicate getIsEmptyPredicate(
+	public Predicate getIsNotEmptyPredicate(
 		String fieldName,
 		Function<String, Column<?, ?>> objectDefinitionColumnSupplier) {
 
 		Column<?, ?> column = objectDefinitionColumnSupplier.apply("id");
 
-		return column.notIn(
+		return column.in(
 			DSLQueryFactoryUtil.select(
 				AssetEntryTable.INSTANCE.classPK
 			).from(

diff --git a/...ion/java/com/liferay/object/rest/internal/resource/v1_0/test/ObjectEntryResourceTest.java b/...ion/java/com/liferay/object/rest/internal/resource/v1_0/test/ObjectEntryResourceTest.java
@@ -5148,8 +5148,8 @@ public void testGetObjectEntryFilteredByKeywords() throws Exception {
 		_postObjectEntryWithKeywords("tag1", "tag2");
 		_postObjectEntryWithKeywords("tag1", "tag2", "tag3");
 
-		_assertFilteredObjectEntries(1, "keywords/any()");
-		_assertFilteredObjectEntries(4, "not keywords/any()");
+		_assertFilteredObjectEntries(4, "keywords/any()");
+		_assertFilteredObjectEntries(1, "not keywords/any()");
 
 		_assertFilteredObjectEntries(4, "keywords/any(k:k eq 'tag1')");
 		_assertFilteredObjectEntries(4, "keywords/any(k:k eq 'TAG1')");
@@ -5245,10 +5245,10 @@ public void testGetObjectEntryFilteredByMultiselectPicklistObjectField()
 			_TAG_1);
 
 		_assertFilteredObjectEntries(
-			1,
+			3,
 			String.format("%s/any()", _OBJECT_FIELD_NAME_MULTISELECT_PICKLIST));
 		_assertFilteredObjectEntries(
-			3,
+			1,
 			String.format(
 				"not %s/any()", _OBJECT_FIELD_NAME_MULTISELECT_PICKLIST));
 		_assertFilteredObjectEntries(
@@ -5407,8 +5407,8 @@ public void testGetObjectEntryFilteredByTaxonomyCategories()
 		_postObjectEntryWithTaxonomyCategories(
 			taxonomyCategory1, taxonomyCategory2, taxonomyCategory3);
 
-		_assertFilteredObjectEntries(1, "taxonomyCategoryIds/any()");
-		_assertFilteredObjectEntries(3, "not taxonomyCategoryIds/any()");
+		_assertFilteredObjectEntries(3, "taxonomyCategoryIds/any()");
+		_assertFilteredObjectEntries(1, "not taxonomyCategoryIds/any()");
 		_assertFilteredObjectEntries(
 			3,
 			String.format(