diff --git a/src/main/java/com/jaxio/jpa/querybyexample/ByPropertySelectorUtil.java b/src/main/java/com/jaxio/jpa/querybyexample/ByPropertySelectorUtil.java index 70b4409..657bae4 100644 --- a/src/main/java/com/jaxio/jpa/querybyexample/ByPropertySelectorUtil.java +++ b/src/main/java/com/jaxio/jpa/querybyexample/ByPropertySelectorUtil.java @@ -110,7 +110,7 @@ private void byObjectOrModeSelector(Root root, CriteriaBuilder builder, L List selectorPredicates = newArrayList(); Path path = jpaUtil.getPath(root, selector.getAttributes()); List selected = selector.getSelected(); - if (selector.getSelected().contains(null)) { + if (selected.contains(null)) { selected = newArrayList(selector.getSelected()); selected.remove(null); selectorPredicates.add(builder.isNull(path)); @@ -133,12 +133,12 @@ private void byObjectAndModeSelector(Root root, CriteriaBuilder builder, PropertySelector selector) { List selectorPredicates = newArrayList(); List selected = selector.getSelected(); - if (selector.getSelected().contains(null)) { + if (selected.contains(null)) { selected = newArrayList(selector.getSelected()); selected.remove(null); selectorPredicates.add(builder.isNull(jpaUtil.getPath(root, selector.getAttributes()))); } - for (Object selection : selector.getSelected()) { + for (Object selection : selected) { Path path = jpaUtil.getPath(root, selector.getAttributes()); if (selection instanceof Identifiable) { selectorPredicates.add(builder.equal(path.get("id"), ((Identifiable) selection).getId())); @@ -148,5 +148,4 @@ private void byObjectAndModeSelector(Root root, CriteriaBuilder builder, } predicates.add(jpaUtil.andPredicate(builder, selectorPredicates)); } - } \ No newline at end of file