Как отрефакторить этот код с проверкой на null?

Predicate predicate = builder.conjunction();
 
        if (paymentFilter.getCounterpartName() != null)
            predicate = builder.and(predicate,
                    builder.like(builder.lower(root.get(COUNTERPART_NAME)),
                            PayOrderServiceConst.PERCENT + paymentFilter.getCounterpartName().toLowerCase() + PayOrderServiceConst.PERCENT));
 
        if (paymentFilter.getCounterpartInn() != null)
            predicate = builder.and(predicate,
                    builder.like(root.get(COUNTERPART_INN),
                            PayOrderServiceConst.PERCENT + paymentFilter.getCounterpartInn() + PayOrderServiceConst.PERCENT));
 
        if (paymentFilter.getDescription() != null)
            predicate = builder.and(predicate,
                    builder.like(builder.lower(root.get(DESCRIPTION)),
                            PayOrderServiceConst.PERCENT + paymentFilter.getDescription().toLowerCase() + PayOrderServiceConst.PERCENT));
 
        if (paymentFilter.getSourceAccountNumber() != null)
            predicate = builder.and(predicate,
                    builder.like(root.get(ACCOUNT).get(NUMBER),
                            PayOrderServiceConst.PERCENT + paymentFilter.getSourceAccountNumber() + PayOrderServiceConst.PERCENT));
 
        if (paymentFilter.getNumber() != null)
            predicate = builder.and(predicate,
                    builder.like(root.get(NUMBER).as(String.class),
                            PayOrderServiceConst.PERCENT + paymentFilter.getNumber() + PayOrderServiceConst.PERCENT));
 
        if (paymentFilter.getClientId() != null)
            predicate = builder.and(predicate,
                    builder.equal(root.get(ACCOUNT).get(BANK_CLIENT).get(CLIENT).get(ID).as(String.class),
                            paymentFilter.getClientId()));
 
        if (paymentFilter.getClientInn() != null)
            predicate = builder.and(predicate,
                    builder.like(root.get(ACCOUNT).get(BANK_CLIENT).get(CLIENT).get(INN).as(String.class),
                            PayOrderServiceConst.PERCENT + paymentFilter.getClientInn() + PayOrderServiceConst.PERCENT));
 
        if (paymentFilter.getSourceAccountId() != null)
            predicate = builder.and(predicate,
                    builder.equal(root.get(ACCOUNT).get(ID).as(String.class),
                            paymentFilter.getSourceAccountId()));
 
        if (paymentFilter.getStartDate() != null)
            predicate = builder.and(predicate,
                    builder.greaterThanOrEqualTo(root.get(CREATED_DATE),
                            LocalDateTime.ofInstant(paymentFilter.getStartDate(), ZoneOffset.UTC)));
 
        if (paymentFilter.getEndDate() != null) {
            LocalDateTime endDate = LocalDateTime.ofInstant(paymentFilter.getEndDate(), ZoneOffset.UTC);
            endDate = endDate.plusDays(1).toLocalDate().atStartOfDay();
            predicate = builder.and(
                    predicate,
                    builder.lessThan(
                            root.get(CREATED_DATE),
                            endDate
                    )
            );

public static Predicate merge(Builder builder, Optional<Predicate>... predicates) {
        Predicate predicate = builder.conjunction();
        for (var optPredicate : predicates) {
            final var finalPredicate = predicate;
            predicate = optPredicate
                    .map(p -> builder.and(finalPredicate, p))
                    .orElse(finalPredicate);
        }
        return predicate;
    }
 
    public static <T, U> Optional<U> toOpt(T t, Function<T, U> function) {
        return Optional.ofNullable(t).map(function);
    }
 
    public static void main(String[] args) {
        final Predicate predicate = merge(builder,
                toOpt(paymentFilter.getCounterpartName(), counterpartName ->
                        builder.like(builder.lower(root.get(COUNTERPART_NAME)),
                                PayOrderServiceConst.PERCENT + counterpartName.toLowerCase() + PayOrderServiceConst.PERCENT)),
                toOpt(paymentFilter.getCounterpartInn(), counterpartInn ->
                        builder.like(root.get(COUNTERPART_INN),
                                PayOrderServiceConst.PERCENT + counterpartInn + PayOrderServiceConst.PERCENT)),
                toOpt(paymentFilter.getDescription(), description ->
                                builder.lower(root.get(DESCRIPTION)),
                        PayOrderServiceConst.PERCENT + description.toLowerCase() + PayOrderServiceConst.PERCENT)),
        ...
                );
    }