Remove 'cross join' from count query. Updates "countHandlesByPrefix" …

…to use a query similar to existing "findByPrefix"

(cherry picked from commit 14223bd)

dspace-api/src/main/java/org/dspace/handle/dao/impl/HandleDAOImpl.java

@@ -90,13 +90,11 @@ public List<Handle> findByPrefix(Context context, String prefix) throws SQLExcep
 
     @Override
     public long countHandlesByPrefix(Context context, String prefix) throws SQLException {
-
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Handle.class);
 
         Root<Handle> handleRoot = criteriaQuery.from(Handle.class);
-        criteriaQuery.select(criteriaBuilder.count(criteriaQuery.from(Handle.class)));
+        criteriaQuery.select(handleRoot);
         criteriaQuery.where(criteriaBuilder.like(handleRoot.get(Handle_.handle), prefix + "%"));
         return countLong(context, criteriaQuery, criteriaBuilder, handleRoot);
     }