From e0552733959384cb677bc409af316e72816dcdd1 Mon Sep 17 00:00:00 2001 From: Mikhail_Navitski Date: Tue, 2 Apr 2024 15:33:46 +0200 Subject: [PATCH] cloud manager report fix WrongLogLevelInCatchBlock issue --- CHANGELOG.md | 1 + .../adobeio/service/impl/EndpointServiceImpl.java | 10 ++++------ .../adobeio/service/impl/IntegrationServiceImpl.java | 2 +- .../java/com/adobe/acs/commons/cqsearch/QueryUtil.java | 2 +- .../errorpagehandler/impl/ErrorPageHandlerImpl.java | 4 ++-- .../engine/HttpCacheServletResponseWrapper.java | 2 +- .../invalidator/HttpCacheInvalidationJobConsumer.java | 4 ++-- .../commons/mcp/impl/DialogResourceProviderImpl.java | 2 +- .../commons/ondeploy/scripts/OnDeployScriptBase.java | 2 +- .../acs/commons/redirects/models/RedirectRule.java | 3 +-- .../adobe/acs/commons/reports/models/ReportRunner.java | 2 +- .../impl/VersionedClientlibsTransformerFactory.java | 2 +- .../twitter/impl/TwitterAdapterFactoryRegisterer.java | 2 +- .../wcm/comparisons/impl/PageCompareDataImpl.java | 2 +- .../commons/wcm/impl/ComponentErrorHandlerImpl.java | 2 +- .../removal/impl/WorkflowInstanceRemoverScheduler.java | 2 +- .../synthetic/impl/SyntheticWorkflowRunnerImpl.java | 6 +++--- 17 files changed, 24 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a580ca2b8..6fddfd6f4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) - #3295 - Updated the annotations in QueryReportConfig fixing the query manager issue due to empty query language - #3284 - Allow anonymous to read redirect caconfig options - #2854 - Code optimization: convert class fields to local variables +- #3301 - CM report fix WrongLogLevelInCatchBlock issue ## 6.4.0 - 2024-02-22 diff --git a/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/EndpointServiceImpl.java b/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/EndpointServiceImpl.java index ff19abf77c..8e4d1a310f 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/EndpointServiceImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/EndpointServiceImpl.java @@ -203,9 +203,9 @@ private JsonObject process(@NotNull final String actionUrl, URIBuilder builder = new URIBuilder(actionUrl); queryParameters.forEach((k, v) -> builder.addParameter(k, v)); uri = builder.build(); - - } catch(URISyntaxException uriexception) { - LOGGER.error(uriexception.getMessage()); + + } catch(URISyntaxException uriException) { + LOGGER.error("Unable to process the actionURL: {} using uriBuilder", actionUrl, uriException); return new JsonObject(); } @@ -223,11 +223,9 @@ private JsonObject process(@NotNull final String actionUrl, } } catch (IOException ioexception) { - LOGGER.error(ioexception.getMessage()); + LOGGER.error("Unable to process the request", ioexception); return new JsonObject(); - } - } private JsonObject processGet(@NotNull final URI uri, String[] headers) throws IOException { diff --git a/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/IntegrationServiceImpl.java b/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/IntegrationServiceImpl.java index cdb8542299..022371d9d5 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/IntegrationServiceImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/adobeio/service/impl/IntegrationServiceImpl.java @@ -141,7 +141,7 @@ private String fetchAccessToken() { LOGGER.error("JSON does not contain an access_token"); } } catch (Exception e) { - LOGGER.error(e.getMessage()); + LOGGER.error("Unable to fetch the access token", e); } LOGGER.info("JWT Access Token : {}", token); diff --git a/bundle/src/main/java/com/adobe/acs/commons/cqsearch/QueryUtil.java b/bundle/src/main/java/com/adobe/acs/commons/cqsearch/QueryUtil.java index dbacd8e795..d2b0c13309 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/cqsearch/QueryUtil.java +++ b/bundle/src/main/java/com/adobe/acs/commons/cqsearch/QueryUtil.java @@ -56,7 +56,7 @@ public static void setResourceResolverOn(ResourceResolver resolver, Query query) try { internalSetResourceResolverOn(resolver, query); } catch (NoSuchFieldException | IllegalAccessException e) { - log.debug("Could not set ResourceResolver on provided Query: {} => {}", + log.error("Could not set ResourceResolver on provided Query: {} => {}", e.getClass().getName(), e.getMessage()); } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/errorpagehandler/impl/ErrorPageHandlerImpl.java b/bundle/src/main/java/com/adobe/acs/commons/errorpagehandler/impl/ErrorPageHandlerImpl.java index d2cafc98c3..b1e7cf6e4f 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/errorpagehandler/impl/ErrorPageHandlerImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/errorpagehandler/impl/ErrorPageHandlerImpl.java @@ -1003,7 +1003,7 @@ public void includeUsingGET(final SlingHttpServletRequest request, final SlingHt try { dispatcher.include(new GetRequest(request), response); } catch (Exception e) { - log.debug("Exception swallowed while including error page", e); + log.error("Exception swallowed while including error page", e); } } } else { @@ -1011,7 +1011,7 @@ public void includeUsingGET(final SlingHttpServletRequest request, final SlingHt try { response.getWriter().write(responseData); } catch (Exception e) { - log.info("Exception swallowed while including error page", e); + log.error("Exception swallowed while including error page", e); } } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/engine/HttpCacheServletResponseWrapper.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/engine/HttpCacheServletResponseWrapper.java index 237a500800..0eaf8e6354 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/engine/HttpCacheServletResponseWrapper.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/engine/HttpCacheServletResponseWrapper.java @@ -102,7 +102,7 @@ public Collection getHeaderNames() { try { return super.getHeaderNames(); } catch (AbstractMethodError e) { - log.debug("Known issue when internal sling redirects are made - the call to getHeaders() will throw an exception.", e); + log.warn("Known issue when internal sling redirects are made - the call to getHeaders() will throw an exception.", e); return Collections.EMPTY_LIST; } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/httpcache/invalidator/HttpCacheInvalidationJobConsumer.java b/bundle/src/main/java/com/adobe/acs/commons/httpcache/invalidator/HttpCacheInvalidationJobConsumer.java index c22bcea523..e0d257b624 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/httpcache/invalidator/HttpCacheInvalidationJobConsumer.java +++ b/bundle/src/main/java/com/adobe/acs/commons/httpcache/invalidator/HttpCacheInvalidationJobConsumer.java @@ -110,7 +110,7 @@ void invalidate(String path){ log.debug("invalidating {}", path); httpCacheEngine.invalidateCache(path); } catch (HttpCacheException e){ - log.debug("Job with the payload path - {} has invalidated the cache", path); + log.error("Job with the payload path - {} has invalidated the cache", path); } } @@ -131,7 +131,7 @@ void invalidateReferences(String path) { } } catch (Exception e){ - log.debug("failed to invalidate references of {}", path); + log.error("failed to invalidate references of {}", path); } } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/DialogResourceProviderImpl.java b/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/DialogResourceProviderImpl.java index c840d994b0..1dbb114fbb 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/DialogResourceProviderImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/mcp/impl/DialogResourceProviderImpl.java @@ -104,7 +104,7 @@ private void setResourceTypeFromClass() throws IllegalAccessException, Instantia } } } catch (RuntimeException | ReflectiveOperationException ex) { - LOGGER.debug("Unable to determine sling resource type for model bean: {} ", originalClass); + LOGGER.error("Unable to determine sling resource type for model bean: {} ", originalClass); } } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/ondeploy/scripts/OnDeployScriptBase.java b/bundle/src/main/java/com/adobe/acs/commons/ondeploy/scripts/OnDeployScriptBase.java index c8d405054d..56e58c8ee9 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/ondeploy/scripts/OnDeployScriptBase.java +++ b/bundle/src/main/java/com/adobe/acs/commons/ondeploy/scripts/OnDeployScriptBase.java @@ -127,7 +127,7 @@ protected final Node getOrCreateNode(String absolutePath, String intermediateNod try { return session.getNode(absolutePath); } catch (PathNotFoundException e) { - logger.info("Creating node (and missing parents): {}", absolutePath); + logger.warn("Creating node (and missing parents): {}", absolutePath); return JcrUtil.createPath(absolutePath, intermediateNodeType, nodeType, session, false); } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/redirects/models/RedirectRule.java b/bundle/src/main/java/com/adobe/acs/commons/redirects/models/RedirectRule.java index 4e5d999fcc..5c8af3969a 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/redirects/models/RedirectRule.java +++ b/bundle/src/main/java/com/adobe/acs/commons/redirects/models/RedirectRule.java @@ -20,7 +20,6 @@ import com.adobe.granite.security.user.util.AuthorizableUtil; import com.day.cq.tagging.Tag; import com.day.cq.tagging.TagManager; -import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.DefaultInjectionStrategy; import org.apache.sling.models.annotations.Model; @@ -269,7 +268,7 @@ static Pattern toRegex(String src, boolean nc) { ptrn = null; } } catch (PatternSyntaxException e) { - log.info("invalid regex: {}", src); + log.error("invalid regex: {}", src); ptrn = null; } return ptrn; diff --git a/bundle/src/main/java/com/adobe/acs/commons/reports/models/ReportRunner.java b/bundle/src/main/java/com/adobe/acs/commons/reports/models/ReportRunner.java index 1fe790d85d..2931f1411f 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/reports/models/ReportRunner.java +++ b/bundle/src/main/java/com/adobe/acs/commons/reports/models/ReportRunner.java @@ -86,7 +86,7 @@ private boolean executeConfig(Resource config, SlingHttpServletRequest request, } catch (ReportException e) { log.warn(e.getMessage(), e); } catch (Exception e) { - log.warn("Unexpected exception executing report executor " + reportExecutor, e); + log.warn("Unexpected exception executing report executor {} ", reportExecutor, e); } return false; } diff --git a/bundle/src/main/java/com/adobe/acs/commons/rewriter/impl/VersionedClientlibsTransformerFactory.java b/bundle/src/main/java/com/adobe/acs/commons/rewriter/impl/VersionedClientlibsTransformerFactory.java index 09ea9e1ad5..c338909d65 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/rewriter/impl/VersionedClientlibsTransformerFactory.java +++ b/bundle/src/main/java/com/adobe/acs/commons/rewriter/impl/VersionedClientlibsTransformerFactory.java @@ -463,7 +463,7 @@ public void doFilter(final ServletRequest request, try { md5FromCache = getCacheEntry(uriInfo.cacheKey); } catch (Exception e) { - log.debug("Failed to get cache entry for '{}'", uriInfo.cacheKey); + log.warn("Failed to get cache entry for '{}'", uriInfo.cacheKey); } // this static value "Invalid cache key parameter." happens when the cache key can't be diff --git a/bundle/src/main/java/com/adobe/acs/commons/twitter/impl/TwitterAdapterFactoryRegisterer.java b/bundle/src/main/java/com/adobe/acs/commons/twitter/impl/TwitterAdapterFactoryRegisterer.java index d5841fadf2..bb77cfb061 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/twitter/impl/TwitterAdapterFactoryRegisterer.java +++ b/bundle/src/main/java/com/adobe/acs/commons/twitter/impl/TwitterAdapterFactoryRegisterer.java @@ -68,7 +68,7 @@ protected void activate(BundleContext bundleContext, Map propert this.adapterFactoryServiceRegistration = bundleContext.registerService(AdapterFactory.class, adapterFactory, serviceProps); } catch (NoClassDefFoundError e) { - log.info("Twitter4J Library not found. Not registering TwitterAdapterFactory."); + log.error("Twitter4J Library not found. Not registering TwitterAdapterFactory."); } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/wcm/comparisons/impl/PageCompareDataImpl.java b/bundle/src/main/java/com/adobe/acs/commons/wcm/comparisons/impl/PageCompareDataImpl.java index 2633dfc56a..1fa01843f3 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/wcm/comparisons/impl/PageCompareDataImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/wcm/comparisons/impl/PageCompareDataImpl.java @@ -82,7 +82,7 @@ private void initialize() throws RepositoryException { } } } catch (javax.jcr.UnsupportedRepositoryOperationException e) { - log.debug(String.format("node %s not versionable", this.resource.getPath())); + log.warn(String.format("node %s not versionable", this.resource.getPath())); } versionSelection.add(new VersionSelectionImpl("latest", Properties.lastModified(resource))); } diff --git a/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/ComponentErrorHandlerImpl.java b/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/ComponentErrorHandlerImpl.java index f133ce7fc1..06ece1294f 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/ComponentErrorHandlerImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/ComponentErrorHandlerImpl.java @@ -232,7 +232,7 @@ private void doFilterWithErrorHandling(final SlingHttpServletRequest slingReques if (this.isComponentErrorHandlingSuppressed(slingRequest)) { // Allows disabling from within an inclusion. // This is checked before the suppression is reset to the "pre-inclusion" state - log.debug("Suppressed component error handling for: {}", + log.warn("Suppressed component error handling for: {}", slingRequest.getResource().getPath()); throw new ServletException(ex); diff --git a/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverScheduler.java b/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverScheduler.java index 77c3b78c8c..3122a48c53 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverScheduler.java +++ b/bundle/src/main/java/com/adobe/acs/commons/workflow/bulk/removal/impl/WorkflowInstanceRemoverScheduler.java @@ -182,7 +182,7 @@ public final void run() { } catch (InterruptedException e) { log.error("Interrupted Exception during Workflow Removal", e); } catch (WorkflowRemovalForceQuitException e) { - log.info("Workflow Removal force quit", e); + log.error("Workflow Removal force quit", e); } } diff --git a/bundle/src/main/java/com/adobe/acs/commons/workflow/synthetic/impl/SyntheticWorkflowRunnerImpl.java b/bundle/src/main/java/com/adobe/acs/commons/workflow/synthetic/impl/SyntheticWorkflowRunnerImpl.java index ec59ac8204..7afdc46ed0 100644 --- a/bundle/src/main/java/com/adobe/acs/commons/workflow/synthetic/impl/SyntheticWorkflowRunnerImpl.java +++ b/bundle/src/main/java/com/adobe/acs/commons/workflow/synthetic/impl/SyntheticWorkflowRunnerImpl.java @@ -296,9 +296,9 @@ private void run(final ResourceResolver resourceResolver, session.save(); } } catch (RepositoryException e) { - log.error("Could not complete save at end of synthetic workflow execution process" - + " [ {} ]", payloadPath, e); - throw new WorkflowException(e); + throw new WorkflowException(String.format( + "Could not complete save at end of synthetic workflow execution process [ %s ]", payloadPath), + e); } }