Skip to content

Commit

Permalink
Correct merge
Browse files Browse the repository at this point in the history
  • Loading branch information
dstepanov committed Sep 9, 2024
1 parent 67c5cfe commit 241b665
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.micronaut.data.model.jpa.criteria.ExpressionType;
import io.micronaut.data.model.jpa.criteria.PersistentAssociationPath;
import io.micronaut.data.model.jpa.criteria.PersistentEntityFrom;
import io.micronaut.data.model.jpa.criteria.impl.predicate.PersistentPropertyInPredicate;
import io.micronaut.data.model.jpa.criteria.impl.predicate.InPredicate;
import io.micronaut.data.processor.model.SourceAssociation;
import io.micronaut.data.processor.model.SourcePersistentEntity;
import jakarta.persistence.criteria.CriteriaBuilder;
Expand Down Expand Up @@ -83,17 +83,17 @@ public Predicate in(Object... values) {
@Override
public Predicate in(Collection<?> values) {
List<Expression<?>> expressions = Objects.requireNonNull(values).stream().map(criteriaBuilder::literal).collect(Collectors.toList());
return new PersistentPropertyInPredicate<>(this, expressions, criteriaBuilder);
return new InPredicate<>(this, expressions, criteriaBuilder);
}

@Override
public Predicate in(Expression<?>... values) {
return new PersistentPropertyInPredicate<>(this, Arrays.asList(values), criteriaBuilder);
return new InPredicate<>(this, Arrays.asList(values), criteriaBuilder);
}

@Override
public Predicate in(Expression<Collection<?>> values) {
return new PersistentPropertyInPredicate<>(this, List.of(Objects.requireNonNull(values)), criteriaBuilder);
return new InPredicate<>(this, List.of(Objects.requireNonNull(values)), criteriaBuilder);
}

@Override
Expand Down

0 comments on commit 241b665

Please sign in to comment.