You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/03/24 16:08:42 UTC
svn commit: r640438 [1/8] - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/compone...
Author: ningjiang
Date: Mon Mar 24 08:08:24 2008
New Revision: 640438
URL: http://svn.apache.org/viewvc?rev=640438&view=rev
Log:
Fixed the check style errors of camel-core and some other components
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileMessage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/DefaultFileRenamer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileRenamer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/CollectionProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/ListPollingConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/QueueComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorPollingConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/Counter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationAgentImpl.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedService.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ObjectNameEncoder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CompletedPredicate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ServiceActivationType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ArtixDSContentType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ArtixDSDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalanceStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Aggregator.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Interceptor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ProceedProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowFaultProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationCollection.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/PredicateAggregationCollection.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/BrowsableEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/NamespaceAware.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Synchronization.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionStringBuffer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/PackageHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterLoader.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ReportingTypeConverterRegistry.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMap.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/CamelInitialContextFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangePatternTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ExchangeTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvocationSerializeTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithMultipleParametersTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExchangeTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/list/ListTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConfigureTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomExchangePatternTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/AmahDeadLetterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanWithExceptionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FaultRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyPerExceptionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThreadTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkWithAsyncFlowTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithMultipleHandlesTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/UnsafeCharactersEncoderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/RouteDotGeneratorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/view/XmlGraphTest.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/EntryFilter.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleProcessesTest.java
activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsIssue170Test.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Mon Mar 24 08:08:24 2008
@@ -21,12 +21,12 @@
import java.util.concurrent.Callable;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteType;
import org.apache.camel.spi.ExchangeConverter;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.Registry;
-import org.apache.camel.model.RouteType;
/**
* Interface used to represent the context used to configure routes and the
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelTemplate.java Mon Mar 24 08:08:24 2008
@@ -474,8 +474,7 @@
}
}
}
- }
- else {
+ } else {
endpoint = context.getEndpoint(endpointUri);
}
if (endpoint == null) {
@@ -504,8 +503,7 @@
Message out = result.getOut(false);
if (out != null) {
answer = out.getBody();
- }
- else {
+ } else {
answer = result.getIn().getBody();
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java Mon Mar 24 08:08:24 2008
@@ -16,12 +16,12 @@
*/
package org.apache.camel;
-import org.apache.camel.spi.Registry;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
+import org.apache.camel.spi.Registry;
/**
* Used to indicate an injection point of an {@link Endpoint}, {@link Producer},
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,16 +25,9 @@
* @version $Revision$
*/
public enum ExchangePattern {
- InOnly,
- RobustInOnly,
- InOut,
- InOptionalOut,
- OutOnly,
- RobustOutOnly,
- OutIn,
- OutOptionalIn;
-
- protected static final Map<String, ExchangePattern> map = new HashMap<String, ExchangePattern>();
+ InOnly, RobustInOnly, InOut, InOptionalOut, OutOnly, RobustOutOnly, OutIn, OutOptionalIn;
+
+ protected static final Map<String, ExchangePattern> MAP = new HashMap<String, ExchangePattern>();
/**
* Returns the WSDL URI for this message exchange pattern
@@ -44,24 +36,24 @@
*/
public String getWsdlUri() {
switch (this) {
- case InOnly:
- return "http://www.w3.org/ns/wsdl/in-only";
- case InOptionalOut:
- return "http://www.w3.org/ns/wsdl/in-optional-out";
- case InOut:
- return "http://www.w3.org/ns/wsdl/in-out";
- case OutIn:
- return "http://www.w3.org/ns/wsdl/out-in";
- case OutOnly:
- return "http://www.w3.org/ns/wsdl/out-only";
- case OutOptionalIn:
- return "http://www.w3.org/ns/wsdl/out-optional_in";
- case RobustInOnly:
- return "http://www.w3.org/ns/wsdl/robust-in-only";
- case RobustOutOnly:
- return "http://www.w3.org/ns/wsdl/robust-out-only";
- default:
- throw new IllegalArgumentException("Unknown message exchange pattern: " + this);
+ case InOnly:
+ return "http://www.w3.org/ns/wsdl/in-only";
+ case InOptionalOut:
+ return "http://www.w3.org/ns/wsdl/in-optional-out";
+ case InOut:
+ return "http://www.w3.org/ns/wsdl/in-out";
+ case OutIn:
+ return "http://www.w3.org/ns/wsdl/out-in";
+ case OutOnly:
+ return "http://www.w3.org/ns/wsdl/out-only";
+ case OutOptionalIn:
+ return "http://www.w3.org/ns/wsdl/out-optional_in";
+ case RobustInOnly:
+ return "http://www.w3.org/ns/wsdl/robust-in-only";
+ case RobustOutOnly:
+ return "http://www.w3.org/ns/wsdl/robust-out-only";
+ default:
+ throw new IllegalArgumentException("Unknown message exchange pattern: " + this);
}
}
@@ -70,11 +62,11 @@
*/
public boolean isInCapable() {
switch (this) {
- case OutOnly:
- case RobustOutOnly:
- return false;
- default:
- return true;
+ case OutOnly:
+ case RobustOutOnly:
+ return false;
+ default:
+ return true;
}
}
@@ -83,11 +75,11 @@
*/
public boolean isOutCapable() {
switch (this) {
- case InOnly:
- case RobustInOnly:
- return false;
- default:
- return true;
+ case InOnly:
+ case RobustInOnly:
+ return false;
+ default:
+ return true;
}
}
@@ -96,11 +88,11 @@
*/
public boolean isFaultCapable() {
switch (this) {
- case InOnly:
- case OutOnly:
- return false;
- default:
- return true;
+ case InOnly:
+ case OutOnly:
+ return false;
+ default:
+ return true;
}
}
@@ -108,16 +100,16 @@
* Converts the WSDL URI into a {@link ExchangePattern} instance
*/
public static ExchangePattern fromWsdlUri(String wsdlUri) {
- return map.get(wsdlUri);
+ return MAP.get(wsdlUri);
}
static {
for (ExchangePattern mep : values()) {
String uri = mep.getWsdlUri();
- map.put(uri, mep);
+ MAP.put(uri, mep);
String name = uri.substring(uri.lastIndexOf('/') + 1);
- map.put("http://www.w3.org/2004/08/wsdl/" + name, mep);
- map.put("http://www.w3.org/2006/01/wsdl/" + name, mep);
+ MAP.put("http://www.w3.org/2004/08/wsdl/" + name, mep);
+ MAP.put("http://www.w3.org/2006/01/wsdl/" + name, mep);
}
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Message.java Mon Mar 24 08:08:24 2008
@@ -16,15 +16,13 @@
*/
package org.apache.camel;
-import org.apache.camel.impl.MessageSupport;
-
import java.util.Map;
/**
* Implements the <a
* href="http://activemq.apache.org/camel/message.html">Message</a> pattern and
* represents an inbound or outbound message as part of an {@link Exchange}
- *
+ *
* @version $Revision$
*/
public interface Message {
@@ -36,21 +34,21 @@
/**
* set the id of the message
- *
+ *
* @param messageId
*/
void setMessageId(String messageId);
/**
* Returns the exchange this message is related to
- *
+ *
* @return
*/
Exchange getExchange();
/**
* Accesses a specific header
- *
+ *
* @param name
* @return object header associated with the name
*/
@@ -59,7 +57,7 @@
/**
* Returns a header associated with this message by name and specifying the
* type required
- *
+ *
* @param name the name of the header
* @param type the type of the header
* @return the value of the given header or null if there is no property for
@@ -69,7 +67,7 @@
/**
* Sets a header on the message
- *
+ *
* @param name of the header
* @param value to associate with the name
*/
@@ -85,28 +83,28 @@
/**
* Returns all of the headers associated with the message
- *
+ *
* @return all the headers in a Map
*/
Map<String, Object> getHeaders();
/**
* Set all the headers associated with this message
- *
+ *
* @param headers
*/
void setHeaders(Map<String, Object> headers);
/**
* Returns the body of the message as a POJO
- *
+ *
* @return the body of the message
*/
Object getBody();
/**
* Returns the body as the specified type
- *
+ *
* @param type the type that the body
* @return the body of the message as the specified type
*/
@@ -125,7 +123,7 @@
/**
* Creates a copy of this message so that it can be used and possibly
* modified further in another exchange
- *
+ *
* @return a new message instance copied from this message
*/
Message copy();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java Mon Mar 24 08:08:24 2008
@@ -24,15 +24,15 @@
* href="http://activemq.apache.org/camel/expression.html">expression</a> and
* <a href="http://activemq.apache.org/camel/predicate.html">predicate</a> <a
* href="http://activemq.apache.org/camel/dsl.html">Java DSL</a>
- *
+ *
* @version $Revision$
*/
-public class Builder {
-
+public final class Builder {
+
/**
* Utility classes should not have a public constructor.
*/
- private Builder() {
+ private Builder() {
}
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java Mon Mar 24 08:08:24 2008
@@ -22,16 +22,16 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.NoSuchEndpointException;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.processor.LoggingLevel;
import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Base class for implementation inheritance for different clauses in the <a
* href="http://activemq.apache.org/camel/dsl.html">Java DSL</a>
- *
+ *
* @version $Revision$
*/
public abstract class BuilderSupport {
@@ -129,10 +129,10 @@
public ValueBuilder constant(Object value) {
return Builder.constant(value);
}
-
+
/**
* Resolves the given URI to an endpoint
- *
+ *
* @throws NoSuchEndpointException if the endpoint URI could not be resolved
*/
public Endpoint endpoint(String uri) throws NoSuchEndpointException {
@@ -160,7 +160,7 @@
/**
* Resolves the list of URIs into a list of {@link Endpoint} instances
- *
+ *
* @throws NoSuchEndpointException if an endpoint URI could not be resolved
*/
public List<Endpoint> endpoints(String... uris) throws NoSuchEndpointException {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -139,12 +138,12 @@
private T dataFormat(DataFormatType dataFormatType) {
switch (operation) {
- case Unmarshal:
- return (T) processorType.unmarshal(dataFormatType);
- case Marshal:
- return (T) processorType.marshal(dataFormatType);
- default:
- throw new IllegalArgumentException("Unknown value: " + operation);
+ case Unmarshal:
+ return (T)processorType.unmarshal(dataFormatType);
+ case Marshal:
+ return (T)processorType.marshal(dataFormatType);
+ default:
+ throw new IllegalArgumentException("Unknown value: " + operation);
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java Mon Mar 24 08:08:24 2008
@@ -16,11 +16,8 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.model.ExceptionType;
-
-import java.util.List;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,11 +16,11 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.model.ExceptionType;
-import org.apache.camel.processor.ErrorHandlerSupport;
-
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.camel.model.ExceptionType;
+import org.apache.camel.processor.ErrorHandlerSupport;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Mon Mar 24 08:08:24 2008
@@ -16,21 +16,21 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.Message;
-
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import java.util.StringTokenizer;
-import java.util.Collection;
import java.util.regex.Pattern;
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.Message;
+
/**
* @version $Revision$
*/
-public class ExpressionBuilder {
+public final class ExpressionBuilder {
/**
@@ -577,9 +577,8 @@
public String toString() {
if (expression != null) {
return expression;
- }
- else {
- return "concat" + expressions;
+ } else {
+ return "concat" + expressions;
}
}
};
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,15 +36,16 @@
private T result;
private String language;
+ public ExpressionClause(T result) {
+ this.result = result;
+ }
+
public static <T extends ExpressionNode> ExpressionClause<T> createAndSetExpression(T result) {
ExpressionClause<T> clause = new ExpressionClause<T>(result);
result.setExpression(clause);
return clause;
}
- public ExpressionClause(T result) {
- this.result = result;
- }
// Helper expressions
//-------------------------------------------------------------------------
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java Mon Mar 24 08:08:24 2008
@@ -20,7 +20,6 @@
import org.apache.camel.processor.Logger;
import org.apache.camel.processor.LoggingErrorHandler;
import org.apache.camel.processor.LoggingLevel;
-import org.apache.camel.processor.ErrorHandlerSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java Mon Mar 24 08:08:24 2008
@@ -31,15 +31,15 @@
/**
* A helper class for working with predicates
- *
+ *
* @version $Revision$
*/
-public class PredicateBuilder {
+public final class PredicateBuilder {
/**
* Utility classes should not have a public constructor.
*/
- private PredicateBuilder() {
+ private PredicateBuilder() {
}
/**
@@ -257,7 +257,7 @@
/**
* Returns a predicate which is true if the expression matches the given
* regular expression
- *
+ *
* @param expression the expression to evaluate
* @param regex the regular expression to match against
* @return a new predicate
@@ -269,7 +269,7 @@
/**
* Returns a predicate which is true if the expression matches the given
* regular expression
- *
+ *
* @param expression the expression to evaluate
* @param pattern the regular expression to match against
* @return a new predicate
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java Mon Mar 24 08:08:24 2008
@@ -18,20 +18,20 @@
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
-import org.apache.camel.Processor;
import org.apache.camel.Message;
+import org.apache.camel.Processor;
/**
* A builder of a number of different {@link Processor} implementations
*
* @version $Revision$
*/
-public class ProcessorBuilder {
-
+public final class ProcessorBuilder {
+
/**
* Utility classes should not have a public constructor.
*/
- private ProcessorBuilder() {
+ private ProcessorBuilder() {
}
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Mon Mar 24 08:08:24 2008
@@ -16,23 +16,22 @@
*/
package org.apache.camel.builder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Predicate;
import org.apache.camel.Route;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.ChoiceType;
+import org.apache.camel.model.ExceptionType;
import org.apache.camel.model.InterceptType;
-import org.apache.camel.model.OtherwiseType;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.RouteType;
import org.apache.camel.model.RoutesType;
-import org.apache.camel.model.ExceptionType;
import org.apache.camel.processor.DelegateProcessor;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* A <a href="http://activemq.apache.org/camel/dsl.html">Java DSL</a> which is
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java Mon Mar 24 08:08:24 2008
@@ -35,7 +35,7 @@
*/
public class DefaultNamespaceContext implements NamespaceContext, NamespaceAware {
- private final Map<String,String> map;
+ private final Map<String, String> map;
private final NamespaceContext parent;
public DefaultNamespaceContext() {
@@ -44,10 +44,10 @@
public DefaultNamespaceContext(XPathFactory factory) {
this.parent = factory.newXPath().getNamespaceContext();
- this.map = new HashMap<String,String>();
+ this.map = new HashMap<String, String>();
}
- public DefaultNamespaceContext(NamespaceContext parent, Map<String,String> map) {
+ public DefaultNamespaceContext(NamespaceContext parent, Map<String, String> map) {
this.parent = parent;
this.map = map;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java Mon Mar 24 08:08:24 2008
@@ -19,15 +19,17 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.model.language.XPathExpression;
-import org.apache.camel.model.language.XQueryExpression;
-import org.apache.camel.spi.NamespaceAware;
-import org.apache.camel.util.ObjectHelper;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.apache.camel.model.language.XPathExpression;
+import org.apache.camel.model.language.XQueryExpression;
+import org.apache.camel.spi.NamespaceAware;
+import org.apache.camel.util.ObjectHelper;
+
+
/**
* A helper class for working with namespaces or creating namespace based expressions
*
@@ -43,13 +45,6 @@
private Map<String, String> namespaces = new HashMap<String, String>();
- /**
- * Returns true if the given namespaceURI is empty or if it matches the
- * given expected namespace
- */
- public static boolean isMatchingNamespaceOrEmptyNamespace(String namespaceURI, String expectedNamespace) {
- return ObjectHelper.isNullOrBlank(namespaceURI) || namespaceURI.equals(expectedNamespace);
- }
/**
* Creates a namespaces object from the given XML element
@@ -67,6 +62,13 @@
add(prefix, uri);
}
+ /**
+ * Returns true if the given namespaceURI is empty or if it matches the
+ * given expected namespace
+ */
+ public static boolean isMatchingNamespaceOrEmptyNamespace(String namespaceURI, String expectedNamespace) {
+ return ObjectHelper.isNullOrBlank(namespaceURI) || namespaceURI.equals(expectedNamespace);
+ }
public Namespaces add(String prefix, String uri) {
namespaces.put(prefix, uri);
return this;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StringResultHandlerFactory.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Mon Mar 24 08:08:24 2008
@@ -32,26 +32,32 @@
import javax.xml.xpath.XPathFunctionException;
import javax.xml.xpath.XPathFunctionResolver;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.InputSource;
+
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
import org.apache.camel.Predicate;
import org.apache.camel.RuntimeExpressionException;
-import static org.apache.camel.builder.xml.Namespaces.*;
-import static org.apache.camel.converter.ObjectConverter.toBoolean;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.util.ExchangeHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
+
+import static org.apache.camel.builder.xml.Namespaces.DEFAULT_NAMESPACE;
+import static org.apache.camel.builder.xml.Namespaces.IN_NAMESPACE;
+import static org.apache.camel.builder.xml.Namespaces.OUT_NAMESPACE;
+import static org.apache.camel.builder.xml.Namespaces.isMatchingNamespaceOrEmptyNamespace;
+import static org.apache.camel.converter.ObjectConverter.toBoolean;
/**
* Creates an XPath expression builder which creates a nodeset result by default.
* If you want to evaluate a String expression then call {@link #stringResult()}
*
* @see XPathConstants#NODESET
- *
+ *
* @version $Revision$
*/
public class XPathBuilder<E extends Exchange> implements Expression<E>, Predicate<E>, NamespaceAware {
@@ -113,7 +119,7 @@
/**
* Sets the expression result type to boolean
- *
+ *
* @return the current builder
*/
public XPathBuilder<E> booleanResult() {
@@ -123,7 +129,7 @@
/**
* Sets the expression result type to boolean
- *
+ *
* @return the current builder
*/
public XPathBuilder<E> nodeResult() {
@@ -133,7 +139,7 @@
/**
* Sets the expression result type to boolean
- *
+ *
* @return the current builder
*/
public XPathBuilder<E> nodeSetResult() {
@@ -143,7 +149,7 @@
/**
* Sets the expression result type to boolean
- *
+ *
* @return the current builder
*/
public XPathBuilder<E> numberResult() {
@@ -153,7 +159,7 @@
/**
* Sets the expression result type to boolean
- *
+ *
* @return the current builder
*/
public XPathBuilder<E> stringResult() {
@@ -173,7 +179,7 @@
/**
* Sets the object model URI to use
- *
+ *
* @return the current builder
*/
public XPathBuilder<E> objectModel(String uri) {
@@ -184,7 +190,7 @@
/**
* Sets the {@link XPathFunctionResolver} instance to use on these XPath
* expressions
- *
+ *
* @return the current builder
*/
public XPathBuilder<E> functionResolver(XPathFunctionResolver functionResolver) {
@@ -195,7 +201,7 @@
/**
* Registers the namespace prefix and URI with the builder so that the
* prefix can be used in XPath expressions
- *
+ *
* @param prefix is the namespace prefix that can be used in the XPath
* expressions
* @param uri is the namespace URI to which the prefix refers
@@ -209,7 +215,7 @@
/**
* Registers namespaces with the builder so that the registered
* prefixes can be used in XPath expressions
- *
+ *
* @param namespaces is namespaces object that should be used in the
* XPath expression
* @return the current builder
@@ -218,7 +224,7 @@
namespaces.configure(this);
return this;
}
-
+
/**
* Registers a variable (in the global namespace) which can be referred to
* from XPath expressions
@@ -297,7 +303,7 @@
return expression;
}
- public void setNamespaces(Map<String,String> namespaces) {
+ public void setNamespaces(Map<String, String> namespaces) {
getNamespaceContext().setNamespaces(namespaces);
}
@@ -390,17 +396,13 @@
this.resultType = resultType;
if (Number.class.isAssignableFrom(resultType)) {
numberResult();
- }
- else if (String.class.isAssignableFrom(resultType)) {
+ } else if (String.class.isAssignableFrom(resultType)) {
stringResult();
- }
- else if (Boolean.class.isAssignableFrom(resultType)) {
+ } else if (Boolean.class.isAssignableFrom(resultType)) {
booleanResult();
- }
- else if (Node.class.isAssignableFrom(resultType)) {
+ } else if (Node.class.isAssignableFrom(resultType)) {
nodeResult();
- }
- else if (NodeList.class.isAssignableFrom(resultType)) {
+ } else if (NodeList.class.isAssignableFrom(resultType)) {
nodeSetResult();
}
}
@@ -430,8 +432,7 @@
if (document instanceof InputSource) {
InputSource inputSource = (InputSource)document;
return getExpression().evaluate(inputSource);
- }
- else if (document instanceof DOMSource) {
+ } else if (document instanceof DOMSource) {
DOMSource source = (DOMSource)document;
return getExpression().evaluate(source.getNode());
} else {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathLanguage.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathLanguage.java Mon Mar 24 08:08:24 2008
@@ -16,12 +16,12 @@
*/
package org.apache.camel.builder.xml;
+import javax.xml.namespace.QName;
+
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.spi.Language;
-
-import javax.xml.namespace.QName;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java Mon Mar 24 08:08:24 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.bean;
-import java.util.List;
import java.util.Collection;
import org.apache.camel.CamelExchangeException;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,11 +16,11 @@
*/
package org.apache.camel.component.bean;
-import org.apache.camel.Expression;
+import java.lang.annotation.Annotation;
+
import org.apache.camel.CamelContext;
+import org.apache.camel.Expression;
import org.apache.camel.language.LanguageAnnotation;
-
-import java.lang.annotation.Annotation;
/**
* A factory which creates an {@link Expression} object from an annotation on a field, property or method parameter
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java Mon Mar 24 08:08:24 2008
@@ -74,8 +74,7 @@
BeanProcessor processor;
if (ObjectConverter.toBool(parameters.remove("cache"))) {
processor = new BeanProcessor(holder.createCacheHolder());
- }
- else {
+ } else {
processor = new BeanProcessor(holder);
}
setProperties(processor, parameters);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Mon Mar 24 08:08:24 2008
@@ -16,14 +16,6 @@
*/
package org.apache.camel.component.bean;
-import org.apache.camel.*;
-import org.apache.camel.spi.Registry;
-import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.language.LanguageAnnotation;
-import static org.apache.camel.util.ExchangeHelper.convertToType;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -35,10 +27,32 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.camel.Body;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.Header;
+import org.apache.camel.Headers;
+import org.apache.camel.Message;
+import org.apache.camel.OutHeaders;
+import org.apache.camel.Properties;
+import org.apache.camel.Property;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.ExpressionBuilder;
+import org.apache.camel.language.LanguageAnnotation;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import static org.apache.camel.util.ExchangeHelper.convertToType;
+
+
+
/**
* Represents the metadata about a bean type created via a combination of
* introspection and annotations together with some useful sensible defaults
- *
+ *
* @version $Revision$
*/
public class BeanInfo {
@@ -145,8 +159,7 @@
// lets assume its the body
if (Exchange.class.isAssignableFrom(parameterType)) {
expression = ExpressionBuilder.exchangeExpression();
- }
- else {
+ } else {
expression = ExpressionBuilder.bodyExpression(parameterType);
}
parameterInfo.setExpression(expression);
@@ -167,9 +180,9 @@
String opName = method.getName();
/*
- *
+ *
* TODO allow an annotation to expose the operation name to use
- *
+ *
* if (method.getAnnotation(Operation.class) != null) { String name =
* method.getAnnotation(Operation.class).name(); if (name != null &&
* name.length() > 0) { opName = name; } }
@@ -188,7 +201,7 @@
/**
* Lets try choose one of the available methods to invoke if we can match
* the message body to the body parameter
- *
+ *
* @param pojo the bean to invoke a method on
* @param exchange the message exchange
* @return the method to invoke or null if no definitive method could be
@@ -199,8 +212,7 @@
return operationsWithBody.get(0);
} else if (!operationsWithBody.isEmpty()) {
return chooseMethodWithMatchingBody(exchange, operationsWithBody);
- }
- else if (operationsWithCustomAnnotation.size() == 1) {
+ } else if (operationsWithCustomAnnotation.size() == 1) {
return operationsWithCustomAnnotation.get(0);
}
return null;
@@ -261,8 +273,7 @@
if (chosen != null) {
chosen = null;
break;
- }
- else {
+ } else {
chosen = possible;
}
}
@@ -335,8 +346,7 @@
if (object instanceof AnnotationExpressionFactory) {
AnnotationExpressionFactory expressionFactory = (AnnotationExpressionFactory) object;
return expressionFactory.createExpression(camelContext, annotation, languageAnnotation, parameterType);
- }
- else {
+ } else {
LOG.error("Ignoring bad annotation: " + languageAnnotation + "on method: " + method
+ " which declares a factory: " + type.getName()
+ " which does not implement " + AnnotationExpressionFactory.class.getName());
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java Mon Mar 24 08:08:24 2008
@@ -76,14 +76,11 @@
try {
Object response = getMethod().invoke(pojo, getArgs());
exchange.getOut().setBody(response);
- }
- catch (InvocationTargetException e) {
+ } catch (InvocationTargetException e) {
exchange.setException(e.getCause());
- }
- catch (RuntimeException e) {
+ } catch (RuntimeException e) {
throw e;
- }
- catch (Throwable e) {
+ } catch (Throwable e) {
throw new RuntimeException(e);
}
}
@@ -92,8 +89,7 @@
methodBean = ObjectHelper.cast(MethodBean.class, objectInput.readObject());
try {
method = methodBean.getMethod();
- }
- catch (NoSuchMethodException e) {
+ } catch (NoSuchMethodException e) {
throw IOHelper.createIOException(e);
}
args = ObjectHelper.cast(Object[].class, objectInput.readObject());
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Mon Mar 24 08:08:24 2008
@@ -26,10 +26,10 @@
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ObjectHelper;
-import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
import org.apache.camel.util.ServiceHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
/**
* A {@link Processor} which converts the inbound exchange to a method
@@ -105,9 +105,8 @@
invocation = beanInfo.createInvocation(bean, exchange);
}
if (invocation == null) {
- throw new IllegalStateException(
- "No method invocation could be created, " +
- "no maching method could be found on: " + bean);
+ throw new IllegalStateException("No method invocation could be created, "
+ + "no maching method could be found on: " + bean);
}
try {
Object value = invocation.proceed();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java?rev=640438&r1=640437&r2=640438&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java Mon Mar 24 08:08:24 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,16 +36,16 @@
this.processor = CamelContextHelper.convertTo(beanInfo.getCamelContext(), Processor.class, bean);
}
- @Override
- public String toString() {
- return bean.toString();
- }
-
public ConstantBeanHolder(Object bean, CamelContext context) {
this(bean, new BeanInfo(context, bean.getClass()));
}
public ConstantBeanHolder(Object bean, CamelContext context, ParameterMappingStrategy parameterMappingStrategy) {
this(bean, new BeanInfo(context, bean.getClass(), parameterMappingStrategy));
+ }
+
+ @Override
+ public String toString() {
+ return bean.toString();
}
public Object getBean() {