This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5bb5baa2ce3 CAMEL-19770: cleanup catches of Throwable in DSLs
5bb5baa2ce3 is described below
commit 5bb5baa2ce3769b9c41da0c71894cbd45b50f4f3
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Fri Nov 10 11:33:18 2023 +0100
CAMEL-19770: cleanup catches of Throwable in DSLs
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java | 2 +-
.../camel/dsl/jbang/core/commands/action/ActionBaseCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/action/MessageTableHelper.java | 4 ++--
.../java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java | 2 +-
.../camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java | 2 +-
.../org/apache/camel/main/download/KnownDependenciesResolver.java | 2 +-
.../main/java/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 64b4afbe186..ad7ccb612e9 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
@@ -678,7 +678,7 @@ public class Debug extends Run {
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 e8f38ca47c4..0bdd8000fe3 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 @@ abstract class ActionBaseCommand extends CamelCommand {
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 94f181d71cb..6c927821e6e 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 @@ public class MessageTableHelper {
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 @@ public class MessageTableHelper {
} 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 dae1c05a20b..4dc156986c5 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 @@ public class Hawtio extends CamelCommand {
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 a27c64df153..408e6d103b1 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 @@ abstract class ProcessBaseCommand extends CamelCommand {
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 3421a9d8ee1..68ff41c456b 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 @@ public final class KnownDependenciesResolver {
}
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 fc5626010f1..251bcbdd30b 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 @@ public final class KnownReposResolver {
}
addRepos(map);
}
- } catch (Throwable e) {
+ } catch (Exception e) {
// ignore
}
}
