Skip to content

Commit

Permalink
Fixing broken build after merging conflicting PRs.
Browse files Browse the repository at this point in the history
This was introduced via #9852 when #11844 was merged.

Closes #12898
  • Loading branch information
ahus1 authored and pedroigor committed Jul 4, 2022
1 parent 2c0cebe commit 63614b1
Showing 1 changed file with 4 additions and 3 deletions.
Expand Up @@ -27,6 +27,7 @@
import org.keycloak.models.ActionTokenValueModel;
import org.keycloak.models.map.storage.CriterionNotSupportedException;
import org.keycloak.models.map.storage.jpa.JpaModelCriteriaBuilder;
import org.keycloak.models.map.storage.jpa.role.JpaPredicateFunction;
import org.keycloak.models.map.storage.jpa.singleUseObject.entity.JpaSingleUseObjectEntity;
import org.keycloak.storage.SearchableModelField;

Expand All @@ -48,7 +49,7 @@ public JpaSingleUseObjectModelCriteriaBuilder() {
super(JpaSingleUseObjectModelCriteriaBuilder::new);
}

public JpaSingleUseObjectModelCriteriaBuilder(BiFunction<CriteriaBuilder, Root<JpaSingleUseObjectEntity>, Predicate> predicateFunc) {
public JpaSingleUseObjectModelCriteriaBuilder(JpaPredicateFunction<JpaSingleUseObjectEntity> predicateFunc) {
super(JpaSingleUseObjectModelCriteriaBuilder::new, predicateFunc);
}

Expand All @@ -62,13 +63,13 @@ public JpaSingleUseObjectModelCriteriaBuilder compare(SearchableModelField<? sup

validateValue(value, modelField, op, String.class);

return new JpaSingleUseObjectModelCriteriaBuilder((cb, root) ->
return new JpaSingleUseObjectModelCriteriaBuilder((cb, query, root) ->
cb.equal(cb.function("->>", String.class, root.get("metadata"),
cb.literal(FIELD_TO_JSON_PROP.get(modelField.getName()))), value[0])
);
} else if(modelField == ActionTokenValueModel.SearchableFields.OBJECT_KEY) {
validateValue(value, modelField, op, String.class);
return new JpaSingleUseObjectModelCriteriaBuilder((cb, root) ->
return new JpaSingleUseObjectModelCriteriaBuilder((cb, query, root) ->
cb.equal(root.get(modelField.getName()), value[0])
);
} else {
Expand Down

0 comments on commit 63614b1

Please sign in to comment.