Repository: camel Updated Branches: refs/heads/master 61121b78e -> 0b08ae46f
Code cleanup: removed unused imports Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b08ae46 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b08ae46 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b08ae46 Branch: refs/heads/master Commit: 0b08ae46ffa948d5a219b08a57897952348684ae Parents: 61121b7 Author: Zoran Regvart <zregv...@apache.org> Authored: Tue May 9 13:05:21 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Tue May 9 13:05:21 2017 +0200 ---------------------------------------------------------------------- .../component/directvm/DirectVmProducer.java | 1 - .../apache/camel/component/log/LogEndpoint.java | 1 - .../properties/DefaultPropertiesParser.java | 1 - .../camel/component/rest/RestEndpoint.java | 1 - .../camel/impl/CamelPostProcessorHelper.java | 2 +- .../apache/camel/impl/DefaultRouteContext.java | 1 - .../camel/impl/DefaultTransformerRegistry.java | 2 -- .../camel/impl/DefaultValidatorRegistry.java | 2 -- .../management/ManagedManagementStrategy.java | 1 - .../camel/management/mbean/ManagedConsumer.java | 1 - .../mbean/ManagedStreamCachingStrategy.java | 1 - .../org/apache/camel/model/LogDefinition.java | 2 +- .../org/apache/camel/model/LoopDefinition.java | 1 - .../camel/model/rest/RestBindingDefinition.java | 2 +- .../validator/CustomValidatorDefinition.java | 2 +- .../validator/EndpointValidatorDefinition.java | 8 ------- .../validator/PredicateValidatorDefinition.java | 3 +-- .../camel/processor/CamelLogProcessor.java | 2 -- .../processor/DefaultMaskingFormatter.java | 13 ------------ .../apache/camel/processor/LogProcessor.java | 2 -- .../java/org/apache/camel/spi/LogListener.java | 3 ++- .../org/apache/camel/spi/MaskingFormatter.java | 2 -- .../java/org/apache/camel/spi/Transformer.java | 2 +- .../apache/camel/spi/TransformerRegistry.java | 3 --- .../java/org/apache/camel/spi/Validator.java | 2 +- .../org/apache/camel/spi/ValidatorRegistry.java | 3 --- .../support/RestConsumerContextPathMatcher.java | 1 - .../camel/builder/TransformerBuilderTest.java | 22 -------------------- .../camel/component/log/LogListenerTest.java | 1 - .../apache/camel/component/log/LogMaskTest.java | 3 --- .../camel/impl/ConfigurationHelperTest.java | 1 - .../camel/impl/EndpointConfigurationTest.java | 1 - .../impl/validator/ValidatorContractTest.java | 9 -------- .../impl/validator/ValidatorRouteTest.java | 11 ---------- .../camel/language/simple/SimpleTest.java | 3 +-- .../ManagedTransformerRegistryTest.java | 2 +- .../ManagedValidatorRegistryTest.java | 3 +-- .../processor/DefaultMaskingFormatterTest.java | 10 --------- .../camel/processor/LogEipListenerTest.java | 1 - .../apache/camel/processor/LogEipMaskTest.java | 2 -- .../camel/processor/LogPropertiesTest.java | 1 - .../support/XMLTokenExpressionIteratorTest.java | 2 -- .../camel/util/jsse/KeyStoreParametersTest.java | 2 -- .../salesforce/AnalyticsApiIntegrationTest.java | 5 ----- .../salesforce/ApprovalIntegrationTest.java | 1 - .../CompositeApiTreeIntegrationTest.java | 1 - .../component/salesforce/LoginConfigHelper.java | 2 -- .../salesforce/dto/generated/Account.java | 3 +-- .../salesforce/dto/generated/Document.java | 3 ++- .../salesforce/dto/generated/Line_Item__c.java | 3 ++- .../salesforce/dto/generated/MSPTest.java | 10 ++++----- .../dto/generated/Merchandise__c.java | 3 ++- .../salesforce/dto/generated/Task.java | 2 ++ .../salesforce/internal/LoginTokenTest.java | 2 -- 54 files changed, 26 insertions(+), 148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java index 6ec6c9f..75cb556 100644 --- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java @@ -21,7 +21,6 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.impl.DefaultAsyncProducer; import org.apache.camel.spi.HeaderFilterStrategy; -import org.apache.camel.util.ExchangeHelper; /** * The Direct-VM producer. http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java index 29d5b3a..5c35a22 100644 --- a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java @@ -27,7 +27,6 @@ import org.apache.camel.processor.DefaultExchangeFormatter; import org.apache.camel.processor.DefaultMaskingFormatter; import org.apache.camel.processor.ThroughputLogger; import org.apache.camel.spi.ExchangeFormatter; -import org.apache.camel.spi.LogListener; import org.apache.camel.spi.MaskingFormatter; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java index 08535c8..8574add 100644 --- a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java +++ b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java @@ -21,7 +21,6 @@ import java.util.Properties; import java.util.Set; import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java index e4c95fa..73bccf9 100644 --- a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java @@ -28,7 +28,6 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.model.rest.RestBindingMode; -import org.apache.camel.processor.UnmarshalProcessor; import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RestConfiguration; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java b/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java index 8d19179..a9063cf 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java +++ b/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java @@ -18,6 +18,7 @@ package org.apache.camel.impl; import java.lang.reflect.Method; import java.util.Set; + import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; @@ -31,7 +32,6 @@ import org.apache.camel.IsSingleton; import org.apache.camel.NoSuchBeanException; import org.apache.camel.PollingConsumer; import org.apache.camel.Processor; -import org.apache.camel.Produce; import org.apache.camel.Producer; import org.apache.camel.ProducerTemplate; import org.apache.camel.ProxyInstantiationException; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java index 16cdc39..2d15015 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java @@ -37,7 +37,6 @@ import org.apache.camel.model.RouteDefinition; import org.apache.camel.processor.CamelInternalProcessor; import org.apache.camel.processor.ContractAdvice; import org.apache.camel.processor.Pipeline; -import org.apache.camel.processor.RestBindingAdvice; import org.apache.camel.spi.Contract; import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.spi.RouteContext; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java index afa9968..52a9391 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java @@ -26,11 +26,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.camel.CamelContext; -import org.apache.camel.Endpoint; import org.apache.camel.impl.transformer.TransformerKey; import org.apache.camel.model.transformer.TransformerDefinition; import org.apache.camel.spi.DataType; -import org.apache.camel.spi.EndpointRegistry; import org.apache.camel.spi.Transformer; import org.apache.camel.spi.TransformerRegistry; import org.apache.camel.util.CamelContextHelper; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java index 9a4d4ca..85f6690 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java @@ -26,11 +26,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.camel.CamelContext; -import org.apache.camel.Endpoint; import org.apache.camel.impl.validator.ValidatorKey; import org.apache.camel.model.validator.ValidatorDefinition; import org.apache.camel.spi.DataType; -import org.apache.camel.spi.EndpointRegistry; import org.apache.camel.spi.Validator; import org.apache.camel.spi.ValidatorRegistry; import org.apache.camel.util.CamelContextHelper; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java index 53e52f5..58a6982 100644 --- a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java @@ -32,7 +32,6 @@ import org.apache.camel.management.mbean.ManagedEventNotifier; import org.apache.camel.management.mbean.ManagedProcessor; import org.apache.camel.management.mbean.ManagedProducer; import org.apache.camel.management.mbean.ManagedRoute; -import org.apache.camel.management.mbean.ManagedRuntimeCamelCatalog; import org.apache.camel.management.mbean.ManagedService; import org.apache.camel.management.mbean.ManagedThreadPool; import org.apache.camel.management.mbean.ManagedTracer; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java index a940286..bcc9967 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedConsumer.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.Consumer; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.api.management.mbean.ManagedConsumerMBean; -import org.apache.camel.spi.ManagementStrategy; /** * @version http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java index 99d88e9..cf8c371 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java @@ -19,7 +19,6 @@ package org.apache.camel.management.mbean; import org.apache.camel.CamelContext; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.api.management.mbean.ManagedStreamCachingStrategyMBean; -import org.apache.camel.spi.ManagementStrategy; import org.apache.camel.spi.StreamCachingStrategy; @ManagedResource(description = "Managed StreamCachingStrategy") http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java index 66493e6..55c87e4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java @@ -17,6 +17,7 @@ package org.apache.camel.model; import java.util.Map; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -29,7 +30,6 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; import org.apache.camel.processor.DefaultMaskingFormatter; import org.apache.camel.processor.LogProcessor; -import org.apache.camel.spi.LogListener; import org.apache.camel.spi.MaskingFormatter; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java index 5be19d7..73f34c6 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java @@ -26,7 +26,6 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.LoopProcessor; -import org.apache.camel.spi.AsPredicate; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java index 17f195e..bde862e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java @@ -18,6 +18,7 @@ package org.apache.camel.model.rest; import java.util.HashMap; import java.util.Map; + import javax.xml.bind.JAXBContext; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -26,7 +27,6 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; -import org.apache.camel.Processor; import org.apache.camel.model.OptionalIdentifiedDefinition; import org.apache.camel.processor.RestBindingAdvice; import org.apache.camel.spi.DataFormat; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java index 5c1e164..befbc02 100644 --- a/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java @@ -20,9 +20,9 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; + import org.apache.camel.CamelContext; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.Transformer; import org.apache.camel.spi.Validator; /** http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java index 537216b..3f5b636 100644 --- a/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java @@ -16,26 +16,18 @@ */ package org.apache.camel.model.validator; -import java.util.HashMap; -import java.util.Map; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.ls.LSResourceResolver; - import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.ExchangePattern; -import org.apache.camel.component.validator.ValidatorEndpoint; -import org.apache.camel.component.validator.ValidatorResourceResolverFactory; import org.apache.camel.impl.validator.ProcessorValidator; import org.apache.camel.processor.SendProcessor; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.Validator; -import org.apache.camel.util.ObjectHelper; /** * Represents an endpoint {@link Validator} which leverages camel validator component such as http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java index 89f72a5..ea484df 100644 --- a/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java @@ -18,9 +18,9 @@ package org.apache.camel.model.validator; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlType; + import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; @@ -29,7 +29,6 @@ import org.apache.camel.model.ExpressionNodeHelper; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.processor.validation.PredicateValidatingProcessor; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.Transformer; import org.apache.camel.spi.Validator; /** http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java index 88a3a9d..066f353 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java @@ -16,8 +16,6 @@ */ package org.apache.camel.processor; -import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.Set; import org.apache.camel.AsyncCallback; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/processor/DefaultMaskingFormatter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultMaskingFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultMaskingFormatter.java index 514d8cd..ed3bb0f 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/DefaultMaskingFormatter.java +++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultMaskingFormatter.java @@ -16,25 +16,12 @@ */ package org.apache.camel.processor; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.Arrays; import java.util.HashSet; -import java.util.Map; import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.Future; import java.util.regex.Pattern; -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.spi.MaskingFormatter; -import org.apache.camel.spi.UriParam; -import org.apache.camel.spi.UriParams; -import org.apache.camel.util.MessageHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; /** * The {@link MaskingFormatter} that searches the specified keywards in the source http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java index c8fa263..3909e7b 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java @@ -16,8 +16,6 @@ */ package org.apache.camel.processor; -import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.Set; import org.apache.camel.AsyncCallback; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/spi/LogListener.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/LogListener.java b/camel-core/src/main/java/org/apache/camel/spi/LogListener.java index 6d7151e..4d8bf9e 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/LogListener.java +++ b/camel-core/src/main/java/org/apache/camel/spi/LogListener.java @@ -18,8 +18,9 @@ package org.apache.camel.spi; import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; +import org.apache.camel.processor.CamelLogProcessor; +import org.apache.camel.processor.LogProcessor; import org.apache.camel.util.CamelLogger; -import org.slf4j.Logger; import org.slf4j.Marker; /** http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/spi/MaskingFormatter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/MaskingFormatter.java b/camel-core/src/main/java/org/apache/camel/spi/MaskingFormatter.java index 08f704e..d83b038 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/MaskingFormatter.java +++ b/camel-core/src/main/java/org/apache/camel/spi/MaskingFormatter.java @@ -16,8 +16,6 @@ */ package org.apache.camel.spi; -import org.apache.camel.Exchange; - /** * A plugin used to mask a log String, for example security information * like password or passphrase. http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/spi/Transformer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/Transformer.java b/camel-core/src/main/java/org/apache/camel/spi/Transformer.java index 32fd376..f282c6f 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/Transformer.java +++ b/camel-core/src/main/java/org/apache/camel/spi/Transformer.java @@ -18,10 +18,10 @@ package org.apache.camel.spi; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; -import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.model.InputTypeDefinition; import org.apache.camel.model.OutputTypeDefinition; +import org.apache.camel.processor.ContractAdvice; import org.apache.camel.support.ServiceSupport; /** http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/spi/TransformerRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/TransformerRegistry.java b/camel-core/src/main/java/org/apache/camel/spi/TransformerRegistry.java index c4d73d4..eba2e36 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/TransformerRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/spi/TransformerRegistry.java @@ -16,12 +16,9 @@ */ package org.apache.camel.spi; -import java.util.List; import java.util.Map; -import org.apache.camel.Endpoint; import org.apache.camel.StaticService; -import org.apache.camel.model.transformer.TransformerDefinition; /** * Registry to cache transformers in memory. http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/spi/Validator.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/Validator.java b/camel-core/src/main/java/org/apache/camel/spi/Validator.java index ebd5776..50b2d86 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/Validator.java +++ b/camel-core/src/main/java/org/apache/camel/spi/Validator.java @@ -18,11 +18,11 @@ package org.apache.camel.spi; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; -import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.ValidationException; import org.apache.camel.model.InputTypeDefinition; import org.apache.camel.model.OutputTypeDefinition; +import org.apache.camel.processor.ContractAdvice; import org.apache.camel.support.ServiceSupport; /** http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/spi/ValidatorRegistry.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/spi/ValidatorRegistry.java b/camel-core/src/main/java/org/apache/camel/spi/ValidatorRegistry.java index 82d1020..1999189 100644 --- a/camel-core/src/main/java/org/apache/camel/spi/ValidatorRegistry.java +++ b/camel-core/src/main/java/org/apache/camel/spi/ValidatorRegistry.java @@ -16,12 +16,9 @@ */ package org.apache.camel.spi; -import java.util.List; import java.util.Map; -import org.apache.camel.Endpoint; import org.apache.camel.StaticService; -import org.apache.camel.model.validator.ValidatorDefinition; /** * Registry to cache validators in memory. http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java b/camel-core/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java index f3c22af..066216a 100644 --- a/camel-core/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java +++ b/camel-core/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java @@ -21,7 +21,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; /** * A context path matcher when using rest-dsl that allows components to reuse the same matching logic. http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java index 1cdd30a..1d7f2b8 100644 --- a/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java +++ b/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java @@ -17,37 +17,15 @@ package org.apache.camel.builder; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import org.apache.camel.CamelContext; -import org.apache.camel.Channel; -import org.apache.camel.DelegateProcessor; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.Processor; -import org.apache.camel.Producer; -import org.apache.camel.Route; import org.apache.camel.TestSupport; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.EventDrivenConsumerRoute; import org.apache.camel.impl.transformer.DataFormatTransformer; import org.apache.camel.impl.transformer.ProcessorTransformer; import org.apache.camel.model.dataformat.StringDataFormat; -import org.apache.camel.processor.ChoiceProcessor; -import org.apache.camel.processor.DeadLetterChannel; -import org.apache.camel.processor.EvaluateExpressionProcessor; -import org.apache.camel.processor.FilterProcessor; -import org.apache.camel.processor.MulticastProcessor; -import org.apache.camel.processor.Pipeline; -import org.apache.camel.processor.RecipientList; import org.apache.camel.processor.SendProcessor; -import org.apache.camel.processor.Splitter; -import org.apache.camel.processor.ThreadsProcessor; -import org.apache.camel.processor.idempotent.IdempotentConsumer; -import org.apache.camel.processor.idempotent.MemoryIdempotentRepository; import org.apache.camel.spi.DataType; import org.apache.camel.spi.Transformer; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java index 4b506e7..9e1110e 100644 --- a/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/log/LogListenerTest.java @@ -21,7 +21,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.JndiRegistry; -import org.apache.camel.model.Constants; import org.apache.camel.util.jndi.JndiTest; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/component/log/LogMaskTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogMaskTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogMaskTest.java index caeae1e..01f0526 100644 --- a/camel-core/src/test/java/org/apache/camel/component/log/LogMaskTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/log/LogMaskTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.log; import org.apache.camel.CamelContext; -import org.apache.camel.ContextTestSupport; import org.apache.camel.ProducerTemplate; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.JndiRegistry; @@ -26,8 +25,6 @@ import org.apache.camel.spi.MaskingFormatter; import org.apache.camel.util.jndi.JndiTest; import org.junit.Assert; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class LogMaskTest { http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java b/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java index 42887d2..e4b7737 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java @@ -23,7 +23,6 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Component; import org.apache.camel.ComponentConfiguration; -import org.apache.camel.ComponentVerifier; import org.apache.camel.Endpoint; import org.apache.camel.EndpointConfiguration; import org.apache.camel.URIField; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java b/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java index 383db7f..ce08662 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java @@ -19,7 +19,6 @@ package org.apache.camel.impl; import org.apache.camel.CamelContext; import org.apache.camel.Component; import org.apache.camel.ComponentConfiguration; -import org.apache.camel.ComponentVerifier; import org.apache.camel.Endpoint; import org.apache.camel.EndpointConfiguration; import org.junit.AfterClass; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java b/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java index a5f65cc..18233b3 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java @@ -16,21 +16,12 @@ */ package org.apache.camel.impl.validator; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; import org.apache.camel.ContextTestSupport; import org.apache.camel.Converter; import org.apache.camel.Exchange; import org.apache.camel.TypeConverters; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.RouteContext; import org.junit.Test; public class ValidatorContractTest extends ContextTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java b/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java index 696881d..872247a 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java @@ -16,35 +16,24 @@ */ package org.apache.camel.impl.validator; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; import java.util.Map; import org.apache.camel.AsyncCallback; import org.apache.camel.Consumer; import org.apache.camel.ContextTestSupport; -import org.apache.camel.Converter; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.TypeConverters; import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultAsyncProducer; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.impl.DefaultExchange; -import org.apache.camel.model.DataFormatDefinition; -import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataType; -import org.apache.camel.spi.RouteContext; -import org.apache.camel.spi.Transformer; import org.apache.camel.spi.Validator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java index 99ce113..06ccd77 100644 --- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java @@ -25,6 +25,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.TimeZone; + import org.apache.camel.CamelAuthorizationException; import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; @@ -39,8 +40,6 @@ import org.apache.camel.impl.JndiRegistry; import org.apache.camel.language.bean.RuntimeBeanExpressionException; import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException; import org.apache.camel.spi.Language; - -import static org.apache.camel.TestSupport.getJavaMajorVersion; /** * @version */ http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/management/ManagedTransformerRegistryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedTransformerRegistryTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedTransformerRegistryTest.java index e26d3c8..5a8cb4b 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedTransformerRegistryTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedTransformerRegistryTest.java @@ -17,9 +17,9 @@ package org.apache.camel.management; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Set; + import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.openmbean.CompositeData; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java index 7ceb111..6d89ad6 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java @@ -17,9 +17,9 @@ package org.apache.camel.management; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Set; + import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.openmbean.CompositeData; @@ -28,7 +28,6 @@ import javax.management.openmbean.TabularData; import org.apache.camel.Message; import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.model.dataformat.StringDataFormat; import org.apache.camel.spi.DataType; import org.apache.camel.spi.Validator; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/processor/DefaultMaskingFormatterTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DefaultMaskingFormatterTest.java b/camel-core/src/test/java/org/apache/camel/processor/DefaultMaskingFormatterTest.java index 84f932b..501a49c 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DefaultMaskingFormatterTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DefaultMaskingFormatterTest.java @@ -16,19 +16,9 @@ */ package org.apache.camel.processor; -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.DefaultExchange; -import org.apache.camel.impl.DefaultMessage; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class DefaultMaskingFormatterTest { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java b/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java index dbebc66..0c85c32 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/LogEipListenerTest.java @@ -21,7 +21,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.JndiRegistry; -import org.apache.camel.spi.LogListener; import org.apache.camel.util.jndi.JndiTest; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/processor/LogEipMaskTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/LogEipMaskTest.java b/camel-core/src/test/java/org/apache/camel/processor/LogEipMaskTest.java index a62aa07..b4e6110 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/LogEipMaskTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/LogEipMaskTest.java @@ -17,8 +17,6 @@ package org.apache.camel.processor; import org.apache.camel.CamelContext; -import org.apache.camel.ContextTestSupport; -import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/processor/LogPropertiesTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/LogPropertiesTest.java b/camel-core/src/test/java/org/apache/camel/processor/LogPropertiesTest.java index 7bd02f2..47765b6 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/LogPropertiesTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/LogPropertiesTest.java @@ -18,7 +18,6 @@ package org.apache.camel.processor; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; /** * @version http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java index d6e67c1..e6a0c54 100644 --- a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java +++ b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java @@ -23,14 +23,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; import junit.framework.TestCase; import static org.apache.camel.TestSupport.getJavaMajorVersion; - /** * */ http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java index e376431..f5c118a 100644 --- a/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java @@ -26,8 +26,6 @@ import java.security.NoSuchProviderException; import org.apache.camel.CamelContext; -import static org.apache.camel.TestSupport.getJavaMajorVersion; - public class KeyStoreParametersTest extends AbstractJsseParametersTest { protected KeyStoreParameters createMinimalKeyStoreParameters() { http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java index c8434b6..19d07b2 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java @@ -16,13 +16,9 @@ */ package org.apache.camel.component.salesforce; -import java.io.FileInputStream; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Properties; -import java.util.TreeMap; import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; @@ -37,7 +33,6 @@ import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportSta import org.apache.camel.component.salesforce.api.dto.analytics.reports.SyncReportResults; import org.apache.camel.dataformat.csv.CsvDataFormat; import org.apache.commons.csv.CSVFormat; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.theories.DataPoints; import org.junit.experimental.theories.Theories; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java index 4ce8965..ecf7e23 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import com.googlecode.junittoolbox.ParallelParameterized; -import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.salesforce.api.dto.approval.ApprovalRequest; import org.apache.camel.component.salesforce.api.dto.approval.ApprovalRequest.Action; import org.apache.camel.component.salesforce.api.dto.approval.ApprovalResult; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java index 2ebd1e0..cfcf8a4 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java @@ -20,7 +20,6 @@ import java.util.Arrays; import com.googlecode.junittoolbox.ParallelParameterized; -import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.salesforce.api.dto.composite.SObjectTree; import org.apache.camel.component.salesforce.dto.generated.Account; import org.apache.camel.component.salesforce.dto.generated.Account_IndustryEnum; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/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 9520271..fa3be30 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 @@ -20,8 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.jsse.KeyStoreParameters; http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java index 430a62d..3cc3c31 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java @@ -19,6 +19,7 @@ package org.apache.camel.component.salesforce.dto.generated; import java.util.ArrayList; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; @@ -30,8 +31,6 @@ import org.apache.camel.component.salesforce.api.dto.SObjectDescription; import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; import org.apache.camel.component.salesforce.api.dto.SObjectField; -import com.fasterxml.jackson.annotation.JsonProperty; - //CHECKSTYLE:OFF /** * Salesforce DTO for SObject Account http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java index 29dfd35..ef57725 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java @@ -16,9 +16,10 @@ */ package org.apache.camel.component.salesforce.dto.generated; +import com.fasterxml.jackson.annotation.JsonProperty; import com.thoughtworks.xstream.annotations.XStreamAlias; + 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/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java index a382e31..be5f8ec 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java @@ -16,9 +16,10 @@ */ package org.apache.camel.component.salesforce.dto.generated; +import com.fasterxml.jackson.annotation.JsonProperty; import com.thoughtworks.xstream.annotations.XStreamAlias; + import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; -import com.fasterxml.jackson.annotation.JsonProperty; //CHECKSTYLE:OFF @XStreamAlias("Line_Item__c") public class Line_Item__c extends AbstractSObjectBase { http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java index 780282d..1dd03a6 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/MSPTest.java @@ -16,11 +16,6 @@ */ package org.apache.camel.component.salesforce.dto.generated; -import org.apache.camel.component.salesforce.api.MultiSelectPicklistConverter; -import org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer; -import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer; -import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -31,6 +26,11 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; +import org.apache.camel.component.salesforce.api.MultiSelectPicklistConverter; +import org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer; +import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer; +import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; + /** * Sample POJO for MSP tests. */ http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java index 8f898fa..94e645a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java @@ -16,9 +16,10 @@ */ package org.apache.camel.component.salesforce.dto.generated; +import com.fasterxml.jackson.annotation.JsonProperty; import com.thoughtworks.xstream.annotations.XStreamAlias; + import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; -import com.fasterxml.jackson.annotation.JsonProperty; //CHECKSTYLE:OFF @XStreamAlias("Merchandise__c") public class Merchandise__c extends AbstractSObjectBase { http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java index 33292d6..bd9433e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Task.java @@ -26,6 +26,7 @@ import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; /** * Salesforce DTO for SObject Task */ +//CHECKSTYLE:OFF @XStreamAlias("Task") public class Task extends AbstractSObjectBase { @@ -53,3 +54,4 @@ public class Task extends AbstractSObjectBase { Description = description; } } +//CHECKSTYLE:ON http://git-wip-us.apache.org/repos/asf/camel/blob/0b08ae46/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 02f319b..e80d250 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 @@ -21,8 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.component.salesforce.api.utils.JsonUtils; import org.apache.camel.component.salesforce.internal.dto.LoginToken; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull;
