switch to spring data jpa