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:18 UTC
[1/3] fixed the various CS errors in the salesforce component - work
in progress
Updated Branches:
refs/heads/master d92b38d1f -> 9d5892e6d
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java
index c3e52c3..cd7f39e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiJobIntegrationTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.salesforce.api.dto.bulk.ContentType;
import org.apache.camel.component.salesforce.api.dto.bulk.JobInfo;
import org.apache.camel.component.salesforce.api.dto.bulk.JobStateEnum;
import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import org.junit.experimental.theories.DataPoints;
import org.junit.experimental.theories.Theory;
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
index bcfd062..99e3b30 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.salesforce.api.dto.bulk.BatchStateEnum;
import org.apache.camel.component.salesforce.api.dto.bulk.ContentType;
import org.apache.camel.component.salesforce.api.dto.bulk.JobInfo;
import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import org.junit.experimental.theories.DataPoints;
import org.junit.experimental.theories.Theory;
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
index f3153c0..f136a33 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.salesforce;
-import org.junit.Assert;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
+import org.junit.Assert;
+
public class LoginConfigHelper extends Assert {
private static final String TEST_LOGIN_PROPERTIES = "../test-salesforce-login.properties";
@@ -61,7 +61,8 @@ public class LoginConfigHelper extends Assert {
if (stream != null) {
try {
stream.close();
- } catch (IOException ignore) {}
+ } catch (IOException ignore) {
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/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 6589cdf..e9264ca 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
@@ -16,16 +16,6 @@
*/
package org.apache.camel.component.salesforce;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.salesforce.api.dto.*;
-import org.apache.camel.component.salesforce.dto.Document;
-import org.apache.camel.component.salesforce.dto.Line_Item__c;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
-import org.apache.camel.component.salesforce.dto.QueryRecordsLine_Item__c;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.FileOutputStream;
import java.io.InputStream;
import java.nio.channels.Channels;
@@ -34,6 +24,24 @@ import java.nio.channels.ReadableByteChannel;
import java.util.HashMap;
import java.util.List;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
+import org.apache.camel.component.salesforce.api.dto.GlobalObjects;
+import org.apache.camel.component.salesforce.api.dto.RestResources;
+import org.apache.camel.component.salesforce.api.dto.SObjectBasicInfo;
+import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
+import org.apache.camel.component.salesforce.api.dto.SearchResult;
+import org.apache.camel.component.salesforce.api.dto.SearchResults;
+import org.apache.camel.component.salesforce.api.dto.Version;
+import org.apache.camel.component.salesforce.api.dto.Versions;
+import org.apache.camel.component.salesforce.dto.generated.Document;
+import org.apache.camel.component.salesforce.dto.generated.Line_Item__c;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
+import org.apache.camel.component.salesforce.dto.generated.QueryRecordsLine_Item__c;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
private static final Logger LOG = LoggerFactory.getLogger(RestApiIntegrationTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurationTest.java
index c556061..4841943 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurationTest.java
@@ -16,14 +16,16 @@
*/
package org.apache.camel.component.salesforce;
+import java.util.*;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.ComponentConfiguration;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.salesforce.dto.Document;
-import org.apache.camel.component.salesforce.dto.Line_Item__c;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
-import org.apache.camel.component.salesforce.dto.QueryRecordsLine_Item__c;
+import org.apache.camel.component.salesforce.dto.generated.Document;
+import org.apache.camel.component.salesforce.dto.generated.Line_Item__c;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
+import org.apache.camel.component.salesforce.dto.generated.QueryRecordsLine_Item__c;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
import org.apache.camel.impl.ParameterConfiguration;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -32,9 +34,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
-
-
/**
* Lets test the use of the ComponentConfiguration on the Salesforce endpoint
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/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 514f17e..8dcaf34 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
@@ -20,7 +20,7 @@ import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import org.apache.camel.component.salesforce.internal.dto.QueryRecordsPushTopic;
import org.joda.time.DateTime;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Document.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Document.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Document.java
deleted file mode 100644
index a448bb3..0000000
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Document.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Salesforce DTO generated by camel-salesforce-maven-plugin
- * Generated on: Tue May 14 21:15:54 PDT 2013
- */
-package org.apache.camel.component.salesforce.dto;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-import org.codehaus.jackson.annotate.JsonProperty;
-
-/**
- * Salesforce DTO for SObject Document
- */
-@XStreamAlias("Document")
-public class Document extends AbstractSObjectBase {
-
- // FolderId
- private String FolderId;
-
- @JsonProperty("FolderId")
- public String getFolderId() {
- return this.FolderId;
- }
-
- @JsonProperty("FolderId")
- public void setFolderId(String FolderId) {
- this.FolderId = FolderId;
- }
-
- // DeveloperName
- private String DeveloperName;
-
- @JsonProperty("DeveloperName")
- public String getDeveloperName() {
- return this.DeveloperName;
- }
-
- @JsonProperty("DeveloperName")
- public void setDeveloperName(String DeveloperName) {
- this.DeveloperName = DeveloperName;
- }
-
- // NamespacePrefix
- private String NamespacePrefix;
-
- @JsonProperty("NamespacePrefix")
- public String getNamespacePrefix() {
- return this.NamespacePrefix;
- }
-
- @JsonProperty("NamespacePrefix")
- public void setNamespacePrefix(String NamespacePrefix) {
- this.NamespacePrefix = NamespacePrefix;
- }
-
- // ContentType
- private String ContentType;
-
- @JsonProperty("ContentType")
- public String getContentType() {
- return this.ContentType;
- }
-
- @JsonProperty("ContentType")
- public void setContentType(String ContentType) {
- this.ContentType = ContentType;
- }
-
- // Type
- private String Type;
-
- @JsonProperty("Type")
- public String getType() {
- return this.Type;
- }
-
- @JsonProperty("Type")
- public void setType(String Type) {
- this.Type = Type;
- }
-
- // IsPublic
- private Boolean IsPublic;
-
- @JsonProperty("IsPublic")
- public Boolean getIsPublic() {
- return this.IsPublic;
- }
-
- @JsonProperty("IsPublic")
- public void setIsPublic(Boolean IsPublic) {
- this.IsPublic = IsPublic;
- }
-
- // BodyLength
- private Integer BodyLength;
-
- @JsonProperty("BodyLength")
- public Integer getBodyLength() {
- return this.BodyLength;
- }
-
- @JsonProperty("BodyLength")
- public void setBodyLength(Integer BodyLength) {
- this.BodyLength = BodyLength;
- }
-
- // Body
- // blob field url, use getBlobField to get the content
- @XStreamAlias("Body")
- private String BodyUrl;
-
- @JsonProperty("Body")
- public String getBodyUrl() {
- return this.BodyUrl;
- }
-
- @JsonProperty("Body")
- public void setBodyUrl(String BodyUrl) {
- this.BodyUrl = BodyUrl;
- }
-
- // Url
- private String Url;
-
- @JsonProperty("Url")
- public String getUrl() {
- return this.Url;
- }
-
- @JsonProperty("Url")
- public void setUrl(String Url) {
- this.Url = Url;
- }
-
- // Description
- private String Description;
-
- @JsonProperty("Description")
- public String getDescription() {
- return this.Description;
- }
-
- @JsonProperty("Description")
- public void setDescription(String Description) {
- this.Description = Description;
- }
-
- // Keywords
- private String Keywords;
-
- @JsonProperty("Keywords")
- public String getKeywords() {
- return this.Keywords;
- }
-
- @JsonProperty("Keywords")
- public void setKeywords(String Keywords) {
- this.Keywords = Keywords;
- }
-
- // IsInternalUseOnly
- private Boolean IsInternalUseOnly;
-
- @JsonProperty("IsInternalUseOnly")
- public Boolean getIsInternalUseOnly() {
- return this.IsInternalUseOnly;
- }
-
- @JsonProperty("IsInternalUseOnly")
- public void setIsInternalUseOnly(Boolean IsInternalUseOnly) {
- this.IsInternalUseOnly = IsInternalUseOnly;
- }
-
- // AuthorId
- private String AuthorId;
-
- @JsonProperty("AuthorId")
- public String getAuthorId() {
- return this.AuthorId;
- }
-
- @JsonProperty("AuthorId")
- public void setAuthorId(String AuthorId) {
- this.AuthorId = AuthorId;
- }
-
- // IsBodySearchable
- private Boolean IsBodySearchable;
-
- @JsonProperty("IsBodySearchable")
- public Boolean getIsBodySearchable() {
- return this.IsBodySearchable;
- }
-
- @JsonProperty("IsBodySearchable")
- public void setIsBodySearchable(Boolean IsBodySearchable) {
- this.IsBodySearchable = IsBodySearchable;
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Line_Item__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Line_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Line_Item__c.java
deleted file mode 100644
index 31bc4ce..0000000
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Line_Item__c.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.salesforce.dto;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-import org.codehaus.jackson.annotate.JsonProperty;
-
-@XStreamAlias("Line_Item__c")
-public class Line_Item__c extends AbstractSObjectBase {
-
- private Double Unit_Price__c;
-
- private Double Units_Sold__c;
-
- private String Merchandise__c;
-
- private String Invoice_Statement__c;
-
- @JsonProperty("Unit_Price__c")
- public Double getUnit_Price__c() {
- return Unit_Price__c;
- }
-
- @JsonProperty("Unit_Price__c")
- public void setUnit_Price__c(Double unit_Price__c) {
- Unit_Price__c = unit_Price__c;
- }
-
- @JsonProperty("Units_Sold__c")
- public Double getUnits_Sold__c() {
- return Units_Sold__c;
- }
-
- @JsonProperty("Units_Sold__c")
- public void setUnits_Sold__c(Double units_Sold__c) {
- Units_Sold__c = units_Sold__c;
- }
-
- @JsonProperty("Merchandise__c")
- public String getMerchandise__c() {
- return Merchandise__c;
- }
-
- @JsonProperty("Merchandise__c")
- public void setMerchandise__c(String merchandise__c) {
- Merchandise__c = merchandise__c;
- }
-
- @JsonProperty("Invoice_Statement__c")
- public String getInvoice_Statement__c() {
- return Invoice_Statement__c;
- }
-
- @JsonProperty("Invoice_Statement__c")
- public void setInvoice_Statement__c(String invoice_Statement__c) {
- Invoice_Statement__c = invoice_Statement__c;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Merchandise__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Merchandise__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Merchandise__c.java
deleted file mode 100644
index f7a76db..0000000
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/Merchandise__c.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.salesforce.dto;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-import org.codehaus.jackson.annotate.JsonProperty;
-
-@XStreamAlias("Merchandise__c")
-public class Merchandise__c extends AbstractSObjectBase {
-
- private String Description__c;
-
- private Double Price__c;
-
- private Double Total_Inventory__c;
-
- @JsonProperty("Description__c")
- public String getDescription__c() {
- return Description__c;
- }
-
- @JsonProperty("Description__c")
- public void setDescription__c(String description__c) {
- Description__c = description__c;
- }
-
- @JsonProperty("Price__c")
- public Double getPrice__c() {
- return Price__c;
- }
-
- @JsonProperty("Price__c")
- public void setPrice__c(Double price__c) {
- Price__c = price__c;
- }
-
- @JsonProperty("Total_Inventory__c")
- public Double getTotal_Inventory__c() {
- return Total_Inventory__c;
- }
-
- @JsonProperty("Total_Inventory__c")
- public void setTotal_Inventory__c(Double total_Inventory__c) {
- Total_Inventory__c = total_Inventory__c;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/QueryRecordsLine_Item__c.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/QueryRecordsLine_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/QueryRecordsLine_Item__c.java
deleted file mode 100644
index 34dcad4..0000000
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/QueryRecordsLine_Item__c.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.salesforce.dto;
-
-import java.util.List;
-
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
-
-public class QueryRecordsLine_Item__c extends AbstractQueryRecordsBase {
- @XStreamImplicit
- private List<Line_Item__c> records;
-
- public List<Line_Item__c> getRecords() {
- return records;
- }
-
- public void setRecords(List<Line_Item__c> records) {
- this.records = records;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/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
new file mode 100644
index 0000000..017172d
--- /dev/null
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
@@ -0,0 +1,201 @@
+/*
+ * Salesforce DTO generated by camel-salesforce-maven-plugin
+ * Generated on: Tue May 14 21:15:54 PDT 2013
+ */
+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;
+
+/**
+ * Salesforce DTO for SObject Document
+ */
+@XStreamAlias("Document")
+public class Document extends AbstractSObjectBase {
+
+ // FolderId
+ private String FolderId;
+
+ @JsonProperty("FolderId")
+ public String getFolderId() {
+ return this.FolderId;
+ }
+
+ @JsonProperty("FolderId")
+ public void setFolderId(String FolderId) {
+ this.FolderId = FolderId;
+ }
+
+ // DeveloperName
+ private String DeveloperName;
+
+ @JsonProperty("DeveloperName")
+ public String getDeveloperName() {
+ return this.DeveloperName;
+ }
+
+ @JsonProperty("DeveloperName")
+ public void setDeveloperName(String DeveloperName) {
+ this.DeveloperName = DeveloperName;
+ }
+
+ // NamespacePrefix
+ private String NamespacePrefix;
+
+ @JsonProperty("NamespacePrefix")
+ public String getNamespacePrefix() {
+ return this.NamespacePrefix;
+ }
+
+ @JsonProperty("NamespacePrefix")
+ public void setNamespacePrefix(String NamespacePrefix) {
+ this.NamespacePrefix = NamespacePrefix;
+ }
+
+ // ContentType
+ private String ContentType;
+
+ @JsonProperty("ContentType")
+ public String getContentType() {
+ return this.ContentType;
+ }
+
+ @JsonProperty("ContentType")
+ public void setContentType(String ContentType) {
+ this.ContentType = ContentType;
+ }
+
+ // Type
+ private String Type;
+
+ @JsonProperty("Type")
+ public String getType() {
+ return this.Type;
+ }
+
+ @JsonProperty("Type")
+ public void setType(String Type) {
+ this.Type = Type;
+ }
+
+ // IsPublic
+ private Boolean IsPublic;
+
+ @JsonProperty("IsPublic")
+ public Boolean getIsPublic() {
+ return this.IsPublic;
+ }
+
+ @JsonProperty("IsPublic")
+ public void setIsPublic(Boolean IsPublic) {
+ this.IsPublic = IsPublic;
+ }
+
+ // BodyLength
+ private Integer BodyLength;
+
+ @JsonProperty("BodyLength")
+ public Integer getBodyLength() {
+ return this.BodyLength;
+ }
+
+ @JsonProperty("BodyLength")
+ public void setBodyLength(Integer BodyLength) {
+ this.BodyLength = BodyLength;
+ }
+
+ // Body
+ // blob field url, use getBlobField to get the content
+ @XStreamAlias("Body")
+ private String BodyUrl;
+
+ @JsonProperty("Body")
+ public String getBodyUrl() {
+ return this.BodyUrl;
+ }
+
+ @JsonProperty("Body")
+ public void setBodyUrl(String BodyUrl) {
+ this.BodyUrl = BodyUrl;
+ }
+
+ // Url
+ private String Url;
+
+ @JsonProperty("Url")
+ public String getUrl() {
+ return this.Url;
+ }
+
+ @JsonProperty("Url")
+ public void setUrl(String Url) {
+ this.Url = Url;
+ }
+
+ // Description
+ private String Description;
+
+ @JsonProperty("Description")
+ public String getDescription() {
+ return this.Description;
+ }
+
+ @JsonProperty("Description")
+ public void setDescription(String Description) {
+ this.Description = Description;
+ }
+
+ // Keywords
+ private String Keywords;
+
+ @JsonProperty("Keywords")
+ public String getKeywords() {
+ return this.Keywords;
+ }
+
+ @JsonProperty("Keywords")
+ public void setKeywords(String Keywords) {
+ this.Keywords = Keywords;
+ }
+
+ // IsInternalUseOnly
+ private Boolean IsInternalUseOnly;
+
+ @JsonProperty("IsInternalUseOnly")
+ public Boolean getIsInternalUseOnly() {
+ return this.IsInternalUseOnly;
+ }
+
+ @JsonProperty("IsInternalUseOnly")
+ public void setIsInternalUseOnly(Boolean IsInternalUseOnly) {
+ this.IsInternalUseOnly = IsInternalUseOnly;
+ }
+
+ // AuthorId
+ private String AuthorId;
+
+ @JsonProperty("AuthorId")
+ public String getAuthorId() {
+ return this.AuthorId;
+ }
+
+ @JsonProperty("AuthorId")
+ public void setAuthorId(String AuthorId) {
+ this.AuthorId = AuthorId;
+ }
+
+ // IsBodySearchable
+ private Boolean IsBodySearchable;
+
+ @JsonProperty("IsBodySearchable")
+ public Boolean getIsBodySearchable() {
+ return this.IsBodySearchable;
+ }
+
+ @JsonProperty("IsBodySearchable")
+ public void setIsBodySearchable(Boolean IsBodySearchable) {
+ this.IsBodySearchable = IsBodySearchable;
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/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
new file mode 100644
index 0000000..2a92461
--- /dev/null
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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;
+
+@XStreamAlias("Line_Item__c")
+public class Line_Item__c extends AbstractSObjectBase {
+
+ private Double Unit_Price__c;
+
+ private Double Units_Sold__c;
+
+ private String Merchandise__c;
+
+ private String Invoice_Statement__c;
+
+ @JsonProperty("Unit_Price__c")
+ public Double getUnit_Price__c() {
+ return Unit_Price__c;
+ }
+
+ @JsonProperty("Unit_Price__c")
+ public void setUnit_Price__c(Double unit_Price__c) {
+ Unit_Price__c = unit_Price__c;
+ }
+
+ @JsonProperty("Units_Sold__c")
+ public Double getUnits_Sold__c() {
+ return Units_Sold__c;
+ }
+
+ @JsonProperty("Units_Sold__c")
+ public void setUnits_Sold__c(Double units_Sold__c) {
+ Units_Sold__c = units_Sold__c;
+ }
+
+ @JsonProperty("Merchandise__c")
+ public String getMerchandise__c() {
+ return Merchandise__c;
+ }
+
+ @JsonProperty("Merchandise__c")
+ public void setMerchandise__c(String merchandise__c) {
+ Merchandise__c = merchandise__c;
+ }
+
+ @JsonProperty("Invoice_Statement__c")
+ public String getInvoice_Statement__c() {
+ return Invoice_Statement__c;
+ }
+
+ @JsonProperty("Invoice_Statement__c")
+ public void setInvoice_Statement__c(String invoice_Statement__c) {
+ Invoice_Statement__c = invoice_Statement__c;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/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
new file mode 100644
index 0000000..f506d12
--- /dev/null
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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;
+
+@XStreamAlias("Merchandise__c")
+public class Merchandise__c extends AbstractSObjectBase {
+
+ private String Description__c;
+
+ private Double Price__c;
+
+ private Double Total_Inventory__c;
+
+ @JsonProperty("Description__c")
+ public String getDescription__c() {
+ return Description__c;
+ }
+
+ @JsonProperty("Description__c")
+ public void setDescription__c(String description__c) {
+ Description__c = description__c;
+ }
+
+ @JsonProperty("Price__c")
+ public Double getPrice__c() {
+ return Price__c;
+ }
+
+ @JsonProperty("Price__c")
+ public void setPrice__c(Double price__c) {
+ Price__c = price__c;
+ }
+
+ @JsonProperty("Total_Inventory__c")
+ public Double getTotal_Inventory__c() {
+ return Total_Inventory__c;
+ }
+
+ @JsonProperty("Total_Inventory__c")
+ public void setTotal_Inventory__c(Double total_Inventory__c) {
+ Total_Inventory__c = total_Inventory__c;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/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
new file mode 100644
index 0000000..ebe18f3
--- /dev/null
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/QueryRecordsLine_Item__c.java
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.salesforce.dto.generated;
+
+import java.util.List;
+
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
+
+public class QueryRecordsLine_Item__c extends AbstractQueryRecordsBase {
+ @XStreamImplicit
+ private List<Line_Item__c> records;
+
+ public List<Line_Item__c> getRecords() {
+ return records;
+ }
+
+ public void setRecords(List<Line_Item__c> records) {
+ this.records = records;
+ }
+}
[2/3] fixed the various CS errors in the salesforce component - work
in progress
Posted by cm...@apache.org.
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
index ed7a212..2764461 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractRestProcessor.java
@@ -82,323 +82,325 @@ public abstract class AbstractRestProcessor extends AbstractSalesforceProcessor
// call Operation using REST client
switch (operationName) {
- case GET_VERSIONS:
- restClient.getVersions(new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- // process response entity and create out message
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_RESOURCES:
- restClient.getResources(new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_GLOBAL_OBJECTS:
- restClient.getGlobalObjects(new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_BASIC_INFO:
- String sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
- restClient.getBasicInfo(sObjectName, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_DESCRIPTION:
- sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
- restClient.getDescription(sObjectName, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case GET_SOBJECT: {
- String sObjectIdValue;
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- sObjectIdValue = sObjectBase.getId();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ case GET_VERSIONS:
+ restClient.getVersions(new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ // process response entity and create out message
+ processResponse(exchange, response, exception, callback);
}
- final String sObjectId = sObjectIdValue;
+ });
+ break;
+
+ case GET_RESOURCES:
+ restClient.getResources(new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_GLOBAL_OBJECTS:
+ restClient.getGlobalObjects(new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_BASIC_INFO:
+ String sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
+ restClient.getBasicInfo(sObjectName, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_DESCRIPTION:
+ sObjectName = getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL);
+ restClient.getDescription(sObjectName, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+
+ case GET_SOBJECT: {
+ String sObjectIdValue;
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ sObjectIdValue = sObjectBase.getId();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ final String sObjectId = sObjectIdValue;
+
+ // use sObject name to load class
+ setResponseClass(exchange, sObjectName);
- // use sObject name to load class
- setResponseClass(exchange, sObjectName);
+ // get optional field list
+ String fieldsValue = getParameter(SOBJECT_FIELDS, exchange, IGNORE_BODY, IS_OPTIONAL);
+ String[] fields = null;
+ if (fieldsValue != null) {
+ fields = fieldsValue.split(",");
+ }
- // get optional field list
- String fieldsValue = getParameter(SOBJECT_FIELDS, exchange, IGNORE_BODY, IS_OPTIONAL);
- String[] fields = null;
- if (fieldsValue != null) {
- fields = fieldsValue.split(",");
+ restClient.getSObject(sObjectName, sObjectId, fields, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, sObjectId, null, null);
}
+ });
- restClient.getSObject(sObjectName, sObjectId, fields, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, sObjectId, null, null);
- }
- });
+ break;
+ }
- break;
+ case CREATE_SOBJECT: {
+ // determine parameters from input AbstractSObject
+ AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
}
- case CREATE_SOBJECT: {
- // determine parameters from input AbstractSObject
- AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- }
+ restClient.createSObject(sObjectName, getRequestStream(exchange),
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
- restClient.createSObject(sObjectName, getRequestStream(exchange),
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
+ break;
+ }
- break;
+ case UPDATE_SOBJECT: {
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectId;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ // remember the sObject Id
+ sObjectId = sObjectBase.getId();
+ // clear base object fields, which cannot be updated
+ sObjectBase.clearBaseFields();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectId = getParameter(SOBJECT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
}
- case UPDATE_SOBJECT: {
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectId;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- // remember the sObject Id
- sObjectId = sObjectBase.getId();
- // clear base object fields, which cannot be updated
- sObjectBase.clearBaseFields();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectId = getParameter(SOBJECT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- }
+ final String finalsObjectId = sObjectId;
+ restClient.updateSObject(sObjectName, sObjectId, getRequestStream(exchange),
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, finalsObjectId, null, null);
+ }
+ });
+
+ break;
+ }
- final String finalsObjectId = sObjectId;
- restClient.updateSObject(sObjectName, sObjectId, getRequestStream(exchange),
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, finalsObjectId, null, null);
- }
- });
-
- break;
+ case DELETE_SOBJECT: {
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectIdValue;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ sObjectIdValue = sObjectBase.getId();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
}
+ final String sObjectId = sObjectIdValue;
- case DELETE_SOBJECT: {
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectIdValue;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- sObjectIdValue = sObjectBase.getId();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ restClient.deleteSObject(sObjectName, sObjectId, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, sObjectId, null, null);
}
- final String sObjectId = sObjectIdValue;
-
- restClient.deleteSObject(sObjectName, sObjectId, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, sObjectId, null, null);
- }
- });
- break;
+ });
+ break;
+ }
+
+ case GET_SOBJECT_WITH_ID: {
+ Object oldValue = null;
+ String sObjectExtIdValue;
+ final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME,
+ exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
+ sObjectExtIdValue = oldValue.toString();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
}
- case GET_SOBJECT_WITH_ID: {
- Object oldValue = null;
- String sObjectExtIdValue;
- final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME,
- exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
- sObjectExtIdValue = oldValue.toString();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
- }
+ // use sObject name to load class
+ setResponseClass(exchange, sObjectName);
+
+ final Object finalOldValue = oldValue;
+ restClient.getSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
+ }
+ });
- // use sObject name to load class
- setResponseClass(exchange, sObjectName);
+ break;
+ }
+
+ case UPSERT_SOBJECT: {
+ String sObjectExtIdValue;
+ final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange,
+ IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ Object oldValue = null;
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
+ sObjectExtIdValue = oldValue.toString();
+ // clear base object fields, which cannot be updated
+ sObjectBase.clearBaseFields();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ }
- final Object finalOldValue = oldValue;
- restClient.getSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
- }
- });
+ final Object finalOldValue = oldValue;
+ restClient.upsertSObject(sObjectName, sObjectExtIdName, sObjectExtIdValue, getRequestStream(exchange),
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
+ }
+ });
+
+ break;
+ }
- break;
+ case DELETE_SOBJECT_WITH_ID: {
+ final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ Object oldValue = null;
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectExtIdValue;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
+ sObjectExtIdValue = oldValue.toString();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
}
- case UPSERT_SOBJECT: {
- String sObjectExtIdValue;
- final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange,
- IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- Object oldValue = null;
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
- sObjectExtIdValue = oldValue.toString();
- // clear base object fields, which cannot be updated
- sObjectBase.clearBaseFields();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, IGNORE_BODY, NOT_OPTIONAL);
- }
+ final Object finalOldValue = oldValue;
+ restClient.deleteSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
+ }
+ });
+
+ break;
+ }
- final Object finalOldValue = oldValue;
- restClient.upsertSObject(sObjectName, sObjectExtIdName, sObjectExtIdValue,
- getRequestStream(exchange), new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
- }
- });
-
- break;
+ case GET_BLOB_FIELD: {
+ // get blob field name
+ final String sObjectBlobFieldName = getParameter(SOBJECT_BLOB_FIELD_NAME,
+ exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ // determine parameters from input AbstractSObject
+ final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
+ String sObjectIdValue;
+ if (sObjectBase != null) {
+ sObjectName = sObjectBase.getClass().getSimpleName();
+ sObjectIdValue = sObjectBase.getId();
+ } else {
+ sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
}
+ final String sObjectId = sObjectIdValue;
+
+ restClient.getBlobField(sObjectName, sObjectId, sObjectBlobFieldName,
+ new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ restoreFields(exchange, sObjectBase, sObjectId, null, null);
+ }
+ });
+ break;
+ }
+
+ case QUERY:
+ final String sObjectQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
- case DELETE_SOBJECT_WITH_ID: {
- final String sObjectExtIdName = getParameter(SOBJECT_EXT_ID_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- Object oldValue = null;
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectExtIdValue;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- oldValue = getAndClearPropertyValue(sObjectBase, sObjectExtIdName);
- sObjectExtIdValue = oldValue.toString();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectExtIdValue = getParameter(SOBJECT_EXT_ID_VALUE, exchange, USE_BODY, NOT_OPTIONAL);
+ // use sObject name to load class
+ setResponseClass(exchange, null);
+
+ restClient.query(sObjectQuery, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
}
+ });
+ break;
- final Object finalOldValue = oldValue;
- restClient.deleteSObjectWithId(sObjectName, sObjectExtIdName, sObjectExtIdValue,
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, null, sObjectExtIdName, finalOldValue);
- }
- });
-
- break;
- }
+ case QUERY_MORE:
+ // reuse SOBJECT_QUERY parameter name for nextRecordsUrl
+ final String nextRecordsUrl = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
- case GET_BLOB_FIELD: {
- // get blob field name
- final String sObjectBlobFieldName = getParameter(SOBJECT_BLOB_FIELD_NAME,
- exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- // determine parameters from input AbstractSObject
- final AbstractSObjectBase sObjectBase = exchange.getIn().getBody(AbstractSObjectBase.class);
- String sObjectIdValue;
- if (sObjectBase != null) {
- sObjectName = sObjectBase.getClass().getSimpleName();
- sObjectIdValue = sObjectBase.getId();
- } else {
- sObjectName = getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL);
- sObjectIdValue = getParameter(SOBJECT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ // use custom response class property
+ setResponseClass(exchange, null);
+
+ restClient.queryMore(nextRecordsUrl, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
}
- final String sObjectId = sObjectIdValue;
-
- restClient.getBlobField(sObjectName, sObjectId, sObjectBlobFieldName,
- new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- restoreFields(exchange, sObjectBase, sObjectId, null, null);
- }
- });
- break;
- }
+ });
+ break;
- case QUERY:
- final String sObjectQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
-
- // use sObject name to load class
- setResponseClass(exchange, null);
-
- restClient.query(sObjectQuery, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case QUERY_MORE:
- // reuse SOBJECT_QUERY parameter name for nextRecordsUrl
- final String nextRecordsUrl = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
-
- // use custom response class property
- setResponseClass(exchange, null);
-
- restClient.queryMore(nextRecordsUrl, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
-
- case SEARCH:
- final String sObjectSearch = getParameter(SOBJECT_SEARCH, exchange, USE_BODY, NOT_OPTIONAL);
-
- restClient.search(sObjectSearch, new RestClient.ResponseCallback() {
- @Override
- public void onResponse(InputStream response, SalesforceException exception) {
- processResponse(exchange, response, exception, callback);
- }
- });
- break;
+ case SEARCH:
+ final String sObjectSearch = getParameter(SOBJECT_SEARCH, exchange, USE_BODY, NOT_OPTIONAL);
- }
+ restClient.search(sObjectSearch, new RestClient.ResponseCallback() {
+ @Override
+ public void onResponse(InputStream response, SalesforceException exception) {
+ processResponse(exchange, response, exception, callback);
+ }
+ });
+ break;
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
+
+ }
} catch (SalesforceException e) {
exchange.setException(new SalesforceException(
String.format("Error processing %s: [%s] \"%s\"",
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
index c214c01..db5c66b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AbstractSalesforceProcessor.java
@@ -35,7 +35,8 @@ public abstract class AbstractSalesforceProcessor implements SalesforceProcessor
protected static final boolean IS_OPTIONAL = true;
protected static final boolean USE_BODY = true;
protected static final boolean IGNORE_BODY = false;
- protected final Logger LOG = LoggerFactory.getLogger(this.getClass());
+
+ protected final Logger log = LoggerFactory.getLogger(this.getClass());
protected final SalesforceEndpoint endpoint;
protected final Map<String, String> endpointConfigMap;
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
index d461207..38ab6c6 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/BulkApiProcessor.java
@@ -60,297 +60,297 @@ public class BulkApiProcessor extends AbstractSalesforceProcessor {
boolean done = false;
try {
switch (operationName) {
- case CREATE_JOB:
- JobInfo jobBody = exchange.getIn().getMandatoryBody(JobInfo.class);
- bulkClient.createJob(jobBody, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case GET_JOB:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- String jobId;
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ case CREATE_JOB:
+ JobInfo jobBody = exchange.getIn().getMandatoryBody(JobInfo.class);
+ bulkClient.createJob(jobBody, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
- bulkClient.getJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case CLOSE_JOB:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case GET_JOB:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ String jobId;
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
- bulkClient.closeJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case ABORT_JOB:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case CLOSE_JOB:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.closeJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
- bulkClient.abortJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
- @Override
- public void onResponse(JobInfo jobInfo, SalesforceException ex) {
- processResponse(exchange, jobInfo, ex, callback);
- }
- });
-
- break;
-
- case CREATE_BATCH:
- // since request is in the body, use headers or endpoint params
- ContentType contentType = ContentType.fromValue(
- getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
-
- InputStream request;
- try {
- request = exchange.getIn().getMandatoryBody(InputStream.class);
- } catch (CamelException e) {
- String msg = "Error preparing batch request: " + e.getMessage();
- throw new SalesforceException(msg, e);
+ });
+
+ break;
+
+ case ABORT_JOB:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.abortJob(jobId, new BulkApiClient.JobInfoResponseCallback() {
+ @Override
+ public void onResponse(JobInfo jobInfo, SalesforceException ex) {
+ processResponse(exchange, jobInfo, ex, callback);
}
-
- bulkClient.createBatch(request, jobId, contentType, new BulkApiClient.BatchInfoResponseCallback() {
- @Override
- public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
- processResponse(exchange, batchInfo, ex, callback);
- }
- });
-
- break;
-
- case GET_BATCH:
- BatchInfo batchBody = exchange.getIn().getBody(BatchInfo.class);
- String batchId;
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case CREATE_BATCH:
+ // since request is in the body, use headers or endpoint params
+ ContentType contentType = ContentType.fromValue(
+ getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+
+ InputStream request;
+ try {
+ request = exchange.getIn().getMandatoryBody(InputStream.class);
+ } catch (CamelException e) {
+ String msg = "Error preparing batch request: " + e.getMessage();
+ throw new SalesforceException(msg, e);
+ }
+
+ bulkClient.createBatch(request, jobId, contentType, new BulkApiClient.BatchInfoResponseCallback() {
+ @Override
+ public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
+ processResponse(exchange, batchInfo, ex, callback);
}
- bulkClient.getBatch(jobId, batchId, new BulkApiClient.BatchInfoResponseCallback() {
- @Override
- public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
- processResponse(exchange, batchInfo, ex, callback);
- }
- });
+ });
- break;
+ break;
- case GET_ALL_BATCHES:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- if (jobBody != null) {
- jobId = jobBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ case GET_BATCH:
+ BatchInfo batchBody = exchange.getIn().getBody(BatchInfo.class);
+ String batchId;
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getBatch(jobId, batchId, new BulkApiClient.BatchInfoResponseCallback() {
+ @Override
+ public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
+ processResponse(exchange, batchInfo, ex, callback);
}
- bulkClient.getAllBatches(jobId, new BulkApiClient.BatchInfoListResponseCallback() {
- @Override
- public void onResponse(List<BatchInfo> batchInfoList, SalesforceException ex) {
- processResponse(exchange, batchInfoList, ex, callback);
- }
- });
-
- break;
-
- case GET_REQUEST:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case GET_ALL_BATCHES:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getAllBatches(jobId, new BulkApiClient.BatchInfoListResponseCallback() {
+ @Override
+ public void onResponse(List<BatchInfo> batchInfoList, SalesforceException ex) {
+ processResponse(exchange, batchInfoList, ex, callback);
}
+ });
- bulkClient.getRequest(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
- @Override
- public void onResponse(InputStream inputStream, SalesforceException ex) {
- // read the request stream into a StreamCache temp file
- // ensures the connection is read
- StreamCache body = null;
- if (inputStream != null) {
+ break;
+
+ case GET_REQUEST:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+
+ bulkClient.getRequest(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
+ @Override
+ public void onResponse(InputStream inputStream, SalesforceException ex) {
+ // read the request stream into a StreamCache temp file
+ // ensures the connection is read
+ StreamCache body = null;
+ if (inputStream != null) {
+ try {
+ body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ } catch (IOException e) {
+ String msg = "Error retrieving batch request: " + e.getMessage();
+ ex = new SalesforceException(msg, e);
+ } finally {
+ // close the input stream to release the Http connection
try {
- body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
- } catch (IOException e) {
- String msg = "Error retrieving batch request: " + e.getMessage();
- ex = new SalesforceException(msg, e);
- } finally {
- // close the input stream to release the Http connection
- try {
- inputStream.close();
- } catch (IOException ignore) {
- }
+ inputStream.close();
+ } catch (IOException ignore) {
}
}
- processResponse(exchange, body, ex, callback);
}
- });
-
- break;
-
- case GET_RESULTS:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ processResponse(exchange, body, ex, callback);
}
- bulkClient.getResults(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
- @Override
- public void onResponse(InputStream inputStream, SalesforceException ex) {
- // read the result stream into a StreamCache temp file
- // ensures the connection is read
- StreamCache body = null;
- if (inputStream != null) {
+ });
+
+ break;
+
+ case GET_RESULTS:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getResults(jobId, batchId, new BulkApiClient.StreamResponseCallback() {
+ @Override
+ public void onResponse(InputStream inputStream, SalesforceException ex) {
+ // read the result stream into a StreamCache temp file
+ // ensures the connection is read
+ StreamCache body = null;
+ if (inputStream != null) {
+ try {
+ body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ } catch (IOException e) {
+ String msg = "Error retrieving batch results: " + e.getMessage();
+ ex = new SalesforceException(msg, e);
+ } finally {
+ // close the input stream to release the Http connection
try {
- body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
- } catch (IOException e) {
- String msg = "Error retrieving batch results: " + e.getMessage();
- ex = new SalesforceException(msg, e);
- } finally {
- // close the input stream to release the Http connection
- try {
- inputStream.close();
- } catch (IOException ignore) {
- }
+ inputStream.close();
+ } catch (IOException ignore) {
}
}
- processResponse(exchange, body, ex, callback);
}
- });
-
- break;
-
- case CREATE_BATCH_QUERY:
- jobBody = exchange.getIn().getBody(JobInfo.class);
- String soqlQuery;
- if (jobBody != null) {
- jobId = jobBody.getId();
- contentType = jobBody.getContentType();
- // use SOQL query from header or endpoint config
- soqlQuery = getParameter(SOBJECT_QUERY, exchange, IGNORE_BODY, NOT_OPTIONAL);
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- contentType = ContentType.fromValue(
- getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
- // reuse SOBJECT_QUERY property
- soqlQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
- }
- bulkClient.createBatchQuery(jobId, soqlQuery, contentType,
- new BulkApiClient.BatchInfoResponseCallback() {
- @Override
- public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
- processResponse(exchange, batchInfo, ex, callback);
- }
- });
-
- break;
-
- case GET_QUERY_RESULT_IDS:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ processResponse(exchange, body, ex, callback);
}
- bulkClient.getQueryResultIds(jobId, batchId, new BulkApiClient.QueryResultIdsCallback() {
- @Override
- public void onResponse(List<String> ids, SalesforceException ex) {
- processResponse(exchange, ids, ex, callback);
- }
- });
-
- break;
-
- case GET_QUERY_RESULT:
- batchBody = exchange.getIn().getBody(BatchInfo.class);
- String resultId;
- if (batchBody != null) {
- jobId = batchBody.getJobId();
- batchId = batchBody.getId();
- resultId = getParameter(RESULT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- } else {
- jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- batchId = getParameter(BATCH_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
- resultId = getParameter(RESULT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ });
+
+ break;
+
+ case CREATE_BATCH_QUERY:
+ jobBody = exchange.getIn().getBody(JobInfo.class);
+ String soqlQuery;
+ if (jobBody != null) {
+ jobId = jobBody.getId();
+ contentType = jobBody.getContentType();
+ // use SOQL query from header or endpoint config
+ soqlQuery = getParameter(SOBJECT_QUERY, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ contentType = ContentType.fromValue(
+ getParameter(CONTENT_TYPE, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ // reuse SOBJECT_QUERY property
+ soqlQuery = getParameter(SOBJECT_QUERY, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.createBatchQuery(jobId, soqlQuery, contentType,
+ new BulkApiClient.BatchInfoResponseCallback() {
+ @Override
+ public void onResponse(BatchInfo batchInfo, SalesforceException ex) {
+ processResponse(exchange, batchInfo, ex, callback);
+ }
+ });
+
+ break;
+
+ case GET_QUERY_RESULT_IDS:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getQueryResultIds(jobId, batchId, new BulkApiClient.QueryResultIdsCallback() {
+ @Override
+ public void onResponse(List<String> ids, SalesforceException ex) {
+ processResponse(exchange, ids, ex, callback);
}
- bulkClient.getQueryResult(jobId, batchId, resultId, new BulkApiClient.StreamResponseCallback() {
- @Override
- public void onResponse(InputStream inputStream, SalesforceException ex) {
- StreamCache body = null;
- if (inputStream != null) {
- // read the result stream into a StreamCache temp file
- // ensures the connection is read
+ });
+
+ break;
+
+ case GET_QUERY_RESULT:
+ batchBody = exchange.getIn().getBody(BatchInfo.class);
+ String resultId;
+ if (batchBody != null) {
+ jobId = batchBody.getJobId();
+ batchId = batchBody.getId();
+ resultId = getParameter(RESULT_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ } else {
+ jobId = getParameter(JOB_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ batchId = getParameter(BATCH_ID, exchange, IGNORE_BODY, NOT_OPTIONAL);
+ resultId = getParameter(RESULT_ID, exchange, USE_BODY, NOT_OPTIONAL);
+ }
+ bulkClient.getQueryResult(jobId, batchId, resultId, new BulkApiClient.StreamResponseCallback() {
+ @Override
+ public void onResponse(InputStream inputStream, SalesforceException ex) {
+ StreamCache body = null;
+ if (inputStream != null) {
+ // read the result stream into a StreamCache temp file
+ // ensures the connection is read
+ try {
+ body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ } catch (IOException e) {
+ String msg = "Error retrieving query result: " + e.getMessage();
+ ex = new SalesforceException(msg, e);
+ } finally {
+ // close the input stream to release the Http connection
try {
- body = StreamCacheConverter.convertToStreamCache(inputStream, exchange);
+ inputStream.close();
} catch (IOException e) {
- String msg = "Error retrieving query result: " + e.getMessage();
- ex = new SalesforceException(msg, e);
- } finally {
- // close the input stream to release the Http connection
- try {
- inputStream.close();
- } catch (IOException e) {
- // ignore
- }
+ // ignore
}
}
- processResponse(exchange, body, ex, callback);
}
- });
+ processResponse(exchange, body, ex, callback);
+ }
+ });
- break;
- }
+ break;
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
+
+ }
} catch (SalesforceException e) {
exchange.setException(new SalesforceException(
String.format("Error processing %s: [%s] \"%s\"",
- operationName, e.getStatusCode(), e.getMessage()),
- e));
+ operationName, e.getStatusCode(), e.getMessage()), e));
callback.done(true);
done = true;
} catch (InvalidPayloadException e) {
exchange.setException(new SalesforceException(
String.format("Unexpected Error processing %s: \"%s\"",
- operationName, e.getMessage()),
- e));
+ operationName, e.getMessage()), e));
callback.done(true);
done = true;
} catch (RuntimeException e) {
exchange.setException(new SalesforceException(
String.format("Unexpected Error processing %s: \"%s\"",
- operationName, e.getMessage()),
- e));
+ operationName, e.getMessage()), e));
callback.done(true);
done = true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
index 528d8ca..5fee6c1 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
@@ -42,9 +42,10 @@ import org.eclipse.jetty.util.StringUtil;
public class JsonRestProcessor extends AbstractRestProcessor {
+ private static final String RESPONSE_TYPE = JsonRestProcessor.class.getName() + ".responseType";
+
// it is ok to use a single thread safe ObjectMapper
private final ObjectMapper objectMapper;
- private static final String RESPONSE_TYPE = JsonRestProcessor.class.getName() + ".responseType";
public JsonRestProcessor(SalesforceEndpoint endpoint) throws SalesforceException {
super(endpoint);
@@ -55,51 +56,53 @@ public class JsonRestProcessor extends AbstractRestProcessor {
}
@Override
- protected void processRequest(Exchange exchange) {
+ protected void processRequest(Exchange exchange) throws SalesforceException {
switch (operationName) {
- case GET_VERSIONS:
- // handle in built response types
- exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<Version>>() {
- });
- break;
-
- case GET_RESOURCES:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, RestResources.class);
- break;
-
- case GET_GLOBAL_OBJECTS:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
- break;
-
- case GET_BASIC_INFO:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
- break;
-
- case GET_DESCRIPTION:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
- break;
-
- case CREATE_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case UPSERT_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case SEARCH:
- // handle known response type
- exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<SearchResult>>() {
- });
- break;
-
+ case GET_VERSIONS:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<Version>>() {
+ });
+ break;
+
+ case GET_RESOURCES:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, RestResources.class);
+ break;
+
+ case GET_GLOBAL_OBJECTS:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
+ break;
+
+ case GET_BASIC_INFO:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
+ break;
+
+ case GET_DESCRIPTION:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
+ break;
+
+ case CREATE_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case UPSERT_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case SEARCH:
+ // handle known response type
+ exchange.setProperty(RESPONSE_TYPE, new TypeReference<List<SearchResult>>() {
+ });
+ break;
+
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
}
}
@@ -120,8 +123,8 @@ public class JsonRestProcessor extends AbstractRestProcessor {
// if all else fails, get body as String
final String body = in.getBody(String.class);
if (null == body) {
- String msg = "Unsupported request message body " +
- (in.getBody() == null ? null : in.getBody().getClass());
+ String msg = "Unsupported request message body "
+ + (in.getBody() == null ? null : in.getBody().getClass());
throw new SalesforceException(msg, null);
} else {
request = new ByteArrayInputStream(body.getBytes(StringUtil.__UTF8_CHARSET));
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
index 905127a..253be42 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
@@ -84,73 +84,69 @@ public class XmlRestProcessor extends AbstractRestProcessor {
protected void processRequest(Exchange exchange) throws SalesforceException {
switch (operationName) {
- case GET_VERSIONS:
- exchange.setProperty(RESPONSE_CLASS, Versions.class);
- break;
-
- case GET_RESOURCES:
- exchange.setProperty(RESPONSE_CLASS, RestResources.class);
- break;
-
- case GET_GLOBAL_OBJECTS:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
- break;
-
- case GET_BASIC_INFO:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
-
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
- break;
-
- case GET_DESCRIPTION:
- // handle in built response types
- exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
-
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
- break;
-
- case GET_SOBJECT:
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
- break;
-
- case CREATE_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case GET_SOBJECT_WITH_ID:
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
- break;
-
- case UPSERT_SOBJECT:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
- break;
-
- case QUERY:
- case QUERY_MORE:
- // need to add alias for Salesforce XML that uses SObject name as root element
- exchange.setProperty(RESPONSE_ALIAS,
- "QueryResult");
- break;
-
- case SEARCH:
- // handle known response type
- exchange.setProperty(RESPONSE_CLASS, SearchResults.class);
- break;
-
+ case GET_VERSIONS:
+ exchange.setProperty(RESPONSE_CLASS, Versions.class);
+ break;
+
+ case GET_RESOURCES:
+ exchange.setProperty(RESPONSE_CLASS, RestResources.class);
+ break;
+
+ case GET_GLOBAL_OBJECTS:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, GlobalObjects.class);
+ break;
+
+ case GET_BASIC_INFO:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectBasicInfo.class);
+
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
+ break;
+
+ case GET_DESCRIPTION:
+ // handle in built response types
+ exchange.setProperty(RESPONSE_CLASS, SObjectDescription.class);
+
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, USE_BODY, NOT_OPTIONAL));
+ break;
+
+ case GET_SOBJECT:
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ break;
+
+ case CREATE_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case GET_SOBJECT_WITH_ID:
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, getParameter(SOBJECT_NAME, exchange, IGNORE_BODY, NOT_OPTIONAL));
+ break;
+
+ case UPSERT_SOBJECT:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, CreateSObjectResult.class);
+ break;
+
+ case QUERY:
+ case QUERY_MORE:
+ // need to add alias for Salesforce XML that uses SObject name as root element
+ exchange.setProperty(RESPONSE_ALIAS, "QueryResult");
+ break;
+
+ case SEARCH:
+ // handle known response type
+ exchange.setProperty(RESPONSE_CLASS, SearchResults.class);
+ break;
+
+ default:
+ throw new SalesforceException("Unknow operation name: " + operationName, null);
}
-
}
protected InputStream getRequestStream(Exchange exchange) throws SalesforceException {
@@ -173,8 +169,8 @@ public class XmlRestProcessor extends AbstractRestProcessor {
// if all else fails, get body as String
final String body = in.getBody(String.class);
if (null == body) {
- String msg = "Unsupported request message body " +
- (in.getBody() == null ? null : in.getBody().getClass());
+ String msg = "Unsupported request message body "
+ + (in.getBody() == null ? null : in.getBody().getClass());
throw new SalesforceException(msg, null);
} else {
request = new ByteArrayInputStream(body.getBytes(StringUtil.__UTF8_CHARSET));
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
index 70e8fa4..4924aad 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/PushTopicHelper.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
public class PushTopicHelper {
private static final Logger LOG = LoggerFactory.getLogger(PushTopicHelper.class);
- private static final ObjectMapper objectMapper = new ObjectMapper();
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private static final String PUSH_TOPIC_OBJECT_NAME = "PushTopic";
private static final long API_TIMEOUT = 60; // Rest API call timeout
private final SalesforceEndpointConfig config;
@@ -55,9 +55,9 @@ public class PushTopicHelper {
// lookup Topic first
try {
// use SOQL to lookup Topic, since Name is not an external ID!!!
- restClient.query("SELECT Id, Name, Query, ApiVersion, IsActive, " +
- "NotifyForFields, NotifyForOperations, Description " +
- "FROM PushTopic WHERE Name = '" + topicName + "'",
+ restClient.query("SELECT Id, Name, Query, ApiVersion, IsActive, "
+ + "NotifyForFields, NotifyForOperations, Description "
+ + "FROM PushTopic WHERE Name = '" + topicName + "'",
callback);
if (!callback.await(API_TIMEOUT, TimeUnit.SECONDS)) {
@@ -66,7 +66,7 @@ public class PushTopicHelper {
if (callback.getException() != null) {
throw callback.getException();
}
- QueryRecordsPushTopic records = objectMapper.readValue(callback.getResponse(),
+ QueryRecordsPushTopic records = OBJECT_MAPPER.readValue(callback.getResponse(),
QueryRecordsPushTopic.class);
if (records.getTotalSize() == 1) {
@@ -74,12 +74,12 @@ public class PushTopicHelper {
LOG.info("Found existing topic {}: {}", topicName, topic);
// check if we need to update topic query, notifyForFields or notifyForOperations
- if (!query.equals(topic.getQuery()) ||
- (config.getNotifyForFields() != null &&
- !config.getNotifyForFields().equals(topic.getNotifyForFields())) ||
- (config.getNotifyForOperations() != null &&
- !config.getNotifyForOperations().equals(topic.getNotifyForOperations()))
- ) {
+ if (!query.equals(topic.getQuery())
+ || (config.getNotifyForFields() != null
+ && !config.getNotifyForFields().equals(topic.getNotifyForFields()))
+ || (config.getNotifyForOperations() != null
+ && !config.getNotifyForOperations().equals(topic.getNotifyForOperations()))
+ ) {
if (!config.isUpdateTopic()) {
String msg = "Query doesn't match existing Topic and updateTopic is set to false";
@@ -132,7 +132,7 @@ public class PushTopicHelper {
final SyncResponseCallback callback = new SyncResponseCallback();
try {
restClient.createSObject(PUSH_TOPIC_OBJECT_NAME,
- new ByteArrayInputStream(objectMapper.writeValueAsBytes(topic)), callback);
+ new ByteArrayInputStream(OBJECT_MAPPER.writeValueAsBytes(topic)), callback);
if (!callback.await(API_TIMEOUT, TimeUnit.SECONDS)) {
throw new SalesforceException("API call timeout!", null);
@@ -141,7 +141,7 @@ public class PushTopicHelper {
throw callback.getException();
}
- CreateSObjectResult result = objectMapper.readValue(callback.getResponse(), CreateSObjectResult.class);
+ CreateSObjectResult result = OBJECT_MAPPER.readValue(callback.getResponse(), CreateSObjectResult.class);
if (!result.getSuccess()) {
final SalesforceException salesforceException = new SalesforceException(
result.getErrors(), HttpStatus.BAD_REQUEST_400);
@@ -185,7 +185,7 @@ public class PushTopicHelper {
topic.setNotifyForOperations(config.getNotifyForOperations());
restClient.updateSObject("PushTopic", topicId,
- new ByteArrayInputStream(objectMapper.writeValueAsBytes(topic)),
+ new ByteArrayInputStream(OBJECT_MAPPER.writeValueAsBytes(topic)),
callback);
if (!callback.await(API_TIMEOUT, TimeUnit.SECONDS)) {
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index f31fdda..40933a9 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -50,6 +50,7 @@ import static org.cometd.bayeux.Message.ERROR_FIELD;
import static org.cometd.bayeux.Message.SUBSCRIPTION_FIELD;
public class SubscriptionHelper implements Service {
+
private static final Logger LOG = LoggerFactory.getLogger(SubscriptionHelper.class);
private static final int CONNECT_TIMEOUT = 110;
@@ -134,8 +135,7 @@ public class SubscriptionHelper implements Service {
new HashMap<SalesforceConsumer, ClientSessionChannel.MessageListener>();
map.putAll(listenerMap);
listenerMap.clear();
- for (Map.Entry<SalesforceConsumer, ClientSessionChannel.MessageListener> entry :
- map.entrySet()) {
+ for (Map.Entry<SalesforceConsumer, ClientSessionChannel.MessageListener> entry : map.entrySet()) {
final SalesforceConsumer consumer = entry.getKey();
final String topicName = consumer.getTopicName();
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
index 7ce7311..52d1d65 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.salesforce;
import java.io.IOException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import org.apache.camel.test.junit4.CamelTestSupport;
public abstract class AbstractSalesforceTestBase extends CamelTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/9d5892e6/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
index 52bf7cc..d1b7303 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
@@ -16,18 +16,23 @@
*/
package org.apache.camel.component.salesforce;
-import org.apache.camel.component.salesforce.api.dto.bulk.*;
-import org.apache.camel.component.salesforce.dto.Merchandise__c;
-import org.junit.experimental.theories.DataPoints;
-import org.junit.experimental.theories.Theory;
-
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.component.salesforce.api.dto.bulk.BatchInfo;
+import org.apache.camel.component.salesforce.api.dto.bulk.BatchStateEnum;
+import org.apache.camel.component.salesforce.api.dto.bulk.ContentType;
+import org.apache.camel.component.salesforce.api.dto.bulk.JobInfo;
+import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
+import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theory;
+
public class BulkApiBatchIntegrationTest extends AbstractBulkApiTestBase {
+
private static final String TEST_REQUEST_XML = "/test-request.xml";
private static final String TEST_REQUEST_CSV = "/test-request.csv";
[3/3] git commit: fixed the various CS errors in the salesforce
component - work in progress
Posted by cm...@apache.org.
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;