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:20 UTC
[3/3] git commit: fixed the various CS errors in the salesforce
component - work in progress
fixed the various CS errors in the salesforce component - work in progress
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d5892e6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d5892e6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d5892e6
Branch: refs/heads/master
Commit: 9d5892e6dcba035185962f78e9f39741ac845f28
Parents: d92b38d
Author: cmueller <cm...@apache.org>
Authored: Sun Jun 30 14:28:06 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sun Jun 30 14:28:06 2013 +0200
----------------------------------------------------------------------
.../salesforce/SalesforceComponent.java | 12 +-
.../salesforce/SalesforceConsumer.java | 10 +-
.../salesforce/SalesforceEndpoint.java | 4 -
.../salesforce/SalesforceEndpointConfig.java | 8 +-
.../salesforce/api/JodaTimeConverter.java | 13 +-
.../salesforce/api/PicklistEnumConverter.java | 5 +-
.../salesforce/api/SalesforceException.java | 2 +
.../salesforce/api/dto/AbstractDTOBase.java | 5 +-
.../salesforce/api/dto/AbstractSObjectBase.java | 91 ++-
.../salesforce/api/dto/Attributes.java | 1 +
.../salesforce/api/dto/ChildRelationShip.java | 1 +
.../salesforce/api/dto/CreateSObjectResult.java | 2 -
.../salesforce/api/dto/GlobalObjects.java | 1 -
.../salesforce/api/dto/RecentItem.java | 14 +-
.../salesforce/api/dto/RecordTypeInfo.java | 1 +
.../component/salesforce/api/dto/RestError.java | 1 +
.../component/salesforce/api/dto/SObject.java | 1 +
.../salesforce/api/dto/SObjectBasicInfo.java | 1 -
.../salesforce/api/dto/SObjectDescription.java | 3 -
.../api/dto/SObjectDescriptionUrls.java | 1 +
.../salesforce/api/dto/SObjectUrls.java | 1 +
.../salesforce/api/dto/SearchResult.java | 6 +-
.../salesforce/api/dto/bulk/BatchInfo.java | 2 +-
.../salesforce/api/dto/bulk/BatchInfoList.java | 2 +-
.../salesforce/api/dto/bulk/BatchResult.java | 2 +-
.../salesforce/api/dto/bulk/Error.java | 2 +-
.../salesforce/api/dto/bulk/JobInfo.java | 2 +-
.../salesforce/api/dto/bulk/ObjectFactory.java | 28 +-
.../salesforce/api/dto/bulk/QueryResult.java | 2 +-
.../api/dto/bulk/QueryResultList.java | 2 +-
.../salesforce/api/dto/bulk/Result.java | 2 +-
.../salesforce/api/dto/bulk/ResultError.java | 2 +-
.../salesforce/api/dto/bulk/SObject.java | 2 +-
.../salesforce/internal/SalesforceSession.java | 142 +++--
.../internal/client/DefaultBulkApiClient.java | 24 +-
.../processor/AbstractRestProcessor.java | 570 ++++++++++---------
.../processor/AbstractSalesforceProcessor.java | 3 +-
.../internal/processor/BulkApiProcessor.java | 500 ++++++++--------
.../internal/processor/JsonRestProcessor.java | 95 ++--
.../internal/processor/XmlRestProcessor.java | 132 +++--
.../internal/streaming/PushTopicHelper.java | 28 +-
.../internal/streaming/SubscriptionHelper.java | 4 +-
.../salesforce/AbstractSalesforceTestBase.java | 2 +-
.../salesforce/BulkApiBatchIntegrationTest.java | 15 +-
.../salesforce/BulkApiJobIntegrationTest.java | 2 +-
.../salesforce/BulkApiQueryIntegrationTest.java | 2 +-
.../component/salesforce/LoginConfigHelper.java | 7 +-
.../salesforce/RestApiIntegrationTest.java | 28 +-
.../SalesforceComponentConfigurationTest.java | 13 +-
.../salesforce/StreamingApiIntegrationTest.java | 2 +-
.../component/salesforce/dto/Document.java | 201 -------
.../component/salesforce/dto/Line_Item__c.java | 74 ---
.../salesforce/dto/Merchandise__c.java | 61 --
.../dto/QueryRecordsLine_Item__c.java | 35 --
.../salesforce/dto/generated/Document.java | 201 +++++++
.../salesforce/dto/generated/Line_Item__c.java | 74 +++
.../dto/generated/Merchandise__c.java | 61 ++
.../dto/generated/QueryRecordsLine_Item__c.java | 35 ++
58 files changed, 1268 insertions(+), 1275 deletions(-)
----------------------------------------------------------------------
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/SalesforceComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 4f075e0..8cc2237 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -16,6 +16,12 @@
*/
package org.apache.camel.component.salesforce;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.apache.camel.CamelContext;
import org.apache.camel.ComponentConfiguration;
import org.apache.camel.Endpoint;
@@ -35,12 +41,6 @@ import org.eclipse.jetty.client.RedirectListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/**
* Represents the component that manages {@link SalesforceEndpoint}.
*/
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/SalesforceConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index 983d41d..b47f658 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -16,6 +16,11 @@
*/
package org.apache.camel.component.salesforce;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -31,11 +36,6 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.cometd.bayeux.Message;
import org.cometd.bayeux.client.ClientSessionChannel;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* The Salesforce consumer.
*/
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/SalesforceEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
index 97e8bcc..6043d2b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
@@ -24,8 +24,6 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.SynchronousDelegateProducer;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Represents a Salesforce endpoint.
@@ -33,8 +31,6 @@ import org.slf4j.LoggerFactory;
@UriEndpoint(scheme = "salesforce", consumerClass = SalesforceConsumer.class)
public class SalesforceEndpoint extends DefaultEndpoint {
- private static final Logger LOG = LoggerFactory.getLogger(SalesforceEndpoint.class);
-
@UriParam
private final SalesforceEndpointConfig config;
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/SalesforceEndpointConfig.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
index 055e91a..353ed30 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.salesforce;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.salesforce.api.dto.bulk.ContentType;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
@@ -25,10 +29,6 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.eclipse.jetty.client.HttpClient;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Salesforce Endpoint configuration.
*/
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/api/JodaTimeConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
index 8a3296a..6ac0de1 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
@@ -18,20 +18,19 @@ package org.apache.camel.component.salesforce.api;
import java.lang.reflect.Constructor;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class JodaTimeConverter implements Converter {
- private static final Logger LOG = LoggerFactory.getLogger(JodaTimeConverter.class);
+
private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
@Override
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/api/PicklistEnumConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java
index 9594e3d..cd50de5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java
@@ -23,14 +23,11 @@ import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class PicklistEnumConverter implements Converter {
- private static final Logger LOG = LoggerFactory.getLogger(PicklistEnumConverter.class);
+
private static final String FACTORY_METHOD = "fromValue";
- @SuppressWarnings("unchecked")
@Override
public void marshal(Object o, HierarchicalStreamWriter writer, MarshallingContext context) {
Class<?> aClass = o.getClass();
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/api/SalesforceException.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
index 96d4622..03a0e0d 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
@@ -25,6 +25,8 @@ import org.apache.camel.component.salesforce.api.dto.RestError;
public class SalesforceException extends CamelException {
+ private static final long serialVersionUID = 1L;
+
private List<RestError> errors;
private int statusCode;
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/api/dto/AbstractDTOBase.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
index 5052921..9c0954a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
@@ -25,13 +25,14 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
// disable null values in json output
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
public abstract class AbstractDTOBase {
- private final static ObjectMapper mapper = new ObjectMapper();
+
+ private static final ObjectMapper MAPPER = new ObjectMapper();
@Override
public String toString() {
try {
StringWriter writer = new StringWriter();
- mapper.writeValue(writer, this);
+ MAPPER.writeValue(writer, this);
return writer.toString();
} catch (IOException e) {
return "Error in toString " + e.getMessage();
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/api/dto/AbstractSObjectBase.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
index c236872..bcec14a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractSObjectBase.java
@@ -22,26 +22,16 @@ import org.joda.time.DateTime;
public class AbstractSObjectBase extends AbstractDTOBase {
private Attributes attributes;
-
- private String Id;
-
- private String OwnerId;
-
- private Boolean IsDeleted;
-
- private String Name;
-
- private DateTime CreatedDate;
-
- private String CreatedById;
-
- private DateTime LastModifiedDate;
-
- private String LastModifiedById;
-
- private DateTime SystemModstamp;
-
- private String LastActivityDate;
+ private String id;
+ private String ownerId;
+ private Boolean isDeleted;
+ private String name;
+ private DateTime createdDate;
+ private String createdById;
+ private DateTime lastModifiedDate;
+ private String lastModifiedById;
+ private DateTime systemModstamp;
+ private String lastActivityDate;
/**
* Utility method to clear all {@link AbstractSObjectBase} fields.
@@ -49,16 +39,16 @@ public class AbstractSObjectBase extends AbstractDTOBase {
*/
public final void clearBaseFields() {
attributes = null;
- Id = null;
- OwnerId = null;
- IsDeleted = null;
- Name = null;
- CreatedDate = null;
- CreatedById = null;
- LastModifiedDate = null;
- LastModifiedById = null;
- SystemModstamp = null;
- LastActivityDate = null;
+ id = null;
+ ownerId = null;
+ isDeleted = null;
+ name = null;
+ createdDate = null;
+ createdById = null;
+ lastModifiedDate = null;
+ lastModifiedById = null;
+ systemModstamp = null;
+ lastActivityDate = null;
}
public Attributes getAttributes() {
@@ -71,102 +61,101 @@ public class AbstractSObjectBase extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return Id;
+ return id;
}
@JsonProperty("Id")
public void setId(String id) {
- Id = id;
+ this.id = id;
}
@JsonProperty("OwnerId")
public String getOwnerId() {
- return OwnerId;
+ return ownerId;
}
@JsonProperty("OwnerId")
public void setOwnerId(String ownerId) {
- OwnerId = ownerId;
+ this.ownerId = ownerId;
}
@JsonProperty("IsDeleted")
public Boolean isIsDeleted() {
- return IsDeleted;
+ return isDeleted;
}
@JsonProperty("IsDeleted")
public void setIsDeleted(Boolean isDeleted) {
- IsDeleted = isDeleted;
+ this.isDeleted = isDeleted;
}
@JsonProperty("Name")
public String getName() {
- return Name;
+ return name;
}
@JsonProperty("Name")
public void setName(String name) {
- Name = name;
+ this.name = name;
}
@JsonProperty("CreatedDate")
public DateTime getCreatedDate() {
- return CreatedDate;
+ return createdDate;
}
@JsonProperty("CreatedDate")
public void setCreatedDate(DateTime createdDate) {
- CreatedDate = createdDate;
+ this.createdDate = createdDate;
}
@JsonProperty("CreatedById")
public String getCreatedById() {
- return CreatedById;
+ return createdById;
}
@JsonProperty("CreatedById")
public void setCreatedById(String createdById) {
- CreatedById = createdById;
+ this.createdById = createdById;
}
@JsonProperty("LastModifiedDate")
public DateTime getLastModifiedDate() {
- return LastModifiedDate;
+ return lastModifiedDate;
}
@JsonProperty("LastModifiedDate")
public void setLastModifiedDate(DateTime lastModifiedDate) {
- LastModifiedDate = lastModifiedDate;
+ this.lastModifiedDate = lastModifiedDate;
}
@JsonProperty("LastModifiedById")
public String getLastModifiedById() {
- return LastModifiedById;
+ return lastModifiedById;
}
@JsonProperty("LastModifiedById")
public void setLastModifiedById(String lastModifiedById) {
- LastModifiedById = lastModifiedById;
+ this.lastModifiedById = lastModifiedById;
}
@JsonProperty("SystemModstamp")
public DateTime getSystemModstamp() {
- return SystemModstamp;
+ return systemModstamp;
}
@JsonProperty("SystemModstamp")
public void setSystemModstamp(DateTime systemModstamp) {
- SystemModstamp = systemModstamp;
+ this.systemModstamp = systemModstamp;
}
@JsonProperty("LastActivityDate")
public String getLastActivityDate() {
- return LastActivityDate;
+ return lastActivityDate;
}
@JsonProperty("LastActivityDate")
public void setLastActivityDate(String lastActivityDate) {
- LastActivityDate = lastActivityDate;
+ this.lastActivityDate = lastActivityDate;
}
-
}
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/api/dto/Attributes.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java
index 439f4c3..9d58f30 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/Attributes.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.salesforce.api.dto;
public class Attributes extends AbstractDTOBase {
+
private String type;
private String url;
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/api/dto/ChildRelationShip.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ChildRelationShip.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ChildRelationShip.java
index 4c2d58e..9b89923 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ChildRelationShip.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ChildRelationShip.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.salesforce.api.dto;
public class ChildRelationShip extends AbstractDTOBase {
+
private String field;
private Boolean deprecatedAndHidden;
private String relationshipName;
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/api/dto/CreateSObjectResult.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/CreateSObjectResult.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/CreateSObjectResult.java
index b7e7dd9..8e2a419 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/CreateSObjectResult.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/CreateSObjectResult.java
@@ -25,10 +25,8 @@ import com.thoughtworks.xstream.annotations.XStreamImplicit;
public class CreateSObjectResult extends AbstractDTOBase {
private String id;
-
@XStreamImplicit
private List<RestError> errors;
-
private Boolean success;
public String getId() {
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/api/dto/GlobalObjects.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/GlobalObjects.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/GlobalObjects.java
index f11bebe..f29a36b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/GlobalObjects.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/GlobalObjects.java
@@ -26,7 +26,6 @@ public class GlobalObjects extends AbstractDTOBase {
private String encoding;
private Integer maxBatchSize;
-
@XStreamImplicit
private List<SObject> sobjects;
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/api/dto/RecentItem.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java
index 503c363..ace884b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecentItem.java
@@ -21,10 +21,8 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class RecentItem extends AbstractDTOBase {
private Attributes attributes;
-
- private String Id;
-
- private String Name;
+ private String id;
+ private String name;
public Attributes getAttributes() {
return attributes;
@@ -36,21 +34,21 @@ public class RecentItem extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return Id;
+ return id;
}
@JsonProperty("Id")
public void setId(String id) {
- Id = id;
+ this.id = id;
}
@JsonProperty("Name")
public String getName() {
- return Name;
+ return name;
}
@JsonProperty("Name")
public void setName(String name) {
- Name = name;
+ this.name = name;
}
}
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/api/dto/RecordTypeInfo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecordTypeInfo.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecordTypeInfo.java
index 7b8d997..392ddb4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecordTypeInfo.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RecordTypeInfo.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.salesforce.api.dto;
public class RecordTypeInfo extends AbstractDTOBase {
+
private String name;
private Boolean available;
private String recordTypeId;
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/api/dto/RestError.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
index 6bda6c4..e16b105 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
@@ -21,6 +21,7 @@ import java.util.List;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
public class RestError extends AbstractDTOBase {
+
private String errorCode;
private String message;
@XStreamImplicit
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/api/dto/SObject.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
index 0ad6962..97fa39d 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.salesforce.api.dto;
public class SObject extends AbstractDTOBase {
+
private String name;
private String label;
private Boolean updateable;
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/api/dto/SObjectBasicInfo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectBasicInfo.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectBasicInfo.java
index 88b5e30..f6a2cb9 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectBasicInfo.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectBasicInfo.java
@@ -23,7 +23,6 @@ import com.thoughtworks.xstream.annotations.XStreamImplicit;
public class SObjectBasicInfo extends AbstractDTOBase {
private SObject objectDescribe;
-
@XStreamImplicit
private List<RecentItem> recentItems;
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/api/dto/SObjectDescription.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescription.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescription.java
index cd45847..9096c1e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescription.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescription.java
@@ -24,12 +24,9 @@ public class SObjectDescription extends SObject {
@XStreamImplicit
private List<SObjectField> fields;
-
private SObjectDescriptionUrls urls;
-
@XStreamImplicit
private List<ChildRelationShip> childRelationships;
-
@XStreamImplicit
private List<RecordTypeInfo> recordTypeInfos;
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/api/dto/SObjectDescriptionUrls.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescriptionUrls.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescriptionUrls.java
index 3fe7503..0772d69 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescriptionUrls.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectDescriptionUrls.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.salesforce.api.dto;
public class SObjectDescriptionUrls extends SObjectUrls {
+
private String uiEditTemplate;
private String uiDetailTemplate;
private String uiNewRecord;
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/api/dto/SObjectUrls.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectUrls.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectUrls.java
index 14b2f06..b1abd74 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectUrls.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObjectUrls.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.salesforce.api.dto;
public class SObjectUrls extends AbstractDTOBase {
+
private String sobject;
private String describe;
private String rowTemplate;
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/api/dto/SearchResult.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java
index d6fb673..113c9eb 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SearchResult.java
@@ -26,7 +26,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
public final class SearchResult extends AbstractDTOBase {
private Attributes attributes;
- private String Id;
+ private String id;
public Attributes getAttributes() {
return attributes;
@@ -38,12 +38,12 @@ public final class SearchResult extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return Id;
+ return id;
}
@JsonProperty("Id")
public void setId(String id) {
- Id = id;
+ this.id = id;
}
}
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/api/dto/bulk/BatchInfo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java
index d33de87..55a84a4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java
@@ -64,7 +64,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
"totalProcessingTime",
"apiActiveProcessingTime",
"apexProcessingTime"
-})
+ })
public class BatchInfo {
@XmlElement(required = 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/api/dto/bulk/BatchInfoList.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfoList.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfoList.java
index 9c15711..d55d17d 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfoList.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfoList.java
@@ -43,7 +43,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "BatchInfoList", propOrder = {
"batchInfo"
-})
+ })
public class BatchInfoList {
protected List<BatchInfo> batchInfo;
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/api/dto/bulk/BatchResult.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchResult.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchResult.java
index b223965..8a2883c 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchResult.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchResult.java
@@ -43,7 +43,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "BatchResult", propOrder = {
"result"
-})
+ })
public class BatchResult {
protected List<Result> result;
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/api/dto/bulk/Error.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java
index ee4cad1..238f78b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Error.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "Error", propOrder = {
"exceptionCode",
"exceptionMessage"
-})
+ })
public class Error {
@XmlElement(required = 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/api/dto/bulk/JobInfo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java
index f06ad3d..ba40482 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java
@@ -87,7 +87,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
"totalProcessingTime",
"apiActiveProcessingTime",
"apexProcessingTime"
-})
+ })
public class JobInfo {
protected String id;
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/api/dto/bulk/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java
index c0dbfc2..2a94d0b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java
@@ -38,13 +38,13 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _JobInfo_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "jobInfo");
- private final static QName _BatchInfo_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "batchInfo");
- private final static QName _Error_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "error");
- private final static QName _Results_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "results");
- private final static QName _ResultList_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "result-list");
- private final static QName _BatchInfoList_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "batchInfoList");
- private final static QName _QueryResult_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "queryResult");
+ private static final QName JOB_INFO_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "jobInfo");
+ private static final QName BATCH_INFO_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "batchInfo");
+ private static final QName ERROR_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "error");
+ private static final QName RESULTS_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "results");
+ private static final QName RESULT_LIST_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "result-list");
+ private static final QName BATCH_INFO_LIST_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "batchInfoList");
+ private static final QName QUERY_RESULT_QNAME = new QName("http://www.force.com/2009/06/asyncapi/dataload", "queryResult");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.camel.component.salesforce.api.dto.bulk
@@ -127,7 +127,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://www.force.com/2009/06/asyncapi/dataload", name = "jobInfo")
public JAXBElement<JobInfo> createJobInfo(JobInfo value) {
- return new JAXBElement<JobInfo>(_JobInfo_QNAME, JobInfo.class, null, value);
+ return new JAXBElement<JobInfo>(JOB_INFO_QNAME, JobInfo.class, null, value);
}
/**
@@ -135,7 +135,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://www.force.com/2009/06/asyncapi/dataload", name = "batchInfo")
public JAXBElement<BatchInfo> createBatchInfo(BatchInfo value) {
- return new JAXBElement<BatchInfo>(_BatchInfo_QNAME, BatchInfo.class, null, value);
+ return new JAXBElement<BatchInfo>(BATCH_INFO_QNAME, BatchInfo.class, null, value);
}
/**
@@ -143,7 +143,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://www.force.com/2009/06/asyncapi/dataload", name = "error")
public JAXBElement<Error> createError(Error value) {
- return new JAXBElement<Error>(_Error_QNAME, Error.class, null, value);
+ return new JAXBElement<Error>(ERROR_QNAME, Error.class, null, value);
}
/**
@@ -151,7 +151,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://www.force.com/2009/06/asyncapi/dataload", name = "results")
public JAXBElement<BatchResult> createResults(BatchResult value) {
- return new JAXBElement<BatchResult>(_Results_QNAME, BatchResult.class, null, value);
+ return new JAXBElement<BatchResult>(RESULTS_QNAME, BatchResult.class, null, value);
}
/**
@@ -159,7 +159,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://www.force.com/2009/06/asyncapi/dataload", name = "result-list")
public JAXBElement<QueryResultList> createResultList(QueryResultList value) {
- return new JAXBElement<QueryResultList>(_ResultList_QNAME, QueryResultList.class, null, value);
+ return new JAXBElement<QueryResultList>(RESULT_LIST_QNAME, QueryResultList.class, null, value);
}
/**
@@ -167,7 +167,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://www.force.com/2009/06/asyncapi/dataload", name = "batchInfoList")
public JAXBElement<BatchInfoList> createBatchInfoList(BatchInfoList value) {
- return new JAXBElement<BatchInfoList>(_BatchInfoList_QNAME, BatchInfoList.class, null, value);
+ return new JAXBElement<BatchInfoList>(BATCH_INFO_LIST_QNAME, BatchInfoList.class, null, value);
}
/**
@@ -175,7 +175,7 @@ public class ObjectFactory {
*/
@XmlElementDecl(namespace = "http://www.force.com/2009/06/asyncapi/dataload", name = "queryResult")
public JAXBElement<QueryResult> createQueryResult(QueryResult value) {
- return new JAXBElement<QueryResult>(_QueryResult_QNAME, QueryResult.class, null, value);
+ return new JAXBElement<QueryResult>(QUERY_RESULT_QNAME, QueryResult.class, null, value);
}
}
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/api/dto/bulk/QueryResult.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResult.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResult.java
index aaaf1b1..35f5f07 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResult.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResult.java
@@ -44,7 +44,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "QueryResult", propOrder = {
"records"
-})
+ })
public class QueryResult {
@XmlElement(nillable = 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/api/dto/bulk/QueryResultList.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResultList.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResultList.java
index 89339e3..a55ba04 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResultList.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/QueryResultList.java
@@ -43,7 +43,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "QueryResultList", propOrder = {
"result"
-})
+ })
public class QueryResultList {
protected List<String> result;
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/api/dto/bulk/Result.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Result.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Result.java
index b8406c3..53d7ed5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Result.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/Result.java
@@ -49,7 +49,7 @@ import javax.xml.bind.annotation.XmlType;
"id",
"success",
"created"
-})
+ })
public class Result {
protected List<ResultError> errors;
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/api/dto/bulk/ResultError.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java
index c837888..8a37426 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ResultError.java
@@ -48,7 +48,7 @@ import javax.xml.bind.annotation.XmlType;
"fields",
"message",
"statusCode"
-})
+ })
public class ResultError {
@XmlElement(nillable = 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/api/dto/bulk/SObject.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/SObject.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/SObject.java
index ff08913..a5f9758 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/SObject.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/SObject.java
@@ -49,7 +49,7 @@ import javax.xml.bind.annotation.XmlType;
"type",
"id",
"any"
-})
+ })
public class SObject {
@XmlElement(required = 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/SalesforceSession.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index ac0e8a8..5d9f24e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -129,64 +129,60 @@ public class SalesforceSession implements Service {
final int exchangeState = loginPost.waitForDone();
switch (exchangeState) {
- case HttpExchange.STATUS_COMPLETED:
- final byte[] responseContent = loginPost.getResponseContentBytes();
- final int responseStatus = loginPost.getResponseStatus();
- switch (responseStatus) {
-
- case HttpStatus.OK_200:
- // parse the response to get token
- LoginToken token = objectMapper.readValue(responseContent,
- LoginToken.class);
-
- // don't log token or instance URL for security reasons
- LOG.info("Login successful");
- accessToken = token.getAccessToken();
- instanceUrl = token.getInstanceUrl();
-
- // notify all listeners
- for (SalesforceSessionListener listener : listeners) {
- try {
- listener.onLogin(accessToken, instanceUrl);
- } catch (Throwable t) {
- LOG.warn("Unexpected error from listener {}: {}", listener, t.getMessage());
- }
- }
-
- break;
-
- case HttpStatus.BAD_REQUEST_400:
- // parse the response to get error
- final LoginError error = objectMapper.readValue(responseContent,
- LoginError.class);
- final String msg = String.format("Login error code:[%s] description:[%s]",
- error.getError(), error.getErrorDescription());
- final List<RestError> errors = new ArrayList<RestError>();
- errors.add(new RestError(msg, error.getErrorDescription()));
- throw new SalesforceException(errors, HttpStatus.BAD_REQUEST_400);
-
- default:
- throw new SalesforceException(
- String.format("Login error status:[%s] reason:[%s]",
- responseStatus, loginPost.getReason()),
- responseStatus);
+ case HttpExchange.STATUS_COMPLETED:
+ final byte[] responseContent = loginPost.getResponseContentBytes();
+ final int responseStatus = loginPost.getResponseStatus();
+
+ switch (responseStatus) {
+ case HttpStatus.OK_200:
+ // parse the response to get token
+ LoginToken token = objectMapper.readValue(responseContent, LoginToken.class);
+
+ // don't log token or instance URL for security reasons
+ LOG.info("Login successful");
+ accessToken = token.getAccessToken();
+ instanceUrl = token.getInstanceUrl();
+
+ // notify all listeners
+ for (SalesforceSessionListener listener : listeners) {
+ try {
+ listener.onLogin(accessToken, instanceUrl);
+ } catch (Throwable t) {
+ LOG.warn("Unexpected error from listener {}: {}", listener, t.getMessage());
+ }
}
+
break;
- case HttpExchange.STATUS_EXCEPTED:
- final Throwable ex = loginPost.getException();
- throw new SalesforceException(
- String.format("Unexpected login exception: %s", ex.getMessage()),
- ex);
+ case HttpStatus.BAD_REQUEST_400:
+ // parse the response to get error
+ final LoginError error = objectMapper.readValue(responseContent, LoginError.class);
+ final String msg = String.format("Login error code:[%s] description:[%s]",
+ error.getError(), error.getErrorDescription());
+ final List<RestError> errors = new ArrayList<RestError>();
+ errors.add(new RestError(msg, error.getErrorDescription()));
+ throw new SalesforceException(errors, HttpStatus.BAD_REQUEST_400);
+
+ default:
+ throw new SalesforceException(String.format("Login error status:[%s] reason:[%s]",
+ responseStatus, loginPost.getReason()), responseStatus);
+ }
+ break;
- case HttpExchange.STATUS_CANCELLED:
- throw new SalesforceException("Login request CANCELLED!", null);
+ case HttpExchange.STATUS_EXCEPTED:
+ final Throwable ex = loginPost.getException();
+ throw new SalesforceException(
+ String.format("Unexpected login exception: %s", ex.getMessage()), ex);
- case HttpExchange.STATUS_EXPIRED:
- throw new SalesforceException("Login request TIMEOUT!", null);
+ case HttpExchange.STATUS_CANCELLED:
+ throw new SalesforceException("Login request CANCELLED!", null);
- }
+ case HttpExchange.STATUS_EXPIRED:
+ throw new SalesforceException("Login request TIMEOUT!", null);
+ default:
+ throw new SalesforceException("Unknow status: " + exchangeState, null);
+ }
} catch (IOException e) {
String msg = "Login error: unexpected exception " + e.getMessage();
throw new SalesforceException(msg, e);
@@ -212,33 +208,33 @@ public class SalesforceSession implements Service {
httpClient.send(logoutGet);
final int done = logoutGet.waitForDone();
switch (done) {
+ case HttpExchange.STATUS_COMPLETED:
+ final int statusCode = logoutGet.getResponseStatus();
+ final String reason = logoutGet.getReason();
+
+ if (statusCode == HttpStatus.OK_200) {
+ LOG.info("Logout successful");
+ } else {
+ throw new SalesforceException(
+ String.format("Logout error, code: [%s] reason: [%s]",
+ statusCode, reason),
+ statusCode);
+ }
+ break;
- case HttpExchange.STATUS_COMPLETED:
- final int statusCode = logoutGet.getResponseStatus();
- final String reason = logoutGet.getReason();
-
- if (statusCode == HttpStatus.OK_200) {
- LOG.info("Logout successful");
- } else {
- throw new SalesforceException(
- String.format("Logout error, code: [%s] reason: [%s]",
- statusCode, reason),
- statusCode);
- }
- break;
+ case HttpExchange.STATUS_EXCEPTED:
+ final Throwable ex = logoutGet.getException();
+ throw new SalesforceException("Unexpected logout exception: " + ex.getMessage(), ex);
- case HttpExchange.STATUS_EXCEPTED:
- final Throwable ex = logoutGet.getException();
- throw new SalesforceException("Unexpected logout exception: " + ex.getMessage(), ex);
+ case HttpExchange.STATUS_CANCELLED:
+ throw new SalesforceException("Logout request CANCELLED!", null);
- case HttpExchange.STATUS_CANCELLED:
- throw new SalesforceException("Logout request CANCELLED!", null);
-
- case HttpExchange.STATUS_EXPIRED:
- throw new SalesforceException("Logout request TIMEOUT!", null);
+ case HttpExchange.STATUS_EXPIRED:
+ throw new SalesforceException("Logout request TIMEOUT!", null);
+ default:
+ throw new SalesforceException("Unknow status: " + done, null);
}
-
} catch (SalesforceException e) {
throw e;
} catch (Exception e) {
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/client/DefaultBulkApiClient.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
index 81f467e..c56466a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
@@ -389,18 +389,18 @@ public class DefaultBulkApiClient extends AbstractClientBase implements BulkApiC
String result = null;
switch (type) {
- case CSV:
- result = "text/csv";
- break;
-
- case XML:
- result = "application/xml";
- break;
-
- case ZIP_CSV:
- case ZIP_XML:
- result = type.toString().toLowerCase().replace('_', '/');
- break;
+ case CSV:
+ result = "text/csv";
+ break;
+
+ case XML:
+ result = "application/xml";
+ break;
+
+ case ZIP_CSV:
+ case ZIP_XML:
+ result = type.toString().toLowerCase().replace('_', '/');
+ break;
}
return result;