diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditAPIImpl.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditAPIImpl.java index 27da9af58f1..ca182f6b165 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditAPIImpl.java @@ -225,29 +225,23 @@ public PublishAuditStatus getPublishAuditStatus(String bundleId) @CloseDBIfOpened public List getPublishAuditStatuses(List bundleIds) throws DotPublisherException { - if (bundleIds == null || bundleIds.isEmpty()) { - return Collections.emptyList(); - } try { final List result = new ArrayList<>(); - final DotConnect dc = new DotConnect(); - final String placeholders = bundleIds.stream() - .map(id -> "?") - .collect(Collectors.joining(",")); + DotConnect dc = new DotConnect(); + final List parameter = bundleIds.stream().map(id -> "'" + id + "'").collect(Collectors.toList()); - dc.setSQL(String.format(SELECT_ALL_BY_BUNDLES_IDS, placeholders)); - bundleIds.forEach(dc::addParam); - final List> items = dc.loadObjectResults(); + dc.setSQL(String.format(SELECT_ALL_BY_BUNDLES_IDS, String.join(",", parameter))); + List> items = dc.loadObjectResults(); - for (final Map item : items) { - result.add(turnIntoPublishAuditStatus(NO_LIMIT_ASSETS, item)); + for(Map item: items) { + result.add(turnIntoPublishAuditStatus(NO_LIMIT_ASSETS, item)); } return result; - } catch (Exception e) { - Logger.error(PublishAuditAPIImpl.class, e.getMessage(), e); - throw new DotPublisherException("Unable to get list of elements with error:" + e.getMessage(), e); + }catch(Exception e){ + Logger.debug(PublisherUtil.class,e.getMessage(),e); + throw new DotPublisherException("Unable to get list of elements with error:"+e.getMessage(), e); } } diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java index b15ee8984a5..f3c16e79f9d 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublisherQueueJob.java @@ -654,7 +654,6 @@ private List getRemoteHistoryFromEndpoint(final List bundleIds, - @Context final HttpServletRequest request) { - - final AuthCredentialPushPublishUtil.PushPublishAuthenticationToken ppAuthToken = - AuthCredentialPushPublishUtil.INSTANCE.processAuthHeader(request); - - final Optional failResponse = PushPublishResourceUtil.getFailResponse(request, ppAuthToken); - - if (failResponse.isPresent()) { - return failResponse.get(); - } - + public Response getAll( List bundleIds) { try { final List statuses = auditAPI.getPublishAuditStatuses(bundleIds);