You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/06/30 14:28:19 UTC
[2/3] fixed the various CS errors in the salesforce component - work
in progress
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
----------------------------------------------------------------------
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 ed7a212..2764461 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
@@ -82,323 +82,325 @@ public abstract class AbstractRestProcessor extends AbstractSalesforceProcessor
// call Operation using REST client
switch (operationName) {
- case GET_VERSIONS:
- restClient.getVersions(new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- // process response entity and create out message
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_RESOURCES:
- restClient.getResources(new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_GLOBAL_OBJECTS:
- restClient.getGlobalObjects(new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_BASIC_INFO:
- String sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
- restClient.getBasicInfo(sObjectName, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_DESCRIPTION:
- sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
- restClient.getDescription(sObjectName, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_SOBJECT: {
- String sObjectIdValue;
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- sObjectIdValue = sObjectBase.getId();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ case GET_VERSIONS:
+ restClient.getVersions(new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ // process response entity and create out message
+ processResponse(exchange, response, exception, callback);
}
- final String sObjectId = sObjectIdValue;
+ });
+ break;
+
+ case GET_RESOURCES:
+ restClient.getResources(new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_GLOBAL_OBJECTS:
+ restClient.getGlobalObjects(new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_BASIC_INFO:
+ String sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
+ restClient.getBasicInfo(sObjectName, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_DESCRIPTION:
+ sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
+ restClient.getDescription(sObjectName, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_SOBJECT: {
+ String sObjectIdValue;
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ sObjectIdValue = sObjectBase.getId();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ final String sObjectId = sObjectIdValue;
+
+ // use sObject name to load class
+ setResponseClass(exchange, sObjectName);
- // use sObject name to load class
- setResponseClass(exchange, sObjectName);
+ // get optional field list
+ String fieldsValue = getParameter(SOBJECT_FIELDS, exchange, IGNORE_BODY, IS_OPTIONAL);
+ String[] fields = null;
+ if (fieldsValue != null) {
+ fields = fieldsValue.split(",");
+ }
- // get optional field list
- String fieldsValue = getParameter(SOBJECT_FIELDS, exchange, IGNORE_BODY, IS_OPTIONAL);
- String[] fields = null;
- if (fieldsValue != null) {
- fields = fieldsValue.split(",");
+ restClient.getSObject(sObjectName, sObjectId, fields, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, sObjectId, null, null);
}
+ });
- restClient.getSObject(sObjectName, sObjectId, fields, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, sObjectId, null, null);
- }
- });
+ break;
+ }
- break;
+ case CREATE_SOBJECT: {
+ // determine parameters from input AbstractSObject
+ AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
}
- case CREATE_SOBJECT: {
- // determine parameters from input AbstractSObject
- AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- }
+ restClient.createSObject(sObjectName, getRequestStream(exchange),
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
- restClient.createSObject(sObjectName, getRequestStream(exchange),
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
+ break;
+ }
- break;
+ case UPDATE_SOBJECT: {
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectId;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ // remember the sObject Id
+ sObjectId = sObjectBase.getId();
+ // clear base object fields, which cannot be updated
+ sObjectBase.clearBaseFields();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectId = getParameter(SOBJECT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
}
- case UPDATE_SOBJECT: {
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectId;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- // remember the sObject Id
- sObjectId = sObjectBase.getId();
- // clear base object fields, which cannot be updated
- sObjectBase.clearBaseFields();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectId = getParameter(SOBJECT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- }
+ final String finalsObjectId = sObjectId;
+ restClient.updateSObject(sObjectName, sObjectId, getRequestStream(exchange),
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, finalsObjectId, null, null);
+ }
+ });
+
+ break;
+ }
- final String finalsObjectId = sObjectId;
- restClient.updateSObject(sObjectName, sObjectId, getRequestStream(exchange),
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, finalsObjectId, null, null);
- }
- });
-
- break;
+ case DELETE_SOBJECT: {
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectIdValue;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ sObjectIdValue = sObjectBase.getId();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
}
+ final String sObjectId = sObjectIdValue;
- case DELETE_SOBJECT: {
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectIdValue;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- sObjectIdValue = sObjectBase.getId();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ restClient.deleteSObject(sObjectName, sObjectId, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, sObjectId, null, null);
}
- final String sObjectId = sObjectIdValue;
-
- restClient.deleteSObject(sObjectName, sObjectId, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, sObjectId, null, null);
- }
- });
- break;
+ });
+ break;
+ }
+
+ case GET_SOBJECT_WITH_ID: {
+ Object oldValue = null;
+ String sObjectExtIdValue;
+ final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME,
+ exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
+ sObjectExtIdValue = oldValue.toString();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
}
- case GET_SOBJECT_WITH_ID: {
- Object oldValue = null;
- String sObjectExtIdValue;
- final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME,
- exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
- sObjectExtIdValue = oldValue.toString();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
- }
+ // use sObject name to load class
+ setResponseClass(exchange, sObjectName);
+
+ final Object finalOldValue = oldValue;
+ restClient.getSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
+ }
+ });
- // use sObject name to load class
- setResponseClass(exchange, sObjectName);
+ break;
+ }
+
+ case UPSERT_SOBJECT: {
+ String sObjectExtIdValue;
+ final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange,
+ IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ Object oldValue = null;
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
+ sObjectExtIdValue = oldValue.toString();
+ // clear base object fields, which cannot be updated
+ sObjectBase.clearBaseFields();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ }
- final Object finalOldValue = oldValue;
- restClient.getSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
- }
- });
+ final Object finalOldValue = oldValue;
+ restClient.upsertSObject(sObjectName, sObjectExtIdName, sObjectExtIdValue, getRequestStream(exchange),
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
+ }
+ });
+
+ break;
+ }
- break;
+ case DELETE_SOBJECT_WITH_ID: {
+ final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ Object oldValue = null;
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectExtIdValue;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
+ sObjectExtIdValue = oldValue.toString();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
}
- case UPSERT_SOBJECT: {
- String sObjectExtIdValue;
- final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange,
- IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- Object oldValue = null;
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
- sObjectExtIdValue = oldValue.toString();
- // clear base object fields, which cannot be updated
- sObjectBase.clearBaseFields();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, IGNORE_BODY, NOT_OPTIONAL);
- }
+ final Object finalOldValue = oldValue;
+ restClient.deleteSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
+ }
+ });
+
+ break;
+ }
- final Object finalOldValue = oldValue;
- restClient.upsertSObject(sObjectName, sObjectExtIdName, sObjectExtIdValue,
- getRequestStream(exchange), new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
- }
- });
-
- break;
+ case GET_BLOB_FIELD: {
+ // get blob field name
+ final String sObjectBlobFieldName = getParameter(SOBJECT_BLOB_FIELD_NAME,
+ exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectIdValue;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ sObjectIdValue = sObjectBase.getId();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
}
+ final String sObjectId = sObjectIdValue;
+
+ restClient.getBlobField(sObjectName, sObjectId, sObjectBlobFieldName,
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, sObjectId, null, null);
+ }
+ });
+ break;
+ }
+
+ case QUERY:
+ final String sObjectQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
- case DELETE_SOBJECT_WITH_ID: {
- final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- Object oldValue = null;
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectExtIdValue;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
- sObjectExtIdValue = oldValue.toString();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
+ // use sObject name to load class
+ setResponseClass(exchange, null);
+
+ restClient.query(sObjectQuery, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
}
+ });
+ break;
- final Object finalOldValue = oldValue;
- restClient.deleteSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
- }
- });
-
- break;
- }
+ case QUERY_MORE:
+ // reuse SOBJECT_QUERY parameter name for nextRecordsUrl
+ final String nextRecordsUrl = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
- case GET_BLOB_FIELD: {
- // get blob field name
- final String sObjectBlobFieldName = getParameter(SOBJECT_BLOB_FIELD_NAME,
- exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectIdValue;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- sObjectIdValue = sObjectBase.getId();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ // use custom response class property
+ setResponseClass(exchange, null);
+
+ restClient.queryMore(nextRecordsUrl, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
}
- final String sObjectId = sObjectIdValue;
-
- restClient.getBlobField(sObjectName, sObjectId, sObjectBlobFieldName,
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, sObjectId, null, null);
- }
- });
- break;
- }
+ });
+ break;
- case QUERY:
- final String sObjectQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
-
- // use sObject name to load class
- setResponseClass(exchange, null);
-
- restClient.query(sObjectQuery, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case QUERY_MORE:
- // reuse SOBJECT_QUERY parameter name for nextRecordsUrl
- final String nextRecordsUrl = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
-
- // use custom response class property
- setResponseClass(exchange, null);
-
- restClient.queryMore(nextRecordsUrl, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case SEARCH:
- final String sObjectSearch = getParameter(SOBJECT_SEARCH, exchange, USE_BODY, NOT_OPTIONAL);
-
- restClient.search(sObjectSearch, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
+ case SEARCH:
+ final String sObjectSearch = getParameter(SOBJECT_SEARCH, exchange, USE_BODY, NOT_OPTIONAL);
- }
+ restClient.search(sObjectSearch, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
+
+ }
} catch (SalesforceException e) {
exchange.setException(new SalesforceException(
String.format("Error processing %s: [%s] \"%s\"",
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
index c214c01..db5c66b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
@@ -35,7 +35,8 @@ public abstract class AbstractSalesforceProcessor implements SalesforceProcessor
protected static final boolean IS_OPTIONAL = true;
protected static final boolean USE_BODY = true;
protected static final boolean IGNORE_BODY = false;
- protected final Logger LOG = LoggerFactory.getLogger(this.getClass());
+
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
protected final SalesforceEndpoint endpoint;
protected final Map<String, String> endpointConfigMap;
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
----------------------------------------------------------------------
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 d461207..38ab6c6 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
@@ -60,297 +60,297 @@ public class BulkApiProcessor extends AbstractSalesforceProcessor {
boolean done = false;
try {
switch (operationName) {
- case CREATE_JOB:
- JobInfo jobBody = exchange.getIn().getMandatoryBody(JobInfo.class);
- bulkClient.createJob(jobBody, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case GET_JOB:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- String jobId;
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ case CREATE_JOB:
+ JobInfo jobBody = exchange.getIn().getMandatoryBody(JobInfo.class);
+ bulkClient.createJob(jobBody, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
- bulkClient.getJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case CLOSE_JOB:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case GET_JOB:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ String jobId;
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
- bulkClient.closeJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case ABORT_JOB:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case CLOSE_JOB:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.closeJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
- bulkClient.abortJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case CREATE_BATCH:
- // since request is in the body, use headers or endpoint params
- ContentType contentType = ContentType.fromValue(
- getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- InputStream request;
- try {
- request = exchange.getIn().getMandatoryBody(InputStream.class);
- } catch (CamelException e) {
- String msg = "Error preparing batch request: " + e.getMessage();
- throw new SalesforceException(msg, e);
+ });
+
+ break;
+
+ case ABORT_JOB:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.abortJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
-
- bulkClient.createBatch(request, jobId, contentType, new BulkApiClient.BatchInfoResponseCallback() {
- @Override
- public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
- processResponse(exchange, batchInfo, ex, callback);
- }
- });
-
- break;
-
- case GET_BATCH:
- BatchInfo batchBody = exchange.getIn().getBody(BatchInfo.class);
- String batchId;
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case CREATE_BATCH:
+ // since request is in the body, use headers or endpoint params
+ ContentType contentType = ContentType.fromValue(
+ getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ InputStream request;
+ try {
+ request = exchange.getIn().getMandatoryBody(InputStream.class);
+ } catch (CamelException e) {
+ String msg = "Error preparing batch request: " + e.getMessage();
+ throw new SalesforceException(msg, e);
+ }
+
+ bulkClient.createBatch(request, jobId, contentType, new BulkApiClient.BatchInfoResponseCallback() {
+ @Override
+ public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
+ processResponse(exchange, batchInfo, ex, callback);
}
- bulkClient.getBatch(jobId, batchId, new BulkApiClient.BatchInfoResponseCallback() {
- @Override
- public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
- processResponse(exchange, batchInfo, ex, callback);
- }
- });
+ });
- break;
+ break;
- case GET_ALL_BATCHES:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ case GET_BATCH:
+ BatchInfo batchBody = exchange.getIn().getBody(BatchInfo.class);
+ String batchId;
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getBatch(jobId, batchId, new BulkApiClient.BatchInfoResponseCallback() {
+ @Override
+ public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
+ processResponse(exchange, batchInfo, ex, callback);
}
- bulkClient.getAllBatches(jobId, new BulkApiClient.BatchInfoListResponseCallback() {
- @Override
- public void onResponse(List<BatchInfo> batchInfoList, SalesforceException ex) {
- processResponse(exchange, batchInfoList, ex, callback);
- }
- });
-
- break;
-
- case GET_REQUEST:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case GET_ALL_BATCHES:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getAllBatches(jobId, new BulkApiClient.BatchInfoListResponseCallback() {
+ @Override
+ public void onResponse(List<BatchInfo> batchInfoList, SalesforceException ex) {
+ processResponse(exchange, batchInfoList, ex, callback);
}
+ });
- bulkClient.getRequest(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
- @Override
- public void onResponse(InputStream inputStream, SalesforceException ex) {
- // read the request stream into a StreamCache temp file
- // ensures the connection is read
- StreamCache body = null;
- if (inputStream != null) {
+ break;
+
+ case GET_REQUEST:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+
+ bulkClient.getRequest(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
+ @Override
+ public void onResponse(InputStream inputStream, SalesforceException ex) {
+ // read the request stream into a StreamCache temp file
+ // ensures the connection is read
+ StreamCache body = null;
+ if (inputStream != null) {
+ try {
+ body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ } catch (IOException e) {
+ String msg = "Error retrieving batch request: " + e.getMessage();
+ ex = new SalesforceException(msg, e);
+ } finally {
+ // close the input stream to release the Http connection
try {
- body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
- } catch (IOException e) {
- String msg = "Error retrieving batch request: " + e.getMessage();
- ex = new SalesforceException(msg, e);
- } finally {
- // close the input stream to release the Http connection
- try {
- inputStream.close();
- } catch (IOException ignore) {
- }
+ inputStream.close();
+ } catch (IOException ignore) {
}
}
- processResponse(exchange, body, ex, callback);
}
- });
-
- break;
-
- case GET_RESULTS:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ processResponse(exchange, body, ex, callback);
}
- bulkClient.getResults(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
- @Override
- public void onResponse(InputStream inputStream, SalesforceException ex) {
- // read the result stream into a StreamCache temp file
- // ensures the connection is read
- StreamCache body = null;
- if (inputStream != null) {
+ });
+
+ break;
+
+ case GET_RESULTS:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getResults(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
+ @Override
+ public void onResponse(InputStream inputStream, SalesforceException ex) {
+ // read the result stream into a StreamCache temp file
+ // ensures the connection is read
+ StreamCache body = null;
+ if (inputStream != null) {
+ try {
+ body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ } catch (IOException e) {
+ String msg = "Error retrieving batch results: " + e.getMessage();
+ ex = new SalesforceException(msg, e);
+ } finally {
+ // close the input stream to release the Http connection
try {
- body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
- } catch (IOException e) {
- String msg = "Error retrieving batch results: " + e.getMessage();
- ex = new SalesforceException(msg, e);
- } finally {
- // close the input stream to release the Http connection
- try {
- inputStream.close();
- } catch (IOException ignore) {
- }
+ inputStream.close();
+ } catch (IOException ignore) {
}
}
- processResponse(exchange, body, ex, callback);
}
- });
-
- break;
-
- case CREATE_BATCH_QUERY:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- String soqlQuery;
- if (jobBody != null) {
- jobId = jobBody.getId();
- contentType = jobBody.getContentType();
- // use SOQL query from header or endpoint config
- soqlQuery = getParameter(SOBJECT_QUERY, exchange, IGNORE_BODY, NOT_OPTIONAL);
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- contentType = ContentType.fromValue(
- getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
- // reuse SOBJECT_QUERY property
- soqlQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
- }
- bulkClient.createBatchQuery(jobId, soqlQuery, contentType,
- new BulkApiClient.BatchInfoResponseCallback() {
- @Override
- public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
- processResponse(exchange, batchInfo, ex, callback);
- }
- });
-
- break;
-
- case GET_QUERY_RESULT_IDS:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ processResponse(exchange, body, ex, callback);
}
- bulkClient.getQueryResultIds(jobId, batchId, new BulkApiClient.QueryResultIdsCallback() {
- @Override
- public void onResponse(List<String> ids, SalesforceException ex) {
- processResponse(exchange, ids, ex, callback);
- }
- });
-
- break;
-
- case GET_QUERY_RESULT:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- String resultId;
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- resultId = getParameter(RESULT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- resultId = getParameter(RESULT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case CREATE_BATCH_QUERY:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ String soqlQuery;
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ contentType = jobBody.getContentType();
+ // use SOQL query from header or endpoint config
+ soqlQuery = getParameter(SOBJECT_QUERY, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ contentType = ContentType.fromValue(
+ getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ // reuse SOBJECT_QUERY property
+ soqlQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.createBatchQuery(jobId, soqlQuery, contentType,
+ new BulkApiClient.BatchInfoResponseCallback() {
+ @Override
+ public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
+ processResponse(exchange, batchInfo, ex, callback);
+ }
+ });
+
+ break;
+
+ case GET_QUERY_RESULT_IDS:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getQueryResultIds(jobId, batchId, new BulkApiClient.QueryResultIdsCallback() {
+ @Override
+ public void onResponse(List<String> ids, SalesforceException ex) {
+ processResponse(exchange, ids, ex, callback);
}
- bulkClient.getQueryResult(jobId, batchId, resultId, new BulkApiClient.StreamResponseCallback() {
- @Override
- public void onResponse(InputStream inputStream, SalesforceException ex) {
- StreamCache body = null;
- if (inputStream != null) {
- // read the result stream into a StreamCache temp file
- // ensures the connection is read
+ });
+
+ break;
+
+ case GET_QUERY_RESULT:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ String resultId;
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ resultId = getParameter(RESULT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ resultId = getParameter(RESULT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getQueryResult(jobId, batchId, resultId, new BulkApiClient.StreamResponseCallback() {
+ @Override
+ public void onResponse(InputStream inputStream, SalesforceException ex) {
+ StreamCache body = null;
+ if (inputStream != null) {
+ // read the result stream into a StreamCache temp file
+ // ensures the connection is read
+ try {
+ body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ } catch (IOException e) {
+ String msg = "Error retrieving query result: " + e.getMessage();
+ ex = new SalesforceException(msg, e);
+ } finally {
+ // close the input stream to release the Http connection
try {
- body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ inputStream.close();
} catch (IOException e) {
- String msg = "Error retrieving query result: " + e.getMessage();
- ex = new SalesforceException(msg, e);
- } finally {
- // close the input stream to release the Http connection
- try {
- inputStream.close();
- } catch (IOException e) {
- // ignore
- }
+ // ignore
}
}
- processResponse(exchange, body, ex, callback);
}
- });
+ processResponse(exchange, body, ex, callback);
+ }
+ });
- break;
- }
+ break;
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
+
+ }
} catch (SalesforceException e) {
exchange.setException(new SalesforceException(
String.format("Error processing %s: [%s] \"%s\"",
- operationName, e.getStatusCode(), e.getMessage()),
- e));
+ operationName, e.getStatusCode(), e.getMessage()), e));
callback.done(true);
done = true;
} catch (InvalidPayloadException e) {
exchange.setException(new SalesforceException(
String.format("Unexpected Error processing %s: \"%s\"",
- operationName, e.getMessage()),
- e));
+ operationName, e.getMessage()), e));
callback.done(true);
done = true;
} catch (RuntimeException e) {
exchange.setException(new SalesforceException(
String.format("Unexpected Error processing %s: \"%s\"",
- operationName, e.getMessage()),
- e));
+ operationName, e.getMessage()), e));
callback.done(true);
done = true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
index 528d8ca..5fee6c1 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
@@ -42,9 +42,10 @@ import org.eclipse.jetty.util.StringUtil;
public class JsonRestProcessor extends AbstractRestProcessor {
+ private static final String RESPONSE_TYPE = JsonRestProcessor.class.getName() + ".responseType";
+
// it is ok to use a single thread safe ObjectMapper
private final ObjectMapper objectMapper;
- private static final String RESPONSE_TYPE = JsonRestProcessor.class.getName() + ".responseType";
public JsonRestProcessor(SalesforceEndpoint endpoint) throws SalesforceException {
super(endpoint);
@@ -55,51 +56,53 @@ public class JsonRestProcessor extends AbstractRestProcessor {
}
@Override
- protected void processRequest(Exchange exchange) {
+ protected void processRequest(Exchange exchange) throws SalesforceException {
switch (operationName) {
- case GET_VERSIONS:
- // handle in built response types
- exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<Version>>() {
- });
- break;
-
- case GET_RESOURCES:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, RestResources.class);
- break;
-
- case GET_GLOBAL_OBJECTS:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
- break;
-
- case GET_BASIC_INFO:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
- break;
-
- case GET_DESCRIPTION:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
- break;
-
- case CREATE_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case UPSERT_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case SEARCH:
- // handle known response type
- exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<SearchResult>>() {
- });
- break;
-
+ case GET_VERSIONS:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<Version>>() {
+ });
+ break;
+
+ case GET_RESOURCES:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, RestResources.class);
+ break;
+
+ case GET_GLOBAL_OBJECTS:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
+ break;
+
+ case GET_BASIC_INFO:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
+ break;
+
+ case GET_DESCRIPTION:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
+ break;
+
+ case CREATE_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case UPSERT_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case SEARCH:
+ // handle known response type
+ exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<SearchResult>>() {
+ });
+ break;
+
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
}
}
@@ -120,8 +123,8 @@ public class JsonRestProcessor extends AbstractRestProcessor {
// if all else fails, get body as String
final String body = in.getBody(String.class);
if (null == body) {
- String msg = "Unsupported request message body " +
- (in.getBody() == null ? null : in.getBody().getClass());
+ String msg = "Unsupported request message body "
+ + (in.getBody() == null ? null : in.getBody().getClass());
throw new SalesforceException(msg, null);
} else {
request = new ByteArrayInputStream(body.getBytes(StringUtil.__UTF8_CHARSET));
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
index 905127a..253be42 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
@@ -84,73 +84,69 @@ public class XmlRestProcessor extends AbstractRestProcessor {
protected void processRequest(Exchange exchange) throws SalesforceException {
switch (operationName) {
- case GET_VERSIONS:
- exchange.setProperty(RESPONSE_CLASS, Versions.class);
- break;
-
- case GET_RESOURCES:
- exchange.setProperty(RESPONSE_CLASS, RestResources.class);
- break;
-
- case GET_GLOBAL_OBJECTS:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
- break;
-
- case GET_BASIC_INFO:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
-
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
- break;
-
- case GET_DESCRIPTION:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
-
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
- break;
-
- case GET_SOBJECT:
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
- break;
-
- case CREATE_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case GET_SOBJECT_WITH_ID:
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
- break;
-
- case UPSERT_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case QUERY:
- case QUERY_MORE:
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- "QueryResult");
- break;
-
- case SEARCH:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, SearchResults.class);
- break;
-
+ case GET_VERSIONS:
+ exchange.setProperty(RESPONSE_CLASS, Versions.class);
+ break;
+
+ case GET_RESOURCES:
+ exchange.setProperty(RESPONSE_CLASS, RestResources.class);
+ break;
+
+ case GET_GLOBAL_OBJECTS:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
+ break;
+
+ case GET_BASIC_INFO:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
+
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
+ break;
+
+ case GET_DESCRIPTION:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
+
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
+ break;
+
+ case GET_SOBJECT:
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ break;
+
+ case CREATE_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case GET_SOBJECT_WITH_ID:
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ break;
+
+ case UPSERT_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case QUERY:
+ case QUERY_MORE:
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, "QueryResult");
+ break;
+
+ case SEARCH:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, SearchResults.class);
+ break;
+
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
}
-
}
protected InputStream getRequestStream(Exchange exchange) throws SalesforceException {
@@ -173,8 +169,8 @@ public class XmlRestProcessor extends AbstractRestProcessor {
// if all else fails, get body as String
final String body = in.getBody(String.class);
if (null == body) {
- String msg = "Unsupported request message body " +
- (in.getBody() == null ? null : in.getBody().getClass());
+ String msg = "Unsupported request message body "
+ + (in.getBody() == null ? null : in.getBody().getClass());
throw new SalesforceException(msg, null);
} else {
request = new ByteArrayInputStream(body.getBytes(StringUtil.__UTF8_CHARSET));
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
index 70e8fa4..4924aad 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
public class PushTopicHelper {
private static final Logger LOG = LoggerFactory.getLogger(PushTopicHelper.class);
- private static final ObjectMapper objectMapper = new ObjectMapper();
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private static final String PUSH_TOPIC_OBJECT_NAME = "PushTopic";
private static final long API_TIMEOUT = 60; // Rest API call timeout
private final SalesforceEndpointConfig config;
@@ -55,9 +55,9 @@ public class PushTopicHelper {
// lookup Topic first
try {
// use SOQL to lookup Topic, since Name is not an external ID!!!
- restClient.query("SELECT Id, Name, Query, ApiVersion, IsActive, " +
- "NotifyForFields, NotifyForOperations, Description " +
- "FROM PushTopic WHERE Name = '" + topicName + "'",
+ restClient.query("SELECT Id, Name, Query, ApiVersion, IsActive, "
+ + "NotifyForFields, NotifyForOperations, Description "
+ + "FROM PushTopic WHERE Name = '" + topicName + "'",
callback);
if (!callback.await(API_TIMEOUT, TimeUnit.SECONDS)) {
@@ -66,7 +66,7 @@ public class PushTopicHelper {
if (callback.getException() != null) {
throw callback.getException();
}
- QueryRecordsPushTopic records = objectMapper.readValue(callback.getResponse(),
+ QueryRecordsPushTopic records = OBJECT_MAPPER.readValue(callback.getResponse(),
QueryRecordsPushTopic.class);
if (records.getTotalSize() == 1) {
@@ -74,12 +74,12 @@ public class PushTopicHelper {
LOG.info("Found existing topic {}: {}", topicName, topic);
// check if we need to update topic query, notifyForFields or notifyForOperations
- if (!query.equals(topic.getQuery()) ||
- (config.getNotifyForFields() != null &&
- !config.getNotifyForFields().equals(topic.getNotifyForFields())) ||
- (config.getNotifyForOperations() != null &&
- !config.getNotifyForOperations().equals(topic.getNotifyForOperations()))
- ) {
+ if (!query.equals(topic.getQuery())
+ || (config.getNotifyForFields() != null
+ && !config.getNotifyForFields().equals(topic.getNotifyForFields()))
+ || (config.getNotifyForOperations() != null
+ && !config.getNotifyForOperations().equals(topic.getNotifyForOperations()))
+ ) {
if (!config.isUpdateTopic()) {
String msg = "Query doesn't match existing Topic and updateTopic is set to false";
@@ -132,7 +132,7 @@ public class PushTopicHelper {
final SyncResponseCallback callback = new SyncResponseCallback();
try {
restClient.createSObject(PUSH_TOPIC_OBJECT_NAME,
- new ByteArrayInputStream(objectMapper.writeValueAsBytes(topic)), callback);
+ new ByteArrayInputStream(OBJECT_MAPPER.writeValueAsBytes(topic)), callback);
if (!callback.await(API_TIMEOUT, TimeUnit.SECONDS)) {
throw new SalesforceException("API call timeout!", null);
@@ -141,7 +141,7 @@ public class PushTopicHelper {
throw callback.getException();
}
- CreateSObjectResult result = objectMapper.readValue(callback.getResponse(), CreateSObjectResult.class);
+ CreateSObjectResult result = OBJECT_MAPPER.readValue(callback.getResponse(), CreateSObjectResult.class);
if (!result.getSuccess()) {
final SalesforceException salesforceException = new SalesforceException(
result.getErrors(), HttpStatus.BAD_REQUEST_400);
@@ -185,7 +185,7 @@ public class PushTopicHelper {
topic.setNotifyForOperations(config.getNotifyForOperations());
restClient.updateSObject("PushTopic", topicId,
- new ByteArrayInputStream(objectMapper.writeValueAsBytes(topic)),
+ new ByteArrayInputStream(OBJECT_MAPPER.writeValueAsBytes(topic)),
callback);
if (!callback.await(API_TIMEOUT, TimeUnit.SECONDS)) {
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index f31fdda..40933a9 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -50,6 +50,7 @@ import static org.cometd.bayeux.Message.ERROR_FIELD;
import static org.cometd.bayeux.Message.SUBSCRIPTION_FIELD;
public class SubscriptionHelper implements Service {
+
private static final Logger LOG = LoggerFactory.getLogger(SubscriptionHelper.class);
private static final int CONNECT_TIMEOUT = 110;
@@ -134,8 +135,7 @@ public class SubscriptionHelper implements Service {
new HashMap<SalesforceConsumer, ClientSessionChannel.MessageListener>();
map.putAll(listenerMap);
listenerMap.clear();
- for (Map.Entry<SalesforceConsumer, ClientSessionChannel.MessageListener> entry :
- map.entrySet()) {
+ for (Map.Entry<SalesforceConsumer, ClientSessionChannel.MessageListener> entry : map.entrySet()) {
final SalesforceConsumer consumer = entry.getKey();
final String topicName = consumer.getTopicName();
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
index 7ce7311..52d1d65 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce;
import java.io.IOException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import org.apache.camel.test.junit4.CamelTestSupport;
public abstract class AbstractSalesforceTestBase extends CamelTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
index 52bf7cc..d1b7303 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
@@ -16,18 +16,23 @@
*/
package org.apache.camel.component.salesforce;
-import org.apache.camel.component.salesforce.api.dto.bulk.*;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
-import org.junit.experimental.theories.DataPoints;
-import org.junit.experimental.theories.Theory;
-
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.component.salesforce.api.dto.bulk.BatchInfo;
+import org.apache.camel.component.salesforce.api.dto.bulk.BatchStateEnum;
+import org.apache.camel.component.salesforce.api.dto.bulk.ContentType;
+import org.apache.camel.component.salesforce.api.dto.bulk.JobInfo;
+import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theory;
+
public class BulkApiBatchIntegrationTest extends AbstractBulkApiTestBase {
+
private static final String TEST_REQUEST_XML = "/test-request.xml";
private static final String TEST_REQUEST_CSV = "/test-request.csv";