Fix pagination being performed in memory for instances select (remove image protocols fetch).

Author: stuartcaunt

visa-persistence/src/main/java/eu/ill/visa/persistence/repositories/InstanceRepository.java

@@ -136,8 +136,7 @@ public List<Instance> getAll(final InstanceFilter filter, final OrderBy orderBy,
         final Root<Instance> root = cbQuery.from(Instance.class);
 
         Fetch<Instance, Plan> planFetch = root.fetch("plan", JoinType.INNER);
-        Fetch<Plan, Image> imageFetch = planFetch.fetch("image", JoinType.INNER);
-        imageFetch.fetch("protocols", JoinType.LEFT);
+        planFetch.fetch("image", JoinType.INNER);
         planFetch.fetch("flavour", JoinType.INNER);
 
         InstanceRequestContext context = new InstanceRequestContext(root);

visa-persistence/src/main/java/eu/ill/visa/persistence/repositories/UserRepository.java

@@ -122,7 +122,7 @@ public List<User> getAll(final UserFilter filter, final OrderBy orderBy, final P
         final CriteriaQuery<User> cbQuery = cb.createQuery(User.class);
         final Root<User> root = cbQuery.from(User.class);
 
-        Fetch<User, Employer> employerFetch = root.fetch("affiliation", JoinType.LEFT);
+        root.fetch("affiliation", JoinType.LEFT);
 
         UserRequestContext context = new UserRequestContext(root);
         final List<Predicate> predicates = this.convertFilterToPredicates(filter, cb, context);