From f267e099a3b3d25e8192650914ee2bbaf4c86cc5 Mon Sep 17 00:00:00 2001 From: Otavio Rodolfo Piske Date: Fri, 10 Nov 2023 11:33:18 +0100 Subject: [PATCH 1/4] CAMEL-19770: cleanup catches of Throwable in DSLs --- .../java/org/apache/camel/dsl/jbang/core/commands/Debug.java | 2 +- .../dsl/jbang/core/commands/action/ActionBaseCommand.java | 2 +- .../dsl/jbang/core/commands/action/MessageTableHelper.java | 4 ++-- .../apache/camel/dsl/jbang/core/commands/process/Hawtio.java | 2 +- .../dsl/jbang/core/commands/process/ProcessBaseCommand.java | 2 +- .../apache/camel/main/download/KnownDependenciesResolver.java | 2 +- .../org/apache/camel/main/download/KnownReposResolver.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java index f5d788235e9fe..4f6012d959f30 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java @@ -672,7 +672,7 @@ JsonObject loadDebug(long pid) { IOHelper.close(fis); return (JsonObject) Jsoner.deserialize(text); } - } catch (Throwable e) { + } catch (Exception e) { // ignore } return null; diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java index e8f38ca47c48c..0bdd8000fe392 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java @@ -86,7 +86,7 @@ JsonObject loadStatus(long pid) { IOHelper.close(fis); return (JsonObject) Jsoner.deserialize(text); } - } catch (Throwable e) { + } catch (Exception e) { // ignore } return null; diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java index 94f181d71cbb1..6c927821e6e91 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java @@ -276,7 +276,7 @@ String valueAsStringPretty() { if (s != null && !s.isEmpty()) { json = true; } - } catch (Throwable e) { + } catch (Exception e) { // ignore as not json } if (s == null || s.isEmpty()) { @@ -291,7 +291,7 @@ String valueAsStringPretty() { } else { s = XmlHelper.prettyPrint(s, 2); } - } catch (Throwable e) { + } catch (Exception e) { // ignore as not xml } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java index dae1c05a20b6c..4dc156986c5f1 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java @@ -140,7 +140,7 @@ protected Integer callHawtio() throws Exception { installHangupInterceptor(); shutdownLatch.await(); - } catch (Throwable e) { + } catch (Exception e) { System.err.println("Cannot launch Hawtio due to: " + e.getMessage()); return 1; } finally { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java index a27c64df1532e..408e6d103b146 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java @@ -87,7 +87,7 @@ JsonObject loadStatus(long pid) { IOHelper.close(fis); return (JsonObject) Jsoner.deserialize(text); } - } catch (Throwable e) { + } catch (Exception e) { // ignore } return null; diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownDependenciesResolver.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownDependenciesResolver.java index 3421a9d8ee16e..68ff41c456b62 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownDependenciesResolver.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownDependenciesResolver.java @@ -51,7 +51,7 @@ private void doLoadKnownDependencies(String name) { } addMappings(map); } - } catch (Throwable e) { + } catch (Exception e) { // ignore } } diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java index fc5626010f1f6..251bcbdd30b8e 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownReposResolver.java @@ -49,7 +49,7 @@ private void doLoadKnownRepos(String name) { } addRepos(map); } - } catch (Throwable e) { + } catch (Exception e) { // ignore } } From ed26f3554e7187de80eac830533f948b5196959c Mon Sep 17 00:00:00 2001 From: Otavio Rodolfo Piske Date: Fri, 10 Nov 2023 11:33:32 +0100 Subject: [PATCH 2/4] CAMEL-19770: cleanup catches of Throwable in camel-report-maven-plugin --- .../camel/maven/htmlxlsx/process/CoverageResultsProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java index c865afbcd2cce..5f3772699346d 100644 --- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java +++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java @@ -225,7 +225,7 @@ protected void gatherBestRouteCoverages() { if (route.getExchangesTotal() > mappedRoute.getExchangesTotal()) { routeMap.put(routeId, route); } - } catch (Throwable t) { + } catch (Exception t) { // this is an edge case that needs to be identified. Log some useful debugging information. System.out.println(t.getClass().toString()); System.out.printf("routeID: %s%n", routeId); From 12dcaa4d86356d7b2beba5d30efb7a1f97bcbebf Mon Sep 17 00:00:00 2001 From: Otavio Rodolfo Piske Date: Fri, 10 Nov 2023 11:33:44 +0100 Subject: [PATCH 3/4] CAMEL-19770: cleanup catches of Throwable in core code --- .../src/main/java/org/apache/camel/processor/Throttler.java | 2 +- .../src/main/java/org/apache/camel/support/MessageHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java index cf306dcd2b472..a7854805cde79 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java @@ -206,7 +206,7 @@ public boolean process(final Exchange exchange, final AsyncCallback callback) { } callback.done(doneSync); return doneSync; - } catch (final Throwable t) { + } catch (final Exception t) { exchange.setException(t); callback.done(doneSync); return doneSync; diff --git a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java index 2f6712103f0b7..35be157940327 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java @@ -694,7 +694,7 @@ public static String dumpMessageHistoryStacktrace( // must not cause new exceptions so run this in a try catch block try { return doDumpMessageHistoryStacktrace(exchange, exchangeFormatter, logStackTrace); - } catch (Throwable e) { + } catch (Exception e) { // ignore as the body is for logging purpose return ""; } From 99a9507c3759e37741689d4dc81d0c15617f2f1b Mon Sep 17 00:00:00 2001 From: Otavio Rodolfo Piske Date: Fri, 10 Nov 2023 11:33:54 +0100 Subject: [PATCH 4/4] CAMEL-19770: cleanup catches of Throwable in components --- .../org/apache/camel/component/olingo2/Olingo2Consumer.java | 2 +- .../apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java | 2 -- .../org/apache/camel/spring/spi/TransactionErrorHandler.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java index d51de91675900..b81fc5df9daa2 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java +++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java @@ -102,7 +102,7 @@ public void onCanceled() { return ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult()); } - } catch (Throwable t) { + } catch (Exception t) { throw RuntimeCamelException.wrapRuntimeCamelException(t); } } diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java index 7fe1213df8682..720997b045ce3 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java @@ -486,8 +486,6 @@ private void readContent( responseHandler.onResponse(this. readContent(uriInfo, content), endpointHttpHeaders); } catch (Exception e) { responseHandler.onException(e); - } catch (Error e) { - responseHandler.onException(new ODataException("Runtime Error Occurred", e)); } } diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java index 796a88f88786a..f31374ddd8bb6 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java @@ -158,7 +158,7 @@ protected void processInTransaction(final Exchange exchange) { } catch (TransactionRollbackException e) { // do not set as exception, as its just a dummy exception to force spring TX to rollback logTransactionRollback(redelivered, ids, null, true); - } catch (Throwable e) { + } catch (Exception e) { exchange.setException(e); logTransactionRollback(redelivered, ids, e, false); } finally {