Use the sort criteria provided by hql-parser (after fixing HQLPARSER-24) ------------------------------------------------------------------------ Key: ISPN-4047 URL: https://issues.jboss.org/browse/ISPN-4047 Project: Infinispan Issue Type: Enhancement Components: Embedded Querying, Remote Querying Affects Versions: 6.0.1.Final Reporter: Adrian Nistor Assignee: Adrian Nistor Labels: 630 Fix For: 7.0.0.Beta1, 7.0.0.Final Currently we have separate handling of the sort criteria in Infinispan because the JPQL parser skips it. See https://hibernate.atlassian.net/browse/HQLPARSER-24.