This is an automated email from the ASF dual-hosted git repository.
jeremyross 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 fd68d1cce1f CAMEL-17979: camel-salesforce: Restore field values...
fd68d1cce1f is described below
commit fd68d1cce1f91cf9df7d5ae567000f566dc5bad4
Author: Jeremy Ross <[email protected]>
AuthorDate: Sun Apr 17 17:05:01 2022 -0500
CAMEL-17979: camel-salesforce: Restore field values...
prior to invoking the callback.
---
.../salesforce/internal/processor/AbstractRestProcessor.java | 10 +++++-----
.../camel/component/salesforce/RestApiIntegrationTest.java | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
index c9a4a0e140b..e78e5a0b511 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
@@ -367,8 +367,8 @@ public abstract class AbstractRestProcessor extends
AbstractSalesforceProcessor
new RestClient.ResponseCallback() {
@Override
public void onResponse(InputStream response, Map<String,
String> headers, SalesforceException exception) {
- processResponse(exchange, response, headers,
exception, callback);
restoreFields(exchange, sObjectBase, finalsObjectId,
null, null);
+ processResponse(exchange, response, headers,
exception, callback);
}
});
}
@@ -381,8 +381,8 @@ public abstract class AbstractRestProcessor extends
AbstractSalesforceProcessor
restClient.deleteSObject(sObjectName, sObjectId,
determineHeaders(exchange), new RestClient.ResponseCallback() {
@Override
public void onResponse(InputStream response, Map<String, String>
headers, SalesforceException exception) {
- processResponse(exchange, response, headers, exception,
callback);
restoreFields(exchange, sObjectBase, sObjectId, null, null);
+ processResponse(exchange, response, headers, exception,
callback);
}
});
}
@@ -410,8 +410,8 @@ public abstract class AbstractRestProcessor extends
AbstractSalesforceProcessor
new RestClient.ResponseCallback() {
@Override
public void onResponse(InputStream response, Map<String,
String> headers, SalesforceException exception) {
- processResponse(exchange, response, headers,
exception, callback);
restoreFields(exchange, sObjectBase, null,
sObjectExtIdName, finalOldValue);
+ processResponse(exchange, response, headers,
exception, callback);
}
});
}
@@ -438,8 +438,8 @@ public abstract class AbstractRestProcessor extends
AbstractSalesforceProcessor
getRequestStream(exchange), new RestClient.ResponseCallback() {
@Override
public void onResponse(InputStream response, Map<String,
String> headers, SalesforceException exception) {
- processResponse(exchange, response, headers,
exception, callback);
restoreFields(exchange, sObjectBase, null,
sObjectExtIdName, finalOldValue);
+ processResponse(exchange, response, headers,
exception, callback);
}
});
}
@@ -483,8 +483,8 @@ public abstract class AbstractRestProcessor extends
AbstractSalesforceProcessor
new RestClient.ResponseCallback() {
@Override
public void onResponse(InputStream response, Map<String,
String> headers, SalesforceException exception) {
- processResponse(exchange, response, headers,
exception, callback);
restoreFields(exchange, sObjectBase, sObjectId, null,
null);
+ processResponse(exchange, response, headers,
exception, callback);
}
});
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index 51bbb663286..b88756918e9 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -420,6 +420,7 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
lineItem.setName(lineItemId);
UpsertSObjectResult result =
template().requestBody("direct:upsertSObject", lineItem,
UpsertSObjectResult.class);
assertNotNull(result);
+ assertNotNull(lineItem.getName());
assertTrue(result.getSuccess());
assertTrue(result.getCreated());
}