Switched all JPQL queries over to use CriteriaQuery and CriteriaBuilder for compile time checking and full feature support. The metamodel classes are hand rolled right now and want to switch them to dynamically generate via gradle build. Will work on that tomorrow