Fix checkstyle errors Signed-off-by: Sune Keller <abs...@almbrand.dk>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f181e5d3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f181e5d3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f181e5d3 Branch: refs/heads/master Commit: f181e5d38aae0b28f47585a8695768c33871d5b5 Parents: 5cbf8bb Author: Sune Keller <abs...@almbrand.dk> Authored: Wed Jun 15 16:38:35 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jun 16 07:55:44 2016 +0200 ---------------------------------------------------------------------- .../camel/component/salesforce/SalesforceConsumer.java | 4 ++-- .../component/salesforce/SalesforceEndpointConfig.java | 4 ++-- .../api/StringMultiSelectPicklistDeserializer.java | 4 ++-- .../salesforce/api/StringMultiSelectPicklistSerializer.java | 4 ++-- .../component/salesforce/api/dto/AbstractSObjectBase.java | 4 ++-- .../camel/component/salesforce/api/dto/RestResources.java | 3 +-- .../camel/component/salesforce/api/dto/SearchResult.java | 3 +-- .../salesforce/api/dto/analytics/reports/Report.java | 6 +++--- .../salesforce/api/dto/analytics/reports/SummaryValue.java | 4 ++-- .../component/salesforce/internal/SalesforceSession.java | 3 ++- .../internal/client/DefaultAnalyticsApiClient.java | 5 +++-- .../salesforce/internal/client/DefaultRestClient.java | 4 ++-- .../camel/component/salesforce/internal/dto/PushTopic.java | 2 +- .../salesforce/internal/processor/JsonRestProcessor.java | 8 ++++---- .../salesforce/internal/streaming/PushTopicHelper.java | 3 ++- .../salesforce/api/MultiSelectPicklistJsonTest.java | 7 +++---- .../camel/component/salesforce/internal/LoginTokenTest.java | 3 ++- .../java/org/apache/camel/maven/CamelSalesforceMojo.java | 9 ++++++--- 18 files changed, 42 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/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 dc7471c..b2fccfe 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 @@ -21,6 +21,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -34,8 +36,6 @@ import org.apache.camel.util.ServiceHelper; import org.cometd.bayeux.Message; import org.cometd.bayeux.client.ClientSessionChannel; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * The Salesforce consumer. */ http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/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 1622b21..36a22af 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 @@ -20,6 +20,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata; import org.apache.camel.component.salesforce.api.dto.bulk.ContentType; @@ -29,8 +31,6 @@ import org.apache.camel.component.salesforce.internal.dto.NotifyForOperationsEnu import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Salesforce Endpoint configuration. */ http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistDeserializer.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistDeserializer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistDeserializer.java index 3cd2b49..5845615f 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistDeserializer.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistDeserializer.java @@ -34,9 +34,9 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; public class StringMultiSelectPicklistDeserializer extends StdDeserializer<Object> implements ContextualDeserializer { - private static final long serialVersionUID = 7380774744798254325L; + private static final long serialVersionUID = 7380774744798254325L; - protected StringMultiSelectPicklistDeserializer(Class<?> vc) { + protected StringMultiSelectPicklistDeserializer(Class<?> vc) { super(vc); } http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java index 6fcf9e0..7cbd99c 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/StringMultiSelectPicklistSerializer.java @@ -28,9 +28,9 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; */ public class StringMultiSelectPicklistSerializer extends StdSerializer<Object> { - private static final long serialVersionUID = 1406195556960561677L; + private static final long serialVersionUID = 1406195556960561677L; - protected StringMultiSelectPicklistSerializer(Class<Object> t) { + protected StringMultiSelectPicklistSerializer(Class<Object> t) { super(t); } http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/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 6d46d32..7ba39da 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 @@ -16,9 +16,9 @@ */ package org.apache.camel.component.salesforce.api.dto; -import org.joda.time.DateTime; - import com.fasterxml.jackson.annotation.JsonProperty; + +import org.joda.time.DateTime; //CHECKSTYLE:OFF public class AbstractSObjectBase extends AbstractDTOBase { http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java index f795528..2b4a166 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java @@ -16,9 +16,8 @@ */ package org.apache.camel.component.salesforce.api.dto; -import com.thoughtworks.xstream.annotations.XStreamAlias; - import com.fasterxml.jackson.annotation.JsonProperty; +import com.thoughtworks.xstream.annotations.XStreamAlias; /** * DTO for Salesforce Resources. http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/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 8091fea..b9a8ad7 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 @@ -16,9 +16,8 @@ */ package org.apache.camel.component.salesforce.api.dto; -import com.thoughtworks.xstream.annotations.XStreamAlias; - import com.fasterxml.jackson.annotation.JsonProperty; +import com.thoughtworks.xstream.annotations.XStreamAlias; /** * DTO for Salesforce SOSL Search result record. http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java index 656b2db..cd7141a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/Report.java @@ -16,13 +16,13 @@ */ package org.apache.camel.component.salesforce.api.dto.analytics.reports; -import org.apache.camel.component.salesforce.api.PicklistEnumConverter; -import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; - import com.fasterxml.jackson.annotation.JsonProperty; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; +import org.apache.camel.component.salesforce.api.PicklistEnumConverter; +import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; + /** * Salesforce DTO for SObject Report */ http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/SummaryValue.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/SummaryValue.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/SummaryValue.java index 833c203..e78dd8d 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/SummaryValue.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/analytics/reports/SummaryValue.java @@ -16,10 +16,10 @@ */ package org.apache.camel.component.salesforce.api.dto.analytics.reports; -import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase; - import com.fasterxml.jackson.annotation.JsonAnySetter; +import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase; + /** * Report results summary value DTO for data cells and aggregates. */ http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/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 af95f6b..8d6d1cc 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 @@ -26,6 +26,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.camel.Service; import org.apache.camel.component.salesforce.SalesforceHttpClient; import org.apache.camel.component.salesforce.SalesforceLoginConfig; @@ -34,7 +36,6 @@ import org.apache.camel.component.salesforce.api.dto.RestError; import org.apache.camel.component.salesforce.internal.dto.LoginError; import org.apache.camel.component.salesforce.internal.dto.LoginToken; import org.apache.camel.util.ObjectHelper; -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.jetty.client.HttpConversation; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java index 7b1976e..cd3cb06 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java @@ -22,6 +22,9 @@ import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.List; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.camel.component.salesforce.SalesforceHttpClient; import org.apache.camel.component.salesforce.api.SalesforceException; import org.apache.camel.component.salesforce.api.dto.RestError; @@ -32,8 +35,6 @@ import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportIns import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata; import org.apache.camel.component.salesforce.api.dto.analytics.reports.SyncReportResults; import org.apache.camel.component.salesforce.internal.SalesforceSession; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.core.type.TypeReference; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.util.BytesContentProvider; http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java index 989be56..0c19a78 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java @@ -24,6 +24,8 @@ import java.net.URLEncoder; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.thoughtworks.xstream.XStream; import org.apache.camel.component.salesforce.SalesforceHttpClient; @@ -36,8 +38,6 @@ import org.apache.camel.component.salesforce.internal.dto.RestChoices; import org.apache.camel.component.salesforce.internal.dto.RestErrors; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.URISupport; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.core.type.TypeReference; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.util.InputStreamContentProvider; http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java index 05bb476..7f5c6fa 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/PushTopic.java @@ -16,12 +16,12 @@ */ package org.apache.camel.component.salesforce.internal.dto; +import com.fasterxml.jackson.annotation.JsonProperty; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; import org.apache.camel.component.salesforce.api.PicklistEnumConverter; import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; -import com.fasterxml.jackson.annotation.JsonProperty; //CHECKSTYLE:OFF /** http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/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 15e214e..b125f8c 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 @@ -22,6 +22,10 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -37,10 +41,6 @@ import org.apache.camel.component.salesforce.api.dto.SearchResult; import org.apache.camel.component.salesforce.api.dto.Version; import org.eclipse.jetty.util.StringUtil; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; - public class JsonRestProcessor extends AbstractRestProcessor { private static final String RESPONSE_TYPE = JsonRestProcessor.class.getName() + ".responseType"; http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/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 b770292..f27ce56 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 @@ -20,6 +20,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.concurrent.TimeUnit; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.camel.CamelException; import org.apache.camel.component.salesforce.SalesforceEndpointConfig; import org.apache.camel.component.salesforce.api.SalesforceException; @@ -28,7 +30,6 @@ import org.apache.camel.component.salesforce.internal.client.RestClient; import org.apache.camel.component.salesforce.internal.client.SyncResponseCallback; import org.apache.camel.component.salesforce.internal.dto.PushTopic; import org.apache.camel.component.salesforce.internal.dto.QueryRecordsPushTopic; -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.jetty.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java index 36bdd7e..393c1d6 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistJsonTest.java @@ -16,13 +16,12 @@ */ package org.apache.camel.component.salesforce.api; -import org.apache.camel.component.salesforce.dto.generated.MSPTest; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.apache.camel.component.salesforce.dto.generated.MSPTest; import org.junit.Test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class MultiSelectPicklistJsonTest { http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java index 36759eb..a0494db 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java @@ -16,8 +16,9 @@ */ package org.apache.camel.component.salesforce.internal; -import org.apache.camel.component.salesforce.internal.dto.LoginToken; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.apache.camel.component.salesforce.internal.dto.LoginToken; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/f181e5d3/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java index a79645c..bdd04aa 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java @@ -37,6 +37,8 @@ import java.util.TreeSet; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.camel.component.salesforce.SalesforceEndpointConfig; import org.apache.camel.component.salesforce.SalesforceHttpClient; import org.apache.camel.component.salesforce.SalesforceLoginConfig; @@ -76,8 +78,6 @@ import org.eclipse.jetty.client.util.BasicAuthentication; import org.eclipse.jetty.client.util.DigestAuthentication; import org.eclipse.jetty.util.ssl.SslContextFactory; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Goal to generate DTOs for Salesforce SObjects */ @@ -275,7 +275,10 @@ public class CamelSalesforceMojo extends AbstractMojo { engine.init(); // make sure we can load both templates - if (!engine.resourceExists(SOBJECT_POJO_VM) || !engine.resourceExists(SOBJECT_QUERY_RECORDS_VM) || !engine.resourceExists(SOBJECT_POJO_OPTIONAL_VM) || !engine.resourceExists(SOBJECT_QUERY_RECORDS_OPTIONAL_VM)) { + if (!engine.resourceExists(SOBJECT_POJO_VM) + || !engine.resourceExists(SOBJECT_QUERY_RECORDS_VM) + || !engine.resourceExists(SOBJECT_POJO_OPTIONAL_VM) + || !engine.resourceExists(SOBJECT_QUERY_RECORDS_OPTIONAL_VM)) { throw new MojoExecutionException("Velocity templates not found"); }
