QuerydslPredicateBuilder (still) returns null Predicate [DATACMNS-1398]

[spring-projects-issues]

Lars van der Vliet opened DATACMNS-1398 and commented

For issue https://jira.spring.io/browse/DATACMNS-1168 a check is added to prevent the 

getPredicate method to return null. The method will actually still return null when unrelated (to the entity) query params are used in the URL.

for example calling the following url /api/test results in correct behavior, but when calling /api/test?idontexistasproperty=true will result in a "null" Predicate in the controller method.

Proposed fix:

 

	@Nullable
	public Predicate getPredicate(TypeInformation<?> type, MultiValueMap<String, String> values,
			QuerydslBindings bindings) {


		Assert.notNull(bindings, "Context must not be null!");


		BooleanBuilder builder = new BooleanBuilder();


		if (values.isEmpty()) {
			return builder;
		}


		for (Entry<String, List<String>> entry : values.entrySet()) {


			if (isSingleElementCollectionWithoutText(entry.getValue())) {
				continue;
			}


			String path = entry.getKey();


			if (!bindings.isPathAvailable(path, type)) {
				continue;
			}


			PathInformation propertyPath = bindings.getPropertyPath(path, type);


			if (propertyPath == null) {
				continue;
			}


			Collection<Object> value = convertToPropertyPathSpecificType(entry.getValue(), propertyPath);
			Optional<Predicate> predicate = invokeBinding(propertyPath, bindings, value);


			predicate.ifPresent(builder::and);
		}

                // return builder when it doens't have a value
		return builder.hasValue() ? builder.getValue() : builder;
	}

 

---

Affects: 2.0.10 (Kay SR10), 2.1 GA (Lovelace)

[mp911de]

That has been fixed recently via #2396