You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/08/31 05:33:41 UTC
[1/2] git commit: CAMEL-6428 Fixed camel-salesforce regressions with
thanks to Dhiraj
Updated Branches:
refs/heads/camel-2.12.x fda615c2d -> 5f82ba3d5
refs/heads/master 1f6867811 -> 08ec3c08c
CAMEL-6428 Fixed camel-salesforce regressions with thanks to Dhiraj
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08ec3c08
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08ec3c08
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08ec3c08
Branch: refs/heads/master
Commit: 08ec3c08c5cf35ff28a4e35768f7f64d761b814e
Parents: 1f68678
Author: Willem Jiang <ni...@apache.org>
Authored: Sat Aug 31 11:27:41 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Sat Aug 31 11:27:41 2013 +0800
----------------------------------------------------------------------
.../mtom/CxfMtomRouterRawModeTest-context.xml | 8 +-
.../salesforce/api/dto/AbstractSObjectBase.java | 86 ++++++++++----------
.../salesforce/api/dto/RecentItem.java | 18 ++--
.../component/salesforce/api/dto/RestError.java | 3 +-
.../salesforce/api/dto/SearchResult.java | 11 ++-
.../salesforce/api/dto/bulk/Error.java | 3 +-
.../salesforce/api/dto/bulk/ResultError.java | 3 +-
.../salesforce/internal/SalesforceSession.java | 2 +-
.../salesforce/internal/dto/LoginError.java | 2 +
.../salesforce/internal/dto/PushTopic.java | 49 ++++++-----
.../internal/processor/JsonRestProcessor.java | 2 +-
.../internal/processor/XmlRestProcessor.java | 2 +-
.../salesforce/RestApiIntegrationTest.java | 4 +-
.../salesforce/StreamingApiIntegrationTest.java | 2 +-
.../salesforce/dto/generated/Document.java | 4 +-
.../salesforce/dto/generated/Line_Item__c.java | 3 +-
.../dto/generated/Merchandise__c.java | 3 +-
.../dto/generated/QueryRecordsLine_Item__c.java | 3 +-
18 files changed, 121 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
index ee8644b..0f61d6d 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
@@ -39,7 +39,7 @@
<entry key="mtom-enabled" value="true"/>
<!-- set the camel-cxf endpoint data fromat to RAW mode -->
- <entry key="dataFormat" value="RAW"/>
+ <entry key="dataFormat" value="CXF_MESSAGE"/>
</cxf:properties>
<!-- END SNIPPET: enableMtom -->
@@ -62,17 +62,17 @@
<cxf:properties>
<entry key="mtom-enabled" value="true"/>
- <entry key="dataFormat" value="RAW"/>
+ <entry key="dataFormat" value="CXF_MESSAGE"/>
</cxf:properties>
-<!--
+
<cxf:inInterceptors>
<ref bean="logInbound"/>
</cxf:inInterceptors>
<cxf:outInterceptors>
<ref bean="logOutbound"/>
</cxf:outInterceptors>
--->
+
</cxf:cxfEndpoint>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 bcec14a..23cad48 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
@@ -18,20 +18,23 @@ package org.apache.camel.component.salesforce.api.dto;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.DateTime;
-
+//CHECKSTYLE:OFF
public class AbstractSObjectBase extends AbstractDTOBase {
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
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.
@@ -39,16 +42,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() {
@@ -61,101 +64,102 @@ public class AbstractSObjectBase extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return id;
+ return Id;
}
@JsonProperty("Id")
public void setId(String id) {
- this.id = id;
+ this.Id = id;
}
@JsonProperty("OwnerId")
public String getOwnerId() {
- return ownerId;
+ return OwnerId;
}
@JsonProperty("OwnerId")
public void setOwnerId(String ownerId) {
- this.ownerId = ownerId;
+ this.OwnerId = ownerId;
}
@JsonProperty("IsDeleted")
public Boolean isIsDeleted() {
- return isDeleted;
+ return IsDeleted;
}
@JsonProperty("IsDeleted")
public void setIsDeleted(Boolean isDeleted) {
- this.isDeleted = isDeleted;
+ this.IsDeleted = isDeleted;
}
@JsonProperty("Name")
public String getName() {
- return name;
+ return Name;
}
@JsonProperty("Name")
public void setName(String name) {
- this.name = name;
+ this.Name = name;
}
@JsonProperty("CreatedDate")
public DateTime getCreatedDate() {
- return createdDate;
+ return CreatedDate;
}
@JsonProperty("CreatedDate")
public void setCreatedDate(DateTime createdDate) {
- this.createdDate = createdDate;
+ this.CreatedDate = createdDate;
}
@JsonProperty("CreatedById")
public String getCreatedById() {
- return createdById;
+ return CreatedById;
}
@JsonProperty("CreatedById")
public void setCreatedById(String createdById) {
- this.createdById = createdById;
+ this.CreatedById = createdById;
}
@JsonProperty("LastModifiedDate")
public DateTime getLastModifiedDate() {
- return lastModifiedDate;
+ return LastModifiedDate;
}
@JsonProperty("LastModifiedDate")
public void setLastModifiedDate(DateTime lastModifiedDate) {
- this.lastModifiedDate = lastModifiedDate;
+ this.LastModifiedDate = lastModifiedDate;
}
@JsonProperty("LastModifiedById")
public String getLastModifiedById() {
- return lastModifiedById;
+ return LastModifiedById;
}
@JsonProperty("LastModifiedById")
public void setLastModifiedById(String lastModifiedById) {
- this.lastModifiedById = lastModifiedById;
+ this.LastModifiedById = lastModifiedById;
}
@JsonProperty("SystemModstamp")
public DateTime getSystemModstamp() {
- return systemModstamp;
+ return SystemModstamp;
}
@JsonProperty("SystemModstamp")
public void setSystemModstamp(DateTime systemModstamp) {
- this.systemModstamp = systemModstamp;
+ this.SystemModstamp = systemModstamp;
}
@JsonProperty("LastActivityDate")
public String getLastActivityDate() {
- return lastActivityDate;
+ return LastActivityDate;
}
@JsonProperty("LastActivityDate")
public void setLastActivityDate(String lastActivityDate) {
- this.lastActivityDate = lastActivityDate;
+ this.LastActivityDate = lastActivityDate;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 ace884b..dc69dcf 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
@@ -17,12 +17,15 @@
package org.apache.camel.component.salesforce.api.dto;
import org.codehaus.jackson.annotate.JsonProperty;
-
+//CHECKSTYLE:OFF
public class RecentItem extends AbstractDTOBase {
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
private Attributes attributes;
- private String id;
- private String name;
+ private String Id;
+ private String Name;
public Attributes getAttributes() {
return attributes;
@@ -34,21 +37,22 @@ public class RecentItem extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return id;
+ return Id;
}
@JsonProperty("Id")
public void setId(String id) {
- this.id = id;
+ this.Id = id;
}
@JsonProperty("Name")
public String getName() {
- return name;
+ return Name;
}
@JsonProperty("Name")
public void setName(String name) {
- this.name = name;
+ this.Name = name;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 e16b105..980108e 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
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce.api.dto;
import java.util.List;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
+//CHECKSTYLE:OFF
public class RestError extends AbstractDTOBase {
private String errorCode;
@@ -67,3 +67,4 @@ public class RestError extends AbstractDTOBase {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 113c9eb..eb75c6a 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
@@ -23,10 +23,14 @@ import org.codehaus.jackson.annotate.JsonProperty;
* DTO for Salesforce SOSL Search result record.
*/
@XStreamAlias("SearchResult")
+//CHECKSTYLE:OFF
public final class SearchResult extends AbstractDTOBase {
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
private Attributes attributes;
- private String id;
+ private String Id;
public Attributes getAttributes() {
return attributes;
@@ -38,12 +42,13 @@ public final class SearchResult extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return id;
+ return Id;
}
@JsonProperty("Id")
public void setId(String id) {
- this.id = id;
+ this.Id = id;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 238f78b..99f0ec7 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
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-
+//CHECKSTYLE:OFF
/**
* <p>Java class for Error complex type.
* <p/>
@@ -93,3 +93,4 @@ public class Error {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 8a37426..b6a3fb9 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
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-
+//CHECKSTYLE:OFF
/**
* <p>Java class for ResultError complex type.
* <p/>
@@ -126,3 +126,4 @@ public class ResultError {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 5d9f24e..c40f3a7 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
@@ -324,7 +324,7 @@ public class SalesforceSession implements Service {
}
- public static interface SalesforceSessionListener {
+ public interface SalesforceSessionListener {
void onLogin(String accessToken, String instanceUrl);
void onLogout();
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
index cec3ef8..50055a0 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
@@ -21,6 +21,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
/**
* DTO for Salesforce login error
*/
+//CHECKSTYLE:OFF
public class LoginError {
private String error;
@@ -45,3 +46,4 @@ public class LoginError {
this.errorDescription = errorDescription;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
index 7da5386..9eaeec8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.salesforce.internal.dto;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
+
import org.apache.camel.component.salesforce.api.PicklistEnumConverter;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -26,74 +27,84 @@ import org.codehaus.jackson.annotate.JsonProperty;
* Salesforce DTO for SObject PushTopic
*/
@XStreamAlias("PushTopic")
+//CHECKSTYLE:OFF
public class PushTopic extends AbstractSObjectBase {
- private String query;
- private Double apiVersion;
- private Boolean isActive;
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
+ private String Query;
+
+ private Double ApiVersion;
+
+ private Boolean IsActive;
+
@XStreamConverter(PicklistEnumConverter.class)
- private NotifyForFieldsEnum notifyForFields;
+ private NotifyForFieldsEnum NotifyForFields;
+
@XStreamConverter(PicklistEnumConverter.class)
- private NotifyForOperationsEnum notifyForOperations;
- private String description;
+ private NotifyForOperationsEnum NotifyForOperations;
+
+ private String Description;
@JsonProperty("Query")
public String getQuery() {
- return this.query;
+ return this.Query;
}
@JsonProperty("Query")
public void setQuery(String query) {
- this.query = query;
+ this.Query = query;
}
@JsonProperty("ApiVersion")
public Double getApiVersion() {
- return this.apiVersion;
+ return this.ApiVersion;
}
@JsonProperty("ApiVersion")
public void setApiVersion(Double apiVersion) {
- this.apiVersion = apiVersion;
+ this.ApiVersion = apiVersion;
}
@JsonProperty("IsActive")
public Boolean getIsActive() {
- return this.isActive;
+ return this.IsActive;
}
@JsonProperty("IsActive")
public void setIsActive(Boolean isActive) {
- this.isActive = isActive;
+ this.IsActive = isActive;
}
@JsonProperty("NotifyForFields")
public NotifyForFieldsEnum getNotifyForFields() {
- return this.notifyForFields;
+ return this.NotifyForFields;
}
@JsonProperty("NotifyForFields")
public void setNotifyForFields(NotifyForFieldsEnum notifyForFields) {
- this.notifyForFields = notifyForFields;
+ this.NotifyForFields = notifyForFields;
}
@JsonProperty("NotifyForOperations")
public NotifyForOperationsEnum getNotifyForOperations() {
- return this.notifyForOperations;
+ return this.NotifyForOperations;
}
@JsonProperty("NotifyForOperations")
public void setNotifyForOperations(NotifyForOperationsEnum notifyForOperations) {
- this.notifyForOperations = notifyForOperations;
+ this.NotifyForOperations = notifyForOperations;
}
@JsonProperty("Description")
public String getDescription() {
- return this.description;
+ return this.Description;
}
@JsonProperty("Description")
public void setDescription(String description) {
- this.description = description;
+ this.Description = description;
}
-}
\ No newline at end of file
+}
+//CHECKSTYLE:ON
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 5fee6c1..b29f36b 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
@@ -102,7 +102,7 @@ public class JsonRestProcessor extends AbstractRestProcessor {
break;
default:
- throw new SalesforceException("Unknow operation name: " + operationName, null);
+ // ignore, some operations do not require response class or type
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/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 253be42..80bb488 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
@@ -145,7 +145,7 @@ public class XmlRestProcessor extends AbstractRestProcessor {
break;
default:
- throw new SalesforceException("Unknow operation name: " + operationName, null);
+ // ignore, some operations do not require alias or class exchange properties
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index e9264ca..9f51bbd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -398,10 +398,10 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
// testQuery
from("direct:query")
- .to("salesforce:query?sObjectQuery=SELECT name from Line_Item__c&sObjectClass=org.apache.camel.component.salesforce.dto.QueryRecordsLine_Item__c");
+ .to("salesforce:query?sObjectQuery=SELECT name from Line_Item__c&sObjectClass=" + QueryRecordsLine_Item__c.class.getName());
from("direct:queryXml")
- .to("salesforce:query?format=XML&sObjectQuery=SELECT name from Line_Item__c&sObjectClass=org.apache.camel.component.salesforce.dto.QueryRecordsLine_Item__c");
+ .to("salesforce:query?format=XML&sObjectQuery=SELECT name from Line_Item__c&sObjectClass=" + QueryRecordsLine_Item__c.class.getName());
// testSearch
from("direct:search")
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
index 8dcaf34..66628eb 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
@@ -93,7 +93,7 @@ public class StreamingApiIntegrationTest extends AbstractSalesforceTestBase {
// route for finding test topic
from("direct:query").
to("salesforce:query?sObjectQuery=SELECT Id FROM PushTopic WHERE Name = 'CamelTestTopic'&"
- + "sObjectClass=org.apache.camel.component.salesforce.internal.dto.QueryRecordsPushTopic");
+ + "sObjectClass=" + QueryRecordsPushTopic.class.getName());
// route for removing test record
from("direct:deleteSObjectWithId").
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
index 017172d..26fc964 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
@@ -1,3 +1,4 @@
+//CHECKSTYLE:OFF
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
* Generated on: Tue May 14 21:15:54 PDT 2013
@@ -198,4 +199,5 @@ public class Document extends AbstractSObjectBase {
this.IsBodySearchable = IsBodySearchable;
}
-}
\ No newline at end of file
+}
+//CHECKSTYLE:ON
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
index 2a92461..ce35cd8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce.dto.generated;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
import org.codehaus.jackson.annotate.JsonProperty;
-
+//CHECKSTYLE:OFF
@XStreamAlias("Line_Item__c")
public class Line_Item__c extends AbstractSObjectBase {
@@ -72,3 +72,4 @@ public class Line_Item__c extends AbstractSObjectBase {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
index f506d12..1fd3b9f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce.dto.generated;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
import org.codehaus.jackson.annotate.JsonProperty;
-
+//CHECKSTYLE:OFF
@XStreamAlias("Merchandise__c")
public class Merchandise__c extends AbstractSObjectBase {
@@ -59,3 +59,4 @@ public class Merchandise__c extends AbstractSObjectBase {
Total_Inventory__c = total_Inventory__c;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/08ec3c08/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
index ebe18f3..266f01e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
@@ -20,7 +20,7 @@ import java.util.List;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
-
+//CHECKSTYLE:OFF
public class QueryRecordsLine_Item__c extends AbstractQueryRecordsBase {
@XStreamImplicit
private List<Line_Item__c> records;
@@ -33,3 +33,4 @@ public class QueryRecordsLine_Item__c extends AbstractQueryRecordsBase {
this.records = records;
}
}
+//CHECKSTYLE:ON
[2/2] git commit: CAMEL-6428 Fixed camel-salesforce regressions with
thanks to Dhiraj
Posted by ni...@apache.org.
CAMEL-6428 Fixed camel-salesforce regressions with thanks to Dhiraj
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f82ba3d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f82ba3d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f82ba3d
Branch: refs/heads/camel-2.12.x
Commit: 5f82ba3d523569619e9a140805b58069a34de8cd
Parents: fda615c
Author: Willem Jiang <ni...@apache.org>
Authored: Sat Aug 31 11:27:41 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Sat Aug 31 11:32:51 2013 +0800
----------------------------------------------------------------------
.../mtom/CxfMtomRouterRawModeTest-context.xml | 8 +-
.../salesforce/api/dto/AbstractSObjectBase.java | 86 ++++++++++----------
.../salesforce/api/dto/RecentItem.java | 18 ++--
.../component/salesforce/api/dto/RestError.java | 3 +-
.../salesforce/api/dto/SearchResult.java | 11 ++-
.../salesforce/api/dto/bulk/Error.java | 3 +-
.../salesforce/api/dto/bulk/ResultError.java | 3 +-
.../salesforce/internal/SalesforceSession.java | 2 +-
.../salesforce/internal/dto/LoginError.java | 2 +
.../salesforce/internal/dto/PushTopic.java | 49 ++++++-----
.../internal/processor/JsonRestProcessor.java | 2 +-
.../internal/processor/XmlRestProcessor.java | 2 +-
.../salesforce/RestApiIntegrationTest.java | 4 +-
.../salesforce/StreamingApiIntegrationTest.java | 2 +-
.../salesforce/dto/generated/Document.java | 4 +-
.../salesforce/dto/generated/Line_Item__c.java | 3 +-
.../dto/generated/Merchandise__c.java | 3 +-
.../dto/generated/QueryRecordsLine_Item__c.java | 3 +-
18 files changed, 121 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
index ee8644b..0f61d6d 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml
@@ -39,7 +39,7 @@
<entry key="mtom-enabled" value="true"/>
<!-- set the camel-cxf endpoint data fromat to RAW mode -->
- <entry key="dataFormat" value="RAW"/>
+ <entry key="dataFormat" value="CXF_MESSAGE"/>
</cxf:properties>
<!-- END SNIPPET: enableMtom -->
@@ -62,17 +62,17 @@
<cxf:properties>
<entry key="mtom-enabled" value="true"/>
- <entry key="dataFormat" value="RAW"/>
+ <entry key="dataFormat" value="CXF_MESSAGE"/>
</cxf:properties>
-<!--
+
<cxf:inInterceptors>
<ref bean="logInbound"/>
</cxf:inInterceptors>
<cxf:outInterceptors>
<ref bean="logOutbound"/>
</cxf:outInterceptors>
--->
+
</cxf:cxfEndpoint>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 bcec14a..23cad48 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
@@ -18,20 +18,23 @@ package org.apache.camel.component.salesforce.api.dto;
import org.codehaus.jackson.annotate.JsonProperty;
import org.joda.time.DateTime;
-
+//CHECKSTYLE:OFF
public class AbstractSObjectBase extends AbstractDTOBase {
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
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.
@@ -39,16 +42,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() {
@@ -61,101 +64,102 @@ public class AbstractSObjectBase extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return id;
+ return Id;
}
@JsonProperty("Id")
public void setId(String id) {
- this.id = id;
+ this.Id = id;
}
@JsonProperty("OwnerId")
public String getOwnerId() {
- return ownerId;
+ return OwnerId;
}
@JsonProperty("OwnerId")
public void setOwnerId(String ownerId) {
- this.ownerId = ownerId;
+ this.OwnerId = ownerId;
}
@JsonProperty("IsDeleted")
public Boolean isIsDeleted() {
- return isDeleted;
+ return IsDeleted;
}
@JsonProperty("IsDeleted")
public void setIsDeleted(Boolean isDeleted) {
- this.isDeleted = isDeleted;
+ this.IsDeleted = isDeleted;
}
@JsonProperty("Name")
public String getName() {
- return name;
+ return Name;
}
@JsonProperty("Name")
public void setName(String name) {
- this.name = name;
+ this.Name = name;
}
@JsonProperty("CreatedDate")
public DateTime getCreatedDate() {
- return createdDate;
+ return CreatedDate;
}
@JsonProperty("CreatedDate")
public void setCreatedDate(DateTime createdDate) {
- this.createdDate = createdDate;
+ this.CreatedDate = createdDate;
}
@JsonProperty("CreatedById")
public String getCreatedById() {
- return createdById;
+ return CreatedById;
}
@JsonProperty("CreatedById")
public void setCreatedById(String createdById) {
- this.createdById = createdById;
+ this.CreatedById = createdById;
}
@JsonProperty("LastModifiedDate")
public DateTime getLastModifiedDate() {
- return lastModifiedDate;
+ return LastModifiedDate;
}
@JsonProperty("LastModifiedDate")
public void setLastModifiedDate(DateTime lastModifiedDate) {
- this.lastModifiedDate = lastModifiedDate;
+ this.LastModifiedDate = lastModifiedDate;
}
@JsonProperty("LastModifiedById")
public String getLastModifiedById() {
- return lastModifiedById;
+ return LastModifiedById;
}
@JsonProperty("LastModifiedById")
public void setLastModifiedById(String lastModifiedById) {
- this.lastModifiedById = lastModifiedById;
+ this.LastModifiedById = lastModifiedById;
}
@JsonProperty("SystemModstamp")
public DateTime getSystemModstamp() {
- return systemModstamp;
+ return SystemModstamp;
}
@JsonProperty("SystemModstamp")
public void setSystemModstamp(DateTime systemModstamp) {
- this.systemModstamp = systemModstamp;
+ this.SystemModstamp = systemModstamp;
}
@JsonProperty("LastActivityDate")
public String getLastActivityDate() {
- return lastActivityDate;
+ return LastActivityDate;
}
@JsonProperty("LastActivityDate")
public void setLastActivityDate(String lastActivityDate) {
- this.lastActivityDate = lastActivityDate;
+ this.LastActivityDate = lastActivityDate;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 ace884b..dc69dcf 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
@@ -17,12 +17,15 @@
package org.apache.camel.component.salesforce.api.dto;
import org.codehaus.jackson.annotate.JsonProperty;
-
+//CHECKSTYLE:OFF
public class RecentItem extends AbstractDTOBase {
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
private Attributes attributes;
- private String id;
- private String name;
+ private String Id;
+ private String Name;
public Attributes getAttributes() {
return attributes;
@@ -34,21 +37,22 @@ public class RecentItem extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return id;
+ return Id;
}
@JsonProperty("Id")
public void setId(String id) {
- this.id = id;
+ this.Id = id;
}
@JsonProperty("Name")
public String getName() {
- return name;
+ return Name;
}
@JsonProperty("Name")
public void setName(String name) {
- this.name = name;
+ this.Name = name;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 e16b105..980108e 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
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce.api.dto;
import java.util.List;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
+//CHECKSTYLE:OFF
public class RestError extends AbstractDTOBase {
private String errorCode;
@@ -67,3 +67,4 @@ public class RestError extends AbstractDTOBase {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 113c9eb..eb75c6a 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
@@ -23,10 +23,14 @@ import org.codehaus.jackson.annotate.JsonProperty;
* DTO for Salesforce SOSL Search result record.
*/
@XStreamAlias("SearchResult")
+//CHECKSTYLE:OFF
public final class SearchResult extends AbstractDTOBase {
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
private Attributes attributes;
- private String id;
+ private String Id;
public Attributes getAttributes() {
return attributes;
@@ -38,12 +42,13 @@ public final class SearchResult extends AbstractDTOBase {
@JsonProperty("Id")
public String getId() {
- return id;
+ return Id;
}
@JsonProperty("Id")
public void setId(String id) {
- this.id = id;
+ this.Id = id;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 238f78b..99f0ec7 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
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-
+//CHECKSTYLE:OFF
/**
* <p>Java class for Error complex type.
* <p/>
@@ -93,3 +93,4 @@ public class Error {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 8a37426..b6a3fb9 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
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-
+//CHECKSTYLE:OFF
/**
* <p>Java class for ResultError complex type.
* <p/>
@@ -126,3 +126,4 @@ public class ResultError {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 5d9f24e..c40f3a7 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
@@ -324,7 +324,7 @@ public class SalesforceSession implements Service {
}
- public static interface SalesforceSessionListener {
+ public interface SalesforceSessionListener {
void onLogin(String accessToken, String instanceUrl);
void onLogout();
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
index cec3ef8..50055a0 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginError.java
@@ -21,6 +21,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
/**
* DTO for Salesforce login error
*/
+//CHECKSTYLE:OFF
public class LoginError {
private String error;
@@ -45,3 +46,4 @@ public class LoginError {
this.errorDescription = errorDescription;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
index 7da5386..9eaeec8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.salesforce.internal.dto;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamConverter;
+
import org.apache.camel.component.salesforce.api.PicklistEnumConverter;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -26,74 +27,84 @@ import org.codehaus.jackson.annotate.JsonProperty;
* Salesforce DTO for SObject PushTopic
*/
@XStreamAlias("PushTopic")
+//CHECKSTYLE:OFF
public class PushTopic extends AbstractSObjectBase {
- private String query;
- private Double apiVersion;
- private Boolean isActive;
+ // WARNING: these fields have case sensitive names,
+ // the field name MUST match the field name used by Salesforce
+ // DO NOT change these field names to camel case!!!
+ private String Query;
+
+ private Double ApiVersion;
+
+ private Boolean IsActive;
+
@XStreamConverter(PicklistEnumConverter.class)
- private NotifyForFieldsEnum notifyForFields;
+ private NotifyForFieldsEnum NotifyForFields;
+
@XStreamConverter(PicklistEnumConverter.class)
- private NotifyForOperationsEnum notifyForOperations;
- private String description;
+ private NotifyForOperationsEnum NotifyForOperations;
+
+ private String Description;
@JsonProperty("Query")
public String getQuery() {
- return this.query;
+ return this.Query;
}
@JsonProperty("Query")
public void setQuery(String query) {
- this.query = query;
+ this.Query = query;
}
@JsonProperty("ApiVersion")
public Double getApiVersion() {
- return this.apiVersion;
+ return this.ApiVersion;
}
@JsonProperty("ApiVersion")
public void setApiVersion(Double apiVersion) {
- this.apiVersion = apiVersion;
+ this.ApiVersion = apiVersion;
}
@JsonProperty("IsActive")
public Boolean getIsActive() {
- return this.isActive;
+ return this.IsActive;
}
@JsonProperty("IsActive")
public void setIsActive(Boolean isActive) {
- this.isActive = isActive;
+ this.IsActive = isActive;
}
@JsonProperty("NotifyForFields")
public NotifyForFieldsEnum getNotifyForFields() {
- return this.notifyForFields;
+ return this.NotifyForFields;
}
@JsonProperty("NotifyForFields")
public void setNotifyForFields(NotifyForFieldsEnum notifyForFields) {
- this.notifyForFields = notifyForFields;
+ this.NotifyForFields = notifyForFields;
}
@JsonProperty("NotifyForOperations")
public NotifyForOperationsEnum getNotifyForOperations() {
- return this.notifyForOperations;
+ return this.NotifyForOperations;
}
@JsonProperty("NotifyForOperations")
public void setNotifyForOperations(NotifyForOperationsEnum notifyForOperations) {
- this.notifyForOperations = notifyForOperations;
+ this.NotifyForOperations = notifyForOperations;
}
@JsonProperty("Description")
public String getDescription() {
- return this.description;
+ return this.Description;
}
@JsonProperty("Description")
public void setDescription(String description) {
- this.description = description;
+ this.Description = description;
}
-}
\ No newline at end of file
+}
+//CHECKSTYLE:ON
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 5fee6c1..b29f36b 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
@@ -102,7 +102,7 @@ public class JsonRestProcessor extends AbstractRestProcessor {
break;
default:
- throw new SalesforceException("Unknow operation name: " + operationName, null);
+ // ignore, some operations do not require response class or type
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/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 253be42..80bb488 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
@@ -145,7 +145,7 @@ public class XmlRestProcessor extends AbstractRestProcessor {
break;
default:
- throw new SalesforceException("Unknow operation name: " + operationName, null);
+ // ignore, some operations do not require alias or class exchange properties
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index e9264ca..9f51bbd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -398,10 +398,10 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
// testQuery
from("direct:query")
- .to("salesforce:query?sObjectQuery=SELECT name from Line_Item__c&sObjectClass=org.apache.camel.component.salesforce.dto.QueryRecordsLine_Item__c");
+ .to("salesforce:query?sObjectQuery=SELECT name from Line_Item__c&sObjectClass=" + QueryRecordsLine_Item__c.class.getName());
from("direct:queryXml")
- .to("salesforce:query?format=XML&sObjectQuery=SELECT name from Line_Item__c&sObjectClass=org.apache.camel.component.salesforce.dto.QueryRecordsLine_Item__c");
+ .to("salesforce:query?format=XML&sObjectQuery=SELECT name from Line_Item__c&sObjectClass=" + QueryRecordsLine_Item__c.class.getName());
// testSearch
from("direct:search")
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
index 8dcaf34..66628eb 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiIntegrationTest.java
@@ -93,7 +93,7 @@ public class StreamingApiIntegrationTest extends AbstractSalesforceTestBase {
// route for finding test topic
from("direct:query").
to("salesforce:query?sObjectQuery=SELECT Id FROM PushTopic WHERE Name = 'CamelTestTopic'&"
- + "sObjectClass=org.apache.camel.component.salesforce.internal.dto.QueryRecordsPushTopic");
+ + "sObjectClass=" + QueryRecordsPushTopic.class.getName());
// route for removing test record
from("direct:deleteSObjectWithId").
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
index 017172d..26fc964 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
@@ -1,3 +1,4 @@
+//CHECKSTYLE:OFF
/*
* Salesforce DTO generated by camel-salesforce-maven-plugin
* Generated on: Tue May 14 21:15:54 PDT 2013
@@ -198,4 +199,5 @@ public class Document extends AbstractSObjectBase {
this.IsBodySearchable = IsBodySearchable;
}
-}
\ No newline at end of file
+}
+//CHECKSTYLE:ON
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
index 2a92461..ce35cd8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce.dto.generated;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
import org.codehaus.jackson.annotate.JsonProperty;
-
+//CHECKSTYLE:OFF
@XStreamAlias("Line_Item__c")
public class Line_Item__c extends AbstractSObjectBase {
@@ -72,3 +72,4 @@ public class Line_Item__c extends AbstractSObjectBase {
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
index f506d12..1fd3b9f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce.dto.generated;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
import org.codehaus.jackson.annotate.JsonProperty;
-
+//CHECKSTYLE:OFF
@XStreamAlias("Merchandise__c")
public class Merchandise__c extends AbstractSObjectBase {
@@ -59,3 +59,4 @@ public class Merchandise__c extends AbstractSObjectBase {
Total_Inventory__c = total_Inventory__c;
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5f82ba3d/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
index ebe18f3..266f01e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
@@ -20,7 +20,7 @@ import java.util.List;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
-
+//CHECKSTYLE:OFF
public class QueryRecordsLine_Item__c extends AbstractQueryRecordsBase {
@XStreamImplicit
private List<Line_Item__c> records;
@@ -33,3 +33,4 @@ public class QueryRecordsLine_Item__c extends AbstractQueryRecordsBase {
this.records = records;
}
}
+//CHECKSTYLE:ON