You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2018/04/16 21:43:25 UTC
[camel] branch master updated (7097b32 -> 1b95a09)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7097b32 CAMEL-12448 - camel-consul: filter health checks by service id (#2296)
new c1f9e3e polish
new 1b95a09 polish
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/CamelContext.java | 1 +
.../java/org/apache/camel/ExchangePattern.java | 2 +-
.../camel/builder/AdviceWithRouteBuilder.java | 10 +--
.../org/apache/camel/builder/AdviceWithTasks.java | 2 +-
.../org/apache/camel/builder/BuilderSupport.java | 4 +-
.../camel/builder/ErrorHandlerBuilderRef.java | 2 +-
.../camel/builder/ErrorHandlerBuilderSupport.java | 6 +-
.../org/apache/camel/builder/ExchangeBuilder.java | 4 +-
.../apache/camel/builder/ExpressionBuilder.java | 2 +-
.../org/apache/camel/builder/ExpressionClause.java | 4 +-
.../org/apache/camel/builder/NotifyBuilder.java | 6 +-
.../org/apache/camel/builder/RouteBuilder.java | 4 +-
.../org/apache/camel/builder/ValueBuilder.java | 2 +-
.../camel/builder/xml/DefaultNamespaceContext.java | 4 +-
.../camel/builder/xml/MessageVariableResolver.java | 2 +-
.../org/apache/camel/builder/xml/Namespaces.java | 2 +-
.../org/apache/camel/builder/xml/XPathBuilder.java | 10 +--
.../org/apache/camel/builder/xml/XsltBuilder.java | 4 +-
.../bean/AbstractCamelInvocationHandler.java | 4 +-
.../org/apache/camel/component/bean/BeanInfo.java | 30 +++----
.../bean/DefaultParameterMappingStrategy.java | 2 +-
.../apache/camel/component/bean/MethodInfo.java | 4 +-
.../apache/camel/component/bean/MethodsFilter.java | 2 +-
.../camel/component/browse/BrowseEndpoint.java | 2 +-
.../camel/component/dataset/DataSetSupport.java | 2 +-
.../camel/component/direct/DirectComponent.java | 2 +-
.../camel/component/direct/DirectEndpoint.java | 2 +-
.../component/directvm/DirectVmComponent.java | 4 +-
.../directvm/DirectVmConsumerExpression.java | 2 +-
.../extension/verifier/ResultBuilder.java | 2 +-
.../extension/verifier/ResultErrorHelper.java | 2 +-
.../apache/camel/component/file/FileComponent.java | 2 +-
.../apache/camel/component/file/FileConsumer.java | 2 +-
.../apache/camel/component/file/FileEndpoint.java | 6 +-
.../apache/camel/component/file/GenericFile.java | 4 +-
.../camel/component/file/GenericFileConsumer.java | 6 +-
.../camel/component/file/GenericFileEndpoint.java | 4 +-
.../camel/component/file/GenericFileMessage.java | 2 +-
.../file/strategy/FileProcessStrategyFactory.java | 18 ++--
.../GenericFileProcessStrategyFactory.java | 18 ++--
.../camel/component/mock/AssertionClause.java | 4 +-
.../apache/camel/component/mock/MockEndpoint.java | 32 +++----
.../properties/DefaultPropertiesParser.java | 2 +-
.../component/properties/PropertiesComponent.java | 2 +-
.../apache/camel/component/rest/RestProducer.java | 2 +-
.../component/scheduler/SchedulerComponent.java | 4 +-
.../component/seda/ArrayBlockingQueueFactory.java | 2 +-
.../component/seda/LinkedBlockingQueueFactory.java | 4 +-
.../seda/PriorityBlockingQueueFactory.java | 8 +-
.../camel/component/seda/QueueReference.java | 2 +-
.../apache/camel/component/seda/SedaComponent.java | 4 +-
.../apache/camel/component/seda/SedaEndpoint.java | 14 +--
.../apache/camel/component/test/TestEndpoint.java | 2 +-
.../camel/component/timer/TimerComponent.java | 4 +-
.../validator/DefaultLSResourceResolver.java | 2 +-
.../org/apache/camel/component/vm/VmComponent.java | 4 +-
.../apache/camel/component/xslt/XsltEndpoint.java | 2 +-
.../camel/converter/CollectionConverter.java | 14 +--
.../apache/camel/converter/jaxp/DomConverter.java | 2 +-
.../apache/camel/converter/jaxp/StaxConverter.java | 4 +-
.../apache/camel/converter/jaxp/XMLReaderPool.java | 8 +-
.../apache/camel/converter/jaxp/XmlConverter.java | 2 +-
.../converter/stream/FileInputStreamCache.java | 2 +-
.../camel/impl/CamelContextTrackerRegistry.java | 2 +-
.../camel/impl/ComponentConfigurationSupport.java | 6 +-
.../org/apache/camel/impl/CompositeRegistry.java | 2 +-
.../impl/DefaultAsyncProcessorAwaitManager.java | 2 +-
.../org/apache/camel/impl/DefaultAttachment.java | 2 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 100 ++++++++++-----------
.../camel/impl/DefaultComponentConfiguration.java | 2 +-
.../org/apache/camel/impl/DefaultDebugger.java | 6 +-
.../org/apache/camel/impl/DefaultEndpoint.java | 6 +-
.../apache/camel/impl/DefaultEndpointRegistry.java | 8 +-
.../org/apache/camel/impl/DefaultExchange.java | 4 +-
.../apache/camel/impl/DefaultExchangeHolder.java | 12 +--
.../apache/camel/impl/DefaultFactoryFinder.java | 4 +-
.../camel/impl/DefaultHeaderFilterStrategy.java | 4 +-
.../camel/impl/DefaultInflightRepository.java | 4 +-
.../java/org/apache/camel/impl/DefaultMessage.java | 6 +-
.../apache/camel/impl/DefaultNodeIdFactory.java | 2 +-
.../impl/DefaultPackageScanClassResolver.java | 16 ++--
.../org/apache/camel/impl/DefaultRestRegistry.java | 4 +-
.../java/org/apache/camel/impl/DefaultRoute.java | 4 +-
.../org/apache/camel/impl/DefaultRouteContext.java | 10 +--
.../camel/impl/DefaultRouteStartupOrder.java | 4 +-
.../camel/impl/DefaultRuntimeEndpointRegistry.java | 12 +--
.../DefaultScheduledPollConsumerScheduler.java | 2 +-
.../org/apache/camel/impl/DefaultServicePool.java | 6 +-
.../apache/camel/impl/DefaultShutdownStrategy.java | 14 +--
.../camel/impl/DefaultStreamCachingStrategy.java | 2 +-
.../apache/camel/impl/DefaultSubUnitOfWork.java | 2 +-
.../camel/impl/DefaultThreadPoolFactory.java | 6 +-
.../apache/camel/impl/DefaultTracedRouteNodes.java | 8 +-
.../org/apache/camel/impl/DefaultUnitOfWork.java | 4 +-
.../camel/impl/DeferServiceStartupListener.java | 2 +-
.../camel/impl/EventDrivenConsumerRoute.java | 2 +-
.../camel/impl/EventDrivenPollingConsumer.java | 4 +-
.../camel/impl/FileWatcherReloadStrategy.java | 2 +-
.../java/org/apache/camel/impl/JndiRegistry.java | 6 +-
.../impl/LimitedPollingConsumerPollStrategy.java | 2 +-
.../camel/impl/MappedEndpointConfiguration.java | 4 +-
.../java/org/apache/camel/impl/RouteService.java | 16 ++--
.../apache/camel/impl/ScheduledPollConsumer.java | 4 +-
.../apache/camel/impl/ScheduledPollEndpoint.java | 4 +-
.../java/org/apache/camel/impl/SimpleRegistry.java | 4 +-
.../camel/impl/ThrottlingInflightRoutePolicy.java | 2 +-
.../apache/camel/impl/UriEndpointComponent.java | 4 +-
.../camel/impl/UriEndpointConfiguration.java | 2 +-
.../converter/AnnotationTypeConverterLoader.java | 16 ++--
.../camel/impl/converter/ArrayTypeConverter.java | 2 +-
.../impl/converter/BaseTypeConverterRegistry.java | 12 +--
.../converter/CorePackageScanClassResolver.java | 6 +-
.../converter/PropertyEditorTypeConverter.java | 2 +-
.../TypeConvertersPackageScanClassResolver.java | 6 +-
.../java/org/apache/camel/impl/osgi/Activator.java | 18 ++--
.../camel/impl/osgi/tracker/AbstractTracked.java | 6 +-
.../impl/scan/AssignableToPackageScanFilter.java | 2 +-
.../impl/scan/CompositePackageScanFilter.java | 4 +-
.../camel/language/simple/BaseSimpleParser.java | 6 +-
.../language/simple/SimpleExpressionParser.java | 2 +-
.../language/simple/SimplePredicateParser.java | 2 +-
.../camel/language/simple/SimpleTokenizer.java | 2 +-
.../language/simple/ast/BinaryExpression.java | 2 +-
.../camel/language/simple/ast/CompositeNodes.java | 4 +-
.../src/main/java/org/apache/camel/main/Main.java | 2 +-
.../java/org/apache/camel/main/MainSupport.java | 12 +--
.../camel/management/DefaultManagementAgent.java | 4 +-
.../DefaultManagementLifecycleStrategy.java | 16 ++--
.../management/DefaultManagementStrategy.java | 2 +-
.../camel/management/MBeanInfoAssembler.java | 14 +--
.../mbean/JMXNotificationTraceEventHandler.java | 6 +-
.../management/mbean/ManagedCamelContext.java | 8 +-
.../management/mbean/ManagedEventNotifier.java | 2 +-
.../camel/management/mbean/ManagedRoute.java | 4 +-
.../management/mbean/RouteCoverageXmlParser.java | 2 +-
.../java/org/apache/camel/model/AOPDefinition.java | 2 +-
.../apache/camel/model/AggregateDefinition.java | 2 +-
.../org/apache/camel/model/CatchDefinition.java | 10 +--
.../org/apache/camel/model/ChoiceDefinition.java | 6 +-
.../apache/camel/model/ContextScanDefinition.java | 4 +-
.../org/apache/camel/model/ExpressionNode.java | 2 +-
.../org/apache/camel/model/HystrixDefinition.java | 2 +-
.../apache/camel/model/InterceptDefinition.java | 2 +-
.../apache/camel/model/LoadBalanceDefinition.java | 2 +-
.../apache/camel/model/MulticastDefinition.java | 2 +-
.../apache/camel/model/OnCompletionDefinition.java | 4 +-
.../apache/camel/model/OnExceptionDefinition.java | 10 +--
.../org/apache/camel/model/OutputDefinition.java | 2 +-
.../apache/camel/model/PackageScanDefinition.java | 6 +-
.../apache/camel/model/ProcessorDefinition.java | 62 ++++++-------
.../camel/model/ProcessorDefinitionHelper.java | 18 ++--
.../apache/camel/model/PropertiesDefinition.java | 2 +-
.../camel/model/RecipientListDefinition.java | 2 +-
.../apache/camel/model/ResequenceDefinition.java | 2 +-
.../model/RestContextRefDefinitionHelper.java | 4 +-
.../model/RouteContextRefDefinitionHelper.java | 4 +-
.../org/apache/camel/model/RouteDefinition.java | 10 +--
.../apache/camel/model/RouteDefinitionHelper.java | 22 ++---
.../org/apache/camel/model/RoutesDefinition.java | 12 +--
.../org/apache/camel/model/ThreadsDefinition.java | 2 +-
.../apache/camel/model/ToDynamicDefinition.java | 4 +-
.../java/org/apache/camel/model/TryDefinition.java | 6 +-
.../org/apache/camel/model/WireTapDefinition.java | 2 +-
.../model/dataformat/DataFormatsDefinition.java | 2 +-
.../dataformat/UniVocityAbstractDataFormat.java | 2 +-
.../model/dataformat/XMLSecurityDataFormat.java | 2 +-
.../camel/model/dataformat/XStreamDataFormat.java | 16 ++--
.../CircuitBreakerLoadBalancerDefinition.java | 6 +-
.../FailoverLoadBalancerDefinition.java | 6 +-
.../WeightedLoadBalancerDefinition.java | 2 +-
.../camel/model/rest/RestBindingDefinition.java | 4 +-
.../model/rest/RestConfigurationDefinition.java | 24 ++---
.../apache/camel/model/rest/RestDefinition.java | 12 +--
.../model/rest/RestOperationParamDefinition.java | 2 +-
.../RestOperationResponseHeaderDefinition.java | 2 +-
.../apache/camel/model/rest/RestsDefinition.java | 2 +-
.../apache/camel/model/rest/VerbDefinition.java | 4 +-
.../org/apache/camel/processor/BatchProcessor.java | 6 +-
.../camel/processor/CamelInternalProcessor.java | 2 +-
.../apache/camel/processor/ChoiceProcessor.java | 2 +-
.../camel/processor/DefaultExchangeFormatter.java | 2 +-
.../camel/processor/DefaultMaskingFormatter.java | 2 +-
.../camel/processor/DelegateAsyncProcessor.java | 2 +-
.../apache/camel/processor/DelegateProcessor.java | 2 +-
.../camel/processor/DelegateSyncProcessor.java | 2 +-
.../camel/processor/ErrorHandlerSupport.java | 2 +-
.../InterceptorToAsyncProcessorBridge.java | 4 +-
.../apache/camel/processor/MulticastProcessor.java | 14 +--
.../camel/processor/RecipientListProcessor.java | 2 +-
.../camel/processor/RedeliveryErrorHandler.java | 2 +-
.../org/apache/camel/processor/Resequencer.java | 2 +-
.../processor/SharedCamelInternalProcessor.java | 2 +-
.../java/org/apache/camel/processor/Splitter.java | 2 +-
.../apache/camel/processor/StreamResequencer.java | 4 +-
.../org/apache/camel/processor/TryProcessor.java | 2 +-
.../apache/camel/processor/WireTapProcessor.java | 2 +-
.../aggregate/AbstractListAggregationStrategy.java | 2 +-
.../processor/aggregate/AggregateProcessor.java | 12 +--
.../aggregate/AggregationStrategyBeanAdapter.java | 2 +-
.../aggregate/AggregationStrategyBeanInfo.java | 4 +-
.../aggregate/AggregationStrategyMethodInfo.java | 2 +-
.../aggregate/MemoryAggregationRepository.java | 2 +-
.../DefaultExceptionPolicyStrategy.java | 6 +-
.../processor/idempotent/IdempotentConsumer.java | 2 +-
.../processor/interceptor/BacklogDebugger.java | 10 +--
.../camel/processor/interceptor/BacklogTracer.java | 6 +-
.../processor/interceptor/DefaultChannel.java | 4 +-
.../interceptor/DefaultTraceEventHandler.java | 2 +-
.../apache/camel/processor/interceptor/Tracer.java | 2 +-
.../loadbalancer/ExceptionFailureStatistics.java | 2 +-
.../loadbalancer/LoadBalancerSupport.java | 4 +-
.../processor/loadbalancer/StickyLoadBalancer.java | 2 +-
.../loadbalancer/WeightedLoadBalancer.java | 4 +-
.../processor/resequencer/ResequencerEngine.java | 6 +-
.../validation/DefaultValidationErrorHandler.java | 6 +-
.../camel/runtimecatalog/AbstractCamelCatalog.java | 18 ++--
.../runtimecatalog/DefaultRuntimeCamelCatalog.java | 2 +-
.../runtimecatalog/EndpointValidationResult.java | 30 +++----
.../camel/runtimecatalog/JSonSchemaHelper.java | 2 +-
.../runtimecatalog/SimpleValidationResult.java | 1 +
.../apache/camel/runtimecatalog/URISupport.java | 10 +--
.../runtimecatalog/UnsafeUriCharactersEncoder.java | 4 +-
.../main/java/org/apache/camel/spi/Container.java | 2 +-
.../apache/camel/support/ChildServiceSupport.java | 2 +-
.../apache/camel/support/DefaultTimeoutMap.java | 10 +--
.../support/RestConsumerContextPathMatcher.java | 2 +-
.../apache/camel/support/TimerListenerManager.java | 2 +-
.../camel/support/TokenXMLExpressionIterator.java | 4 +-
.../support/TokenXMLPairExpressionIterator.java | 2 +-
.../camel/support/XMLTokenExpressionIterator.java | 14 +--
.../java/org/apache/camel/util/AntPathMatcher.java | 2 +-
.../camel/util/AsyncProcessorConverterHelper.java | 2 +-
.../org/apache/camel/util/CamelContextHelper.java | 8 +-
.../org/apache/camel/util/CollectionHelper.java | 4 +-
.../java/org/apache/camel/util/EndpointHelper.java | 6 +-
.../java/org/apache/camel/util/ExchangeHelper.java | 2 +-
.../java/org/apache/camel/util/GroupIterator.java | 2 +-
.../main/java/org/apache/camel/util/HostUtils.java | 6 +-
.../apache/camel/util/IntrospectionSupport.java | 16 ++--
.../org/apache/camel/util/JsonSchemaHelper.java | 4 +-
.../java/org/apache/camel/util/MessageHelper.java | 2 +-
.../java/org/apache/camel/util/ObjectHelper.java | 10 +--
.../java/org/apache/camel/util/OgnlHelper.java | 4 +-
.../java/org/apache/camel/util/ServiceHelper.java | 2 +-
.../org/apache/camel/util/StringQuoteHelper.java | 2 +-
.../java/org/apache/camel/util/URISupport.java | 14 +--
.../org/apache/camel/util/UnitOfWorkHelper.java | 6 +-
.../camel/util/UnsafeUriCharactersEncoder.java | 4 +-
.../org/apache/camel/util/XmlLineNumberParser.java | 2 +-
.../camel/util/component/AbstractApiComponent.java | 6 +-
.../camel/util/component/AbstractApiEndpoint.java | 4 +-
.../camel/util/component/AbstractApiProducer.java | 2 +-
.../camel/util/component/ApiMethodHelper.java | 26 +++---
.../camel/util/component/ApiMethodParser.java | 14 +--
.../util/component/ApiMethodPropertiesHelper.java | 6 +-
.../util/component/ArgumentSubstitutionParser.java | 14 +--
.../RejectableScheduledThreadPoolExecutor.java | 4 +-
.../concurrent/RejectableThreadPoolExecutor.java | 4 +-
.../concurrent/SubmitOrderedCompletionService.java | 2 +-
.../org/apache/camel/util/function/Suppliers.java | 8 +-
.../org/apache/camel/util/jndi/JndiContext.java | 10 +--
.../camel/util/jsse/BaseSSLContextParameters.java | 14 +--
.../apache/camel/util/jsse/FilterParameters.java | 10 +--
.../org/apache/camel/util/jsse/JsseParameters.java | 2 +-
.../apache/camel/util/jsse/KeyStoreParameters.java | 2 +-
.../util/jsse/SSLContextServerParameters.java | 2 +-
.../camel/util/toolbox/AggregationStrategies.java | 4 +-
.../apache/camel/ThreadPoolRejectedPolicyTest.java | 8 +-
.../camel/builder/BuilderWithScopesTest.java | 46 +++++-----
.../camel/builder/ExpressionBuilderTest.java | 8 +-
.../builder/PredicateBuilderConcurrentTest.java | 2 +-
.../org/apache/camel/builder/RouteBuilderTest.java | 4 +-
.../builder/xml/DefaultNamespaceContextTest.java | 2 +-
.../org/apache/camel/builder/xml/XPathTest.java | 2 +-
.../camel/component/bean/BeanConcurrentTest.java | 2 +-
.../bean/BeanExpressionConcurrentTest.java | 2 +-
.../camel/component/bean/BeanMapPutTest.java | 2 +-
.../BeanParameterMethodCallThreeBodyOgnlTest.java | 2 +-
.../bean/BeanParameterThreeBodyOgnlTest.java | 2 +-
.../component/bean/BeanParameterValueTest.java | 2 +-
.../bean/BeanWithHeadersAndBodyInject2Test.java | 4 +-
.../bean/CamelSimpleExpressionPerfTestRunner.java | 2 +-
.../component/bean/ProxyReturnFutureListTest.java | 2 +-
.../pojomessage/PojoProxyHelperOneWayTest.java | 2 +-
.../direct/DirectShouldUseSameThreadTest.java | 2 +-
.../directvm/DirectVmShouldUseSameThreadTest.java | 2 +-
.../file/AntPathMatcherGenericFileFilterTest.java | 2 +-
.../FileConcurrentWriteAppendSameFileTest.java | 2 +-
.../file/FileConsumerDirectoryFilterTest.java | 6 +-
.../component/file/FileConsumerFileFilterTest.java | 2 +-
.../file/FileProduceOverruleExpressionTest.java | 2 +-
.../file/FileProduceOverruleOnlyOnceTest.java | 2 +-
.../component/file/FileProduceOverruleTest.java | 2 +-
.../file/FileProducerFileBodyGetsMoved.java | 2 +-
.../camel/component/file/FileSorterRefTest.java | 2 +-
.../component/file/GenericFileMessageTest.java | 10 +--
.../GenericFileDeleteProcessStrategyTest.java | 8 +-
.../LanguageLoadScriptFromFileCachedTest.java | 2 +-
.../camel/component/mock/MockEndpointTest.java | 18 ++--
.../mock/MockExpectedBodiesAsListTest.java | 4 +-
.../component/seda/CollectionProducerTest.java | 2 +-
.../camel/component/seda/SedaConcurrentTest.java | 4 +-
.../camel/component/seda/SedaEndpointTest.java | 4 +-
.../camel/component/seda/SedaQueueFactoryTest.java | 2 +-
.../seda/SedaShouldNotUseSameThreadTest.java | 2 +-
.../component/vm/VmShouldNotUseSameThreadTest.java | 2 +-
.../camel/component/xslt/XsltContentCacheTest.java | 2 +-
.../camel/converter/CollectionConverterTest.java | 4 +-
.../org/apache/camel/converter/ConverterTest.java | 4 +-
.../camel/converter/ObjectConverterTest.java | 2 +-
.../apache/camel/impl/CamelContextTrackerTest.java | 2 +-
.../apache/camel/impl/ConfigurationHelperTest.java | 2 +-
.../camel/impl/DefaultExchangeHolderTest.java | 6 +-
.../impl/DefaultHeaderFilterStrategyTest.java | 10 +--
.../impl/DefaultProducerTemplateAsyncTest.java | 4 +-
.../camel/impl/DefaultProducerTemplateTest.java | 8 +-
.../apache/camel/impl/DummyLifecycleStrategy.java | 2 +-
.../org/apache/camel/impl/JndiRegistryTest.java | 2 +-
...edPollEndpointConfigureConsumerRestartTest.java | 2 +-
.../org/apache/camel/impl/ServicePoolTest.java | 6 +-
.../apache/camel/impl/health/HealthCheckTest.java | 28 +++---
.../issues/CBRCustomPredicateAsFilterTest.java | 2 +-
.../camel/issues/ChangeHeaderCaseIssueTest.java | 2 +-
.../issues/FilterCustomPredicateAsFilterTest.java | 2 +-
.../InterceptCustomPredicateAsFilterTest.java | 2 +-
.../camel/issues/ServicePoolAwareLeakyTest.java | 2 +-
.../camel/issues/SplitListListIssueTest.java | 4 +-
.../camel/issues/SplitPropertiesFileIssueTest.java | 6 +-
.../SplitterUsingBeanReturningMessageTest.java | 2 +-
.../language/BeanLanguageInvalidOGNLTest.java | 2 +-
.../camel/language/SimpleOgnlMapIssueTest.java | 2 +-
.../simple/SimpleParserExpressionTest.java | 2 +-
.../language/simple/SimpleParserPredicateTest.java | 6 +-
.../apache/camel/language/simple/SimpleTest.java | 72 +++++++--------
.../camel/management/AddEventNotifierTest.java | 2 +-
.../camel/management/EndpointCompletionTest.java | 2 +-
.../camel/management/EventNotifierEventsTest.java | 2 +-
.../EventNotifierExchangeCompletedTest.java | 2 +-
.../management/EventNotifierExchangeSentTest.java | 2 +-
.../EventNotifierFailureHandledEventsTest.java | 2 +-
.../EventNotifierRedeliveryEventsTest.java | 2 +-
...ventNotifierServiceStoppingFailedEventTest.java | 2 +-
.../ManagedBrowsableEndpointAsXmlTest.java | 2 +-
.../camel/management/ManagedCamelContextTest.java | 2 +-
.../management/ManagedConsumerCacheHitsTest.java | 2 +-
.../camel/management/ManagedConsumerCacheTest.java | 2 +-
.../management/ManagedEndpointRegistryTest.java | 2 +-
.../management/ManagedRegisterTwoRoutesTest.java | 2 +-
.../management/ManagedRouteAddRemoveTest.java | 8 +-
...ManagedSetAndRemoveHeaderAndPropertiesTest.java | 1 +
.../management/ManagedTransformerRegistryTest.java | 2 +-
.../management/ManagedValidatorRegistryTest.java | 2 +-
.../MultipleEventNotifierEventsTest.java | 4 +-
.../camel/management/RemoveEventNotifierTest.java | 2 +-
.../management/RemoveRouteDefinitionTest.java | 6 +-
.../org/apache/camel/processor/AsyncLoopTest.java | 2 +-
.../processor/ChoiceCompoundPredicateTest.java | 6 +-
.../org/apache/camel/processor/ClaimCheckTest.java | 2 +-
.../processor/ComposedMessageProcessorTest.java | 2 +-
.../processor/DynamicRouterAnnotationTest.java | 2 +-
.../DynamicRouterExchangeHeaders2Test.java | 4 +-
.../DynamicRouterExchangeHeadersTest.java | 2 +-
.../DynamicRouterExchangePropertiesTest.java | 2 +-
.../apache/camel/processor/DynamicRouterTest.java | 2 +-
.../camel/processor/ErrorHandlerSupportTest.java | 4 +-
.../processor/ExchangeIdempotentConsumerTest.java | 2 +-
...dempotentConsumerUsingCustomRepositoryTest.java | 2 +-
.../camel/processor/RecipientListBeanTest.java | 2 +-
...pientListContextScopedOnExceptionIssueTest.java | 4 +-
...istExchangePropertyAggregationStrategyTest.java | 2 +-
.../camel/processor/RemoveHeadersExcludeTest.java | 4 +-
.../apache/camel/processor/RemoveHeadersTest.java | 4 +-
.../processor/RouteAwareSynchronizationTest.java | 2 +-
.../camel/processor/RoutePerformanceTest.java | 2 +-
...utingSlipContextScopedOnExceptionIssueTest.java | 4 +-
.../camel/processor/SamplingThrottlerTest.java | 4 +-
.../camel/processor/SplitCustomExpressionTest.java | 2 +-
.../processor/SplitRefCustomExpressionTest.java | 2 +-
.../camel/processor/SplitterCollateTest.java | 2 +-
.../camel/processor/SplitterNullBodyTest.java | 4 +-
.../camel/processor/SplitterOnPrepareTest.java | 2 +-
.../processor/SplitterParallelAggregateTest.java | 4 +-
.../apache/camel/processor/SplitterPojoTest.java | 4 +-
.../apache/camel/processor/SplitterSkipTest.java | 6 +-
.../org/apache/camel/processor/SplitterTest.java | 6 +-
.../camel/processor/UnitOfWorkProducerTest.java | 2 +-
.../AggregateConcurrentPerCorrelationKeyTest.java | 2 +-
.../AggregateExpressionSizeFallbackTest.java | 2 +-
.../AggregateExpressionSizeOverrideFixedTest.java | 2 +-
...gateExpressionSizeOverrideFixedTimeoutTest.java | 2 +-
.../aggregator/AggregateExpressionSizeTest.java | 2 +-
.../AggregateExpressionTimeoutFallbackTest.java | 2 +-
.../AggregateExpressionTimeoutPerGroupTest.java | 4 +-
.../aggregator/AggregateExpressionTimeoutTest.java | 2 +-
.../AggregateForceCompletionHeaderTest.java | 2 +-
.../AggregateSimpleExpressionIssueTest.java | 2 +-
...ggregationStrategyBeanAdapterAllowNullTest.java | 2 +-
.../aggregator/AggregatorConcurrencyTest.java | 2 +-
.../camel/processor/aggregator/AggregatorTest.java | 2 +-
.../aggregator/AlbertoAggregatorTest.java | 10 +--
...ustomListAggregationStrategyEmptySplitTest.java | 2 +-
.../CustomListAggregationStrategySplitTest.java | 2 +-
...DistributedConcurrentPerCorrelationKeyTest.java | 2 +-
.../DistributedOptimisticLockFailingTest.java | 2 +-
.../async/AsyncEndpointDynamicRouterTest.java | 2 +-
.../AsyncEndpointEventNotifierSendingTest.java | 2 +-
.../async/AsyncEndpointTryCatchFinally3Test.java | 2 +-
.../DefaultExceptionPolicyStrategyTest.java | 6 +-
.../ParentChildInterceptStrategyTest.java | 2 +-
.../CustomInterceptorRouteWithChildOutputTest.java | 2 +-
.../interceptor/DebugExceptionBreakpointTest.java | 2 +-
.../DebugExceptionEventBreakpointTest.java | 2 +-
.../interceptor/DebugSingleStepConditionTest.java | 2 +-
.../processor/interceptor/DebugSingleStepTest.java | 2 +-
.../camel/processor/interceptor/DebugTest.java | 2 +-
.../processor/interceptor/TraceFormatterTest.java | 2 +-
.../processor/interceptor/TraceHandlerTest.java | 2 +-
.../interceptor/TraceHandlerTestHandler.java | 2 +-
.../TraceInterceptorDestinationTest.java | 4 +-
.../TraceInterceptorFactoryCreatesHandlerTest.java | 2 +-
.../interceptor/TraceInterceptorSubclassTest.java | 2 +-
.../resequencer/ResequencerEngineTest.java | 10 +--
.../processor/resequencer/SequenceBuffer.java | 2 +-
.../camel/processor/resequencer/SequenceTest.java | 2 +-
.../runtimecatalog/RuntimeCamelCatalogTest.java | 14 +--
.../java/org/apache/camel/spi/ContainerTest.java | 2 +-
.../camel/support/DefaultTimeoutMapTest.java | 22 ++---
.../XMLTokenExpressionIteratorCharsetTest.java | 2 +-
.../XMLTokenExpressionIteratorGroupingTest.java | 4 +-
.../support/XMLTokenExpressionIteratorTest.java | 4 +-
.../apache/camel/util/CaseInsensitiveMapTest.java | 24 ++---
.../apache/camel/util/CollectionHelperTest.java | 4 +-
.../org/apache/camel/util/EndpointHelperTest.java | 4 +-
.../org/apache/camel/util/ExchangeHelperTest.java | 4 +-
.../camel/util/ExpressionListComparatorTest.java | 2 +-
.../camel/util/IntrospectionSupportTest.java | 16 ++--
.../org/apache/camel/util/KeyValueHolderTest.java | 20 ++---
.../java/org/apache/camel/util/LRUCacheTest.java | 2 +-
.../org/apache/camel/util/LRUSoftCacheTest.java | 24 ++---
.../org/apache/camel/util/MessageHelperTest.java | 2 +-
.../org/apache/camel/util/ObjectHelperTest.java | 8 +-
.../apache/camel/util/OrderedComparatorTest.java | 16 ++--
.../org/apache/camel/util/ResourceHelperTest.java | 4 +-
.../java/org/apache/camel/util/URISupportTest.java | 6 +-
.../camel/util/component/ApiMethodHelperTest.java | 10 +--
.../component/ApiMethodPropertiesHelperTest.java | 4 +-
.../component/ArgumentSubstitutionParserTest.java | 4 +-
.../org/apache/camel/util/component/TestProxy.java | 4 +-
.../SubmitOrderedCompletionServiceTest.java | 2 +-
...ndiCamelSingletonInitialContextFactoryTest.java | 2 +-
.../java/org/apache/camel/util/jndi/JndiTest.java | 2 +-
.../util/jsse/AbstractJsseParametersTest.java | 2 +-
.../camel/util/jsse/SSLContextParametersTest.java | 2 +-
.../camel/core/osgi/OsgiCamelContextPublisher.java | 4 +-
.../apache/camel/core/osgi/OsgiClassResolver.java | 2 +-
.../camel/core/osgi/OsgiEventAdminNotifier.java | 4 +-
.../core/osgi/OsgiPackageScanClassResolver.java | 2 +-
.../camel/core/osgi/OsgiServiceRegistry.java | 6 +-
.../apache/camel/core/osgi/OsgiTypeConverter.java | 4 +-
.../camel/core/osgi/utils/BundleContextUtils.java | 2 +-
.../apache/camel/core/osgi/CamelMockBundle.java | 8 +-
.../camel/core/osgi/CamelMockBundleContext.java | 2 +-
.../camel/core/osgi/OsgiComponentResolverTest.java | 1 -
.../core/osgi/test/MockTypeConverterRegistry.java | 4 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 8 +-
.../core/xml/AbstractCamelEndpointFactoryBean.java | 4 +-
.../core/xml/PatternBasedPackageScanFilter.java | 8 +-
.../jsse/CipherSuitesParametersDefinition.java | 2 +-
.../xml/util/jsse/FilterParametersDefinition.java | 4 +-
.../SecureSocketProtocolsParametersDefinition.java | 2 +-
470 files changed, 1238 insertions(+), 1236 deletions(-)
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.
[camel] 02/02: polish
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1b95a0995945452d4fb2f55d524dafe10b85c8db
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Mon Apr 16 23:43:07 2018 +0200
polish
---
.../main/java/org/apache/camel/CamelContext.java | 1 +
.../java/org/apache/camel/ExchangePattern.java | 2 +-
.../camel/builder/AdviceWithRouteBuilder.java | 10 +--
.../org/apache/camel/builder/AdviceWithTasks.java | 2 +-
.../org/apache/camel/builder/BuilderSupport.java | 4 +-
.../camel/builder/ErrorHandlerBuilderRef.java | 2 +-
.../camel/builder/ErrorHandlerBuilderSupport.java | 6 +-
.../org/apache/camel/builder/ExchangeBuilder.java | 4 +-
.../apache/camel/builder/ExpressionBuilder.java | 2 +-
.../org/apache/camel/builder/ExpressionClause.java | 4 +-
.../org/apache/camel/builder/NotifyBuilder.java | 6 +-
.../org/apache/camel/builder/RouteBuilder.java | 4 +-
.../org/apache/camel/builder/ValueBuilder.java | 2 +-
.../camel/builder/xml/DefaultNamespaceContext.java | 4 +-
.../camel/builder/xml/MessageVariableResolver.java | 2 +-
.../org/apache/camel/builder/xml/Namespaces.java | 2 +-
.../org/apache/camel/builder/xml/XPathBuilder.java | 10 +--
.../org/apache/camel/builder/xml/XsltBuilder.java | 4 +-
.../bean/AbstractCamelInvocationHandler.java | 4 +-
.../org/apache/camel/component/bean/BeanInfo.java | 30 +++----
.../bean/DefaultParameterMappingStrategy.java | 2 +-
.../apache/camel/component/bean/MethodInfo.java | 4 +-
.../apache/camel/component/bean/MethodsFilter.java | 2 +-
.../camel/component/browse/BrowseEndpoint.java | 2 +-
.../camel/component/dataset/DataSetSupport.java | 2 +-
.../camel/component/direct/DirectComponent.java | 2 +-
.../camel/component/direct/DirectEndpoint.java | 2 +-
.../component/directvm/DirectVmComponent.java | 4 +-
.../directvm/DirectVmConsumerExpression.java | 2 +-
.../extension/verifier/ResultBuilder.java | 2 +-
.../extension/verifier/ResultErrorHelper.java | 2 +-
.../apache/camel/component/file/FileComponent.java | 2 +-
.../apache/camel/component/file/FileConsumer.java | 2 +-
.../apache/camel/component/file/FileEndpoint.java | 6 +-
.../apache/camel/component/file/GenericFile.java | 4 +-
.../camel/component/file/GenericFileConsumer.java | 6 +-
.../camel/component/file/GenericFileEndpoint.java | 4 +-
.../camel/component/file/GenericFileMessage.java | 2 +-
.../file/strategy/FileProcessStrategyFactory.java | 18 ++--
.../GenericFileProcessStrategyFactory.java | 18 ++--
.../camel/component/mock/AssertionClause.java | 4 +-
.../apache/camel/component/mock/MockEndpoint.java | 32 +++----
.../properties/DefaultPropertiesParser.java | 2 +-
.../component/properties/PropertiesComponent.java | 2 +-
.../apache/camel/component/rest/RestProducer.java | 2 +-
.../component/scheduler/SchedulerComponent.java | 4 +-
.../component/seda/ArrayBlockingQueueFactory.java | 2 +-
.../component/seda/LinkedBlockingQueueFactory.java | 4 +-
.../seda/PriorityBlockingQueueFactory.java | 8 +-
.../camel/component/seda/QueueReference.java | 2 +-
.../apache/camel/component/seda/SedaComponent.java | 4 +-
.../apache/camel/component/seda/SedaEndpoint.java | 14 +--
.../apache/camel/component/test/TestEndpoint.java | 2 +-
.../camel/component/timer/TimerComponent.java | 4 +-
.../validator/DefaultLSResourceResolver.java | 2 +-
.../org/apache/camel/component/vm/VmComponent.java | 4 +-
.../apache/camel/component/xslt/XsltEndpoint.java | 2 +-
.../camel/converter/CollectionConverter.java | 14 +--
.../apache/camel/converter/jaxp/DomConverter.java | 2 +-
.../apache/camel/converter/jaxp/StaxConverter.java | 4 +-
.../apache/camel/converter/jaxp/XMLReaderPool.java | 8 +-
.../apache/camel/converter/jaxp/XmlConverter.java | 2 +-
.../converter/stream/FileInputStreamCache.java | 2 +-
.../camel/impl/CamelContextTrackerRegistry.java | 2 +-
.../camel/impl/ComponentConfigurationSupport.java | 6 +-
.../org/apache/camel/impl/CompositeRegistry.java | 2 +-
.../impl/DefaultAsyncProcessorAwaitManager.java | 2 +-
.../org/apache/camel/impl/DefaultAttachment.java | 2 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 100 ++++++++++-----------
.../camel/impl/DefaultComponentConfiguration.java | 2 +-
.../org/apache/camel/impl/DefaultDebugger.java | 6 +-
.../org/apache/camel/impl/DefaultEndpoint.java | 6 +-
.../apache/camel/impl/DefaultEndpointRegistry.java | 8 +-
.../org/apache/camel/impl/DefaultExchange.java | 4 +-
.../apache/camel/impl/DefaultExchangeHolder.java | 12 +--
.../apache/camel/impl/DefaultFactoryFinder.java | 4 +-
.../camel/impl/DefaultHeaderFilterStrategy.java | 4 +-
.../camel/impl/DefaultInflightRepository.java | 4 +-
.../java/org/apache/camel/impl/DefaultMessage.java | 6 +-
.../apache/camel/impl/DefaultNodeIdFactory.java | 2 +-
.../impl/DefaultPackageScanClassResolver.java | 16 ++--
.../org/apache/camel/impl/DefaultRestRegistry.java | 4 +-
.../java/org/apache/camel/impl/DefaultRoute.java | 4 +-
.../org/apache/camel/impl/DefaultRouteContext.java | 10 +--
.../camel/impl/DefaultRouteStartupOrder.java | 4 +-
.../camel/impl/DefaultRuntimeEndpointRegistry.java | 12 +--
.../DefaultScheduledPollConsumerScheduler.java | 2 +-
.../org/apache/camel/impl/DefaultServicePool.java | 6 +-
.../apache/camel/impl/DefaultShutdownStrategy.java | 14 +--
.../camel/impl/DefaultStreamCachingStrategy.java | 2 +-
.../apache/camel/impl/DefaultSubUnitOfWork.java | 2 +-
.../camel/impl/DefaultThreadPoolFactory.java | 6 +-
.../apache/camel/impl/DefaultTracedRouteNodes.java | 8 +-
.../org/apache/camel/impl/DefaultUnitOfWork.java | 4 +-
.../camel/impl/DeferServiceStartupListener.java | 2 +-
.../camel/impl/EventDrivenConsumerRoute.java | 2 +-
.../camel/impl/EventDrivenPollingConsumer.java | 4 +-
.../camel/impl/FileWatcherReloadStrategy.java | 2 +-
.../java/org/apache/camel/impl/JndiRegistry.java | 6 +-
.../impl/LimitedPollingConsumerPollStrategy.java | 2 +-
.../camel/impl/MappedEndpointConfiguration.java | 4 +-
.../java/org/apache/camel/impl/RouteService.java | 16 ++--
.../apache/camel/impl/ScheduledPollConsumer.java | 4 +-
.../apache/camel/impl/ScheduledPollEndpoint.java | 4 +-
.../java/org/apache/camel/impl/SimpleRegistry.java | 4 +-
.../camel/impl/ThrottlingInflightRoutePolicy.java | 2 +-
.../apache/camel/impl/UriEndpointComponent.java | 4 +-
.../camel/impl/UriEndpointConfiguration.java | 2 +-
.../converter/AnnotationTypeConverterLoader.java | 16 ++--
.../camel/impl/converter/ArrayTypeConverter.java | 2 +-
.../impl/converter/BaseTypeConverterRegistry.java | 12 +--
.../converter/CorePackageScanClassResolver.java | 6 +-
.../converter/PropertyEditorTypeConverter.java | 2 +-
.../TypeConvertersPackageScanClassResolver.java | 6 +-
.../java/org/apache/camel/impl/osgi/Activator.java | 18 ++--
.../camel/impl/osgi/tracker/AbstractTracked.java | 6 +-
.../impl/scan/AssignableToPackageScanFilter.java | 2 +-
.../impl/scan/CompositePackageScanFilter.java | 4 +-
.../camel/language/simple/BaseSimpleParser.java | 6 +-
.../language/simple/SimpleExpressionParser.java | 2 +-
.../language/simple/SimplePredicateParser.java | 2 +-
.../camel/language/simple/SimpleTokenizer.java | 2 +-
.../language/simple/ast/BinaryExpression.java | 2 +-
.../camel/language/simple/ast/CompositeNodes.java | 4 +-
.../src/main/java/org/apache/camel/main/Main.java | 2 +-
.../java/org/apache/camel/main/MainSupport.java | 12 +--
.../camel/management/DefaultManagementAgent.java | 4 +-
.../DefaultManagementLifecycleStrategy.java | 16 ++--
.../management/DefaultManagementStrategy.java | 2 +-
.../camel/management/MBeanInfoAssembler.java | 14 +--
.../mbean/JMXNotificationTraceEventHandler.java | 6 +-
.../management/mbean/ManagedCamelContext.java | 8 +-
.../management/mbean/ManagedEventNotifier.java | 2 +-
.../camel/management/mbean/ManagedRoute.java | 4 +-
.../management/mbean/RouteCoverageXmlParser.java | 2 +-
.../java/org/apache/camel/model/AOPDefinition.java | 2 +-
.../apache/camel/model/AggregateDefinition.java | 2 +-
.../org/apache/camel/model/CatchDefinition.java | 10 +--
.../org/apache/camel/model/ChoiceDefinition.java | 6 +-
.../apache/camel/model/ContextScanDefinition.java | 4 +-
.../org/apache/camel/model/ExpressionNode.java | 2 +-
.../org/apache/camel/model/HystrixDefinition.java | 2 +-
.../apache/camel/model/InterceptDefinition.java | 2 +-
.../apache/camel/model/LoadBalanceDefinition.java | 2 +-
.../apache/camel/model/MulticastDefinition.java | 2 +-
.../apache/camel/model/OnCompletionDefinition.java | 4 +-
.../apache/camel/model/OnExceptionDefinition.java | 10 +--
.../org/apache/camel/model/OutputDefinition.java | 2 +-
.../apache/camel/model/PackageScanDefinition.java | 6 +-
.../apache/camel/model/ProcessorDefinition.java | 62 ++++++-------
.../camel/model/ProcessorDefinitionHelper.java | 18 ++--
.../apache/camel/model/PropertiesDefinition.java | 2 +-
.../camel/model/RecipientListDefinition.java | 2 +-
.../apache/camel/model/ResequenceDefinition.java | 2 +-
.../model/RestContextRefDefinitionHelper.java | 4 +-
.../model/RouteContextRefDefinitionHelper.java | 4 +-
.../org/apache/camel/model/RouteDefinition.java | 10 +--
.../apache/camel/model/RouteDefinitionHelper.java | 22 ++---
.../org/apache/camel/model/RoutesDefinition.java | 12 +--
.../org/apache/camel/model/ThreadsDefinition.java | 2 +-
.../apache/camel/model/ToDynamicDefinition.java | 4 +-
.../java/org/apache/camel/model/TryDefinition.java | 6 +-
.../org/apache/camel/model/WireTapDefinition.java | 2 +-
.../model/dataformat/DataFormatsDefinition.java | 2 +-
.../dataformat/UniVocityAbstractDataFormat.java | 2 +-
.../model/dataformat/XMLSecurityDataFormat.java | 2 +-
.../camel/model/dataformat/XStreamDataFormat.java | 16 ++--
.../CircuitBreakerLoadBalancerDefinition.java | 6 +-
.../FailoverLoadBalancerDefinition.java | 6 +-
.../WeightedLoadBalancerDefinition.java | 2 +-
.../camel/model/rest/RestBindingDefinition.java | 4 +-
.../model/rest/RestConfigurationDefinition.java | 24 ++---
.../apache/camel/model/rest/RestDefinition.java | 12 +--
.../model/rest/RestOperationParamDefinition.java | 2 +-
.../RestOperationResponseHeaderDefinition.java | 2 +-
.../apache/camel/model/rest/RestsDefinition.java | 2 +-
.../apache/camel/model/rest/VerbDefinition.java | 4 +-
.../org/apache/camel/processor/BatchProcessor.java | 6 +-
.../camel/processor/CamelInternalProcessor.java | 2 +-
.../apache/camel/processor/ChoiceProcessor.java | 2 +-
.../camel/processor/DefaultExchangeFormatter.java | 2 +-
.../camel/processor/DefaultMaskingFormatter.java | 2 +-
.../camel/processor/DelegateAsyncProcessor.java | 2 +-
.../apache/camel/processor/DelegateProcessor.java | 2 +-
.../camel/processor/DelegateSyncProcessor.java | 2 +-
.../camel/processor/ErrorHandlerSupport.java | 2 +-
.../InterceptorToAsyncProcessorBridge.java | 4 +-
.../apache/camel/processor/MulticastProcessor.java | 14 +--
.../camel/processor/RecipientListProcessor.java | 2 +-
.../camel/processor/RedeliveryErrorHandler.java | 2 +-
.../org/apache/camel/processor/Resequencer.java | 2 +-
.../processor/SharedCamelInternalProcessor.java | 2 +-
.../java/org/apache/camel/processor/Splitter.java | 2 +-
.../apache/camel/processor/StreamResequencer.java | 4 +-
.../org/apache/camel/processor/TryProcessor.java | 2 +-
.../apache/camel/processor/WireTapProcessor.java | 2 +-
.../aggregate/AbstractListAggregationStrategy.java | 2 +-
.../processor/aggregate/AggregateProcessor.java | 12 +--
.../aggregate/AggregationStrategyBeanAdapter.java | 2 +-
.../aggregate/AggregationStrategyBeanInfo.java | 4 +-
.../aggregate/AggregationStrategyMethodInfo.java | 2 +-
.../aggregate/MemoryAggregationRepository.java | 2 +-
.../DefaultExceptionPolicyStrategy.java | 6 +-
.../processor/idempotent/IdempotentConsumer.java | 2 +-
.../processor/interceptor/BacklogDebugger.java | 10 +--
.../camel/processor/interceptor/BacklogTracer.java | 6 +-
.../processor/interceptor/DefaultChannel.java | 4 +-
.../interceptor/DefaultTraceEventHandler.java | 2 +-
.../apache/camel/processor/interceptor/Tracer.java | 2 +-
.../loadbalancer/ExceptionFailureStatistics.java | 2 +-
.../loadbalancer/LoadBalancerSupport.java | 4 +-
.../processor/loadbalancer/StickyLoadBalancer.java | 2 +-
.../loadbalancer/WeightedLoadBalancer.java | 4 +-
.../processor/resequencer/ResequencerEngine.java | 6 +-
.../validation/DefaultValidationErrorHandler.java | 6 +-
.../camel/runtimecatalog/AbstractCamelCatalog.java | 18 ++--
.../runtimecatalog/DefaultRuntimeCamelCatalog.java | 2 +-
.../runtimecatalog/EndpointValidationResult.java | 30 +++----
.../camel/runtimecatalog/JSonSchemaHelper.java | 2 +-
.../runtimecatalog/SimpleValidationResult.java | 1 +
.../apache/camel/runtimecatalog/URISupport.java | 10 +--
.../runtimecatalog/UnsafeUriCharactersEncoder.java | 4 +-
.../main/java/org/apache/camel/spi/Container.java | 2 +-
.../apache/camel/support/ChildServiceSupport.java | 2 +-
.../apache/camel/support/DefaultTimeoutMap.java | 10 +--
.../support/RestConsumerContextPathMatcher.java | 2 +-
.../apache/camel/support/TimerListenerManager.java | 2 +-
.../camel/support/TokenXMLExpressionIterator.java | 4 +-
.../support/TokenXMLPairExpressionIterator.java | 2 +-
.../camel/support/XMLTokenExpressionIterator.java | 14 +--
.../java/org/apache/camel/util/AntPathMatcher.java | 2 +-
.../camel/util/AsyncProcessorConverterHelper.java | 2 +-
.../org/apache/camel/util/CamelContextHelper.java | 8 +-
.../org/apache/camel/util/CollectionHelper.java | 4 +-
.../java/org/apache/camel/util/EndpointHelper.java | 6 +-
.../java/org/apache/camel/util/ExchangeHelper.java | 2 +-
.../java/org/apache/camel/util/GroupIterator.java | 2 +-
.../main/java/org/apache/camel/util/HostUtils.java | 6 +-
.../apache/camel/util/IntrospectionSupport.java | 16 ++--
.../org/apache/camel/util/JsonSchemaHelper.java | 4 +-
.../java/org/apache/camel/util/MessageHelper.java | 2 +-
.../java/org/apache/camel/util/ObjectHelper.java | 10 +--
.../java/org/apache/camel/util/OgnlHelper.java | 4 +-
.../java/org/apache/camel/util/ServiceHelper.java | 2 +-
.../org/apache/camel/util/StringQuoteHelper.java | 2 +-
.../java/org/apache/camel/util/URISupport.java | 14 +--
.../org/apache/camel/util/UnitOfWorkHelper.java | 6 +-
.../camel/util/UnsafeUriCharactersEncoder.java | 4 +-
.../org/apache/camel/util/XmlLineNumberParser.java | 2 +-
.../camel/util/component/AbstractApiComponent.java | 6 +-
.../camel/util/component/AbstractApiEndpoint.java | 4 +-
.../camel/util/component/AbstractApiProducer.java | 2 +-
.../camel/util/component/ApiMethodHelper.java | 26 +++---
.../camel/util/component/ApiMethodParser.java | 14 +--
.../util/component/ApiMethodPropertiesHelper.java | 6 +-
.../util/component/ArgumentSubstitutionParser.java | 14 +--
.../RejectableScheduledThreadPoolExecutor.java | 4 +-
.../concurrent/RejectableThreadPoolExecutor.java | 4 +-
.../concurrent/SubmitOrderedCompletionService.java | 2 +-
.../org/apache/camel/util/function/Suppliers.java | 8 +-
.../org/apache/camel/util/jndi/JndiContext.java | 10 +--
.../camel/util/jsse/BaseSSLContextParameters.java | 14 +--
.../apache/camel/util/jsse/FilterParameters.java | 10 +--
.../org/apache/camel/util/jsse/JsseParameters.java | 2 +-
.../apache/camel/util/jsse/KeyStoreParameters.java | 2 +-
.../util/jsse/SSLContextServerParameters.java | 2 +-
.../camel/util/toolbox/AggregationStrategies.java | 4 +-
.../apache/camel/ThreadPoolRejectedPolicyTest.java | 8 +-
.../camel/builder/BuilderWithScopesTest.java | 46 +++++-----
.../camel/builder/ExpressionBuilderTest.java | 8 +-
.../builder/PredicateBuilderConcurrentTest.java | 2 +-
.../org/apache/camel/builder/RouteBuilderTest.java | 4 +-
.../builder/xml/DefaultNamespaceContextTest.java | 2 +-
.../org/apache/camel/builder/xml/XPathTest.java | 2 +-
.../camel/component/bean/BeanConcurrentTest.java | 2 +-
.../bean/BeanExpressionConcurrentTest.java | 2 +-
.../camel/component/bean/BeanMapPutTest.java | 2 +-
.../BeanParameterMethodCallThreeBodyOgnlTest.java | 2 +-
.../bean/BeanParameterThreeBodyOgnlTest.java | 2 +-
.../component/bean/BeanParameterValueTest.java | 2 +-
.../bean/BeanWithHeadersAndBodyInject2Test.java | 4 +-
.../bean/CamelSimpleExpressionPerfTestRunner.java | 2 +-
.../component/bean/ProxyReturnFutureListTest.java | 2 +-
.../pojomessage/PojoProxyHelperOneWayTest.java | 2 +-
.../direct/DirectShouldUseSameThreadTest.java | 2 +-
.../directvm/DirectVmShouldUseSameThreadTest.java | 2 +-
.../file/AntPathMatcherGenericFileFilterTest.java | 2 +-
.../FileConcurrentWriteAppendSameFileTest.java | 2 +-
.../file/FileConsumerDirectoryFilterTest.java | 6 +-
.../component/file/FileConsumerFileFilterTest.java | 2 +-
.../file/FileProduceOverruleExpressionTest.java | 2 +-
.../file/FileProduceOverruleOnlyOnceTest.java | 2 +-
.../component/file/FileProduceOverruleTest.java | 2 +-
.../file/FileProducerFileBodyGetsMoved.java | 2 +-
.../camel/component/file/FileSorterRefTest.java | 2 +-
.../component/file/GenericFileMessageTest.java | 10 +--
.../GenericFileDeleteProcessStrategyTest.java | 8 +-
.../LanguageLoadScriptFromFileCachedTest.java | 2 +-
.../camel/component/mock/MockEndpointTest.java | 18 ++--
.../mock/MockExpectedBodiesAsListTest.java | 4 +-
.../component/seda/CollectionProducerTest.java | 2 +-
.../camel/component/seda/SedaConcurrentTest.java | 4 +-
.../camel/component/seda/SedaEndpointTest.java | 4 +-
.../camel/component/seda/SedaQueueFactoryTest.java | 2 +-
.../seda/SedaShouldNotUseSameThreadTest.java | 2 +-
.../component/vm/VmShouldNotUseSameThreadTest.java | 2 +-
.../camel/component/xslt/XsltContentCacheTest.java | 2 +-
.../camel/converter/CollectionConverterTest.java | 4 +-
.../org/apache/camel/converter/ConverterTest.java | 4 +-
.../camel/converter/ObjectConverterTest.java | 2 +-
.../apache/camel/impl/CamelContextTrackerTest.java | 2 +-
.../apache/camel/impl/ConfigurationHelperTest.java | 2 +-
.../camel/impl/DefaultExchangeHolderTest.java | 6 +-
.../impl/DefaultHeaderFilterStrategyTest.java | 10 +--
.../impl/DefaultProducerTemplateAsyncTest.java | 4 +-
.../camel/impl/DefaultProducerTemplateTest.java | 8 +-
.../apache/camel/impl/DummyLifecycleStrategy.java | 2 +-
.../org/apache/camel/impl/JndiRegistryTest.java | 2 +-
...edPollEndpointConfigureConsumerRestartTest.java | 2 +-
.../org/apache/camel/impl/ServicePoolTest.java | 6 +-
.../apache/camel/impl/health/HealthCheckTest.java | 28 +++---
.../issues/CBRCustomPredicateAsFilterTest.java | 2 +-
.../camel/issues/ChangeHeaderCaseIssueTest.java | 2 +-
.../issues/FilterCustomPredicateAsFilterTest.java | 2 +-
.../InterceptCustomPredicateAsFilterTest.java | 2 +-
.../camel/issues/ServicePoolAwareLeakyTest.java | 2 +-
.../camel/issues/SplitListListIssueTest.java | 4 +-
.../camel/issues/SplitPropertiesFileIssueTest.java | 6 +-
.../SplitterUsingBeanReturningMessageTest.java | 2 +-
.../language/BeanLanguageInvalidOGNLTest.java | 2 +-
.../camel/language/SimpleOgnlMapIssueTest.java | 2 +-
.../simple/SimpleParserExpressionTest.java | 2 +-
.../language/simple/SimpleParserPredicateTest.java | 6 +-
.../apache/camel/language/simple/SimpleTest.java | 72 +++++++--------
.../camel/management/AddEventNotifierTest.java | 2 +-
.../camel/management/EndpointCompletionTest.java | 2 +-
.../camel/management/EventNotifierEventsTest.java | 2 +-
.../EventNotifierExchangeCompletedTest.java | 2 +-
.../management/EventNotifierExchangeSentTest.java | 2 +-
.../EventNotifierFailureHandledEventsTest.java | 2 +-
.../EventNotifierRedeliveryEventsTest.java | 2 +-
...ventNotifierServiceStoppingFailedEventTest.java | 2 +-
.../ManagedBrowsableEndpointAsXmlTest.java | 2 +-
.../camel/management/ManagedCamelContextTest.java | 2 +-
.../management/ManagedConsumerCacheHitsTest.java | 2 +-
.../camel/management/ManagedConsumerCacheTest.java | 2 +-
.../management/ManagedEndpointRegistryTest.java | 2 +-
.../management/ManagedRegisterTwoRoutesTest.java | 2 +-
.../management/ManagedRouteAddRemoveTest.java | 8 +-
...ManagedSetAndRemoveHeaderAndPropertiesTest.java | 1 +
.../management/ManagedTransformerRegistryTest.java | 2 +-
.../management/ManagedValidatorRegistryTest.java | 2 +-
.../MultipleEventNotifierEventsTest.java | 4 +-
.../camel/management/RemoveEventNotifierTest.java | 2 +-
.../management/RemoveRouteDefinitionTest.java | 6 +-
.../org/apache/camel/processor/AsyncLoopTest.java | 2 +-
.../processor/ChoiceCompoundPredicateTest.java | 6 +-
.../org/apache/camel/processor/ClaimCheckTest.java | 2 +-
.../processor/ComposedMessageProcessorTest.java | 2 +-
.../processor/DynamicRouterAnnotationTest.java | 2 +-
.../DynamicRouterExchangeHeaders2Test.java | 4 +-
.../DynamicRouterExchangeHeadersTest.java | 2 +-
.../DynamicRouterExchangePropertiesTest.java | 2 +-
.../apache/camel/processor/DynamicRouterTest.java | 2 +-
.../camel/processor/ErrorHandlerSupportTest.java | 4 +-
.../processor/ExchangeIdempotentConsumerTest.java | 2 +-
...dempotentConsumerUsingCustomRepositoryTest.java | 2 +-
.../camel/processor/RecipientListBeanTest.java | 2 +-
...pientListContextScopedOnExceptionIssueTest.java | 4 +-
...istExchangePropertyAggregationStrategyTest.java | 2 +-
.../camel/processor/RemoveHeadersExcludeTest.java | 4 +-
.../apache/camel/processor/RemoveHeadersTest.java | 4 +-
.../processor/RouteAwareSynchronizationTest.java | 2 +-
.../camel/processor/RoutePerformanceTest.java | 2 +-
...utingSlipContextScopedOnExceptionIssueTest.java | 4 +-
.../camel/processor/SamplingThrottlerTest.java | 4 +-
.../camel/processor/SplitCustomExpressionTest.java | 2 +-
.../processor/SplitRefCustomExpressionTest.java | 2 +-
.../camel/processor/SplitterCollateTest.java | 2 +-
.../camel/processor/SplitterNullBodyTest.java | 4 +-
.../camel/processor/SplitterOnPrepareTest.java | 2 +-
.../processor/SplitterParallelAggregateTest.java | 4 +-
.../apache/camel/processor/SplitterPojoTest.java | 4 +-
.../apache/camel/processor/SplitterSkipTest.java | 6 +-
.../org/apache/camel/processor/SplitterTest.java | 6 +-
.../camel/processor/UnitOfWorkProducerTest.java | 2 +-
.../AggregateConcurrentPerCorrelationKeyTest.java | 2 +-
.../AggregateExpressionSizeFallbackTest.java | 2 +-
.../AggregateExpressionSizeOverrideFixedTest.java | 2 +-
...gateExpressionSizeOverrideFixedTimeoutTest.java | 2 +-
.../aggregator/AggregateExpressionSizeTest.java | 2 +-
.../AggregateExpressionTimeoutFallbackTest.java | 2 +-
.../AggregateExpressionTimeoutPerGroupTest.java | 4 +-
.../aggregator/AggregateExpressionTimeoutTest.java | 2 +-
.../AggregateForceCompletionHeaderTest.java | 2 +-
.../AggregateSimpleExpressionIssueTest.java | 2 +-
...ggregationStrategyBeanAdapterAllowNullTest.java | 2 +-
.../aggregator/AggregatorConcurrencyTest.java | 2 +-
.../camel/processor/aggregator/AggregatorTest.java | 2 +-
.../aggregator/AlbertoAggregatorTest.java | 10 +--
...ustomListAggregationStrategyEmptySplitTest.java | 2 +-
.../CustomListAggregationStrategySplitTest.java | 2 +-
...DistributedConcurrentPerCorrelationKeyTest.java | 2 +-
.../DistributedOptimisticLockFailingTest.java | 2 +-
.../async/AsyncEndpointDynamicRouterTest.java | 2 +-
.../AsyncEndpointEventNotifierSendingTest.java | 2 +-
.../async/AsyncEndpointTryCatchFinally3Test.java | 2 +-
.../DefaultExceptionPolicyStrategyTest.java | 6 +-
.../ParentChildInterceptStrategyTest.java | 2 +-
.../CustomInterceptorRouteWithChildOutputTest.java | 2 +-
.../interceptor/DebugExceptionBreakpointTest.java | 2 +-
.../DebugExceptionEventBreakpointTest.java | 2 +-
.../interceptor/DebugSingleStepConditionTest.java | 2 +-
.../processor/interceptor/DebugSingleStepTest.java | 2 +-
.../camel/processor/interceptor/DebugTest.java | 2 +-
.../processor/interceptor/TraceFormatterTest.java | 2 +-
.../processor/interceptor/TraceHandlerTest.java | 2 +-
.../interceptor/TraceHandlerTestHandler.java | 2 +-
.../TraceInterceptorDestinationTest.java | 4 +-
.../TraceInterceptorFactoryCreatesHandlerTest.java | 2 +-
.../interceptor/TraceInterceptorSubclassTest.java | 2 +-
.../resequencer/ResequencerEngineTest.java | 10 +--
.../processor/resequencer/SequenceBuffer.java | 2 +-
.../camel/processor/resequencer/SequenceTest.java | 2 +-
.../runtimecatalog/RuntimeCamelCatalogTest.java | 14 +--
.../java/org/apache/camel/spi/ContainerTest.java | 2 +-
.../camel/support/DefaultTimeoutMapTest.java | 22 ++---
.../XMLTokenExpressionIteratorCharsetTest.java | 2 +-
.../XMLTokenExpressionIteratorGroupingTest.java | 4 +-
.../support/XMLTokenExpressionIteratorTest.java | 4 +-
.../apache/camel/util/CaseInsensitiveMapTest.java | 24 ++---
.../apache/camel/util/CollectionHelperTest.java | 4 +-
.../org/apache/camel/util/EndpointHelperTest.java | 4 +-
.../org/apache/camel/util/ExchangeHelperTest.java | 4 +-
.../camel/util/ExpressionListComparatorTest.java | 2 +-
.../camel/util/IntrospectionSupportTest.java | 16 ++--
.../org/apache/camel/util/KeyValueHolderTest.java | 20 ++---
.../java/org/apache/camel/util/LRUCacheTest.java | 2 +-
.../org/apache/camel/util/LRUSoftCacheTest.java | 24 ++---
.../org/apache/camel/util/MessageHelperTest.java | 2 +-
.../org/apache/camel/util/ObjectHelperTest.java | 8 +-
.../apache/camel/util/OrderedComparatorTest.java | 16 ++--
.../org/apache/camel/util/ResourceHelperTest.java | 4 +-
.../java/org/apache/camel/util/URISupportTest.java | 6 +-
.../camel/util/component/ApiMethodHelperTest.java | 10 +--
.../component/ApiMethodPropertiesHelperTest.java | 4 +-
.../component/ArgumentSubstitutionParserTest.java | 4 +-
.../org/apache/camel/util/component/TestProxy.java | 4 +-
.../SubmitOrderedCompletionServiceTest.java | 2 +-
...ndiCamelSingletonInitialContextFactoryTest.java | 2 +-
.../java/org/apache/camel/util/jndi/JndiTest.java | 2 +-
.../util/jsse/AbstractJsseParametersTest.java | 2 +-
.../camel/util/jsse/SSLContextParametersTest.java | 2 +-
453 files changed, 1205 insertions(+), 1202 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index b1080d4..8384e66 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -1403,6 +1403,7 @@ public interface CamelContext extends SuspendableService, RuntimeConfiguration {
/**
* @deprecated use {@link #getGlobalOption(String)} instead.
*/
+ @Deprecated
String getProperty(String key);
/**
diff --git a/camel-core/src/main/java/org/apache/camel/ExchangePattern.java b/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
index 60de5db..b1bd103 100644
--- a/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
+++ b/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
@@ -34,7 +34,7 @@ public enum ExchangePattern {
// TODO: We should deprecate and only support InOnly, InOut, and InOptionalOut
- protected static final Map<String, ExchangePattern> MAP = new HashMap<String, ExchangePattern>();
+ protected static final Map<String, ExchangePattern> MAP = new HashMap<>();
/**
* Returns the WSDL URI for this message exchange pattern
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
index 021bfd9..8b3d72f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
@@ -37,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
public abstract class AdviceWithRouteBuilder extends RouteBuilder {
private RouteDefinition originalRoute;
- private final List<AdviceWithTask> adviceWithTasks = new ArrayList<AdviceWithTask>();
+ private final List<AdviceWithTask> adviceWithTasks = new ArrayList<>();
/**
* Sets the original route to be adviced.
@@ -133,7 +133,7 @@ public abstract class AdviceWithRouteBuilder extends RouteBuilder {
*/
public <T extends ProcessorDefinition<?>> AdviceWithBuilder<T> weaveById(String pattern) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
- return new AdviceWithBuilder<T>(this, pattern, null, null, null);
+ return new AdviceWithBuilder<>(this, pattern, null, null, null);
}
/**
@@ -147,7 +147,7 @@ public abstract class AdviceWithRouteBuilder extends RouteBuilder {
*/
public <T extends ProcessorDefinition<?>> AdviceWithBuilder<T> weaveByToString(String pattern) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
- return new AdviceWithBuilder<T>(this, null, pattern, null, null);
+ return new AdviceWithBuilder<>(this, null, pattern, null, null);
}
/**
@@ -161,7 +161,7 @@ public abstract class AdviceWithRouteBuilder extends RouteBuilder {
*/
public <T extends ProcessorDefinition<?>> AdviceWithBuilder<T> weaveByToUri(String pattern) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
- return new AdviceWithBuilder<T>(this, null, null, pattern, null);
+ return new AdviceWithBuilder<>(this, null, null, pattern, null);
}
/**
@@ -172,7 +172,7 @@ public abstract class AdviceWithRouteBuilder extends RouteBuilder {
*/
public <T extends ProcessorDefinition<?>> AdviceWithBuilder<T> weaveByType(Class<T> type) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
- return new AdviceWithBuilder<T>(this, null, null, null, type);
+ return new AdviceWithBuilder<>(this, null, null, null, type);
}
/**
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
index 1a917d6..c87ca73 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
@@ -429,7 +429,7 @@ public final class AdviceWithTasks {
final int selectFrom, final int selectTo, int maxDeep) {
// first iterator and apply match by
- List<ProcessorDefinition<?>> matched = new ArrayList<ProcessorDefinition<?>>();
+ List<ProcessorDefinition<?>> matched = new ArrayList<>();
List<ProcessorDefinition<?>> outputs = new ArrayList<>();
diff --git a/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java b/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
index ea81d2c..99fef37 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
@@ -429,7 +429,7 @@ public abstract class BuilderSupport {
* @return list of endpoints
*/
public List<Endpoint> endpoints(String... uris) throws NoSuchEndpointException {
- List<Endpoint> endpoints = new ArrayList<Endpoint>();
+ List<Endpoint> endpoints = new ArrayList<>();
for (String uri : uris) {
endpoints.add(endpoint(uri));
}
@@ -443,7 +443,7 @@ public abstract class BuilderSupport {
* @return list of the given endpoints
*/
public List<Endpoint> endpoints(Endpoint... endpoints) {
- List<Endpoint> answer = new ArrayList<Endpoint>();
+ List<Endpoint> answer = new ArrayList<>();
answer.addAll(Arrays.asList(endpoints));
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
index ddb1948..04e1913 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
@@ -35,7 +35,7 @@ import org.apache.camel.util.ObjectHelper;
public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport {
public static final String DEFAULT_ERROR_HANDLER_BUILDER = "CamelDefaultErrorHandlerBuilder";
private final String ref;
- private final Map<RouteContext, ErrorHandlerBuilder> handlers = new HashMap<RouteContext, ErrorHandlerBuilder>();
+ private final Map<RouteContext, ErrorHandlerBuilder> handlers = new HashMap<>();
private boolean supportTransacted;
public ErrorHandlerBuilderRef(String ref) {
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
index 8bc55cb..44feecf 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
@@ -36,14 +36,14 @@ import org.apache.camel.util.ObjectHelper;
* @version
*/
public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder {
- private Map<RouteContext, List<OnExceptionDefinition>> onExceptions = new HashMap<RouteContext, List<OnExceptionDefinition>>();
+ private Map<RouteContext, List<OnExceptionDefinition>> onExceptions = new HashMap<>();
private ExceptionPolicyStrategy exceptionPolicyStrategy;
public void addErrorHandlers(RouteContext routeContext, OnExceptionDefinition exception) {
// only add if we not already have it
List<OnExceptionDefinition> list = onExceptions.get(routeContext);
if (list == null) {
- list = new ArrayList<OnExceptionDefinition>();
+ list = new ArrayList<>();
onExceptions.put(routeContext, list);
}
if (!list.contains(exception)) {
@@ -53,7 +53,7 @@ public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder
protected void cloneBuilder(ErrorHandlerBuilderSupport other) {
if (!onExceptions.isEmpty()) {
- Map<RouteContext, List<OnExceptionDefinition>> copy = new HashMap<RouteContext, List<OnExceptionDefinition>>(onExceptions);
+ Map<RouteContext, List<OnExceptionDefinition>> copy = new HashMap<>(onExceptions);
other.onExceptions = copy;
}
other.exceptionPolicyStrategy = exceptionPolicyStrategy;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
index 12f9003..97282e0 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
@@ -34,8 +34,8 @@ public final class ExchangeBuilder {
private CamelContext context;
private ExchangePattern pattern;
private Object body;
- private Map<String, Object> headers = new HashMap<String, Object>();
- private Map<String, Object> properties = new HashMap<String, Object>();
+ private Map<String, Object> headers = new HashMap<>();
+ private Map<String, Object> properties = new HashMap<>();
public ExchangeBuilder(CamelContext context) {
this.context = context;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
index bab24bc..3641d0f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
@@ -878,7 +878,7 @@ public final class ExpressionBuilder {
*/
public static Expression cacheExpression(final Expression expression) {
return new ExpressionAdapter() {
- private final AtomicReference<Object> cache = new AtomicReference<Object>();
+ private final AtomicReference<Object> cache = new AtomicReference<>();
public Object evaluate(Exchange exchange) {
Object answer = cache.get();
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 52af129..055b75b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -39,11 +39,11 @@ public class ExpressionClause<T> extends ExpressionDefinition {
private ExpressionClauseSupport<T> delegate;
public ExpressionClause(T result) {
- this.delegate = new ExpressionClauseSupport<T>(result);
+ this.delegate = new ExpressionClauseSupport<>(result);
}
public static <T extends ExpressionNode> ExpressionClause<T> createAndSetExpression(T result) {
- ExpressionClause<T> clause = new ExpressionClause<T>(result);
+ ExpressionClause<T> clause = new ExpressionClause<>(result);
result.setExpression(clause);
return clause;
}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index c6bf5bd..41d190a 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -1008,7 +1008,7 @@ public class NotifyBuilder {
* @see #whenExactBodiesReceived(Object...)
*/
public NotifyBuilder whenBodiesReceived(Object... bodies) {
- List<Object> bodyList = new ArrayList<Object>();
+ List<Object> bodyList = new ArrayList<>();
bodyList.addAll(Arrays.asList(bodies));
return doWhenBodies(bodyList, true, false);
}
@@ -1024,7 +1024,7 @@ public class NotifyBuilder {
* @see #whenExactBodiesDone(Object...)
*/
public NotifyBuilder whenBodiesDone(Object... bodies) {
- List<Object> bodyList = new ArrayList<Object>();
+ List<Object> bodyList = new ArrayList<>();
bodyList.addAll(Arrays.asList(bodies));
return doWhenBodies(bodyList, false, false);
}
@@ -1039,7 +1039,7 @@ public class NotifyBuilder {
* @see #whenBodiesReceived(Object...)
*/
public NotifyBuilder whenExactBodiesReceived(Object... bodies) {
- List<Object> bodyList = new ArrayList<Object>();
+ List<Object> bodyList = new ArrayList<>();
bodyList.addAll(Arrays.asList(bodies));
return doWhenBodies(bodyList, true, true);
}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 62fbccb..8f20626 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -99,7 +99,7 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild
*/
public RestConfigurationDefinition restConfiguration(String component) {
if (restConfigurations == null) {
- restConfigurations = new HashMap<String, RestConfigurationDefinition>();
+ restConfigurations = new HashMap<>();
}
RestConfigurationDefinition restConfiguration = restConfigurations.get(component);
if (restConfiguration == null) {
@@ -498,7 +498,7 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild
camelContext.addRestDefinitions(getRestCollection().getRests());
// convert rests into routes so we they are routes for runtime
- List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> routes = new ArrayList<>();
for (RestDefinition rest : getRestCollection().getRests()) {
List<RouteDefinition> list = rest.asRouteDefinition(getContext());
routes.addAll(list);
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
index f7f3a82..d6d387f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
@@ -159,7 +159,7 @@ public class ValueBuilder implements Expression, Predicate {
}
public Predicate in(Object... values) {
- List<Predicate> predicates = new ArrayList<Predicate>();
+ List<Predicate> predicates = new ArrayList<>();
for (Object value : values) {
Expression right = asExpression(value);
right = ExpressionBuilder.convertToExpression(right, expression);
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
index 8555e1c..32644c7 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
@@ -43,7 +43,7 @@ public class DefaultNamespaceContext implements NamespaceContext, NamespaceAware
public DefaultNamespaceContext(XPathFactory factory) {
this.parent = factory.newXPath().getNamespaceContext();
- this.map = new HashMap<String, String>();
+ this.map = new HashMap<>();
}
public DefaultNamespaceContext(NamespaceContext parent, Map<String, String> map) {
@@ -80,7 +80,7 @@ public class DefaultNamespaceContext implements NamespaceContext, NamespaceAware
}
public Iterator<String> getPrefixes(String namespaceURI) {
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
for (Entry<String, String> entry : map.entrySet()) {
if (namespaceURI.equals(entry.getValue())) {
set.add(entry.getKey());
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java b/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
index d1d538e..20ccc66 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
@@ -45,7 +45,7 @@ import static org.apache.camel.builder.xml.Namespaces.SYSTEM_PROPERTIES_NAMESPAC
public class MessageVariableResolver implements XPathVariableResolver {
private static final Logger LOG = LoggerFactory.getLogger(MessageVariableResolver.class);
- private Map<String, Object> variables = new HashMap<String, Object>();
+ private Map<String, Object> variables = new HashMap<>();
private final ThreadLocal<Exchange> exchange;
public MessageVariableResolver(ThreadLocal<Exchange> exchange) {
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java b/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
index d4651b1..359c613 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
@@ -43,7 +43,7 @@ public class Namespaces {
public static final String ENVIRONMENT_VARIABLES = "http://camel.apache.org/xml/variables/environment-variables";
public static final String EXCHANGE_PROPERTY = "http://camel.apache.org/xml/variables/exchange-property";
- private Map<String, String> namespaces = new HashMap<String, String>();
+ private Map<String, String> namespaces = new HashMap<>();
/**
* Creates a namespaces object from the given XML element
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index 4b61f8f..0db66c2 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -94,12 +94,12 @@ public class XPathBuilder extends ServiceSupport implements CamelContextAware, E
private static volatile XPathFactory defaultXPathFactory;
private CamelContext camelContext;
- private final Queue<XPathExpression> pool = new ConcurrentLinkedQueue<XPathExpression>();
- private final Queue<XPathExpression> poolLogNamespaces = new ConcurrentLinkedQueue<XPathExpression>();
+ private final Queue<XPathExpression> pool = new ConcurrentLinkedQueue<>();
+ private final Queue<XPathExpression> poolLogNamespaces = new ConcurrentLinkedQueue<>();
private final String text;
- private final ThreadLocal<Exchange> exchange = new ThreadLocal<Exchange>();
+ private final ThreadLocal<Exchange> exchange = new ThreadLocal<>();
private final MessageVariableResolver variableResolver = new MessageVariableResolver(exchange);
- private final Map<String, String> namespaces = new ConcurrentHashMap<String, String>();
+ private final Map<String, String> namespaces = new ConcurrentHashMap<>();
private boolean threadSafety;
private volatile XPathFactory xpathFactory;
private volatile Class<?> documentType = Document.class;
@@ -908,7 +908,7 @@ public class XPathBuilder extends ServiceSupport implements CamelContextAware, E
}
private void logDiscoveredNamespaces(NodeList namespaces) {
- Map<String, HashSet<String>> map = new LinkedHashMap<String, HashSet<String>>();
+ Map<String, HashSet<String>> map = new LinkedHashMap<>();
for (int i = 0; i < namespaces.getLength(); i++) {
Node n = namespaces.item(i);
if (n.getNodeName().equals("xmlns:xml")) {
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 035d4ab..953195b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -72,7 +72,7 @@ import static org.apache.camel.util.ObjectHelper.notNull;
*/
public class XsltBuilder implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(XsltBuilder.class);
- private Map<String, Object> parameters = new HashMap<String, Object>();
+ private Map<String, Object> parameters = new HashMap<>();
private XmlConverter converter = new XmlConverter();
private Templates template;
private volatile BlockingQueue<Transformer> transformers;
@@ -267,7 +267,7 @@ public class XsltBuilder implements Processor {
*/
public XsltBuilder transformerCacheSize(int numberToCache) {
if (numberToCache > 0) {
- transformers = new ArrayBlockingQueue<Transformer>(numberToCache);
+ transformers = new ArrayBlockingQueue<>(numberToCache);
} else {
transformers = null;
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
index 7172154..3e73283 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
public abstract class AbstractCamelInvocationHandler implements InvocationHandler {
private static final Logger LOG = LoggerFactory.getLogger(CamelInvocationHandler.class);
- private static final List<Method> EXCLUDED_METHODS = new ArrayList<Method>();
+ private static final List<Method> EXCLUDED_METHODS = new ArrayList<>();
private static ExecutorService executorService;
protected final Endpoint endpoint;
protected final Producer producer;
@@ -185,7 +185,7 @@ public abstract class AbstractCamelInvocationHandler implements InvocationHandle
final boolean isFuture = method.getReturnType() == Future.class;
// create task to execute the proxy and gather the reply
- FutureTask<Object> task = new FutureTask<Object>(new Callable<Object>() {
+ FutureTask<Object> task = new FutureTask<>(new Callable<Object>() {
public Object call() throws Exception {
// process the exchange
LOG.trace("Proxied method call {} invoking producer: {}", method.getName(), producer);
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 1628793..5dde40d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -65,19 +65,19 @@ import org.slf4j.LoggerFactory;
public class BeanInfo {
private static final Logger LOG = LoggerFactory.getLogger(BeanInfo.class);
private static final String CGLIB_CLASS_SEPARATOR = "$$";
- private static final List<Method> EXCLUDED_METHODS = new ArrayList<Method>();
+ private static final List<Method> EXCLUDED_METHODS = new ArrayList<>();
private final CamelContext camelContext;
private final BeanComponent component;
private final Class<?> type;
private final ParameterMappingStrategy strategy;
private final MethodInfo defaultMethod;
// shared state with details of operations introspected from the bean, created during the constructor
- private Map<String, List<MethodInfo>> operations = new HashMap<String, List<MethodInfo>>();
- private List<MethodInfo> operationsWithBody = new ArrayList<MethodInfo>();
- private List<MethodInfo> operationsWithNoBody = new ArrayList<MethodInfo>();
- private List<MethodInfo> operationsWithCustomAnnotation = new ArrayList<MethodInfo>();
- private List<MethodInfo> operationsWithHandlerAnnotation = new ArrayList<MethodInfo>();
- private Map<Method, MethodInfo> methodMap = new HashMap<Method, MethodInfo>();
+ private Map<String, List<MethodInfo>> operations = new HashMap<>();
+ private List<MethodInfo> operationsWithBody = new ArrayList<>();
+ private List<MethodInfo> operationsWithNoBody = new ArrayList<>();
+ private List<MethodInfo> operationsWithCustomAnnotation = new ArrayList<>();
+ private List<MethodInfo> operationsWithHandlerAnnotation = new ArrayList<>();
+ private Map<Method, MethodInfo> methodMap = new HashMap<>();
private boolean publicConstructors;
static {
@@ -239,7 +239,7 @@ public class BeanInfo {
// and therefore use arrayLength from ObjectHelper to return the array length field.
Method method = ObjectHelper.class.getMethod("arrayLength", Object[].class);
ParameterInfo pi = new ParameterInfo(0, Object[].class, null, ExpressionBuilder.mandatoryBodyExpression(Object[].class, true));
- List<ParameterInfo> lpi = new ArrayList<ParameterInfo>(1);
+ List<ParameterInfo> lpi = new ArrayList<>(1);
lpi.add(pi);
methodInfo = new MethodInfo(exchange.getContext(), pojo.getClass(), method, lpi, lpi, false, false);
// Need to update the message body to be pojo for the invocation
@@ -370,7 +370,7 @@ public class BeanInfo {
existing.add(methodInfo);
} else {
// its a new method we have not seen before so wrap it in a list and add it
- List<MethodInfo> methods = new ArrayList<MethodInfo>();
+ List<MethodInfo> methods = new ArrayList<>();
methods.add(methodInfo);
operations.put(opName, methods);
}
@@ -427,8 +427,8 @@ public class BeanInfo {
Class<?>[] parameterTypes = method.getParameterTypes();
List<Annotation>[] parametersAnnotations = collectParameterAnnotations(clazz, method);
- List<ParameterInfo> parameters = new ArrayList<ParameterInfo>();
- List<ParameterInfo> bodyParameters = new ArrayList<ParameterInfo>();
+ List<ParameterInfo> parameters = new ArrayList<>();
+ List<ParameterInfo> bodyParameters = new ArrayList<>();
boolean hasCustomAnnotation = false;
boolean hasHandlerAnnotation = ObjectHelper.hasAnnotation(method.getAnnotations(), Handler.class);
@@ -480,7 +480,7 @@ public class BeanInfo {
protected List<Annotation>[] collectParameterAnnotations(Class<?> c, Method m) {
List<Annotation>[] annotations = new List[m.getParameterCount()];
for (int i = 0; i < annotations.length; i++) {
- annotations[i] = new ArrayList<Annotation>();
+ annotations[i] = new ArrayList<>();
}
collectParameterAnnotations(c, m, annotations);
return annotations;
@@ -656,7 +656,7 @@ public class BeanInfo {
count++;
}
- List<MethodInfo> operations = new ArrayList<MethodInfo>();
+ List<MethodInfo> operations = new ArrayList<>();
for (MethodInfo info : operationList) {
if (info.getParameters().size() == count) {
operations.add(info);
@@ -670,7 +670,7 @@ public class BeanInfo {
}
// okay we still got multiple operations, so need to match the best one
- List<MethodInfo> candidates = new ArrayList<MethodInfo>();
+ List<MethodInfo> candidates = new ArrayList<>();
MethodInfo fallbackCandidate = null;
for (MethodInfo info : operations) {
it = ObjectHelper.createIterator(parameters, ",", false);
@@ -1182,7 +1182,7 @@ public class BeanInfo {
return Collections.emptyList();
}
- List<MethodInfo> methods = new ArrayList<MethodInfo>();
+ List<MethodInfo> methods = new ArrayList<>();
for (Collection<MethodInfo> col : operations.values()) {
methods.addAll(col);
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java b/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
index 41359ab..9ec7ba1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
@@ -33,7 +33,7 @@ import org.apache.camel.spi.Registry;
* @version
*/
public class DefaultParameterMappingStrategy implements ParameterMappingStrategy {
- private final Map<Class<?>, Expression> parameterTypeToExpressionMap = new ConcurrentHashMap<Class<?>, Expression>();
+ private final Map<Class<?>, Expression> parameterTypeToExpressionMap = new ConcurrentHashMap<>();
public DefaultParameterMappingStrategy() {
loadDefaultRegistry();
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index 766ee2c..5fbde08 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -205,7 +205,7 @@ public class MethodInfo {
}
private Map<Class<?>, Annotation> collectMethodAnnotations(Class<?> c, Method method) {
- Map<Class<?>, Annotation> annotations = new HashMap<Class<?>, Annotation>();
+ Map<Class<?>, Annotation> annotations = new HashMap<>();
collectMethodAnnotations(c, method, annotations);
return annotations;
}
@@ -517,7 +517,7 @@ public class MethodInfo {
Class<?> type = method.getDeclaringClass();
// create the search order of types to scan
- List<Class<?>> typesToSearch = new ArrayList<Class<?>>();
+ List<Class<?>> typesToSearch = new ArrayList<>();
addTypeAndSuperTypes(type, typesToSearch);
Class<?>[] interfaces = type.getInterfaces();
for (Class<?> anInterface : interfaces) {
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java
index c4e3faf..6053e20 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java
@@ -30,7 +30,7 @@ import org.apache.camel.util.ObjectHelper;
*/
class MethodsFilter {
- private final List<Method> methods = new ArrayList<Method>();
+ private final List<Method> methods = new ArrayList<>();
private final Class<?> inheritingClass;
/**
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
index 3fbe1ac..dcccd2c 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
@@ -89,7 +89,7 @@ public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint
}
protected List<Exchange> createExchangeList() {
- return new CopyOnWriteArrayList<Exchange>();
+ return new CopyOnWriteArrayList<>();
}
/**
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
index 40ee117..77c82b7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
@@ -93,7 +93,7 @@ public abstract class DataSetSupport implements DataSet {
public Map<String, Object> getDefaultHeaders() {
if (defaultHeaders == null) {
- defaultHeaders = new HashMap<String, Object>();
+ defaultHeaders = new HashMap<>();
populateDefaultHeaders(defaultHeaders);
}
return defaultHeaders;
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
index acf0d8f..5b385b1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
@@ -34,7 +34,7 @@ public class DirectComponent extends UriEndpointComponent {
// must keep a map of consumers on the component to ensure endpoints can lookup old consumers
// later in case the DirectEndpoint was re-created due the old was evicted from the endpoints LRUCache
// on DefaultCamelContext
- private final Map<String, DirectConsumer> consumers = new HashMap<String, DirectConsumer>();
+ private final Map<String, DirectConsumer> consumers = new HashMap<>();
@Metadata(label = "producer", defaultValue = "true")
private boolean block = true;
@Metadata(label = "producer", defaultValue = "30000")
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
index cf3db04..8347c5d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
@@ -51,7 +51,7 @@ public class DirectEndpoint extends DefaultEndpoint {
private boolean failIfNoConsumers = true;
public DirectEndpoint() {
- this.consumers = new HashMap<String, DirectConsumer>();
+ this.consumers = new HashMap<>();
}
public DirectEndpoint(String endpointUri, Component component) {
diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
index 0577e3a..cacaaa1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
@@ -38,7 +38,7 @@ public class DirectVmComponent extends UriEndpointComponent {
// must keep a map of consumers on the component to ensure endpoints can lookup old consumers
// later in case the DirectVmEndpoint was re-created due the old was evicted from the endpoints LRUCache
// on DefaultCamelContext
- private static final ConcurrentMap<String, DirectVmConsumer> CONSUMERS = new ConcurrentHashMap<String, DirectVmConsumer>();
+ private static final ConcurrentMap<String, DirectVmConsumer> CONSUMERS = new ConcurrentHashMap<>();
@Metadata(label = "producer", defaultValue = "true")
private boolean block = true;
@Metadata(label = "producer", defaultValue = "30000")
@@ -58,7 +58,7 @@ public class DirectVmComponent extends UriEndpointComponent {
* @return consumer endpoints
*/
public static Collection<Endpoint> getConsumerEndpoints() {
- Collection<Endpoint> endpoints = new ArrayList<Endpoint>(CONSUMERS.size());
+ Collection<Endpoint> endpoints = new ArrayList<>(CONSUMERS.size());
for (DirectVmConsumer consumer : CONSUMERS.values()) {
endpoints.add(consumer.getEndpoint());
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerExpression.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerExpression.java
index 53bdb60..bdce1e4 100644
--- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumerExpression.java
@@ -39,7 +39,7 @@ public class DirectVmConsumerExpression extends ExpressionAdapter {
@Override
public Object evaluate(Exchange exchange) {
- Collection<Endpoint> endpoints = new ArrayList<Endpoint>();
+ Collection<Endpoint> endpoints = new ArrayList<>();
for (Endpoint endpoint : DirectVmComponent.getConsumerEndpoints()) {
if (matcher.match(pattern, endpoint.getEndpointKey())) {
endpoints.add(endpoint);
diff --git a/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java b/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java
index 637bd08..e356648 100644
--- a/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultBuilder.java
@@ -33,7 +33,7 @@ public final class ResultBuilder {
public ResultBuilder() {
this.scope = Optional.empty();
- this.status = scope.empty();
+ this.status = Optional.empty();
}
// **********************************
diff --git a/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java b/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java
index d03307e..96c93ad 100644
--- a/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java
@@ -159,6 +159,6 @@ public final class ResultErrorHelper {
static Set<String> parameters(final Set<String> options) {
final Set<String> withoutExclusionMark = options.stream().map(o -> o.replaceFirst("!", "")).collect(Collectors.toSet());
- return new TreeSet<String>(withoutExclusionMark);
+ return new TreeSet<>(withoutExclusionMark);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java b/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
index 17dc54e..baa86c3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
@@ -104,7 +104,7 @@ public class FileComponent extends GenericFileComponent<File> implements Endpoin
prefix = "";
}
File[] list = file.listFiles();
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
for (File aFile : list) {
String name = aFile.getName();
if (pattern.length() == 0 || name.contains(pattern)) {
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java b/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
index 860b098..ccf73e7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
@@ -196,7 +196,7 @@ public class FileConsumer extends GenericFileConsumer<File> {
* @return wrapped as a GenericFile
*/
public static GenericFile<File> asGenericFile(String endpointPath, File file, String charset, boolean probeContentType) {
- GenericFile<File> answer = new GenericFile<File>(probeContentType);
+ GenericFile<File> answer = new GenericFile<>(probeContentType);
// use file specific binding
answer.setBinding(new FileBinding());
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index bfc75a1..9f2a603 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -163,7 +163,7 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
throw new IllegalArgumentException("You must configure fileExist=Move when moveExisting has been set");
}
- return new GenericFileProducer<File>(this, operations);
+ return new GenericFileProducer<>(this, operations);
}
public Exchange createExchange(GenericFile<File> file) {
@@ -298,7 +298,7 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
}
public Set<PosixFilePermission> getPermissions() {
- Set<PosixFilePermission> permissions = new HashSet<PosixFilePermission>();
+ Set<PosixFilePermission> permissions = new HashSet<>();
if (ObjectHelper.isEmpty(chmod)) {
return permissions;
}
@@ -359,7 +359,7 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
}
public Set<PosixFilePermission> getDirectoryPermissions() {
- Set<PosixFilePermission> permissions = new HashSet<PosixFilePermission>();
+ Set<PosixFilePermission> permissions = new HashSet<>();
if (ObjectHelper.isEmpty(chmodDirectory)) {
return permissions;
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
index d6b533d..bbf075f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
@@ -129,7 +129,7 @@ public class GenericFile<T> implements WrappedFile<T> {
Map<String, Object> headers;
exchange.setProperty(FileComponent.FILE_EXCHANGE_FILE, this);
- GenericFileMessage<T> msg = new GenericFileMessage<T>(this);
+ GenericFileMessage<T> msg = new GenericFileMessage<>(this);
if (exchange.hasOut()) {
headers = exchange.getOut().hasHeaders() ? exchange.getOut().getHeaders() : null;
exchange.setOut(msg);
@@ -354,7 +354,7 @@ public class GenericFile<T> implements WrappedFile<T> {
public GenericFileBinding<T> getBinding() {
if (binding == null) {
- binding = new GenericFileDefaultBinding<T>();
+ binding = new GenericFileDefaultBinding<>();
}
return binding;
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 6129620..1cc7d0d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -118,7 +118,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
}
// gather list of files to process
- List<GenericFile<T>> files = new ArrayList<GenericFile<T>>();
+ List<GenericFile<T>> files = new ArrayList<>();
String name = endpoint.getConfiguration().getDirectory();
// time how long it takes to poll
@@ -151,7 +151,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// sort using build in sorters so we can use expressions
// use a linked list so we can dequeue the exchanges
- LinkedList<Exchange> exchanges = new LinkedList<Exchange>();
+ LinkedList<Exchange> exchanges = new LinkedList<>();
for (GenericFile<T> file : files) {
Exchange exchange = endpoint.createExchange(file);
endpoint.configureExchange(exchange);
@@ -440,7 +440,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// register on completion callback that does the completion strategies
// (for instance to move the file after we have processed it)
- exchange.addOnCompletion(new GenericFileOnCompletion<T>(endpoint, operations, processStrategy, target, absoluteFileName));
+ exchange.addOnCompletion(new GenericFileOnCompletion<>(endpoint, operations, processStrategy, target, absoluteFileName));
log.debug("About to process file: {} using exchange: {}", target, exchange);
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 3b067df..6e831bd 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -233,7 +233,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
*/
@Override
public List<Exchange> getExchanges() {
- final List<Exchange> answer = new ArrayList<Exchange>();
+ final List<Exchange> answer = new ArrayList<>();
GenericFileConsumer<?> consumer = null;
try {
@@ -1319,7 +1319,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
}
protected Map<String, Object> getParamsAsMap() {
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
if (isNoop()) {
params.put("noop", Boolean.toString(true));
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java
index 71c6d6b..dbdbfd3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileMessage.java
@@ -65,7 +65,7 @@ public class GenericFileMessage<T> extends DefaultMessage {
@Override
public GenericFileMessage<T> newInstance() {
- return new GenericFileMessage<T>(getCamelContext());
+ return new GenericFileMessage<>(getCamelContext());
}
@Override
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
index 710f4eb..e31815b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
@@ -45,26 +45,26 @@ public final class FileProcessStrategyFactory {
boolean isMove = moveExpression != null || preMoveExpression != null || moveFailedExpression != null;
if (isDelete) {
- GenericFileDeleteProcessStrategy<File> strategy = new GenericFileDeleteProcessStrategy<File>();
+ GenericFileDeleteProcessStrategy<File> strategy = new GenericFileDeleteProcessStrategy<>();
strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
if (preMoveExpression != null) {
- GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<File>();
+ GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(preMoveExpression);
strategy.setBeginRenamer(renamer);
}
if (moveFailedExpression != null) {
- GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<File>();
+ GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(moveFailedExpression);
strategy.setFailureRenamer(renamer);
}
return strategy;
} else if (isMove || isNoop) {
- GenericFileRenameProcessStrategy<File> strategy = new GenericFileRenameProcessStrategy<File>();
+ GenericFileRenameProcessStrategy<File> strategy = new GenericFileRenameProcessStrategy<>();
strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
if (!isNoop) {
// move on commit is only possible if not noop
if (moveExpression != null) {
- GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<File>();
+ GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(moveExpression);
strategy.setCommitRenamer(renamer);
} else {
@@ -73,20 +73,20 @@ public final class FileProcessStrategyFactory {
}
// both move and noop supports pre move
if (preMoveExpression != null) {
- GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<File>();
+ GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(preMoveExpression);
strategy.setBeginRenamer(renamer);
}
// both move and noop supports move failed
if (moveFailedExpression != null) {
- GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<File>();
+ GenericFileExpressionRenamer<File> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(moveFailedExpression);
strategy.setFailureRenamer(renamer);
}
return strategy;
} else {
// default strategy will move files in a .camel/ subfolder where the file was consumed
- GenericFileRenameProcessStrategy<File> strategy = new GenericFileRenameProcessStrategy<File>();
+ GenericFileRenameProcessStrategy<File> strategy = new GenericFileRenameProcessStrategy<>();
strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
strategy.setCommitRenamer(getDefaultCommitRenamer(context));
return strategy;
@@ -97,7 +97,7 @@ public final class FileProcessStrategyFactory {
// use context to lookup language to let it be loose coupled
Language language = context.resolveLanguage("file");
Expression expression = language.createExpression("${file:parent}/.camel/${file:onlyname}");
- return new GenericFileExpressionRenamer<File>(expression);
+ return new GenericFileExpressionRenamer<>(expression);
}
@SuppressWarnings("unchecked")
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java
index 28edafe..16e6914 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java
@@ -41,44 +41,44 @@ public final class GenericFileProcessStrategyFactory {
boolean isMove = moveExpression != null || preMoveExpression != null || moveFailedExpression != null;
if (isDelete) {
- GenericFileDeleteProcessStrategy<T> strategy = new GenericFileDeleteProcessStrategy<T>();
+ GenericFileDeleteProcessStrategy<T> strategy = new GenericFileDeleteProcessStrategy<>();
strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<T>) getExclusiveReadLockStrategy(params));
if (preMoveExpression != null) {
- GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<T>();
+ GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(preMoveExpression);
strategy.setBeginRenamer(renamer);
}
if (moveFailedExpression != null) {
- GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<T>();
+ GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(moveFailedExpression);
strategy.setFailureRenamer(renamer);
}
return strategy;
} else if (isMove || isNoop) {
- GenericFileRenameProcessStrategy<T> strategy = new GenericFileRenameProcessStrategy<T>();
+ GenericFileRenameProcessStrategy<T> strategy = new GenericFileRenameProcessStrategy<>();
strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<T>) getExclusiveReadLockStrategy(params));
if (!isNoop && moveExpression != null) {
// move on commit is only possible if not noop
- GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<T>();
+ GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(moveExpression);
strategy.setCommitRenamer(renamer);
}
// both move and noop supports pre move
if (moveFailedExpression != null) {
- GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<T>();
+ GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(moveFailedExpression);
strategy.setFailureRenamer(renamer);
}
// both move and noop supports pre move
if (preMoveExpression != null) {
- GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<T>();
+ GenericFileExpressionRenamer<T> renamer = new GenericFileExpressionRenamer<>();
renamer.setExpression(preMoveExpression);
strategy.setBeginRenamer(renamer);
}
return strategy;
} else {
// default strategy will do nothing
- GenericFileNoOpProcessStrategy<T> strategy = new GenericFileNoOpProcessStrategy<T>();
+ GenericFileNoOpProcessStrategy<T> strategy = new GenericFileNoOpProcessStrategy<>();
strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<T>) getExclusiveReadLockStrategy(params));
return strategy;
}
@@ -97,7 +97,7 @@ public final class GenericFileProcessStrategyFactory {
if ("none".equals(readLock) || "false".equals(readLock)) {
return null;
} else if ("rename".equals(readLock)) {
- GenericFileRenameExclusiveReadLockStrategy<T> readLockStrategy = new GenericFileRenameExclusiveReadLockStrategy<T>();
+ GenericFileRenameExclusiveReadLockStrategy<T> readLockStrategy = new GenericFileRenameExclusiveReadLockStrategy<>();
Long timeout = (Long) params.get("readLockTimeout");
if (timeout != null) {
readLockStrategy.setTimeout(timeout);
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java b/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
index d79e92d..81f01ee 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
@@ -39,7 +39,7 @@ public abstract class AssertionClause extends ExpressionClauseSupport<ValueBuild
protected final MockEndpoint mock;
protected volatile int currentIndex;
- private final Set<Predicate> predicates = new LinkedHashSet<Predicate>();
+ private final Set<Predicate> predicates = new LinkedHashSet<>();
private final Expression previous = new PreviousTimestamp();
private final Expression next = new NextTimestamp();
@@ -75,7 +75,7 @@ public abstract class AssertionClause extends ExpressionClauseSupport<ValueBuild
* Adds the given predicate to this assertion clause
*/
public ExpressionClause<AssertionClause> predicate() {
- ExpressionClause<AssertionClause> clause = new ExpressionClause<AssertionClause>(this);
+ ExpressionClause<AssertionClause> clause = new ExpressionClause<>(this);
addPredicate(clause);
return clause;
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index 5c39d67..acddf42 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -562,7 +562,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
expects(new Runnable() {
public void run() {
// these are the expected values to find
- final Set<Object> actualHeaderValues = new CopyOnWriteArraySet<Object>(values);
+ final Set<Object> actualHeaderValues = new CopyOnWriteArraySet<>(values);
for (int i = 0; i < getReceivedExchanges().size(); i++) {
Exchange exchange = getReceivedExchange(i);
@@ -592,7 +592,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
* <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
*/
public void expectedHeaderValuesReceivedInAnyOrder(String name, Object... values) {
- List<Object> valueList = new ArrayList<Object>();
+ List<Object> valueList = new ArrayList<>();
valueList.addAll(Arrays.asList(values));
expectedHeaderValuesReceivedInAnyOrder(name, valueList);
}
@@ -605,7 +605,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
*/
public void expectedPropertyReceived(final String name, final Object value) {
if (expectedPropertyValues == null) {
- expectedPropertyValues = new HashMap<String, Object>();
+ expectedPropertyValues = new HashMap<>();
}
expectedPropertyValues.put(name, value);
@@ -649,7 +649,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
expects(new Runnable() {
public void run() {
// these are the expected values to find
- final Set<Object> actualPropertyValues = new CopyOnWriteArraySet<Object>(values);
+ final Set<Object> actualPropertyValues = new CopyOnWriteArraySet<>(values);
for (int i = 0; i < getReceivedExchanges().size(); i++) {
Exchange exchange = getReceivedExchange(i);
@@ -679,7 +679,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
* <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
*/
public void expectedPropertyValuesReceivedInAnyOrder(String name, Object... values) {
- List<Object> valueList = new ArrayList<Object>();
+ List<Object> valueList = new ArrayList<>();
valueList.addAll(Arrays.asList(values));
expectedPropertyValuesReceivedInAnyOrder(name, valueList);
}
@@ -696,7 +696,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
public void expectedBodiesReceived(final List<?> bodies) {
expectedMessageCount(bodies.size());
this.expectedBodyValues = bodies;
- this.actualBodyValues = new ArrayList<Object>();
+ this.actualBodyValues = new ArrayList<>();
expects(new Runnable() {
public void run() {
@@ -765,7 +765,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
* <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
*/
public void expectedBodiesReceived(Object... bodies) {
- List<Object> bodyList = new ArrayList<Object>();
+ List<Object> bodyList = new ArrayList<>();
bodyList.addAll(Arrays.asList(bodies));
expectedBodiesReceived(bodyList);
}
@@ -803,11 +803,11 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
public void expectedBodiesReceivedInAnyOrder(final List<?> bodies) {
expectedMessageCount(bodies.size());
this.expectedBodyValues = bodies;
- this.actualBodyValues = new ArrayList<Object>();
+ this.actualBodyValues = new ArrayList<>();
expects(new Runnable() {
public void run() {
- List<Object> actualBodyValuesSet = new ArrayList<Object>(actualBodyValues);
+ List<Object> actualBodyValuesSet = new ArrayList<>(actualBodyValues);
for (int i = 0; i < expectedBodyValues.size(); i++) {
Exchange exchange = getReceivedExchange(i);
assertTrue("No exchange received for counter: " + i, exchange != null);
@@ -829,7 +829,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
* <b>Important:</b> This overrides any previous set value using {@link #expectedMessageCount(int)}
*/
public void expectedBodiesReceivedInAnyOrder(Object... bodies) {
- List<Object> bodyList = new ArrayList<Object>();
+ List<Object> bodyList = new ArrayList<>();
bodyList.addAll(Arrays.asList(bodies));
expectedBodiesReceivedInAnyOrder(bodyList);
}
@@ -1014,7 +1014,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
}
public void assertNoDuplicates(Expression expression) {
- Map<Object, Exchange> map = new HashMap<Object, Exchange>();
+ Map<Object, Exchange> map = new HashMap<>();
List<Exchange> list = getReceivedExchanges();
for (int i = 0; i < list.size(); i++) {
Exchange e2 = list.get(i);
@@ -1297,10 +1297,10 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
expectedCount = -1;
counter = 0;
defaultProcessor = null;
- processors = new HashMap<Integer, Processor>();
- receivedExchanges = new CopyOnWriteArrayList<Exchange>();
- failures = new CopyOnWriteArrayList<Throwable>();
- tests = new CopyOnWriteArrayList<Runnable>();
+ processors = new HashMap<>();
+ receivedExchanges = new CopyOnWriteArrayList<>();
+ failures = new CopyOnWriteArrayList<>();
+ tests = new CopyOnWriteArrayList<>();
latch = null;
sleepForEmptyTest = 0;
resultWaitTime = 0;
@@ -1308,7 +1308,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
assertPeriod = 0L;
expectedMinimumCount = -1;
expectedBodyValues = null;
- actualBodyValues = new ArrayList<Object>();
+ actualBodyValues = new ArrayList<>();
expectedHeaderValues = null;
actualHeaderValues = null;
expectedPropertyValues = null;
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 8574add..0dd7769 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
@@ -118,7 +118,7 @@ public class DefaultPropertiesParser implements AugmentedPropertyNameAwareProper
throw new IllegalArgumentException("Circular reference detected with key [" + property.getKey() + "] from text: " + input);
}
- Set<String> newReplaced = new HashSet<String>(replacedPropertyKeys);
+ Set<String> newReplaced = new HashSet<>(replacedPropertyKeys);
newReplaced.add(property.getKey());
String before = answer.substring(0, property.getBeginIndex());
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index f6cf803..38527c8 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -92,7 +92,7 @@ public class PropertiesComponent extends UriEndpointComponent {
private static final Logger LOG = LoggerFactory.getLogger(PropertiesComponent.class);
@SuppressWarnings("unchecked")
private final Map<CacheKey, Properties> cacheMap = LRUCacheFactory.newLRUSoftCache(1000);
- private final Map<String, PropertiesFunction> functions = new HashMap<String, PropertiesFunction>();
+ private final Map<String, PropertiesFunction> functions = new HashMap<>();
private PropertiesResolver propertiesResolver = new DefaultPropertiesResolver(this);
private PropertiesParser propertiesParser = new DefaultPropertiesParser(this);
private boolean isDefaultCreated;
diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java
index 0da7ab4..ea7fc12 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java
@@ -356,7 +356,7 @@ public class RestProducer extends DefaultAsyncProducer {
DataFormat dataFormat, String prefix) throws Exception {
if (config.getDataFormatProperties() != null && !config.getDataFormatProperties().isEmpty()) {
// must use a copy as otherwise the options gets removed during introspection setProperties
- Map<String, Object> copy = new HashMap<String, Object>();
+ Map<String, Object> copy = new HashMap<>();
// filter keys on prefix
// - either its a known prefix and must match the prefix parameter
diff --git a/camel-core/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java b/camel-core/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java
index 599699c..e00bbea 100644
--- a/camel-core/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java
@@ -28,8 +28,8 @@ import org.apache.camel.spi.Metadata;
public class SchedulerComponent extends UriEndpointComponent {
- private final Map<String, ScheduledExecutorService> executors = new HashMap<String, ScheduledExecutorService>();
- private final Map<String, AtomicInteger> refCounts = new HashMap<String, AtomicInteger>();
+ private final Map<String, ScheduledExecutorService> executors = new HashMap<>();
+ private final Map<String, AtomicInteger> refCounts = new HashMap<>();
@Metadata(defaultValue = "1", label = "scheduler")
private int concurrentTasks = 1;
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java b/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java
index d9fd3e0..0b67117 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/ArrayBlockingQueueFactory.java
@@ -69,6 +69,6 @@ public class ArrayBlockingQueueFactory<E> implements BlockingQueueFactory<E> {
@Override
public ArrayBlockingQueue<E> create(int capacity) {
return fair == null
- ? new ArrayBlockingQueue<E>(defaultCapacity) : new ArrayBlockingQueue<E>(defaultCapacity, fair);
+ ? new ArrayBlockingQueue<>(defaultCapacity) : new ArrayBlockingQueue<>(defaultCapacity, fair);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/LinkedBlockingQueueFactory.java b/camel-core/src/main/java/org/apache/camel/component/seda/LinkedBlockingQueueFactory.java
index b75ab39..55dd547 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/LinkedBlockingQueueFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/LinkedBlockingQueueFactory.java
@@ -25,11 +25,11 @@ public class LinkedBlockingQueueFactory<E> implements BlockingQueueFactory<E> {
@Override
public LinkedBlockingQueue<E> create() {
- return new LinkedBlockingQueue<E>();
+ return new LinkedBlockingQueue<>();
}
@Override
public LinkedBlockingQueue<E> create(int capacity) {
- return new LinkedBlockingQueue<E>(capacity);
+ return new LinkedBlockingQueue<>(capacity);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java b/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java
index 377cb83..446b633 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/PriorityBlockingQueueFactory.java
@@ -41,15 +41,15 @@ public class PriorityBlockingQueueFactory<E> implements BlockingQueueFactory<E>
@Override
public PriorityBlockingQueue<E> create() {
return comparator == null
- ? new PriorityBlockingQueue<E>()
+ ? new PriorityBlockingQueue<>()
// PriorityQueue as a default capacity of 11
- : new PriorityBlockingQueue<E>(11, comparator);
+ : new PriorityBlockingQueue<>(11, comparator);
}
@Override
public PriorityBlockingQueue<E> create(int capacity) {
return comparator == null
- ? new PriorityBlockingQueue<E>(capacity)
- : new PriorityBlockingQueue<E>(capacity, comparator);
+ ? new PriorityBlockingQueue<>(capacity)
+ : new PriorityBlockingQueue<>(capacity, comparator);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/QueueReference.java b/camel-core/src/main/java/org/apache/camel/component/seda/QueueReference.java
index 17a03cd..f8561c9 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/QueueReference.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/QueueReference.java
@@ -34,7 +34,7 @@ public final class QueueReference {
private Integer size;
private Boolean multipleConsumers;
- private List<SedaEndpoint> endpoints = new LinkedList<SedaEndpoint>();
+ private List<SedaEndpoint> endpoints = new LinkedList<>();
QueueReference(BlockingQueue<Exchange> queue, Integer size, Boolean multipleConsumers) {
this.queue = queue;
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
index 1dc1cae..7350150 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
@@ -42,9 +42,9 @@ public class SedaComponent extends UriEndpointComponent {
@Metadata(label = "advanced")
protected int queueSize;
@Metadata(label = "advanced")
- protected BlockingQueueFactory<Exchange> defaultQueueFactory = new LinkedBlockingQueueFactory<Exchange>();
+ protected BlockingQueueFactory<Exchange> defaultQueueFactory = new LinkedBlockingQueueFactory<>();
- private final Map<String, QueueReference> queues = new HashMap<String, QueueReference>();
+ private final Map<String, QueueReference> queues = new HashMap<>();
public SedaComponent() {
super(SedaEndpoint.class);
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index f365b99..45df699 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -55,8 +55,8 @@ import org.slf4j.LoggerFactory;
@UriEndpoint(firstVersion = "1.1.0", scheme = "seda", title = "SEDA", syntax = "seda:name", consumerClass = SedaConsumer.class, label = "core,endpoint")
public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, BrowsableEndpoint, MultipleConsumersSupport {
private static final Logger LOG = LoggerFactory.getLogger(SedaEndpoint.class);
- private final Set<SedaProducer> producers = new CopyOnWriteArraySet<SedaProducer>();
- private final Set<SedaConsumer> consumers = new CopyOnWriteArraySet<SedaConsumer>();
+ private final Set<SedaProducer> producers = new CopyOnWriteArraySet<>();
+ private final Set<SedaConsumer> consumers = new CopyOnWriteArraySet<>();
private volatile MulticastProcessor consumerMulticastProcessor;
private volatile boolean multicastStarted;
private volatile ExecutorService multicastExecutor;
@@ -93,7 +93,7 @@ public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, Brow
private BlockingQueueFactory<Exchange> queueFactory;
public SedaEndpoint() {
- queueFactory = new LinkedBlockingQueueFactory<Exchange>();
+ queueFactory = new LinkedBlockingQueueFactory<>();
}
public SedaEndpoint(String endpointUri, Component component, BlockingQueue<Exchange> queue) {
@@ -106,7 +106,7 @@ public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, Brow
if (queue != null) {
this.size = queue.remainingCapacity();
}
- queueFactory = new LinkedBlockingQueueFactory<Exchange>();
+ queueFactory = new LinkedBlockingQueueFactory<>();
getComponent().registerQueue(this, queue);
}
@@ -228,7 +228,7 @@ public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, Brow
multicastExecutor = getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, URISupport.sanitizeUri(getEndpointUri()) + "(multicast)");
}
// create list of consumers to multicast to
- List<Processor> processors = new ArrayList<Processor>(size);
+ List<Processor> processors = new ArrayList<>(size);
for (SedaConsumer consumer : getConsumers()) {
processors.add(consumer.getProcessor());
}
@@ -410,7 +410,7 @@ public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, Brow
* Returns the current pending exchanges
*/
public List<Exchange> getExchanges() {
- return new ArrayList<Exchange>(getQueue());
+ return new ArrayList<>(getQueue());
}
@ManagedAttribute
@@ -438,7 +438,7 @@ public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, Brow
* Returns the current active producers on this endpoint
*/
public Set<SedaProducer> getProducers() {
- return new HashSet<SedaProducer>(producers);
+ return new HashSet<>(producers);
}
void onStarted(SedaProducer producer) {
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
index d86fcd3..f6fffdf 100644
--- a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
@@ -73,7 +73,7 @@ public class TestEndpoint extends MockEndpoint {
protected void doStart() throws Exception {
LOG.debug("Consuming expected messages from: {}", expectedMessageEndpoint);
- final List<Object> expectedBodies = new ArrayList<Object>();
+ final List<Object> expectedBodies = new ArrayList<>();
EndpointHelper.pollEndpoint(expectedMessageEndpoint, new Processor() {
public void process(Exchange exchange) throws Exception {
// if file based we need to load the file into memory as the file may be deleted/moved afterwards
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java b/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
index cb6fca5..e51f0a2 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
@@ -36,8 +36,8 @@ import org.apache.camel.impl.UriEndpointComponent;
* @version
*/
public class TimerComponent extends UriEndpointComponent {
- private final Map<String, Timer> timers = new HashMap<String, Timer>();
- private final Map<String, AtomicInteger> refCounts = new HashMap<String, AtomicInteger>();
+ private final Map<String, Timer> timers = new HashMap<>();
+ private final Map<String, AtomicInteger> refCounts = new HashMap<>();
public TimerComponent() {
super(TimerEndpoint.class);
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
index 2de0a9e..d4e7f63 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
@@ -39,7 +39,7 @@ public class DefaultLSResourceResolver implements LSResourceResolver {
private final String resourceUri;
private final String resourcePath;
private String relatedURI;
- private Map<String, String> relatedURIMap = new HashMap<String, String>();
+ private Map<String, String> relatedURIMap = new HashMap<>();
public DefaultLSResourceResolver(CamelContext camelContext, String resourceUri) {
this.camelContext = camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java b/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
index 5e0cb76..44724fb 100644
--- a/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
@@ -37,8 +37,8 @@ import org.apache.camel.component.seda.SedaComponent;
* @version
*/
public class VmComponent extends SedaComponent {
- protected static final Map<String, QueueReference> QUEUES = new HashMap<String, QueueReference>();
- protected static final Map<String, VmEndpoint> ENDPOINTS = new HashMap<String, VmEndpoint>();
+ protected static final Map<String, QueueReference> QUEUES = new HashMap<>();
+ protected static final Map<String, VmEndpoint> ENDPOINTS = new HashMap<>();
private static final AtomicInteger START_COUNTER = new AtomicInteger();
public VmComponent() {
diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
index e92e91c..c9b0a07 100644
--- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
@@ -479,7 +479,7 @@ public class XsltEndpoint extends ProcessorEndpoint {
// any additional transformer parameters then make a copy to avoid side-effects
if (parameters != null) {
- Map<String, Object> copy = new HashMap<String, Object>(parameters);
+ Map<String, Object> copy = new HashMap<>(parameters);
xslt.setParameters(copy);
}
diff --git a/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java b/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
index cd296fa..e573f9f 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
@@ -67,7 +67,7 @@ public final class CollectionConverter {
*/
@Converter
public static <T> List<T> toList(Collection<T> collection) {
- return new ArrayList<T>(collection);
+ return new ArrayList<>(collection);
}
/**
@@ -75,7 +75,7 @@ public final class CollectionConverter {
*/
@Converter
public static <T> ArrayList<T> toArrayList(Iterator<T> it) {
- ArrayList<T> list = new ArrayList<T>();
+ ArrayList<T> list = new ArrayList<>();
while (it.hasNext()) {
list.add(it.next());
}
@@ -84,14 +84,14 @@ public final class CollectionConverter {
@Converter
public static Set<Object> toSet(Object[] array) {
- Set<Object> answer = new HashSet<Object>();
+ Set<Object> answer = new HashSet<>();
answer.addAll(Arrays.asList(array));
return answer;
}
@Converter
public static <T> Set<T> toSet(Collection<T> collection) {
- return new HashSet<T>(collection);
+ return new HashSet<>(collection);
}
@Converter
@@ -108,12 +108,12 @@ public final class CollectionConverter {
@Converter
public static <K, V> Hashtable<K, V> toHashtable(Map<? extends K, ? extends V> map) {
- return new Hashtable<K, V>(map);
+ return new Hashtable<>(map);
}
@Converter
public static <K, V> HashMap<K, V> toHashMap(Map<? extends K, ? extends V> map) {
- return new HashMap<K, V>(map);
+ return new HashMap<>(map);
}
/**
@@ -124,7 +124,7 @@ public final class CollectionConverter {
if (iterable instanceof List) {
return (List<T>) iterable;
}
- List<T> result = new LinkedList<T>();
+ List<T> result = new LinkedList<>();
for (T value : iterable) {
result.add(value);
}
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
index 8c59219..dc25a61 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
@@ -126,7 +126,7 @@ public final class DomConverter {
@Converter
public static List<?> toList(NodeList nodeList) {
- List<Object> answer = new ArrayList<Object>();
+ List<Object> answer = new ArrayList<>();
Iterator<Object> it = ObjectHelper.createIterator(nodeList);
while (it.hasNext()) {
answer.add(it.next());
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
index d41ee7b..df1b4f6 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
@@ -81,8 +81,8 @@ public class StaxConverter {
LOG.debug("StaxConverter pool size: {}", i);
- INPUT_FACTORY_POOL = new LinkedBlockingQueue<XMLInputFactory>(i);
- OUTPUT_FACTORY_POOL = new LinkedBlockingQueue<XMLOutputFactory>(i);
+ INPUT_FACTORY_POOL = new LinkedBlockingQueue<>(i);
+ OUTPUT_FACTORY_POOL = new LinkedBlockingQueue<>(i);
}
private XMLInputFactory inputFactory;
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
index 381b76d..98f9c77 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
@@ -40,7 +40,7 @@ import org.xml.sax.XMLReader;
* Manages a pool of XMLReader (and associated SAXParser) instances for reuse.
*/
public class XMLReaderPool {
- private final Queue<WeakReference<XMLReader>> pool = new ConcurrentLinkedQueue<WeakReference<XMLReader>>();
+ private final Queue<WeakReference<XMLReader>> pool = new ConcurrentLinkedQueue<>();
private final SAXParserFactory saxParserFactory;
/**
@@ -86,8 +86,8 @@ public class XMLReaderPool {
*/
private final class OneTimeXMLReader implements XMLReader {
private final XMLReader xmlReader;
- private final Map<String, Boolean> initFeatures = new HashMap<String, Boolean>();
- private final Map<String, Object> initProperties = new HashMap<String, Object>();
+ private final Map<String, Boolean> initFeatures = new HashMap<>();
+ private final Map<String, Object> initProperties = new HashMap<>();
private final ContentHandler initContentHandler;
private final DTDHandler initDtdHandler;
private final EntityResolver initEntityResolver;
@@ -125,7 +125,7 @@ public class XMLReaderPool {
xmlReader.setErrorHandler(initErrorHandler);
// return the wrapped instance to the pool
- pool.offer(new WeakReference<XMLReader>(xmlReader));
+ pool.offer(new WeakReference<>(xmlReader));
} finally {
readerInvalid = true;
}
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index f827f21..907f653 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -1079,7 +1079,7 @@ public class XmlConverter {
protected void setupFeatures(DocumentBuilderFactory factory) {
Properties properties = System.getProperties();
- List<String> features = new ArrayList<String>();
+ List<String> features = new ArrayList<>();
for (Map.Entry<Object, Object> prop : properties.entrySet()) {
String key = (String) prop.getKey();
if (key.startsWith(XmlConverter.DOCUMENT_BUILDER_FACTORY_FEATURE)) {
diff --git a/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java b/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
index acea1c9..1e99e68 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
@@ -182,7 +182,7 @@ public final class FileInputStreamCache extends InputStream implements StreamCac
*/
synchronized void add(FileInputStreamCache fileInputStreamCache) {
if (fileInputStreamCaches == null) {
- fileInputStreamCaches = new ArrayList<FileInputStreamCache>(3);
+ fileInputStreamCaches = new ArrayList<>(3);
}
fileInputStreamCaches.add(fileInputStreamCache);
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/CamelContextTrackerRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/CamelContextTrackerRegistry.java
index 33af5a3..fc044ad 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/CamelContextTrackerRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/CamelContextTrackerRegistry.java
@@ -36,7 +36,7 @@ public final class CamelContextTrackerRegistry {
private static final Logger LOG = LoggerFactory.getLogger(CamelContextTrackerRegistry.class);
- private final Set<CamelContextTracker> trackers = new LinkedHashSet<CamelContextTracker>();
+ private final Set<CamelContextTracker> trackers = new LinkedHashSet<>();
private CamelContextTrackerRegistry() {
// hide constructor
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java b/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
index 3b40d6d..6932968 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ComponentConfigurationSupport.java
@@ -40,7 +40,7 @@ import org.apache.camel.util.UnsafeUriCharactersEncoder;
@Deprecated
public abstract class ComponentConfigurationSupport implements ComponentConfiguration {
protected final Component component;
- private Map<String, Object> propertyValues = new HashMap<String, Object>();
+ private Map<String, Object> propertyValues = new HashMap<>();
private String baseUri;
public ComponentConfigurationSupport(Component component) {
@@ -111,7 +111,7 @@ public abstract class ComponentConfigurationSupport implements ComponentConfigur
@Override
public String getUriString() {
- List<String> queryParams = new ArrayList<String>();
+ List<String> queryParams = new ArrayList<>();
for (Map.Entry<String, Object> entry : getParameters().entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
@@ -163,7 +163,7 @@ public abstract class ComponentConfigurationSupport implements ComponentConfigur
EndpointCompleter completer = (EndpointCompleter) component;
return completer.completeEndpointPath(this, completionText);
}
- return new ArrayList<String>();
+ return new ArrayList<>();
}
public String createParameterJsonSchema() {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
index d40dbbe..05b9688 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
@@ -33,7 +33,7 @@ public class CompositeRegistry implements Registry {
private final List<Registry> registryList;
public CompositeRegistry() {
- registryList = new ArrayList<Registry>();
+ registryList = new ArrayList<>();
}
public CompositeRegistry(List<Registry> registries) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java
index bea06a7..c8dafaa 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java
@@ -49,7 +49,7 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements
private final AtomicLong maxDuration = new AtomicLong();
private final AtomicLong meanDuration = new AtomicLong();
- private final Map<Exchange, AwaitThread> inflight = new ConcurrentHashMap<Exchange, AwaitThread>();
+ private final Map<Exchange, AwaitThread> inflight = new ConcurrentHashMap<>();
private final ExchangeFormatter exchangeFormatter;
private boolean interruptThreadsWhileStopping = true;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java
index 8a1ad89..f1efa75 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultAttachment.java
@@ -108,7 +108,7 @@ public class DefaultAttachment implements Attachment {
}
private Map<String, Object> createHeaders() {
- return new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+ return new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
}
public boolean equals(Object other) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index daee1bf..6263db3 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -216,11 +216,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private ClassLoader applicationContextClassLoader;
private EndpointRegistry<EndpointKey> endpoints;
private final AtomicInteger endpointKeyCounter = new AtomicInteger();
- private final List<EndpointStrategy> endpointStrategies = new ArrayList<EndpointStrategy>();
- private final Map<String, Component> components = new ConcurrentHashMap<String, Component>();
- private final Set<Route> routes = new LinkedHashSet<Route>();
- private final List<Service> servicesToStop = new CopyOnWriteArrayList<Service>();
- private final List<StartupListener> startupListeners = new CopyOnWriteArrayList<StartupListener>();
+ private final List<EndpointStrategy> endpointStrategies = new ArrayList<>();
+ private final Map<String, Component> components = new ConcurrentHashMap<>();
+ private final Set<Route> routes = new LinkedHashSet<>();
+ private final List<Service> servicesToStop = new CopyOnWriteArrayList<>();
+ private final List<StartupListener> startupListeners = new CopyOnWriteArrayList<>();
private final DeferServiceStartupListener deferStartupListener = new DeferServiceStartupListener();
private TypeConverter typeConverter;
private TypeConverterRegistry typeConverterRegistry;
@@ -228,27 +228,27 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private ComponentResolver componentResolver;
private boolean autoCreateComponents = true;
private LanguageResolver languageResolver = new DefaultLanguageResolver();
- private final Map<String, Language> languages = new HashMap<String, Language>();
+ private final Map<String, Language> languages = new HashMap<>();
private Registry registry;
- private List<LifecycleStrategy> lifecycleStrategies = new CopyOnWriteArrayList<LifecycleStrategy>();
+ private List<LifecycleStrategy> lifecycleStrategies = new CopyOnWriteArrayList<>();
private ManagementStrategy managementStrategy;
private ManagementMBeanAssembler managementMBeanAssembler;
- private final List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
- private final List<RestDefinition> restDefinitions = new ArrayList<RestDefinition>();
+ private final List<RouteDefinition> routeDefinitions = new ArrayList<>();
+ private final List<RestDefinition> restDefinitions = new ArrayList<>();
private Map<String, RestConfiguration> restConfigurations = new ConcurrentHashMap<>();
private Map<String, ServiceCallConfigurationDefinition> serviceCallConfigurations = new ConcurrentHashMap<>();
private Map<String, HystrixConfigurationDefinition> hystrixConfigurations = new ConcurrentHashMap<>();
private RestRegistry restRegistry = new DefaultRestRegistry();
- private List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
- private List<RoutePolicyFactory> routePolicyFactories = new ArrayList<RoutePolicyFactory>();
+ private List<InterceptStrategy> interceptStrategies = new ArrayList<>();
+ private List<RoutePolicyFactory> routePolicyFactories = new ArrayList<>();
private Set<LogListener> logListeners = new LinkedHashSet<>();
private HeadersMapFactory headersMapFactory = new DefaultHeadersMapFactory();
// special flags to control the first startup which can are special
private volatile boolean firstStartDone;
private volatile boolean doNotStartRoutesOnFirstStart;
- private final ThreadLocal<Boolean> isStartingRoutes = new ThreadLocal<Boolean>();
- private final ThreadLocal<Boolean> isSetupRoutes = new ThreadLocal<Boolean>();
+ private final ThreadLocal<Boolean> isStartingRoutes = new ThreadLocal<>();
+ private final ThreadLocal<Boolean> isSetupRoutes = new ThreadLocal<>();
private Boolean autoStartup = Boolean.TRUE;
private Boolean trace = Boolean.FALSE;
private Boolean messageHistory = Boolean.TRUE;
@@ -268,16 +268,16 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private ErrorHandlerFactory errorHandlerBuilder;
private final Object errorHandlerExecutorServiceLock = new Object();
private ScheduledExecutorService errorHandlerExecutorService;
- private Map<String, DataFormatDefinition> dataFormats = new HashMap<String, DataFormatDefinition>();
+ private Map<String, DataFormatDefinition> dataFormats = new HashMap<>();
private DataFormatResolver dataFormatResolver = new DefaultDataFormatResolver();
- private Map<String, String> globalOptions = new HashMap<String, String>();
+ private Map<String, String> globalOptions = new HashMap<>();
private FactoryFinderResolver factoryFinderResolver = new DefaultFactoryFinderResolver();
private FactoryFinder defaultFactoryFinder;
private PropertiesComponent propertiesComponent;
private StreamCachingStrategy streamCachingStrategy;
- private final Map<String, FactoryFinder> factories = new HashMap<String, FactoryFinder>();
- private final Map<String, RouteService> routeServices = new LinkedHashMap<String, RouteService>();
- private final Map<String, RouteService> suspendedRouteServices = new LinkedHashMap<String, RouteService>();
+ private final Map<String, FactoryFinder> factories = new HashMap<>();
+ private final Map<String, RouteService> routeServices = new LinkedHashMap<>();
+ private final Map<String, RouteService> suspendedRouteServices = new LinkedHashMap<>();
private ClassResolver classResolver = new DefaultClassResolver(this);
private PackageScanClassResolver packageScanClassResolver;
// we use a capacity of 100 per endpoint, so for the same endpoint we have at most 100 producers in the pool
@@ -293,7 +293,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private InflightRepository inflightRepository = new DefaultInflightRepository();
private AsyncProcessorAwaitManager asyncProcessorAwaitManager = new DefaultAsyncProcessorAwaitManager();
private RuntimeEndpointRegistry runtimeEndpointRegistry;
- private final List<RouteStartupOrder> routeStartupOrder = new ArrayList<RouteStartupOrder>();
+ private final List<RouteStartupOrder> routeStartupOrder = new ArrayList<>();
// start auto assigning route ids using numbering 1000 and upwards
private int defaultRouteStartupOrder = 1000;
private ShutdownStrategy shutdownStrategy = new DefaultShutdownStrategy(this);
@@ -601,11 +601,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public Collection<Endpoint> getEndpoints() {
- return new ArrayList<Endpoint>(endpoints.values());
+ return new ArrayList<>(endpoints.values());
}
public Map<String, Endpoint> getEndpointMap() {
- Map<String, Endpoint> answer = new TreeMap<String, Endpoint>();
+ Map<String, Endpoint> answer = new TreeMap<>();
for (Map.Entry<EndpointKey, Endpoint> entry : endpoints.entrySet()) {
answer.put(entry.getKey().get(), entry.getValue());
}
@@ -637,7 +637,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public Collection<Endpoint> removeEndpoints(String uri) throws Exception {
- Collection<Endpoint> answer = new ArrayList<Endpoint>();
+ Collection<Endpoint> answer = new ArrayList<>();
Endpoint oldEndpoint = endpoints.remove(getEndpointKey(uri));
if (oldEndpoint != null) {
answer.add(oldEndpoint);
@@ -893,7 +893,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
return Collections.emptyList();
} else {
synchronized (routes) {
- return new ArrayList<Route>(routes);
+ return new ArrayList<>(routes);
}
}
}
@@ -1141,7 +1141,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// must ensure route is prepared, before we can start it
route.prepare(this);
- List<Route> routes = new ArrayList<Route>();
+ List<Route> routes = new ArrayList<>();
List<RouteContext> routeContexts = route.addRoutes(this, routes);
RouteService routeService = new RouteService(this, route, routeContexts, routes);
startRouteService(routeService, true);
@@ -1238,7 +1238,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
try {
- List<RouteStartupOrder> routes = new ArrayList<RouteStartupOrder>(1);
+ List<RouteStartupOrder> routes = new ArrayList<>(1);
RouteStartupOrder order = new DefaultRouteStartupOrder(1, routeService.getRoutes().iterator().next(), routeService);
routes.add(order);
@@ -1258,7 +1258,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
try {
- List<RouteStartupOrder> routes = new ArrayList<RouteStartupOrder>(1);
+ List<RouteStartupOrder> routes = new ArrayList<>(1);
RouteStartupOrder order = new DefaultRouteStartupOrder(1, routeService.getRoutes().iterator().next(), routeService);
routes.add(order);
@@ -1278,7 +1278,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
try {
- List<RouteStartupOrder> routes = new ArrayList<RouteStartupOrder>(1);
+ List<RouteStartupOrder> routes = new ArrayList<>(1);
RouteStartupOrder order = new DefaultRouteStartupOrder(1, routeService.getRoutes().iterator().next(), routeService);
routes.add(order);
@@ -1298,7 +1298,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
try {
- List<RouteStartupOrder> routes = new ArrayList<RouteStartupOrder>(1);
+ List<RouteStartupOrder> routes = new ArrayList<>(1);
RouteStartupOrder order = new DefaultRouteStartupOrder(1, routeService.getRoutes().iterator().next(), routeService);
routes.add(order);
@@ -1323,7 +1323,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// gather a map of all the endpoints in use by the routes, so we can known if a given endpoints is in use
// by one or more routes, when we remove the route
- Map<String, Set<Endpoint>> endpointsInUse = new HashMap<String, Set<Endpoint>>();
+ Map<String, Set<Endpoint>> endpointsInUse = new HashMap<>();
for (Map.Entry<String, RouteService> entry : routeServices.entrySet()) {
endpointsInUse.put(entry.getKey(), entry.getValue().gatherEndpoints());
}
@@ -1347,7 +1347,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// from the route which we have removed, then remove all its private endpoints
// (eg the endpoints which are not in use by other routes)
- Set<Endpoint> toRemove = new LinkedHashSet<Endpoint>();
+ Set<Endpoint> toRemove = new LinkedHashSet<>();
for (Endpoint endpoint : endpointsInUse.get(routeId)) {
// how many times is the endpoint in use
int count = 0;
@@ -1390,7 +1390,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
- List<RouteStartupOrder> routes = new ArrayList<RouteStartupOrder>(1);
+ List<RouteStartupOrder> routes = new ArrayList<>(1);
Route route = routeService.getRoutes().iterator().next();
RouteStartupOrder order = new DefaultRouteStartupOrder(1, route, routeService);
routes.add(order);
@@ -1420,7 +1420,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
- List<RouteStartupOrder> routes = new ArrayList<RouteStartupOrder>(1);
+ List<RouteStartupOrder> routes = new ArrayList<>(1);
Route route = routeService.getRoutes().iterator().next();
RouteStartupOrder order = new DefaultRouteStartupOrder(1, route, routeService);
routes.add(order);
@@ -1805,10 +1805,10 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("properties", json, true);
// selected rows to use for answer
- Map<String, String[]> selected = new LinkedHashMap<String, String[]>();
+ Map<String, String[]> selected = new LinkedHashMap<>();
// extract options from the node
- Map<String, Object> options = new LinkedHashMap<String, Object>();
+ Map<String, Object> options = new LinkedHashMap<>();
IntrospectionSupport.getProperties(target, options, "", false);
// remove outputs which we do not want to include
options.remove("outputs");
@@ -1933,11 +1933,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("properties", json, true);
// selected rows to use for answer
- Map<String, String[]> selected = new LinkedHashMap<String, String[]>();
- Map<String, String[]> dataFormatOptions = new LinkedHashMap<String, String[]>();
+ Map<String, String[]> selected = new LinkedHashMap<>();
+ Map<String, String[]> dataFormatOptions = new LinkedHashMap<>();
// extract options from the data format
- Map<String, Object> options = new LinkedHashMap<String, Object>();
+ Map<String, Object> options = new LinkedHashMap<>();
IntrospectionSupport.getProperties(dataFormat, options, "", false);
for (Map.Entry<String, Object> entry : options.entrySet()) {
@@ -2092,11 +2092,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("componentProperties", json, true);
// selected rows to use for answer
- Map<String, String[]> selected = new LinkedHashMap<String, String[]>();
+ Map<String, String[]> selected = new LinkedHashMap<>();
// insert values from component
Component component = getComponent(componentName);
- Map<String, Object> options = new HashMap<String, Object>();
+ Map<String, Object> options = new HashMap<>();
IntrospectionSupport.getProperties(component, options, null);
for (Map.Entry<String, Object> entry : options.entrySet()) {
@@ -2252,8 +2252,8 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("properties", json, true);
// selected rows to use for answer
- Map<String, String[]> selected = new LinkedHashMap<String, String[]>();
- Map<String, String[]> uriOptions = new LinkedHashMap<String, String[]>();
+ Map<String, String[]> selected = new LinkedHashMap<>();
+ Map<String, String[]> uriOptions = new LinkedHashMap<>();
// insert values from uri
Map<String, Object> options = EndpointHelper.endpointProperties(this, uri);
@@ -2414,7 +2414,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public String createRouteStaticEndpointJson(String routeId, boolean includeDynamic) {
- List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> routes = new ArrayList<>();
if (routeId != null) {
RouteDefinition route = getRouteDefinition(routeId);
if (route == null) {
@@ -3068,7 +3068,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
// assemble list of startup ordering so routes can be shutdown accordingly
- List<RouteStartupOrder> orders = new ArrayList<RouteStartupOrder>();
+ List<RouteStartupOrder> orders = new ArrayList<>();
for (Map.Entry<String, RouteService> entry : suspendedRouteServices.entrySet()) {
Route route = entry.getValue().getRoutes().iterator().next();
Integer order = entry.getValue().getRouteDefinition().getStartupOrder();
@@ -3615,7 +3615,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
isStartingRoutes.set(true);
try {
// filter out already started routes
- Map<String, RouteService> filtered = new LinkedHashMap<String, RouteService>();
+ Map<String, RouteService> filtered = new LinkedHashMap<>();
for (Map.Entry<String, RouteService> entry : routeServices.entrySet()) {
boolean startable = false;
@@ -3679,7 +3679,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private void shutdownServices(Collection<?> services, boolean reverse) {
Collection<?> list = services;
if (reverse) {
- List<Object> reverseList = new ArrayList<Object>(services);
+ List<Object> reverseList = new ArrayList<>(services);
Collections.reverse(reverseList);
list = reverseList;
}
@@ -3840,7 +3840,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
boolean addingRoutes, Collection<RouteService> routeServices) throws Exception {
// list of inputs to start when all the routes have been prepared for starting
// we use a tree map so the routes will be ordered according to startup order defined on the route
- Map<Integer, DefaultRouteStartupOrder> inputs = new TreeMap<Integer, DefaultRouteStartupOrder>();
+ Map<Integer, DefaultRouteStartupOrder> inputs = new TreeMap<>();
// figure out the order in which the routes should be started
for (RouteService routeService : routeServices) {
@@ -3959,7 +3959,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
private void doStartOrResumeRouteConsumers(Map<Integer, DefaultRouteStartupOrder> inputs, boolean resumeOnly, boolean addingRoute) throws Exception {
- List<Endpoint> routeInputs = new ArrayList<Endpoint>();
+ List<Endpoint> routeInputs = new ArrayList<>();
for (Map.Entry<Integer, DefaultRouteStartupOrder> entry : inputs.entrySet()) {
Integer order = entry.getKey();
@@ -3985,7 +3985,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// check for multiple consumer violations with existing routes which
// have already been started, or is currently starting
- List<Endpoint> existingEndpoints = new ArrayList<Endpoint>();
+ List<Endpoint> existingEndpoints = new ArrayList<>();
for (Route existingRoute : getRoutes()) {
if (route.getId().equals(existingRoute.getId())) {
// skip ourselves
@@ -4282,7 +4282,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public List<String> getComponentNames() {
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
for (String name : components.keySet()) {
answer.add(name);
}
@@ -4291,7 +4291,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
public List<String> getLanguageNames() {
synchronized (languages) {
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
for (String name : languages.keySet()) {
answer.add(name);
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentConfiguration.java
index 0cc0ff2..5ea605f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentConfiguration.java
@@ -69,7 +69,7 @@ public class DefaultComponentConfiguration extends ComponentConfigurationSupport
*/
@Override
public SortedMap<String, ParameterConfiguration> getParameterConfigurationMap() {
- SortedMap<String, ParameterConfiguration> answer = new TreeMap<String, ParameterConfiguration>();
+ SortedMap<String, ParameterConfiguration> answer = new TreeMap<>();
Set<Map.Entry<String, Object>> entries = getParameters().entrySet();
for (Map.Entry<String, Object> entry : entries) {
String name = entry.getKey();
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
index aa0dec1..5d8b6ad 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
@@ -57,9 +57,9 @@ public class DefaultDebugger implements Debugger, CamelContextAware {
private static final Logger LOG = LoggerFactory.getLogger(DefaultDebugger.class);
private final EventNotifier debugEventNotifier = new DebugEventNotifier();
- private final List<BreakpointConditions> breakpoints = new CopyOnWriteArrayList<BreakpointConditions>();
+ private final List<BreakpointConditions> breakpoints = new CopyOnWriteArrayList<>();
private final int maxConcurrentSingleSteps = 1;
- private final Map<String, Breakpoint> singleSteps = new HashMap<String, Breakpoint>(maxConcurrentSingleSteps);
+ private final Map<String, Breakpoint> singleSteps = new HashMap<>(maxConcurrentSingleSteps);
private CamelContext camelContext;
private boolean useTracer = true;
@@ -201,7 +201,7 @@ public class DefaultDebugger implements Debugger, CamelContextAware {
@Override
public List<Breakpoint> getBreakpoints() {
- List<Breakpoint> answer = new ArrayList<Breakpoint>(breakpoints.size());
+ List<Breakpoint> answer = new ArrayList<>(breakpoints.size());
for (BreakpointConditions e : breakpoints) {
answer.add(e.getBreakpoint());
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
index 3a3dc07..371edf3 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
@@ -476,7 +476,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
public Map<String, Object> getConsumerProperties() {
if (consumerProperties == null) {
// must create empty if none exists
- consumerProperties = new HashMap<String, Object>();
+ consumerProperties = new HashMap<>();
}
return consumerProperties;
}
@@ -485,7 +485,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
// append consumer properties
if (consumerProperties != null && !consumerProperties.isEmpty()) {
if (this.consumerProperties == null) {
- this.consumerProperties = new HashMap<String, Object>(consumerProperties);
+ this.consumerProperties = new HashMap<>(consumerProperties);
} else {
this.consumerProperties.putAll(consumerProperties);
}
@@ -501,7 +501,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
if (consumerProperties != null) {
// use a defensive copy of the consumer properties as the methods below will remove the used properties
// and in case we restart routes, we need access to the original consumer properties again
- Map<String, Object> copy = new HashMap<String, Object>(consumerProperties);
+ Map<String, Object> copy = new HashMap<>(consumerProperties);
// set reference properties first as they use # syntax that fools the regular properties setter
EndpointHelper.setReferenceProperties(getCamelContext(), consumer, copy);
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
index 71175a4..7a230b4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
@@ -43,7 +43,7 @@ public class DefaultEndpointRegistry extends LRUCache<EndpointKey, Endpoint> imp
// do not stop on eviction, as the endpoint may still be in use
super(CamelContextHelper.getMaximumEndpointCacheSize(context), CamelContextHelper.getMaximumEndpointCacheSize(context), false);
// static map to hold endpoints we do not want to be evicted
- this.staticMap = new ConcurrentHashMap<EndpointKey, Endpoint>();
+ this.staticMap = new ConcurrentHashMap<>();
this.context = context;
}
@@ -150,7 +150,7 @@ public class DefaultEndpointRegistry extends LRUCache<EndpointKey, Endpoint> imp
@Override
public Set<EndpointKey> keySet() {
- Set<EndpointKey> answer = new LinkedHashSet<EndpointKey>();
+ Set<EndpointKey> answer = new LinkedHashSet<>();
answer.addAll(staticMap.keySet());
answer.addAll(super.keySet());
return answer;
@@ -158,7 +158,7 @@ public class DefaultEndpointRegistry extends LRUCache<EndpointKey, Endpoint> imp
@Override
public Collection<Endpoint> values() {
- Collection<Endpoint> answer = new ArrayList<Endpoint>();
+ Collection<Endpoint> answer = new ArrayList<>();
answer.addAll(staticMap.values());
answer.addAll(super.values());
return answer;
@@ -166,7 +166,7 @@ public class DefaultEndpointRegistry extends LRUCache<EndpointKey, Endpoint> imp
@Override
public Set<Entry<EndpointKey, Endpoint>> entrySet() {
- Set<Entry<EndpointKey, Endpoint>> answer = new LinkedHashSet<Entry<EndpointKey, Endpoint>>();
+ Set<Entry<EndpointKey, Endpoint>> answer = new LinkedHashSet<>();
answer.addAll(staticMap.entrySet());
answer.addAll(super.entrySet());
return answer;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
index cccbc72..fc50df1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
@@ -494,7 +494,7 @@ public final class DefaultExchange implements Exchange {
// unit of work not yet registered so we store the on completion temporary
// until the unit of work is assigned to this exchange by the unit of work
if (onCompletions == null) {
- onCompletions = new ArrayList<Synchronization>();
+ onCompletions = new ArrayList<>();
}
onCompletions.add(onCompletion);
} else {
@@ -529,7 +529,7 @@ public final class DefaultExchange implements Exchange {
public List<Synchronization> handoverCompletions() {
List<Synchronization> answer = null;
if (onCompletions != null) {
- answer = new ArrayList<Synchronization>(onCompletions);
+ answer = new ArrayList<>(onCompletions);
onCompletions.clear();
onCompletions = null;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
index 003e7f6..681ff4c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
@@ -212,7 +212,7 @@ public class DefaultExchangeHolder implements Serializable {
return;
}
if (payload.properties == null) {
- payload.properties = new LinkedHashMap<String, Object>();
+ payload.properties = new LinkedHashMap<>();
}
payload.properties.put(key, property);
}
@@ -229,7 +229,7 @@ public class DefaultExchangeHolder implements Serializable {
if (exchange.getIn().hasHeaders()) {
Map<String, Object> map = checkValidHeaderObjects("in headers", exchange, exchange.getIn().getHeaders(), allowSerializedHeaders);
if (map != null && !map.isEmpty()) {
- inHeaders = new LinkedHashMap<String, Object>(map);
+ inHeaders = new LinkedHashMap<>(map);
}
}
return null;
@@ -239,7 +239,7 @@ public class DefaultExchangeHolder implements Serializable {
if (exchange.hasOut() && exchange.getOut().hasHeaders()) {
Map<String, Object> map = checkValidHeaderObjects("out headers", exchange, exchange.getOut().getHeaders(), allowSerializedHeaders);
if (map != null && !map.isEmpty()) {
- outHeaders = new LinkedHashMap<String, Object>(map);
+ outHeaders = new LinkedHashMap<>(map);
}
}
return null;
@@ -249,7 +249,7 @@ public class DefaultExchangeHolder implements Serializable {
if (exchange.hasProperties()) {
Map<String, Object> map = checkValidExchangePropertyObjects("properties", exchange, exchange.getProperties(), allowSerializedHeaders);
if (map != null && !map.isEmpty()) {
- properties = new LinkedHashMap<String, Object>(map);
+ properties = new LinkedHashMap<>(map);
}
}
return null;
@@ -274,7 +274,7 @@ public class DefaultExchangeHolder implements Serializable {
return null;
}
- Map<String, Object> result = new LinkedHashMap<String, Object>();
+ Map<String, Object> result = new LinkedHashMap<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
// silently skip any values which is null
@@ -303,7 +303,7 @@ public class DefaultExchangeHolder implements Serializable {
return null;
}
- Map<String, Object> result = new LinkedHashMap<String, Object>();
+ Map<String, Object> result = new LinkedHashMap<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
// silently skip any values which is null
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
index 7697cfb..bf87c6e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
@@ -38,7 +38,7 @@ import org.apache.camel.util.IOHelper;
*/
public class DefaultFactoryFinder implements FactoryFinder {
- private final ConcurrentMap<String, Class<?>> classMap = new ConcurrentHashMap<String, Class<?>>();
+ private final ConcurrentMap<String, Class<?>> classMap = new ConcurrentHashMap<>();
private final ClassResolver classResolver;
private final String path;
@@ -64,7 +64,7 @@ public class DefaultFactoryFinder implements FactoryFinder {
@Override
public <T> List<T> newInstances(String key, Injector injector, Class<T> type) throws ClassNotFoundException, IOException {
List<Class<T>> list = CastUtils.cast(findClasses(key));
- List<T> answer = new ArrayList<T>(list.size());
+ List<T> answer = new ArrayList<>(list.size());
answer.add(newInstance(key, injector, type));
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
index 9652af6..c11a4c4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
@@ -67,7 +67,7 @@ public class DefaultHeaderFilterStrategy implements HeaderFilterStrategy {
*/
public Set<String> getOutFilter() {
if (outFilter == null) {
- outFilter = new HashSet<String>();
+ outFilter = new HashSet<>();
}
return outFilter;
@@ -119,7 +119,7 @@ public class DefaultHeaderFilterStrategy implements HeaderFilterStrategy {
*/
public Set<String> getInFilter() {
if (inFilter == null) {
- inFilter = new HashSet<String>();
+ inFilter = new HashSet<>();
}
return inFilter;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
index de693b4..7f079ac 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
@@ -44,8 +44,8 @@ import org.slf4j.LoggerFactory;
public class DefaultInflightRepository extends ServiceSupport implements InflightRepository {
private static final Logger LOG = LoggerFactory.getLogger(DefaultInflightRepository.class);
- private final ConcurrentMap<String, Exchange> inflight = new ConcurrentHashMap<String, Exchange>();
- private final ConcurrentMap<String, AtomicInteger> routeCount = new ConcurrentHashMap<String, AtomicInteger>();
+ private final ConcurrentMap<String, Exchange> inflight = new ConcurrentHashMap<>();
+ private final ConcurrentMap<String, AtomicInteger> routeCount = new ConcurrentHashMap<>();
public void add(Exchange exchange) {
inflight.put(exchange.getExchangeId(), exchange);
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
index e226de0..7440433 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
@@ -192,7 +192,7 @@ public class DefaultMessage extends MessageSupport {
boolean matches = false;
// must use a set to store the keys to remove as we cannot walk using entrySet and remove at the same time
// due concurrent modification error
- Set<String> toRemove = new HashSet<String>();
+ Set<String> toRemove = new HashSet<>();
for (Map.Entry<String, Object> entry : headers.entrySet()) {
String key = entry.getKey();
if (EndpointHelper.matchPattern(key, pattern)) {
@@ -266,7 +266,7 @@ public class DefaultMessage extends MessageSupport {
* @return return a newly constructed Map
*/
protected Map<String, Attachment> createAttachments() {
- Map<String, Attachment> map = new LinkedHashMap<String, Attachment>();
+ Map<String, Attachment> map = new LinkedHashMap<>();
populateInitialAttachments(map);
return map;
}
@@ -365,7 +365,7 @@ public class DefaultMessage extends MessageSupport {
// this way setAttachments(getAttachments()) will tunnel attachment headers
this.attachmentObjects = ((AttachmentMap)attachments).getOriginalMap();
} else {
- this.attachmentObjects = new LinkedHashMap<String, Attachment>();
+ this.attachmentObjects = new LinkedHashMap<>();
for (Map.Entry<String, DataHandler> entry : attachments.entrySet()) {
this.attachmentObjects.put(entry.getKey(), new DefaultAttachment(entry.getValue()));
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
index be3a127..90acc52 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
@@ -30,7 +30,7 @@ import org.apache.camel.spi.NodeIdFactory;
*/
public class DefaultNodeIdFactory implements NodeIdFactory {
- protected static Map<String, AtomicInteger> nodeCounters = new HashMap<String, AtomicInteger>();
+ protected static Map<String, AtomicInteger> nodeCounters = new HashMap<>();
public String createId(NamedNode definition) {
String key = definition.getShortName();
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
index 03a7916..1d698e9 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
public class DefaultPackageScanClassResolver extends ServiceSupport implements PackageScanClassResolver, StaticService, NonManagedService {
protected final Logger log = LoggerFactory.getLogger(getClass());
- private final Set<ClassLoader> classLoaders = new LinkedHashSet<ClassLoader>();
+ private final Set<ClassLoader> classLoaders = new LinkedHashSet<>();
private Map<String, List<String>> jarCache;
private Set<PackageScanFilter> scanFilters;
private String[] acceptableSchemes = {};
@@ -84,7 +84,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
public void addFilter(PackageScanFilter filter) {
if (scanFilters == null) {
- scanFilters = new LinkedHashSet<PackageScanFilter>();
+ scanFilters = new LinkedHashSet<>();
}
scanFilters.add(filter);
}
@@ -114,7 +114,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
public Set<ClassLoader> getClassLoaders() {
// return a new set to avoid any concurrency issues in other runtimes such as OSGi
- return Collections.unmodifiableSet(new LinkedHashSet<ClassLoader>(classLoaders));
+ return Collections.unmodifiableSet(new LinkedHashSet<>(classLoaders));
}
public void setClassLoaders(Set<ClassLoader> classLoaders) {
@@ -132,7 +132,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
}
PackageScanFilter test = getCompositeFilter(new AnnotatedWithPackageScanFilter(annotation, true));
- Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+ Set<Class<?>> classes = new LinkedHashSet<>();
for (String pkg : packageNames) {
find(test, pkg, classes);
}
@@ -152,7 +152,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
}
PackageScanFilter test = getCompositeFilter(new AnnotatedWithAnyPackageScanFilter(annotations, true));
- Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+ Set<Class<?>> classes = new LinkedHashSet<>();
for (String pkg : packageNames) {
find(test, pkg, classes);
}
@@ -172,7 +172,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
}
PackageScanFilter test = getCompositeFilter(new AssignableToPackageScanFilter(parent));
- Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+ Set<Class<?>> classes = new LinkedHashSet<>();
for (String pkg : packageNames) {
find(test, pkg, classes);
}
@@ -187,7 +187,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
return Collections.emptySet();
}
- Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+ Set<Class<?>> classes = new LinkedHashSet<>();
for (String pkg : packageNames) {
find(filter, pkg, classes);
}
@@ -416,7 +416,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
* @return all the .class entries from the JAR
*/
protected List<String> doLoadJarClassEntries(InputStream stream, String urlPath) {
- List<String> entries = new ArrayList<String>();
+ List<String> entries = new ArrayList<>();
JarInputStream jarStream = null;
try {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
index 04a827d..a2d9707 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
@@ -43,7 +43,7 @@ import org.apache.camel.util.ObjectHelper;
public class DefaultRestRegistry extends ServiceSupport implements StaticService, RestRegistry, CamelContextAware {
private CamelContext camelContext;
- private final Map<Consumer, RestService> registry = new LinkedHashMap<Consumer, RestService>();
+ private final Map<Consumer, RestService> registry = new LinkedHashMap<>();
private transient Producer apiProducer;
public void addRestService(Consumer consumer, String url, String baseUrl, String basePath, String uriTemplate, String method,
@@ -58,7 +58,7 @@ public class DefaultRestRegistry extends ServiceSupport implements StaticService
@Override
public List<RestRegistry.RestService> listAllRestServices() {
- return new ArrayList<RestService>(registry.values());
+ return new ArrayList<>(registry.values());
}
@Override
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
index edf9a8a..d67c8cc 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
@@ -41,8 +41,8 @@ import org.apache.camel.util.TimeUtils;
public abstract class DefaultRoute extends ServiceSupport implements Route {
private final Endpoint endpoint;
- private final Map<String, Object> properties = new HashMap<String, Object>();
- private final List<Service> services = new ArrayList<Service>();
+ private final Map<String, Object> properties = new HashMap<>();
+ private final List<Service> services = new ArrayList<>();
private final RouteContext routeContext;
private Date startDate;
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 869b660..faff06e 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
@@ -52,14 +52,14 @@ import org.apache.camel.util.ObjectHelper;
* @version
*/
public class DefaultRouteContext implements RouteContext {
- private final Map<ProcessorDefinition<?>, AtomicInteger> nodeIndex = new HashMap<ProcessorDefinition<?>, AtomicInteger>();
+ private final Map<ProcessorDefinition<?>, AtomicInteger> nodeIndex = new HashMap<>();
private final RouteDefinition route;
private FromDefinition from;
private final Collection<Route> routes;
private Endpoint endpoint;
- private final List<Processor> eventDrivenProcessors = new ArrayList<Processor>();
+ private final List<Processor> eventDrivenProcessors = new ArrayList<>();
private CamelContext camelContext;
- private List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
+ private List<InterceptStrategy> interceptStrategies = new ArrayList<>();
private InterceptStrategy managedInterceptStrategy;
private boolean routeAdded;
private Boolean trace;
@@ -70,7 +70,7 @@ public class DefaultRouteContext implements RouteContext {
private Boolean handleFault;
private Long delay;
private Boolean autoStartup = Boolean.TRUE;
- private List<RoutePolicy> routePolicyList = new ArrayList<RoutePolicy>();
+ private List<RoutePolicy> routePolicyList = new ArrayList<>();
private ShutdownRoute shutdownRoute;
private ShutdownRunningTask shutdownRunningTask;
private RouteError routeError;
@@ -88,7 +88,7 @@ public class DefaultRouteContext implements RouteContext {
*/
public DefaultRouteContext(CamelContext camelContext) {
this.camelContext = camelContext;
- this.routes = new ArrayList<Route>();
+ this.routes = new ArrayList<>();
this.route = new RouteDefinition("temporary");
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
index 4eb0e54..0c73112 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
@@ -52,7 +52,7 @@ public class DefaultRouteStartupOrder implements RouteStartupOrder {
}
public List<Consumer> getInputs() {
- List<Consumer> answer = new ArrayList<Consumer>();
+ List<Consumer> answer = new ArrayList<>();
Map<Route, Consumer> inputs = routeService.getInputs();
for (Consumer consumer : inputs.values()) {
answer.add(consumer);
@@ -61,7 +61,7 @@ public class DefaultRouteStartupOrder implements RouteStartupOrder {
}
public List<Service> getServices() {
- List<Service> answer = new ArrayList<Service>();
+ List<Service> answer = new ArrayList<>();
Collection<Route> routes = routeService.getRoutes();
for (Route route : routes) {
answer.addAll(route.getServices());
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
index 2bd652c..17050a2 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
@@ -73,7 +73,7 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
@Override
public List<String> getAllEndpoints(boolean includeInputs) {
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
if (includeInputs) {
for (Map.Entry<String, Set<String>> entry : inputs.entrySet()) {
answer.addAll(entry.getValue());
@@ -87,7 +87,7 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
@Override
public List<String> getEndpointsPerRoute(String routeId, boolean includeInputs) {
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
if (includeInputs) {
Set<String> uris = inputs.get(routeId);
if (uris != null) {
@@ -103,7 +103,7 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
@Override
public List<Statistic> getEndpointStatistics() {
- List<Statistic> answer = new ArrayList<Statistic>();
+ List<Statistic> answer = new ArrayList<>();
// inputs
for (Map.Entry<String, Set<String>> entry : inputs.entrySet()) {
@@ -184,10 +184,10 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
ObjectHelper.notNull(camelContext, "camelContext", this);
if (inputs == null) {
- inputs = new HashMap<String, Set<String>>();
+ inputs = new HashMap<>();
}
if (outputs == null) {
- outputs = new HashMap<String, Map<String, String>>();
+ outputs = new HashMap<>();
}
if (getCamelContext().getManagementStrategy().getManagementAgent() != null) {
extended = getCamelContext().getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended();
@@ -219,7 +219,7 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
String routeId = rse.getRoute().getId();
// a HashSet is fine for inputs as we only have a limited number of those
- Set<String> uris = new HashSet<String>();
+ Set<String> uris = new HashSet<>();
uris.add(endpoint.getEndpointUri());
inputs.put(routeId, uris);
// use a LRUCache for outputs as we could potential have unlimited uris if dynamic routing is in use
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
index 9f086ce..f2b2093 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
@@ -40,7 +40,7 @@ public class DefaultScheduledPollConsumerScheduler extends org.apache.camel.supp
private Consumer consumer;
private ScheduledExecutorService scheduledExecutorService;
private boolean shutdownExecutor;
- private volatile List<ScheduledFuture<?>> futures = new ArrayList<ScheduledFuture<?>>();
+ private volatile List<ScheduledFuture<?>> futures = new ArrayList<>();
private Runnable task;
private int concurrentTasks = 1;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
index bb54e87..fdb928e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultServicePool.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
@Deprecated
public abstract class DefaultServicePool<Key, Service> extends ServiceSupport implements ServicePool<Key, Service> {
protected final Logger log = LoggerFactory.getLogger(getClass());
- protected final ConcurrentMap<Key, BlockingQueue<Service>> pool = new ConcurrentHashMap<Key, BlockingQueue<Service>>();
+ protected final ConcurrentMap<Key, BlockingQueue<Service>> pool = new ConcurrentHashMap<>();
protected int capacity = 100;
protected DefaultServicePool() {
@@ -66,7 +66,7 @@ public abstract class DefaultServicePool<Key, Service> extends ServiceSupport im
public synchronized Service addAndAcquire(Key key, Service service) {
BlockingQueue<Service> entry = pool.get(key);
if (entry == null) {
- entry = new ArrayBlockingQueue<Service>(capacity);
+ entry = new ArrayBlockingQueue<>(capacity);
pool.put(key, entry);
}
log.trace("AddAndAcquire key: {} service: {}", key, service);
@@ -109,7 +109,7 @@ public abstract class DefaultServicePool<Key, Service> extends ServiceSupport im
protected void doStop() throws Exception {
log.debug("Stopping service pool: {}", this);
for (BlockingQueue<Service> entry : pool.values()) {
- Collection<Service> values = new ArrayList<Service>();
+ Collection<Service> values = new ArrayList<>();
entry.drainTo(values);
ServiceHelper.stopServices(values);
entry.clear();
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index 34e6207..14f701f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -154,7 +154,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
}
public boolean shutdown(CamelContext context, RouteStartupOrder route, long timeout, TimeUnit timeUnit, boolean abortAfterTimeout) throws Exception {
- List<RouteStartupOrder> routes = new ArrayList<RouteStartupOrder>(1);
+ List<RouteStartupOrder> routes = new ArrayList<>(1);
routes.add(route);
return doShutdown(context, routes, timeout, timeUnit, false, abortAfterTimeout, false);
}
@@ -179,7 +179,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
StopWatch watch = new StopWatch();
// at first sort according to route startup order
- List<RouteStartupOrder> routesOrdered = new ArrayList<RouteStartupOrder>(routes);
+ List<RouteStartupOrder> routesOrdered = new ArrayList<>(routes);
routesOrdered.sort(new Comparator<RouteStartupOrder>() {
public int compare(RouteStartupOrder o1, RouteStartupOrder o2) {
return o1.getStartupOrder() - o2.getStartupOrder();
@@ -453,7 +453,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// include error handlers as we want to prepare them for shutdown as well
list = ServiceHelper.getChildServices(service, true);
} else {
- list = new LinkedHashSet<Service>(1);
+ list = new LinkedHashSet<>(1);
list.add(service);
}
@@ -532,7 +532,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// list of deferred consumers to shutdown when all exchanges has been completed routed
// and thus there are no more inflight exchanges so they can be safely shutdown at that time
- List<ShutdownDeferredConsumer> deferredConsumers = new ArrayList<ShutdownDeferredConsumer>();
+ List<ShutdownDeferredConsumer> deferredConsumers = new ArrayList<>();
for (RouteStartupOrder order : routes) {
ShutdownRoute shutdownRoute = order.getRoute().getRouteContext().getShutdownRoute();
@@ -603,7 +603,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
while (!done && !timeoutOccurred.get()) {
int size = 0;
// number of inflights per route
- final Map<String, Integer> routeInflight = new LinkedHashMap<String, Integer>();
+ final Map<String, Integer> routeInflight = new LinkedHashMap<>();
for (RouteStartupOrder order : routes) {
int inflight = context.getInflightRepository().size(order.getRoute().getId());
@@ -726,11 +726,11 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
}
// filter so inflight must start from any of the routes
- Set<String> routeIds = new HashSet<String>();
+ Set<String> routeIds = new HashSet<>();
for (RouteStartupOrder route : routes) {
routeIds.add(route.getRoute().getId());
}
- Collection<InflightRepository.InflightExchange> filtered = new ArrayList<InflightRepository.InflightExchange>();
+ Collection<InflightRepository.InflightExchange> filtered = new ArrayList<>();
for (InflightRepository.InflightExchange inflight : inflights) {
String routeId = inflight.getExchange().getFromRouteId();
if (routeIds.contains(routeId)) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
index 8a77af4..00e7d10 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
@@ -62,7 +62,7 @@ public class DefaultStreamCachingStrategy extends org.apache.camel.support.Servi
private int bufferSize = IOHelper.DEFAULT_BUFFER_SIZE;
private boolean removeSpoolDirectoryWhenStopping = true;
private final UtilizationStatistics statistics = new UtilizationStatistics();
- private final Set<SpoolRule> spoolRules = new LinkedHashSet<SpoolRule>();
+ private final Set<SpoolRule> spoolRules = new LinkedHashSet<>();
private boolean anySpoolRules;
public CamelContext getCamelContext() {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java
index ec29df3..e3cec94 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java
@@ -60,7 +60,7 @@ public class DefaultSubUnitOfWork implements SubUnitOfWork, SubUnitOfWorkCallbac
private void addFailedException(Exception exception) {
if (failedExceptions == null) {
- failedExceptions = new ArrayList<Exception>();
+ failedExceptions = new ArrayList<>();
}
if (!failedExceptions.contains(exception)) {
// avoid adding the same exception multiple times
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java
index eafafe6..f012bf1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java
@@ -73,16 +73,16 @@ public class DefaultThreadPoolFactory implements ThreadPoolFactory {
BlockingQueue<Runnable> workQueue;
if (corePoolSize == 0 && maxQueueSize <= 0) {
// use a synchronous queue for direct-handover (no tasks stored on the queue)
- workQueue = new SynchronousQueue<Runnable>();
+ workQueue = new SynchronousQueue<>();
// and force 1 as pool size to be able to create the thread pool by the JDK
corePoolSize = 1;
maxPoolSize = 1;
} else if (maxQueueSize <= 0) {
// use a synchronous queue for direct-handover (no tasks stored on the queue)
- workQueue = new SynchronousQueue<Runnable>();
+ workQueue = new SynchronousQueue<>();
} else {
// bounded task queue to store tasks on the queue
- workQueue = new LinkedBlockingQueue<Runnable>(maxQueueSize);
+ workQueue = new LinkedBlockingQueue<>(maxQueueSize);
}
ThreadPoolExecutor answer = new RejectableThreadPoolExecutor(corePoolSize, maxPoolSize, keepAliveTime, timeUnit, workQueue);
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultTracedRouteNodes.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultTracedRouteNodes.java
index 05e15d2..6bd16d7 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultTracedRouteNodes.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultTracedRouteNodes.java
@@ -36,8 +36,8 @@ import org.apache.camel.spi.TracedRouteNodes;
*/
@Deprecated
public class DefaultTracedRouteNodes implements TracedRouteNodes {
- private final Stack<List<RouteNode>> routeNodes = new Stack<List<RouteNode>>();
- private final Map<ProcessorDefinition<?>, AtomicInteger> nodeCounter = new HashMap<ProcessorDefinition<?>, AtomicInteger>();
+ private final Stack<List<RouteNode>> routeNodes = new Stack<>();
+ private final Map<ProcessorDefinition<?>, AtomicInteger> nodeCounter = new HashMap<>();
public DefaultTracedRouteNodes() {
// create an empty list to start with
@@ -47,7 +47,7 @@ public class DefaultTracedRouteNodes implements TracedRouteNodes {
public void addTraced(RouteNode entry) {
List<RouteNode> list = routeNodes.isEmpty() ? null : routeNodes.peek();
if (list == null) {
- list = new ArrayList<RouteNode>();
+ list = new ArrayList<>();
routeNodes.push(list);
}
list.add(entry);
@@ -70,7 +70,7 @@ public class DefaultTracedRouteNodes implements TracedRouteNodes {
}
public List<RouteNode> getNodes() {
- List<RouteNode> answer = new ArrayList<RouteNode>();
+ List<RouteNode> answer = new ArrayList<>();
for (List<RouteNode> list : routeNodes) {
answer.addAll(list);
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
index 585bc60..3f48ac9 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
@@ -187,7 +187,7 @@ public class DefaultUnitOfWork implements UnitOfWork, Service {
public synchronized void addSynchronization(Synchronization synchronization) {
if (synchronizations == null) {
- synchronizations = new ArrayList<Synchronization>();
+ synchronizations = new ArrayList<>();
}
log.trace("Adding synchronization {}", synchronization);
synchronizations.add(synchronization);
@@ -417,7 +417,7 @@ public class DefaultUnitOfWork implements UnitOfWork, Service {
private Set<Object> getTransactedBy() {
if (transactedBy == null) {
- transactedBy = new LinkedHashSet<Object>();
+ transactedBy = new LinkedHashSet<>();
}
return transactedBy;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java b/camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java
index 5a533db..479dce3 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ServiceHelper;
*/
public class DeferServiceStartupListener implements StartupListener, Ordered {
- private final Set<Service> services = new CopyOnWriteArraySet<Service>();
+ private final Set<Service> services = new CopyOnWriteArraySet<>();
public void addService(Service service) {
services.add(service);
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
index 66e3e91..d0acf9f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
@@ -99,7 +99,7 @@ public class EventDrivenConsumerRoute extends DefaultRoute {
}
public List<Processor> filter(String pattern) {
- List<Processor> match = new ArrayList<Processor>();
+ List<Processor> match = new ArrayList<>();
doFilter(pattern, navigate(), match);
return match;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
index 066abf4..b94063c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
@@ -59,9 +59,9 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement
super(endpoint);
this.queueCapacity = queueSize;
if (queueSize <= 0) {
- this.queue = new LinkedBlockingQueue<Exchange>();
+ this.queue = new LinkedBlockingQueue<>();
} else {
- this.queue = new ArrayBlockingQueue<Exchange>(queueSize);
+ this.queue = new ArrayBlockingQueue<>(queueSize);
}
this.interruptedExceptionHandler = new LoggingExceptionHandler(endpoint.getCamelContext(), EventDrivenPollingConsumer.class);
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
index b908054..be97319 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
@@ -146,7 +146,7 @@ public class FileWatcherReloadStrategy extends ReloadStrategySupport {
WatchService watcher = path.getFileSystem().newWatchService();
// we cannot support deleting files as we don't know which routes that would be
if (isRecursive) {
- this.folderKeys = new HashMap<WatchKey, Path>();
+ this.folderKeys = new HashMap<>();
registerRecursive(watcher, path, modifier);
} else {
registerPathToWatcher(modifier, path, watcher);
diff --git a/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
index cc39b21..ea26769 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
@@ -91,7 +91,7 @@ public class JndiRegistry implements Registry {
}
public <T> Map<String, T> findByTypeWithName(Class<T> type) {
- Map<String, T> answer = new LinkedHashMap<String, T>();
+ Map<String, T> answer = new LinkedHashMap<>();
try {
NamingEnumeration<NameClassPair> list = getContext().list("");
while (list.hasMore()) {
@@ -109,7 +109,7 @@ public class JndiRegistry implements Registry {
}
public <T> Set<T> findByType(Class<T> type) {
- Set<T> answer = new LinkedHashSet<T>();
+ Set<T> answer = new LinkedHashSet<>();
try {
NamingEnumeration<NameClassPair> list = getContext().list("");
while (list.hasMore()) {
@@ -163,7 +163,7 @@ public class JndiRegistry implements Registry {
}
protected Context createContext() throws NamingException {
- Hashtable<Object, Object> properties = new Hashtable<Object, Object>(System.getProperties());
+ Hashtable<Object, Object> properties = new Hashtable<>(System.getProperties());
if (environment != null) {
properties.putAll(environment);
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
index bd73cba..926f8f0 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
@@ -35,7 +35,7 @@ import org.apache.camel.util.ServiceHelper;
*/
public class LimitedPollingConsumerPollStrategy extends DefaultPollingConsumerPollStrategy implements Service {
- private final Map<Consumer, Integer> state = new HashMap<Consumer, Integer>();
+ private final Map<Consumer, Integer> state = new HashMap<>();
private int limit = 3;
public int getLimit() {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
index adbdde1..317cc2d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
@@ -35,7 +35,7 @@ import org.apache.camel.util.UnsafeUriCharactersEncoder;
@Deprecated
public final class MappedEndpointConfiguration extends DefaultEndpointConfiguration {
// TODO: need 2 sets to differentiate between user keys and fixed keys
- private Map<String, Object> params = new LinkedHashMap<String, Object>();
+ private Map<String, Object> params = new LinkedHashMap<>();
MappedEndpointConfiguration(CamelContext camelContext) {
super(camelContext);
@@ -85,7 +85,7 @@ public final class MappedEndpointConfiguration extends DefaultEndpointConfigurat
@Override
public String toUriString(UriFormat format) {
Set<Map.Entry<String, Object>> entries = params.entrySet();
- List<String> queryParams = new ArrayList<String>();
+ List<String> queryParams = new ArrayList<>();
String scheme = null;
String schemeSpecificPart = null;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
index 01bef6c..e5d545e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
@@ -69,7 +69,7 @@ public class RouteService extends ChildServiceSupport {
private final List<Route> routes;
private final String id;
private boolean removingRoutes;
- private final Map<Route, Consumer> inputs = new HashMap<Route, Consumer>();
+ private final Map<Route, Consumer> inputs = new HashMap<>();
private final AtomicBoolean warmUpDone = new AtomicBoolean(false);
private final AtomicBoolean endpointDone = new AtomicBoolean(false);
@@ -108,7 +108,7 @@ public class RouteService extends ChildServiceSupport {
* for {@link org.apache.camel.EndpointAware} processors which uses an endpoint.
*/
public Set<Endpoint> gatherEndpoints() {
- Set<Endpoint> answer = new LinkedHashSet<Endpoint>();
+ Set<Endpoint> answer = new LinkedHashSet<>();
for (Route route : routes) {
Set<Service> services = gatherChildServices(route, true);
for (Service service : services) {
@@ -172,14 +172,14 @@ public class RouteService extends ChildServiceSupport {
route.onStartingServices(services);
// gather list of services to start as we need to start child services as well
- Set<Service> list = new LinkedHashSet<Service>();
+ Set<Service> list = new LinkedHashSet<>();
for (Service service : services) {
list.addAll(ServiceHelper.getChildServices(service));
}
// split into consumers and child services as we need to start the consumers
// afterwards to avoid them being active while the others start
- List<Service> childServices = new ArrayList<Service>();
+ List<Service> childServices = new ArrayList<>();
for (Service service : list) {
// inject the route
@@ -399,11 +399,11 @@ public class RouteService extends ChildServiceSupport {
*/
private Set<Service> gatherChildServices(Route route, boolean includeErrorHandler) {
// gather list of services to stop as we need to start child services as well
- List<Service> services = new ArrayList<Service>();
+ List<Service> services = new ArrayList<>();
services.addAll(route.getServices());
// also get route scoped services
doGetRouteScopedServices(services, route);
- Set<Service> list = new LinkedHashSet<Service>();
+ Set<Service> list = new LinkedHashSet<>();
for (Service service : services) {
list.addAll(ServiceHelper.getChildServices(service));
}
@@ -411,7 +411,7 @@ public class RouteService extends ChildServiceSupport {
// also get route scoped error handler (which must be done last)
doGetRouteScopedErrorHandler(list, route);
}
- Set<Service> answer = new LinkedHashSet<Service>();
+ Set<Service> answer = new LinkedHashSet<>();
answer.addAll(list);
return answer;
}
@@ -422,7 +422,7 @@ public class RouteService extends ChildServiceSupport {
private void doGetRouteScopedErrorHandler(Set<Service> services, Route route) {
// only include error handlers if they are route scoped
boolean includeErrorHandler = !routeDefinition.isContextScopedErrorHandler(route.getRouteContext().getCamelContext());
- List<Service> extra = new ArrayList<Service>();
+ List<Service> extra = new ArrayList<>();
if (includeErrorHandler) {
for (Service service : services) {
if (service instanceof Channel) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
index 9831a81..8c6ef36 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
@@ -422,12 +422,12 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
scheduler.scheduleTask(this);
// configure scheduler with options from this consumer
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
IntrospectionSupport.getProperties(this, properties, null);
IntrospectionSupport.setProperties(getEndpoint().getCamelContext().getTypeConverter(), scheduler, properties);
if (schedulerProperties != null && !schedulerProperties.isEmpty()) {
// need to use a copy in case the consumer is restarted so we keep the properties
- Map<String, Object> copy = new HashMap<String, Object>(schedulerProperties);
+ Map<String, Object> copy = new HashMap<>(schedulerProperties);
IntrospectionSupport.setProperties(getEndpoint().getCamelContext().getTypeConverter(), scheduler, copy);
if (copy.size() > 0) {
throw new FailedToCreateConsumerException(getEndpoint(), "There are " + copy.size()
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
index a27eb1f..820af33 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
@@ -155,8 +155,8 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
@Override
protected void configurePollingConsumer(PollingConsumer consumer) throws Exception {
- Map<String, Object> copy = new HashMap<String, Object>(getConsumerProperties());
- Map<String, Object> throwaway = new HashMap<String, Object>();
+ Map<String, Object> copy = new HashMap<>(getConsumerProperties());
+ Map<String, Object> throwaway = new HashMap<>();
// filter out unwanted options which is intended for the scheduled poll consumer
// as these options are not supported on the polling consumer
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
index d2a4a21..f698ac7 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
@@ -53,7 +53,7 @@ public class SimpleRegistry extends HashMap<String, Object> implements Registry
}
public <T> Map<String, T> findByTypeWithName(Class<T> type) {
- Map<String, T> result = new HashMap<String, T>();
+ Map<String, T> result = new HashMap<>();
for (Map.Entry<String, Object> entry : entrySet()) {
if (type.isInstance(entry.getValue())) {
result.put(entry.getKey(), type.cast(entry.getValue()));
@@ -63,7 +63,7 @@ public class SimpleRegistry extends HashMap<String, Object> implements Registry
}
public <T> Set<T> findByType(Class<T> type) {
- Set<T> result = new HashSet<T>();
+ Set<T> result = new HashSet<>();
for (Map.Entry<String, Object> entry : entrySet()) {
if (type.isInstance(entry.getValue())) {
result.add(type.cast(entry.getValue()));
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
index 8db542a..f225abb 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java
@@ -55,7 +55,7 @@ public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements
Context, Route
}
- private final Set<Route> routes = new LinkedHashSet<Route>();
+ private final Set<Route> routes = new LinkedHashSet<>();
private ContextScopedEventNotifier eventNotifier;
private CamelContext camelContext;
private final Lock lock = new ReentrantLock();
diff --git a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java
index 504e2f4..ec3b40c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointComponent.java
@@ -73,7 +73,7 @@ public abstract class UriEndpointComponent extends DefaultComponent {
*/
public static SortedMap<String, ParameterConfiguration> createParameterConfigurationMap(
Class<? extends Endpoint> endpointClass) {
- SortedMap<String, ParameterConfiguration> answer = new TreeMap<String, ParameterConfiguration>();
+ SortedMap<String, ParameterConfiguration> answer = new TreeMap<>();
populateParameterConfigurationMap(answer, endpointClass, "");
return answer;
}
@@ -126,7 +126,7 @@ public abstract class UriEndpointComponent extends DefaultComponent {
if (parameterConfigurationMap == null) {
parameterConfigurationMap = createParameterConfigurationMap(getEndpointClass());
}
- return new TreeMap<String, ParameterConfiguration>(parameterConfigurationMap);
+ return new TreeMap<>(parameterConfigurationMap);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java
index c58577d..b21cdde 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/UriEndpointConfiguration.java
@@ -143,7 +143,7 @@ public class UriEndpointConfiguration implements EndpointConfiguration {
if (propertyMap == null) {
propertyMap = UriEndpointComponent.createParameterConfigurationMap(getEndpointClass());
}
- return new TreeMap<String, ParameterConfiguration>(propertyMap);
+ return new TreeMap<>(propertyMap);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index b8c3aab..576bc80 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -69,8 +69,8 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
private static final Logger LOG = LoggerFactory.getLogger(AnnotationTypeConverterLoader.class);
private static final Charset UTF8 = Charset.forName("UTF-8");
protected PackageScanClassResolver resolver;
- protected Set<Class<?>> visitedClasses = new HashSet<Class<?>>();
- protected Set<String> visitedURIs = new HashSet<String>();
+ protected Set<Class<?>> visitedClasses = new HashSet<>();
+ protected Set<String> visitedURIs = new HashSet<>();
public AnnotationTypeConverterLoader(PackageScanClassResolver resolver) {
this.resolver = resolver;
@@ -105,7 +105,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
// filter out package names which can be loaded as a class directly so we avoid package scanning which
// is much slower and does not work 100% in all runtime containers
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
packageNames = filterPackageNamesOnly(resolver, packageNames, classes);
if (!classes.isEmpty()) {
LOG.debug("Loaded {} @Converter classes", classes.size());
@@ -158,7 +158,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
}
// the filtered packages to return
- List<String> packages = new ArrayList<String>();
+ List<String> packages = new ArrayList<>();
// try to load it as a class first
for (String name : packageNames) {
@@ -198,7 +198,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
* @throws IOException is thrown for IO related errors
*/
protected String[] findPackageNames() throws IOException {
- Set<String> packages = new HashSet<String>();
+ Set<String> packages = new HashSet<>();
ClassLoader ccl = Thread.currentThread().getContextClassLoader();
if (ccl != null) {
findPackages(packages, ccl);
@@ -320,7 +320,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
new StaticMethodTypeConverter(method, allowNull));
} else {
if (injector == null) {
- injector = new CachingInjector<Object>(registry, CastUtils.cast(type, Object.class));
+ injector = new CachingInjector<>(registry, CastUtils.cast(type, Object.class));
}
registerTypeConverter(registry, method, toType, fromType,
new InstanceMethodTypeConverter(injector, method, registry, allowNull));
@@ -351,7 +351,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
registerFallbackTypeConverter(registry, new StaticMethodFallbackTypeConverter(method, registry, allowNull), method);
} else {
if (injector == null) {
- injector = new CachingInjector<Object>(registry, CastUtils.cast(type, Object.class));
+ injector = new CachingInjector<>(registry, CastUtils.cast(type, Object.class));
}
registerFallbackTypeConverter(registry, new InstanceMethodFallbackTypeConverter(injector, method, registry, allowNull), method);
}
@@ -400,7 +400,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
*/
protected static String[] filterUnwantedPackage(String name, String[] packageNames) {
// the filtered packages to return
- List<String> packages = new ArrayList<String>();
+ List<String> packages = new ArrayList<>();
for (String s : packageNames) {
if (!name.equals(s)) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
index 767bcdb..29b795a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
@@ -63,7 +63,7 @@ public class ArrayTypeConverter extends TypeConverterSupport {
return (T)Arrays.asList((Object[])value);
} else if (value.getClass().isArray()) {
int size = Array.getLength(value);
- List<Object> answer = new ArrayList<Object>(size);
+ List<Object> answer = new ArrayList<>(size);
for (int i = 0; i < size; i++) {
answer.add(Array.get(value, i));
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index 28a1d12..21f6658 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -66,12 +66,12 @@ import org.slf4j.LoggerFactory;
public abstract class BaseTypeConverterRegistry extends ServiceSupport implements TypeConverter, TypeConverterRegistry, CamelContextAware {
protected final Logger log = LoggerFactory.getLogger(getClass());
protected final OptimisedTypeConverter optimisedTypeConverter = new OptimisedTypeConverter();
- protected final ConcurrentMap<TypeMapping, TypeConverter> typeMappings = new ConcurrentHashMap<TypeMapping, TypeConverter>();
+ protected final ConcurrentMap<TypeMapping, TypeConverter> typeMappings = new ConcurrentHashMap<>();
// for misses use a soft reference cache map, as the classes may be un-deployed at runtime
@SuppressWarnings("unchecked")
protected final LRUSoftCache<TypeMapping, TypeMapping> misses = LRUCacheFactory.newLRUSoftCache(1000);
- protected final List<TypeConverterLoader> typeConverterLoaders = new ArrayList<TypeConverterLoader>();
- protected final List<FallbackTypeConverter> fallbackConverters = new CopyOnWriteArrayList<FallbackTypeConverter>();
+ protected final List<TypeConverterLoader> typeConverterLoaders = new ArrayList<>();
+ protected final List<FallbackTypeConverter> fallbackConverters = new CopyOnWriteArrayList<>();
protected final PackageScanClassResolver resolver;
protected CamelContext camelContext;
protected Injector injector;
@@ -519,7 +519,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
}
public Set<Class<?>> getFromClassMappings() {
- Set<Class<?>> answer = new HashSet<Class<?>>();
+ Set<Class<?>> answer = new HashSet<>();
for (TypeMapping mapping : typeMappings.keySet()) {
answer.add(mapping.getFromType());
}
@@ -527,7 +527,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
}
public Map<Class<?>, TypeConverter> getToClassMappings(Class<?> fromClass) {
- Map<Class<?>, TypeConverter> answer = new HashMap<Class<?>, TypeConverter>();
+ Map<Class<?>, TypeConverter> answer = new HashMap<>();
for (Map.Entry<TypeMapping, TypeConverter> entry : typeMappings.entrySet()) {
TypeMapping mapping = entry.getKey();
if (mapping.isApplicable(fromClass)) {
@@ -616,7 +616,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
}
public List<Class<?>[]> listAllTypeConvertersFromTo() {
- List<Class<?>[]> answer = new ArrayList<Class<?>[]>(typeMappings.size());
+ List<Class<?>[]> answer = new ArrayList<>(typeMappings.size());
for (TypeMapping mapping : typeMappings.keySet()) {
answer.add(new Class<?>[]{mapping.getFromType(), mapping.getToType()});
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java b/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java
index 65ec445..1398aec 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/CorePackageScanClassResolver.java
@@ -55,8 +55,8 @@ import org.slf4j.LoggerFactory;
public class CorePackageScanClassResolver implements PackageScanClassResolver {
protected final Logger log = LoggerFactory.getLogger(getClass());
- private final Set<ClassLoader> classLoaders = new LinkedHashSet<ClassLoader>();
- private final Set<Class<?>> converters = new LinkedHashSet<Class<?>>();
+ private final Set<ClassLoader> classLoaders = new LinkedHashSet<>();
+ private final Set<Class<?>> converters = new LinkedHashSet<>();
public CorePackageScanClassResolver() {
converters.add(ObjectConverter.class);
@@ -89,7 +89,7 @@ public class CorePackageScanClassResolver implements PackageScanClassResolver {
@Override
public Set<ClassLoader> getClassLoaders() {
// return a new set to avoid any concurrency issues in other runtimes such as OSGi
- return Collections.unmodifiableSet(new LinkedHashSet<ClassLoader>(classLoaders));
+ return Collections.unmodifiableSet(new LinkedHashSet<>(classLoaders));
}
@Override
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
index 340cdc6..3803af6 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
@@ -45,7 +45,7 @@ public class PropertyEditorTypeConverter implements TypeConverter {
@SuppressWarnings("unchecked")
private final Map<Class<?>, Class<?>> misses = LRUCacheFactory.newLRUSoftCache(1000);
// we don't anticipate so many property editors so we have unbounded map
- private final Map<Class<?>, PropertyEditor> cache = new HashMap<Class<?>, PropertyEditor>();
+ private final Map<Class<?>, PropertyEditor> cache = new HashMap<>();
public void clear() {
cache.clear();
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java b/camel-core/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
index 2854274..ad7fe53 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
@@ -33,8 +33,8 @@ import org.apache.camel.spi.PackageScanFilter;
*/
public class TypeConvertersPackageScanClassResolver implements PackageScanClassResolver {
- private final Set<ClassLoader> classLoaders = new LinkedHashSet<ClassLoader>();
- private final Set<Class<?>> converters = new LinkedHashSet<Class<?>>();
+ private final Set<ClassLoader> classLoaders = new LinkedHashSet<>();
+ private final Set<Class<?>> converters = new LinkedHashSet<>();
public TypeConvertersPackageScanClassResolver(Class<?> clazz) {
converters.add(clazz);
@@ -51,7 +51,7 @@ public class TypeConvertersPackageScanClassResolver implements PackageScanClassR
@Override
public Set<ClassLoader> getClassLoaders() {
// return a new set to avoid any concurrency issues in other runtimes such as OSGi
- return Collections.unmodifiableSet(new LinkedHashSet<ClassLoader>(classLoaders));
+ return Collections.unmodifiableSet(new LinkedHashSet<>(classLoaders));
}
@Override
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index 917d83a..40b5b52 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -86,11 +86,11 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
private BundleTracker tracker;
- private final Map<Long, List<BaseService>> resolvers = new ConcurrentHashMap<Long, List<BaseService>>();
+ private final Map<Long, List<BaseService>> resolvers = new ConcurrentHashMap<>();
private long bundleId;
// Map from package name to the capability we export for this package
- private final Map<String, BundleCapability> packageCapabilities = new HashMap<String, BundleCapability>();
+ private final Map<String, BundleCapability> packageCapabilities = new HashMap<>();
public void start(BundleContext context) throws Exception {
LOG.info("Camel activator starting");
@@ -124,7 +124,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
public Object addingBundle(Bundle bundle, BundleEvent event) {
LOG.debug("Bundle started: {}", bundle.getSymbolicName());
if (extenderCapabilityWired(bundle)) {
- List<BaseService> r = new ArrayList<BaseService>();
+ List<BaseService> r = new ArrayList<>();
registerComponents(bundle, r);
registerLanguages(bundle, r);
registerDataFormats(bundle, r);
@@ -173,7 +173,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
protected void registerComponents(Bundle bundle, List<BaseService> resolvers) {
if (canSee(bundle, Component.class)) {
- Map<String, String> components = new HashMap<String, String>();
+ Map<String, String> components = new HashMap<>();
for (Enumeration<?> e = bundle.getEntryPaths(META_INF_COMPONENT); e != null && e.hasMoreElements();) {
String path = (String) e.nextElement();
LOG.debug("Found entry: {} in bundle {}", path, bundle.getSymbolicName());
@@ -188,7 +188,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
protected void registerLanguages(Bundle bundle, List<BaseService> resolvers) {
if (canSee(bundle, Language.class)) {
- Map<String, String> languages = new HashMap<String, String>();
+ Map<String, String> languages = new HashMap<>();
for (Enumeration<?> e = bundle.getEntryPaths(META_INF_LANGUAGE); e != null && e.hasMoreElements();) {
String path = (String) e.nextElement();
LOG.debug("Found entry: {} in bundle {}", path, bundle.getSymbolicName());
@@ -209,7 +209,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
protected void registerDataFormats(Bundle bundle, List<BaseService> resolvers) {
if (canSee(bundle, DataFormat.class)) {
- Map<String, String> dataformats = new HashMap<String, String>();
+ Map<String, String> dataformats = new HashMap<>();
for (Enumeration<?> e = bundle.getEntryPaths(META_INF_DATAFORMAT); e != null && e.hasMoreElements();) {
String path = (String) e.nextElement();
LOG.debug("Found entry: {} in bundle {}", path, bundle.getSymbolicName());
@@ -411,7 +411,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
PackageScanFilter test = new AnnotatedWithPackageScanFilter(Converter.class, true);
- Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+ Set<Class<?>> classes = new LinkedHashSet<>();
Set<String> packages = getConverterPackages(bundle.getEntry(META_INF_TYPE_CONVERTER));
if (LOG.isTraceEnabled()) {
@@ -565,7 +565,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
}
protected void doRegister(Class<?> type, String key, Object value) {
- Dictionary<String, Object> props = new Hashtable<String, Object>();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(key, value);
doRegister(type, props);
}
@@ -598,7 +598,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer {
}
protected static Set<String> getConverterPackages(URL resource) {
- Set<String> packages = new LinkedHashSet<String>();
+ Set<String> packages = new LinkedHashSet<>();
if (resource != null) {
BufferedReader reader = null;
try {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
index 1b32408..f2b49e5 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
@@ -110,10 +110,10 @@ abstract class AbstractTracked {
* AbstractTracked constructor.
*/
AbstractTracked() {
- tracked = new HashMap<Object, Object>();
+ tracked = new HashMap<>();
trackingCount = 0;
- adding = new ArrayList<Object>(6);
- initial = new LinkedList<Object>();
+ adding = new ArrayList<>(6);
+ initial = new LinkedList<>();
closed = false;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java b/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
index 549138e..72c5bff 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.PackageScanFilter;
* Package scan filter for testing if a given class is assignable to another class.
*/
public class AssignableToPackageScanFilter implements PackageScanFilter {
- private final Set<Class<?>> parents = new HashSet<Class<?>>();
+ private final Set<Class<?>> parents = new HashSet<>();
public AssignableToPackageScanFilter() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java b/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
index ce6e510..117fd78 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
@@ -31,11 +31,11 @@ public class CompositePackageScanFilter implements PackageScanFilter {
private Set<PackageScanFilter> filters;
public CompositePackageScanFilter() {
- filters = new LinkedHashSet<PackageScanFilter>();
+ filters = new LinkedHashSet<>();
}
public CompositePackageScanFilter(Set<PackageScanFilter> filters) {
- this.filters = new LinkedHashSet<PackageScanFilter>(filters);
+ this.filters = new LinkedHashSet<>(filters);
}
public void addFilter(PackageScanFilter filter) {
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java b/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
index 878a3c9..55803f7 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
@@ -41,8 +41,8 @@ import org.apache.camel.language.simple.types.TokenType;
public abstract class BaseSimpleParser {
protected final String expression;
- protected final List<SimpleToken> tokens = new ArrayList<SimpleToken>();
- protected final List<SimpleNode> nodes = new ArrayList<SimpleNode>();
+ protected final List<SimpleToken> tokens = new ArrayList<>();
+ protected final List<SimpleNode> nodes = new ArrayList<>();
protected SimpleToken token;
protected int previousIndex;
protected int index;
@@ -116,7 +116,7 @@ public abstract class BaseSimpleParser {
* has a linked and prepared graph of nodes which represent the input expression.
*/
protected void prepareBlocks() {
- List<SimpleNode> answer = new ArrayList<SimpleNode>();
+ List<SimpleNode> answer = new ArrayList<>();
Deque<Block> stack = new ArrayDeque<>();
for (SimpleNode token : nodes) {
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
index a6c7409..9787bf9 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
@@ -169,7 +169,7 @@ public class SimpleExpressionParser extends BaseSimpleParser {
}
private List<Expression> createExpressions() {
- List<Expression> answer = new ArrayList<Expression>();
+ List<Expression> answer = new ArrayList<>();
for (SimpleNode token : nodes) {
Expression exp = token.createExpression(expression);
if (exp != null) {
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
index 524f345..6d381e8 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
@@ -449,7 +449,7 @@ public class SimplePredicateParser extends BaseSimpleParser {
* @return the created {@link Predicate}s, is never <tt>null</tt>.
*/
private List<Predicate> createPredicates() {
- List<Predicate> answer = new ArrayList<Predicate>();
+ List<Predicate> answer = new ArrayList<>();
for (SimpleNode node : nodes) {
Expression exp = node.createExpression(expression);
if (exp != null) {
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
index 44728e2..f3b426c 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
@@ -30,7 +30,7 @@ import org.apache.camel.util.ObjectHelper;
public final class SimpleTokenizer {
// use CopyOnWriteArrayList so we can modify it in the for loop when changing function start/end tokens
- private static final List<SimpleTokenType> KNOWN_TOKENS = new CopyOnWriteArrayList<SimpleTokenType>();
+ private static final List<SimpleTokenType> KNOWN_TOKENS = new CopyOnWriteArrayList<>();
// optimise to be able to quick check for start functions
private static final String[] FUNCTION_START = new String[]{"${", "$simple{"};
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java b/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
index e46b8c9..546b232 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
@@ -173,7 +173,7 @@ public class BinaryExpression extends BaseSimpleNode {
// from the right hand side expression.
// each element on the right hand side must be separated by comma (default for create iterator)
Iterator<Object> it = ObjectHelper.createIterator(rightExp.evaluate(exchange, Object.class));
- List<Object> values = new ArrayList<Object>();
+ List<Object> values = new ArrayList<>();
while (it.hasNext()) {
values.add(it.next());
}
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java b/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
index eea8767..319e32c 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
@@ -28,7 +28,7 @@ import org.apache.camel.language.simple.types.SimpleToken;
*/
public class CompositeNodes extends BaseSimpleNode {
- private final List<SimpleNode> children = new ArrayList<SimpleNode>();
+ private final List<SimpleNode> children = new ArrayList<>();
public CompositeNodes(SimpleToken token) {
super(token);
@@ -58,7 +58,7 @@ public class CompositeNodes extends BaseSimpleNode {
} else if (children.size() == 1) {
return children.get(0).createExpression(expression);
} else {
- List<Expression> answer = new ArrayList<Expression>();
+ List<Expression> answer = new ArrayList<>();
for (SimpleNode child : children) {
answer.add(child.createExpression(expression));
}
diff --git a/camel-core/src/main/java/org/apache/camel/main/Main.java b/camel-core/src/main/java/org/apache/camel/main/Main.java
index f19b567..26a910f 100644
--- a/camel-core/src/main/java/org/apache/camel/main/Main.java
+++ b/camel-core/src/main/java/org/apache/camel/main/Main.java
@@ -162,7 +162,7 @@ public class Main extends MainSupport {
}
protected Map<String, CamelContext> getCamelContextMap() {
- Map<String, CamelContext> answer = new HashMap<String, CamelContext>();
+ Map<String, CamelContext> answer = new HashMap<>();
CamelContext camelContext = createContext();
if (registry.size() > 0) {
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
index 0c978a0..9584f98 100644
--- a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
@@ -51,8 +51,8 @@ public abstract class MainSupport extends ServiceSupport {
protected static final Logger LOG = LoggerFactory.getLogger(MainSupport.class);
protected static final int UNINITIALIZED_EXIT_CODE = Integer.MIN_VALUE;
protected static final int DEFAULT_EXIT_CODE = 0;
- protected final List<MainListener> listeners = new ArrayList<MainListener>();
- protected final List<Option> options = new ArrayList<Option>();
+ protected final List<MainListener> listeners = new ArrayList<>();
+ protected final List<Option> options = new ArrayList<>();
protected final CountDownLatch latch = new CountDownLatch(1);
protected final AtomicBoolean completed = new AtomicBoolean(false);
protected final AtomicInteger exitCode = new AtomicInteger(UNINITIALIZED_EXIT_CODE);
@@ -61,11 +61,11 @@ public abstract class MainSupport extends ServiceSupport {
protected int durationMaxMessages;
protected TimeUnit timeUnit = TimeUnit.SECONDS;
protected boolean trace;
- protected List<RouteBuilder> routeBuilders = new ArrayList<RouteBuilder>();
+ protected List<RouteBuilder> routeBuilders = new ArrayList<>();
protected String routeBuilderClasses;
protected String fileWatchDirectory;
protected boolean fileWatchDirectoryRecursively;
- protected final List<CamelContext> camelContexts = new ArrayList<CamelContext>();
+ protected final List<CamelContext> camelContexts = new ArrayList<>();
protected ProducerTemplate camelTemplate;
protected boolean hangupInterceptorEnabled = true;
protected int durationHitExitCode = DEFAULT_EXIT_CODE;
@@ -307,7 +307,7 @@ public abstract class MainSupport extends ServiceSupport {
* Parses the command line arguments.
*/
public void parseArguments(String[] arguments) {
- LinkedList<String> args = new LinkedList<String>(Arrays.asList(arguments));
+ LinkedList<String> args = new LinkedList<>(Arrays.asList(arguments));
boolean valid = true;
while (!args.isEmpty()) {
@@ -523,7 +523,7 @@ public abstract class MainSupport extends ServiceSupport {
}
public List<RouteDefinition> getRouteDefinitions() {
- List<RouteDefinition> answer = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> answer = new ArrayList<>();
for (CamelContext camelContext : camelContexts) {
answer.addAll(camelContext.getRouteDefinitions());
}
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index d3f7280..548a208 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -70,7 +70,7 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
private ManagementMBeanAssembler assembler;
// need a name -> actual name mapping as some servers changes the names (such as WebSphere)
- private final ConcurrentMap<ObjectName, ObjectName> mbeansRegistered = new ConcurrentHashMap<ObjectName, ObjectName>();
+ private final ConcurrentMap<ObjectName, ObjectName> mbeansRegistered = new ConcurrentHashMap<>();
private JMXConnectorServer cs;
private Registry registry;
@@ -101,7 +101,7 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
protected void finalizeSettings() throws Exception {
// JVM system properties take precedence over any configuration
- Map<String, Object> values = new LinkedHashMap<String, Object>();
+ Map<String, Object> values = new LinkedHashMap<>();
if (System.getProperty(JmxSystemPropertyKeys.REGISTRY_PORT) != null) {
registryPort = Integer.getInteger(JmxSystemPropertyKeys.REGISTRY_PORT);
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index 36a6f17..00a2261 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -127,18 +127,18 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement
// the wrapped processors is for performance counters, which are in use for the created routes
// when a route is removed, we should remove the associated processors from this map
private final Map<Processor, KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>> wrappedProcessors =
- new HashMap<Processor, KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>>();
- private final List<PreRegisterService> preServices = new ArrayList<PreRegisterService>();
+ new HashMap<>();
+ private final List<PreRegisterService> preServices = new ArrayList<>();
private final TimerListenerManager loadTimer = new ManagedLoadTimer();
private final TimerListenerManagerStartupListener loadTimerStartupListener = new TimerListenerManagerStartupListener();
private volatile CamelContext camelContext;
private volatile ManagedCamelContext camelContextMBean;
private volatile boolean initialized;
- private final Set<String> knowRouteIds = new HashSet<String>();
- private final Map<Tracer, ManagedTracer> managedTracers = new HashMap<Tracer, ManagedTracer>();
- private final Map<BacklogTracer, ManagedBacklogTracer> managedBacklogTracers = new HashMap<BacklogTracer, ManagedBacklogTracer>();
- private final Map<BacklogDebugger, ManagedBacklogDebugger> managedBacklogDebuggers = new HashMap<BacklogDebugger, ManagedBacklogDebugger>();
- private final Map<ThreadPoolExecutor, Object> managedThreadPools = new HashMap<ThreadPoolExecutor, Object>();
+ private final Set<String> knowRouteIds = new HashSet<>();
+ private final Map<Tracer, ManagedTracer> managedTracers = new HashMap<>();
+ private final Map<BacklogTracer, ManagedBacklogTracer> managedBacklogTracers = new HashMap<>();
+ private final Map<BacklogDebugger, ManagedBacklogDebugger> managedBacklogDebuggers = new HashMap<>();
+ private final Map<ThreadPoolExecutor, Object> managedThreadPools = new HashMap<>();
public DefaultManagementLifecycleStrategy() {
}
@@ -769,7 +769,7 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement
// Create a map (ProcessorType -> PerformanceCounter)
// to be passed to InstrumentationInterceptStrategy.
Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters =
- new HashMap<ProcessorDefinition<?>, PerformanceCounter>();
+ new HashMap<>();
// Each processor in a route will have its own performance counter.
// These performance counter will be embedded to InstrumentationProcessor
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
index c41b5d4..d0cdcb3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
public class DefaultManagementStrategy extends ServiceSupport implements ManagementStrategy, CamelContextAware {
private static final Logger LOG = LoggerFactory.getLogger(DefaultManagementStrategy.class);
- private List<EventNotifier> eventNotifiers = new CopyOnWriteArrayList<EventNotifier>();
+ private List<EventNotifier> eventNotifiers = new CopyOnWriteArrayList<>();
private EventFactory eventFactory = new DefaultEventFactory();
private ManagementNamingStrategy managementNamingStrategy;
private ManagementObjectStrategy managementObjectStrategy;
diff --git a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
index c4c6930..f96602f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
@@ -107,11 +107,11 @@ public class MBeanInfoAssembler implements Service {
}
// maps and lists to contain information about attributes and operations
- Map<String, ManagedAttributeInfo> attributes = new LinkedHashMap<String, ManagedAttributeInfo>();
- Set<ManagedOperationInfo> operations = new LinkedHashSet<ManagedOperationInfo>();
- Set<ModelMBeanAttributeInfo> mBeanAttributes = new LinkedHashSet<ModelMBeanAttributeInfo>();
- Set<ModelMBeanOperationInfo> mBeanOperations = new LinkedHashSet<ModelMBeanOperationInfo>();
- Set<ModelMBeanNotificationInfo> mBeanNotifications = new LinkedHashSet<ModelMBeanNotificationInfo>();
+ Map<String, ManagedAttributeInfo> attributes = new LinkedHashMap<>();
+ Set<ManagedOperationInfo> operations = new LinkedHashSet<>();
+ Set<ModelMBeanAttributeInfo> mBeanAttributes = new LinkedHashSet<>();
+ Set<ModelMBeanOperationInfo> mBeanOperations = new LinkedHashSet<>();
+ Set<ModelMBeanNotificationInfo> mBeanNotifications = new LinkedHashSet<>();
// extract details from default managed bean
if (defaultManagedBean != null) {
@@ -146,8 +146,8 @@ public class MBeanInfoAssembler implements Service {
if (cached == null) {
doExtractAttributesAndOperations(managedClass, attributes, operations);
cached = new MBeanAttributesAndOperations();
- cached.attributes = new LinkedHashMap<String, ManagedAttributeInfo>(attributes);
- cached.operations = new LinkedHashSet<ManagedOperationInfo>(operations);
+ cached.attributes = new LinkedHashMap<>(attributes);
+ cached.operations = new LinkedHashSet<>(operations);
// clear before we re-add them
attributes.clear();
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/JMXNotificationTraceEventHandler.java b/camel-core/src/main/java/org/apache/camel/management/mbean/JMXNotificationTraceEventHandler.java
index dccc638..74469a9 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/JMXNotificationTraceEventHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/JMXNotificationTraceEventHandler.java
@@ -73,7 +73,7 @@ public final class JMXNotificationTraceEventHandler implements TraceEventHandler
}
private Map<String, Object> createTraceMessage(ProcessorDefinition<?> node, Exchange exchange, String body) {
- Map<String, Object> mi = new HashMap<String, Object>();
+ Map<String, Object> mi = new HashMap<>();
mi.put("ExchangeId", exchange.getExchangeId());
mi.put("EndpointURI", getEndpointUri(node));
mi.put("TimeStamp", new Date(System.currentTimeMillis()));
@@ -83,13 +83,13 @@ public final class JMXNotificationTraceEventHandler implements TraceEventHandler
Map<String, Object> sHeaders = message.getHeaders();
Map<String, Object> sProperties = exchange.getProperties();
- Map<String, String> headers = new HashMap<String, String>();
+ Map<String, String> headers = new HashMap<>();
for (String key : sHeaders.keySet()) {
headers.put(key, message.getHeader(key, String.class));
}
mi.put("Headers", headers);
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
for (String key : sProperties.keySet()) {
properties.put(key, exchange.getProperty(key, String.class));
}
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index 60b1029..a2d241f 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -519,7 +519,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
ObjectName query = ObjectName.getInstance(jmxDomain + ":context=" + prefix + getContext().getManagementName() + ",type=routes,*");
Set<ObjectName> routes = server.queryNames(query, null);
- List<ManagedProcessorMBean> processors = new ArrayList<ManagedProcessorMBean>();
+ List<ManagedProcessorMBean> processors = new ArrayList<>();
if (includeProcessors) {
// gather all the processors for this CamelContext, which requires JMX
query = ObjectName.getInstance(jmxDomain + ":context=" + prefix + getContext().getManagementName() + ",type=processors,*");
@@ -618,7 +618,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
public List<String> findEipNames() throws Exception {
Map<String, Properties> map = findEips();
- return new ArrayList<String>(map.keySet());
+ return new ArrayList<>(map.keySet());
}
public TabularData listEips() throws Exception {
@@ -674,7 +674,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
public List<String> findComponentNames() throws Exception {
Map<String, Properties> map = findComponents();
- return new ArrayList<String>(map.keySet());
+ return new ArrayList<>(map.keySet());
}
@Override
@@ -755,7 +755,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
configuration.setParameters(endpointParameters);
return configuration.completeEndpointPath(completionText);
} else {
- return new ArrayList<String>();
+ return new ArrayList<>();
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
index c351cb8..9830069 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEventNotifier.java
@@ -142,7 +142,7 @@ public class ManagedEventNotifier extends NotificationBroadcasterSupport impleme
"ExchangeFailureHandledEvent", "ExchangeRedeliveryEvents", "ExchangeSendingEvent", "ExchangeSentEvent", "RouteStartedEvent",
"RouteStoppedEvent", "ServiceStartupFailureEvent", "ServiceStopFailureEvent"};
- List<MBeanNotificationInfo> infos = new ArrayList<MBeanNotificationInfo>();
+ List<MBeanNotificationInfo> infos = new ArrayList<>();
for (String name : names) {
MBeanNotificationInfo info = new MBeanNotificationInfo(new String[]{"org.apache.camel.management.event"},
"org.apache.camel.management.event." + name, "The event " + name + " occurred");
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index 471194e..7c74a45 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -374,7 +374,7 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList
String prefix = getContext().getManagementStrategy().getManagementAgent().getIncludeHostName() ? "*/" : "";
ObjectName query = ObjectName.getInstance(jmxDomain + ":context=" + prefix + getContext().getManagementName() + ",type=processors,*");
Set<ObjectName> names = server.queryNames(query, null);
- List<ManagedProcessorMBean> mps = new ArrayList<ManagedProcessorMBean>();
+ List<ManagedProcessorMBean> mps = new ArrayList<>();
for (ObjectName on : names) {
ManagedProcessorMBean processor = context.getManagementStrategy().getManagementAgent().newProxyClient(on, ManagedProcessorMBean.class);
@@ -386,7 +386,7 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList
mps.sort(new OrderProcessorMBeans());
// walk the processors in reverse order, and calculate the accumulated total time
- Map<String, Long> accumulatedTimes = new HashMap<String, Long>();
+ Map<String, Long> accumulatedTimes = new HashMap<>();
Collections.reverse(mps);
for (ManagedProcessorMBean processor : mps) {
processorAccumulatedTime += processor.getTotalProcessingTime();
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java b/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
index e9784fb..e0c9915 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
@@ -65,7 +65,7 @@ public final class RouteCoverageXmlParser {
final DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
final Document doc = docBuilder.newDocument();
- final Stack<Element> elementStack = new Stack<Element>();
+ final Stack<Element> elementStack = new Stack<>();
final StringBuilder textBuffer = new StringBuilder();
final DefaultHandler handler = new DefaultHandler() {
diff --git a/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
index b99f711..87c22d8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
@@ -109,7 +109,7 @@ public class AOPDefinition extends OutputDefinition<AOPDefinition> {
// use a pipeline to assemble the before and target processor
// and the after if not afterFinally
- Collection<ProcessorDefinition<?>> pipe = new ArrayList<ProcessorDefinition<?>>();
+ Collection<ProcessorDefinition<?>> pipe = new ArrayList<>();
Processor finallyProcessor = null;
diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 4b9ab4f..2e60ec3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -129,7 +129,7 @@ public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition
@XmlAttribute
private String aggregateControllerRef;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
public AggregateDefinition() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
index 361f9cc..7e55d84 100644
--- a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
@@ -46,13 +46,13 @@ import org.apache.camel.util.ExpressionToPredicateAdapter;
@XmlAccessorType(XmlAccessType.FIELD)
public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
@XmlElement(name = "exception")
- private List<String> exceptions = new ArrayList<String>();
+ private List<String> exceptions = new ArrayList<>();
@XmlElement(name = "onWhen") @AsPredicate
private WhenDefinition onWhen;
@XmlElement(name = "handled") @AsPredicate
private ExpressionSubElementDefinition handled;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
@XmlTransient
private List<Class<? extends Throwable>> exceptionClasses;
@XmlTransient
@@ -66,7 +66,7 @@ public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
}
public CatchDefinition(Class<? extends Throwable> exceptionType) {
- exceptionClasses = new ArrayList<Class<? extends Throwable>>();
+ exceptionClasses = new ArrayList<>();
exceptionClasses.add(exceptionType);
}
@@ -155,7 +155,7 @@ public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
*/
public CatchDefinition exception(Class<? extends Throwable>... exceptions) {
if (exceptionClasses == null) {
- exceptionClasses = new ArrayList<Class<? extends Throwable>>();
+ exceptionClasses = new ArrayList<>();
}
if (exceptions != null) {
for (Class<? extends Throwable> exception : exceptions) {
@@ -269,7 +269,7 @@ public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
// must use the class resolver from CamelContext to load classes to ensure it can
// be loaded in all kind of environments such as JEE servers and OSGi etc.
List<String> list = getExceptions();
- List<Class<? extends Throwable>> answer = new ArrayList<Class<? extends Throwable>>(list.size());
+ List<Class<? extends Throwable>> answer = new ArrayList<>(list.size());
for (String name : list) {
Class<Throwable> type = context.getClassResolver().resolveMandatoryClass(name, Throwable.class);
answer.add(type);
diff --git a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
index d37058a..e5514f0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
@@ -46,7 +46,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlAccessorType(XmlAccessType.FIELD)
public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> {
@XmlElementRef @AsPredicate
- private List<WhenDefinition> whenClauses = new ArrayList<WhenDefinition>();
+ private List<WhenDefinition> whenClauses = new ArrayList<>();
@XmlElement
private OtherwiseDefinition otherwise;
@@ -131,7 +131,7 @@ public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> {
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- List<FilterProcessor> filters = new ArrayList<FilterProcessor>();
+ List<FilterProcessor> filters = new ArrayList<>();
for (WhenDefinition whenClause : whenClauses) {
FilterProcessor filter = (FilterProcessor) createProcessor(routeContext, whenClause);
filters.add(filter);
@@ -192,7 +192,7 @@ public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> {
*/
@AsPredicate
public ExpressionClause<ChoiceDefinition> when() {
- ExpressionClause<ChoiceDefinition> clause = new ExpressionClause<ChoiceDefinition>(this);
+ ExpressionClause<ChoiceDefinition> clause = new ExpressionClause<>(this);
addClause(new WhenDefinition(clause));
return clause;
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
index cffc3dc..5392f5d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
@@ -36,9 +36,9 @@ public class ContextScanDefinition {
@XmlAttribute
private Boolean includeNonSingletons;
@XmlElement(name = "excludes")
- private List<String> excludes = new ArrayList<String>();
+ private List<String> excludes = new ArrayList<>();
@XmlElement(name = "includes")
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<>();
public ContextScanDefinition() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java b/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
index 8b58e07..d2ac38e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
@@ -40,7 +40,7 @@ public abstract class ExpressionNode extends ProcessorDefinition<ExpressionNode>
@XmlElementRef
private ExpressionDefinition expression;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
public ExpressionNode() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java b/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
index 901c1ab..fd4b7ff 100644
--- a/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
@@ -42,7 +42,7 @@ public class HystrixDefinition extends ProcessorDefinition<HystrixDefinition> {
@XmlElement
private HystrixConfigurationDefinition hystrixConfiguration;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
@XmlTransient
private OnFallbackDefinition onFallback;
@XmlAttribute
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
index 5acd5b6..15bfa1f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
@@ -44,7 +44,7 @@ public class InterceptDefinition extends OutputDefinition<InterceptDefinition> {
@XmlTransient
protected Processor output;
@XmlTransient
- protected final List<Processor> intercepted = new ArrayList<Processor>();
+ protected final List<Processor> intercepted = new ArrayList<>();
public InterceptDefinition() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
index 38c34f6..2bd9e5f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
@@ -61,7 +61,7 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini
)
private LoadBalancerDefinition loadBalancerType;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
public LoadBalanceDefinition() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
index 1c1b6ec..25d7f00 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
@@ -97,7 +97,7 @@ public class MulticastDefinition extends OutputDefinition<MulticastDefinition> i
// force the answer as a multicast processor even if there is only one child processor in the multicast
if (!(answer instanceof MulticastProcessor)) {
- List<Processor> list = new ArrayList<Processor>(1);
+ List<Processor> list = new ArrayList<>(1);
list.add(answer);
answer = createCompositeProcessor(routeContext, list);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
index ee3462a..e526d06 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
@@ -63,14 +63,14 @@ public class OnCompletionDefinition extends ProcessorDefinition<OnCompletionDefi
@XmlAttribute(name = "useOriginalMessage")
private Boolean useOriginalMessagePolicy;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
@XmlTransient
private ExecutorService executorService;
@XmlTransient
private Boolean routeScoped;
// TODO: in Camel 3.0 the OnCompletionDefinition should not contain state and OnCompletion processors
@XmlTransient
- private final Map<String, Processor> onCompletions = new HashMap<String, Processor>();
+ private final Map<String, Processor> onCompletions = new HashMap<>();
public OnCompletionDefinition() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
index 507799e..3069d2f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
@@ -58,7 +58,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlAccessorType(XmlAccessType.FIELD)
public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefinition> {
@XmlElement(name = "exception", required = true)
- private List<String> exceptions = new ArrayList<String>();
+ private List<String> exceptions = new ArrayList<>();
@XmlElement(name = "onWhen") @AsPredicate
private WhenDefinition onWhen;
@XmlElement(name = "retryWhile") @AsPredicate
@@ -78,7 +78,7 @@ public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefini
@XmlAttribute(name = "useOriginalMessage")
private Boolean useOriginalMessagePolicy;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
@XmlTransient
private List<Class<? extends Throwable>> exceptionClasses;
@XmlTransient
@@ -95,7 +95,7 @@ public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefini
private Boolean routeScoped;
// TODO: in Camel 3.0 the OnExceptionDefinition should not contain state and ErrorHandler processors
@XmlTransient
- private final Map<String, Processor> errorHandlers = new HashMap<String, Processor>();
+ private final Map<String, Processor> errorHandlers = new HashMap<>();
@XmlTransient
private RedeliveryPolicy redeliveryPolicy;
@@ -107,7 +107,7 @@ public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefini
}
public OnExceptionDefinition(Class<? extends Throwable> exceptionType) {
- exceptionClasses = new ArrayList<Class<? extends Throwable>>();
+ exceptionClasses = new ArrayList<>();
exceptionClasses.add(exceptionType);
}
@@ -1028,7 +1028,7 @@ public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefini
protected List<Class<? extends Throwable>> createExceptionClasses(ClassResolver resolver) throws ClassNotFoundException {
List<String> list = getExceptions();
- List<Class<? extends Throwable>> answer = new ArrayList<Class<? extends Throwable>>(list.size());
+ List<Class<? extends Throwable>> answer = new ArrayList<>(list.size());
for (String name : list) {
Class<? extends Throwable> type = resolver.resolveMandatoryClass(name, Throwable.class);
answer.add(type);
diff --git a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
index a390f98..39f67cc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
@@ -36,7 +36,7 @@ import org.apache.camel.spi.Metadata;
public class OutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
@XmlElementRef
- protected List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ protected List<ProcessorDefinition<?>> outputs = new ArrayList<>();
public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
diff --git a/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
index cd3a64d..c14e96a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
@@ -33,11 +33,11 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class PackageScanDefinition {
@XmlElement(name = "package", required = true)
- private List<String> packages = new ArrayList<String>();
+ private List<String> packages = new ArrayList<>();
@XmlElement
- private List<String> excludes = new ArrayList<String>();
+ private List<String> excludes = new ArrayList<>();
@XmlElement
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<>();
public PackageScanDefinition() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 9544d93..d67fa50 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -94,11 +94,11 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
@XmlAttribute
protected Boolean inheritErrorHandler;
@XmlTransient
- private final LinkedList<Block> blocks = new LinkedList<Block>();
+ private final LinkedList<Block> blocks = new LinkedList<>();
@XmlTransient
private ProcessorDefinition<?> parent;
@XmlTransient
- private final List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
+ private final List<InterceptStrategy> interceptStrategies = new ArrayList<>();
// use xs:any to support optional property placeholders
@XmlAnyAttribute
private Map<QName, Object> otherAttributes;
@@ -445,7 +445,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
}
protected Processor createOutputsProcessorImpl(RouteContext routeContext, Collection<ProcessorDefinition<?>> outputs) throws Exception {
- List<Processor> list = new ArrayList<Processor>();
+ List<Processor> list = new ArrayList<>();
for (ProcessorDefinition<?> output : outputs) {
// allow any custom logic before we create the processor
@@ -458,7 +458,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
ProcessorDefinitionHelper.resolveKnownConstantFields(output);
// also resolve properties and constant fields on embedded expressions
- ProcessorDefinition<?> me = (ProcessorDefinition<?>) output;
+ ProcessorDefinition<?> me = output;
if (me instanceof ExpressionNode) {
ExpressionNode exp = (ExpressionNode) me;
ExpressionDefinition expressionDefinition = exp.getExpression();
@@ -540,7 +540,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
ProcessorDefinitionHelper.resolveKnownConstantFields(this);
// also resolve properties and constant fields on embedded expressions
- ProcessorDefinition<?> me = (ProcessorDefinition<?>) this;
+ ProcessorDefinition<?> me = this;
if (me instanceof ExpressionNode) {
ExpressionNode exp = (ExpressionNode) me;
ExpressionDefinition expressionDefinition = exp.getExpression();
@@ -618,7 +618,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
@SuppressWarnings("unchecked")
public Type attribute(QName name, Object value) {
if (otherAttributes == null) {
- otherAttributes = new HashMap<QName, Object>();
+ otherAttributes = new HashMap<>();
}
otherAttributes.put(name, value);
return (Type) this;
@@ -1753,7 +1753,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
public RecipientListDefinition<Type> recipientList(@AsEndpointUri Expression recipients) {
- RecipientListDefinition<Type> answer = new RecipientListDefinition<Type>(recipients);
+ RecipientListDefinition<Type> answer = new RecipientListDefinition<>(recipients);
addOutput(answer);
return answer;
}
@@ -1767,7 +1767,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
public RecipientListDefinition<Type> recipientList(@AsEndpointUri Expression recipients, String delimiter) {
- RecipientListDefinition<Type> answer = new RecipientListDefinition<Type>(recipients);
+ RecipientListDefinition<Type> answer = new RecipientListDefinition<>(recipients);
answer.setDelimiter(delimiter);
addOutput(answer);
return answer;
@@ -1782,7 +1782,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@AsEndpointUri
public ExpressionClause<RecipientListDefinition<Type>> recipientList(String delimiter) {
- RecipientListDefinition<Type> answer = new RecipientListDefinition<Type>();
+ RecipientListDefinition<Type> answer = new RecipientListDefinition<>();
answer.setDelimiter(delimiter);
addOutput(answer);
return ExpressionClause.createAndSetExpression(answer);
@@ -1796,7 +1796,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@AsEndpointUri
public ExpressionClause<RecipientListDefinition<Type>> recipientList() {
- RecipientListDefinition<Type> answer = new RecipientListDefinition<Type>();
+ RecipientListDefinition<Type> answer = new RecipientListDefinition<>();
addOutput(answer);
return ExpressionClause.createAndSetExpression(answer);
}
@@ -1817,7 +1817,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@Deprecated
public Type routingSlip(String header, String uriDelimiter) {
- RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header, uriDelimiter);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<>(header, uriDelimiter);
addOutput(answer);
return (Type) this;
}
@@ -1838,7 +1838,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@Deprecated
public Type routingSlip(String header) {
- RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<>(header);
addOutput(answer);
return (Type) this;
}
@@ -1861,7 +1861,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@Deprecated
public Type routingSlip(String header, String uriDelimiter, boolean ignoreInvalidEndpoints) {
- RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header, uriDelimiter);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<>(header, uriDelimiter);
answer.setIgnoreInvalidEndpoints(ignoreInvalidEndpoints);
addOutput(answer);
return (Type) this;
@@ -1885,7 +1885,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@Deprecated
public Type routingSlip(String header, boolean ignoreInvalidEndpoints) {
- RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<>(header);
answer.setIgnoreInvalidEndpoints(ignoreInvalidEndpoints);
addOutput(answer);
return (Type) this;
@@ -1904,7 +1904,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
public RoutingSlipDefinition<Type> routingSlip(@AsEndpointUri Expression expression, String uriDelimiter) {
- RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(expression, uriDelimiter);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<>(expression, uriDelimiter);
addOutput(answer);
return answer;
}
@@ -1922,7 +1922,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
public RoutingSlipDefinition<Type> routingSlip(@AsEndpointUri Expression expression) {
- RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(expression);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<>(expression);
addOutput(answer);
return answer;
}
@@ -1939,7 +1939,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the expression clause to configure the expression to decide the destinations
*/
public ExpressionClause<RoutingSlipDefinition<Type>> routingSlip() {
- RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>();
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<>();
addOutput(answer);
return ExpressionClause.createAndSetExpression(answer);
}
@@ -1957,7 +1957,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
public DynamicRouterDefinition<Type> dynamicRouter(@AsEndpointUri Expression expression) {
- DynamicRouterDefinition<Type> answer = new DynamicRouterDefinition<Type>(expression);
+ DynamicRouterDefinition<Type> answer = new DynamicRouterDefinition<>(expression);
addOutput(answer);
return answer;
}
@@ -1975,7 +1975,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@AsEndpointUri
public ExpressionClause<DynamicRouterDefinition<Type>> dynamicRouter() {
- DynamicRouterDefinition<Type> answer = new DynamicRouterDefinition<Type>();
+ DynamicRouterDefinition<Type> answer = new DynamicRouterDefinition<>();
addOutput(answer);
return ExpressionClause.createAndSetExpression(answer);
}
@@ -2086,7 +2086,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
public ExpressionClause<ResequenceDefinition> resequence() {
ResequenceDefinition answer = new ResequenceDefinition();
- ExpressionClause<ResequenceDefinition> clause = new ExpressionClause<ResequenceDefinition>(answer);
+ ExpressionClause<ResequenceDefinition> clause = new ExpressionClause<>(answer);
answer.setExpression(clause);
addOutput(answer);
return clause;
@@ -2113,7 +2113,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
public ExpressionClause<AggregateDefinition> aggregate() {
AggregateDefinition answer = new AggregateDefinition();
- ExpressionClause<AggregateDefinition> clause = new ExpressionClause<AggregateDefinition>(answer);
+ ExpressionClause<AggregateDefinition> clause = new ExpressionClause<>(answer);
answer.setExpression(clause);
addOutput(answer);
return clause;
@@ -3055,7 +3055,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return a expression builder clause to set the body
*/
public ExpressionClause<ProcessorDefinition<Type>> setBody() {
- ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<ProcessorDefinition<Type>>(this);
+ ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<>(this);
SetBodyDefinition answer = new SetBodyDefinition(clause);
addOutput(answer);
return clause;
@@ -3133,7 +3133,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
public ExpressionClause<ProcessorDefinition<Type>> transform() {
ExpressionClause<ProcessorDefinition<Type>> clause =
- new ExpressionClause<ProcessorDefinition<Type>>((ProcessorDefinition<Type>) this);
+ new ExpressionClause<>(this);
TransformDefinition answer = new TransformDefinition(clause);
addOutput(answer);
return clause;
@@ -3159,7 +3159,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
public ExpressionClause<ProcessorDefinition<Type>> script() {
ExpressionClause<ProcessorDefinition<Type>> clause =
- new ExpressionClause<ProcessorDefinition<Type>>((ProcessorDefinition<Type>) this);
+ new ExpressionClause<>(this);
ScriptDefinition answer = new ScriptDefinition(clause);
addOutput(answer);
return clause;
@@ -3182,7 +3182,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return a expression builder clause to set the header
*/
public ExpressionClause<ProcessorDefinition<Type>> setHeader(String name) {
- ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<ProcessorDefinition<Type>>(this);
+ ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<>(this);
SetHeaderDefinition answer = new SetHeaderDefinition(name, clause);
addOutput(answer);
return clause;
@@ -3231,7 +3231,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@Deprecated
public ExpressionClause<ProcessorDefinition<Type>> setOutHeader(String name) {
- ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<ProcessorDefinition<Type>>(this);
+ ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<>(this);
SetOutHeaderDefinition answer = new SetOutHeaderDefinition(name, clause);
addOutput(answer);
return clause;
@@ -3287,7 +3287,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return a expression builder clause to set the property
*/
public ExpressionClause<ProcessorDefinition<Type>> setProperty(String name) {
- ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<ProcessorDefinition<Type>>(this);
+ ExpressionClause<ProcessorDefinition<Type>> clause = new ExpressionClause<>(this);
SetPropertyDefinition answer = new SetPropertyDefinition(name, clause);
addOutput(answer);
return clause;
@@ -3429,7 +3429,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*/
@SuppressWarnings("unchecked")
public <T> Type sort(Expression expression, Comparator<T> comparator) {
- addOutput(new SortDefinition<T>(expression, comparator));
+ addOutput(new SortDefinition<>(expression, comparator));
return (Type) this;
}
@@ -3439,7 +3439,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
*/
public <T> ExpressionClause<SortDefinition<T>> sort() {
- SortDefinition<T> answer = new SortDefinition<T>();
+ SortDefinition<T> answer = new SortDefinition<>();
addOutput(answer);
return ExpressionClause.createAndSetExpression(answer);
}
@@ -4047,7 +4047,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the expression to create the {@link DataFormat}
*/
public DataFormatClause<ProcessorDefinition<Type>> unmarshal() {
- return new DataFormatClause<ProcessorDefinition<Type>>(this, DataFormatClause.Operation.Unmarshal);
+ return new DataFormatClause<>(this, DataFormatClause.Operation.Unmarshal);
}
/**
@@ -4099,7 +4099,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the expression to create the {@link DataFormat}
*/
public DataFormatClause<ProcessorDefinition<Type>> marshal() {
- return new DataFormatClause<ProcessorDefinition<Type>>(this, DataFormatClause.Operation.Marshal);
+ return new DataFormatClause<>(this, DataFormatClause.Operation.Marshal);
}
/**
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
index 15e01c1..0c5f1bf 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public final class ProcessorDefinitionHelper {
private static final Logger LOG = LoggerFactory.getLogger(ProcessorDefinitionHelper.class);
- private static final ThreadLocal<RestoreAction> CURRENT_RESTORE_ACTION = new ThreadLocal<RestoreAction>();
+ private static final ThreadLocal<RestoreAction> CURRENT_RESTORE_ACTION = new ThreadLocal<>();
private ProcessorDefinitionHelper() {
}
@@ -68,7 +68,7 @@ public final class ProcessorDefinitionHelper {
* @return the found definitions, or <tt>null</tt> if not found
*/
public static <T> Iterator<T> filterTypeInOutputs(List<ProcessorDefinition<?>> outputs, Class<T> type, int maxDeep) {
- List<T> found = new ArrayList<T>();
+ List<T> found = new ArrayList<>();
doFindType(outputs, type, found, maxDeep);
return found.iterator();
}
@@ -82,7 +82,7 @@ public final class ProcessorDefinitionHelper {
* @return the first found type, or <tt>null</tt> if not found
*/
public static <T> T findFirstTypeInOutputs(List<ProcessorDefinition<?>> outputs, Class<T> type) {
- List<T> found = new ArrayList<T>();
+ List<T> found = new ArrayList<>();
doFindType(outputs, type, found, -1);
if (found.isEmpty()) {
return null;
@@ -194,7 +194,7 @@ public final class ProcessorDefinitionHelper {
}
if (set == null) {
- set = new LinkedHashSet<String>();
+ set = new LinkedHashSet<>();
}
// add ourselves
@@ -567,7 +567,7 @@ public final class ProcessorDefinitionHelper {
private static final class RestoreAction implements Runnable {
private final RestoreAction prevChange;
- private final ArrayList<Runnable> actions = new ArrayList<Runnable>();
+ private final ArrayList<Runnable> actions = new ArrayList<>();
private RestoreAction(RestoreAction prevChange) {
this.prevChange = prevChange;
@@ -682,7 +682,7 @@ public final class ProcessorDefinitionHelper {
LOG.trace("Resolving property placeholders for: {}", definition);
// find all getter/setter which we can use for property placeholders
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
IntrospectionSupport.getProperties(definition, properties, null);
OtherAttributesAware other = null;
@@ -721,7 +721,7 @@ public final class ProcessorDefinitionHelper {
}
}
- Map<String, Object> changedProperties = new HashMap<String, Object>();
+ Map<String, Object> changedProperties = new HashMap<>();
if (!properties.isEmpty()) {
LOG.trace("There are {} properties on: {}", properties.size(), definition);
// lookup and resolve properties for String based properties
@@ -762,10 +762,10 @@ public final class ProcessorDefinitionHelper {
LOG.trace("Resolving known fields for: {}", definition);
// find all String getter/setter
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
IntrospectionSupport.getProperties(definition, properties, null);
- Map<String, Object> changedProperties = new HashMap<String, Object>();
+ Map<String, Object> changedProperties = new HashMap<>();
if (!properties.isEmpty()) {
LOG.trace("There are {} properties on: {}", properties.size(), definition);
diff --git a/camel-core/src/main/java/org/apache/camel/model/PropertiesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PropertiesDefinition.java
index 1b0401a..008cabf 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PropertiesDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PropertiesDefinition.java
@@ -54,7 +54,7 @@ public class PropertiesDefinition {
}
public Map<String, String> asMap() {
- Map<String, String> propertiesAsMap = new HashMap<String, String>();
+ Map<String, String> propertiesAsMap = new HashMap<>();
for (PropertyDefinition propertyType : getProperties()) {
propertiesAsMap.put(propertyType.getKey(), propertyType.getValue());
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
index 391a093..7c12c2c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
@@ -159,7 +159,7 @@ public class RecipientListDefinition<Type extends ProcessorDefinition<Type>> ext
// create a pipeline with two processors
// the first is the eval processor which evaluates the expression to use
// the second is the recipient list
- List<Processor> pipe = new ArrayList<Processor>(2);
+ List<Processor> pipe = new ArrayList<>(2);
// the eval processor must be wrapped in error handler, so in case there was an
// error during evaluation, the error handler can deal with it
diff --git a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
index 08df767..b2e539d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
@@ -63,7 +63,7 @@ public class ResequenceDefinition extends ProcessorDefinition<ResequenceDefiniti
@XmlElementRef @Metadata(required = "true")
private ExpressionDefinition expression;
@XmlElementRef
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
public ResequenceDefinition() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
index ad3fcc5..5da18a6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
@@ -70,7 +70,7 @@ public final class RestContextRefDefinitionHelper {
// must clone the rest definitions as they can be reused with multiple CamelContexts
// and they would need their own instances of the definitions to not have side effects among
// the CamelContext - for example property placeholder resolutions etc.
- List<RestDefinition> clones = new ArrayList<RestDefinition>(answer.size());
+ List<RestDefinition> clones = new ArrayList<>(answer.size());
try {
JAXBContext jaxb = getOrCreateJAXBContext(camelContext);
for (RestDefinition def : answer) {
@@ -134,7 +134,7 @@ public final class RestContextRefDefinitionHelper {
}
if (name != null && name2 != null && name.getNamespaces() != null && !name.getNamespaces().isEmpty()) {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.putAll(name.getNamespaces());
name2.setNamespaces(map);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
index 5b4dad2..2a03d58 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
@@ -68,7 +68,7 @@ public final class RouteContextRefDefinitionHelper {
// must clone the route definitions as they can be reused with multiple CamelContexts
// and they would need their own instances of the definitions to not have side effects among
// the CamelContext - for example property placeholder resolutions etc.
- List<RouteDefinition> clones = new ArrayList<RouteDefinition>(answer.size());
+ List<RouteDefinition> clones = new ArrayList<>(answer.size());
try {
JAXBContext jaxb = getOrCreateJAXBContext(camelContext);
for (RouteDefinition def : answer) {
@@ -120,7 +120,7 @@ public final class RouteContextRefDefinitionHelper {
}
if (name != null && name2 != null && name.getNamespaces() != null && !name.getNamespaces().isEmpty()) {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.putAll(name.getNamespaces());
name2.setNamespaces(map);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
index ddb3fb9..9e17ac4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -70,8 +70,8 @@ import org.apache.camel.util.ObjectHelper;
// must use XmlAccessType.PROPERTY as there is some custom logic needed to be executed in the setter methods
public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
private final AtomicBoolean prepared = new AtomicBoolean(false);
- private List<FromDefinition> inputs = new ArrayList<FromDefinition>();
- private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ private List<FromDefinition> inputs = new ArrayList<>();
+ private List<ProcessorDefinition<?>> outputs = new ArrayList<>();
private String group;
private String streamCache;
private String trace;
@@ -190,7 +190,7 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
}
public List<RouteContext> addRoutes(ModelCamelContext camelContext, Collection<Route> routes) throws Exception {
- List<RouteContext> answer = new ArrayList<RouteContext>();
+ List<RouteContext> answer = new ArrayList<>();
@SuppressWarnings("deprecation")
ErrorHandlerFactory handler = camelContext.getErrorHandlerBuilder();
@@ -621,7 +621,7 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
*/
public RouteDefinition routePolicy(RoutePolicy... policies) {
if (routePolicies == null) {
- routePolicies = new ArrayList<RoutePolicy>();
+ routePolicies = new ArrayList<>();
}
for (RoutePolicy policy : policies) {
routePolicies.add(policy);
@@ -1294,7 +1294,7 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
throw new FailedToCreateRouteException(route.getId(), route.toString(), at, cause);
}
- List<ProcessorDefinition<?>> list = new ArrayList<ProcessorDefinition<?>>(outputs);
+ List<ProcessorDefinition<?>> list = new ArrayList<>(outputs);
for (ProcessorDefinition<?> output : list) {
try {
output.addRoutes(routeContext, routes);
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
index 81409ad..041bdc2 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
@@ -68,7 +68,7 @@ public final class RouteDefinitionHelper {
* @return the endpoints uris
*/
public static Set<String> gatherAllEndpointUris(CamelContext camelContext, RouteDefinition route, boolean includeInputs, boolean includeOutputs, boolean includeDynamic) {
- Set<String> answer = new LinkedHashSet<String>();
+ Set<String> answer = new LinkedHashSet<>();
if (includeInputs) {
for (FromDefinition from : route.getInputs()) {
@@ -120,7 +120,7 @@ public final class RouteDefinitionHelper {
*/
public static void forceAssignIds(CamelContext context, List<RouteDefinition> routes) throws Exception {
// handle custom assigned id's first, and then afterwards assign auto generated ids
- Set<String> customIds = new HashSet<String>();
+ Set<String> customIds = new HashSet<>();
for (final RouteDefinition route : routes) {
// if there was a custom id assigned, then make sure to support property placeholders
@@ -173,7 +173,7 @@ public final class RouteDefinitionHelper {
* @return <tt>null</tt> if no duplicate id's detected, otherwise the first found duplicate id is returned.
*/
public static String validateUniqueIds(RouteDefinition target, List<RouteDefinition> routes) {
- Set<String> routesIds = new LinkedHashSet<String>();
+ Set<String> routesIds = new LinkedHashSet<>();
// gather all ids for the existing route, but only include custom ids, and no abstract ids
// as abstract nodes is cross-cutting functionality such as interceptors etc
for (RouteDefinition route : routes) {
@@ -186,7 +186,7 @@ public final class RouteDefinitionHelper {
// gather all ids for the target route, but only include custom ids, and no abstract ids
// as abstract nodes is cross-cutting functionality such as interceptors etc
- Set<String> targetIds = new LinkedHashSet<String>();
+ Set<String> targetIds = new LinkedHashSet<>();
ProcessorDefinitionHelper.gatherAllNodeIds(target, targetIds, true, false);
// now check for clash with the target route
@@ -298,13 +298,13 @@ public final class RouteDefinitionHelper {
initRouteInputs(context, route.getInputs());
// abstracts is the cross cutting concerns
- List<ProcessorDefinition<?>> abstracts = new ArrayList<ProcessorDefinition<?>>();
+ List<ProcessorDefinition<?>> abstracts = new ArrayList<>();
// upper is the cross cutting concerns such as interceptors, error handlers etc
- List<ProcessorDefinition<?>> upper = new ArrayList<ProcessorDefinition<?>>();
+ List<ProcessorDefinition<?>> upper = new ArrayList<>();
// lower is the regular route
- List<ProcessorDefinition<?>> lower = new ArrayList<ProcessorDefinition<?>>();
+ List<ProcessorDefinition<?>> lower = new ArrayList<>();
RouteDefinitionHelper.prepareRouteForInit(route, abstracts, lower);
@@ -454,17 +454,17 @@ public final class RouteDefinitionHelper {
for (ProcessorDefinition processor : abstracts) {
if (processor instanceof InterceptSendToEndpointDefinition) {
if (interceptSendToEndpointDefinitions == null) {
- interceptSendToEndpointDefinitions = new ArrayList<InterceptSendToEndpointDefinition>();
+ interceptSendToEndpointDefinitions = new ArrayList<>();
}
interceptSendToEndpointDefinitions.add((InterceptSendToEndpointDefinition) processor);
} else if (processor instanceof InterceptFromDefinition) {
if (interceptFromDefinitions == null) {
- interceptFromDefinitions = new ArrayList<InterceptFromDefinition>();
+ interceptFromDefinitions = new ArrayList<>();
}
interceptFromDefinitions.add((InterceptFromDefinition) processor);
} else if (processor instanceof InterceptDefinition) {
if (intercepts == null) {
- intercepts = new ArrayList<InterceptDefinition>();
+ intercepts = new ArrayList<>();
}
intercepts.add((InterceptDefinition) processor);
}
@@ -555,7 +555,7 @@ public final class RouteDefinitionHelper {
private static void initOnCompletions(List<ProcessorDefinition<?>> abstracts, List<ProcessorDefinition<?>> upper,
List<OnCompletionDefinition> onCompletions) {
- List<OnCompletionDefinition> completions = new ArrayList<OnCompletionDefinition>();
+ List<OnCompletionDefinition> completions = new ArrayList<>();
// find the route scoped onCompletions
for (ProcessorDefinition out : abstracts) {
diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
index 3f51b0e..7dc71e4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
@@ -39,17 +39,17 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class RoutesDefinition extends OptionalIdentifiedDefinition<RoutesDefinition> implements RouteContainer {
@XmlElementRef
- private List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
+ private List<RouteDefinition> routes = new ArrayList<>();
@XmlTransient
- private List<InterceptDefinition> intercepts = new ArrayList<InterceptDefinition>();
+ private List<InterceptDefinition> intercepts = new ArrayList<>();
@XmlTransient
- private List<InterceptFromDefinition> interceptFroms = new ArrayList<InterceptFromDefinition>();
+ private List<InterceptFromDefinition> interceptFroms = new ArrayList<>();
@XmlTransient
- private List<InterceptSendToEndpointDefinition> interceptSendTos = new ArrayList<InterceptSendToEndpointDefinition>();
+ private List<InterceptSendToEndpointDefinition> interceptSendTos = new ArrayList<>();
@XmlTransient
- private List<OnExceptionDefinition> onExceptions = new ArrayList<OnExceptionDefinition>();
+ private List<OnExceptionDefinition> onExceptions = new ArrayList<>();
@XmlTransient
- private List<OnCompletionDefinition> onCompletions = new ArrayList<OnCompletionDefinition>();
+ private List<OnCompletionDefinition> onCompletions = new ArrayList<>();
@XmlTransient
private ModelCamelContext camelContext;
@XmlTransient
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index a287659..046b493 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -141,7 +141,7 @@ public class ThreadsDefinition extends OutputDefinition<ThreadsDefinition> imple
ThreadsProcessor thread = new ThreadsProcessor(routeContext.getCamelContext(), threadPool, shutdownThreadPool, policy);
- List<Processor> pipe = new ArrayList<Processor>(2);
+ List<Processor> pipe = new ArrayList<>(2);
pipe.add(thread);
pipe.add(createChildProcessor(routeContext, true));
// wrap in nested pipeline so this appears as one processor
diff --git a/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
index f6628b9..e640b77 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
@@ -87,7 +87,7 @@ public class ToDynamicDefinition extends NoOutputDefinition<ToDynamicDefinition>
}
protected Expression createExpression(RouteContext routeContext) {
- List<Expression> list = new ArrayList<Expression>();
+ List<Expression> list = new ArrayList<>();
String[] parts = safeSplitRaw(uri);
for (String part : parts) {
@@ -215,7 +215,7 @@ public class ToDynamicDefinition extends NoOutputDefinition<ToDynamicDefinition>
private static List<Pair> checkRAW(String s) {
Matcher matcher = RAW_PATTERN.matcher(s);
- List<Pair> answer = new ArrayList<Pair>();
+ List<Pair> answer = new ArrayList<>();
// Check all occurrences
while (matcher.find()) {
answer.add(new Pair(matcher.start(), matcher.end() - 1));
diff --git a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
index ad8c5f3..44face5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
@@ -73,7 +73,7 @@ public class TryDefinition extends OutputDefinition<TryDefinition> {
throw new IllegalArgumentException("Definition has no children on " + this);
}
- List<Processor> catchProcessors = new ArrayList<Processor>();
+ List<Processor> catchProcessors = new ArrayList<>();
if (catchClauses != null) {
for (CatchDefinition catchClause : catchClauses) {
catchProcessors.add(createProcessor(routeContext, catchClause));
@@ -257,8 +257,8 @@ public class TryDefinition extends OutputDefinition<TryDefinition> {
protected void checkInitialized() {
if (!initialized) {
initialized = true;
- outputsWithoutCatches = new ArrayList<ProcessorDefinition<?>>();
- catchClauses = new ArrayList<CatchDefinition>();
+ outputsWithoutCatches = new ArrayList<>();
+ catchClauses = new ArrayList<>();
finallyClause = null;
for (ProcessorDefinition<?> output : outputs) {
diff --git a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
index 51440aa..4d92407 100644
--- a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
@@ -52,7 +52,7 @@ public class WireTapDefinition<Type extends ProcessorDefinition<Type>> extends T
@XmlElement(name = "body")
private ExpressionSubElementDefinition newExchangeExpression;
@XmlElementRef
- private List<SetHeaderDefinition> headers = new ArrayList<SetHeaderDefinition>();
+ private List<SetHeaderDefinition> headers = new ArrayList<>();
@XmlTransient
private ExecutorService executorService;
@XmlAttribute
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index 34e062c..86bb526 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -102,7 +102,7 @@ public class DataFormatsDefinition {
* @return A Map of the contained DataFormatType's indexed by id.
*/
public Map<String, DataFormatDefinition> asMap() {
- Map<String, DataFormatDefinition> dataFormatsAsMap = new HashMap<String, DataFormatDefinition>();
+ Map<String, DataFormatDefinition> dataFormatsAsMap = new HashMap<>();
for (DataFormatDefinition dataFormatType : getDataFormats()) {
dataFormatsAsMap.put(dataFormatType.getId(), dataFormatType);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
index 3fab521..778f58b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
@@ -314,7 +314,7 @@ public abstract class UniVocityAbstractDataFormat extends DataFormatDefinition {
if (headers == null) {
return null;
}
- List<String> names = new ArrayList<String>(headers.size());
+ List<String> names = new ArrayList<>(headers.size());
for (UniVocityHeader header : headers) {
if (header.getName() != null && !header.getName().isEmpty()) {
names.add(header.getName());
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
index acefe2f..dd3fc3b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
@@ -471,7 +471,7 @@ public class XMLSecurityDataFormat extends DataFormatDefinition implements Names
@Override
public void setNamespaces(Map<String, String> nspaces) {
if (this.namespaces == null) {
- this.namespaces = new HashMap<String, String>();
+ this.namespaces = new HashMap<>();
}
this.namespaces.putAll(nspaces);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index 7321fd3..99e631d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -267,7 +267,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- List<ConverterEntry> list = new ArrayList<ConverterEntry>();
+ List<ConverterEntry> list = new ArrayList<>();
for (String str : v) {
ConverterEntry entry = new ConverterEntry();
entry.setClsName(str);
@@ -284,7 +284,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (ConverterEntry entry : v.getList()) {
list.add(entry.getClsName());
}
@@ -332,7 +332,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- List<ImplicitCollectionEntry> list = new ArrayList<ImplicitCollectionEntry>();
+ List<ImplicitCollectionEntry> list = new ArrayList<>();
for (Entry<String, String[]> e : v.entrySet()) {
ImplicitCollectionEntry entry = new ImplicitCollectionEntry(e.getKey(), e.getValue());
list.add(entry);
@@ -350,7 +350,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- Map<String, String[]> map = new HashMap<String, String[]>();
+ Map<String, String[]> map = new HashMap<>();
for (ImplicitCollectionEntry entry : v.getList()) {
map.put(entry.getClsName(), entry.getFields());
}
@@ -421,7 +421,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- List<AliasEntry> ret = new ArrayList<AliasEntry>(value.size());
+ List<AliasEntry> ret = new ArrayList<>(value.size());
for (Map.Entry<String, String> entry : value.entrySet()) {
ret.add(new AliasEntry(entry.getKey(), entry.getValue()));
}
@@ -436,7 +436,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- Map<String, String> answer = new HashMap<String, String>();
+ Map<String, String> answer = new HashMap<>();
for (AliasEntry alias : value.getList()) {
answer.put(alias.getName(), alias.getClsName());
}
@@ -509,7 +509,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- List<OmitFieldEntry> list = new ArrayList<OmitFieldEntry>();
+ List<OmitFieldEntry> list = new ArrayList<>();
for (Entry<String, String[]> e : v.entrySet()) {
OmitFieldEntry entry = new OmitFieldEntry(e.getKey(), e.getValue());
list.add(entry);
@@ -527,7 +527,7 @@ public class XStreamDataFormat extends DataFormatDefinition {
return null;
}
- Map<String, String[]> map = new HashMap<String, String[]>();
+ Map<String, String[]> map = new HashMap<>();
for (OmitFieldEntry entry : v.getList()) {
map.put(entry.getClsName(), entry.getFields());
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java
index 10f1de5..04c89e4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java
@@ -49,9 +49,9 @@ import org.apache.camel.util.ObjectHelper;
@Deprecated
public class CircuitBreakerLoadBalancerDefinition extends LoadBalancerDefinition {
@XmlTransient
- private List<Class<?>> exceptionTypes = new ArrayList<Class<?>>();
+ private List<Class<?>> exceptionTypes = new ArrayList<>();
@XmlElement(name = "exception")
- private List<String> exceptions = new ArrayList<String>();
+ private List<String> exceptions = new ArrayList<>();
@XmlAttribute
private Long halfOpenAfter;
@XmlAttribute
@@ -70,7 +70,7 @@ public class CircuitBreakerLoadBalancerDefinition extends LoadBalancerDefinition
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
CircuitBreakerLoadBalancer answer;
- List<Class<?>> classes = new ArrayList<Class<?>>();
+ List<Class<?>> classes = new ArrayList<>();
if (!exceptionTypes.isEmpty()) {
classes.addAll(exceptionTypes);
} else if (!exceptions.isEmpty()) {
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
index 920280e..a548604 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
@@ -45,9 +45,9 @@ import org.apache.camel.util.ObjectHelper;
@XmlAccessorType(XmlAccessType.FIELD)
public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition {
@XmlTransient
- private List<Class<?>> exceptionTypes = new ArrayList<Class<?>>();
+ private List<Class<?>> exceptionTypes = new ArrayList<>();
@XmlElement(name = "exception")
- private List<String> exceptions = new ArrayList<String>();
+ private List<String> exceptions = new ArrayList<>();
@XmlAttribute
private Boolean roundRobin;
@XmlAttribute
@@ -62,7 +62,7 @@ public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition {
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
FailOverLoadBalancer answer;
- List<Class<?>> classes = new ArrayList<Class<?>>();
+ List<Class<?>> classes = new ArrayList<>();
if (!exceptionTypes.isEmpty()) {
classes.addAll(exceptionTypes);
} else if (!exceptions.isEmpty()) {
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
index 8dc572e..b235baf 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
@@ -56,7 +56,7 @@ public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
WeightedLoadBalancer loadBalancer;
- List<Integer> distributionRatioList = new ArrayList<Integer>();
+ List<Integer> distributionRatioList = new ArrayList<>();
try {
String[] ratios = distributionRatio.split(getDistributionRatioDelimiter());
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 4e111fd..db9dc46 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
@@ -209,7 +209,7 @@ public class RestBindingDefinition extends OptionalIdentifiedDefinition<RestBind
DataFormat dataFormat, String prefix) throws Exception {
if (config.getDataFormatProperties() != null && !config.getDataFormatProperties().isEmpty()) {
// must use a copy as otherwise the options gets removed during introspection setProperties
- Map<String, Object> copy = new HashMap<String, Object>();
+ Map<String, Object> copy = new HashMap<>();
// filter keys on prefix
// - either its a known prefix and must match the prefix parameter
@@ -252,7 +252,7 @@ public class RestBindingDefinition extends OptionalIdentifiedDefinition<RestBind
*/
public void addDefaultValue(String paramName, String defaultValue) {
if (defaultValues == null) {
- defaultValues = new HashMap<String, String>();
+ defaultValues = new HashMap<>();
}
defaultValues.put(paramName, defaultValue);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
index 0444f6b..dcbe5ce 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
@@ -100,22 +100,22 @@ public class RestConfigurationDefinition {
private String xmlDataFormat;
@XmlElement(name = "componentProperty")
- private List<RestPropertyDefinition> componentProperties = new ArrayList<RestPropertyDefinition>();
+ private List<RestPropertyDefinition> componentProperties = new ArrayList<>();
@XmlElement(name = "endpointProperty")
- private List<RestPropertyDefinition> endpointProperties = new ArrayList<RestPropertyDefinition>();
+ private List<RestPropertyDefinition> endpointProperties = new ArrayList<>();
@XmlElement(name = "consumerProperty") @Metadata(label = "consumer")
- private List<RestPropertyDefinition> consumerProperties = new ArrayList<RestPropertyDefinition>();
+ private List<RestPropertyDefinition> consumerProperties = new ArrayList<>();
@XmlElement(name = "dataFormatProperty")
- private List<RestPropertyDefinition> dataFormatProperties = new ArrayList<RestPropertyDefinition>();
+ private List<RestPropertyDefinition> dataFormatProperties = new ArrayList<>();
@XmlElement(name = "apiProperty") @Metadata(label = "consumer")
- private List<RestPropertyDefinition> apiProperties = new ArrayList<RestPropertyDefinition>();
+ private List<RestPropertyDefinition> apiProperties = new ArrayList<>();
@XmlElement(name = "corsHeaders") @Metadata(label = "consumer")
- private List<RestPropertyDefinition> corsHeaders = new ArrayList<RestPropertyDefinition>();
+ private List<RestPropertyDefinition> corsHeaders = new ArrayList<>();
public String getComponent() {
return component;
@@ -822,7 +822,7 @@ public class RestConfigurationDefinition {
answer.setXmlDataFormat(xmlDataFormat);
}
if (!componentProperties.isEmpty()) {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
for (RestPropertyDefinition prop : componentProperties) {
String key = prop.getKey();
String value = CamelContextHelper.parseText(context, prop.getValue());
@@ -831,7 +831,7 @@ public class RestConfigurationDefinition {
answer.setComponentProperties(props);
}
if (!endpointProperties.isEmpty()) {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
for (RestPropertyDefinition prop : endpointProperties) {
String key = prop.getKey();
String value = CamelContextHelper.parseText(context, prop.getValue());
@@ -840,7 +840,7 @@ public class RestConfigurationDefinition {
answer.setEndpointProperties(props);
}
if (!consumerProperties.isEmpty()) {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
for (RestPropertyDefinition prop : consumerProperties) {
String key = prop.getKey();
String value = CamelContextHelper.parseText(context, prop.getValue());
@@ -849,7 +849,7 @@ public class RestConfigurationDefinition {
answer.setConsumerProperties(props);
}
if (!dataFormatProperties.isEmpty()) {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
for (RestPropertyDefinition prop : dataFormatProperties) {
String key = prop.getKey();
String value = CamelContextHelper.parseText(context, prop.getValue());
@@ -858,7 +858,7 @@ public class RestConfigurationDefinition {
answer.setDataFormatProperties(props);
}
if (!apiProperties.isEmpty()) {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
for (RestPropertyDefinition prop : apiProperties) {
String key = prop.getKey();
String value = CamelContextHelper.parseText(context, prop.getValue());
@@ -867,7 +867,7 @@ public class RestConfigurationDefinition {
answer.setApiProperties(props);
}
if (!corsHeaders.isEmpty()) {
- Map<String, String> props = new HashMap<String, String>();
+ Map<String, String> props = new HashMap<>();
for (RestPropertyDefinition prop : corsHeaders) {
String key = prop.getKey();
String value = CamelContextHelper.parseText(context, prop.getValue());
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index ab43326..e421174 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -76,7 +76,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition>
private Boolean apiDocs;
@XmlElementRef
- private List<VerbDefinition> verbs = new ArrayList<VerbDefinition>();
+ private List<VerbDefinition> verbs = new ArrayList<>();
@Override
public String getLabel() {
@@ -615,7 +615,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition>
// sanity check this rest definition do not have duplicates
validateUniquePaths();
- List<RouteDefinition> answer = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> answer = new ArrayList<>();
if (camelContext.getRestConfigurations().isEmpty()) {
// make sure to initialize a rest configuration when its empty
// lookup a global which may have been setup via camel-spring-boot etc
@@ -650,13 +650,13 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition>
// sanity check this rest definition do not have duplicates
validateUniquePaths();
- List<RouteDefinition> answer = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> answer = new ArrayList<>();
addRouteDefinition(camelContext, answer, restConfiguration.getComponent());
return answer;
}
protected void validateUniquePaths() {
- Set<String> paths = new HashSet<String>();
+ Set<String> paths = new HashSet<>();
for (VerbDefinition verb : verbs) {
String path = verb.asVerb();
if (verb.getUri() != null) {
@@ -679,7 +679,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition>
String from = "rest-api:" + configuration.getApiContextPath();
// append options
- Map<String, Object> options = new HashMap<String, Object>();
+ Map<String, Object> options = new HashMap<>();
String routeId = configuration.getApiContextRouteId();
if (routeId == null) {
@@ -778,7 +778,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition>
String from = "rest:" + verb.asVerb() + ":" + buildUri(verb);
// append options
- Map<String, Object> options = new HashMap<String, Object>();
+ Map<String, Object> options = new HashMap<>();
// verb takes precedence over configuration on rest
if (verb.getConsumes() != null) {
options.put("consumes", verb.getConsumes());
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
index 714d900..325543f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
@@ -200,7 +200,7 @@ public class RestOperationParamDefinition {
return allowableValues;
}
- return new ArrayList<String>();
+ return new ArrayList<>();
}
/**
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
index 49e968b..ecdb7674 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
@@ -157,7 +157,7 @@ public class RestOperationResponseHeaderDefinition {
return allowableValues;
}
- return new ArrayList<String>();
+ return new ArrayList<>();
}
public String getExample() {
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
index ad47584..a7ea476 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
@@ -36,7 +36,7 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinition> implements RestContainer {
@XmlElementRef
- private List<RestDefinition> rests = new ArrayList<RestDefinition>();
+ private List<RestDefinition> rests = new ArrayList<>();
@XmlTransient
private ModelCamelContext camelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index f9c8d3f..dc335f0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -47,10 +47,10 @@ public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition>
private String method;
@XmlElementRef
- private List<RestOperationParamDefinition> params = new ArrayList<RestOperationParamDefinition>();
+ private List<RestOperationParamDefinition> params = new ArrayList<>();
@XmlElementRef
- private List<RestOperationResponseMsgDefinition> responseMsgs = new ArrayList<RestOperationResponseMsgDefinition>();
+ private List<RestOperationResponseMsgDefinition> responseMsgs = new ArrayList<>();
@XmlAttribute
private String uri;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
index f6059ba..1e0a2e5 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
@@ -217,7 +217,7 @@ public class BatchProcessor extends ServiceSupport implements AsyncProcessor, Na
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
@@ -337,12 +337,12 @@ public class BatchProcessor extends ServiceSupport implements AsyncProcessor, Na
private Queue<Exchange> queue;
private Lock queueLock = new ReentrantLock();
private final AtomicBoolean exchangeEnqueued = new AtomicBoolean();
- private final Queue<String> completionPredicateMatched = new ConcurrentLinkedQueue<String>();
+ private final Queue<String> completionPredicateMatched = new ConcurrentLinkedQueue<>();
private Condition exchangeEnqueuedCondition = queueLock.newCondition();
BatchSender() {
super(camelContext.getExecutorServiceManager().resolveThreadName("Batch Sender"));
- this.queue = new LinkedList<Exchange>();
+ this.queue = new LinkedList<>();
}
@Override
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 9b9450a..df58543 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -83,7 +83,7 @@ import org.slf4j.LoggerFactory;
public class CamelInternalProcessor extends DelegateAsyncProcessor {
private static final Logger LOG = LoggerFactory.getLogger(CamelInternalProcessor.class);
- private final List<CamelInternalProcessorAdvice> advices = new ArrayList<CamelInternalProcessorAdvice>();
+ private final List<CamelInternalProcessorAdvice> advices = new ArrayList<>();
public CamelInternalProcessor() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
index 5117168..1d3d6e0 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
@@ -176,7 +176,7 @@ public class ChoiceProcessor extends ServiceSupport implements AsyncProcessor, N
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>();
+ List<Processor> answer = new ArrayList<>();
if (filters != null) {
answer.addAll(filters);
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
index bf39ab9..3f05e30 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
@@ -473,7 +473,7 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
}
private static Map<String, Object> sortMap(Map<String, Object> map) {
- Map<String, Object> answer = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, Object> answer = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
answer.putAll(map);
return answer;
}
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 ed3bb0f..cf3050e 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
@@ -30,7 +30,7 @@ import org.apache.camel.spi.MaskingFormatter;
*/
public class DefaultMaskingFormatter implements MaskingFormatter {
- private static final Set<String> DEFAULT_KEYWORDS = new HashSet<String>(Arrays.asList("passphrase", "password", "secretKey"));
+ private static final Set<String> DEFAULT_KEYWORDS = new HashSet<>(Arrays.asList("passphrase", "password", "secretKey"));
private Set<String> keywords;
private boolean maskKeyValue;
private boolean maskXmlElement;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
index 3abee6e..b3542c5 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
@@ -126,7 +126,7 @@ public class DelegateAsyncProcessor extends ServiceSupport implements DelegatePr
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java
index 54a974f..4c2d79c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java
@@ -88,7 +88,7 @@ public class DelegateProcessor extends ServiceSupport implements org.apache.came
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DelegateSyncProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/DelegateSyncProcessor.java
index ceaccff..8b5906e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DelegateSyncProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DelegateSyncProcessor.java
@@ -86,7 +86,7 @@ public class DelegateSyncProcessor extends ServiceSupport implements org.apache.
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java b/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
index d13b7d2..90ba3c1 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
@@ -42,7 +42,7 @@ public abstract class ErrorHandlerSupport extends ChildServiceSupport implements
protected final Logger log = LoggerFactory.getLogger(getClass());
- protected final Map<ExceptionPolicyKey, OnExceptionDefinition> exceptionPolicies = new LinkedHashMap<ExceptionPolicyKey, OnExceptionDefinition>();
+ protected final Map<ExceptionPolicyKey, OnExceptionDefinition> exceptionPolicies = new LinkedHashMap<>();
protected ExceptionPolicyStrategy exceptionPolicy = createDefaultExceptionPolicyStrategy();
public void addExceptionPolicy(RouteContext routeContext, OnExceptionDefinition exceptionType) {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java b/camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
index 9b7647c..7541c5f 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
@@ -34,8 +34,8 @@ public class InterceptorToAsyncProcessorBridge extends ServiceSupport implements
private final AsyncProcessor interceptor;
private volatile AsyncProcessor target;
- private volatile ThreadLocal<AsyncCallback> callback = new ThreadLocal<AsyncCallback>();
- private volatile ThreadLocal<Boolean> interceptorDone = new ThreadLocal<Boolean>();
+ private volatile ThreadLocal<AsyncCallback> callback = new ThreadLocal<>();
+ private volatile ThreadLocal<Boolean> interceptorDone = new ThreadLocal<>();
/**
* Constructs the bridge
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 55cd399..98f8abc 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -159,7 +159,7 @@ public class MulticastProcessor extends ServiceSupport implements AsyncProcessor
private final boolean shutdownExecutorService;
private ExecutorService aggregateExecutorService;
private final long timeout;
- private final ConcurrentMap<PreparedErrorHandler, Processor> errorHandlers = new ConcurrentHashMap<PreparedErrorHandler, Processor>();
+ private final ConcurrentMap<PreparedErrorHandler, Processor> errorHandlers = new ConcurrentHashMap<>();
private final boolean shareUnitOfWork;
public MulticastProcessor(CamelContext camelContext, Collection<Processor> processors) {
@@ -277,10 +277,10 @@ public class MulticastProcessor extends ServiceSupport implements AsyncProcessor
final CompletionService<Exchange> completion;
if (streaming) {
// execute tasks in parallel+streaming and aggregate in the order they are finished (out of order sequence)
- completion = new ExecutorCompletionService<Exchange>(executorService);
+ completion = new ExecutorCompletionService<>(executorService);
} else {
// execute tasks in parallel and aggregate in the order the tasks are submitted (in order sequence)
- completion = new SubmitOrderedCompletionService<Exchange>(executorService);
+ completion = new SubmitOrderedCompletionService<>(executorService);
}
final AtomicInteger total = new AtomicInteger(0);
@@ -991,7 +991,7 @@ public class MulticastProcessor extends ServiceSupport implements AsyncProcessor
}
protected Iterable<ProcessorExchangePair> createProcessorExchangePairs(Exchange exchange) throws Exception {
- List<ProcessorExchangePair> result = new ArrayList<ProcessorExchangePair>(processors.size());
+ List<ProcessorExchangePair> result = new ArrayList<>(processors.size());
StreamCache streamCache = null;
if (isParallelProcessing() && exchange.getIn().getBody() instanceof StreamCache) {
@@ -1252,11 +1252,11 @@ public class MulticastProcessor extends ServiceSupport implements AsyncProcessor
Map<?, ?> property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
Map<Object, AggregationStrategy> map = CastUtils.cast(property);
if (map == null) {
- map = new ConcurrentHashMap<Object, AggregationStrategy>();
+ map = new ConcurrentHashMap<>();
} else {
// it is not safe to use the map directly as the exchange doesn't have the deep copy of it's properties
// we just create a new copy if we need to change the map
- map = new ConcurrentHashMap<Object, AggregationStrategy>(map);
+ map = new ConcurrentHashMap<>(map);
}
// store the strategy using this processor as the key
// (so we can store multiple strategies on the same exchange)
@@ -1342,7 +1342,7 @@ public class MulticastProcessor extends ServiceSupport implements AsyncProcessor
if (!hasNext()) {
return null;
}
- return new ArrayList<Processor>(processors);
+ return new ArrayList<>(processors);
}
public boolean hasNext() {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
index 33ef611..339338e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
@@ -187,7 +187,7 @@ public class RecipientListProcessor extends MulticastProcessor {
@Override
protected Iterable<ProcessorExchangePair> createProcessorExchangePairs(Exchange exchange) throws Exception {
// here we iterate the recipient lists and create the exchange pair for each of those
- List<ProcessorExchangePair> result = new ArrayList<ProcessorExchangePair>();
+ List<ProcessorExchangePair> result = new ArrayList<>();
// at first we must lookup the endpoint and acquire the producer which can send to the endpoint
int index = 0;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index d7938f0..a2f5727 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -327,7 +327,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(output);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java b/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
index 16166cb..a462839 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
@@ -96,7 +96,7 @@ public class Resequencer extends BatchProcessor implements Traceable {
};
}
- return new TreeSet<Exchange>(answer);
+ return new TreeSet<>(answer);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
index 9bf76d2..f8278bf 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
public class SharedCamelInternalProcessor {
private static final Logger LOG = LoggerFactory.getLogger(SharedCamelInternalProcessor.class);
- private final List<CamelInternalProcessorAdvice> advices = new ArrayList<CamelInternalProcessorAdvice>();
+ private final List<CamelInternalProcessorAdvice> advices = new ArrayList<>();
public SharedCamelInternalProcessor(CamelInternalProcessorAdvice... advices) {
if (advices != null) {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
index fb56485..2a50bc6 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
@@ -247,7 +247,7 @@ public class Splitter extends MulticastProcessor implements AsyncProcessor, Trac
}
private Iterable<ProcessorExchangePair> createProcessorExchangePairsList(Exchange exchange, Object value) {
- List<ProcessorExchangePair> result = new ArrayList<ProcessorExchangePair>();
+ List<ProcessorExchangePair> result = new ArrayList<>();
// reuse iterable and add it to the result list
Iterable<ProcessorExchangePair> pairs = createProcessorExchangePairsIterable(exchange, value);
diff --git a/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java b/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
index 0df5400..3fac08a 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
@@ -91,7 +91,7 @@ public class StreamResequencer extends ServiceSupport implements SequenceSender<
public StreamResequencer(CamelContext camelContext, Processor processor, SequenceElementComparator<Exchange> comparator, Expression expression) {
ObjectHelper.notNull(camelContext, "CamelContext");
this.camelContext = camelContext;
- this.engine = new ResequencerEngine<Exchange>(comparator);
+ this.engine = new ResequencerEngine<>(comparator);
this.engine.setSequenceSender(this);
this.processor = processor;
this.expression = expression;
@@ -256,7 +256,7 @@ public class StreamResequencer extends ServiceSupport implements SequenceSender<
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
index 4198630..71d2538 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
@@ -171,7 +171,7 @@ public class TryProcessor extends ServiceSupport implements AsyncProcessor, Navi
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>();
+ List<Processor> answer = new ArrayList<>();
if (tryProcessor != null) {
answer.add(tryProcessor);
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
index 5015d18..6feb4d2 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
@@ -255,7 +255,7 @@ public class WireTapProcessor extends ServiceSupport implements AsyncProcessor,
public void addNewExchangeProcessor(Processor processor) {
if (newExchangeProcessors == null) {
- newExchangeProcessors = new ArrayList<Processor>();
+ newExchangeProcessors = new ArrayList<>();
}
newExchangeProcessors.add(processor);
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
index d4ff93f..a13b1d6 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
@@ -100,7 +100,7 @@ public abstract class AbstractListAggregationStrategy<V> implements CompletionAw
private List<V> getList(Exchange exchange) {
List<V> list = exchange.getProperty(Exchange.GROUPED_EXCHANGE, List.class);
if (list == null) {
- list = new GroupedExchangeList<V>();
+ list = new GroupedExchangeList<>();
exchange.setProperty(Exchange.GROUPED_EXCHANGE, list);
}
return list;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 34e4bf1..18fc42c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -111,9 +111,9 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor
private ExceptionHandler exceptionHandler;
private AggregationRepository aggregationRepository;
private Map<String, String> closedCorrelationKeys;
- private final Set<String> batchConsumerCorrelationKeys = new ConcurrentSkipListSet<String>();
+ private final Set<String> batchConsumerCorrelationKeys = new ConcurrentSkipListSet<>();
private final Set<String> inProgressCompleteExchanges = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
- private final Map<String, RedeliveryData> redeliveryState = new ConcurrentHashMap<String, RedeliveryData>();
+ private final Map<String, RedeliveryData> redeliveryState = new ConcurrentHashMap<>();
private final AggregateProcessorStatistics statistics = new Statistics();
private final AtomicLong totalIn = new AtomicLong();
@@ -245,7 +245,7 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
@@ -383,7 +383,7 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor
private List<Exchange> doAggregation(String key, Exchange newExchange) throws CamelExchangeException {
LOG.trace("onAggregation +++ start +++ with correlation key: {}", key);
- List<Exchange> list = new ArrayList<Exchange>();
+ List<Exchange> list = new ArrayList<>();
String complete = null;
Exchange answer;
@@ -1233,7 +1233,7 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor
LOG.trace("Starting recover check");
// copy the current in progress before doing scan
- final Set<String> copyOfInProgress = new LinkedHashSet<String>(inProgressCompleteExchanges);
+ final Set<String> copyOfInProgress = new LinkedHashSet<>(inProgressCompleteExchanges);
Set<String> exchangeIds = recoverable.scan(camelContext);
for (String exchangeId : exchangeIds) {
@@ -1350,7 +1350,7 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor
closedCorrelationKeys = LRUCacheFactory.newLRUCache(getCloseCorrelationKeyOnCompletion());
} else {
LOG.info("Using ClosedCorrelationKeys with unbounded capacity");
- closedCorrelationKeys = new ConcurrentHashMap<String, String>();
+ closedCorrelationKeys = new ConcurrentHashMap<>();
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
index 64ea3f8..f7124dd 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
@@ -37,7 +37,7 @@ import org.apache.camel.util.ServiceHelper;
*/
public final class AggregationStrategyBeanAdapter extends ServiceSupport implements AggregationStrategy, CamelContextAware {
- private static final List<Method> EXCLUDED_METHODS = new ArrayList<Method>();
+ private static final List<Method> EXCLUDED_METHODS = new ArrayList<>();
private CamelContext camelContext;
private Object pojo;
private final Class<?> type;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
index 45ac011..7e060e7 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
@@ -73,8 +73,8 @@ public class AggregationStrategyBeanInfo {
}
}
- List<ParameterInfo> oldParameters = new ArrayList<ParameterInfo>();
- List<ParameterInfo> newParameters = new ArrayList<ParameterInfo>();
+ List<ParameterInfo> oldParameters = new ArrayList<>();
+ List<ParameterInfo> newParameters = new ArrayList<>();
for (int i = 0; i < size / 2; i++) {
Class<?> oldType = parameterTypes[i];
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
index e677705..891de02 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
@@ -49,7 +49,7 @@ public class AggregationStrategyMethodInfo {
public Object invoke(Object pojo, Exchange oldExchange, Exchange newExchange) throws Exception {
// evaluate the parameters
- List<Object> list = new ArrayList<Object>(oldParameters.size() + newParameters.size());
+ List<Object> list = new ArrayList<>(oldParameters.size() + newParameters.size());
for (ParameterInfo info : oldParameters) {
if (oldExchange != null) {
Object value = info.getExpression().evaluate(oldExchange, info.getType());
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
index 430055d..944a73d 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
@@ -34,7 +34,7 @@ import org.apache.camel.support.ServiceSupport;
* @version
*/
public class MemoryAggregationRepository extends ServiceSupport implements OptimisticLockingAggregationRepository {
- private final ConcurrentMap<String, Exchange> cache = new ConcurrentHashMap<String, Exchange>();
+ private final ConcurrentMap<String, Exchange> cache = new ConcurrentHashMap<>();
private final boolean optimisticLocking;
public MemoryAggregationRepository() {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
index a976902..c9d8781 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
@@ -61,9 +61,9 @@ public class DefaultExceptionPolicyStrategy implements ExceptionPolicyStrategy {
public OnExceptionDefinition getExceptionPolicy(Map<ExceptionPolicyKey, OnExceptionDefinition> exceptionPolicies,
Exchange exchange, Throwable exception) {
- Map<Integer, OnExceptionDefinition> candidates = new TreeMap<Integer, OnExceptionDefinition>();
- Map<ExceptionPolicyKey, OnExceptionDefinition> routeScoped = new LinkedHashMap<ExceptionPolicyKey, OnExceptionDefinition>();
- Map<ExceptionPolicyKey, OnExceptionDefinition> contextScoped = new LinkedHashMap<ExceptionPolicyKey, OnExceptionDefinition>();
+ Map<Integer, OnExceptionDefinition> candidates = new TreeMap<>();
+ Map<ExceptionPolicyKey, OnExceptionDefinition> routeScoped = new LinkedHashMap<>();
+ Map<ExceptionPolicyKey, OnExceptionDefinition> contextScoped = new LinkedHashMap<>();
// split policies into route and context scoped
initRouteAndContextScopedExceptionPolicies(exceptionPolicies, routeScoped, contextScoped);
diff --git a/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java b/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
index 742a6e6..bfc960e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
@@ -173,7 +173,7 @@ public class IdempotentConsumer extends ServiceSupport implements CamelContextAw
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
index 5d44171..ae92ff8 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
@@ -75,9 +75,9 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
private final AtomicBoolean enabled = new AtomicBoolean();
private final AtomicLong debugCounter = new AtomicLong(0);
private final Debugger debugger;
- private final ConcurrentMap<String, NodeBreakpoint> breakpoints = new ConcurrentHashMap<String, NodeBreakpoint>();
- private final ConcurrentMap<String, SuspendedExchange> suspendedBreakpoints = new ConcurrentHashMap<String, SuspendedExchange>();
- private final ConcurrentMap<String, BacklogTracerEventMessage> suspendedBreakpointMessages = new ConcurrentHashMap<String, BacklogTracerEventMessage>();
+ private final ConcurrentMap<String, NodeBreakpoint> breakpoints = new ConcurrentHashMap<>();
+ private final ConcurrentMap<String, SuspendedExchange> suspendedBreakpoints = new ConcurrentHashMap<>();
+ private final ConcurrentMap<String, BacklogTracerEventMessage> suspendedBreakpointMessages = new ConcurrentHashMap<>();
private volatile String singleStepExchangeId;
private int bodyMaxChars = 128 * 1024;
private boolean bodyIncludeStreams;
@@ -237,7 +237,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
}
public Set<String> getBreakpoints() {
- return new LinkedHashSet<String>(breakpoints.keySet());
+ return new LinkedHashSet<>(breakpoints.keySet());
}
public void resumeBreakpoint(String nodeId) {
@@ -420,7 +420,7 @@ public class BacklogDebugger extends ServiceSupport implements InterceptStrategy
}
public Set<String> getSuspendedBreakpointNodeIds() {
- return new LinkedHashSet<String>(suspendedBreakpoints.keySet());
+ return new LinkedHashSet<>(suspendedBreakpoints.keySet());
}
/**
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
index 15f9cd2..89b923c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
@@ -52,7 +52,7 @@ public final class BacklogTracer extends ServiceSupport implements InterceptStra
private boolean enabled;
private final AtomicLong traceCounter = new AtomicLong(0);
// use a queue with a upper limit to avoid storing too many messages
- private final Queue<BacklogTracerEventMessage> queue = new LinkedBlockingQueue<BacklogTracerEventMessage>(MAX_BACKLOG_SIZE);
+ private final Queue<BacklogTracerEventMessage> queue = new LinkedBlockingQueue<>(MAX_BACKLOG_SIZE);
// how many of the last messages to keep in the backlog at total
private int backlogSize = 1000;
private boolean removeOnDump = true;
@@ -262,7 +262,7 @@ public final class BacklogTracer extends ServiceSupport implements InterceptStra
}
public List<BacklogTracerEventMessage> dumpTracedMessages(String nodeId) {
- List<BacklogTracerEventMessage> answer = new ArrayList<BacklogTracerEventMessage>();
+ List<BacklogTracerEventMessage> answer = new ArrayList<>();
if (nodeId != null) {
for (BacklogTracerEventMessage message : queue) {
if (nodeId.equals(message.getToNode()) || nodeId.equals(message.getRouteId())) {
@@ -291,7 +291,7 @@ public final class BacklogTracer extends ServiceSupport implements InterceptStra
}
public List<BacklogTracerEventMessage> dumpAllTracedMessages() {
- List<BacklogTracerEventMessage> answer = new ArrayList<BacklogTracerEventMessage>();
+ List<BacklogTracerEventMessage> answer = new ArrayList<>();
answer.addAll(queue);
if (isRemoveOnDump()) {
queue.clear();
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
index 50500e3..0f5b212 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
@@ -64,7 +64,7 @@ public class DefaultChannel extends CamelInternalProcessor implements ModelChann
private static final Logger LOG = LoggerFactory.getLogger(DefaultChannel.class);
- private final List<InterceptStrategy> interceptors = new ArrayList<InterceptStrategy>();
+ private final List<InterceptStrategy> interceptors = new ArrayList<>();
private Processor errorHandler;
// the next processor (non wrapped)
private Processor nextProcessor;
@@ -99,7 +99,7 @@ public class DefaultChannel extends CamelInternalProcessor implements ModelChann
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(nextProcessor);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
index 405e266..caeafcb 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
@@ -98,7 +98,7 @@ public class DefaultTraceEventHandler implements TraceEventHandler, Service {
Object jpa = ObjectHelper.newInstance(jpaTraceEventMessageClass);
// copy options from event to jpa
- Map<String, Object> options = new HashMap<String, Object>();
+ Map<String, Object> options = new HashMap<>();
IntrospectionSupport.getProperties(msg, options, null);
IntrospectionSupport.setProperties(exchange.getContext().getTypeConverter(), jpa, options);
// and set the timestamp as its not a String type
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
index 30ea234..df5e04b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
@@ -55,7 +55,7 @@ public class Tracer implements InterceptStrategy, Service {
private boolean useJpa;
private CamelLogProcessor logger;
private TraceInterceptorFactory traceInterceptorFactory = new DefaultTraceInterceptorFactory();
- private final List<TraceEventHandler> traceHandlers = new CopyOnWriteArrayList<TraceEventHandler>();
+ private final List<TraceEventHandler> traceHandlers = new CopyOnWriteArrayList<>();
private String jpaTraceEventMessageClassName = JPA_TRACE_EVENT_MESSAGE;
private boolean jmxTraceNotifications;
private int traceBodySize = 10000;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java
index a1e5f5b..744eed4 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public class ExceptionFailureStatistics {
- private final Map<Class<?>, AtomicLong> counters = new HashMap<Class<?>, AtomicLong>();
+ private final Map<Class<?>, AtomicLong> counters = new HashMap<>();
private final AtomicLong fallbackCounter = new AtomicLong();
public void init(List<Class<?>> exceptions) {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
index 4d307c8..fe22f0b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public abstract class LoadBalancerSupport extends ServiceSupport implements LoadBalancer, Navigate<Processor>, IdAware {
protected final Logger log = LoggerFactory.getLogger(getClass());
- private final List<Processor> processors = new CopyOnWriteArrayList<Processor>();
+ private final List<Processor> processors = new CopyOnWriteArrayList<>();
private String id;
public void addProcessor(Processor processor) {
@@ -62,7 +62,7 @@ public abstract class LoadBalancerSupport extends ServiceSupport implements Load
if (!hasNext()) {
return null;
}
- return new ArrayList<Processor>(processors);
+ return new ArrayList<>(processors);
}
public boolean hasNext() {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
index 5389185..37e422f 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
@@ -36,7 +36,7 @@ public class StickyLoadBalancer extends QueueLoadBalancer {
private Expression correlationExpression;
private RoundRobinLoadBalancer loadBalancer;
private int numberOfHashGroups = 64 * 1024;
- private final Map<Object, Processor> stickyMap = new HashMap<Object, Processor>();
+ private final Map<Object, Processor> stickyMap = new HashMap<>();
public StickyLoadBalancer(Expression correlationExpression) {
this.correlationExpression = correlationExpression;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
index 04866bc..d70d1b7 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
@@ -22,8 +22,8 @@ import java.util.List;
public abstract class WeightedLoadBalancer extends QueueLoadBalancer {
transient int lastIndex;
- private List<Integer> distributionRatioList = new ArrayList<Integer>();
- private List<DistributionRatio> runtimeRatios = new ArrayList<DistributionRatio>();
+ private List<Integer> distributionRatioList = new ArrayList<>();
+ private List<DistributionRatio> runtimeRatios = new ArrayList<>();
public WeightedLoadBalancer(List<Integer> distributionRatios) {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
index 9a83cd0..71c407b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
@@ -186,7 +186,7 @@ public class ResequencerEngine<E> {
* @param o an element.
*/
void setLastDelivered(E o) {
- lastDelivered = new Element<E>(o);
+ lastDelivered = new Element<>(o);
}
/**
@@ -199,7 +199,7 @@ public class ResequencerEngine<E> {
*/
public synchronized void insert(E o) {
// wrap object into internal element
- Element<E> element = new Element<E>(o);
+ Element<E> element = new Element<>(o);
// validate the exchange has no problem
if (!sequence.comparator().isValid(element)) {
@@ -327,7 +327,7 @@ public class ResequencerEngine<E> {
}
private static <E> Sequence<Element<E>> createSequence(SequenceElementComparator<E> comparator) {
- return new Sequence<Element<E>>(new ElementComparator<E>(comparator));
+ return new Sequence<>(new ElementComparator<>(comparator));
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
index c81a8c0..299d5e7 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
*/
public class DefaultValidationErrorHandler implements ValidatorErrorHandler {
private static final Logger LOG = LoggerFactory.getLogger(DefaultValidationErrorHandler.class);
- private List<SAXParseException> warnings = new ArrayList<SAXParseException>();
- private List<SAXParseException> errors = new ArrayList<SAXParseException>();
- private List<SAXParseException> fatalErrors = new ArrayList<SAXParseException>();
+ private List<SAXParseException> warnings = new ArrayList<>();
+ private List<SAXParseException> errors = new ArrayList<>();
+ private List<SAXParseException> fatalErrors = new ArrayList<>();
public void warning(SAXParseException e) throws SAXException {
if (LOG.isDebugEnabled()) {
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java
index 9500634..70fe5ef 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java
@@ -548,7 +548,7 @@ public abstract class AbstractCamelCatalog {
// only if we support alternative syntax, and the uri contains the username and password in the authority
// part of the uri, then we would need some special logic to capture that information and strip those
// details from the uri, so we can continue parsing the uri using the normal syntax
- Map<String, String> userInfoOptions = new LinkedHashMap<String, String>();
+ Map<String, String> userInfoOptions = new LinkedHashMap<>();
if (alternativeSyntax != null && alternativeSyntax.contains("@")) {
// clip the scheme from the syntax
alternativeSyntax = after(alternativeSyntax, ":");
@@ -606,7 +606,7 @@ public abstract class AbstractCamelCatalog {
// parse the syntax and find the names of each option
Matcher matcher = SYNTAX_PATTERN.matcher(syntax);
- List<String> word = new ArrayList<String>();
+ List<String> word = new ArrayList<>();
while (matcher.find()) {
String s = matcher.group(1);
if (!scheme.equals(s)) {
@@ -617,7 +617,7 @@ public abstract class AbstractCamelCatalog {
String[] tokens = SYNTAX_PATTERN.split(syntax);
// find the position where each option start/end
- List<String> word2 = new ArrayList<String>();
+ List<String> word2 = new ArrayList<>();
int prev = 0;
int prevPath = 0;
@@ -664,7 +664,7 @@ public abstract class AbstractCamelCatalog {
boolean defaultValueAdded = false;
// now parse the uri to know which part isw what
- Map<String, String> options = new LinkedHashMap<String, String>();
+ Map<String, String> options = new LinkedHashMap<>();
// include the username and password from the userinfo section
if (!userInfoOptions.isEmpty()) {
@@ -712,7 +712,7 @@ public abstract class AbstractCamelCatalog {
}
}
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
// remove all options which are using default values and are not required
for (Map.Entry<String, String> entry : options.entrySet()) {
@@ -832,7 +832,7 @@ public abstract class AbstractCamelCatalog {
private String doAsEndpointUri(String scheme, String json, String ampersand, boolean encode) throws URISyntaxException {
List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
- Map<String, String> copy = new HashMap<String, String>();
+ Map<String, String> copy = new HashMap<>();
for (Map<String, String> row : rows) {
String name = row.get("name");
String required = row.get("required");
@@ -942,7 +942,7 @@ public abstract class AbstractCamelCatalog {
// parse the syntax into each options
Matcher matcher = SYNTAX_PATTERN.matcher(originalSyntax);
- List<String> options = new ArrayList<String>();
+ List<String> options = new ArrayList<>();
while (matcher.find()) {
String s = matcher.group(1);
options.add(s);
@@ -955,7 +955,7 @@ public abstract class AbstractCamelCatalog {
// parse the syntax into each options
Matcher matcher2 = SYNTAX_PATTERN.matcher(syntax);
- List<String> options2 = new ArrayList<String>();
+ List<String> options2 = new ArrayList<>();
while (matcher2.find()) {
String s = matcher2.group(1);
s = s.replaceAll("BEGINCAMELPLACEHOLDER", "\\{\\{");
@@ -1267,7 +1267,7 @@ public abstract class AbstractCamelCatalog {
if ("log".equals(scheme)) {
String showAll = options.get("showAll");
if ("true".equals(showAll)) {
- Map<String, String> filtered = new LinkedHashMap<String, String>();
+ Map<String, String> filtered = new LinkedHashMap<>();
// remove all the other showXXX options when showAll=true
for (Map.Entry<String, String> entry : options.entrySet()) {
String key = entry.getKey();
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/DefaultRuntimeCamelCatalog.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/DefaultRuntimeCamelCatalog.java
index 7648e64..041eeb0 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/DefaultRuntimeCamelCatalog.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/DefaultRuntimeCamelCatalog.java
@@ -27,7 +27,7 @@ import org.apache.camel.CamelContext;
public class DefaultRuntimeCamelCatalog extends AbstractCamelCatalog implements RuntimeCamelCatalog {
// cache of operation -> result
- private final Map<String, Object> cache = new HashMap<String, Object>();
+ private final Map<String, Object> cache = new HashMap<>();
private boolean caching;
/**
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
index 7d1c657..c6ce457 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
@@ -106,7 +106,7 @@ public class EndpointValidationResult implements Serializable {
public void addUnknown(String name) {
if (unknown == null) {
- unknown = new LinkedHashSet<String>();
+ unknown = new LinkedHashSet<>();
}
if (!unknown.contains(name)) {
unknown.add(name);
@@ -116,14 +116,14 @@ public class EndpointValidationResult implements Serializable {
public void addUnknownSuggestions(String name, String[] suggestions) {
if (unknownSuggestions == null) {
- unknownSuggestions = new LinkedHashMap<String, String[]>();
+ unknownSuggestions = new LinkedHashMap<>();
}
unknownSuggestions.put(name, suggestions);
}
public void addLenient(String name) {
if (lenient == null) {
- lenient = new LinkedHashSet<String>();
+ lenient = new LinkedHashSet<>();
}
if (!lenient.contains(name)) {
lenient.add(name);
@@ -132,7 +132,7 @@ public class EndpointValidationResult implements Serializable {
public void addRequired(String name) {
if (required == null) {
- required = new LinkedHashSet<String>();
+ required = new LinkedHashSet<>();
}
if (!required.contains(name)) {
required.add(name);
@@ -142,7 +142,7 @@ public class EndpointValidationResult implements Serializable {
public void addInvalidEnum(String name, String value) {
if (invalidEnum == null) {
- invalidEnum = new LinkedHashMap<String, String>();
+ invalidEnum = new LinkedHashMap<>();
}
if (!invalidEnum.containsKey(name)) {
invalidEnum.put(name, value);
@@ -152,21 +152,21 @@ public class EndpointValidationResult implements Serializable {
public void addInvalidEnumChoices(String name, String[] choices) {
if (invalidEnumChoices == null) {
- invalidEnumChoices = new LinkedHashMap<String, String[]>();
+ invalidEnumChoices = new LinkedHashMap<>();
}
invalidEnumChoices.put(name, choices);
}
public void addInvalidEnumSuggestions(String name, String[] suggestions) {
if (invalidEnumSuggestions == null) {
- invalidEnumSuggestions = new LinkedHashMap<String, String[]>();
+ invalidEnumSuggestions = new LinkedHashMap<>();
}
invalidEnumSuggestions.put(name, suggestions);
}
public void addInvalidReference(String name, String value) {
if (invalidReference == null) {
- invalidReference = new LinkedHashMap<String, String>();
+ invalidReference = new LinkedHashMap<>();
}
if (!invalidReference.containsKey(name)) {
invalidReference.put(name, value);
@@ -176,7 +176,7 @@ public class EndpointValidationResult implements Serializable {
public void addInvalidBoolean(String name, String value) {
if (invalidBoolean == null) {
- invalidBoolean = new LinkedHashMap<String, String>();
+ invalidBoolean = new LinkedHashMap<>();
}
if (!invalidBoolean.containsKey(name)) {
invalidBoolean.put(name, value);
@@ -186,7 +186,7 @@ public class EndpointValidationResult implements Serializable {
public void addInvalidInteger(String name, String value) {
if (invalidInteger == null) {
- invalidInteger = new LinkedHashMap<String, String>();
+ invalidInteger = new LinkedHashMap<>();
}
if (!invalidInteger.containsKey(name)) {
invalidInteger.put(name, value);
@@ -196,7 +196,7 @@ public class EndpointValidationResult implements Serializable {
public void addInvalidNumber(String name, String value) {
if (invalidNumber == null) {
- invalidNumber = new LinkedHashMap<String, String>();
+ invalidNumber = new LinkedHashMap<>();
}
if (!invalidNumber.containsKey(name)) {
invalidNumber.put(name, value);
@@ -206,14 +206,14 @@ public class EndpointValidationResult implements Serializable {
public void addDefaultValue(String name, String value) {
if (defaultValues == null) {
- defaultValues = new LinkedHashMap<String, String>();
+ defaultValues = new LinkedHashMap<>();
}
defaultValues.put(name, value);
}
public void addNotConsumerOnly(String name) {
if (notConsumerOnly == null) {
- notConsumerOnly = new LinkedHashSet<String>();
+ notConsumerOnly = new LinkedHashSet<>();
}
if (!notConsumerOnly.contains(name)) {
notConsumerOnly.add(name);
@@ -223,7 +223,7 @@ public class EndpointValidationResult implements Serializable {
public void addNotProducerOnly(String name) {
if (notProducerOnly == null) {
- notProducerOnly = new LinkedHashSet<String>();
+ notProducerOnly = new LinkedHashSet<>();
}
if (!notProducerOnly.contains(name)) {
notProducerOnly.add(name);
@@ -326,7 +326,7 @@ public class EndpointValidationResult implements Serializable {
}
// for each invalid option build a reason message
- Map<String, String> options = new LinkedHashMap<String, String>();
+ Map<String, String> options = new LinkedHashMap<>();
if (unknown != null) {
for (String name : unknown) {
if (unknownSuggestions != null && unknownSuggestions.containsKey(name)) {
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaHelper.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaHelper.java
index 3034136..fa5315f 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaHelper.java
@@ -399,7 +399,7 @@ public final class JSonSchemaHelper {
}
public static Set<String> getNames(List<Map<String, String>> rows) {
- Set<String> answer = new LinkedHashSet<String>();
+ Set<String> answer = new LinkedHashSet<>();
for (Map<String, String> row : rows) {
if (row.containsKey("name")) {
answer.add(row.get("name"));
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/SimpleValidationResult.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/SimpleValidationResult.java
index 3ad27fd..b83ba51 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/SimpleValidationResult.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/SimpleValidationResult.java
@@ -20,6 +20,7 @@ package org.apache.camel.runtimecatalog;
* Kept to be backwards compatible,
* @deprecated Please use {@link LanguageValidationResult} instead.
*/
+@Deprecated
public class SimpleValidationResult extends LanguageValidationResult {
public SimpleValidationResult(String text) {
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/URISupport.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/URISupport.java
index 8389590..8bd0814 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/URISupport.java
@@ -53,7 +53,7 @@ public final class URISupport {
}
public static Map<String, Object> extractProperties(Map<String, Object> properties, String optionPrefix) {
- Map<String, Object> rc = new LinkedHashMap<String, Object>(properties.size());
+ Map<String, Object> rc = new LinkedHashMap<>(properties.size());
for (Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
Map.Entry<String, Object> entry = it.next();
@@ -97,7 +97,7 @@ public final class URISupport {
int idx = schemeSpecificPart.indexOf('?');
if (idx < 0) {
// return an empty map
- return new LinkedHashMap<String, Object>(0);
+ return new LinkedHashMap<>(0);
} else {
query = schemeSpecificPart.substring(idx + 1);
}
@@ -163,7 +163,7 @@ public final class URISupport {
if (isEmpty(uri)) {
// return an empty map
- return new LinkedHashMap<String, Object>(0);
+ return new LinkedHashMap<>(0);
}
// need to parse the uri query parameters manually as we cannot rely on splitting by &,
@@ -171,7 +171,7 @@ public final class URISupport {
try {
// use a linked map so the parameters is in the same order
- Map<String, Object> rc = new LinkedHashMap<String, Object>();
+ Map<String, Object> rc = new LinkedHashMap<>();
boolean isKey = true;
boolean isValue = false;
@@ -289,7 +289,7 @@ public final class URISupport {
list = (List<String>) existing;
} else {
// create a new list to hold the multiple values
- list = new ArrayList<String>();
+ list = new ArrayList<>();
String s = existing != null ? existing.toString() : null;
if (s != null) {
list.add(s);
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/UnsafeUriCharactersEncoder.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/UnsafeUriCharactersEncoder.java
index a11c810..2aee59f 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/UnsafeUriCharactersEncoder.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/UnsafeUriCharactersEncoder.java
@@ -96,7 +96,7 @@ public final class UnsafeUriCharactersEncoder {
private static List<Pair> checkRAW(String s) {
Matcher matcher = RAW_PATTERN.matcher(s);
- List<Pair> answer = new ArrayList<Pair>();
+ List<Pair> answer = new ArrayList<>();
// Check all occurrences
while (matcher.find()) {
answer.add(new Pair(matcher.start(), matcher.end()));
@@ -137,7 +137,7 @@ public final class UnsafeUriCharactersEncoder {
if (checkRaw) {
rawPairs = checkRAW(s);
} else {
- rawPairs = new ArrayList<Pair>();
+ rawPairs = new ArrayList<>();
}
int n = s == null ? 0 : s.length();
diff --git a/camel-core/src/main/java/org/apache/camel/spi/Container.java b/camel-core/src/main/java/org/apache/camel/spi/Container.java
index 79c9509..f76f439 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/Container.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/Container.java
@@ -48,7 +48,7 @@ public interface Container {
private static final Logger LOG = LoggerFactory.getLogger(Container.class);
private static Container container;
- private static final Set<CamelContext> CONTEXTS = new LinkedHashSet<CamelContext>();
+ private static final Set<CamelContext> CONTEXTS = new LinkedHashSet<>();
private Instance() {
}
diff --git a/camel-core/src/main/java/org/apache/camel/support/ChildServiceSupport.java b/camel-core/src/main/java/org/apache/camel/support/ChildServiceSupport.java
index b4861ff..e51fafa 100644
--- a/camel-core/src/main/java/org/apache/camel/support/ChildServiceSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/support/ChildServiceSupport.java
@@ -126,7 +126,7 @@ public abstract class ChildServiceSupport extends ServiceSupport {
protected void addChildService(Object childService) {
synchronized (this) {
if (childServices == null) {
- childServices = new LinkedHashSet<Object>();
+ childServices = new LinkedHashSet<>();
}
}
childServices.add(childService);
diff --git a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java b/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
index d99a5b0..3b467b0 100644
--- a/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
+++ b/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
@@ -52,7 +52,7 @@ public class DefaultTimeoutMap<K, V> extends ServiceSupport implements TimeoutMa
protected final Logger log = LoggerFactory.getLogger(getClass());
- private final ConcurrentMap<K, TimeoutMapEntry<K, V>> map = new ConcurrentHashMap<K, TimeoutMapEntry<K, V>>();
+ private final ConcurrentMap<K, TimeoutMapEntry<K, V>> map = new ConcurrentHashMap<>();
private final ScheduledExecutorService executor;
private volatile ScheduledFuture<?> future;
private final long purgePollTime;
@@ -94,7 +94,7 @@ public class DefaultTimeoutMap<K, V> extends ServiceSupport implements TimeoutMa
}
public V put(K key, V value, long timeoutMillis) {
- TimeoutMapEntry<K, V> entry = new TimeoutMapEntry<K, V>(key, value, timeoutMillis);
+ TimeoutMapEntry<K, V> entry = new TimeoutMapEntry<>(key, value, timeoutMillis);
if (useLock) {
lock.lock();
}
@@ -110,7 +110,7 @@ public class DefaultTimeoutMap<K, V> extends ServiceSupport implements TimeoutMa
}
public V putIfAbsent(K key, V value, long timeoutMillis) {
- TimeoutMapEntry<K, V> entry = new TimeoutMapEntry<K, V>(key, value, timeoutMillis);
+ TimeoutMapEntry<K, V> entry = new TimeoutMapEntry<>(key, value, timeoutMillis);
if (useLock) {
lock.lock();
}
@@ -191,7 +191,7 @@ public class DefaultTimeoutMap<K, V> extends ServiceSupport implements TimeoutMa
long now = currentTime();
- List<TimeoutMapEntry<K, V>> expired = new ArrayList<TimeoutMapEntry<K, V>>();
+ List<TimeoutMapEntry<K, V>> expired = new ArrayList<>();
if (useLock) {
lock.lock();
@@ -220,7 +220,7 @@ public class DefaultTimeoutMap<K, V> extends ServiceSupport implements TimeoutMa
}
});
- List<K> evicts = new ArrayList<K>(expired.size());
+ List<K> evicts = new ArrayList<>(expired.size());
try {
// now fire eviction notification
for (TimeoutMapEntry<K, V> entry : expired) {
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 11bb6fb..e885883 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
@@ -116,7 +116,7 @@ public final class RestConsumerContextPathMatcher {
public static ConsumerPath matchBestPath(String requestMethod, String requestPath, List<ConsumerPath> consumerPaths) {
ConsumerPath answer = null;
- List<ConsumerPath> candidates = new ArrayList<ConsumerPath>();
+ List<ConsumerPath> candidates = new ArrayList<>();
// first match by http method
for (ConsumerPath entry : consumerPaths) {
diff --git a/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java b/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
index ae489c7..6f3ba26 100644
--- a/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
+++ b/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public class TimerListenerManager extends ServiceSupport implements Runnable, CamelContextAware, StaticService {
private static final Logger LOG = LoggerFactory.getLogger(TimerListenerManager.class);
- private final Set<TimerListener> listeners = new LinkedHashSet<TimerListener>();
+ private final Set<TimerListener> listeners = new LinkedHashSet<>();
private CamelContext camelContext;
private ScheduledExecutorService executorService;
private volatile ScheduledFuture<?> task;
diff --git a/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java
index 5f2298f..dc4848e 100644
--- a/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java
@@ -243,7 +243,7 @@ public class TokenXMLExpressionIterator extends ExpressionAdapter {
}
// find namespaces (there can be attributes mixed, so we should only grab the namespaces)
- Map<String, String> namespaces = new LinkedHashMap<String, String>();
+ Map<String, String> namespaces = new LinkedHashMap<>();
Matcher matcher = NAMESPACE_PATTERN.matcher(text);
while (matcher.find()) {
String prefix = matcher.group(1);
@@ -318,7 +318,7 @@ public class TokenXMLExpressionIterator extends ExpressionAdapter {
private static String buildXMLTail(String xmlhead) {
// assume the input text is a portion of a well-formed xml
- List<String> tags = new ArrayList<String>();
+ List<String> tags = new ArrayList<>();
int p = 0;
while (p < xmlhead.length()) {
p = xmlhead.indexOf('<', p);
diff --git a/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
index 7b41f51..6e838fb 100644
--- a/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
@@ -191,7 +191,7 @@ public class TokenXMLPairExpressionIterator extends TokenPairExpressionIterator
}
// find namespaces (there can be attributes mixed, so we should only grab the namespaces)
- Map<String, String> namespaces = new LinkedHashMap<String, String>();
+ Map<String, String> namespaces = new LinkedHashMap<>();
Matcher matcher = NAMESPACE_PATTERN.matcher(text);
while (matcher.find()) {
String prefix = matcher.group(1);
diff --git a/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
index 45f9293..4523fa8 100644
--- a/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
@@ -222,18 +222,18 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
throw new XMLStreamException("reader not supporting Location");
}
- this.path = new ArrayList<QName>();
+ this.path = new ArrayList<>();
// wrapped mode needs the segments and the injected mode needs the namespaces
if (this.mode == 'w') {
- this.segments = new ArrayList<String>();
- this.segmentlog = new ArrayList<QName>();
+ this.segments = new ArrayList<>();
+ this.segmentlog = new ArrayList<>();
} else if (this.mode == 'i') {
- this.namespaces = new ArrayList<Map<String, String>>();
+ this.namespaces = new ArrayList<>();
}
// when grouping the tokens, allocate the storage to temporarily store tokens.
if (this.group > 1) {
- this.tokens = new ArrayList<String>();
+ this.tokens = new ArrayList<>();
}
this.nextToken = getNextToken();
}
@@ -314,7 +314,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
}
private void pushNamespaces(XMLStreamReader reader) {
- Map<String, String> m = new HashMap<String, String>();
+ Map<String, String> m = new HashMap<>();
if (namespaces.size() > 0) {
m.putAll(namespaces.get(namespaces.size() - 1));
}
@@ -380,7 +380,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
} else if (mode == 'i') {
final String stag = token.substring(0, token.indexOf('>') + 1);
- Set<String> skip = new HashSet<String>();
+ Set<String> skip = new HashSet<>();
Matcher matcher = NAMESPACE_PATTERN.matcher(stag);
char quote = 0;
while (matcher.find()) {
diff --git a/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java b/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java
index 4618573..114a1aa 100644
--- a/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java
+++ b/camel-core/src/main/java/org/apache/camel/util/AntPathMatcher.java
@@ -454,7 +454,7 @@ public class AntPathMatcher {
return null;
}
StringTokenizer st = new StringTokenizer(str, delimiters);
- List<String> tokens = new ArrayList<String>();
+ List<String> tokens = new ArrayList<>();
while (st.hasMoreTokens()) {
String token = st.nextToken();
token = token.trim();
diff --git a/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorConverterHelper.java b/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorConverterHelper.java
index 14319ed..637557b 100644
--- a/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorConverterHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/AsyncProcessorConverterHelper.java
@@ -104,7 +104,7 @@ public final class AsyncProcessorConverterHelper {
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(processor);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
index ba35b56..b3f5cee 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
@@ -516,7 +516,7 @@ public final class CamelContextHelper {
public static SortedMap<String, Properties> findComponents(CamelContext camelContext, Enumeration<URL> componentDescriptionIter)
throws LoadPropertiesException {
- SortedMap<String, Properties> map = new TreeMap<String, Properties>();
+ SortedMap<String, Properties> map = new TreeMap<>();
while (componentDescriptionIter != null && componentDescriptionIter.hasMoreElements()) {
URL url = componentDescriptionIter.nextElement();
LOG.trace("Finding components in url: {}", url);
@@ -608,7 +608,7 @@ public final class CamelContextHelper {
* Find information about all the EIPs from camel-core.
*/
public static SortedMap<String, Properties> findEips(CamelContext camelContext) throws LoadPropertiesException {
- SortedMap<String, Properties> answer = new TreeMap<String, Properties>();
+ SortedMap<String, Properties> answer = new TreeMap<>();
ClassResolver resolver = camelContext.getClassResolver();
LOG.debug("Finding all EIPs using class resolver: {} -> {}", new Object[]{resolver});
@@ -764,10 +764,10 @@ public final class CamelContextHelper {
LOG.trace("Resolving property placeholders for: {}", target);
// find all getter/setter which we can use for property placeholders
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
IntrospectionSupport.getProperties(target, properties, null);
- Map<String, Object> changedProperties = new HashMap<String, Object>();
+ Map<String, Object> changedProperties = new HashMap<>();
if (!properties.isEmpty()) {
LOG.trace("There are {} properties on: {}", properties.size(), target);
// lookup and resolve properties for String based properties
diff --git a/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java b/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
index 68f3820..dc79b6f 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
@@ -86,7 +86,7 @@ public final class CollectionHelper {
if (oldValue instanceof List) {
list = (List<Object>) oldValue;
} else {
- list = new ArrayList<Object>();
+ list = new ArrayList<>();
list.add(oldValue);
// replace old entry with list
map.remove(key);
@@ -99,7 +99,7 @@ public final class CollectionHelper {
}
public static <T> Set<T> createSetContaining(T... contents) {
- Set<T> contentsAsSet = new HashSet<T>();
+ Set<T> contentsAsSet = new HashSet<>();
contentsAsSet.addAll(Arrays.asList(contents));
return contentsAsSet;
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
index d0b19f7..2294bfc 100644
--- a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
@@ -345,7 +345,7 @@ public final class EndpointHelper {
@SuppressWarnings({"unchecked", "rawtypes"})
public static <T> List<T> resolveReferenceListParameter(CamelContext context, String value, Class<T> elementType) {
if (value == null) {
- return new ArrayList<T>();
+ return new ArrayList<>();
}
List<String> elements = Arrays.asList(value.split(","));
if (elements.size() == 1) {
@@ -355,12 +355,12 @@ public final class EndpointHelper {
return (List) bean;
} else {
// The bean is a list element
- List<T> singleElementList = new ArrayList<T>();
+ List<T> singleElementList = new ArrayList<>();
singleElementList.add(elementType.cast(bean));
return singleElementList;
}
} else { // more than one list element
- List<T> result = new ArrayList<T>(elements.size());
+ List<T> result = new ArrayList<>(elements.size());
for (String element : elements) {
result.add(resolveReferenceParameter(context, element.trim(), elementType));
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
index f588af5..8241793 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
@@ -470,7 +470,7 @@ public final class ExchangeHelper {
* @return a Map populated with the require variables
*/
public static Map<String, Object> createVariableMap(Exchange exchange) {
- Map<String, Object> answer = new HashMap<String, Object>();
+ Map<String, Object> answer = new HashMap<>();
populateVariableMap(exchange, answer);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java b/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java
index f92faf2..e5c6ab2 100644
--- a/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java
@@ -122,7 +122,7 @@ public final class GroupIterator implements Iterator<Object>, Closeable {
}
private Object doNext() throws IOException {
- List<Object> list = new ArrayList<Object>();
+ List<Object> list = new ArrayList<>();
int count = 0;
while (count < group && it.hasNext()) {
Object data = it.next();
diff --git a/camel-core/src/main/java/org/apache/camel/util/HostUtils.java b/camel-core/src/main/java/org/apache/camel/util/HostUtils.java
index 2931466..9d16aa5 100644
--- a/camel-core/src/main/java/org/apache/camel/util/HostUtils.java
+++ b/camel-core/src/main/java/org/apache/camel/util/HostUtils.java
@@ -38,7 +38,7 @@ public final class HostUtils {
public static Map<String, Set<InetAddress>> getNetworkInterfaceAddresses() {
//JVM returns interfaces in a non-predictable order, so to make this more predictable
//let's have them sort by interface name (by using a TreeMap).
- Map<String, Set<InetAddress>> interfaceAddressMap = new TreeMap<String, Set<InetAddress>>();
+ Map<String, Set<InetAddress>> interfaceAddressMap = new TreeMap<>();
try {
Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
while (ifaces.hasMoreElements()) {
@@ -53,7 +53,7 @@ public final class HostUtils {
if (!ia.isLoopbackAddress() && !ia.getHostAddress().contains(":")) {
Set<InetAddress> addresses = interfaceAddressMap.get(name);
if (addresses == null) {
- addresses = new LinkedHashSet<InetAddress>();
+ addresses = new LinkedHashSet<>();
}
addresses.add(ia);
interfaceAddressMap.put(name, addresses);
@@ -71,7 +71,7 @@ public final class HostUtils {
* Returns a {@link Set} of {@link InetAddress} that are non-loopback or mac.
*/
public static Set<InetAddress> getAddresses() {
- Set<InetAddress> allAddresses = new LinkedHashSet<InetAddress>();
+ Set<InetAddress> allAddresses = new LinkedHashSet<>();
Map<String, Set<InetAddress>> interfaceAddressMap = getNetworkInterfaceAddresses();
for (Map.Entry<String, Set<InetAddress>> entry : interfaceAddressMap.entrySet()) {
Set<InetAddress> addresses = entry.getValue();
diff --git a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index 5b99692..02c2d7a 100644
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -63,7 +63,7 @@ import static org.apache.camel.util.ObjectHelper.isAssignableFrom;
public final class IntrospectionSupport {
private static final Logger LOG = LoggerFactory.getLogger(IntrospectionSupport.class);
- private static final List<Method> EXCLUDED_METHODS = new ArrayList<Method>();
+ private static final List<Method> EXCLUDED_METHODS = new ArrayList<>();
// use a cache to speedup introspecting for known classes during startup
// use a weak cache as we dont want the cache to keep around as it reference classes
// which could prevent classloader to unload classes if being referenced from this cache
@@ -79,7 +79,7 @@ public final class IntrospectionSupport {
EXCLUDED_METHODS.addAll(Arrays.asList(Proxy.class.getMethods()));
}
- private static final Set<Class<?>> PRIMITIVE_CLASSES = new HashSet<Class<?>>();
+ private static final Set<Class<?>> PRIMITIVE_CLASSES = new HashSet<>();
static {
PRIMITIVE_CLASSES.add(String.class);
@@ -305,7 +305,7 @@ public final class IntrospectionSupport {
// loop each method on the class and gather details about the method
// especially about getter/setters
- List<MethodInfo> found = new ArrayList<MethodInfo>();
+ List<MethodInfo> found = new ArrayList<>();
Method[] methods = clazz.getMethods();
for (Method method : methods) {
if (EXCLUDED_METHODS.contains(method)) {
@@ -456,7 +456,7 @@ public final class IntrospectionSupport {
public static Map<String, Object> extractProperties(Map<String, Object> properties, String optionPrefix, boolean remove) {
ObjectHelper.notNull(properties, "properties");
- Map<String, Object> rc = new LinkedHashMap<String, Object>(properties.size());
+ Map<String, Object> rc = new LinkedHashMap<>(properties.size());
for (Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
Map.Entry<String, Object> entry = it.next();
@@ -478,7 +478,7 @@ public final class IntrospectionSupport {
public static Map<String, String> extractStringProperties(Map<String, Object> properties) {
ObjectHelper.notNull(properties, "properties");
- Map<String, String> rc = new LinkedHashMap<String, String>(properties.size());
+ Map<String, String> rc = new LinkedHashMap<>(properties.size());
for (Entry<String, Object> entry : properties.entrySet()) {
String name = entry.getKey();
@@ -693,7 +693,7 @@ public final class IntrospectionSupport {
}
public static Set<Method> findSetterMethods(Class<?> clazz, String name, boolean allowBuilderPattern) {
- Set<Method> candidates = new LinkedHashSet<Method>();
+ Set<Method> candidates = new LinkedHashSet<>();
// Build the method name.
name = "set" + ObjectHelper.capitalize(name);
@@ -747,8 +747,8 @@ public final class IntrospectionSupport {
}
protected static List<Method> findSetterMethodsOrderedByParameterType(Class<?> target, String propertyName, boolean allowBuilderPattern) {
- List<Method> answer = new LinkedList<Method>();
- List<Method> primitives = new LinkedList<Method>();
+ List<Method> answer = new LinkedList<>();
+ List<Method> primitives = new LinkedList<>();
Set<Method> setters = findSetterMethods(target, propertyName, allowBuilderPattern);
for (Method setter : setters) {
Class<?> parameterType = setter.getParameterTypes()[0];
diff --git a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
index a2cc323..532a046 100644
--- a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java
@@ -109,7 +109,7 @@ public final class JsonSchemaHelper {
* @return a list of all the rows, where each row is a set of key value pairs with metadata
*/
public static List<Map<String, String>> parseJsonSchema(String group, String json, boolean parseProperties) {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (json == null) {
return answer;
}
@@ -134,7 +134,7 @@ public final class JsonSchemaHelper {
// need to safe encode \" so we can parse the line
line = line.replaceAll("\"\\\\\"\"", '"' + QUOT + '"');
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
Matcher matcher = PATTERN.matcher(line);
String key;
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 2d8a891..8260865 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -423,7 +423,7 @@ public final class MessageHelper {
sb.append(prefix);
sb.append(" <headers>\n");
// sort the headers so they are listed A..Z
- Map<String, Object> headers = new TreeMap<String, Object>(message.getHeaders());
+ Map<String, Object> headers = new TreeMap<>(message.getHeaders());
for (Map.Entry<String, Object> entry : headers.entrySet()) {
Object value = entry.getValue();
String type = ObjectHelper.classCanonicalName(value);
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index db5b9b9..ab98900 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -415,9 +415,9 @@ public final class ObjectHelper {
* @return an Optional
*/
public static Optional<Object> firstNotNull(Object... values) {
- for (int i = 0; i < values.length; i++) {
- if (values[i] != null) {
- return Optional.of(values[i]);
+ for (Object value : values) {
+ if (value != null) {
+ return Optional.of(value);
}
}
@@ -1532,7 +1532,7 @@ public final class ObjectHelper {
public static List<Method> findMethodsWithAnnotation(Class<?> type,
Class<? extends Annotation> annotationType,
boolean checkMetaAnnotations) {
- List<Method> answer = new ArrayList<Method>();
+ List<Method> answer = new ArrayList<>();
do {
Method[] methods = type.getDeclaredMethods();
for (Method method : methods) {
@@ -1872,7 +1872,7 @@ public final class ObjectHelper {
* @return the Iterable
*/
public static Iterable<Throwable> createExceptionIterable(Throwable exception) {
- List<Throwable> throwables = new ArrayList<Throwable>();
+ List<Throwable> throwables = new ArrayList<>();
Throwable current = exception;
// spool to the bottom of the caused by tree
diff --git a/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java b/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java
index f2f86cf..61b3aab 100644
--- a/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java
@@ -180,7 +180,7 @@ public final class OgnlHelper {
value = null;
}
- return new KeyValueHolder<String, String>(key, value);
+ return new KeyValueHolder<>(key, value);
}
return null;
@@ -196,7 +196,7 @@ public final class OgnlHelper {
* @throws IllegalArgumentException if the last method has a missing ending parenthesis
*/
public static List<String> splitOgnl(String ognl) {
- List<String> methods = new ArrayList<String>();
+ List<String> methods = new ArrayList<>();
// return an empty list if ognl is empty
if (ObjectHelper.isEmpty(ognl)) {
diff --git a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
index 55c9bd3..f382032 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
@@ -467,7 +467,7 @@ public final class ServiceHelper {
* @return the services, including the parent service, and all its children
*/
public static Set<Service> getChildServices(Service service, boolean includeErrorHandler) {
- Set<Service> answer = new LinkedHashSet<Service>();
+ Set<Service> answer = new LinkedHashSet<>();
doGetChildServices(answer, service, includeErrorHandler);
return answer;
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java b/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
index 8837c3a..cb04de9 100644
--- a/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
@@ -92,7 +92,7 @@ public final class StringQuoteHelper {
return new String[]{trim ? input.trim() : input};
}
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
StringBuilder sb = new StringBuilder();
boolean singleQuoted = false;
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 17f5935..35f10ef 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -175,7 +175,7 @@ public final class URISupport {
if (uri == null || ObjectHelper.isEmpty(uri)) {
// return an empty map
- return new LinkedHashMap<String, Object>(0);
+ return new LinkedHashMap<>(0);
}
// need to parse the uri query parameters manually as we cannot rely on splitting by &,
@@ -183,7 +183,7 @@ public final class URISupport {
try {
// use a linked map so the parameters is in the same order
- Map<String, Object> rc = new LinkedHashMap<String, Object>();
+ Map<String, Object> rc = new LinkedHashMap<>();
boolean isKey = true;
boolean isValue = false;
@@ -291,7 +291,7 @@ public final class URISupport {
list = CastUtils.cast((List<?>) existing);
} else {
// create a new list to hold the multiple values
- list = new ArrayList<String>();
+ list = new ArrayList<>();
String s = existing != null ? existing.toString() : null;
if (s != null) {
list.add(s);
@@ -318,7 +318,7 @@ public final class URISupport {
int idx = schemeSpecificPart.indexOf('?');
if (idx < 0) {
// return an empty map
- return new LinkedHashMap<String, Object>(0);
+ return new LinkedHashMap<>(0);
} else {
query = schemeSpecificPart.substring(idx + 1);
}
@@ -581,10 +581,10 @@ public final class URISupport {
return buildUri(scheme, path, null);
} else {
// reorder parameters a..z
- List<String> keys = new ArrayList<String>(parameters.keySet());
+ List<String> keys = new ArrayList<>(parameters.keySet());
keys.sort(null);
- Map<String, Object> sorted = new LinkedHashMap<String, Object>(parameters.size());
+ Map<String, Object> sorted = new LinkedHashMap<>(parameters.size());
for (String key : keys) {
sorted.put(key, parameters.get(key));
}
@@ -601,7 +601,7 @@ public final class URISupport {
}
public static Map<String, Object> extractProperties(Map<String, Object> properties, String optionPrefix) {
- Map<String, Object> rc = new LinkedHashMap<String, Object>(properties.size());
+ Map<String, Object> rc = new LinkedHashMap<>(properties.size());
for (Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
Map.Entry<String, Object> entry = it.next();
diff --git a/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java b/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java
index 6446a40..3b4a170 100644
--- a/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java
@@ -86,7 +86,7 @@ public final class UnitOfWorkHelper {
if (synchronizations != null && !synchronizations.isEmpty()) {
// work on a copy of the list to avoid any modification which may cause ConcurrentModificationException
- List<Synchronization> copy = new ArrayList<Synchronization>(synchronizations);
+ List<Synchronization> copy = new ArrayList<>(synchronizations);
// reverse so we invoke it FILO style instead of FIFO
Collections.reverse(copy);
@@ -114,7 +114,7 @@ public final class UnitOfWorkHelper {
public static void beforeRouteSynchronizations(Route route, Exchange exchange, List<Synchronization> synchronizations, Logger log) {
if (synchronizations != null && !synchronizations.isEmpty()) {
// work on a copy of the list to avoid any modification which may cause ConcurrentModificationException
- List<Synchronization> copy = new ArrayList<Synchronization>(synchronizations);
+ List<Synchronization> copy = new ArrayList<>(synchronizations);
// reverse so we invoke it FILO style instead of FIFO
Collections.reverse(copy);
@@ -139,7 +139,7 @@ public final class UnitOfWorkHelper {
public static void afterRouteSynchronizations(Route route, Exchange exchange, List<Synchronization> synchronizations, Logger log) {
if (synchronizations != null && !synchronizations.isEmpty()) {
// work on a copy of the list to avoid any modification which may cause ConcurrentModificationException
- List<Synchronization> copy = new ArrayList<Synchronization>(synchronizations);
+ List<Synchronization> copy = new ArrayList<>(synchronizations);
// reverse so we invoke it FILO style instead of FIFO
Collections.reverse(copy);
diff --git a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
index 9f59442..8273c53 100644
--- a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
+++ b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
@@ -96,7 +96,7 @@ public final class UnsafeUriCharactersEncoder {
private static List<Pair> checkRAW(String s) {
Matcher matcher = RAW_PATTERN.matcher(s);
- List<Pair> answer = new ArrayList<Pair>();
+ List<Pair> answer = new ArrayList<>();
// Check all occurrences
while (matcher.find()) {
// TODO: should likely be matcher.end() - 1
@@ -137,7 +137,7 @@ public final class UnsafeUriCharactersEncoder {
if (checkRaw) {
rawPairs = checkRAW(s);
} else {
- rawPairs = new ArrayList<Pair>();
+ rawPairs = new ArrayList<>();
}
int n = s == null ? 0 : s.length();
diff --git a/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java b/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
index a95892b..c56d47b 100644
--- a/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
+++ b/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
@@ -119,7 +119,7 @@ public final class XmlLineNumberParser {
final DocumentBuilder docBuilder = dbf.newDocumentBuilder();
doc = docBuilder.newDocument();
- final Stack<Element> elementStack = new Stack<Element>();
+ final Stack<Element> elementStack = new Stack<>();
final StringBuilder textBuffer = new StringBuilder();
final DefaultHandler handler = new DefaultHandler() {
private Locator locator;
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java
index 4f3e4e7..33d603e 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiComponent.java
@@ -110,7 +110,7 @@ public abstract class AbstractApiComponent<E extends Enum<E> & ApiName, T, S ext
protected abstract Endpoint createEndpoint(String uri, String methodName, E apiName, T endpointConfiguration);
protected T createEndpointConfiguration(E name) throws Exception {
- final Map<String, Object> componentProperties = new HashMap<String, Object>();
+ final Map<String, Object> componentProperties = new HashMap<>();
// copy component configuration, if set
if (configuration != null) {
IntrospectionSupport.getProperties(configuration, componentProperties, null, false);
@@ -132,7 +132,7 @@ public abstract class AbstractApiComponent<E extends Enum<E> & ApiName, T, S ext
@Override
public List<String> completeEndpointPath(ComponentConfiguration configuration, String completionText) {
- final List<String> result = new ArrayList<String>();
+ final List<String> result = new ArrayList<>();
final Set<String> apiNames = collection.getApiNames();
boolean useDefaultName = apiNames.size() == 1 && apiNames.contains("");
@@ -215,7 +215,7 @@ public abstract class AbstractApiComponent<E extends Enum<E> & ApiName, T, S ext
try {
final List<Object> arguments = helper.getArguments(methodName);
final int nArgs = arguments.size();
- final Set<String> options = new HashSet<String>();
+ final Set<String> options = new HashSet<>();
for (int i = 1; i < nArgs; i += 2) {
options.add((String) arguments.get(i));
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java
index ab50d12..106154f 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiEndpoint.java
@@ -44,7 +44,7 @@ public abstract class AbstractApiEndpoint<E extends ApiName, T>
extends DefaultEndpoint implements PropertyNamesInterceptor, PropertiesInterceptor {
// thread pool executor with Endpoint Class name as keys
- private static Map<String, ExecutorService> executorServiceMap = new ConcurrentHashMap<String, ExecutorService>();
+ private static Map<String, ExecutorService> executorServiceMap = new ConcurrentHashMap<>();
// logger
protected final Logger log = LoggerFactory.getLogger(getClass());
@@ -127,7 +127,7 @@ public abstract class AbstractApiEndpoint<E extends ApiName, T>
// compute endpoint property names and values
this.endpointPropertyNames = Collections.unmodifiableSet(
getPropertiesHelper().getEndpointPropertyNames(configuration));
- final HashMap<String, Object> properties = new HashMap<String, Object>();
+ final HashMap<String, Object> properties = new HashMap<>();
getPropertiesHelper().getEndpointProperties(configuration, properties);
this.endpointProperties = Collections.unmodifiableMap(properties);
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java
index 506b5d0..4c89f0d 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/AbstractApiProducer.java
@@ -57,7 +57,7 @@ public abstract class AbstractApiProducer<E extends Enum<E> & ApiName, T>
@Override
public boolean process(final Exchange exchange, final AsyncCallback callback) {
// properties for method arguments
- final Map<String, Object> properties = new HashMap<String, Object>();
+ final Map<String, Object> properties = new HashMap<>();
properties.putAll(endpoint.getEndpointProperties());
propertiesHelper.getExchangeProperties(exchange, properties);
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java
index f653b77..a39b9f8 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodHelper.java
@@ -74,12 +74,12 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
}
if (nullableArguments != null && !nullableArguments.isEmpty()) {
- this.nullableArguments = Collections.unmodifiableList(new ArrayList<String>(nullableArguments));
+ this.nullableArguments = Collections.unmodifiableList(new ArrayList<>(nullableArguments));
} else {
this.nullableArguments = Collections.emptyList();
}
- final Map<Pattern, String> aliasPatterns = new HashMap<Pattern, String>();
+ final Map<Pattern, String> aliasPatterns = new HashMap<>();
for (Map.Entry<String, String> alias : aliases.entrySet()) {
if (alias.getKey() == null || alias.getValue() == null) {
throw new IllegalArgumentException("Alias pattern and replacement cannot be null");
@@ -111,7 +111,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
}
Set<String> names = tmpAliasesMap.get(alias);
if (names == null) {
- names = new HashSet<String>();
+ names = new HashSet<>();
tmpAliasesMap.put(alias, names);
}
names.add(name);
@@ -121,7 +121,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
// map method name to Enum
List<T> overloads = tmpMethodMap.get(name);
if (overloads == null) {
- overloads = new ArrayList<T>();
+ overloads = new ArrayList<>();
tmpMethodMap.put(method.getName(), overloads);
}
overloads.add(method);
@@ -129,7 +129,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
// add arguments for this method
List<Object> arguments = tmpArgumentsMap.get(name);
if (arguments == null) {
- arguments = new ArrayList<Object>();
+ arguments = new ArrayList<>();
tmpArgumentsMap.put(name, arguments);
}
@@ -160,7 +160,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
// validate nullableArguments
if (!tmpValidArguments.keySet().containsAll(this.nullableArguments)) {
- List<String> unknowns = new ArrayList<String>(this.nullableArguments);
+ List<String> unknowns = new ArrayList<>(this.nullableArguments);
unknowns.removeAll(tmpValidArguments.keySet());
throw new IllegalArgumentException("Unknown nullable arguments " + unknowns.toString());
}
@@ -173,7 +173,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
if (methodNames.size() > 1) {
// get mapped methods
- final List<T> aliasedMethods = new ArrayList<T>();
+ final List<T> aliasedMethods = new ArrayList<>();
for (String methodName : methodNames) {
List<T> mappedMethods = tmpMethodMap.get(methodName);
aliasedMethods.addAll(mappedMethods);
@@ -181,13 +181,13 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
// look for argument overlap
for (T method : aliasedMethods) {
- final List<String> argNames = new ArrayList<String>(method.getArgNames());
+ final List<String> argNames = new ArrayList<>(method.getArgNames());
argNames.removeAll(this.nullableArguments);
- final Set<T> ambiguousMethods = new HashSet<T>();
+ final Set<T> ambiguousMethods = new HashSet<>();
for (T otherMethod : aliasedMethods) {
if (method != otherMethod) {
- final List<String> otherArgsNames = new ArrayList<String>(otherMethod.getArgNames());
+ final List<String> otherArgsNames = new ArrayList<>(otherMethod.getArgNames());
otherArgsNames.removeAll(this.nullableArguments);
if (argNames.equals(otherArgsNames)) {
@@ -236,7 +236,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
List<T> methods = methodMap.get(name);
if (methods == null) {
if (aliasesMap.containsKey(name)) {
- methods = new ArrayList<T>();
+ methods = new ArrayList<>();
for (String method : aliasesMap.get(name)) {
methods.addAll(methodMap.get(method));
}
@@ -359,7 +359,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
List<Object> arguments = argumentsMap.get(name);
if (arguments == null) {
if (aliasesMap.containsKey(name)) {
- arguments = new ArrayList<Object>();
+ arguments = new ArrayList<>();
for (String method : aliasesMap.get(name)) {
arguments.addAll(argumentsMap.get(method));
}
@@ -379,7 +379,7 @@ public final class ApiMethodHelper<T extends Enum<T> & ApiMethod> {
*/
public Set<String> getMissingProperties(String methodName, Set<String> argNames) {
final List<Object> argsWithTypes = getArguments(methodName);
- final Set<String> missingArgs = new HashSet<String>();
+ final Set<String> missingArgs = new HashSet<>();
for (int i = 1; i < argsWithTypes.size(); i += 2) {
final String name = (String) argsWithTypes.get(i);
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
index 2e4f4aa..c3ff108 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
@@ -45,7 +45,7 @@ public abstract class ApiMethodParser<T> {
private static final Map<String, Class<?>> PRIMITIVE_TYPES;
static {
- PRIMITIVE_TYPES = new HashMap<String, Class<?>>();
+ PRIMITIVE_TYPES = new HashMap<>();
PRIMITIVE_TYPES.put("int", Integer.TYPE);
PRIMITIVE_TYPES.put("long", Long.TYPE);
PRIMITIVE_TYPES.put("double", Double.TYPE);
@@ -77,7 +77,7 @@ public abstract class ApiMethodParser<T> {
}
public final void setSignatures(List<String> signatures) {
- this.signatures = new ArrayList<String>();
+ this.signatures = new ArrayList<>();
this.signatures.addAll(signatures);
}
@@ -95,7 +95,7 @@ public abstract class ApiMethodParser<T> {
*/
public final List<ApiMethodModel> parse() {
// parse sorted signatures and generate descriptions
- List<ApiMethodModel> result = new ArrayList<ApiMethodModel>();
+ List<ApiMethodModel> result = new ArrayList<>();
for (String signature : signatures) {
// skip comment or empty lines
@@ -122,8 +122,8 @@ public abstract class ApiMethodParser<T> {
final String name = methodMatcher.group(3);
final String argSignature = methodMatcher.group(4);
- final List<ApiMethodArg> arguments = new ArrayList<ApiMethodArg>();
- final List<Class<?>> argTypes = new ArrayList<Class<?>>();
+ final List<ApiMethodArg> arguments = new ArrayList<>();
+ final List<Class<?>> argTypes = new ArrayList<>();
final Matcher argsMatcher = ARGS_PATTERN.matcher(argSignature);
while (argsMatcher.find()) {
@@ -150,7 +150,7 @@ public abstract class ApiMethodParser<T> {
result = processResults(result);
// check that argument names have the same type across methods
- Map<String, Class<?>> allArguments = new HashMap<String, Class<?>>();
+ Map<String, Class<?>> allArguments = new HashMap<>();
for (ApiMethodModel model : result) {
for (ApiMethodArg argument : model.getArguments()) {
String name = argument.getName();
@@ -198,7 +198,7 @@ public abstract class ApiMethodParser<T> {
});
// assign unique names to every method model
- final Map<String, Integer> dups = new HashMap<String, Integer>();
+ final Map<String, Integer> dups = new HashMap<>();
for (ApiMethodModel model : result) {
// locale independent upper case conversion
final String name = model.getName();
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodPropertiesHelper.java b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodPropertiesHelper.java
index fb2cd4e..246336a 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodPropertiesHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodPropertiesHelper.java
@@ -36,7 +36,7 @@ public abstract class ApiMethodPropertiesHelper<C> {
protected static final Logger LOG = LoggerFactory.getLogger(ApiMethodPropertiesHelper.class);
// set of field names which are specific to the api, to be excluded from method argument considerations
- protected final Set<String> componentConfigFields = new HashSet<String>();
+ protected final Set<String> componentConfigFields = new HashSet<>();
protected final Class<?> componentConfigClass;
protected final String propertyPrefix;
@@ -100,13 +100,13 @@ public abstract class ApiMethodPropertiesHelper<C> {
}
public Set<String> getEndpointPropertyNames(Object endpointConfiguration) {
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
getEndpointProperties(endpointConfiguration, properties);
return Collections.unmodifiableSet(properties.keySet());
}
public Set<String> getValidEndpointProperties(Object endpointConfiguration) {
- Set<String> fields = new HashSet<String>();
+ Set<String> fields = new HashSet<>();
for (Field field : endpointConfiguration.getClass().getDeclaredFields()) {
fields.add(field.getName());
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java b/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java
index 00d9aa8..8f219cc 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java
@@ -37,7 +37,7 @@ public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
*/
public ArgumentSubstitutionParser(Class<T> proxyType, Substitution[] substitutions) {
super(proxyType);
- Map<String, Map<String, List<NameReplacement>>> regexMap = new LinkedHashMap<String, Map<String, List<NameReplacement>>>();
+ Map<String, Map<String, List<NameReplacement>>> regexMap = new LinkedHashMap<>();
for (Substitution substitution : substitutions) {
substitution.validate();
@@ -51,21 +51,21 @@ public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
Map<String, List<NameReplacement>> replacementMap = regexMap.get(substitution.method);
if (replacementMap == null) {
- replacementMap = new LinkedHashMap<String, List<NameReplacement>>();
+ replacementMap = new LinkedHashMap<>();
regexMap.put(substitution.method, replacementMap);
}
List<NameReplacement> replacements = replacementMap.get(substitution.argName);
if (replacements == null) {
- replacements = new ArrayList<NameReplacement>();
+ replacements = new ArrayList<>();
replacementMap.put(substitution.argName, replacements);
}
replacements.add(nameReplacement);
}
// now compile the patterns, all this because Pattern doesn't override equals()!!!
- this.methodMap = new LinkedHashMap<Pattern, Map<Pattern, List<NameReplacement>>>();
+ this.methodMap = new LinkedHashMap<>();
for (Map.Entry<String, Map<String, List<NameReplacement>>> method : regexMap.entrySet()) {
- Map<Pattern, List<NameReplacement>> argMap = new LinkedHashMap<Pattern, List<NameReplacement>>();
+ Map<Pattern, List<NameReplacement>> argMap = new LinkedHashMap<>();
for (Map.Entry<String, List<NameReplacement>> arg : method.getValue().entrySet()) {
argMap.put(Pattern.compile(arg.getKey()), arg.getValue());
}
@@ -75,7 +75,7 @@ public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
@Override
public List<ApiMethodModel> processResults(List<ApiMethodModel> parseResult) {
- final List<ApiMethodModel> result = new ArrayList<ApiMethodModel>();
+ final List<ApiMethodModel> result = new ArrayList<>();
for (ApiMethodModel model : parseResult) {
// look for method name matches
@@ -84,7 +84,7 @@ public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
if (methodEntry.getKey().matcher(model.getName()).matches()) {
// look for arg name matches
- final List<ApiMethodArg> updatedArguments = new ArrayList<ApiMethodArg>();
+ final List<ApiMethodArg> updatedArguments = new ArrayList<>();
final Map<Pattern, List<NameReplacement>> argMap = methodEntry.getValue();
for (ApiMethodArg argument : model.getArguments()) {
diff --git a/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableScheduledThreadPoolExecutor.java b/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableScheduledThreadPoolExecutor.java
index 7a205e6..47be32f 100644
--- a/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableScheduledThreadPoolExecutor.java
+++ b/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableScheduledThreadPoolExecutor.java
@@ -73,7 +73,7 @@ public class RejectableScheduledThreadPoolExecutor extends ScheduledThreadPoolEx
@Override
protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
if (runnable instanceof Rejectable) {
- return new RejectableFutureTask<T>(runnable, value);
+ return new RejectableFutureTask<>(runnable, value);
} else {
return super.newTaskFor(runnable, value);
}
@@ -82,7 +82,7 @@ public class RejectableScheduledThreadPoolExecutor extends ScheduledThreadPoolEx
@Override
protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
if (callable instanceof Rejectable) {
- return new RejectableFutureTask<T>(callable);
+ return new RejectableFutureTask<>(callable);
} else {
return super.newTaskFor(callable);
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableThreadPoolExecutor.java b/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableThreadPoolExecutor.java
index 8962184..0a9536b 100644
--- a/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableThreadPoolExecutor.java
+++ b/camel-core/src/main/java/org/apache/camel/util/concurrent/RejectableThreadPoolExecutor.java
@@ -79,7 +79,7 @@ public class RejectableThreadPoolExecutor extends ThreadPoolExecutor {
@Override
protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
if (runnable instanceof Rejectable) {
- return new RejectableFutureTask<T>(runnable, value);
+ return new RejectableFutureTask<>(runnable, value);
} else {
return super.newTaskFor(runnable, value);
}
@@ -88,7 +88,7 @@ public class RejectableThreadPoolExecutor extends ThreadPoolExecutor {
@Override
protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
if (callable instanceof Rejectable) {
- return new RejectableFutureTask<T>(callable);
+ return new RejectableFutureTask<>(callable);
} else {
return super.newTaskFor(callable);
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java b/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java
index 09d02bf..1158900 100644
--- a/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java
+++ b/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java
@@ -39,7 +39,7 @@ public class SubmitOrderedCompletionService<V> implements CompletionService<V> {
// the idea to order the completed task in the same order as they where submitted is to leverage
// the delay queue. With the delay queue we can control the order by the getDelay and compareTo methods
// where we can order the tasks in the same order as they where submitted.
- private final DelayQueue<SubmitOrderFutureTask> completionQueue = new DelayQueue<SubmitOrderFutureTask>();
+ private final DelayQueue<SubmitOrderFutureTask> completionQueue = new DelayQueue<>();
// id is the unique id that determines the order in which tasks was submitted (incrementing)
private final AtomicInteger id = new AtomicInteger();
diff --git a/camel-core/src/main/java/org/apache/camel/util/function/Suppliers.java b/camel-core/src/main/java/org/apache/camel/util/function/Suppliers.java
index 84a43b2..90a76f2 100644
--- a/camel-core/src/main/java/org/apache/camel/util/function/Suppliers.java
+++ b/camel-core/src/main/java/org/apache/camel/util/function/Suppliers.java
@@ -68,8 +68,8 @@ public final class Suppliers {
public static <T> Optional<T> firstNotNull(ThrowingSupplier<T, Exception>... suppliers) throws Exception {
T answer = null;
- for (int i = 0; i < suppliers.length; i++) {
- answer = suppliers[i].get();
+ for (ThrowingSupplier<T, Exception> supplier : suppliers) {
+ answer = supplier.get();
if (answer != null) {
break;
}
@@ -81,8 +81,8 @@ public final class Suppliers {
public static <T> Optional<T> firstMatching(Predicate<T> predicate, ThrowingSupplier<T, Exception>... suppliers) throws Exception {
T answer = null;
- for (int i = 0; i < suppliers.length; i++) {
- answer = suppliers[i].get();
+ for (ThrowingSupplier<T, Exception> supplier : suppliers) {
+ answer = supplier.get();
if (predicate.test(answer)) {
break;
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java b/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
index f43ae6e..2f02e49 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
@@ -74,9 +74,9 @@ public class JndiContext implements Context, Serializable {
}
public JndiContext(Hashtable<String, Object> environment, Map<String, Object> bindings) {
- this.environment = environment == null ? new Hashtable<String, Object>() : new Hashtable<String, Object>(environment);
+ this.environment = environment == null ? new Hashtable<>() : new Hashtable<>(environment);
this.bindings = bindings;
- treeBindings = new HashMap<String, Object>();
+ treeBindings = new HashMap<>();
}
public JndiContext(Hashtable<String, Object> environment, Map<String, Object> bindings, String nameInNamespace) {
@@ -87,7 +87,7 @@ public class JndiContext implements Context, Serializable {
protected JndiContext(JndiContext clone, Hashtable<String, Object> env) {
this.bindings = clone.bindings;
this.treeBindings = clone.treeBindings;
- this.environment = new Hashtable<String, Object>(env);
+ this.environment = new Hashtable<>(env);
}
protected JndiContext(JndiContext clone, Hashtable<String, Object> env, String nameInNamespace) {
@@ -101,7 +101,7 @@ public class JndiContext implements Context, Serializable {
* properties set on the injected bean
*/
public static Map<String, Object> createBindingsMapFromEnvironment(Hashtable<String, Object> env) throws Exception {
- Map<String, Object> answer = new HashMap<String, Object>(env);
+ Map<String, Object> answer = new HashMap<>(env);
for (Map.Entry<String, Object> entry : env.entrySet()) {
String key = entry.getKey();
@@ -147,7 +147,7 @@ public class JndiContext implements Context, Serializable {
assert name != null && name.length() > 0;
assert !frozen;
- Map<String, Object> newBindings = new HashMap<String, Object>();
+ Map<String, Object> newBindings = new HashMap<>();
int pos = name.indexOf('/');
if (pos == -1) {
if (treeBindings.put(name, value) != null) {
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
index e4c73a3..bcd68d0 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
@@ -385,7 +385,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
}
};
- List<Configurer<SSLEngine>> sslEngineConfigurers = new LinkedList<Configurer<SSLEngine>>();
+ List<Configurer<SSLEngine>> sslEngineConfigurers = new LinkedList<>();
sslEngineConfigurers.add(sslEngineConfigurer);
return sslEngineConfigurers;
@@ -423,7 +423,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
List<Configurer<SSLSocketFactory>> sslSocketFactoryConfigurers =
- new LinkedList<Configurer<SSLSocketFactory>>();
+ new LinkedList<>();
sslSocketFactoryConfigurers.add(sslSocketFactoryConfigurer);
return sslSocketFactoryConfigurers;
@@ -461,7 +461,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
List<Configurer<SSLServerSocketFactory>> sslServerSocketFactoryConfigurers =
- new LinkedList<Configurer<SSLServerSocketFactory>>();
+ new LinkedList<>();
sslServerSocketFactoryConfigurers.add(sslServerSocketFactoryConfigurer);
return sslServerSocketFactoryConfigurers;
@@ -567,7 +567,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
}
};
- List<Configurer<SSLSocket>> sslSocketConfigurers = new LinkedList<Configurer<SSLSocket>>();
+ List<Configurer<SSLSocket>> sslSocketConfigurers = new LinkedList<>();
sslSocketConfigurers.add(sslSocketConfigurer);
return sslSocketConfigurers;
@@ -667,7 +667,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
}
};
- List<Configurer<SSLServerSocket>> sslServerSocketConfigurers = new LinkedList<Configurer<SSLServerSocket>>();
+ List<Configurer<SSLServerSocket>> sslServerSocketConfigurers = new LinkedList<>();
sslServerSocketConfigurers.add(sslServerSocketConfigurer);
return sslServerSocketConfigurers;
@@ -766,9 +766,9 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
// Explicit list has precedence over filters, even when the list is
// empty.
if (explicitValues != null) {
- returnValues = new ArrayList<String>(explicitValues);
+ returnValues = new ArrayList<>(explicitValues);
} else {
- returnValues = new LinkedList<String>();
+ returnValues = new LinkedList<>();
for (String value : availableValues) {
if (this.matchesOneOf(value, includePatterns)
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/FilterParameters.java b/camel-core/src/main/java/org/apache/camel/util/jsse/FilterParameters.java
index 0d8c080..258ab9c 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/FilterParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/FilterParameters.java
@@ -40,7 +40,7 @@ public class FilterParameters extends JsseParameters {
*/
public List<String> getInclude() {
if (this.include == null) {
- this.include = new ArrayList<String>();
+ this.include = new ArrayList<>();
}
return this.include;
}
@@ -53,7 +53,7 @@ public class FilterParameters extends JsseParameters {
*/
public List<String> getExclude() {
if (exclude == null) {
- exclude = new ArrayList<String>();
+ exclude = new ArrayList<>();
}
return this.exclude;
}
@@ -100,7 +100,7 @@ public class FilterParameters extends JsseParameters {
* @throws PatternSyntaxException if any of the expressions are invalid
*/
protected List<Pattern> getPattern(List<String> patternStrings) {
- List<Pattern> patterns = new ArrayList<Pattern>(patternStrings.size());
+ List<Pattern> patterns = new ArrayList<>(patternStrings.size());
for (String expression : patternStrings) {
patterns.add(Pattern.compile(this.parsePropertyValue(expression)));
@@ -116,8 +116,8 @@ public class FilterParameters extends JsseParameters {
private final List<Pattern> excludes;
public Patterns(List<Pattern> includes, List<Pattern> excludes) {
- this.includes = Collections.unmodifiableList(new ArrayList<Pattern>(includes));
- this.excludes = Collections.unmodifiableList(new ArrayList<Pattern>(excludes));
+ this.includes = Collections.unmodifiableList(new ArrayList<>(includes));
+ this.excludes = Collections.unmodifiableList(new ArrayList<>(excludes));
}
public List<Pattern> getIncludes() {
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.java b/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.java
index a96549e..7a0c8f9 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.java
@@ -95,7 +95,7 @@ public class JsseParameters implements CamelContextAware {
if (this.getCamelContext() == null) {
return values;
} else {
- List<String> parsedValues = new ArrayList<String>(values.size());
+ List<String> parsedValues = new ArrayList<>(values.size());
for (String value : values) {
parsedValues.add(this.parsePropertyValue(value));
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/KeyStoreParameters.java b/camel-core/src/main/java/org/apache/camel/util/jsse/KeyStoreParameters.java
index cbd0cc6..398c81e 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/KeyStoreParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/KeyStoreParameters.java
@@ -176,7 +176,7 @@ public class KeyStoreParameters extends JsseParameters {
}
if (LOG.isDebugEnabled()) {
- List<String> aliases = new LinkedList<String>();
+ List<String> aliases = new LinkedList<>();
Enumeration<String> aliasEnum = ks.aliases();
while (aliasEnum.hasMoreElements()) {
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java b/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java
index e240c3f..b6cb614 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java
@@ -87,7 +87,7 @@ public class SSLContextServerParameters extends BaseSSLContextParameters {
// cipher suites and protocols, this method needs to address that.
// As is, we do NOT pass the configurers along for those two settings.
- List<Configurer<SSLEngine>> sslEngineConfigurers = new LinkedList<Configurer<SSLEngine>>();
+ List<Configurer<SSLEngine>> sslEngineConfigurers = new LinkedList<>();
if (this.getClientAuthentication() != null) {
diff --git a/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java b/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
index 4952be1..17cd260 100644
--- a/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
+++ b/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
@@ -40,7 +40,7 @@ public final class AggregationStrategies {
* @param type The type the {@link FlexibleAggregationStrategy} deals with.
*/
public static <T> FlexibleAggregationStrategy<T> flexible(Class<T> type) {
- return new FlexibleAggregationStrategy<T>(type);
+ return new FlexibleAggregationStrategy<>(type);
}
/**
@@ -48,7 +48,7 @@ public final class AggregationStrategies {
* <tt>pick expression</tt> results.
*/
public static FlexibleAggregationStrategy<Object> flexible() {
- return new FlexibleAggregationStrategy<Object>();
+ return new FlexibleAggregationStrategy<>();
}
/**
diff --git a/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java b/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java
index fb64d02..ea0a1f1 100644
--- a/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/ThreadPoolRejectedPolicyTest.java
@@ -33,11 +33,11 @@ public class ThreadPoolRejectedPolicyTest extends TestSupport {
final ExecutorService executorService = createTestExecutorService(ThreadPoolRejectedPolicy.Abort.asRejectedExecutionHandler());
- final MockCallable<String> task1 = new MockCallable<String>();
+ final MockCallable<String> task1 = new MockCallable<>();
final Future<?> result1 = executorService.submit(task1);
final MockRunnable task2 = new MockRunnable();
final Future<?> result2 = executorService.submit(task2);
- final MockCallable<String> task3 = new MockCallable<String>();
+ final MockCallable<String> task3 = new MockCallable<>();
try {
executorService.submit(task3);
fail("Third task should have been rejected by a threadpool is full with 1 task and queue is full with 1 task.");
@@ -57,12 +57,12 @@ public class ThreadPoolRejectedPolicyTest extends TestSupport {
final MockRejectableRunnable task1 = new MockRejectableRunnable();
final Future<?> result1 = executorService.submit(task1);
- final MockRejectableCallable<String> task2 = new MockRejectableCallable<String>();
+ final MockRejectableCallable<String> task2 = new MockRejectableCallable<>();
final Future<?> result2 = executorService.submit(task2);
final MockRejectableRunnable task3 = new MockRejectableRunnable();
final Future<?> result3 = executorService.submit(task3);
- final MockRejectableCallable<String> task4 = new MockRejectableCallable<String>();
+ final MockRejectableCallable<String> task4 = new MockRejectableCallable<>();
final Future<?> result4 = executorService.submit(task4);
shutdownAndAwait(executorService);
diff --git a/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java b/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
index 1975954..a1947c2 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
@@ -34,7 +34,7 @@ import org.apache.camel.processor.DelegateProcessor;
*/
public class BuilderWithScopesTest extends TestSupport {
- final List<String> order = new ArrayList<String>();
+ final List<String> order = new ArrayList<>();
final DelegateProcessor interceptor1 = new DelegateProcessor() {
@Override
public void process(Exchange exchange) throws Exception {
@@ -111,7 +111,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithFilterEnd() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("TO");
runTest(new RouteBuilder() {
@@ -125,7 +125,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithFilterNoEnd() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
runTest(new RouteBuilder() {
public void configure() {
@@ -150,7 +150,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithChoice1() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("INVOKED");
expected.add("TO");
@@ -158,7 +158,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithChoice2() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("INVOKED2");
expected.add("TO");
@@ -166,14 +166,14 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithChoice3() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("TO");
runTest(createChoiceBuilder(), expected, "banana");
}
public void testRouteWithChoiceNoEnd() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("INVOKED");
runTest(new RouteBuilder() {
@@ -199,7 +199,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithChoiceOtherwise1() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("INVOKED");
expected.add("TO");
@@ -207,7 +207,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithChoiceOtherwise2() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("INVOKED2");
expected.add("TO");
@@ -215,14 +215,14 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithChoiceOtherwise3() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("INVOKED3");
expected.add("TO");
runTest(createChoiceWithOtherwiseBuilder(), expected, "banana");
}
public void testRouteWithChoiceOtherwiseNoEnd() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("INVOKED");
runTest(new RouteBuilder() {
@@ -252,7 +252,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchNoEndNoException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("TO");
@@ -260,7 +260,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchNoEndWithCaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("INVOKED");
expected.add("INVOKED3");
@@ -269,7 +269,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchNoEndWithUncaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
runTest(createTryCatchNoEnd(), expected);
@@ -285,7 +285,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchEndNoException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("TO");
expected.add("INVOKED3");
@@ -294,7 +294,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchEndWithCaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("INVOKED");
expected.add("INVOKED3");
@@ -303,7 +303,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchEndWithUncaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
runTest(createTryCatchEnd(), expected);
@@ -320,7 +320,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchFinallyNoEndNoException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("TO");
expected.add("INVOKED2");
@@ -330,7 +330,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchFinallyNoEndWithCaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("INVOKED");
expected.add("INVOKED2");
@@ -340,7 +340,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchFinallyNoEndWithUncaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("INVOKED2");
expected.add("INVOKED3");
@@ -359,7 +359,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchFinallyEndNoException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("TO");
expected.add("INVOKED2");
@@ -369,7 +369,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchFinallyEndWithCaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("INVOKED");
expected.add("INVOKED2");
@@ -379,7 +379,7 @@ public class BuilderWithScopesTest extends TestSupport {
}
public void testRouteWithTryCatchFinallyEndWithUncaughtException() throws Exception {
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add("VALIDATE");
expected.add("INVOKED2");
diff --git a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
index 0550580..4ae7963 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
@@ -43,7 +43,7 @@ public class ExpressionBuilderTest extends TestSupport {
public void testRegexTokenize() throws Exception {
Expression expression = regexTokenizeExpression(headerExpression("location"), ",");
- List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
+ List<String> expected = new ArrayList<>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
assertExpression(expression, exchange, expected);
Predicate predicate = contains(regexTokenizeExpression(headerExpression("location"), ","),
@@ -67,7 +67,7 @@ public class ExpressionBuilderTest extends TestSupport {
public void testTokenize() throws Exception {
Expression expression = tokenizeExpression(headerExpression("location"), ",");
- List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
+ List<String> expected = new ArrayList<>(Arrays.asList(new String[] {"Islington", "London", "UK"}));
assertExpression(expression, exchange, expected);
Predicate predicate = contains(tokenizeExpression(headerExpression("location"), ","),
@@ -83,7 +83,7 @@ public class ExpressionBuilderTest extends TestSupport {
Expression expression = regexTokenizeExpression(bodyExpression(), "[\r|\n]");
exchange.getIn().setBody("Hello World\nBye World\rSee you again");
- List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Hello World", "Bye World", "See you again"}));
+ List<String> expected = new ArrayList<>(Arrays.asList(new String[] {"Hello World", "Bye World", "See you again"}));
assertExpression(expression, exchange, expected);
}
@@ -91,7 +91,7 @@ public class ExpressionBuilderTest extends TestSupport {
Expression expression = sortExpression(body().tokenize(",").getExpression(), new SortByName());
exchange.getIn().setBody("Jonathan,Claus,James,Hadrian");
- List<String> expected = new ArrayList<String>(Arrays.asList(new String[] {"Claus", "Hadrian", "James", "Jonathan"}));
+ List<String> expected = new ArrayList<>(Arrays.asList(new String[] {"Claus", "Hadrian", "James", "Jonathan"}));
assertExpression(expression, exchange, expected);
}
diff --git a/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java b/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java
index aa9f206..5604818 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderConcurrentTest.java
@@ -43,7 +43,7 @@ public class PredicateBuilderConcurrentTest extends ContextTestSupport {
public void testPredicateBuilderConcurrent() throws Exception {
context.start();
- List<Future<Boolean>> futures = new ArrayList<Future<Boolean>>();
+ List<Future<Boolean>> futures = new ArrayList<>();
ExecutorService pool = Executors.newFixedThreadPool(10);
for (int i = 0; i < 1000; i++) {
diff --git a/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
index 0818017..4f1bfb2 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
@@ -255,7 +255,7 @@ public class RouteBuilderTest extends TestSupport {
Channel channel = unwrapChannel(consumer.getProcessor());
MulticastProcessor multicastProcessor = assertIsInstanceOf(MulticastProcessor.class, channel.getNextProcessor());
- List<Processor> endpoints = new ArrayList<Processor>(multicastProcessor.getProcessors());
+ List<Processor> endpoints = new ArrayList<>(multicastProcessor.getProcessors());
assertEquals("Should have 2 endpoints", 2, endpoints.size());
assertSendToProcessor(unwrapChannel(endpoints.get(0)).getNextProcessor(), "direct://tap");
@@ -299,7 +299,7 @@ public class RouteBuilderTest extends TestSupport {
assertEquals(3, line.getProcessors().size());
// last should be our seda
- List<Processor> processors = new ArrayList<Processor>(line.getProcessors());
+ List<Processor> processors = new ArrayList<>(line.getProcessors());
Processor sendTo = assertIsInstanceOf(SendProcessor.class, unwrapChannel(processors.get(2)).getNextProcessor());
assertSendTo(sendTo, "direct://d");
}
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
index 66e6e05..35e3e06 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
@@ -118,7 +118,7 @@ public class DefaultNamespaceContextTest extends ContextTestSupport {
}
public void testDefaultNamespaceContextAnotherCtr() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("foo", "http://acme/cheese");
DefaultNamespaceContext context = new DefaultNamespaceContext(null, map);
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index 316400c..e602bc2 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -365,7 +365,7 @@ public class XPathTest extends ContextTestSupport {
// convert the node concurrently to test that XML Parser is not thread safe when
// importing nodes to a new Document, so try a test for that
- final List<Document> result = new ArrayList<Document>();
+ final List<Document> result = new ArrayList<>();
ExecutorService executor = Executors.newFixedThreadPool(size);
final CountDownLatch latch = new CountDownLatch(size);
for (int i = 0; i < size; i++) {
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
index dfa4848..4b49b65 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanConcurrentTest.java
@@ -44,7 +44,7 @@ public class BeanConcurrentTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// should be 1000 messages
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
String body = mock.getReceivedExchanges().get(i).getIn().getBody(String.class);
list.add(body);
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java
index cb7e60f..18411fa 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanExpressionConcurrentTest.java
@@ -44,7 +44,7 @@ public class BeanExpressionConcurrentTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// should be 1000 messages
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
String body = mock.getReceivedExchanges().get(i).getIn().getBody(String.class);
list.add(body);
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
index ae6eed6..5cced20 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.impl.JndiRegistry;
*/
public class BeanMapPutTest extends ContextTestSupport {
- private Map<String, String> myMap = new HashMap<String, String>();
+ private Map<String, String> myMap = new HashMap<>();
@Override
protected JndiRegistry createRegistry() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java
index 577774e..f7c2293 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterMethodCallThreeBodyOgnlTest.java
@@ -31,7 +31,7 @@ public class BeanParameterMethodCallThreeBodyOgnlTest extends ContextTestSupport
public void testBeanParameterValue() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("3");
- List<String> body = new ArrayList<String>();
+ List<String> body = new ArrayList<>();
body.add("A");
body.add("B");
body.add("C");
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java
index 5102c68..7e24b61 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterThreeBodyOgnlTest.java
@@ -31,7 +31,7 @@ public class BeanParameterThreeBodyOgnlTest extends ContextTestSupport {
public void testBeanParameterValue() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("3");
- List<String> body = new ArrayList<String>();
+ List<String> body = new ArrayList<>();
body.add("A");
body.add("B");
body.add("C");
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
index 0a2bc09..dee662c 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
@@ -87,7 +87,7 @@ public class BeanParameterValueTest extends ContextTestSupport {
public void testBeanParameterNoBody() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Is Hadrian 21 years old?");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("SomeTest", true);
headers.put("SomeAge", 21);
headers.put("SomeName", "Hadrian");
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
index 6d5bf3d..6fe8fc3 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(BeanWithHeadersAndBodyInject2Test.class);
private MyBean myBean = new MyBean();
- private Map<String, User> users = new HashMap<String, User>();
+ private Map<String, User> users = new HashMap<>();
public void testCannotBindToParameter() throws Exception {
// Create hashmap for testing purpose
@@ -64,7 +64,7 @@ public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
}
public void testBindToParameter() throws Exception {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
list.add("Charles");
list.add("Claus");
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/CamelSimpleExpressionPerfTestRunner.java b/camel-core/src/test/java/org/apache/camel/component/bean/CamelSimpleExpressionPerfTestRunner.java
index 4c26429..d5a73cb 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/CamelSimpleExpressionPerfTestRunner.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/CamelSimpleExpressionPerfTestRunner.java
@@ -56,7 +56,7 @@ public final class CamelSimpleExpressionPerfTestRunner {
ctx.start();
- Map<String, String> body = new HashMap<String, String>();
+ Map<String, String> body = new HashMap<>();
body.put("p", "q");
ProducerTemplate template = ctx.createProducerTemplate();
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java
index 0cb9071..0c8f51e 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureListTest.java
@@ -75,7 +75,7 @@ public class ProxyReturnFutureListTest extends ContextTestSupport {
.delay(50)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- List<String> users = new ArrayList<String>();
+ List<String> users = new ArrayList<>();
users.add("Claus");
users.add("Jonathan");
exchange.getIn().setBody(users);
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
index c62c3fd..832fdd2 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
@@ -57,7 +57,7 @@ public class PojoProxyHelperOneWayTest extends ContextTestSupport {
}
public final class PersonReceiver implements PersonHandler {
- public List<Person> receivedPersons = new ArrayList<Person>();
+ public List<Person> receivedPersons = new ArrayList<>();
@Override
public void onPerson(Person person) {
diff --git a/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java b/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java
index 281c064..6964eb3 100644
--- a/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/direct/DirectShouldUseSameThreadTest.java
@@ -41,7 +41,7 @@ public class DirectShouldUseSameThreadTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- final ThreadLocal<String> local = new ThreadLocal<String>();
+ final ThreadLocal<String> local = new ThreadLocal<>();
from("direct:start").process(new Processor() {
public void process(Exchange exchange) throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java
index 9bf8de7..476e376 100644
--- a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmShouldUseSameThreadTest.java
@@ -41,7 +41,7 @@ public class DirectVmShouldUseSameThreadTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- final ThreadLocal<String> local = new ThreadLocal<String>();
+ final ThreadLocal<String> local = new ThreadLocal<>();
from("direct-vm:start").process(new Processor() {
public void process(Exchange exchange) throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java b/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
index 026ecd3..52fc52d 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
@@ -37,7 +37,7 @@ public class AntPathMatcherGenericFileFilterTest extends ContextTestSupport {
@Override
protected JndiRegistry createRegistry() throws Exception {
- AntPathMatcherGenericFileFilter<File> filterNotCaseSensitive = new AntPathMatcherGenericFileFilter<File>("**/c*");
+ AntPathMatcherGenericFileFilter<File> filterNotCaseSensitive = new AntPathMatcherGenericFileFilter<>("**/c*");
filterNotCaseSensitive.setCaseSensitive(false);
JndiRegistry jndi = super.createRegistry();
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java
index d663e31..40b4201 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentWriteAppendSameFileTest.java
@@ -65,7 +65,7 @@ public class FileConcurrentWriteAppendSameFileTest extends ContextTestSupport {
assertEquals("Should be " + size + " lines", size, lines.length);
// should be unique
- Set<String> rows = new LinkedHashSet<String>(Arrays.asList(lines));
+ Set<String> rows = new LinkedHashSet<>(Arrays.asList(lines));
assertEquals("Should be " + size + " unique lines", size, rows.size());
log.info(txt);
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java
index 05375fb..11de860 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryFilterTest.java
@@ -33,12 +33,12 @@ import org.apache.camel.impl.JndiRegistry;
public class FileConsumerDirectoryFilterTest extends ContextTestSupport {
private final String fileUrl = "file://target/directoryfilter/?recursive=true&filter=#myFilter&initialDelay=0&delay=10";
- private final Set<String> names = new TreeSet<String>();
+ private final Set<String> names = new TreeSet<>();
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = super.createRegistry();
- jndi.bind("myFilter", new MyDirectoryFilter<Object>());
+ jndi.bind("myFilter", new MyDirectoryFilter<>());
return jndi;
}
@@ -67,7 +67,7 @@ public class FileConsumerDirectoryFilterTest extends ContextTestSupport {
// check names
assertEquals(4, names.size());
// copy to list so its easier to index
- List<String> list = new ArrayList<String>(names);
+ List<String> list = new ArrayList<>(names);
list.sort(null);
assertEquals("okDir", list.get(0));
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
index acb8274..3435a44 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
@@ -32,7 +32,7 @@ public class FileConsumerFileFilterTest extends ContextTestSupport {
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = super.createRegistry();
- jndi.bind("myFilter", new MyFileFilter<Object>());
+ jndi.bind("myFilter", new MyFileFilter<>());
return jndi;
}
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleExpressionTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleExpressionTest.java
index d491970..3f23fd0 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleExpressionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleExpressionTest.java
@@ -47,7 +47,7 @@ public class FileProduceOverruleExpressionTest extends ContextTestSupport {
mock.message(0).header(Exchange.OVERRULE_FILE_NAME).isNull();
mock.expectedFileExists("target/write/copy-of-overruled.txt", "Hello World");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put(Exchange.FILE_NAME, "hello.txt");
// this header should overrule the endpoint configuration
map.put(Exchange.OVERRULE_FILE_NAME, "overruled.txt");
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleOnlyOnceTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleOnlyOnceTest.java
index 60240ea..70c3140 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleOnlyOnceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleOnlyOnceTest.java
@@ -37,7 +37,7 @@ public class FileProduceOverruleOnlyOnceTest extends ContextTestSupport {
mock.expectedFileExists("target/write/ruled.txt", "Hello World");
mock.expectedFileExists("target/again/hello.txt", "Hello World");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put(Exchange.FILE_NAME, "hello.txt");
// this header should overrule the endpoint configuration
map.put(Exchange.OVERRULE_FILE_NAME, "ruled.txt");
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java
index e809c9f..5284b20 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProduceOverruleTest.java
@@ -58,7 +58,7 @@ public class FileProduceOverruleTest extends ContextTestSupport {
mock.message(0).header(Exchange.OVERRULE_FILE_NAME).isNull();
mock.expectedFileExists("target/write/ruled.txt", "Hello World");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put(Exchange.FILE_NAME, "hello.txt");
// this header should overrule the endpoint configuration
map.put(Exchange.OVERRULE_FILE_NAME, "ruled.txt");
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java
index 2e5aca9..bee05ba 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java
@@ -58,7 +58,7 @@ public class FileProducerFileBodyGetsMoved extends ContextTestSupport {
mock.expectedMessageCount(1);
File temporaryFile = File.createTempFile("camel", "test");
- GenericFile<File> body = new GenericFile<File>();
+ GenericFile<File> body = new GenericFile<>();
body.setFile(temporaryFile);
template.requestBodyAndHeader("direct:in", temporaryFile, Exchange.FILE_LOCAL_WORK_PATH, temporaryFile);
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
index 85b2866..b6a2b00 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
@@ -39,7 +39,7 @@ public class FileSorterRefTest extends ContextTestSupport {
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = super.createRegistry();
- jndi.bind("mySorter", new MyFileSorter<Object>());
+ jndi.bind("mySorter", new MyFileSorter<>());
return jndi;
}
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java b/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java
index 51c35935..0db614a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java
@@ -29,22 +29,22 @@ public class GenericFileMessageTest extends ContextTestSupport {
private CamelContext camelContext = new DefaultCamelContext();
public void testGenericMessageToStringConversion() throws Exception {
- GenericFileMessage<File> message = new GenericFileMessage<File>(camelContext);
+ GenericFileMessage<File> message = new GenericFileMessage<>(camelContext);
assertStringContains(message.toString(), "org.apache.camel.component.file.GenericFileMessage@");
- GenericFile<File> file = new GenericFile<File>(true);
+ GenericFile<File> file = new GenericFile<>(true);
file.setFileName("target/test.txt");
file.setFile(new File("target/test.txt"));
- message = new GenericFileMessage<File>(camelContext, file);
+ message = new GenericFileMessage<>(camelContext, file);
assertEquals(FileUtil.isWindows() ? "target\\test.txt" : "target/test.txt", message.toString());
}
public void testGenericFileContentType() throws Exception {
- GenericFile<File> file = new GenericFile<File>(true);
+ GenericFile<File> file = new GenericFile<>(true);
file.setEndpointPath("target");
file.setFileName("target");
file.setFile(new File("target/camel-core-test.log"));
- GenericFileMessage<File> message = new GenericFileMessage<File>(camelContext, file);
+ GenericFileMessage<File> message = new GenericFileMessage<>(camelContext, file);
file.populateHeaders(message, false);
assertEquals("Get a wrong file content type", "txt", message.getHeader(Exchange.FILE_CONTENT_TYPE));
}
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategyTest.java b/camel-core/src/test/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategyTest.java
index 7367ebd..abb5920 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategyTest.java
@@ -106,10 +106,10 @@ public class GenericFileDeleteProcessStrategyTest extends ContextTestSupport {
GenericFileEndpoint<Object> endpoint = context.getEndpoint("file://target/foo", GenericFileEndpoint.class);
Exchange exchange = endpoint.createExchange();
- GenericFile<Object> file = new GenericFile<Object>();
+ GenericFile<Object> file = new GenericFile<>();
file.setAbsoluteFilePath("target/foo/me.txt");
- GenericFileDeleteProcessStrategy<Object> strategy = new GenericFileDeleteProcessStrategy<Object>();
+ GenericFileDeleteProcessStrategy<Object> strategy = new GenericFileDeleteProcessStrategy<>();
strategy.commit(new MyGenericFileOperations(), endpoint, exchange, file);
assertEquals("Should have tried to delete file 2 times", 2, deleteCounter);
@@ -124,10 +124,10 @@ public class GenericFileDeleteProcessStrategyTest extends ContextTestSupport {
GenericFileEndpoint<Object> endpoint = context.getEndpoint("file://target/foo", GenericFileEndpoint.class);
Exchange exchange = endpoint.createExchange();
- GenericFile<Object> file = new GenericFile<Object>();
+ GenericFile<Object> file = new GenericFile<>();
file.setAbsoluteFilePath("target/foo/boom.txt");
- GenericFileDeleteProcessStrategy<Object> strategy = new GenericFileDeleteProcessStrategy<Object>();
+ GenericFileDeleteProcessStrategy<Object> strategy = new GenericFileDeleteProcessStrategy<>();
try {
strategy.commit(new MyGenericFileOperations(), endpoint, exchange, file);
fail("Should have thrown an exception");
diff --git a/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java b/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java
index 2cc9bc2..aabdbbd 100644
--- a/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java
@@ -67,7 +67,7 @@ public class LanguageLoadScriptFromFileCachedTest extends ContextTestSupport {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
Set<ObjectName> objNameSet = mbeanServer.queryNames(
new ObjectName("org.apache.camel:type=endpoints,name=\"language://simple:*contentCache=true*\",*"), null);
- ObjectName managedObjName = new ArrayList<ObjectName>(objNameSet).get(0);
+ ObjectName managedObjName = new ArrayList<>(objNameSet).get(0);
mbeanServer.invoke(managedObjName, "clearContentCache", null, null);
template.sendBody("direct:start", "World");
diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
index 73a81b6..0b5662c 100644
--- a/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
@@ -765,7 +765,7 @@ public class MockEndpointTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "beer");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", 123);
map.put("bar", "beer");
template.sendBodyAndHeaders("direct:a", "Hello World", map);
@@ -779,7 +779,7 @@ public class MockEndpointTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "beer");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", 123);
map.put("bar", "beer");
template.sendBodyAndHeaders("direct:a", "Hello World", map);
@@ -794,7 +794,7 @@ public class MockEndpointTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", null);
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", 123);
template.sendBodyAndHeaders("direct:a", "Hello World", map);
@@ -809,7 +809,7 @@ public class MockEndpointTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "Test");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", 123);
map.put("bar", is);
template.sendBodyAndHeaders("direct:a", "Hello World", map);
@@ -823,7 +823,7 @@ public class MockEndpointTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "beer");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", 456);
map.put("bar", "beer");
template.sendBodyAndHeaders("direct:a", "Hello World", map);
@@ -837,7 +837,7 @@ public class MockEndpointTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "beer");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", 123);
map.put("bar", "wine");
template.sendBodyAndHeaders("direct:a", "Hello World", map);
@@ -851,12 +851,12 @@ public class MockEndpointTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "beer");
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", 123);
map.put("bar", "beer");
template.sendBodyAndHeaders("direct:a", "Hello World", map);
- map = new HashMap<String, Object>();
+ map = new HashMap<>();
map.put("foo", 123);
map.put("bar", "wine");
template.sendBodyAndHeaders("direct:a", "Hello World", map);
@@ -1171,7 +1171,7 @@ public class MockEndpointTest extends ContextTestSupport {
}
protected Object[] listOfMessages(int... counters) {
- List<String> list = new ArrayList<String>(counters.length);
+ List<String> list = new ArrayList<>(counters.length);
for (int counter : counters) {
list.add(createTestMessage(counter));
}
diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockExpectedBodiesAsListTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockExpectedBodiesAsListTest.java
index fc06b69..5421a82 100644
--- a/camel-core/src/test/java/org/apache/camel/component/mock/MockExpectedBodiesAsListTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockExpectedBodiesAsListTest.java
@@ -38,7 +38,7 @@ public class MockExpectedBodiesAsListTest extends ContextTestSupport {
}
public void testUsingListString() throws Exception {
- List<String> data = new ArrayList<String>();
+ List<String> data = new ArrayList<>();
data.add("Hello World");
data.add("Bye World");
@@ -52,7 +52,7 @@ public class MockExpectedBodiesAsListTest extends ContextTestSupport {
}
public void testUsingList() throws Exception {
- List<Object> data = new ArrayList<Object>();
+ List<Object> data = new ArrayList<>();
data.add("Hello World");
data.add(123);
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/CollectionProducerTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/CollectionProducerTest.java
index f8b1a0e..aba8f98 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/CollectionProducerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/CollectionProducerTest.java
@@ -39,7 +39,7 @@ public class CollectionProducerTest extends ContextTestSupport {
}
public void testCollectionProducer() throws Exception {
- Queue<Exchange> queue = new ArrayBlockingQueue<Exchange>(10);
+ Queue<Exchange> queue = new ArrayBlockingQueue<>(10);
Endpoint endpoint = context.getEndpoint("seda://foo");
MyProducer my = new MyProducer(endpoint, queue);
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java
index 1c3aca1..4c43482 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java
@@ -71,7 +71,7 @@ public class SedaConcurrentTest extends ContextTestSupport {
mock.setResultMinimumWaitTime(500);
ExecutorService executors = Executors.newFixedThreadPool(10);
- List<Object> replies = new ArrayList<Object>(20);
+ List<Object> replies = new ArrayList<>(20);
for (int i = 0; i < 20; i++) {
final int num = i;
Object out = executors.submit(new Callable<Object>() {
@@ -102,7 +102,7 @@ public class SedaConcurrentTest extends ContextTestSupport {
// must start the template
pt.start();
- List<Future<Object>> replies = new ArrayList<Future<Object>>(20);
+ List<Future<Object>> replies = new ArrayList<>(20);
for (int i = 0; i < 20; i++) {
Future<Object> out = pt.asyncRequestBody("seda:bar", "Message " + i);
replies.add(out);
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
index 391997a..f54f795 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
@@ -31,10 +31,10 @@ import org.apache.camel.Producer;
*/
public class SedaEndpointTest extends ContextTestSupport {
- private BlockingQueue<Exchange> queue = new ArrayBlockingQueue<Exchange>(1000);
+ private BlockingQueue<Exchange> queue = new ArrayBlockingQueue<>(1000);
public void testSedaEndpointUnboundedQueue() throws Exception {
- BlockingQueue<Exchange> unbounded = new LinkedBlockingQueue<Exchange>();
+ BlockingQueue<Exchange> unbounded = new LinkedBlockingQueue<>();
SedaEndpoint seda = new SedaEndpoint("seda://foo", context.getComponent("seda"), unbounded);
assertNotNull(seda);
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java
index 062df5a..e92a686 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueFactoryTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.impl.SimpleRegistry;
*
*/
public class SedaQueueFactoryTest extends ContextTestSupport {
- private final ArrayBlockingQueueFactory<Exchange> arrayQueueFactory = new ArrayBlockingQueueFactory<Exchange>();
+ private final ArrayBlockingQueueFactory<Exchange> arrayQueueFactory = new ArrayBlockingQueueFactory<>();
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaShouldNotUseSameThreadTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaShouldNotUseSameThreadTest.java
index a514add..1c715e0 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaShouldNotUseSameThreadTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaShouldNotUseSameThreadTest.java
@@ -41,7 +41,7 @@ public class SedaShouldNotUseSameThreadTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- final ThreadLocal<String> local = new ThreadLocal<String>();
+ final ThreadLocal<String> local = new ThreadLocal<>();
from("direct:start").process(new Processor() {
public void process(Exchange exchange) throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/component/vm/VmShouldNotUseSameThreadTest.java b/camel-core/src/test/java/org/apache/camel/component/vm/VmShouldNotUseSameThreadTest.java
index be4ccc6..c897aae 100644
--- a/camel-core/src/test/java/org/apache/camel/component/vm/VmShouldNotUseSameThreadTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/vm/VmShouldNotUseSameThreadTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.component.mock.MockEndpoint;
public class VmShouldNotUseSameThreadTest extends AbstractVmTestSupport {
private static long id;
- private final ThreadLocal<String> local = new ThreadLocal<String>();
+ private final ThreadLocal<String> local = new ThreadLocal<>();
public void testNotUseSameThread() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltContentCacheTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltContentCacheTest.java
index 7fc6aeb..7879403 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltContentCacheTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltContentCacheTest.java
@@ -136,7 +136,7 @@ public class XsltContentCacheTest extends ContextTestSupport {
// clear the cache via the mbean server
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
Set<ObjectName> objNameSet = mbeanServer.queryNames(new ObjectName("org.apache.camel:type=endpoints,name=\"xslt:*contentCache=true*\",*"), null);
- ObjectName managedObjName = new ArrayList<ObjectName>(objNameSet).get(0);
+ ObjectName managedObjName = new ArrayList<>(objNameSet).get(0);
mbeanServer.invoke(managedObjName, "clearCachedStylesheet", null, null);
// now replace the file with a new XSL transformation
diff --git a/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java
index 43fbb7d..67f8e6b 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java
@@ -68,7 +68,7 @@ public class CollectionConverterTest extends TestCase {
}
public void testToSet() {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("foo", "bar");
Set<Map.Entry<String, String>> out = CollectionConverter.toSet(map);
@@ -92,7 +92,7 @@ public class CollectionConverterTest extends TestCase {
}
public void testToProperties() {
- Map<Object, Object> map = new HashMap<Object, Object>();
+ Map<Object, Object> map = new HashMap<>();
map.put("foo", "bar");
Properties prop = CollectionConverter.toProperties(map);
diff --git a/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
index 8bafbfb..1db5874 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
@@ -125,7 +125,7 @@ public class ConverterTest extends TestCase {
public void testCollectionToArrayConversion() throws Exception {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add("one");
list.add("two");
@@ -137,7 +137,7 @@ public class ConverterTest extends TestCase {
}
public void testCollectionToPrimitiveArrayConversion() throws Exception {
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
list.add(5);
list.add(6);
diff --git a/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
index 94a7087..5eeaa0f 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
@@ -31,7 +31,7 @@ public class ObjectConverterTest extends TestCase {
public void testIsCollection() {
assertEquals(false, ObjectConverter.isCollection("String"));
assertEquals(false, ObjectConverter.isCollection(null));
- assertEquals(true, ObjectConverter.isCollection(new ArrayList<Object>()));
+ assertEquals(true, ObjectConverter.isCollection(new ArrayList<>()));
assertEquals(true, ObjectConverter.isCollection(new String[]{"foo", "bar"}));
}
diff --git a/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java b/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java
index 4909b4b..6fb3ccc 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java
@@ -28,7 +28,7 @@ public class CamelContextTrackerTest extends TestCase {
private final class MyContextTracker extends CamelContextTracker {
- private List<String> names = new ArrayList<String>();
+ private List<String> names = new ArrayList<>();
@Override
public void contextCreated(CamelContext camelContext) {
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 e4b7737..03482d6 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
@@ -170,7 +170,7 @@ public class ConfigurationHelperTest {
Field[] fields = clazz.getDeclaredFields();
// Put the Fields in a Map first for a prettier print
- Map<String, Field> map = new HashMap<String, Field>();
+ Map<String, Field> map = new HashMap<>();
URIField anno = null;
for (final Field field : fields) {
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
index fe9aad7..62bccc9 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
@@ -85,7 +85,7 @@ public class DefaultExchangeHolderTest extends ContextTestSupport {
public void testSkipNonSerializableDataFromList() throws Exception {
// use a mixed list, the MyFoo is not serializable so the entire list should be skipped
- List<Object> list = new ArrayList<Object>();
+ List<Object> list = new ArrayList<>();
list.add("I am okay");
list.add(new MyFoo("Tiger"));
@@ -107,7 +107,7 @@ public class DefaultExchangeHolderTest extends ContextTestSupport {
public void testSkipNonSerializableDataFromMap() throws Exception {
// use a mixed Map, the MyFoo is not serializable so the entire map should be skipped
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("A", "I am okay");
map.put("B", new MyFoo("Tiger"));
@@ -129,7 +129,7 @@ public class DefaultExchangeHolderTest extends ContextTestSupport {
public void testCaughtException() throws Exception {
// use a mixed list, the MyFoo is not serializable so the entire list should be skipped
- List<Object> list = new ArrayList<Object>();
+ List<Object> list = new ArrayList<>();
list.add("I am okay");
list.add(new MyFoo("Tiger"));
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultHeaderFilterStrategyTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultHeaderFilterStrategyTest.java
index fa71415..b875522 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultHeaderFilterStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultHeaderFilterStrategyTest.java
@@ -43,7 +43,7 @@ public class DefaultHeaderFilterStrategyTest extends ContextTestSupport {
public void testInFilterDefaultHeaderFilterStrategy() {
DefaultHeaderFilterStrategy comp = new DefaultHeaderFilterStrategy();
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("foo");
comp.setInFilter(set);
@@ -53,7 +53,7 @@ public class DefaultHeaderFilterStrategyTest extends ContextTestSupport {
public void testInFilterDoFilterDefaultHeaderFilterStrategy() {
DefaultHeaderFilterStrategy comp = new DefaultHeaderFilterStrategy();
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("foo");
comp.setInFilter(set);
@@ -68,7 +68,7 @@ public class DefaultHeaderFilterStrategyTest extends ContextTestSupport {
public void testOutFilterDefaultHeaderFilterStrategy() {
DefaultHeaderFilterStrategy comp = new DefaultHeaderFilterStrategy();
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("foo");
comp.setOutFilter(set);
@@ -78,7 +78,7 @@ public class DefaultHeaderFilterStrategyTest extends ContextTestSupport {
public void testOutFilterDoFilterDefaultHeaderFilterStrategy() {
DefaultHeaderFilterStrategy comp = new DefaultHeaderFilterStrategy();
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("foo");
comp.setOutFilter(set);
@@ -94,7 +94,7 @@ public class DefaultHeaderFilterStrategyTest extends ContextTestSupport {
DefaultHeaderFilterStrategy comp = new DefaultHeaderFilterStrategy();
comp.setCaseInsensitive(true);
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("Content-Type");
comp.setOutFilter(set);
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java
index 323e091..e94d625 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java
@@ -160,7 +160,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "cheese");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", 123);
headers.put("bar", "cheese");
Future<Object> future = template.asyncRequestBodyAndHeaders("direct:start", "Hello", headers);
@@ -186,7 +186,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
mock.expectedHeaderReceived("foo", 123);
mock.expectedHeaderReceived("bar", "cheese");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", 123);
headers.put("bar", "cheese");
Future<String> future = template.asyncRequestBodyAndHeaders("direct:start", "Hello", headers, String.class);
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
index 29793a6..30c6c66 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
@@ -184,7 +184,7 @@ public class DefaultProducerTemplateTest extends ContextTestSupport {
out = template.requestBodyAndHeader("direct:inout", "Hello", "foo", "bar", Integer.class);
assertEquals(new Integer(123), out);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
out = template.requestBodyAndHeaders("direct:inout", "Hello", headers, Integer.class);
assertEquals(new Integer(123), out);
@@ -196,7 +196,7 @@ public class DefaultProducerTemplateTest extends ContextTestSupport {
out = template.requestBodyAndHeader(endpoint, "Hello", "foo", "bar", Integer.class);
assertEquals(new Integer(123), out);
- headers = new HashMap<String, Object>();
+ headers = new HashMap<>();
out = template.requestBodyAndHeaders(endpoint, "Hello", headers, Integer.class);
assertEquals(new Integer(123), out);
}
@@ -211,7 +211,7 @@ public class DefaultProducerTemplateTest extends ContextTestSupport {
out = producer.requestBodyAndHeader("Hello", "foo", 123);
assertEquals("Bye Bye World", out);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
out = producer.requestBodyAndHeaders("Hello", headers);
assertEquals("Bye Bye World", out);
@@ -229,7 +229,7 @@ public class DefaultProducerTemplateTest extends ContextTestSupport {
producer.sendBody("Hello");
producer.sendBodyAndHeader("Hello", "foo", 123);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
producer.sendBodyAndHeaders("Hello", headers);
assertMockEndpointsSatisfied();
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java b/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java
index 7fbca21..7031238 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java
@@ -37,7 +37,7 @@ import org.apache.camel.support.LifecycleStrategySupport;
*/
public class DummyLifecycleStrategy extends LifecycleStrategySupport {
- private List<String> events = new ArrayList<String>();
+ private List<String> events = new ArrayList<>();
public void onContextStart(CamelContext context) throws VetoCamelContextStartException {
events.add("onContextStart");
diff --git a/camel-core/src/test/java/org/apache/camel/impl/JndiRegistryTest.java b/camel-core/src/test/java/org/apache/camel/impl/JndiRegistryTest.java
index 21e0eef..583f31e 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/JndiRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/JndiRegistryTest.java
@@ -65,7 +65,7 @@ public class JndiRegistryTest extends TestCase {
}
public void testCamelContextFactory() throws Exception {
- Map<Object, Object> env = new HashMap<Object, Object>();
+ Map<Object, Object> env = new HashMap<>();
env.put("java.naming.factory.initial", "org.apache.camel.util.jndi.CamelInitialContextFactory");
JndiRegistry jndi = new JndiRegistry(env);
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java b/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java
index 7ff1d5e..f0676c3 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java
@@ -33,7 +33,7 @@ import org.apache.camel.builder.RouteBuilder;
public class ScheduledPollEndpointConfigureConsumerRestartTest extends ContextTestSupport {
private MyEndpoint my;
- private Map<String, Object> props = new HashMap<String, Object>();
+ private Map<String, Object> props = new HashMap<>();
public void testRestart() throws Exception {
getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java b/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java
index 2fc60c9..137653a 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java
@@ -152,7 +152,7 @@ public class ServicePoolTest extends ContextTestSupport {
public void testAcquireAdd() throws Exception {
Endpoint endpoint = context.getEndpoint("mock:foo");
- List<Producer> producers = new ArrayList<Producer>();
+ List<Producer> producers = new ArrayList<>();
for (int i = 0; i < 5; i++) {
Producer producer = pool.acquire(endpoint);
@@ -192,7 +192,7 @@ public class ServicePoolTest extends ContextTestSupport {
final Endpoint endpoint = context.getEndpoint("mock:foo");
ExecutorService executor = Executors.newFixedThreadPool(5);
- List<Future<Integer>> response = new ArrayList<Future<Integer>>();
+ List<Future<Integer>> response = new ArrayList<>();
for (int i = 0; i < 5; i++) {
final int index = i;
Future<Integer> out = executor.submit(new Callable<Integer>() {
@@ -220,7 +220,7 @@ public class ServicePoolTest extends ContextTestSupport {
final Endpoint endpoint = context.getEndpoint("mock:foo");
ExecutorService executor = Executors.newFixedThreadPool(5);
- List<Future<Integer>> response = new ArrayList<Future<Integer>>();
+ List<Future<Integer>> response = new ArrayList<>();
for (int i = 0; i < 5; i++) {
final int index = i;
Future<Integer> out = executor.submit(new Callable<Integer>() {
diff --git a/camel-core/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java b/camel-core/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
index 367051e..231201f 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/health/HealthCheckTest.java
@@ -37,7 +37,7 @@ public class HealthCheckTest {
Assert.assertEquals(HealthCheck.State.UNKNOWN, result.getState());
Assert.assertTrue(result.getMessage().isPresent());
Assert.assertEquals("Disabled", result.getMessage().get());
- Assert.assertEquals(false, result.getDetails().get(MyHealthCheck.CHECK_ENABLED));
+ Assert.assertEquals(false, result.getDetails().get(AbstractHealthCheck.CHECK_ENABLED));
check.getConfiguration().setEnabled(true);
@@ -45,7 +45,7 @@ public class HealthCheckTest {
Assert.assertEquals(HealthCheck.State.UP, result.getState());
Assert.assertFalse(result.getMessage().isPresent());
- Assert.assertFalse(result.getDetails().containsKey(MyHealthCheck.CHECK_ENABLED));
+ Assert.assertFalse(result.getDetails().containsKey(AbstractHealthCheck.CHECK_ENABLED));
}
@Test
@@ -62,17 +62,17 @@ public class HealthCheckTest {
HealthCheck.Result result2 = check.call();
Assert.assertEquals(HealthCheck.State.UP, result2.getState());
- Assert.assertEquals(result1.getDetails().get(MyHealthCheck.INVOCATION_TIME), result2.getDetails().get(MyHealthCheck.INVOCATION_TIME));
- Assert.assertEquals(result1.getDetails().get(MyHealthCheck.INVOCATION_COUNT), result2.getDetails().get(MyHealthCheck.INVOCATION_COUNT));
- Assert.assertNotEquals(check.getMetaData().get(MyHealthCheck.INVOCATION_ATTEMPT_TIME), result2.getDetails().get(MyHealthCheck.INVOCATION_TIME));
+ Assert.assertEquals(result1.getDetails().get(AbstractHealthCheck.INVOCATION_TIME), result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
+ Assert.assertEquals(result1.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT), result2.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+ Assert.assertNotEquals(check.getMetaData().get(AbstractHealthCheck.INVOCATION_ATTEMPT_TIME), result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
Thread.sleep(1250);
HealthCheck.Result result3 = check.call();
Assert.assertEquals(HealthCheck.State.UP, result3.getState());
- Assert.assertNotEquals(result2.getDetails().get(MyHealthCheck.INVOCATION_TIME), result3.getDetails().get(MyHealthCheck.INVOCATION_TIME));
- Assert.assertNotEquals(result2.getDetails().get(MyHealthCheck.INVOCATION_COUNT), result3.getDetails().get(MyHealthCheck.INVOCATION_COUNT));
- Assert.assertEquals(check.getMetaData().get(MyHealthCheck.INVOCATION_ATTEMPT_TIME), result3.getDetails().get(MyHealthCheck.INVOCATION_TIME));
+ Assert.assertNotEquals(result2.getDetails().get(AbstractHealthCheck.INVOCATION_TIME), result3.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
+ Assert.assertNotEquals(result2.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT), result3.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+ Assert.assertEquals(check.getMetaData().get(AbstractHealthCheck.INVOCATION_ATTEMPT_TIME), result3.getDetails().get(AbstractHealthCheck.INVOCATION_TIME));
}
@Test
@@ -88,8 +88,8 @@ public class HealthCheckTest {
result = check.call();
Assert.assertEquals(HealthCheck.State.UP, result.getState());
- Assert.assertEquals(i + 1, result.getDetails().get(MyHealthCheck.INVOCATION_COUNT));
- Assert.assertEquals(i + 1, result.getDetails().get(MyHealthCheck.FAILURE_COUNT));
+ Assert.assertEquals(i + 1, result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+ Assert.assertEquals(i + 1, result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT));
}
Assert.assertEquals(HealthCheck.State.DOWN, check.call().getState());
@@ -110,8 +110,8 @@ public class HealthCheckTest {
for (int i = 0; i < check.getConfiguration().getFailureThreshold(); i++) {
result = check.call();
- icount = (int)result.getDetails().get(MyHealthCheck.INVOCATION_COUNT);
- fcount = (int)result.getDetails().get(MyHealthCheck.FAILURE_COUNT);
+ icount = (int)result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT);
+ fcount = (int)result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT);
Assert.assertEquals(HealthCheck.State.UP, result.getState());
Assert.assertEquals(i + 1, icount);
@@ -120,8 +120,8 @@ public class HealthCheckTest {
result = check.call();
Assert.assertEquals(HealthCheck.State.UP, result.getState());
- Assert.assertEquals(icount, result.getDetails().get(MyHealthCheck.INVOCATION_COUNT));
- Assert.assertEquals(fcount, result.getDetails().get(MyHealthCheck.FAILURE_COUNT));
+ Assert.assertEquals(icount, result.getDetails().get(AbstractHealthCheck.INVOCATION_COUNT));
+ Assert.assertEquals(fcount, result.getDetails().get(AbstractHealthCheck.FAILURE_COUNT));
Thread.sleep(550);
}
diff --git a/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java b/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java
index 2a81a6e..30da5da 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java
@@ -33,7 +33,7 @@ public class CBRCustomPredicateAsFilterTest extends ContextTestSupport {
private static class MyFiler implements Predicate {
- private List<String> bodies = new ArrayList<String>();
+ private List<String> bodies = new ArrayList<>();
public boolean matches(Exchange exchange) {
String body = exchange.getIn().getBody(String.class);
diff --git a/camel-core/src/test/java/org/apache/camel/issues/ChangeHeaderCaseIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/ChangeHeaderCaseIssueTest.java
index 3772001..f5464e2 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/ChangeHeaderCaseIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/ChangeHeaderCaseIssueTest.java
@@ -40,7 +40,7 @@ public class ChangeHeaderCaseIssueTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
// only the changed case header should exist
- Map<String, Object> headers = new HashMap<String, Object>(mock.getReceivedExchanges().get(0).getIn().getHeaders());
+ Map<String, Object> headers = new HashMap<>(mock.getReceivedExchanges().get(0).getIn().getHeaders());
assertEquals("cool", headers.get("SoapAction"));
assertEquals(null, headers.get("SOAPAction"));
}
diff --git a/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java b/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java
index b20a84d..494f350 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java
@@ -33,7 +33,7 @@ public class FilterCustomPredicateAsFilterTest extends ContextTestSupport {
private static class MyFiler implements Predicate {
- private List<String> bodies = new ArrayList<String>();
+ private List<String> bodies = new ArrayList<>();
public boolean matches(Exchange exchange) {
String body = exchange.getIn().getBody(String.class);
diff --git a/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java b/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
index 3464c31..d5143c5 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
@@ -35,7 +35,7 @@ public class InterceptCustomPredicateAsFilterTest extends ContextTestSupport {
private static class MyFiler implements Predicate {
- private List<String> bodies = new ArrayList<String>();
+ private List<String> bodies = new ArrayList<>();
public boolean matches(Exchange exchange) {
String body = exchange.getIn().getBody(String.class);
diff --git a/camel-core/src/test/java/org/apache/camel/issues/ServicePoolAwareLeakyTest.java b/camel-core/src/test/java/org/apache/camel/issues/ServicePoolAwareLeakyTest.java
index bc77881..e04447f 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/ServicePoolAwareLeakyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/ServicePoolAwareLeakyTest.java
@@ -125,7 +125,7 @@ public class ServicePoolAwareLeakyTest extends ContextTestSupport {
public void testForMemoryLeak() throws Exception {
registerLeakyComponent();
- final Map<String, AtomicLong> references = new HashMap<String, AtomicLong>();
+ final Map<String, AtomicLong> references = new HashMap<>();
// track LeakySieveProducer lifecycle
context.addLifecycleStrategy(new LifecycleStrategySupport() {
diff --git a/camel-core/src/test/java/org/apache/camel/issues/SplitListListIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/SplitListListIssueTest.java
index 3e2b5fa..f822d8f 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/SplitListListIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/SplitListListIssueTest.java
@@ -28,9 +28,9 @@ import org.apache.camel.builder.RouteBuilder;
public class SplitListListIssueTest extends ContextTestSupport {
public void testSplitListList() throws Exception {
- List<List<String>> list = new ArrayList<List<String>>();
+ List<List<String>> list = new ArrayList<>();
for (int i = 0; i < 5; i++) {
- List<String> entry = new ArrayList<String>();
+ List<String> entry = new ArrayList<>();
entry.add("number" + i);
entry.add("Camel");
list.add(entry);
diff --git a/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java
index dab351e..146b348 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java
@@ -78,15 +78,15 @@ public class SplitPropertiesFileIssueTest extends ContextTestSupport {
// now we use our own expressions to split the file as we like it
// what we return is just the list of the two Camel Message objects
// which contains the splitted data (our way)
- List<Message> answer = new ArrayList<Message>();
+ List<Message> answer = new ArrayList<>();
answer.add(msg1);
answer.add(msg2);
// split the original body into two data lists
// can be done a bit prettier than this code
// but its just for show and tell how to use Expressions
- List<String> data1 = new ArrayList<String>();
- List<String> data2 = new ArrayList<String>();
+ List<String> data1 = new ArrayList<>();
+ List<String> data2 = new ArrayList<>();
String body = exchange.getIn().getBody(String.class);
String[] lines = body.split(LS);
diff --git a/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java b/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
index 7128217..59da61a 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
@@ -44,7 +44,7 @@ public class SplitterUsingBeanReturningMessageTest extends ContextTestSupport {
Message in = exchange.getIn();
assertNotNull(in.toString());
- List<Message> msgs = new LinkedList<Message>();
+ List<Message> msgs = new LinkedList<>();
Message copy = in.copy();
assertNotNull(copy.toString());
diff --git a/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java b/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
index 4f253c4..af9b073 100644
--- a/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
@@ -59,7 +59,7 @@ public class BeanLanguageInvalidOGNLTest extends ContextTestSupport {
public static class MyReallyCoolBean {
- private Map<?, ?> map = new LinkedHashMap<Object, Object>();
+ private Map<?, ?> map = new LinkedHashMap<>();
public Map<?, ?> getOther() {
return map;
diff --git a/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java b/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
index 913a72d..78498d2 100644
--- a/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
@@ -68,7 +68,7 @@ public class SimpleOgnlMapIssueTest extends ContextTestSupport {
private Map<Object, Object> property;
public MyObjectMessage() {
- this.property = new HashMap<Object, Object>();
+ this.property = new HashMap<>();
}
public Map<Object, Object> getProperty() {
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
index 72231a1..ad217dd 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionTest.java
@@ -174,7 +174,7 @@ public class SimpleParserExpressionTest extends ExchangeTestSupport {
}
public void testSimpleMap() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("foo", "123");
map.put("foo bar", "456");
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
index 6e4a908..2b857c7 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
@@ -205,7 +205,7 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
}
public void testSimpleMap() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("foo", "123");
map.put("foo bar", "456");
@@ -233,7 +233,7 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = super.createRegistry();
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add("foo");
list.add("bar");
@@ -242,7 +242,7 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
}
public void testSimpleIn() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("key", "foo");
map.put("key2", "bar");
map.put("key3", "none");
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 71ccc22..82e9e47 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
@@ -265,12 +265,12 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLBodyListAndMap() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("cool", "Camel rocks");
map.put("dude", "Hey dude");
map.put("code", 4321);
- List<Map<String, Object>> lines = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> lines = new ArrayList<>();
lines.add(map);
exchange.getIn().setBody(lines);
@@ -282,7 +282,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLBodyEmptyList() throws Exception {
- Map<String, List<String>> map = new HashMap<String, List<String>>();
+ Map<String, List<String>> map = new HashMap<>();
map.put("list", new ArrayList<String>());
exchange.getIn().setBody(map);
@@ -337,7 +337,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLCallReplace() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("cool", "Camel rocks");
map.put("dude", "Hey dude");
exchange.getIn().setHeaders(map);
@@ -346,11 +346,11 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLBodyListAndMapAndMethod() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("camel", new OrderLine(123, "Camel in Action"));
map.put("amq", new OrderLine(456, "ActiveMQ in Action"));
- List<Map<String, Object>> lines = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> lines = new ArrayList<>();
lines.add(map);
exchange.getIn().setBody(lines);
@@ -366,7 +366,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLPropertyList() throws Exception {
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
lines.add("Camel in Action");
lines.add("ActiveMQ in Action");
exchange.setProperty("wicket", lines);
@@ -389,7 +389,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLPropertyLinesList() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
exchange.setProperty("wicket", lines);
@@ -411,7 +411,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLPropertyMap() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("cool", "Camel rocks");
map.put("dude", "Hey dude");
map.put("code", 4321);
@@ -427,7 +427,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLExchangePropertyMap() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("cool", "Camel rocks");
map.put("dude", "Hey dude");
map.put("code", 4321);
@@ -443,7 +443,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLPropertyMapWithDot() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("this.code", "This code");
exchange.setProperty("wicket", map);
@@ -827,7 +827,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLHeaderList() throws Exception {
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
lines.add("Camel in Action");
lines.add("ActiveMQ in Action");
exchange.getIn().setHeader("wicket", lines);
@@ -849,7 +849,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLHeaderLinesList() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
exchange.getIn().setHeader("wicket", lines);
@@ -871,7 +871,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLHeaderMap() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("cool", "Camel rocks");
map.put("dude", "Hey dude");
map.put("code", 4321);
@@ -887,7 +887,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testOGNLHeaderMapWithDot() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("this.code", "This code");
exchange.getIn().setHeader("wicket", map);
@@ -914,7 +914,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLAsMap() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", "Camel");
map.put("bar", 6);
exchange.getIn().setBody(map);
@@ -924,7 +924,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLAsMapWithDot() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo.bar", "Camel");
exchange.getIn().setBody(map);
@@ -932,7 +932,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLAsMapShorthand() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("foo", "Camel");
map.put("bar", 6);
exchange.getIn().setBody(map);
@@ -1029,7 +1029,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderList() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1050,7 +1050,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderListShorthand() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1073,13 +1073,13 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLListMap() throws Exception {
- List<Map<String, String>> grid = new ArrayList<Map<String, String>>();
- Map<String, String> cells = new LinkedHashMap<String, String>();
+ List<Map<String, String>> grid = new ArrayList<>();
+ Map<String, String> cells = new LinkedHashMap<>();
cells.put("ABC", "123");
cells.put("DEF", "456");
grid.add(cells);
- Map<String, String> cells2 = new LinkedHashMap<String, String>();
+ Map<String, String> cells2 = new LinkedHashMap<>();
cells2.put("HIJ", "789");
grid.add(cells2);
@@ -1094,7 +1094,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLList() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1108,7 +1108,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLListShorthand() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1150,7 +1150,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderListOutOfBounds() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1183,7 +1183,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderListOutOfBoundsShorthand() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1216,7 +1216,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderListOutOfBoundsWithNullSafe() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1227,7 +1227,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderListOutOfBoundsWithNullSafeShorthand() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1238,7 +1238,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderListNoMethodNameWithNullSafe() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1255,7 +1255,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testBodyOGNLOrderListNoMethodNameWithNullSafeShorthand() throws Exception {
- List<OrderLine> lines = new ArrayList<OrderLine>();
+ List<OrderLine> lines = new ArrayList<>();
lines.add(new OrderLine(123, "Camel in Action"));
lines.add(new OrderLine(456, "ActiveMQ in Action"));
Order order = new Order(lines);
@@ -1570,7 +1570,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testSimpleMapBoolean() throws Exception {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
exchange.getIn().setBody(map);
map.put("isCredit", true);
@@ -1608,7 +1608,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testCollateEven() throws Exception {
- List<Object> data = new ArrayList<Object>();
+ List<Object> data = new ArrayList<>();
data.add("A");
data.add("B");
data.add("C");
@@ -1634,7 +1634,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testCollateOdd() throws Exception {
- List<Object> data = new ArrayList<Object>();
+ List<Object> data = new ArrayList<>();
data.add("A");
data.add("B");
data.add("C");
@@ -1702,7 +1702,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testListRemoveByInstance() throws Exception {
- List<Object> data = new ArrayList<Object>();
+ List<Object> data = new ArrayList<>();
data.add("A");
data.add("B");
exchange.getIn().setBody(data);
@@ -1717,7 +1717,7 @@ public class SimpleTest extends LanguageTestSupport {
}
public void testListRemoveIndex() throws Exception {
- List<Object> data = new ArrayList<Object>();
+ List<Object> data = new ArrayList<>();
data.add("A");
data.add("B");
exchange.getIn().setBody(data);
diff --git a/camel-core/src/test/java/org/apache/camel/management/AddEventNotifierTest.java b/camel-core/src/test/java/org/apache/camel/management/AddEventNotifierTest.java
index 6ff8f1b..1c7954d 100644
--- a/camel-core/src/test/java/org/apache/camel/management/AddEventNotifierTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/AddEventNotifierTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class AddEventNotifierTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
private EventNotifier notifier;
@Override
diff --git a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
index 8d5151b..891b986 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
@@ -45,7 +45,7 @@ public class EndpointCompletionTest extends ManagementTestSupport {
mbeanServer.isRegistered(on);
String componentName = "file";
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
assertCompletion(mbeanServer, on, componentName, properties, "");
assertCompletion(mbeanServer, on, componentName, properties, "po");
assertCompletion(mbeanServer, on, componentName, properties, "/");
diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
index e9d3b42..ec15b73 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
@@ -48,7 +48,7 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class EventNotifierEventsTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
@Override
public void setUp() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java
index c8d9057..d634986 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java
@@ -33,7 +33,7 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class EventNotifierExchangeCompletedTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
@Override
public void setUp() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
index 0d4fe4d..e236ee3 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
@@ -36,7 +36,7 @@ import static org.awaitility.Awaitility.await;
*/
public class EventNotifierExchangeSentTest extends ContextTestSupport {
- protected static List<EventObject> events = new ArrayList<EventObject>();
+ protected static List<EventObject> events = new ArrayList<>();
@Override
public void setUp() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java
index ab2a373..29b569c 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java
@@ -42,7 +42,7 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class EventNotifierFailureHandledEventsTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
@Override
public void setUp() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java
index cf146ea..877ca40 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java
@@ -38,7 +38,7 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class EventNotifierRedeliveryEventsTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
@Override
public void setUp() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
index d79dc65..438fedf 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class EventNotifierServiceStoppingFailedEventTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
private static String stopOrder;
@Override
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java
index b3772bb..148cdc3 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java
@@ -44,7 +44,7 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport {
template.sendBodyAndHeader("direct:start", "<foo>Camel > Donkey</foo>", "title", "<title>Me & You</title>");
template.sendBodyAndHeader("direct:start", "Camel > Donkey", "name", "Me & You");
template.sendBodyAndHeader("direct:start", 123, "user", true);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("user", false);
headers.put("uid", 123);
headers.put("title", "Camel rocks");
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index 7d0b450..8d281b8 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -121,7 +121,7 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
mock.expectedHeaderReceived("foo", 123);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", 123);
mbeanServer.invoke(on, "sendBodyAndHeaders", new Object[]{"direct:start", "Hello World", headers}, new String[]{"java.lang.String", "java.lang.Object", "java.util.Map"});
assertMockEndpointsSatisfied();
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheHitsTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheHitsTest.java
index 0e83e1d..9454ee1 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheHitsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheHitsTest.java
@@ -52,7 +52,7 @@ public class ManagedConsumerCacheHitsTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
- List<ObjectName> list = new ArrayList<ObjectName>(set);
+ List<ObjectName> list = new ArrayList<>(set);
ObjectName on = null;
for (ObjectName name : list) {
if (name.getCanonicalName().contains("ConsumerCache")) {
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
index cebb4cb..eac2072 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
@@ -56,7 +56,7 @@ public class ManagedConsumerCacheTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
- List<ObjectName> list = new ArrayList<ObjectName>(set);
+ List<ObjectName> list = new ArrayList<>(set);
ObjectName on = null;
for (ObjectName name : list) {
if (name.getCanonicalName().contains("ConsumerCache")) {
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java
index 44c68ca..9d016aa 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java
@@ -48,7 +48,7 @@ public class ManagedEndpointRegistryTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
- List<ObjectName> list = new ArrayList<ObjectName>(set);
+ List<ObjectName> list = new ArrayList<>(set);
ObjectName on = null;
for (ObjectName name : list) {
if (name.getCanonicalName().contains("DefaultEndpointRegistry")) {
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java
index 8fdc3c4..1361fa5 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java
@@ -39,7 +39,7 @@ public class ManagedRegisterTwoRoutesTest extends ManagementTestSupport {
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(2, set.size());
- Set<String> uris = new HashSet<String>();
+ Set<String> uris = new HashSet<>();
for (ObjectName on : set) {
String uri = (String) mbeanServer.getAttribute(on, "EndpointUri");
uris.add(uri);
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
index f4804a6..1a0aa48 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
@@ -262,7 +262,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:error").expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("error", "mock:error");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
@@ -321,7 +321,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:error").expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("error", "mock:error");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
@@ -378,7 +378,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:done").expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("done", "mock:done");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
@@ -436,7 +436,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:done").expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("done", "mock:done");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java
index cf085f7..9ea3e2e 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java
@@ -74,6 +74,7 @@ public class ManagedSetAndRemoveHeaderAndPropertiesTest extends ManagementTestSu
assertTrue("Should find removeHeader mbean", found3);
assertTrue("Should find removeHeaders mbean", found4);
assertTrue("Should find removeProperty mbean", found5);
+ assertTrue("Should find removeProperty mbean", found6);
}
@Override
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 5a8cb4b..6a17dc2 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
@@ -51,7 +51,7 @@ public class ManagedTransformerRegistryTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
- List<ObjectName> list = new ArrayList<ObjectName>(set);
+ List<ObjectName> list = new ArrayList<>(set);
ObjectName on = null;
for (ObjectName name : list) {
if (name.getCanonicalName().contains("DefaultTransformerRegistry")) {
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 6d89ad6..e59a3f2 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
@@ -51,7 +51,7 @@ public class ManagedValidatorRegistryTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
- List<ObjectName> list = new ArrayList<ObjectName>(set);
+ List<ObjectName> list = new ArrayList<>(set);
ObjectName on = null;
for (ObjectName name : list) {
if (name.getCanonicalName().contains("DefaultValidatorRegistry")) {
diff --git a/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java b/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java
index 21709e2..8639e8e 100644
--- a/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java
@@ -44,8 +44,8 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class MultipleEventNotifierEventsTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
- private static List<EventObject> events2 = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
+ private static List<EventObject> events2 = new ArrayList<>();
@Override
protected boolean useJmx() {
diff --git a/camel-core/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java b/camel-core/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java
index 576141e..42d3962 100644
--- a/camel-core/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.support.EventNotifierSupport;
*/
public class RemoveEventNotifierTest extends ContextTestSupport {
- private static List<EventObject> events = new ArrayList<EventObject>();
+ private static List<EventObject> events = new ArrayList<>();
private EventNotifier notifier;
@Override
diff --git a/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java b/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
index 66dfd28..952c1c1 100644
--- a/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
@@ -48,7 +48,7 @@ public class RemoveRouteDefinitionTest extends ManagementTestSupport {
assertEquals("Should be registered", true, registered);
RouteDefinition definition = context.getRouteDefinition("route1");
- List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> routeDefinitions = new ArrayList<>();
routeDefinitions.add(definition);
context.shutdownRoute("route1");
@@ -74,7 +74,7 @@ public class RemoveRouteDefinitionTest extends ManagementTestSupport {
assertEquals("Should be registered", true, registered);
RouteDefinition definition = context.getRouteDefinition("route1");
- List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> routeDefinitions = new ArrayList<>();
routeDefinitions.add(definition);
// must stop before we can remove
context.stopRoute("route1");
@@ -102,7 +102,7 @@ public class RemoveRouteDefinitionTest extends ManagementTestSupport {
assertEquals("Should be registered", true, registered);
RouteDefinition definition = context.getRouteDefinition("route1");
- List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
+ List<RouteDefinition> routeDefinitions = new ArrayList<>();
routeDefinitions.add(definition);
context.stopRoute("route1");
diff --git a/camel-core/src/test/java/org/apache/camel/processor/AsyncLoopTest.java b/camel-core/src/test/java/org/apache/camel/processor/AsyncLoopTest.java
index 9839dd7..fb00266 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/AsyncLoopTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/AsyncLoopTest.java
@@ -73,7 +73,7 @@ public class AsyncLoopTest extends ContextTestSupport {
private void performLoopTest(String endpointUri, int expectedIterations, String header) throws InterruptedException {
resultEndpoint.expectedMessageCount(expectedIterations);
- List<String> results = new ArrayList<String>(expectedIterations);
+ List<String> results = new ArrayList<>(expectedIterations);
for (int i = 0; i < expectedIterations; i++) {
results.add(BASE_PAYLOAD + new String(new char[i + 1]).replace("\0", " Hello Camel"));
}
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java
index 08b7cac..105c304 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java
@@ -53,7 +53,7 @@ public class ChoiceCompoundPredicateTest extends ContextTestSupport {
MockEndpoint mock = getMockEndpoint("mock:admin");
mock.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("username", "donald");
headers.put("admin", "true");
template.sendBodyAndHeaders("direct:start", "Hello World", headers);
@@ -65,7 +65,7 @@ public class ChoiceCompoundPredicateTest extends ContextTestSupport {
MockEndpoint mock = getMockEndpoint("mock:god");
mock.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("username", "pluto");
headers.put("admin", "true");
headers.put("type", "god");
@@ -78,7 +78,7 @@ public class ChoiceCompoundPredicateTest extends ContextTestSupport {
MockEndpoint mock = getMockEndpoint("mock:god");
mock.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("username", "Camel");
headers.put("admin", "true");
template.sendBodyAndHeaders("direct:start", "Hello Camel Rider", headers);
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java b/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java
index 31931bd..4a3f0bf 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java
@@ -31,7 +31,7 @@ import org.apache.camel.language.XPath;
public class ClaimCheckTest extends ContextTestSupport {
// in memory data store for testing only!
- public static Map<String, Object> dataStore = new HashMap<String, Object>();
+ public static Map<String, Object> dataStore = new HashMap<>();
public void testClaimCheck() throws Exception {
String body = "<order custId=\"123\"><lotsOfContent/></order>";
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java b/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java
index 068c50e..1dc2160 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java
@@ -166,7 +166,7 @@ public class ComposedMessageProcessorTest extends ContextTestSupport {
return newExchange;
}
- List<OrderItem> order = new ArrayList<OrderItem>(2);
+ List<OrderItem> order = new ArrayList<>(2);
order.add(oldExchange.getIn().getBody(OrderItem.class));
order.add(newExchange.getIn().getBody(OrderItem.class));
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java
index 173e185..e6222a8 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
public class DynamicRouterAnnotationTest extends ContextTestSupport {
private static int invoked;
- private static List<String> bodies = new ArrayList<String>();
+ private static List<String> bodies = new ArrayList<>();
public void testDynamicRouterAnnotation() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java
index a3b81e7..d34263b 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java
@@ -31,8 +31,8 @@ import org.apache.camel.builder.RouteBuilder;
*/
public class DynamicRouterExchangeHeaders2Test extends ContextTestSupport {
- private static List<String> bodies = new ArrayList<String>();
- private static List<String> previouses = new ArrayList<String>();
+ private static List<String> bodies = new ArrayList<>();
+ private static List<String> previouses = new ArrayList<>();
public void testDynamicRouter() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java
index e5c10f4..8b8cfdd 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
*/
public class DynamicRouterExchangeHeadersTest extends ContextTestSupport {
- private static List<String> bodies = new ArrayList<String>();
+ private static List<String> bodies = new ArrayList<>();
public void testDynamicRouter() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
index ab8884e..f943e54 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
*/
public class DynamicRouterExchangePropertiesTest extends ContextTestSupport {
- private static List<String> bodies = new ArrayList<String>();
+ private static List<String> bodies = new ArrayList<>();
public void testDynamicRouter() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java
index 84884bf..0802179 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
public class DynamicRouterTest extends ContextTestSupport {
private static int invoked;
- private static List<String> bodies = new ArrayList<String>();
+ private static List<String> bodies = new ArrayList<>();
public void testDynamicRouter() throws Exception {
getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java b/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
index cdd2f66..cab2379 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.model.OnExceptionDefinition;
... 1975 lines suppressed ...
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.
[camel] 01/02: polish
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c1f9e3eb866c87b6452578f68194acb2cdfb0f51
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Mon Apr 16 23:42:22 2018 +0200
polish
---
.../org/apache/camel/core/osgi/OsgiCamelContextPublisher.java | 4 ++--
.../main/java/org/apache/camel/core/osgi/OsgiClassResolver.java | 2 +-
.../java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java | 4 ++--
.../org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java | 2 +-
.../main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java | 6 +++---
.../main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java | 4 ++--
.../java/org/apache/camel/core/osgi/utils/BundleContextUtils.java | 2 +-
.../src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java | 8 ++++----
.../java/org/apache/camel/core/osgi/CamelMockBundleContext.java | 2 +-
.../org/apache/camel/core/osgi/OsgiComponentResolverTest.java | 1 -
.../apache/camel/core/osgi/test/MockTypeConverterRegistry.java | 4 ++--
.../apache/camel/core/xml/AbstractCamelContextFactoryBean.java | 8 ++++----
.../apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java | 4 ++--
.../org/apache/camel/core/xml/PatternBasedPackageScanFilter.java | 8 ++++----
.../core/xml/util/jsse/CipherSuitesParametersDefinition.java | 2 +-
.../camel/core/xml/util/jsse/FilterParametersDefinition.java | 4 ++--
.../xml/util/jsse/SecureSocketProtocolsParametersDefinition.java | 2 +-
17 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
index 307a12b..26ca21c 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
@@ -47,7 +47,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
private final BundleContext bundleContext;
private final Map<CamelContext, ServiceRegistration<?>> registrations
- = new ConcurrentHashMap<CamelContext, ServiceRegistration<?>>();
+ = new ConcurrentHashMap<>();
public OsgiCamelContextPublisher(BundleContext bundleContext) {
this.bundleContext = bundleContext;
@@ -115,7 +115,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
if (!lookupCamelContext(bundleContext, symbolicName, name)) {
Version bundleVersion = getBundleVersion(bundleContext.getBundle());
- Dictionary<String, Object > props = new Hashtable<String, Object>();
+ Dictionary<String, Object > props = new Hashtable<>();
props.put(CONTEXT_SYMBOLIC_NAME_PROPERTY, symbolicName);
props.put(CONTEXT_VERSION_PROPERTY, bundleVersion);
props.put(CONTEXT_NAME_PROPERTY, name);
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
index f75a50a..cae621c 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
@@ -124,7 +124,7 @@ public class OsgiClassResolver extends DefaultClassResolver {
@Override
public Enumeration<URL> loadAllResourcesAsURL(String uri) {
ObjectHelper.notEmpty(uri, "uri");
- Vector<URL> answer = new Vector<URL>();
+ Vector<URL> answer = new Vector<>();
try {
String resolvedName = resolveUriPath(uri);
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
index 74cd06c..e9b79f0 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiEventAdminNotifier.java
@@ -56,7 +56,7 @@ public class OsgiEventAdminNotifier extends EventNotifierSupport {
public OsgiEventAdminNotifier(BundleContext bundleContext) {
this.bundleContext = bundleContext;
- this.tracker = new ServiceTracker<EventAdmin, EventAdmin>(bundleContext, EventAdmin.class.getName(), null);
+ this.tracker = new ServiceTracker<>(bundleContext, EventAdmin.class.getName(), null);
setIgnoreExchangeEvents(true);
}
@@ -66,7 +66,7 @@ public class OsgiEventAdminNotifier extends EventNotifierSupport {
return;
}
- Dictionary<String, Object> props = new Hashtable<String, Object>();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(TYPE, getType(event));
props.put(EVENT, event);
props.put(TIMESTAMP, System.currentTimeMillis());
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
index af9846e..8772f8c 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
@@ -91,7 +91,7 @@ public class OsgiPackageScanClassResolver extends DefaultPackageScanClassResolve
} else {
bundles = new Bundle[]{bundle};
}
- Set<String> urls = new LinkedHashSet<String>();
+ Set<String> urls = new LinkedHashSet<>();
for (Bundle bd : bundles) {
log.trace("Searching in bundle: {}", bd);
try {
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
index 337061b..cc2c353 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
public class OsgiServiceRegistry extends LifecycleStrategySupport implements Registry {
private static final Logger LOG = LoggerFactory.getLogger(OsgiCamelContextHelper.class);
private final BundleContext bundleContext;
- private final Queue<ServiceReference<?>> serviceReferenceQueue = new ConcurrentLinkedQueue<ServiceReference<?>>();
+ private final Queue<ServiceReference<?>> serviceReferenceQueue = new ConcurrentLinkedQueue<>();
public OsgiServiceRegistry(BundleContext bc) {
bundleContext = bc;
@@ -97,7 +97,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
}
public <T> Map<String, T> findByTypeWithName(Class<T> type) {
- Map<String, T> result = new HashMap<String, T>();
+ Map<String, T> result = new HashMap<>();
int count = 0;
try {
ServiceReference<?>[] refs = bundleContext.getAllServiceReferences(type.getName(), null);
@@ -127,7 +127,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
public <T> Set<T> findByType(Class<T> type) {
Map<String, T> map = findByTypeWithName(type);
- return new HashSet<T>(map.values());
+ return new HashSet<>(map.values());
}
public Object lookup(String name) {
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index 85bd1f1..ae63aca 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -61,7 +61,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
this.camelContext = camelContext;
this.injector = injector;
this.factoryFinder = factoryFinder;
- this.tracker = new ServiceTracker<TypeConverterLoader, Object>(bundleContext, TypeConverterLoader.class.getName(), this);
+ this.tracker = new ServiceTracker<>(bundleContext, TypeConverterLoader.class.getName(), this);
}
public Object addingService(ServiceReference<TypeConverterLoader> serviceReference) {
@@ -225,7 +225,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
ServiceReference<TypeConverterLoader>[] serviceReferences = this.tracker.getServiceReferences();
if (serviceReferences != null) {
ArrayList<ServiceReference<TypeConverterLoader>> servicesList =
- new ArrayList<ServiceReference<TypeConverterLoader>>(Arrays.asList(serviceReferences));
+ new ArrayList<>(Arrays.asList(serviceReferences));
// Just make sure we install the high ranking fallback converter at last
Collections.sort(servicesList);
for (ServiceReference<TypeConverterLoader> sr : servicesList) {
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
index ce7af15..4b77f77 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
@@ -80,7 +80,7 @@ public final class BundleContextUtils {
public static Map<String, Properties> findComponents(BundleContext bundleContext, CamelContext camelContext)
throws IOException, LoadPropertiesException {
- SortedMap<String, Properties> answer = new TreeMap<String, Properties>();
+ SortedMap<String, Properties> answer = new TreeMap<>();
Bundle[] bundles = bundleContext.getBundles();
for (Bundle bundle : bundles) {
Enumeration<URL> iter = bundle.getResources(CamelContextHelper.COMPONENT_DESCRIPTOR);
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
index 212b932..7fa2f40 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
@@ -65,11 +65,11 @@ public class CamelMockBundle extends MockBundle {
}
private Enumeration<String> getListEnumeration(String prefix, String entrys[]) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (String entry : entrys) {
list.add(prefix + entry);
}
- return new ListEnumeration<String>(list);
+ return new ListEnumeration<>(list);
}
public Enumeration<String> getEntryPaths(String path) {
@@ -92,12 +92,12 @@ public class CamelMockBundle extends MockBundle {
public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) {
if (path.equals("/org/apache/camel/core/osgi/test") && filePattern.equals("*.class")) {
- List<URL> urls = new ArrayList<URL>();
+ List<URL> urls = new ArrayList<>();
URL url = getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyTypeConverter.class");
urls.add(url);
url = getClass().getClassLoader().getResource("org/apache/camel/core/osgi/test/MyRouteBuilder.class");
urls.add(url);
- return new ListEnumeration<URL>(urls);
+ return new ListEnumeration<>(urls);
} else {
return CastUtils.cast(super.findEntries(path, filePattern, recurse));
}
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
index 0c16ae1..5d8cff8 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundleContext.java
@@ -77,7 +77,7 @@ public class CamelMockBundleContext extends MockBundleContext {
// lookup Java class if clazz contains dot (.) symbol
if (clazz.contains(".")) {
try {
- final Class c = Class.forName(clazz);
+ Class.forName(clazz);
return super.getServiceReference(clazz);
} catch (ClassNotFoundException ex) {
return null; // class not found so no service reference is returned
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
index 59ff0dc..85c667f 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiComponentResolverTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.core.osgi;
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.component.file.FileComponent;
diff --git a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
index 28cbdc3..df1b4e7 100644
--- a/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
+++ b/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
@@ -27,8 +27,8 @@ import org.apache.camel.spi.Injector;
import org.apache.camel.spi.TypeConverterRegistry;
public class MockTypeConverterRegistry implements TypeConverterRegistry {
- private List<TypeConverter> typeConverters = new ArrayList<TypeConverter>();
- private List<TypeConverter> fallbackTypeConverters = new ArrayList<TypeConverter>();
+ private List<TypeConverter> typeConverters = new ArrayList<>();
+ private List<TypeConverter> fallbackTypeConverters = new ArrayList<>();
public List<TypeConverter> getTypeConverters() {
return typeConverters;
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 87101bb..521188f 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -140,7 +140,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
private static final Logger LOG = LoggerFactory.getLogger(AbstractCamelContextFactoryBean.class);
@XmlTransient
- private List<RoutesBuilder> builders = new ArrayList<RoutesBuilder>();
+ private List<RoutesBuilder> builders = new ArrayList<>();
@XmlTransient
private ClassLoader contextClassLoaderOnStart;
@XmlTransient
@@ -994,7 +994,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
protected void initThreadPoolProfiles(T context) throws Exception {
- Set<String> defaultIds = new HashSet<String>();
+ Set<String> defaultIds = new HashSet<>();
// lookup and use custom profiles from the registry
Map<String, ThreadPoolProfile> profiles = context.getRegistry().findByTypeWithName(ThreadPoolProfile.class);
@@ -1058,7 +1058,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
* Strategy to install all available routes into the context
*/
protected void installRoutes() throws Exception {
- List<RouteBuilder> builders = new ArrayList<RouteBuilder>();
+ List<RouteBuilder> builders = new ArrayList<>();
// lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
@@ -1151,7 +1151,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
}
private String[] normalizePackages(T context, List<String> unnormalized) throws Exception {
- List<String> packages = new ArrayList<String>();
+ List<String> packages = new ArrayList<>();
for (String name : unnormalized) {
// it may use property placeholders
name = context.resolvePropertyPlaceholders(name);
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
index b7d68f1..9c1e559 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
@@ -48,7 +48,7 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
private ExchangePattern pattern;
@XmlElementRef
@Metadata(description = "To configure additional endpoint options using a XML style which is similar as configuring Spring or Blueprint beans.")
- private List<PropertyDefinition> properties = new ArrayList<PropertyDefinition>();
+ private List<PropertyDefinition> properties = new ArrayList<>();
@XmlTransient
private Endpoint endpoint;
@@ -122,7 +122,7 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
if (properties == null || properties.isEmpty()) {
return uri;
} else {
- Map<String, Object> map = new LinkedHashMap<String, Object>();
+ Map<String, Object> map = new LinkedHashMap<>();
for (PropertyDefinition property : properties) {
// resolve placeholders for each value
String value = getCamelContext().resolvePropertyPlaceholders(property.getValue());
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
index 99bf76b..8f92a4d 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/PatternBasedPackageScanFilter.java
@@ -42,7 +42,7 @@ public class PatternBasedPackageScanFilter implements PackageScanFilter {
*/
public void addExcludePattern(String excludePattern) {
if (excludePatterns == null) {
- excludePatterns = new ArrayList<String>();
+ excludePatterns = new ArrayList<>();
}
excludePatterns.add(excludePattern);
}
@@ -53,21 +53,21 @@ public class PatternBasedPackageScanFilter implements PackageScanFilter {
*/
public void addIncludePattern(String includePattern) {
if (includePatterns == null) {
- includePatterns = new ArrayList<String>();
+ includePatterns = new ArrayList<>();
}
includePatterns.add(includePattern);
}
public void addIncludePatterns(Collection<String> includes) {
if (includePatterns == null) {
- includePatterns = new ArrayList<String>();
+ includePatterns = new ArrayList<>();
}
includePatterns.addAll(includes);
}
public void addExcludePatterns(Collection<String> excludes) {
if (excludePatterns == null) {
- excludePatterns = new ArrayList<String>();
+ excludePatterns = new ArrayList<>();
}
excludePatterns.addAll(excludes);
}
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java
index f552355..999601c 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/CipherSuitesParametersDefinition.java
@@ -35,7 +35,7 @@ public class CipherSuitesParametersDefinition {
*/
public List<String> getCipherSuite() {
if (this.cipherSuite == null) {
- this.cipherSuite = new ArrayList<String>();
+ this.cipherSuite = new ArrayList<>();
}
return this.cipherSuite;
}
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java
index 6d0481c..92eabf3 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/FilterParametersDefinition.java
@@ -42,7 +42,7 @@ public class FilterParametersDefinition {
*/
public List<String> getInclude() {
if (this.include == null) {
- this.include = new ArrayList<String>();
+ this.include = new ArrayList<>();
}
return this.include;
}
@@ -55,7 +55,7 @@ public class FilterParametersDefinition {
*/
public List<String> getExclude() {
if (exclude == null) {
- exclude = new ArrayList<String>();
+ exclude = new ArrayList<>();
}
return this.exclude;
}
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java
index ae48d39..30af484 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/SecureSocketProtocolsParametersDefinition.java
@@ -38,7 +38,7 @@ public class SecureSocketProtocolsParametersDefinition {
*/
public List<String> getSecureSocketProtocol() {
if (this.secureSocketProtocol == null) {
- this.secureSocketProtocol = new ArrayList<String>();
+ this.secureSocketProtocol = new ArrayList<>();
}
return this.secureSocketProtocol;
}
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.