You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/17 09:59:44 UTC
[camel] 07/13: (chores) camel-salesforce: combined duplicated catch blocks
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
commit 2fdad02f66e573f581e2184e6b0bd01cc3f4e7d9
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 17 10:20:21 2023 +0200
(chores) camel-salesforce: combined duplicated catch blocks
---
.../component/salesforce/codegen/AbstractSalesforceExecution.java | 4 +---
.../salesforce/internal/client/DefaultAnalyticsApiClient.java | 4 ----
.../component/salesforce/internal/client/DefaultRestClient.java | 5 +----
.../component/salesforce/internal/processor/BulkApiProcessor.java | 7 +------
4 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
index 298b11e8ce2..b11b33f2541 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
@@ -235,9 +235,7 @@ public abstract class AbstractSalesforceExecution {
SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
httpClient = new SalesforceHttpClient(sslContextFactory);
- } catch (final GeneralSecurityException e) {
- throw new RuntimeException("Error creating default SSL context: " + e.getMessage(), e);
- } catch (final IOException e) {
+ } catch (GeneralSecurityException | IOException e) {
throw new RuntimeException("Error creating default SSL context: " + e.getMessage(), e);
}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
index eee09ac6fdd..90d3f6c1cca 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
@@ -267,10 +267,6 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
return new SalesforceException(errors, statusCode);
}
- } catch (UnsupportedEncodingException e) {
- // log and ignore
- String msg = "Unexpected Error parsing JSON error response body + [" + responseContent + "] : " + e.getMessage();
- log.warn(msg, e);
} catch (IOException e) {
// log and ignore
String msg = "Unexpected Error parsing JSON error response body + [" + responseContent + "] : " + e.getMessage();
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index 221b753a884..d24e10cc33d 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -335,10 +335,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
setAccessToken(request);
doHttpRequest(request, new DelegatingClientCallback(callback));
- } catch (UnsupportedEncodingException e) {
- String msg = "Unexpected error: " + e.getMessage();
- callback.onResponse(null, Collections.emptyMap(), new SalesforceException(msg, e));
- } catch (URISyntaxException e) {
+ } catch (UnsupportedEncodingException | URISyntaxException e) {
String msg = "Unexpected error: " + e.getMessage();
callback.onResponse(null, Collections.emptyMap(), new SalesforceException(msg, e));
}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
index b6a9d5211b8..8e44584ebfd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
@@ -118,12 +118,7 @@ public class BulkApiProcessor extends AbstractSalesforceProcessor {
e));
callback.done(true);
done = true;
- } catch (InvalidPayloadException e) {
- exchange.setException(new SalesforceException(
- String.format("Unexpected Error processing %s: \"%s\"", operationName.value(), e.getMessage()), e));
- callback.done(true);
- done = true;
- } catch (RuntimeException e) {
+ } catch (InvalidPayloadException | RuntimeException e) {
exchange.setException(new SalesforceException(
String.format("Unexpected Error processing %s: \"%s\"", operationName.value(), e.getMessage()), e));
callback.done(true);