updated jpa-query to add SqlResultSet and Criteria Bulk Updates
updated TODOs