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/17 12:41:38 UTC
[camel] branch master updated (2594f3a -> 0cc2351)
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 2594f3a CAMEL-12449: Fixed CS
new 70f618a polish
new a3c9d73 polish
new bd73b0e polish
new 0cc2351 polish
The 4 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:
.../apache/camel/component/ahc/ws/WsEndpoint.java | 2 +-
.../camel/component/ahc/DefaultAhcBinding.java | 4 +-
.../component/ahc/AhcProduceGetHeadersTest.java | 2 +-
.../component/ahc/AhcProducePostHeadersTest.java | 2 +-
.../ahc/AhcProducerConnectionCloseHeadersTest.java | 2 +-
.../AhcProducerTwoParametersWithSameKeyTest.java | 4 +-
.../apache/camel/component/apns/ApnsConsumer.java | 2 +-
.../apache/camel/component/apns/ApnsEndpoint.java | 2 +-
.../apache/camel/component/apns/ApnsProducer.java | 2 +-
.../camel/component/apns/util/ApnsUtils.java | 4 +-
.../ASN1DataFormatWithStreamIteratorClassTest.java | 1 -
.../asn1/SpringASN1DataFormatRouteTest.java | 1 -
.../camel/component/atmos/core/AtmosAPIFacade.java | 6 +--
.../validator/AtmosConfigurationValidator.java | 2 +-
.../atmosphere/websocket/MemoryWebSocketStore.java | 4 +-
.../atmosphere/websocket/WebsocketComponent.java | 2 +-
.../component/atmosphere/websocket/TestClient.java | 4 +-
.../websocket/WebsocketRouteWithInitParamTest.java | 2 +-
.../apache/camel/component/avro/AvroComponent.java | 2 +-
.../apache/camel/component/avro/AvroListener.java | 2 +-
.../camel/dataformat/avro/AvroDataFormat.java | 4 +-
.../camel/avro/impl/KeyValueProtocolImpl.java | 2 +-
.../component/aws/xray/CustomComponentTest.java | 1 -
.../apache/camel/component/aws/xray/ErrorTest.java | 1 -
.../camel/component/aws/xray/FakeAWSDaemon.java | 2 +-
.../aws/xray/MulticastParallelRouteTest.java | 1 -
.../component/aws/xray/MulticastRouteTest.java | 1 -
.../component/aws/xray/Route2ConcurrentTest.java | 1 -
.../component/aws/xray/RouteConcurrentTest.java | 1 -
.../aws/xray/SpringAwsXRaySimpleRouteTest.java | 1 -
.../camel/component/aws/xray/TwoService2Test.java | 1 -
.../camel/component/aws/xray/TwoServiceTest.java | 1 -
.../aws/xray/TwoServiceWithExcludeTest.java | 1 -
.../apache/camel/component/aws/cw/CwProducer.java | 2 +-
.../apache/camel/component/aws/s3/S3Consumer.java | 4 +-
.../apache/camel/component/aws/s3/S3Producer.java | 2 +-
.../camel/component/aws/sns/SnsProducer.java | 2 +-
.../camel/component/aws/sqs/SqsConsumer.java | 2 +-
.../camel/component/aws/sqs/SqsProducer.java | 2 +-
.../swf/CamelActivityImplementationFactory.java | 2 +-
.../component/aws/swf/CamelSWFWorkflowClient.java | 2 +-
.../component/aws/swf/CamelWorkflowDefinition.java | 6 +--
.../swf/CamelWorkflowDefinitionFactoryFactory.java | 2 +-
.../camel/component/aws/cw/CwComponentTest.java | 2 +-
.../component/aws/ddb/AmazonDDBClientMock.java | 14 +++---
.../aws/ddb/BatchGetItemsCommandTest.java | 6 +--
.../component/aws/ddb/DeleteItemCommandTest.java | 4 +-
.../aws/ddb/DescribeTableCommandTest.java | 2 +-
.../component/aws/ddb/GetItemCommandTest.java | 2 +-
.../component/aws/ddb/PutItemCommandTest.java | 4 +-
.../camel/component/aws/ddb/QueryCommandTest.java | 6 +--
.../camel/component/aws/ddb/ScanCommandTest.java | 4 +-
.../component/aws/ddb/UpdateItemCommandTest.java | 6 +--
.../integration/DdbComponentIntegrationTest.java | 2 +-
.../component/aws/ec2/AmazonEC2ClientMock.java | 14 +++---
.../camel/component/aws/ec2/EC2ProducerTest.java | 2 +-
.../integration/EC2ComponentIntegrationTest.java | 2 +-
.../component/aws/kms/AmazonKMSClientMock.java | 2 +-
.../aws/lambda/AmazonLambdaClientMock.java | 4 +-
.../camel/component/aws/s3/AmazonS3ClientMock.java | 6 +--
.../aws/s3/AmazonS3EncryptionClientMock.java | 6 +--
.../aws/s3/S3ComponentExistingBucketTest.java | 4 +-
.../aws/s3/S3ComponentNonExistingBucketTest.java | 2 +-
.../aws/sdb/BatchDeleteAttributesCommandTest.java | 4 +-
.../aws/sdb/BatchPutAttributesCommandTest.java | 4 +-
.../aws/sdb/DeleteAttributesCommandTest.java | 6 +--
.../aws/sdb/GetAttributesCommandTest.java | 6 +--
.../aws/sdb/PutAttributesCommandTest.java | 6 +--
.../component/aws/sns/AmazonSNSClientMock.java | 2 +-
.../component/aws/sqs/AmazonSQSClientMock.java | 10 ++---
.../aws/sqs/SqsConcurrentConsumerTest.java | 2 +-
.../camel/component/aws/sqs/SqsEndpointTest.java | 7 +--
.../camel/component/aws/sqs/SqsProducerTest.java | 6 +--
.../component/azure/blob/BlobServiceProducer.java | 8 ++--
.../component/azure/queue/QueueServiceUtil.java | 2 +-
.../azure/queue/QueueServiceProducerTest.java | 2 +-
.../java/org/apache/camel/bam/ProcessBuilder.java | 6 +--
.../apache/camel/bam/model/ProcessInstance.java | 2 +-
.../camel/bam/processor/ActivityMonitorEngine.java | 2 +-
.../org/apache/camel/bam/rules/ActivityRules.java | 2 +-
.../org/apache/camel/bam/rules/ProcessRules.java | 2 +-
.../dataformat/barcode/BarcodeDataFormat.java | 4 +-
.../camel/dataformat/beanio/BeanIODataFormat.java | 4 +-
.../beanio/BeanIODataFormatComplexTest.java | 2 +-
...rmatSimpleCustomBeanReaderErrorHandlerTest.java | 2 +-
.../beanio/BeanIODataFormatSimpleTest.java | 2 +-
...IOSplitterCustomBeanReaderErrorHandlerTest.java | 2 +-
.../dataformat/beanio/BeanIOSplitterTest.java | 2 +-
.../org/apache/camel/dataformat/beanio/Header.java | 2 +-
.../beanio/SpringBeanIODataFormatSimpleTest.java | 2 +-
.../camel/dataformat/beanio/csv/CsvTest.java | 2 +-
.../component/beanstalk/ConnectionSettings.java | 2 +-
.../beanstalk/ConsumerToProducerHeadersTest.java | 2 +-
.../dataformat/bindy/BindyAbstractFactory.java | 8 ++--
.../camel/dataformat/bindy/BindyCsvFactory.java | 31 ++++++--------
.../dataformat/bindy/BindyFixedLengthFactory.java | 15 +++----
.../dataformat/bindy/BindyKeyValuePairFactory.java | 23 +++++-----
.../dataformat/bindy/csv/BindyCsvDataFormat.java | 10 ++---
.../bindy/fixed/BindyFixedLengthDataFormat.java | 6 +--
.../bindy/kvp/BindyKeyValuePairDataFormat.java | 4 +-
.../bindy/util/AnnotationModelLoader.java | 4 +-
.../BindyComplexCsvGenerateHeaderMarshallTest.java | 4 +-
.../bindy/csv/BindyComplexCsvMarshallTest.java | 4 +-
.../BindySimpleCsvBooleanFalseMarshallTest.java | 4 +-
.../csv/BindySimpleCsvBooleanTrueMarshallTest.java | 4 +-
.../BindySimpleCsvGenerateHeaderMarshallTest.java | 4 +-
.../bindy/csv/BindySimpleCsvMarshallDslTest.java | 4 +-
...BindySimpleCsvMarshallPositionModifiedTest.java | 4 +-
.../bindy/csv/BindySimpleCsvMarshallTest.java | 4 +-
.../bindy/csv/BindySimpleCsvNullMarshallTest.java | 4 +-
.../csv/BindySimpleCsvOneToManyMarshallTest.java | 6 +--
.../bindy/csv/BindySimpleCsvUnmarshallTest.java | 1 -
.../bindy/csv/WickedHeaderWithCommaCsvTest.java | 2 +-
.../BindyComplexKeyValuePairStandaloneTest.java | 4 +-
.../BindySimpleKeyValuePairMarshallDslTest.java | 4 +-
.../fix/BindySimpleKeyValuePairMarshallTest.java | 4 +-
.../BindySimpleKeyValuePairNullMarshallTest.java | 4 +-
.../BindySimpleKeyValuePairSortedMarshallTest.java | 4 +-
.../BindySimpleKeyValuePairTabMarshallTest.java | 4 +-
...eKeyValuePairWithoutSectionMarshallDslTest.java | 4 +-
.../BindySimpleFixedLengthHeaderFooterTest.java | 14 +++---
.../simple/BindySimpleFixedLengthMarshallTest.java | 4 +-
...mpleFixedLengthMarshallWithClipAndTrimTest.java | 4 +-
...BindySimpleFixedLengthMarshallWithClipTest.java | 4 +-
...ndySimpleFixedLengthMarshallWithNoClipTest.java | 4 +-
.../BindySimpleFixedLengthObjectMarshallTest.java | 2 +-
...BindyFixedLengthHeaderFooterSkipHeaderTest.java | 8 ++--
.../BlueprintCamelContextLookupHelper.java | 2 +-
.../blueprint/BlueprintContainerRegistry.java | 4 +-
.../BlueprintModelJAXBContextFactory.java | 2 +-
.../camel/blueprint/BlueprintPropertiesParser.java | 4 +-
.../camel/blueprint/CamelContextFactoryBean.java | 20 ++++-----
.../blueprint/CamelRestContextFactoryBean.java | 2 +-
.../blueprint/CamelRouteContextFactoryBean.java | 2 +-
.../blueprint/handler/CamelNamespaceHandler.java | 4 +-
.../bonita/api/filter/BonitaAuthFilter.java | 2 +-
.../component/bonita/BonitaConfigurationTest.java | 3 +-
.../camel/component/boon/BoonDataFormatTest.java | 6 +--
.../component/box/api/BoxEventLogsManager.java | 8 ++--
.../camel/component/box/api/BoxFilesManager.java | 4 +-
.../camel/component/box/api/BoxFoldersManager.java | 6 +--
.../camel/component/box/api/BoxGroupsManager.java | 2 +-
.../camel/component/box/api/BoxSearchManager.java | 2 +-
.../camel/component/box/api/BoxTasksManager.java | 2 +-
.../camel/component/box/api/BoxUsersManager.java | 2 +-
.../apache/camel/component/box/BoxComponent.java | 2 -
.../camel/component/box/BoxConfiguration.java | 1 -
.../apache/camel/component/box/BoxConsumer.java | 3 +-
.../apache/camel/component/box/BoxEndpoint.java | 2 -
.../apache/camel/component/box/BoxProducer.java | 1 -
.../box/internal/BoxConnectionHelper.java | 2 +-
.../component/box/AbstractBoxTestSupport.java | 2 +-
.../BoxCollaborationsManagerIntegrationTest.java | 8 ++--
.../box/BoxCommentsManagerIntegrationTest.java | 8 ++--
.../box/BoxEventLogsManagerIntegrationTest.java | 4 +-
.../box/BoxEventsManagerIntegrationTest.java | 2 -
.../box/BoxFilesManagerIntegrationTest.java | 34 +++++++--------
.../box/BoxFoldersManagerIntegrationTest.java | 20 ++++-----
.../box/BoxGroupsManagerIntegrationTest.java | 8 ++--
.../box/BoxSearchManagerIntegrationTest.java | 4 +-
.../box/BoxTasksManagerIntegrationTest.java | 10 ++---
.../box/BoxUsersManagerIntegrationTest.java | 18 ++++----
.../component/braintree/BraintreeComponent.java | 2 -
.../braintree/BraintreeConfiguration.java | 1 -
.../component/braintree/BraintreeConsumer.java | 1 -
.../component/braintree/BraintreeEndpoint.java | 2 -
.../component/braintree/BraintreeProducer.java | 1 -
.../braintree/AbstractBraintreeTestSupport.java | 2 -
.../braintree/AddOnGatewayIntegrationTest.java | 1 -
.../braintree/AddressGatewayIntegrationTest.java | 2 -
.../ClientTokenGatewayIntegrationTest.java | 1 -
...editCardVerificationGatewayIntegrationTest.java | 2 -
.../braintree/CustomerGatewayIntegrationTest.java | 1 -
.../braintree/DiscountGatewayIntegrationTest.java | 2 -
.../MerchantAccountGatewayIntegrationTest.java | 2 -
.../PaymentMethodGatewayIntegrationTest.java | 1 -
.../PaymentMethodNonceGatewayIntegrationTest.java | 2 -
.../braintree/PlanGatewayIntegrationTest.java | 1 -
...ttlementBatchSummaryGatewayIntegrationTest.java | 4 +-
.../SubscriptionGatewayIntegrationTest.java | 8 ++--
.../TransactionGatewayIntegrationTest.java | 4 +-
.../WebhookNotificationGatewayIntegrationTest.java | 2 -
.../cache/CacheEventListenerRegistry.java | 2 +-
.../camel/component/cache/CacheLoaderRegistry.java | 2 +-
.../cache/CacheConfigurationFileTest.java | 2 +-
.../camel/component/cache/CacheConsumerTest.java | 4 +-
.../cache/CacheBasedBodyReplacerTest.java | 2 +-
.../cache/CacheBasedTokenReplacerTest.java | 2 +-
.../cache/CacheBasedXPathElementReplacerTest.java | 2 +-
.../cassandra/ResultSetConversionStrategies.java | 2 +-
.../cassandra/CassandraAggregationRepository.java | 4 +-
.../cassandra/CassandraComponentProducerTest.java | 2 -
.../CassandraComponentProducerUnpreparedTest.java | 2 -
.../CassandraIdempotentRepositoryTest.java | 2 +-
.../NamedCassandraIdempotentRepositoryTest.java | 2 +-
.../apache/camel/component/cmis/CMISHelper.java | 4 +-
.../camel/component/cmis/CMISSessionFacade.java | 4 +-
.../camel/component/cmis/CMISTestSupport.java | 6 +--
.../camel/component/cometd/CometdBinding.java | 2 +-
.../camel/component/cometd/CometdComponent.java | 6 +--
.../camel/component/cometd/CometBindingTest.java | 2 +-
.../camel/component/cometd/CometdConsumerTest.java | 2 +-
...oducerConsumerInteractiveAuthenticatedMain.java | 2 +-
...tdProducerConsumerInteractiveExtensionMain.java | 2 +-
.../camel/component/consul/ConsulRegistryTest.java | 4 +-
.../component/context/LocalContextComponent.java | 2 +-
.../component/couchbase/CouchbaseEndpoint.java | 4 +-
.../component/couchdb/CouchDbComponentTest.java | 4 +-
.../crypt/EnvelopedDataEncryptorConfiguration.java | 4 +-
.../crypto/cms/sig/SignedDataCreator.java | 2 +-
.../cms/sig/SignedDataCreatorConfiguration.java | 2 +-
.../component/crypto/cms/EnvelopedDataTest.java | 2 +-
.../camel/component/crypto/cms/SignedDataTest.java | 2 +-
.../crypto/DefaultPGPSecretKeyAccessor.java | 6 +--
.../camel/converter/crypto/PGPDataFormat.java | 2 +-
.../camel/converter/crypto/PGPDataFormatUtil.java | 6 +--
.../converter/crypto/PGPKeyAccessDataFormat.java | 6 +--
.../crypto/AbstractPGPDataFormatTest.java | 2 +-
.../converter/crypto/PGPDataFormatDynamicTest.java | 6 +--
.../camel/converter/crypto/PGPDataFormatTest.java | 12 +++---
.../apache/camel/dataformat/csv/CsvMarshaller.java | 4 +-
.../camel/dataformat/csv/CsvRecordConverters.java | 3 +-
.../camel/dataformat/csv/CsvUnmarshaller.java | 2 +-
.../CsvDataFormatCustomRecordConverterTest.java | 3 --
...svMarshalAutogenColumnsSpringQuoteModeTest.java | 6 +--
.../csv/CsvMarshalAutogenColumnsSpringTest.java | 6 +--
.../dataformat/csv/CsvMarshalCharsetTest.java | 2 +-
.../csv/CsvMarshalPipeDelimiterSpringTest.java | 6 +--
.../csv/CsvMarshalPipeDelimiterTest.java | 6 +--
.../apache/camel/dataformat/csv/CsvRouteTest.java | 10 ++---
.../cxf/common/header/CxfHeaderFilterStrategy.java | 2 +-
.../cxf/transport/CamelTransportFactory.java | 2 +-
.../blueprint/CamelTransportNameSpaceHandler.java | 2 +-
.../apache/camel/component/cxf/CxfConsumer.java | 2 +-
.../apache/camel/component/cxf/CxfEndpoint.java | 12 +++---
.../org/apache/camel/component/cxf/CxfPayload.java | 2 +-
.../apache/camel/component/cxf/CxfProducer.java | 10 ++---
.../camel/component/cxf/DefaultCxfBinding.java | 20 ++++-----
.../cxf/blueprint/CxfNamespaceHandler.java | 2 +-
.../component/cxf/converter/CachedCxfPayload.java | 6 +--
.../cxf/converter/CxfPayloadConverter.java | 20 ++++-----
.../component/cxf/cxfbean/CxfBeanComponent.java | 2 +-
.../component/cxf/cxfbean/CxfBeanEndpoint.java | 2 +-
.../cxf/feature/AbstractDataFormatFeature.java | 6 +--
.../cxf/feature/CXFMessageDataFormatFeature.java | 4 +-
.../camel/component/cxf/jaxrs/CxfRsComponent.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsEndpoint.java | 6 +--
.../camel/component/cxf/jaxrs/CxfRsProducer.java | 8 ++--
.../component/cxf/jaxrs/DataFormatProvider.java | 2 +-
.../component/cxf/jaxrs/SimpleCxfRsBinding.java | 8 ++--
.../spring/AbstractCxfBeanDefinitionParser.java | 2 +-
.../apache/camel/component/cxf/util/CxfUtils.java | 2 +-
.../component/cxf/AbstractCxfWsdlFirstTest.java | 14 +++---
...XFWsdlOnlyPayloadModeMultiPartNoSpringTest.java | 4 +-
.../cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java | 12 +++---
.../camel/component/cxf/CXFWsdlOnlyTest.java | 20 ++++-----
.../cxf/CxfConsumerPayLoadFaultMessageTest.java | 4 +-
.../CxfConsumerPayloadFaultCauseEnabledTest.java | 6 +--
.../component/cxf/CxfConsumerPayloadFaultTest.java | 6 +--
.../component/cxf/CxfConsumerPayloadTest.java | 4 +-
.../CxfConsumerPayloadXPathClientServerTest.java | 4 +-
.../component/cxf/CxfConsumerResponseTest.java | 2 +-
.../camel/component/cxf/CxfConsumerTest.java | 2 +-
.../component/cxf/CxfMessageHeaderTimeoutTest.java | 4 +-
.../component/cxf/CxfMixedModeRouterTest.java | 6 +--
.../CxfPayLoadSoapHeaderViaCamelHeaderTest.java | 2 +-
.../component/cxf/CxfProducerContextTest.java | 8 ++--
.../component/cxf/CxfProducerOperationTest.java | 10 ++---
.../cxf/CxfProducerProtocalHeaderTest.java | 2 +-
.../camel/component/cxf/CxfProducerRouterTest.java | 4 +-
.../component/cxf/CxfProducerSoapActionTest.java | 2 +-
.../component/cxf/CxfProducerSoapFaultTest.java | 2 +-
.../camel/component/cxf/CxfProducerTest.java | 4 +-
.../apache/camel/component/cxf/CxfTimeoutTest.java | 2 +-
.../camel/component/cxf/DefaultCxfBindingTest.java | 22 +++++-----
.../camel/component/cxf/FailOverFeatureTest.java | 2 +-
.../component/cxf/LoadDistributorFeatureTest.java | 2 +-
.../component/cxf/converter/ConverterTest.java | 4 +-
.../cxf/converter/CxfPayloadConverterTest.java | 10 ++---
.../camel/component/cxf/cxfbean/CxfBeanTest.java | 6 +--
.../cxf/holder/CxfHolderConsumerTest.java | 6 +--
.../component/cxf/jaxrs/CxfRsEndpointTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsProducerTest.java | 2 +-
.../cxf/jaxrs/DataFormatProviderTest.java | 12 +++---
.../cxf/jaxrs/DefaultCxfRsBindingTest.java | 2 +-
.../CxfRsConsumerSimpleBindingTest.java | 2 +-
.../cxf/jaxrs/simplebinding/testbean/Order.java | 2 +-
.../cxf/jaxrs/testbean/CustomerService.java | 6 +--
.../camel/component/cxf/jaxrs/testbean/Order.java | 2 +-
.../cxf/mtom/CxfJavaMtomProducerPayloadTest.java | 4 +-
.../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 10 ++---
.../component/cxf/mtom/CxfMtomConsumerTest.java | 4 +-
.../CxfMtomDisabledConsumerPayloadModeTest.java | 4 +-
.../CxfMtomDisabledProducerPayloadModeTest.java | 4 +-
.../cxf/mtom/CxfMtomPOJOProducerTest.java | 4 +-
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 6 +--
.../cxf/mtom/CxfMtomRouterPayloadModeTest.java | 4 +-
.../component/cxf/multipart/CXFMultiPartTest.java | 4 +-
.../soap/headers/CxfMessageHeadersRelayTest.java | 34 +++++++--------
.../cxf/soap/headers/HeaderTesterImpl.java | 2 +-
.../cxf/spring/CxfEndpointBeansRouterTest.java | 2 +-
.../camel/component/cxf/ssl/SslGlobalTest.java | 2 +-
.../apache/camel/component/cxf/ssl/SslTest.java | 2 +-
.../component/cxf/wssecurity/client/Client.java | 4 +-
.../cxf/wssecurity/client/UTPasswordCallback.java | 2 +-
.../cxf/wssecurity/server/UTPasswordCallback.java | 2 +-
.../maven/connector/model/EndpointOptionModel.java | 1 -
.../maven/connector/util/JSonSchemaHelper.java | 2 -
.../component/connector/ConnectorComponent.java | 1 +
.../camel/component/connector/ConnectorModel.java | 3 --
.../camel/catalog/karaf/KarafRuntimeProvider.java | 8 ++--
.../springboot/SpringBootRuntimeProvider.java | 8 ++--
.../apache/camel/catalog/DefaultCamelCatalog.java | 34 +++++++--------
.../camel/catalog/DefaultRuntimeProvider.java | 8 ++--
.../org/apache/camel/catalog/CamelCatalogTest.java | 24 +++++------
.../camel/commands/AbstractCamelController.java | 2 +-
.../commands/AbstractLocalCamelController.java | 38 ++++++++--------
.../camel/commands/ComponentListCommand.java | 2 +-
.../camel/commands/ContextInflightCommand.java | 2 +-
.../apache/camel/commands/ContextListCommand.java | 2 +-
.../camel/commands/EndpointStatisticCommand.java | 2 +-
.../camel/commands/RestRegistryListCommand.java | 2 +-
.../apache/camel/commands/RouteListCommand.java | 2 +-
.../camel/commands/DummyCamelController.java | 6 +--
.../jolokia/DefaultJolokiaCamelController.java | 50 +++++++++++-----------
.../cxf/jaxrs/testbean/CustomerService.java | 6 +--
.../camel/component/cxf/jaxrs/testbean/Order.java | 2 +-
.../test/cxf/blueprint/CxfEndpointBeansTest.java | 2 +-
.../builder/AddComponentInConfigureBuilder.java | 6 +--
.../tools/apt/CoreEipAnnotationProcessor.java | 40 ++++++++---------
.../tools/apt/EndpointAnnotationProcessor.java | 20 ++++-----
.../camel/tools/apt/SpringAnnotationProcessor.java | 12 +++---
.../camel/tools/apt/model/ComponentOption.java | 2 -
.../camel/tools/apt/model/EndpointOption.java | 2 -
.../apache/camel/tools/apt/model/EndpointPath.java | 2 -
.../tools/apt/EndpointOptionComparatorTest.java | 2 +-
.../maven/AbstractApiMethodGeneratorMojo.java | 4 +-
.../apache/camel/maven/DocumentGeneratorMojo.java | 34 +++++++--------
.../camel/maven/FileApiMethodGeneratorMojo.java | 2 +-
.../camel/maven/JavadocApiMethodGeneratorMojo.java | 6 +--
.../java/org/apache/camel/maven/JavadocParser.java | 4 +-
.../org/apache/camel/component/test/TestProxy.java | 2 +-
.../camel/maven/ApiComponentGeneratorMojoTest.java | 2 +-
343 files changed, 800 insertions(+), 904 deletions(-)
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.
[camel] 03/04: 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 bd73b0e7bbd9d8b0eb77aee5dbea9cc25dc51c02
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 14:39:58 2018 +0200
polish
---
.../cache/CacheEventListenerRegistry.java | 2 +-
.../camel/component/cache/CacheLoaderRegistry.java | 2 +-
.../cache/CacheConfigurationFileTest.java | 2 +-
.../camel/component/cache/CacheConsumerTest.java | 4 +--
.../cache/CacheBasedBodyReplacerTest.java | 2 +-
.../cache/CacheBasedTokenReplacerTest.java | 2 +-
.../cache/CacheBasedXPathElementReplacerTest.java | 2 +-
.../cassandra/ResultSetConversionStrategies.java | 2 +-
.../cassandra/CassandraAggregationRepository.java | 4 +--
.../cassandra/CassandraComponentProducerTest.java | 2 --
.../CassandraComponentProducerUnpreparedTest.java | 2 --
.../CassandraIdempotentRepositoryTest.java | 2 +-
.../NamedCassandraIdempotentRepositoryTest.java | 2 +-
.../apache/camel/component/cmis/CMISHelper.java | 4 +--
.../camel/component/cmis/CMISSessionFacade.java | 4 +--
.../camel/component/cmis/CMISTestSupport.java | 6 ++--
.../camel/component/cometd/CometdBinding.java | 2 +-
.../camel/component/cometd/CometdComponent.java | 6 ++--
.../camel/component/cometd/CometBindingTest.java | 2 +-
.../camel/component/cometd/CometdConsumerTest.java | 2 +-
...oducerConsumerInteractiveAuthenticatedMain.java | 2 +-
...tdProducerConsumerInteractiveExtensionMain.java | 2 +-
.../camel/component/consul/ConsulRegistryTest.java | 4 +--
.../component/context/LocalContextComponent.java | 2 +-
.../component/couchbase/CouchbaseEndpoint.java | 4 +--
.../component/couchdb/CouchDbComponentTest.java | 4 +--
.../crypt/EnvelopedDataEncryptorConfiguration.java | 4 +--
.../crypto/cms/sig/SignedDataCreator.java | 2 +-
.../cms/sig/SignedDataCreatorConfiguration.java | 2 +-
.../component/crypto/cms/EnvelopedDataTest.java | 2 +-
.../camel/component/crypto/cms/SignedDataTest.java | 2 +-
.../crypto/DefaultPGPSecretKeyAccessor.java | 6 ++--
.../camel/converter/crypto/PGPDataFormat.java | 2 +-
.../camel/converter/crypto/PGPDataFormatUtil.java | 6 ++--
.../converter/crypto/PGPKeyAccessDataFormat.java | 6 ++--
.../crypto/AbstractPGPDataFormatTest.java | 2 +-
.../converter/crypto/PGPDataFormatDynamicTest.java | 6 ++--
.../camel/converter/crypto/PGPDataFormatTest.java | 12 ++++----
.../apache/camel/dataformat/csv/CsvMarshaller.java | 4 +--
.../camel/dataformat/csv/CsvRecordConverters.java | 3 +-
.../camel/dataformat/csv/CsvUnmarshaller.java | 2 +-
.../CsvDataFormatCustomRecordConverterTest.java | 3 --
...svMarshalAutogenColumnsSpringQuoteModeTest.java | 6 ++--
.../csv/CsvMarshalAutogenColumnsSpringTest.java | 6 ++--
.../dataformat/csv/CsvMarshalCharsetTest.java | 2 +-
.../csv/CsvMarshalPipeDelimiterSpringTest.java | 6 ++--
.../csv/CsvMarshalPipeDelimiterTest.java | 6 ++--
.../apache/camel/dataformat/csv/CsvRouteTest.java | 10 +++----
.../cxf/common/header/CxfHeaderFilterStrategy.java | 2 +-
.../cxf/transport/CamelTransportFactory.java | 2 +-
.../blueprint/CamelTransportNameSpaceHandler.java | 2 +-
.../apache/camel/component/cxf/CxfConsumer.java | 2 +-
.../apache/camel/component/cxf/CxfEndpoint.java | 12 ++++----
.../org/apache/camel/component/cxf/CxfPayload.java | 2 +-
.../apache/camel/component/cxf/CxfProducer.java | 10 +++----
.../camel/component/cxf/DefaultCxfBinding.java | 20 ++++++-------
.../cxf/blueprint/CxfNamespaceHandler.java | 2 +-
.../component/cxf/converter/CachedCxfPayload.java | 6 ++--
.../cxf/converter/CxfPayloadConverter.java | 20 ++++++-------
.../component/cxf/cxfbean/CxfBeanComponent.java | 2 +-
.../component/cxf/cxfbean/CxfBeanEndpoint.java | 2 +-
.../cxf/feature/AbstractDataFormatFeature.java | 6 ++--
.../cxf/feature/CXFMessageDataFormatFeature.java | 4 +--
.../camel/component/cxf/jaxrs/CxfRsComponent.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsEndpoint.java | 6 ++--
.../camel/component/cxf/jaxrs/CxfRsProducer.java | 8 ++---
.../component/cxf/jaxrs/DataFormatProvider.java | 2 +-
.../component/cxf/jaxrs/SimpleCxfRsBinding.java | 8 ++---
.../spring/AbstractCxfBeanDefinitionParser.java | 2 +-
.../apache/camel/component/cxf/util/CxfUtils.java | 2 +-
.../component/cxf/AbstractCxfWsdlFirstTest.java | 14 ++++-----
...XFWsdlOnlyPayloadModeMultiPartNoSpringTest.java | 4 +--
.../cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java | 12 ++++----
.../camel/component/cxf/CXFWsdlOnlyTest.java | 20 ++++++-------
.../cxf/CxfConsumerPayLoadFaultMessageTest.java | 4 +--
.../CxfConsumerPayloadFaultCauseEnabledTest.java | 6 ++--
.../component/cxf/CxfConsumerPayloadFaultTest.java | 6 ++--
.../component/cxf/CxfConsumerPayloadTest.java | 4 +--
.../CxfConsumerPayloadXPathClientServerTest.java | 4 +--
.../component/cxf/CxfConsumerResponseTest.java | 2 +-
.../camel/component/cxf/CxfConsumerTest.java | 2 +-
.../component/cxf/CxfMessageHeaderTimeoutTest.java | 4 +--
.../component/cxf/CxfMixedModeRouterTest.java | 6 ++--
.../CxfPayLoadSoapHeaderViaCamelHeaderTest.java | 2 +-
.../component/cxf/CxfProducerContextTest.java | 8 ++---
.../component/cxf/CxfProducerOperationTest.java | 10 +++----
.../cxf/CxfProducerProtocalHeaderTest.java | 2 +-
.../camel/component/cxf/CxfProducerRouterTest.java | 4 +--
.../component/cxf/CxfProducerSoapActionTest.java | 2 +-
.../component/cxf/CxfProducerSoapFaultTest.java | 2 +-
.../camel/component/cxf/CxfProducerTest.java | 4 +--
.../apache/camel/component/cxf/CxfTimeoutTest.java | 2 +-
.../camel/component/cxf/DefaultCxfBindingTest.java | 22 +++++++-------
.../camel/component/cxf/FailOverFeatureTest.java | 2 +-
.../component/cxf/LoadDistributorFeatureTest.java | 2 +-
.../component/cxf/converter/ConverterTest.java | 4 +--
.../cxf/converter/CxfPayloadConverterTest.java | 10 +++----
.../camel/component/cxf/cxfbean/CxfBeanTest.java | 6 ++--
.../cxf/holder/CxfHolderConsumerTest.java | 6 ++--
.../component/cxf/jaxrs/CxfRsEndpointTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsProducerTest.java | 2 +-
.../cxf/jaxrs/DataFormatProviderTest.java | 12 ++++----
.../cxf/jaxrs/DefaultCxfRsBindingTest.java | 2 +-
.../CxfRsConsumerSimpleBindingTest.java | 2 +-
.../cxf/jaxrs/simplebinding/testbean/Order.java | 2 +-
.../cxf/jaxrs/testbean/CustomerService.java | 6 ++--
.../camel/component/cxf/jaxrs/testbean/Order.java | 2 +-
.../cxf/mtom/CxfJavaMtomProducerPayloadTest.java | 4 +--
.../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 10 +++----
.../component/cxf/mtom/CxfMtomConsumerTest.java | 4 +--
.../CxfMtomDisabledConsumerPayloadModeTest.java | 4 +--
.../CxfMtomDisabledProducerPayloadModeTest.java | 4 +--
.../cxf/mtom/CxfMtomPOJOProducerTest.java | 4 +--
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 6 ++--
.../cxf/mtom/CxfMtomRouterPayloadModeTest.java | 4 +--
.../component/cxf/multipart/CXFMultiPartTest.java | 4 +--
.../soap/headers/CxfMessageHeadersRelayTest.java | 34 +++++++++++-----------
.../cxf/soap/headers/HeaderTesterImpl.java | 2 +-
.../cxf/spring/CxfEndpointBeansRouterTest.java | 2 +-
.../camel/component/cxf/ssl/SslGlobalTest.java | 2 +-
.../apache/camel/component/cxf/ssl/SslTest.java | 2 +-
.../component/cxf/wssecurity/client/Client.java | 4 +--
.../cxf/wssecurity/client/UTPasswordCallback.java | 2 +-
.../cxf/wssecurity/server/UTPasswordCallback.java | 2 +-
124 files changed, 295 insertions(+), 303 deletions(-)
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java
index 1c5a848..95947b3 100644
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java
@@ -38,7 +38,7 @@ public class CacheEventListenerRegistry {
public synchronized List<CacheEventListener> getEventListeners() {
if (eventListeners == null) {
- eventListeners = new ArrayList<CacheEventListener>();
+ eventListeners = new ArrayList<>();
}
return eventListeners;
}
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java
index f2fa001..5cd3a2c 100644
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java
@@ -36,7 +36,7 @@ public class CacheLoaderRegistry {
public synchronized List<CacheLoaderWrapper> getCacheLoaders() {
if (registeredCacheLoaders == null) {
- registeredCacheLoaders = new ArrayList<CacheLoaderWrapper>();
+ registeredCacheLoaders = new ArrayList<>();
}
return registeredCacheLoaders;
}
diff --git a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java
index bac85ed..fc91ef5 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java
@@ -32,7 +32,7 @@ public class CacheConfigurationFileTest extends CamelTestSupport {
public void testConfigurationFile() throws Exception {
getMockEndpoint("mock:foo").expectedMessageCount(1);
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put(CacheConstants.CACHE_KEY, "myKey");
map.put(CacheConstants.CACHE_OPERATION, "ADD");
template.sendBodyAndHeaders("direct:start", "Hello World", map);
diff --git a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
index 8c83549..84ed707 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
@@ -43,7 +43,7 @@ public class CacheConsumerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(3);
- List<String> operations = new ArrayList<String>();
+ List<String> operations = new ArrayList<>();
operations.add(CacheConstants.CACHE_OPERATION_ADD);
operations.add(CacheConstants.CACHE_OPERATION_UPDATE);
operations.add(CacheConstants.CACHE_OPERATION_DELETE);
@@ -69,7 +69,7 @@ public class CacheConsumerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(3);
- List<String> operations = new ArrayList<String>();
+ List<String> operations = new ArrayList<>();
operations.add(CacheConstants.CACHE_OPERATION_ADD);
operations.add(CacheConstants.CACHE_OPERATION_UPDATE);
operations.add(CacheConstants.CACHE_OPERATION_DELETE);
diff --git a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
index ebd9c10..481f7ef 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
@@ -45,7 +45,7 @@ public class CacheBasedBodyReplacerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(1);
- List<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<>();
keys.add("farewell");
keys.add("greeting");
for (final String key : keys) {
diff --git a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
index 9d6c981..dfe671b 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
@@ -50,7 +50,7 @@ public class CacheBasedTokenReplacerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(1);
- List<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<>();
keys.add("novel");
keys.add("author");
keys.add("number");
diff --git a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
index 8882cb4..8960afa 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
@@ -56,7 +56,7 @@ public class CacheBasedXPathElementReplacerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(1);
- List<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<>();
keys.add("book1");
keys.add("book2");
keys.add("XML_FRAGMENT");
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java
index bda0234..eded894 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java
@@ -74,7 +74,7 @@ public final class ResultSetConversionStrategies {
@Override
public Object getBody(ResultSet resultSet) {
- List<Row> rows = new ArrayList<Row>(rowMax);
+ List<Row> rows = new ArrayList<>(rowMax);
int rowCount = 0;
Iterator<Row> rowIter = resultSet.iterator();
while (rowIter.hasNext() && rowCount < rowMax) {
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java
index 751b70d..8345cb1 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java
@@ -301,7 +301,7 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re
@Override
public Set<String> getKeys() {
List<Row> rows = selectKeyIds();
- Set<String> keys = new HashSet<String>(rows.size());
+ Set<String> keys = new HashSet<>(rows.size());
String keyColumnName = getKeyColumn();
for (Row row : rows) {
keys.add(row.getString(keyColumnName));
@@ -318,7 +318,7 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re
@Override
public Set<String> scan(CamelContext camelContext) {
List<Row> rows = selectKeyIds();
- Set<String> exchangeIds = new HashSet<String>(rows.size());
+ Set<String> exchangeIds = new HashSet<>(rows.size());
for (Row row : rows) {
exchangeIds.add(row.getString(exchangeIdColumn));
}
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
index de318f3..9afee87 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
@@ -110,7 +110,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest {
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
@@ -123,7 +122,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest {
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java
index 402d6d0..c7024fe 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java
@@ -83,7 +83,6 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
@@ -92,7 +91,6 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
index 5bd044f..78206ca 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
@@ -43,7 +43,7 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest {
if (canTest()) {
cluster = CassandraUnitUtils.cassandraCluster();
session = cluster.connect(CassandraUnitUtils.KEYSPACE);
- idempotentRepository = new CassandraIdempotentRepository<String>(session);
+ idempotentRepository = new CassandraIdempotentRepository<>(session);
idempotentRepository.start();
}
}
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
index d345025..4e53626 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
@@ -43,7 +43,7 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest {
if (canTest()) {
cluster = CassandraUnitUtils.cassandraCluster();
session = cluster.connect(CassandraUnitUtils.KEYSPACE);
- idempotentRepository = new NamedCassandraIdempotentRepository<String>(session, "ID");
+ idempotentRepository = new NamedCassandraIdempotentRepository<>(session, "ID");
idempotentRepository.setTable("NAMED_CAMEL_IDEMPOTENT");
idempotentRepository.start();
}
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java
index 6d6a7bb..882c455 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java
@@ -30,7 +30,7 @@ public final class CMISHelper {
}
public static Map<String, Object> filterCMISProperties(Map<String, Object> properties) {
- Map<String, Object> result = new HashMap<String, Object>(properties.size());
+ Map<String, Object> result = new HashMap<>(properties.size());
for (Map.Entry<String, Object> entry : properties.entrySet()) {
if (entry.getKey().startsWith("cmis:")) {
result.put(entry.getKey(), entry.getValue());
@@ -45,7 +45,7 @@ public final class CMISHelper {
}
public static Map<String, Object> propertyDataToMap(List<? extends PropertyData<?>> properties) {
- Map<String, Object> result = new HashMap<String, Object>();
+ Map<String, Object> result = new HashMap<>();
for (PropertyData<?> propertyData : properties) {
result.put(propertyData.getId(), propertyData.getFirstValue());
}
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 70dc73f..4bc0adc 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -72,7 +72,7 @@ public class CMISSessionFacade {
}
void initSession() {
- Map<String, String> parameter = new HashMap<String, String>();
+ Map<String, String> parameter = new HashMap<>();
parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
parameter.put(SessionParameter.ATOMPUB_URL, this.url);
parameter.put(SessionParameter.USER, this.username);
@@ -133,7 +133,7 @@ public class CMISSessionFacade {
//some duplication
public List<Map<String, Object>> retrieveResult(Boolean retrieveContent, Integer readSize,
ItemIterable<QueryResult> itemIterable) {
- List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> result = new ArrayList<>();
boolean queryForContent = retrieveContent != null ? retrieveContent : readContent;
int documentsToRead = readSize != null ? readSize : readCount;
int count = 0;
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
index 6ac0cce..7b1e934 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
@@ -95,7 +95,7 @@ public class CMISTestSupport extends CamelTestSupport {
protected Session createSession() {
SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
- Map<String, String> parameter = new HashMap<String, String>();
+ Map<String, String> parameter = new HashMap<>();
parameter.put(SessionParameter.ATOMPUB_URL, getUrl());
parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
@@ -128,7 +128,7 @@ public class CMISTestSupport extends CamelTestSupport {
}
protected Folder createChildFolderWithName(Folder parent, String childName) {
- Map<String, String> newFolderProps = new HashMap<String, String>();
+ Map<String, String> newFolderProps = new HashMap<>();
newFolderProps.put(PropertyIds.OBJECT_TYPE_ID, "cmis:folder");
newFolderProps.put(PropertyIds.NAME, childName);
return parent.createFolder(newFolderProps);
@@ -141,7 +141,7 @@ public class CMISTestSupport extends CamelTestSupport {
ContentStream contentStream = createSession().getObjectFactory()
.createContentStream(fileName, buf.length, "text/plain; charset=UTF-8", input);
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:document");
properties.put(PropertyIds.NAME, fileName);
newFolder.createDocument(properties, contentStream, VersioningState.NONE);
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java
index 5600490..2e8aeb7 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java
@@ -121,7 +121,7 @@ public class CometdBinding {
//TODO: do something in the style of JMS where they have header Strategies?
private Object filterHeaders(Map<String, Object> headers) {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
for (Entry<String, Object> entry : headers.entrySet()) {
if (entry != null && entry.getKey() != null) {
map.put(entry.getKey(), entry.getValue());
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index b92611c..474d70b 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
public class CometdComponent extends UriEndpointComponent implements SSLContextParametersAware {
private static final Logger LOG = LoggerFactory.getLogger(CometdComponent.class);
- private final Map<String, ConnectorRef> connectors = new LinkedHashMap<String, ConnectorRef>();
+ private final Map<String, ConnectorRef> connectors = new LinkedHashMap<>();
private List<BayeuxServer.BayeuxServerListener> serverListeners;
@@ -305,14 +305,14 @@ public class CometdComponent extends UriEndpointComponent implements SSLContextP
public void addExtension(BayeuxServer.Extension extension) {
if (extensions == null) {
- extensions = new ArrayList<BayeuxServer.Extension>();
+ extensions = new ArrayList<>();
}
extensions.add(extension);
}
public void addServerListener(BayeuxServer.BayeuxServerListener serverListener) {
if (serverListeners == null) {
- serverListeners = new ArrayList<BayeuxServer.BayeuxServerListener>();
+ serverListeners = new ArrayList<>();
}
serverListeners.add(serverListener);
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
index a382b02..141617d 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
@@ -64,7 +64,7 @@ public class CometBindingTest {
public void before() {
testObj = new CometdBinding(bayeux);
- Set<String> attributeNames = new HashSet<String>(Arrays.asList(STRING_ATTR_NAME, INTEGER_ATTR_NAME,
+ Set<String> attributeNames = new HashSet<>(Arrays.asList(STRING_ATTR_NAME, INTEGER_ATTR_NAME,
LONG_ATTR_NAME, DOUBLE_ATTR_NAME,
FOO_ATTR_NAME, BOOLEAN_ATT_NAME));
when(remote.getAttributeNames()).thenReturn(attributeNames);
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
index 85ca8ab..5035678 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
@@ -68,7 +68,7 @@ public class CometdConsumerTest {
testObj = new CometdConsumer(endpoint, processor);
testObj.setBayeux(bayeuxServerImpl);
- Set<String> attributeNames = new HashSet<String>();
+ Set<String> attributeNames = new HashSet<>();
String attributeKey = USER_NAME;
attributeNames.add(attributeKey);
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
index 46d0b97..b23e21a 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
@@ -129,7 +129,7 @@ public class CometdProducerConsumerInteractiveAuthenticatedMain {
advice.put(Message.RECONNECT_FIELD, Message.RECONNECT_HANDSHAKE_VALUE);
Map<String, Object> ext = message.getExt(true);
- Map<String, Object> authentication = new HashMap<String, Object>();
+ Map<String, Object> authentication = new HashMap<>();
ext.put("authentication", authentication);
authentication.put("failed", true);
authentication.put("failureReason", "invalid_credentials");
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
index bbd58c9..dacc410 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
@@ -75,7 +75,7 @@ public class CometdProducerConsumerInteractiveExtensionMain {
public static final class Censor implements BayeuxServer.Extension, ServerSession.RemoveListener {
- private HashSet<String> forbidden = new HashSet<String>(Arrays.asList("one", "two"));
+ private HashSet<String> forbidden = new HashSet<>(Arrays.asList("one", "two"));
public void removed(ServerSession session, boolean timeout) {
// called on remove of client
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
index ded99ee..4cd215f 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
@@ -119,7 +119,7 @@ public class ConsulRegistryTest implements Serializable {
.findByTypeWithName(consulTestClassOne.getClass());
registry.remove("testClassOne");
registry.remove("testClassTwo");
- HashMap<String, ConsulTestClass> emptyHashMap = new HashMap<String, ConsulTestClass>();
+ HashMap<String, ConsulTestClass> emptyHashMap = new HashMap<>();
assertNotNull(consulTestClassMap);
assertEquals(consulTestClassMap.getClass(), emptyHashMap.getClass());
assertEquals(2, consulTestClassMap.size());
@@ -146,7 +146,7 @@ public class ConsulRegistryTest implements Serializable {
registry.put("classTwo", classTwo);
Set<? extends ConsulTestClass> results = registry.findByType(classOne.getClass());
assertNotNull(results);
- HashSet<ConsulTestClass> hashSet = new HashSet<ConsulTestClass>();
+ HashSet<ConsulTestClass> hashSet = new HashSet<>();
registry.remove("classOne");
registry.remove("classTwo");
assertEquals(results.getClass(), hashSet.getClass());
diff --git a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
index 2a930f6..b4c434f 100644
--- a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
+++ b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
@@ -38,7 +38,7 @@ public class LocalContextComponent extends DefaultComponent {
private CamelContext localCamelContext;
@Metadata(label = "advanced", defaultValue = "direct,seda,mock")
- private List<String> localProtocolSchemes = new ArrayList<String>(Arrays.asList("direct", "seda", "mock"));
+ private List<String> localProtocolSchemes = new ArrayList<>(Arrays.asList("direct", "seda", "mock"));
public LocalContextComponent(CamelContext localCamelContext) {
ObjectHelper.notNull(localCamelContext, "localCamelContext");
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
index 563c405..fd12ca6 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
@@ -545,10 +545,10 @@ public class CouchbaseEndpoint extends ScheduledPollEndpoint {
hosts[i] = hosts[i].trim();
}
- List<String> hostList = new ArrayList<String>();
+ List<String> hostList = new ArrayList<>();
hostList.add(hostname);
hostList.addAll(Arrays.asList(hosts));
- Set<String> hostSet = new LinkedHashSet<String>(hostList);
+ Set<String> hostSet = new LinkedHashSet<>(hostList);
hosts = hostSet.toArray(new String[hostSet.size()]);
URI[] uriArray = new URI[hosts.length];
diff --git a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
index 887cefc..9e99820 100644
--- a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
+++ b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
@@ -39,7 +39,7 @@ public class CouchDbComponentTest {
@Test
public void testEndpointCreated() throws Exception {
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
String uri = "couchdb:http://localhost:5984/db";
String remaining = "http://localhost:5984/db";
@@ -50,7 +50,7 @@ public class CouchDbComponentTest {
@Test
public void testPropertiesSet() throws Exception {
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
params.put("createDatabase", true);
params.put("username", "coldplay");
params.put("password", "chrism");
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
index 50f3fc8..0418e3f 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
@@ -54,7 +54,7 @@ public class EnvelopedDataEncryptorConfiguration extends CryptoCmsMarshallerConf
private static final Logger LOG = LoggerFactory.getLogger(EnvelopedDataEncryptorConfiguration.class);
- private static final Map<String, List<Integer>> SUPPORTED_ENCRYPTION_ALGORITHMS = new HashMap<String, List<Integer>>(7);
+ private static final Map<String, List<Integer>> SUPPORTED_ENCRYPTION_ALGORITHMS = new HashMap<>(7);
static {
@@ -74,7 +74,7 @@ public class EnvelopedDataEncryptorConfiguration extends CryptoCmsMarshallerConf
}
@UriParam(label = "encrypt", multiValue = true, description = "Recipient Info: reference to a bean which implements the interface org.apache.camel.component.crypto.cms.api.TransRecipientInfo")
- private final List<RecipientInfo> recipient = new ArrayList<RecipientInfo>(3);
+ private final List<RecipientInfo> recipient = new ArrayList<>(3);
@UriParam(label = "encrypt", enums = "AES/CBC/PKCS5Padding,DESede/CBC/PKCS5Padding,Camellia/CBC/PKCS5Padding,CAST5/CBC/PKCS5Padding")
private String contentEncryptionAlgorithm;
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
index 1369551..50a4913 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
@@ -105,7 +105,7 @@ public class SignedDataCreator extends CryptoCmsMarshallerAbstract {
gen.addSignerInfoGenerator(signerBuilder.build(contentSigner, signerCert));
- List<Certificate> certificateList = new ArrayList<Certificate>();
+ List<Certificate> certificateList = new ArrayList<>();
for (Certificate cert : signer.getCertificateChain(exchange)) {
if (!certificateList.contains(cert)) {
certificateList.add(cert);
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java
index 354aede..572ffab 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java
@@ -36,7 +36,7 @@ public class SignedDataCreatorConfiguration extends CryptoCmsMarshallerConfigura
private Boolean includeContent = Boolean.TRUE;
@UriParam(label = "sign", multiValue = true, description = "Signer information: reference to a bean which implements org.apache.camel.component.crypto.cms.api.SignerInfo")
- private final List<SignerInfo> signer = new ArrayList<SignerInfo>(3);
+ private final List<SignerInfo> signer = new ArrayList<>(3);
public SignedDataCreatorConfiguration(CamelContext context) {
super(context);
diff --git a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java
index 49579bd..90545da 100644
--- a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java
+++ b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java
@@ -384,7 +384,7 @@ public class EnvelopedDataTest {
throws UnsupportedEncodingException, Exception {
KeyStoreParameters keystorePas = KeystoreUtil.getKeyStoreParameters(keystoreName);
- List<RecipientInfo> recipients = new ArrayList<RecipientInfo>(aliases.length);
+ List<RecipientInfo> recipients = new ArrayList<>(aliases.length);
for (String alias : aliases) {
DefaultKeyTransRecipientInfo recipient = new DefaultKeyTransRecipientInfo();
recipient.setCertificateAlias(alias);
diff --git a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java
index 9d4b448..30a3f78 100644
--- a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java
+++ b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java
@@ -112,7 +112,7 @@ public class SignedDataTest {
throws UnsupportedEncodingException, Exception {
KeyStoreParameters keystore = KeystoreUtil.getKeyStoreParameters(keystoreName);
- List<SignerInfo> signers = new ArrayList<SignerInfo>(aliases.length);
+ List<SignerInfo> signers = new ArrayList<>(aliases.length);
for (String alias : aliases) {
DefaultSignerInfo signerInfo = new DefaultSignerInfo();
signerInfo.setIncludeCertificates(includeCertificates); // without
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
index cd1e14a..82d9c83 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
@@ -39,10 +39,10 @@ import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
*/
public class DefaultPGPSecretKeyAccessor implements PGPSecretKeyAccessor {
- private final Map<String, List<PGPSecretKeyAndPrivateKeyAndUserId>> userIdPart2SecretKeyList = new HashMap<String, List<PGPSecretKeyAndPrivateKeyAndUserId>>(
+ private final Map<String, List<PGPSecretKeyAndPrivateKeyAndUserId>> userIdPart2SecretKeyList = new HashMap<>(
3);
- private final Map<Long, PGPPrivateKey> keyId2PrivateKey = new HashMap<Long, PGPPrivateKey>(3);
+ private final Map<Long, PGPPrivateKey> keyId2PrivateKey = new HashMap<>(3);
private final PGPSecretKeyRingCollection pgpSecretKeyring;
@@ -74,7 +74,7 @@ public class DefaultPGPSecretKeyAccessor implements PGPSecretKeyAccessor {
@Override
public List<PGPSecretKeyAndPrivateKeyAndUserId> getSignerKeys(Exchange exchange, List<String> useridParts) throws Exception {
- List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<PGPSecretKeyAndPrivateKeyAndUserId>(3);
+ List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<>(3);
for (String useridPart : useridParts) {
List<PGPSecretKeyAndPrivateKeyAndUserId> partResult = userIdPart2SecretKeyList.get(useridPart);
if (partResult == null) {
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
index 5b7521b..6819440 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
@@ -123,7 +123,7 @@ public class PGPDataFormat extends PGPKeyAccessDataFormat implements PGPPublicKe
public Map<String, String> determineSignatureKeyUserId2Password(List<String> sigKeyUserids, String sigKeyPassword) {
// we want to keep the order of the entries, therefore we use LinkedHashMap
- Map<String, String> sigKeyUserId2Password = new LinkedHashMap<String, String>(sigKeyUserids.size());
+ Map<String, String> sigKeyUserId2Password = new LinkedHashMap<>(sigKeyUserids.size());
for (String sigKeyUserid : sigKeyUserids) {
if (sigKeyPassword == null) {
sigKeyPassword = passphraseAccessor.getPassphrase(sigKeyUserid);
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
index a46156e..822ca4d 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
@@ -208,7 +208,7 @@ public final class PGPDataFormatUtil {
}
public static List<PGPPublicKey> findPublicKeys(List<String> useridParts, boolean forEncryption, PGPPublicKeyRingCollection pgpPublicKeyringCollection) {
- List<PGPPublicKey> result = new ArrayList<PGPPublicKey>(useridParts.size());
+ List<PGPPublicKey> result = new ArrayList<>(useridParts.size());
for (Iterator<PGPPublicKeyRing> keyRingIter = pgpPublicKeyringCollection.getKeyRings(); keyRingIter.hasNext();) {
PGPPublicKeyRing keyRing = keyRingIter.next();
PGPPublicKey primaryKey = keyRing.getPublicKey();
@@ -405,13 +405,13 @@ public final class PGPDataFormatUtil {
public static List<PGPSecretKeyAndPrivateKeyAndUserId> findSecretKeysWithPrivateKeyAndUserId(Map<String, String> sigKeyUserId2Password,
String provider, PGPSecretKeyRingCollection pgpSec) throws PGPException {
- List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<PGPSecretKeyAndPrivateKeyAndUserId>(sigKeyUserId2Password.size());
+ List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<>(sigKeyUserId2Password.size());
for (Iterator<?> i = pgpSec.getKeyRings(); i.hasNext();) {
Object data = i.next();
if (data instanceof PGPSecretKeyRing) {
PGPSecretKeyRing keyring = (PGPSecretKeyRing) data;
PGPSecretKey primaryKey = keyring.getSecretKey();
- List<String> useridParts = new ArrayList<String>(sigKeyUserId2Password.keySet());
+ List<String> useridParts = new ArrayList<>(sigKeyUserId2Password.keySet());
String[] foundKeyUserIdForUserIdPart = findFirstKeyUserIdContainingOneOfTheParts(useridParts, primaryKey.getPublicKey());
if (foundKeyUserIdForUserIdPart == null) {
LOG.debug("No User ID found in primary key with key ID {} containing one of the parts {}", primaryKey.getKeyID(),
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
index d3e17ad..76f495c 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
@@ -291,7 +291,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
if (userids == null || userids.isEmpty()) {
result = Collections.singletonList(userid);
} else {
- result = new ArrayList<String>(userids.size() + 1);
+ result = new ArrayList<>(userids.size() + 1);
result.add(userid);
result.addAll(userids);
}
@@ -313,7 +313,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
if (userids == null || userids.isEmpty()) {
result = Collections.singletonList(userid);
} else {
- result = new ArrayList<String>(userids.size() + 1);
+ result = new ArrayList<>(userids.size() + 1);
result.add(userid);
result.addAll(userids);
}
@@ -339,7 +339,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
exchange.getOut().setHeader(NUMBER_OF_SIGNING_KEYS, Integer.valueOf(sigSecretKeysWithPrivateKeyAndUserId.size()));
- List<PGPSignatureGenerator> sigGens = new ArrayList<PGPSignatureGenerator>();
+ List<PGPSignatureGenerator> sigGens = new ArrayList<>();
for (PGPSecretKeyAndPrivateKeyAndUserId sigSecretKeyWithPrivateKeyAndUserId : sigSecretKeysWithPrivateKeyAndUserId) {
PGPPrivateKey sigPrivateKey = sigSecretKeyWithPrivateKeyAndUserId.getPrivateKey();
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
index e941ce7..28eb552 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
@@ -41,7 +41,7 @@ public abstract class AbstractPGPDataFormatTest extends CamelTestSupport {
}
protected Map<String, Object> getHeaders() {
- return new HashMap<String, Object>();
+ return new HashMap<>();
}
protected void assertMocksSatisfied(MockEndpoint encrypted, MockEndpoint unencrypted, String payload) throws Exception {
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
index 0489086..d42a273 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
@@ -36,7 +36,7 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
// setup a wrong userids
@Override
protected List<String> getKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("wrong1");
userids.add(getKeyUserId());
return userids;
@@ -45,7 +45,7 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
// setup a wrong signature userids
@Override
protected List<String> getSignatureKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("wrong1");
userids.add(getKeyUserId());
return userids;
@@ -77,7 +77,7 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
// override wrong userid and password with correct userid and password in the headers
protected Map<String, Object> getHeaders() {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(PGPKeyAccessDataFormat.KEY_USERID, "sdude@nowhere.net");
headers.put(PGPKeyAccessDataFormat.KEY_USERIDS, Collections.singletonList("second"));
headers.put(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID, "sdude@nowhere.net");
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
index 565496b..304f467 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
@@ -109,14 +109,14 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
}
protected List<String> getKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("second");
userids.add(getKeyUserId());
return userids;
}
protected List<String> getSignatureKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("second");
userids.add(getKeyUserId());
return userids;
@@ -206,7 +206,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint exception = setupExpectations(context, 1, "mock:exception");
String payload = "Hi Alice, Be careful Eve is listening, signed Bob";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
// add signature user id which does not have a passphrase
headers.put(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID, "userIDWithNoPassphrase");
// the following entry is necessary for the dynamic test
@@ -614,12 +614,12 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
pgpSignAndEncryptSeveralSignerKeys.setEncryptionKeyRing(getPublicKeyRing());
pgpSignAndEncryptSeveralSignerKeys.setSignatureKeyRing(getSecKeyRing());
- List<String> signerUserIds = new ArrayList<String>();
+ List<String> signerUserIds = new ArrayList<>();
signerUserIds.add("Third (comment third) <em...@third.com>");
signerUserIds.add("Second <em...@second.com>");
pgpSignAndEncryptSeveralSignerKeys.setSignatureKeyUserids(signerUserIds);
- Map<String, String> userId2Passphrase = new HashMap<String, String>();
+ Map<String, String> userId2Passphrase = new HashMap<>();
userId2Passphrase.put("Third (comment third) <em...@third.com>", "sdude");
userId2Passphrase.put("Second <em...@second.com>", "sdude");
PGPPassphraseAccessor passphraseAccessorSeveralKeys = new DefaultPGPPassphraseAccessor(userId2Passphrase);
@@ -631,7 +631,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
pgpVerifyAndDecryptSeveralSignerKeys.setSignatureKeyRing(getPublicKeyRing());
pgpVerifyAndDecryptSeveralSignerKeys.setProvider(getProvider());
// only specify one expected signature
- List<String> expectedSigUserIds = new ArrayList<String>();
+ List<String> expectedSigUserIds = new ArrayList<>();
expectedSigUserIds.add("Second <em...@second.com>");
pgpVerifyAndDecryptSeveralSignerKeys.setSignatureKeyUserids(expectedSigUserIds);
from("direct:several-signer-keys").streamCaching().marshal(pgpSignAndEncryptSeveralSignerKeys).to("mock:encrypted")
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index 2d80616..6e6124b 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -117,7 +117,7 @@ abstract class CsvMarshaller {
@Override
protected Iterable<?> getMapRecordValues(Map<?, ?> map) {
- List<Object> result = new ArrayList<Object>(fixedColumns.length);
+ List<Object> result = new ArrayList<>(fixedColumns.length);
for (String key : fixedColumns) {
result.add(map.get(key));
}
@@ -135,7 +135,7 @@ abstract class CsvMarshaller {
@Override
protected Iterable<?> getMapRecordValues(Map<?, ?> map) {
- List<Object> result = new ArrayList<Object>(map.size());
+ List<Object> result = new ArrayList<>(map.size());
for (Object key : map.keySet()) {
result.add(map.get(key));
}
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java
index 4884cbc..0d94f38 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java
@@ -18,7 +18,6 @@ package org.apache.camel.dataformat.csv;
import java.lang.reflect.Field;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -49,7 +48,7 @@ final class CsvRecordConverters {
@Override
public List<String> convertRecord(CSVRecord record) {
- List<String> answer = new ArrayList<String>(record.size());
+ List<String> answer = new ArrayList<>(record.size());
for (int i = 0; i < record.size(); i++) {
answer.add(record.get(i));
}
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
index 9bde056..7fe5a98 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
@@ -101,7 +101,7 @@ abstract class CsvUnmarshaller {
}
private <T> List<T> asList(Iterator<CSVRecord> iterator, CsvRecordConverter<T> converter) {
- List<T> answer = new ArrayList<T>();
+ List<T> answer = new ArrayList<>();
while (iterator.hasNext()) {
answer.add(converter.convertRecord(iterator.next()));
}
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java
index b08ace4..9a092aa 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.csv;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -28,8 +27,6 @@ import org.apache.camel.util.CastUtils;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.Assert.*;
-
/**
* Test cases for {@link CsvRecordConverter}.
*/
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
index 290c20d..7cfa5f2 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
@@ -71,15 +71,15 @@ public class CsvMarshalAutogenColumnsSpringQuoteModeTest extends CamelSpringTest
}
private static List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
index 4b4b6a3..5d0e367 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
@@ -70,15 +70,15 @@ public class CsvMarshalAutogenColumnsSpringTest extends CamelSpringTestSupport {
}
private static List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
index 46684a5..fac5f2f 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
@@ -34,7 +34,7 @@ public class CsvMarshalCharsetTest extends CamelTestSupport {
MockEndpoint endpoint = getMockEndpoint("mock:daltons");
endpoint.expectedMessageCount(1);
- List<List<String>> data = new ArrayList<List<String>>();
+ List<List<String>> data = new ArrayList<>();
data.add(0, new ArrayList<String>());
data.get(0).add(0, "L\u00fccky Luke");
Exchange in = createExchangeWithBody(data);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
index 1442f82..ac4df06 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
@@ -51,15 +51,15 @@ public class CsvMarshalPipeDelimiterSpringTest extends CamelSpringTestSupport {
}
private List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
index f117f79..46c09f0 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
@@ -48,15 +48,15 @@ public class CsvMarshalPipeDelimiterTest extends CamelTestSupport {
}
private List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
index 6dffc09..f17447d 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
@@ -39,7 +39,7 @@ public class CsvRouteTest extends CamelTestSupport {
resultEndpoint.expectedMessageCount(1);
// START SNIPPET: marshalInput
- Map<String, Object> body = new LinkedHashMap<String, Object>();
+ Map<String, Object> body = new LinkedHashMap<>();
body.put("foo", "abc");
body.put("bar", 123);
// END SNIPPET: marshalInput
@@ -66,11 +66,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMulti",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
@@ -107,11 +107,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMultiCustom",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
index 6d4edd0..acede34 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
@@ -94,7 +94,7 @@ public class CxfHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
setLowerCase(true);
// initialize message header filter map with default SOAP filter
- messageHeaderFiltersMap = new HashMap<String, MessageHeaderFilter>();
+ messageHeaderFiltersMap = new HashMap<>();
addToMessageHeaderFilterMap(new SoapMessageHeaderFilter());
// filter headers begin with "Camel" or "org.apache.camel"
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
index 5b38b45..3f30361 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
@@ -47,7 +47,7 @@ public class CamelTransportFactory extends AbstractTransportFactory implements C
public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/camel";
public static final List<String> DEFAULT_NAMESPACES = Arrays.asList(TRANSPORT_ID);
- private static final Set<String> URI_PREFIXES = new HashSet<String>();
+ private static final Set<String> URI_PREFIXES = new HashSet<>();
private HeaderFilterStrategy headerFilterStrategy;
private boolean checkException;
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
index 72672f2..f5688f9 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
@@ -42,7 +42,7 @@ public class CamelTransportNameSpaceHandler extends BaseNamespaceHandler {
@SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses() {
- return new HashSet<Class>(Arrays.asList(CamelTransportNameSpaceHandler.class));
+ return new HashSet<>(Arrays.asList(CamelTransportNameSpaceHandler.class));
}
public URL getSchemaLocation(String s) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index 7dd3f4c..ef5b4ec 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -315,7 +315,7 @@ public class CxfConsumer extends DefaultConsumer {
// bind the CXF request into a Camel exchange
binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange);
// extract the javax.xml.ws header
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
binding.extractJaxWsContext(cxfExchange, context);
// put the context into camelExchange
camelExchange.setProperty(CxfConstants.JAXWS_CONTEXT, context);
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 5a80cb1..372f672 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -133,11 +133,11 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
private BindingConfiguration bindingConfig;
private DataBinding dataBinding;
private Object serviceFactoryBean;
- private List<Interceptor<? extends Message>> in = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> out = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> outFault = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> inFault = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Feature> features = new ModCountCopyOnWriteArrayList<Feature>();
+ private List<Interceptor<? extends Message>> in = new ModCountCopyOnWriteArrayList<>();
+ private List<Interceptor<? extends Message>> out = new ModCountCopyOnWriteArrayList<>();
+ private List<Interceptor<? extends Message>> outFault = new ModCountCopyOnWriteArrayList<>();
+ private List<Interceptor<? extends Message>> inFault = new ModCountCopyOnWriteArrayList<>();
+ private List<Feature> features = new ModCountCopyOnWriteArrayList<>();
private List<Handler> handlers;
private List<String> schemaLocations;
private String transportId;
@@ -445,7 +445,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
Method m = factoryBean.getClass().getMethod("getServiceFactory");
JaxWsServiceFactoryBean sf = (JaxWsServiceFactoryBean)m.invoke(factoryBean);
@SuppressWarnings("rawtypes")
- List<Handler> chain = new ArrayList<Handler>(handlers);
+ List<Handler> chain = new ArrayList<>(handlers);
chain.addAll(builder.buildHandlerChainFromClass(sf.getServiceClass(),
sf.getEndpointInfo().getName(),
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
index 40c4be2..6f8ade4 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
@@ -51,7 +51,7 @@ public class CxfPayload<T> {
}
public CxfPayload(List<T> headers, List<Element> body) {
this.headers = headers;
- this.body = new ArrayList<Source>(body.size());
+ this.body = new ArrayList<>(body.size());
for (Element el : body) {
this.body.add(new DOMSource(el));
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
index cf0e37b..eef9047 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
@@ -123,8 +123,8 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor {
// prepare binding operation info
BindingOperationInfo boi = prepareBindingOperation(camelExchange, cxfExchange);
- Map<String, Object> invocationContext = new HashMap<String, Object>();
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> invocationContext = new HashMap<>();
+ Map<String, Object> responseContext = new HashMap<>();
invocationContext.put(Client.RESPONSE_CONTEXT, responseContext);
invocationContext.put(Client.REQUEST_CONTEXT, prepareRequest(camelExchange, cxfExchange));
@@ -160,8 +160,8 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor {
// prepare binding operation info
BindingOperationInfo boi = prepareBindingOperation(camelExchange, cxfExchange);
- Map<String, Object> invocationContext = new HashMap<String, Object>();
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> invocationContext = new HashMap<>();
+ Map<String, Object> responseContext = new HashMap<>();
invocationContext.put(Client.RESPONSE_CONTEXT, responseContext);
invocationContext.put(Client.REQUEST_CONTEXT, prepareRequest(camelExchange, cxfExchange));
@@ -229,7 +229,7 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor {
Map<String, List<String>> transportHeaders = CastUtils.cast((Map<?, ?>)requestContext.get(Message.PROTOCOL_HEADERS));
boolean added;
if (transportHeaders == null) {
- transportHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ transportHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
added = true;
} else {
added = false;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 088ee71..75188b2 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -135,7 +135,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
if (!DataFormat.CXF_MESSAGE.equals(dataFormat)) {
for (Map.Entry<String, org.apache.camel.Attachment> entry : camelExchange.getIn().getAttachmentObjects().entrySet()) {
if (attachments == null) {
- attachments = new HashSet<Attachment>();
+ attachments = new HashSet<>();
}
AttachmentImpl attachment = new AttachmentImpl(entry.getKey());
org.apache.camel.Attachment camelAttachment = entry.getValue();
@@ -326,7 +326,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
}
// create response context
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> responseContext = new HashMap<>();
org.apache.camel.Message response;
if (camelExchange.getPattern().isOutCapable()) {
@@ -414,7 +414,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
boolean isXop = Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class));
for (Map.Entry<String, org.apache.camel.Attachment> entry : camelExchange.getOut().getAttachmentObjects().entrySet()) {
if (attachments == null) {
- attachments = new HashSet<Attachment>();
+ attachments = new HashSet<>();
}
AttachmentImpl attachment = new AttachmentImpl(entry.getKey());
org.apache.camel.Attachment camelAttachment = entry.getValue();
@@ -662,7 +662,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
// get cxf transport headers (if any) from camel exchange
// use a treemap to keep ordering and ignore key case
- Map<String, List<String>> transportHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> transportHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
if (camelExchange != null) {
Map<String, List<String>> h = CastUtils.cast((Map<?, ?>)camelExchange.getProperty(Message.PROTOCOL_HEADERS));
if (h != null) {
@@ -693,7 +693,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
// need to filter the User-Agent ignore the case, as CXF just check the header with "User-Agent"
if (entry.getKey().equalsIgnoreCase("User-Agent")) {
- List<String> listValue = new ArrayList<String>();
+ List<String> listValue = new ArrayList<>();
listValue.add(entry.getValue().toString());
transportHeaders.put("User-Agent", listValue);
}
@@ -723,7 +723,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
if (entry.getValue() instanceof List) {
transportHeaders.put(entry.getKey(), (List<String>)entry.getValue());
} else {
- List<String> listValue = new ArrayList<String>();
+ List<String> listValue = new ArrayList<>();
listValue.add(entry.getValue().toString());
transportHeaders.put(entry.getKey(), listValue);
}
@@ -766,8 +766,8 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
}
} else if (dataFormat == DataFormat.PAYLOAD) {
List<SoapHeader> headers = CastUtils.cast((List<?>)message.get(Header.HEADER_LIST));
- Map<String, String> nsMap = new HashMap<String, String>();
- answer = new CxfPayload<SoapHeader>(headers, getPayloadBodyElements(message, nsMap), nsMap);
+ Map<String, String> nsMap = new HashMap<>();
+ answer = new CxfPayload<>(headers, getPayloadBodyElements(message, nsMap), nsMap);
} else if (dataFormat.dealias() == DataFormat.RAW) {
answer = message.getContent(InputStream.class);
@@ -835,7 +835,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
}
MessageContentsList inObjects = MessageContentsList.getContentsList(message);
if (inObjects == null) {
- return new ArrayList<Source>(0);
+ return new ArrayList<>(0);
}
org.apache.cxf.message.Exchange exchange = message.getExchange();
BindingOperationInfo boi = exchange.getBindingOperationInfo();
@@ -857,7 +857,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
partInfos = op.getInput().getMessageParts();
}
- List<Source> answer = new ArrayList<Source>();
+ List<Source> answer = new ArrayList<>();
for (MessagePartInfo partInfo : partInfos) {
if (!inObjects.hasValue(partInfo)) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
index 89dee36..fbbec0c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
@@ -46,7 +46,7 @@ public class CxfNamespaceHandler extends BaseNamespaceHandler {
@SuppressWarnings({"rawtypes"})
public Set<Class> getManagedClasses() {
- return new HashSet<Class>(Arrays.asList(CxfNamespaceHandler.class));
+ return new HashSet<>(Arrays.asList(CxfNamespaceHandler.class));
}
public Metadata parse(Element element, ParserContext context) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index 5ea6dca..d82fcac 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -44,7 +44,7 @@ public class CachedCxfPayload<T> extends CxfPayload<T> implements StreamCache {
private static final Logger LOG = LoggerFactory.getLogger(CachedCxfPayload.class);
public CachedCxfPayload(CxfPayload<T> orig, Exchange exchange, XmlConverter xml) {
- super(orig.getHeaders(), new ArrayList<Source>(orig.getBodySources()), orig.getNsMap());
+ super(orig.getHeaders(), new ArrayList<>(orig.getBodySources()), orig.getNsMap());
ListIterator<Source> li = getBodySources().listIterator();
while (li.hasNext()) {
Source source = li.next();
@@ -95,7 +95,7 @@ public class CachedCxfPayload<T> extends CxfPayload<T> implements StreamCache {
}
private CachedCxfPayload(CachedCxfPayload<T> orig, Exchange exchange) throws IOException {
- super(orig.getHeaders(), new ArrayList<Source>(orig.getBodySources()), orig.getNsMap());
+ super(orig.getHeaders(), new ArrayList<>(orig.getBodySources()), orig.getNsMap());
ListIterator<Source> li = getBodySources().listIterator();
while (li.hasNext()) {
Source source = li.next();
@@ -150,6 +150,6 @@ public class CachedCxfPayload<T> extends CxfPayload<T> implements StreamCache {
@Override
public StreamCache copy(Exchange exchange) throws IOException {
- return new CachedCxfPayload<T>(this, exchange);
+ return new CachedCxfPayload<>(this, exchange);
}
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index 29d3c10..65e911e 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -60,16 +60,16 @@ public final class CxfPayloadConverter {
@Converter
public static <T> CxfPayload<T> elementToCxfPayload(Element element, Exchange exchange) {
- List<T> headers = new ArrayList<T>();
- List<Element> body = new ArrayList<Element>();
+ List<T> headers = new ArrayList<>();
+ List<Element> body = new ArrayList<>();
body.add(element);
- return new CxfPayload<T>(headers, body);
+ return new CxfPayload<>(headers, body);
}
@Converter
public static <T> CxfPayload<T> nodeListToCxfPayload(NodeList nodeList, Exchange exchange) {
- List<T> headers = new ArrayList<T>();
- List<Element> body = new ArrayList<Element>();
+ List<T> headers = new ArrayList<>();
+ List<Element> body = new ArrayList<>();
for (int i = 0; i < nodeList.getLength(); i++) {
Node node = nodeList.item(i);
// add all nodes to the body that are elements
@@ -77,15 +77,15 @@ public final class CxfPayloadConverter {
body.add((Element) node);
}
}
- return new CxfPayload<T>(headers, body);
+ return new CxfPayload<>(headers, body);
}
@Converter
public static <T> CxfPayload<T> sourceToCxfPayload(Source src, Exchange exchange) {
- List<T> headers = new ArrayList<T>();
- List<Source> body = new ArrayList<Source>();
+ List<T> headers = new ArrayList<>();
+ List<Source> body = new ArrayList<>();
body.add(src);
- return new CxfPayload<T>(headers, body, null);
+ return new CxfPayload<>(headers, body, null);
}
@Converter
@@ -115,7 +115,7 @@ public final class CxfPayloadConverter {
@Converter
public static <T> StreamCache cxfPayLoadToStreamCache(CxfPayload<T> payload, Exchange exchange) {
- return new CachedCxfPayload<T>(payload, exchange, xml);
+ return new CachedCxfPayload<>(payload, exchange, xml);
}
@SuppressWarnings("unchecked")
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
index 67ac0b7..92974d9 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
@@ -33,7 +33,7 @@ import org.apache.camel.impl.HeaderFilterStrategyComponent;
@Deprecated
public class CxfBeanComponent extends HeaderFilterStrategyComponent {
- private Map<String, CxfBeanEndpoint> endpoints = new HashMap<String, CxfBeanEndpoint>();
+ private Map<String, CxfBeanEndpoint> endpoints = new HashMap<>();
public CxfBeanComponent() {
super(CxfBeanEndpoint.class);
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
index 31cd9bf..d0a7433 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
@@ -79,7 +79,7 @@ public class CxfBeanEndpoint extends ProcessorEndpoint implements HeaderFilterSt
if (obj instanceof List) {
serviceBeans = (List<Object>)obj;
} else {
- serviceBeans = new ArrayList<Object>(1);
+ serviceBeans = new ArrayList<>(1);
serviceBeans.add(obj);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
index 857b532..8b40301 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
@@ -38,13 +38,13 @@ public abstract class AbstractDataFormatFeature extends AbstractFeature {
protected static final Collection<Class<?>> REMOVING_FAULT_IN_INTERCEPTORS;
static {
- REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<Class<?>>();
+ REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<>();
REMOVING_FAULT_IN_INTERCEPTORS.add(ClientFaultConverter.class);
}
// The interceptors which need to be keeped
- protected Set<String> inInterceptorNames = new HashSet<String>();
- protected Set<String> outInterceptorNames = new HashSet<String>();
+ protected Set<String> inInterceptorNames = new HashSet<>();
+ protected Set<String> outInterceptorNames = new HashSet<>();
protected abstract Logger getLogger();
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index b585281..66d7ba8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -58,11 +58,11 @@ public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature {
private static final Collection<Class<?>> REMOVING_OUT_INTERCEPTORS;
static {
- REMOVING_IN_INTERCEPTORS = new ArrayList<Class<?>>();
+ REMOVING_IN_INTERCEPTORS = new ArrayList<>();
REMOVING_IN_INTERCEPTORS.add(HolderInInterceptor.class);
REMOVING_IN_INTERCEPTORS.add(WrapperClassInInterceptor.class);
- REMOVING_OUT_INTERCEPTORS = new ArrayList<Class<?>>();
+ REMOVING_OUT_INTERCEPTORS = new ArrayList<>();
REMOVING_OUT_INTERCEPTORS.add(HolderOutInterceptor.class);
REMOVING_OUT_INTERCEPTORS.add(WrapperClassOutInterceptor.class);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
index abb61ee..6d0c74c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
@@ -85,7 +85,7 @@ public class CxfRsComponent extends HeaderFilterStrategyComponent implements SSL
// The super class (DefaultComponent) will invoke "setProperties" after this method
// with to apply properties defined by URI query.
if (bean.getProperties() != null) {
- Map<String, Object> copy = new HashMap<String, Object>();
+ Map<String, Object> copy = new HashMap<>();
copy.putAll(bean.getProperties());
setProperties(answer, copy);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 015918a..1daa8d1 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -95,12 +95,12 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
@UriParam(label = "advanced")
private CxfRsBinding binding;
@UriParam(javaType = "java.lang.String")
- private List<Object> providers = new LinkedList<Object>();
+ private List<Object> providers = new LinkedList<>();
private String providersRef;
@UriParam
private List<String> schemaLocations;
@UriParam
- private List<Feature> features = new ModCountCopyOnWriteArrayList<Feature>();
+ private List<Feature> features = new ModCountCopyOnWriteArrayList<>();
@UriParam(label = "producer,advanced", defaultValue = "true")
private boolean httpClientAPI = true;
@UriParam(label = "producer,advanced")
@@ -422,7 +422,7 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
public void addResourceClass(Class<?> resourceClass) {
if (resourceClasses == null) {
- resourceClasses = new ArrayList<Class<?>>();
+ resourceClasses = new ArrayList<>();
}
resourceClasses.add(resourceClass);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index 7edd0ba..8799f1e 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -479,7 +479,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
}
private Map<String, String> getQueryParametersFromQueryString(String queryString, String charset) throws UnsupportedEncodingException {
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
for (String param : queryString.split("&")) {
String[] pair = param.split("=", 2);
if (pair.length == 2) {
@@ -538,7 +538,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
}
private Map<String, String> getMatrixParametersFromMatrixString(String matrixString, String charset) throws UnsupportedEncodingException {
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
for (String param : matrixString.split(";")) {
String[] pair = param.split("=", 2);
if (pair.length == 2) {
@@ -616,7 +616,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
protected Map<String, String> parseResponseHeaders(Object response, Exchange camelExchange) {
- Map<String, String> answer = new HashMap<String, String>();
+ Map<String, String> answer = new HashMap<>();
if (response instanceof Response) {
for (Map.Entry<String, List<Object>> entry : ((Response) response).getMetadata().entrySet()) {
@@ -845,7 +845,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
private LRUSoftCache<String, JAXRSClientFactoryBean> cache;
ClientFactoryBeanCache(final int maxCacheSize) {
- this.cache = new LRUSoftCache<String, JAXRSClientFactoryBean>(maxCacheSize);
+ this.cache = new LRUSoftCache<>(maxCacheSize);
}
public void start() throws Exception {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
index 73ef59a..0496547 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
@@ -37,7 +37,7 @@ import org.apache.cxf.jaxrs.utils.JAXRSUtils;
public class DataFormatProvider<T> implements MessageBodyWriter<T>, MessageBodyReader<T> {
- private Map<String, DataFormat> formats = new HashMap<String, DataFormat>();
+ private Map<String, DataFormat> formats = new HashMap<>();
@Override
public boolean isReadable(Class<?> cls, Type type, Annotation[] anns, MediaType mt) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index 701b11c..e30471a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -106,7 +106,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
/** The JAX-RS annotations to be injected as headers in the IN message */
private static final Set<Class<?>> HEADER_ANNOTATIONS = Collections.unmodifiableSet(
- new HashSet<Class<?>>(Arrays.asList(new Class<?>[] {
+ new HashSet<>(Arrays.asList(new Class<?>[] {
CookieParam.class,
FormParam.class,
PathParam.class,
@@ -115,7 +115,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
QueryParam.class})));
private static final Set<Class<?>> BINARY_ATTACHMENT_TYPES = Collections.unmodifiableSet(
- new HashSet<Class<?>>(Arrays.asList(new Class<?>[] {
+ new HashSet<>(Arrays.asList(new Class<?>[] {
Attachment.class,
DataHandler.class,
DataSource.class,
@@ -126,7 +126,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
private static final Object[] NO_PARAMETERS = null;
/** Caches the Method to Parameters associations to avoid reflection with every request */
- private Map<Method, MethodSpec> methodSpecCache = new ConcurrentHashMap<Method, MethodSpec>();
+ private Map<Method, MethodSpec> methodSpecCache = new ConcurrentHashMap<>();
@Override
@@ -195,7 +195,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
*/
protected Map<String, String> filterCamelHeadersForResponseHeaders(Map<String, Object> headers,
org.apache.camel.Exchange camelExchange) {
- Map<String, String> answer = new HashMap<String, String>();
+ Map<String, String> answer = new HashMap<>();
for (Map.Entry<String, Object> entry : headers.entrySet()) {
if (getHeaderFilterStrategy().applyFilterToCamelHeaders(entry.getKey(), entry.getValue(), camelExchange)) {
continue;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
index 05bb947..b3d09d5 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
@@ -88,7 +88,7 @@ public abstract class AbstractCxfBeanDefinitionParser extends AbstractBeanDefini
Map<String, Object> map = null;
if (propertyValue == null) {
if (lazyInstantiation) {
- map = new HashMap<String, Object>();
+ map = new HashMap<>();
bean.addPropertyValue("properties", map);
}
} else {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
index 45894fb..7e11d8a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
@@ -52,7 +52,7 @@ public final class CxfUtils {
}
public static String elementToString(Element element) throws Exception {
- Map<String, String> namespaces = new HashMap<String, String>();
+ Map<String, String> namespaces = new HashMap<>();
visitNodesForNameSpace(element, namespaces);
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
writeElement(element, writer, namespaces);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
index 4687b24..5ec794f 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
@@ -66,10 +66,10 @@ public abstract class AbstractCxfWsdlFirstTest extends CamelSpringTestSupport {
"http://localhost:" + getPort2() + "/" + getClass().getSimpleName()
+ "/PersonService/");
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("we should get the right answer from router", "Bonjour", name.value);
@@ -123,12 +123,12 @@ public abstract class AbstractCxfWsdlFirstTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessageWithHolders(final String personIdString) {
Exchange exchange = template.send("direct:producer", new Processor() {
public void process(final Exchange exchange) {
- final List<Object> params = new ArrayList<Object>();
- Holder<String> personId = new Holder<String>();
+ final List<Object> params = new ArrayList<>();
+ Holder<String> personId = new Holder<>();
personId.value = personIdString;
params.add(personId);
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
params.add(ssn);
params.add(name);
exchange.getIn().setBody(params);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
index 844d051..1e386fd 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
@@ -93,10 +93,10 @@ public class CXFWsdlOnlyPayloadModeMultiPartNoSpringTest extends CamelTestSuppor
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + port2
+ "/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest/PersonMultiPart");
- Holder<Integer> ssn = new Holder<Integer>();
+ Holder<Integer> ssn = new Holder<>();
ssn.value = 0;
- Holder<String> name = new Holder<String>();
+ Holder<String> name = new Holder<>();
name.value = "Unknown name";
client.getPersonMultiPartOperation("foo", 0, name, ssn);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
index 20dab1e..1afadd3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
@@ -114,10 +114,10 @@ public class CXFWsdlOnlyPayloadModeNoSpringTest extends CamelTestSupport {
c.getInInterceptors().add(new LoggingInInterceptor());
c.getOutInterceptors().add(new LoggingOutInterceptor());
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("Bonjour", name.value);
@@ -138,10 +138,10 @@ public class CXFWsdlOnlyPayloadModeNoSpringTest extends CamelTestSupport {
c.getInInterceptors().add(new LoggingInInterceptor());
c.getOutInterceptors().add(new LoggingOutInterceptor());
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
Throwable t = null;
try {
client.getPerson(personId, ssn, name);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
index 7dfc300..b03731e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
@@ -94,16 +94,16 @@ public class CXFWsdlOnlyTest extends CamelSpringTestSupport {
((BindingProvider)client).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + port3 + "/CXFWsdlOnlyTest/PersonService/");
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("Bonjour", name.value);
personId.value = "";
- ssn = new Holder<String>();
- name = new Holder<String>();
+ ssn = new Holder<>();
+ name = new Holder<>();
Throwable t = null;
try {
client.getPerson(personId, ssn, name);
@@ -117,16 +117,16 @@ public class CXFWsdlOnlyTest extends CamelSpringTestSupport {
((BindingProvider)client2).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + port4 + "/CXFWsdlOnlyTest/PersonService/");
- Holder<String> personId2 = new Holder<String>();
+ Holder<String> personId2 = new Holder<>();
personId2.value = "hello";
- Holder<String> ssn2 = new Holder<String>();
- Holder<String> name2 = new Holder<String>();
+ Holder<String> ssn2 = new Holder<>();
+ Holder<String> name2 = new Holder<>();
client2.getPerson(personId2, ssn2, name2);
assertEquals("Bonjour", name2.value);
personId2.value = "";
- ssn2 = new Holder<String>();
- name2 = new Holder<String>();
+ ssn2 = new Holder<>();
+ name2 = new Holder<>();
try {
client2.getPerson(personId2, ssn2, name2);
fail("Expect exception");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
index 348fb32..83bf5a9 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
@@ -42,9 +42,9 @@ public class CxfConsumerPayLoadFaultMessageTest extends CxfConsumerPayloadFaultT
from(fromURI).process(new Processor() {
public void process(final Exchange exchange) throws Exception {
Element details = StaxUtils.read(new StringReader(FAULTS)).getDocumentElement();
- List<Element> outElements = new ArrayList<Element>();
+ List<Element> outElements = new ArrayList<>();
outElements.add(details);
- CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements);
+ CxfPayload<SoapHeader> responsePayload = new CxfPayload<>(null, outElements);
exchange.getOut().setBody(responsePayload);
exchange.getOut().setFault(true);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
index 4828a78..5193e2c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
@@ -95,10 +95,10 @@ public class CxfConsumerPayloadFaultCauseEnabledTest extends CamelTestSupport {
((BindingProvider)client).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceAddress);
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
try {
client.getPerson(personId, ssn, name);
fail("SOAPFault expected!");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
index 96ebff6..031a8a3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
@@ -100,10 +100,10 @@ public class CxfConsumerPayloadFaultTest extends CamelTestSupport {
((BindingProvider)client).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceAddress);
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
Throwable t = null;
try {
client.getPerson(personId, ssn, name);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
index a981839..67364cd 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
@@ -66,7 +66,7 @@ public class CxfConsumerPayloadTest extends CxfConsumerMessageTest {
public void process(final Exchange exchange) throws Exception {
CxfPayload<SoapHeader> requestPayload = exchange.getIn().getBody(CxfPayload.class);
List<Source> inElements = requestPayload.getBodySources();
- List<Source> outElements = new ArrayList<Source>();
+ List<Source> outElements = new ArrayList<>();
// You can use a customer toStringConverter to turn a CxfPayLoad message into String as you want
String request = exchange.getIn().getBody(String.class);
XmlConverter converter = new XmlConverter();
@@ -87,7 +87,7 @@ public class CxfConsumerPayloadTest extends CxfConsumerMessageTest {
Document outDocument = converter.toDOMDocument(documentString, exchange);
outElements.add(new DOMSource(outDocument.getDocumentElement()));
// set the payload header with null
- CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements, null);
+ CxfPayload<SoapHeader> responsePayload = new CxfPayload<>(null, outElements, null);
exchange.getOut().setBody(responsePayload);
}
});
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java
index 01a3c5c..83eec85 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java
@@ -94,10 +94,10 @@ public class CxfConsumerPayloadXPathClientServerTest extends CamelTestSupport {
//build some dummy response
XmlConverter converter = new XmlConverter();
Document outDocument = converter.toDOMDocument(ECHO_RESPONSE, exchange);
- List<Source> outElements = new ArrayList<Source>();
+ List<Source> outElements = new ArrayList<>();
outElements.add(new DOMSource(outDocument.getDocumentElement()));
// set the payload header with null
- CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements, null);
+ CxfPayload<SoapHeader> responsePayload = new CxfPayload<>(null, outElements, null);
exchange.getOut().setBody(responsePayload);
}
});
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
index 2899a22..684c571 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
@@ -78,7 +78,7 @@ public class CxfConsumerResponseTest extends CamelTestSupport {
// Put the result back
exchange.getIn().setBody(result);
// set up the response context which force start document
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("org.apache.cxf.stax.force-start-document", Boolean.TRUE);
exchange.getIn().setHeader(Client.RESPONSE_CONTEXT, map);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
index 28cee98..7b51d25 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
@@ -82,7 +82,7 @@ public class CxfConsumerTest extends CamelTestSupport {
// Put the result back
exchange.getOut().setBody(result);
// set up the response context which force start document
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("org.apache.cxf.stax.force-start-document", Boolean.TRUE);
exchange.getOut().setHeader(Client.RESPONSE_CONTEXT, map);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
index 3eceb4d..8676989 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
@@ -68,12 +68,12 @@ public class CxfMessageHeaderTimeoutTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
// setup the receive timeout dynamically
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
HTTPClientPolicy clientPolicy = new HTTPClientPolicy();
clientPolicy.setReceiveTimeout(100);
requestContext.put(HTTPClientPolicy.class.getName(), clientPolicy);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
index 017730c..ebd170c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
@@ -90,7 +90,7 @@ public class CxfMixedModeRouterTest extends CamelTestSupport {
public void process(Exchange exchange) throws Exception {
CxfPayload<?> message = exchange.getIn().getBody(CxfPayload.class);
- List<String> params = new ArrayList<String>();
+ List<String> params = new ArrayList<>();
if (message != null) {
// convert CxfPayload to list of objects any way you like
@@ -121,10 +121,10 @@ public class CxfMixedModeRouterTest extends CamelTestSupport {
+ "<return xmlns=\"http://cxf.component.camel.apache.org/\">"
+ list.get(0)
+ "</return></ns1:echoResponse>";
- List<Element> body = new ArrayList<Element>();
+ List<Element> body = new ArrayList<>();
body.add(StaxUtils.read(new StringReader(s)).getDocumentElement());
- message = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), body);
+ message = new CxfPayload<>(new ArrayList<SoapHeader>(), body);
}
exchange.getIn().setBody(message);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
index b368f18..c09a8bf 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
@@ -49,7 +49,7 @@ public class CxfPayLoadSoapHeaderViaCamelHeaderTest extends CxfPayLoadSoapHeader
callerId.setPhoneNumber("108");
SoapHeader soapHeader = new SoapHeader(new QName("http://camel.apache.org/pizza/types", "CallerIDHeader"),
callerId, new JAXBDataBinding(CallerIDHeaderType.class));
- List<SoapHeader> soapHeaders = new ArrayList<SoapHeader>(1);
+ List<SoapHeader> soapHeaders = new ArrayList<>(1);
soapHeaders.add(soapHeader);
// sets the SOAP header via a camel header
exchange.getIn().setHeader(Header.HEADER_LIST, soapHeaders);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
index 072e921..c4a64cb 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
@@ -67,9 +67,9 @@ public class CxfProducerContextTest extends CxfProducerTest {
protected Exchange sendSimpleMessage() {
Exchange exchange = template.send(getSimpleEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(Message.ENDPOINT_ADDRESS, getSimpleServerAddress());
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
@@ -87,9 +87,9 @@ public class CxfProducerContextTest extends CxfProducerTest {
protected Exchange sendJaxWsMessage() {
Exchange exchange = template.send(getJaxwsEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, getJaxWsServerAddress());
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
index 985e949..dc5aa9b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
@@ -51,7 +51,7 @@ public class CxfProducerOperationTest extends CxfProducerTest {
private Exchange sendSimpleMessage(String endpointUri) {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Exchange.FILE_NAME, "testFile");
@@ -65,7 +65,7 @@ public class CxfProducerOperationTest extends CxfProducerTest {
protected Exchange sendJaxWsMessage() {
Exchange exchange = template.send(getJaxwsEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Exchange.FILE_NAME, "testFile");
@@ -79,11 +79,11 @@ public class CxfProducerOperationTest extends CxfProducerTest {
Exchange exchange = template.send(getSimpleEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
// we need to override the operation name first
- final List<String> para1 = new ArrayList<String>();
+ final List<String> para1 = new ArrayList<>();
para1.add("para1");
- final List<String> para2 = new ArrayList<String>();
+ final List<String> para2 = new ArrayList<>();
para2.add("para2");
- List<List<String>> parameters = new ArrayList<List<String>>();
+ List<List<String>> parameters = new ArrayList<>();
parameters.add(para1);
parameters.add(para2);
// The object array version is working too
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
index 72c2d3d..53c4da3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
@@ -66,7 +66,7 @@ public class CxfProducerProtocalHeaderTest extends CamelTestSupport {
private Exchange sendSimpleMessage(String endpointUri) {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add("Hello World!");
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
index 1b4d281..84480e3e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
@@ -89,7 +89,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
error.expectedMessageCount(1);
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
// Prepare the request message for the camel-cxf procedure
params.add(TEST_MESSAGE);
senderExchange.getIn().setBody(params);
@@ -112,7 +112,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
public void testInvokingSimpleServerWithParams() throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
// Prepare the request message for the camel-cxf procedure
params.add(TEST_MESSAGE);
senderExchange.getIn().setBody(params);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java
index bcb589e..19c48b3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java
@@ -55,7 +55,7 @@ public class CxfProducerSoapActionTest extends CamelTestSupport {
@Override
public void process(Exchange exchange) throws Exception {
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
params.add("foo");
params.add(10);
params.add("bar");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java
index 9650074..752aafe 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java
@@ -90,7 +90,7 @@ public class CxfProducerSoapFaultTest extends Assert {
private Exchange sendJaxWsMessage(final String uri, final String message, final String operation) {
Exchange exchange = template.request(uri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(message);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, operation);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
index d28177a..7b0a4f1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
@@ -183,7 +183,7 @@ public class CxfProducerTest extends Assert {
private Exchange sendSimpleMessage(String endpointUri) {
Exchange exchange = template.request(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, ECHO_OPERATION);
@@ -224,7 +224,7 @@ public class CxfProducerTest extends Assert {
protected Exchange sendJaxWsMessage() {
Exchange exchange = template.request(getJaxwsEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
index 1e2efe3..aa076f9 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
@@ -102,7 +102,7 @@ public class CxfTimeoutTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
index 8b07634..7f688dc 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
@@ -98,7 +98,7 @@ public class DefaultCxfBindingTest extends Assert {
@Test
public void testPayloadBodyNamespace() throws Exception {
MessageImpl message = new MessageImpl();
- Map<String, String> nsMap = new HashMap<String, String>();
+ Map<String, String> nsMap = new HashMap<>();
Document document = getDocument(SOAP_MESSAGE_1);
message.setContent(Node.class, document);
DefaultCxfBinding.getPayloadBodyElements(message, nsMap);
@@ -115,7 +115,7 @@ public class DefaultCxfBindingTest extends Assert {
@Test
public void testOverridePayloadBodyNamespace() throws Exception {
MessageImpl message = new MessageImpl();
- Map<String, String> nsMap = new HashMap<String, String>();
+ Map<String, String> nsMap = new HashMap<>();
Document document = getDocument(SOAP_MESSAGE_2);
message.setContent(Node.class, document);
DefaultCxfBinding.getPayloadBodyElements(message, nsMap);
@@ -155,7 +155,7 @@ public class DefaultCxfBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
exchange.getIn().setHeader("soapAction", "urn:hello:world");
exchange.getIn().setHeader("MyFruitHeader", "peach");
@@ -211,16 +211,16 @@ public class DefaultCxfBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> responseContext = new HashMap<>();
responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200));
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("content-type", Arrays.asList("text/xml;charset=UTF-8"));
headers.put("Content-Length", Arrays.asList("241"));
responseContext.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
cxfExchange.setInMessage(cxfMessage);
- Set<Attachment> attachments = new HashSet<Attachment>();
+ Set<Attachment> attachments = new HashSet<>();
AttachmentImpl attachment = new AttachmentImpl("att-1", new DataHandler(new FileDataSource("pom.xml")));
attachment.setHeader("additional-header", "value 1");
attachments.add(attachment);
@@ -245,9 +245,9 @@ public class DefaultCxfBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> responseContext = new HashMap<>();
responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200));
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
responseContext.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
cxfExchange.setInMessage(cxfMessage);
@@ -314,7 +314,7 @@ public class DefaultCxfBindingTest extends Assert {
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("content-type", Arrays.asList("text/xml;charset=UTF-8"));
headers.put("Content-Length", Arrays.asList("241"));
headers.put("soapAction", Arrays.asList("urn:hello:world"));
@@ -322,7 +322,7 @@ public class DefaultCxfBindingTest extends Assert {
headers.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
- Set<Attachment> attachments = new HashSet<Attachment>();
+ Set<Attachment> attachments = new HashSet<>();
AttachmentImpl attachment = new AttachmentImpl("att-1", new DataHandler(new FileDataSource("pom.xml")));
attachment.setHeader("attachment-header", "value 1");
attachments.add(attachment);
@@ -356,7 +356,7 @@ public class DefaultCxfBindingTest extends Assert {
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("myfruitheader", Arrays.asList("peach"));
headers.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java
index 6c9b1be..6d1f74b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java
@@ -105,7 +105,7 @@ public class FailOverFeatureTest {
public void configure() {
String alt = SERVICE_ADDRESS;
- List<String> serviceList = new ArrayList<String>();
+ List<String> serviceList = new ArrayList<>();
serviceList.add(alt);
RandomStrategy strategy = new RandomStrategy();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java
index 461aa30..d8dd722 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java
@@ -109,7 +109,7 @@ public class LoadDistributorFeatureTest {
ctx.addRoutes(new RouteBuilder() {
public void configure() {
- List<String> serviceList = new ArrayList<String>();
+ List<String> serviceList = new ArrayList<>();
serviceList.add(SERVICE_ADDRESS_1);
serviceList.add(SERVICE_ADDRESS_2);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
index b3a7d09..d94aa8d 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
@@ -46,7 +46,7 @@ public class ConverterTest extends Assert {
@Test
public void testToArray() throws Exception {
- List<String> testList = new ArrayList<String>();
+ List<String> testList = new ArrayList<>();
testList.add("string 1");
testList.add("string 2");
@@ -91,7 +91,7 @@ public class ConverterTest extends Assert {
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document document = documentBuilder.parse(file);
document.getDocumentElement().normalize();
- List<Element> elements = new ArrayList<Element>();
+ List<Element> elements = new ArrayList<>();
elements.add(document.getDocumentElement());
nl = new NodeListWrapper(elements);
list.clear();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
index 7ec06a2..43155d1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
@@ -63,13 +63,13 @@ public class CxfPayloadConverterTest extends ExchangeTestSupport {
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
document = documentBuilder.parse(file);
document.getDocumentElement().normalize();
- List<Source> body = new ArrayList<Source>();
+ List<Source> body = new ArrayList<>();
body.add(new DOMSource(document.getDocumentElement()));
- List<Source> staxbody = new ArrayList<Source>();
+ List<Source> staxbody = new ArrayList<>();
staxbody.add(new StAXSource(StaxUtils.createXMLStreamReader(new FileInputStream(file), "utf-8")));
- payload = new CxfPayload<String[]>(new ArrayList<String[]>(), body, null);
- emptyPayload = new CxfPayload<String[]>(new ArrayList<String[]>(), new ArrayList<Source>(), null);
- staxpayload = new CxfPayload<String[]>(new ArrayList<String[]>(), staxbody, null);
+ payload = new CxfPayload<>(new ArrayList<String[]>(), body, null);
+ emptyPayload = new CxfPayload<>(new ArrayList<String[]>(), new ArrayList<Source>(), null);
+ staxpayload = new CxfPayload<>(new ArrayList<String[]>(), staxbody, null);
inputStream = new FileInputStream(file);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
index 0c3a4ac..0ea7790 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
@@ -261,10 +261,10 @@ public class CxfBeanTest extends AbstractJUnit4SpringContextTests {
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + CXFTestSupport.getPort1() + "/CxfBeanTest/PersonService/");
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("Get a wrong personId", "hello", personId.value);
assertEquals("Get a wrong SSN", "000-000-0000", ssn.value);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
index dca697a..a7a183e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
@@ -51,9 +51,9 @@ public class CxfHolderConsumerTest extends CamelTestSupport {
MyOrderEndpoint client = (MyOrderEndpoint) proxyFactory.create();
- Holder<String> strPart = new Holder<String>();
+ Holder<String> strPart = new Holder<>();
strPart.value = "parts";
- Holder<String> strCustomer = new Holder<String>();
+ Holder<String> strCustomer = new Holder<>();
strCustomer.value = "";
String result = client.myOrder(strPart, 2, strCustomer);
@@ -72,7 +72,7 @@ public class CxfHolderConsumerTest extends CamelTestSupport {
MyOrderEndpoint client = (MyOrderEndpoint) proxyFactory.create();
- Holder<String> header = new Holder<String>();
+ Holder<String> header = new Holder<>();
header.value = "parts";
String result = client.mySecureOrder(1, header);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
index 0ae208e..91a3415 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
@@ -86,7 +86,7 @@ public class CxfRsEndpointTest extends CamelTestSupport {
CxfRsComponent component = new CxfRsComponent(context);
CxfRsEndpoint endpoint = (CxfRsEndpoint)component.createEndpoint(endpointUri);
- JSONProvider<?> jsonProvider = new JSONProvider<Object>();
+ JSONProvider<?> jsonProvider = new JSONProvider<>();
jsonProvider.setDropRootElement(true);
jsonProvider.setSupportUnwrapped(true);
endpoint.setProvider(jsonProvider);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
index 7ec6f9d..b21b0db 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
@@ -393,7 +393,7 @@ public class CxfRsProducerTest extends CamelSpringTestSupport {
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS, InputStream.class);
// override the parameter setting from URI
// START SNIPPET: QueryMapExample
- Map<String, String> queryMap = new LinkedHashMap<String, String>();
+ Map<String, String> queryMap = new LinkedHashMap<>();
queryMap.put("q1", "new");
queryMap.put("q2", "world");
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_QUERY_MAP, queryMap);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
index b591ce5..805b472 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
@@ -37,7 +37,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testIsReadableWriteableSpecificMatch() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
assertTrue(p.isReadable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
assertTrue(p.isWriteable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
@@ -45,7 +45,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testIsReadableWriteableComplexSubMatch() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
assertTrue(p.isReadable(Book.class, Book.class, new Annotation[] {},
MediaType.valueOf("text/plain+v2")));
@@ -55,7 +55,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testIsReadableWriteableStarMatch() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat(new TestDataFormat());
assertTrue(p.isReadable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
assertTrue(p.isWriteable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
@@ -63,7 +63,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testNotReadableWriteable() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("application/json", new TestDataFormat());
assertFalse(p.isReadable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
assertFalse(p.isWriteable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
@@ -71,7 +71,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testReadFrom() throws Exception {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
ByteArrayInputStream bis = new ByteArrayInputStream("dataformat".getBytes());
@@ -82,7 +82,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testWriteTo() throws Exception {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java
index a14900e..265bae2 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java
@@ -59,7 +59,7 @@ public class DefaultCxfRsBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
Message camelMessage = new DefaultMessage(context);
org.apache.cxf.message.Message cxfMessage = new MessageImpl();
- Map<String, List<String>> headers = new HashMap<String, List<String>>();
+ Map<String, List<String>> headers = new HashMap<>();
headers.put("emptyList", Collections.<String>emptyList());
headers.put("zeroSizeList", new ArrayList<String>(0));
cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index be3c9d8..ec3a4a2 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -120,7 +120,7 @@ public class CxfRsConsumerSimpleBindingTest extends CamelTestSupport {
assertEquals(MessageContentsList.class, exchange.getIn().getBody().getClass());
assertEquals(0, exchange.getIn().getBody(MessageContentsList.class).size());
CustomerList response = new CustomerList();
- List<Customer> list = new ArrayList<Customer>(2);
+ List<Customer> list = new ArrayList<>(2);
list.add(new Customer(123, "Raul"));
list.add(new Customer(456, "Raul2"));
response.setCustomers(list);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
index 1ed7e1c..ecb090b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Order {
private long id;
private String description;
- private Map<Long, Product> products = new HashMap<Long, Product>();
+ private Map<Long, Product> products = new HashMap<>();
public Order() {
init();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index c051948..86fe90d 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -40,8 +40,8 @@ import org.apache.cxf.common.util.StringUtils;
@Path("/customerservice/")
public class CustomerService {
private final AtomicLong currentId = new AtomicLong(123L);
- private final Map<Long, Customer> customers = new ConcurrentHashMap<Long, Customer>();
- private final Map<Long, Order> orders = new ConcurrentHashMap<Long, Order>();
+ private final Map<Long, Customer> customers = new ConcurrentHashMap<>();
+ private final Map<Long, Order> orders = new ConcurrentHashMap<>();
public CustomerService() {
init();
@@ -67,7 +67,7 @@ public class CustomerService {
@Path("/customers/")
@Produces("application/xml")
public List<Customer> getCustomers() {
- List<Customer> list = new ArrayList<Customer>(customers.values());
+ List<Customer> list = new ArrayList<>(customers.values());
return list;
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 2e2728c..d10046a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Order {
private long id;
private String description;
- private Map<Long, Product> products = new HashMap<Long, Product>();
+ private Map<Long, Product> products = new HashMap<>();
public Order() {
init();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
index eb66996..3a9ca27 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
@@ -36,8 +36,8 @@ public class CxfJavaMtomProducerPayloadTest extends CxfMtomConsumerTest {
return;
}
- final Holder<byte[]> photo = new Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
- final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ final Holder<byte[]> photo = new Holder<>("RequestFromCXF".getBytes("UTF-8"));
+ final Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Exchange exchange = context.createProducerTemplate().send(MTOM_ENDPOINT_URI_MTOM_ENABLE, new Processor() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
index de49ff1..3d52e64 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
@@ -71,9 +71,9 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT
public void process(Exchange exchange) throws Exception {
exchange.setPattern(ExchangePattern.InOut);
assertEquals("Get a wrong Content-Type header", "application/xop+xml", exchange.getIn().getHeader("Content-Type"));
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(getRequestMessage())).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
@@ -95,7 +95,7 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT
// verify request
assertEquals(1, in.getBody().size());
- Map<String, String> ns = new HashMap<String, String>();
+ Map<String, String> ns = new HashMap<>();
ns.put("ns", MtomTestHelper.SERVICE_TYPES_NS);
ns.put("xop", MtomTestHelper.XOP_NS);
@@ -120,9 +120,9 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT
MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, IOUtils.readBytesFromStream(dr.getInputStream()));
// create response
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.RESP_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> sbody = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> sbody = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getOut().setBody(sbody);
exchange.getOut().addAttachment(MtomTestHelper.RESP_PHOTO_CID,
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
index 6503c80..5e09516 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
@@ -99,8 +99,8 @@ public class CxfMtomConsumerTest extends CamelTestSupport {
return;
}
- Holder<byte[]> photo = new Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
- Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ Holder<byte[]> photo = new Holder<>("RequestFromCXF".getBytes("UTF-8"));
+ Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Hello port = getPort();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
index f681de6..78083c6 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
@@ -68,9 +68,9 @@ public class CxfMtomDisabledConsumerPayloadModeTest extends CxfMtomConsumerPaylo
MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, IOUtils.readBytesFromStream(dr.getInputStream()));
// create response
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.MTOM_DISABLED_RESP_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getOut().setBody(body);
exchange.getOut().addAttachment(MtomTestHelper.RESP_PHOTO_CID,
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
index 2ec2b24..4c24d08 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
@@ -80,9 +80,9 @@ public class CxfMtomDisabledProducerPayloadModeTest extends CxfMtomProducerPaylo
public void process(Exchange exchange) throws Exception {
exchange.setPattern(ExchangePattern.InOut);
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.MTOM_DISABLED_REQ_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
index a8e0f0d..22cc34f 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
@@ -74,8 +74,8 @@ public class CxfMtomPOJOProducerTest extends AbstractJUnit4SpringContextTests {
return;
}
- final Holder<byte[]> photo = new Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
- final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ final Holder<byte[]> photo = new Holder<>(MtomTestHelper.REQ_PHOTO_DATA);
+ final Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Exchange exchange = context.createProducerTemplate().send("direct://testEndpoint", new Processor() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
index 794e39e..3b18e09 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
@@ -96,9 +96,9 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
public void process(Exchange exchange) throws Exception {
exchange.setPattern(ExchangePattern.InOut);
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.REQ_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
@@ -116,7 +116,7 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
CxfPayload<SoapHeader> out = exchange.getOut().getBody(CxfPayload.class);
Assert.assertEquals(1, out.getBody().size());
- Map<String, String> ns = new HashMap<String, String>();
+ Map<String, String> ns = new HashMap<>();
ns.put("ns", MtomTestHelper.SERVICE_TYPES_NS);
ns.put("xop", MtomTestHelper.XOP_NS);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
index 04fd568..7c141e1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
@@ -76,8 +76,8 @@ public class CxfMtomRouterPayloadModeTest extends AbstractJUnit4SpringContextTes
return;
}
- Holder<byte[]> photo = new Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
- Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ Holder<byte[]> photo = new Holder<>(MtomTestHelper.REQ_PHOTO_DATA);
+ Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Hello port = getPort();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
index 34b3570..17b7635 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
@@ -97,8 +97,8 @@ public class CXFMultiPartTest extends CamelTestSupport {
e0.setV(in0);
e1.setV(in1);
- javax.xml.ws.Holder<InE> h = new javax.xml.ws.Holder<InE>();
- javax.xml.ws.Holder<InE> h1 = new javax.xml.ws.Holder<InE>();
+ javax.xml.ws.Holder<InE> h = new javax.xml.ws.Holder<>();
+ javax.xml.ws.Holder<InE> h1 = new javax.xml.ws.Holder<>();
multiPartClient.foo(e0, e1, h, h1);
return h.value.getV() + " " + h1.value.getV();
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
index 696eadd..d5d7e0a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
@@ -165,8 +165,8 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
OutHeader me = new OutHeader();
me.setRequestType("CXF user");
- Holder<OutHeaderResponse> result = new Holder<OutHeaderResponse>(new OutHeaderResponse());
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(new SOAPHeaderData());
+ Holder<OutHeaderResponse> result = new Holder<>(new OutHeaderResponse());
+ Holder<SOAPHeaderData> header = new Holder<>(new SOAPHeaderData());
proxy.outHeader(me, result, header);
assertTrue("Expected in band header to propagate but it didn't",
result.value.getResponseType().equals("pass"));
@@ -185,7 +185,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
"http://localhost:" + portE1 + "/CxfMessageHeadersRelayTest/HeaderService/");
InoutHeader me = new InoutHeader();
me.setRequestType("CXF user");
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(Constants.IN_OUT_REQUEST_HEADER_DATA);
+ Holder<SOAPHeaderData> header = new Holder<>(Constants.IN_OUT_REQUEST_HEADER_DATA);
InoutHeaderResponse result = proxy.inoutHeader(me, header);
assertTrue("Expected in band header to propagate but it didn't",
result.getResponseType().equals("pass"));
@@ -365,8 +365,8 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
"http://localhost:" + portE3 + "/CxfMessageHeadersRelayTest/HeaderService/");
OutHeader me = new OutHeader();
me.setRequestType("CXF user");
- Holder<OutHeaderResponse> result = new Holder<OutHeaderResponse>(new OutHeaderResponse());
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(new SOAPHeaderData());
+ Holder<OutHeaderResponse> result = new Holder<>(new OutHeaderResponse());
+ Holder<SOAPHeaderData> header = new Holder<>(new SOAPHeaderData());
try {
proxy.outHeader(me, result, header);
} catch (Exception e) {
@@ -388,7 +388,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
"http://localhost:" + portE3 + "/CxfMessageHeadersRelayTest/HeaderService/");
InoutHeader me = new InoutHeader();
me.setRequestType("CXF user");
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(Constants.IN_OUT_REQUEST_HEADER_DATA);
+ Holder<SOAPHeaderData> header = new Holder<>(Constants.IN_OUT_REQUEST_HEADER_DATA);
InoutHeaderResponse result = null;
try {
result = proxy.inoutHeader(me, header);
@@ -413,12 +413,12 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
+ "</message></ns2:SOAPHeaderInfo>";
String requestBody = "<ns2:inoutHeader xmlns:ns2=\"http://apache.org/camel/component/cxf/soap/headers\">"
+ "<requestType>CXF user</requestType></ns2:inoutHeader>";
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(requestBody)).getDocumentElement()));
- final List<SoapHeader> headers = new ArrayList<SoapHeader>();
+ final List<SoapHeader> headers = new ArrayList<>();
headers.add(new SoapHeader(qname,
StaxUtils.read(new StringReader(requestHeader)).getDocumentElement()));
- final CxfPayload<SoapHeader> cxfPayload = new CxfPayload<SoapHeader>(headers, elements, null);
+ final CxfPayload<SoapHeader> cxfPayload = new CxfPayload<>(headers, elements, null);
Exchange exchange = template.request(uri, new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -491,7 +491,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
protected void doTestInOutOfBandHeaderCamelTemplate(String producerUri) throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -501,7 +501,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
senderExchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "inOutOfBandHeader");
List<Header> headers = buildOutOfBandHeaderList(false);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(Header.HEADER_LIST, headers);
senderExchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
@@ -519,7 +519,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
protected void doTestOutOutOfBandHeaderCamelTemplate(String producerUri) throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -543,7 +543,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
public void doTestInOutOutOfBandHeaderCamelTemplate(String producerUri) throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -553,7 +553,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
senderExchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "inoutOutOfBandHeader");
List<Header> inHeaders = buildOutOfBandHeaderList(false);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(Header.HEADER_LIST, inHeaders);
senderExchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
@@ -640,13 +640,13 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
hdr.setMustUnderstand(invalid);
- List<Header> headers = new ArrayList<Header>();
+ List<Header> headers = new ArrayList<>();
headers.add(hdr);
return headers;
}
protected static void validateReturnedOutOfBandHeaderWithInsertion(Map<String, Object> responseContext, boolean expect) {
- List<OutofBandHeader> hdrToTest = new ArrayList<OutofBandHeader>();
+ List<OutofBandHeader> hdrToTest = new ArrayList<>();
List<Header> oobHdr = CastUtils.cast((List<?>)responseContext.get(Header.HEADER_LIST));
if (!expect) {
if (oobHdr == null || (oobHdr != null && oobHdr.size() == 0)) {
@@ -723,7 +723,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
List<SoapHeader> soapHeaders = CastUtils.cast((List<?>)exchange.getIn().getHeader(Header.HEADER_LIST));
if (soapHeaders == null) {
// we just create a new soap headers in case the header is null
- soapHeaders = new ArrayList<SoapHeader>();
+ soapHeaders = new ArrayList<>();
}
// Insert a new header
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index 085115a..e9aa325 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -161,7 +161,7 @@ public class HeaderTesterImpl implements HeaderTester {
ob.setName("testOobReturnHeaderName");
ob.setValue("testOobReturnHeaderValue");
ob.setHdrAttribute("testReturnHdrAttribute");
- JAXBElement<OutofBandHeader> job = new JAXBElement<OutofBandHeader>(
+ JAXBElement<OutofBandHeader> job = new JAXBElement<>(
new QName(Constants.TEST_HDR_NS, Constants.TEST_HDR_RESPONSE_ELEM),
OutofBandHeader.class, null, ob);
Header hdr = new Header(
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
index b834a6d..abd3553 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
@@ -74,7 +74,7 @@ public class CxfEndpointBeansRouterTest extends AbstractSpringBeanTestSupport {
Exchange reply = template.request("cxf:bean:serviceEndpoint", new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add("hello");
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
index 67b6f5b..ee75796 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
@@ -71,7 +71,7 @@ public class SslGlobalTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
index bb73c7e..2c4c746 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
@@ -80,7 +80,7 @@ public class SslTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java
index 27d24fd..3b71410 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java
@@ -46,7 +46,7 @@ public final class Client {
public static WSS4JOutInterceptor getWSS4JOutInterceptor() throws Exception {
- Map<String, Object> outProps = new HashMap<String, Object>();
+ Map<String, Object> outProps = new HashMap<>();
outProps.put("action", "Signature");
// outProps.put("action", "UsernameToken Timestamp Signature Encrypt");
@@ -80,7 +80,7 @@ public final class Client {
public static WSS4JInInterceptor getWSS4JInInterceptor() throws Exception {
- Map<String, Object> inProps = new HashMap<String, Object>();
+ Map<String, Object> inProps = new HashMap<>();
inProps.put("action", "Signature");
// inProps.put("action", "UsernameToken Timestamp Signature Encrypt");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
index cf97dde..98b48ec 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
@@ -31,7 +31,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
public class UTPasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
index 91764d6..acdd8b2 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
@@ -31,7 +31,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
public class UTPasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.
[camel] 01/04: 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 70f618adebbafef719bcb27f965b8e10ac5c3050
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 14:39:37 2018 +0200
polish
---
.../java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 2 +-
.../org/apache/camel/component/ahc/DefaultAhcBinding.java | 4 ++--
.../camel/component/ahc/AhcProduceGetHeadersTest.java | 2 +-
.../camel/component/ahc/AhcProducePostHeadersTest.java | 2 +-
.../ahc/AhcProducerConnectionCloseHeadersTest.java | 2 +-
.../ahc/AhcProducerTwoParametersWithSameKeyTest.java | 4 ++--
.../java/org/apache/camel/component/apns/ApnsConsumer.java | 2 +-
.../java/org/apache/camel/component/apns/ApnsEndpoint.java | 2 +-
.../java/org/apache/camel/component/apns/ApnsProducer.java | 2 +-
.../org/apache/camel/component/apns/util/ApnsUtils.java | 4 ++--
.../asn1/ASN1DataFormatWithStreamIteratorClassTest.java | 1 -
.../dataformat/asn1/SpringASN1DataFormatRouteTest.java | 1 -
.../apache/camel/component/atmos/core/AtmosAPIFacade.java | 6 +++---
.../atmos/validator/AtmosConfigurationValidator.java | 2 +-
.../atmosphere/websocket/MemoryWebSocketStore.java | 4 ++--
.../component/atmosphere/websocket/WebsocketComponent.java | 2 +-
.../camel/component/atmosphere/websocket/TestClient.java | 4 ++--
.../websocket/WebsocketRouteWithInitParamTest.java | 2 +-
.../org/apache/camel/component/avro/AvroComponent.java | 2 +-
.../java/org/apache/camel/component/avro/AvroListener.java | 2 +-
.../org/apache/camel/dataformat/avro/AvroDataFormat.java | 4 ++--
.../org/apache/camel/avro/impl/KeyValueProtocolImpl.java | 2 +-
.../camel/component/aws/xray/CustomComponentTest.java | 1 -
.../org/apache/camel/component/aws/xray/ErrorTest.java | 1 -
.../org/apache/camel/component/aws/xray/FakeAWSDaemon.java | 2 +-
.../component/aws/xray/MulticastParallelRouteTest.java | 1 -
.../camel/component/aws/xray/MulticastRouteTest.java | 1 -
.../camel/component/aws/xray/Route2ConcurrentTest.java | 1 -
.../camel/component/aws/xray/RouteConcurrentTest.java | 1 -
.../component/aws/xray/SpringAwsXRaySimpleRouteTest.java | 1 -
.../apache/camel/component/aws/xray/TwoService2Test.java | 1 -
.../apache/camel/component/aws/xray/TwoServiceTest.java | 1 -
.../component/aws/xray/TwoServiceWithExcludeTest.java | 1 -
.../java/org/apache/camel/component/aws/cw/CwProducer.java | 2 +-
.../java/org/apache/camel/component/aws/s3/S3Consumer.java | 4 ++--
.../java/org/apache/camel/component/aws/s3/S3Producer.java | 2 +-
.../org/apache/camel/component/aws/sns/SnsProducer.java | 2 +-
.../org/apache/camel/component/aws/sqs/SqsConsumer.java | 2 +-
.../org/apache/camel/component/aws/sqs/SqsProducer.java | 2 +-
.../aws/swf/CamelActivityImplementationFactory.java | 2 +-
.../camel/component/aws/swf/CamelSWFWorkflowClient.java | 2 +-
.../camel/component/aws/swf/CamelWorkflowDefinition.java | 6 +++---
.../aws/swf/CamelWorkflowDefinitionFactoryFactory.java | 2 +-
.../org/apache/camel/component/aws/cw/CwComponentTest.java | 2 +-
.../camel/component/aws/ddb/AmazonDDBClientMock.java | 14 +++++++-------
.../camel/component/aws/ddb/BatchGetItemsCommandTest.java | 6 +++---
.../camel/component/aws/ddb/DeleteItemCommandTest.java | 4 ++--
.../camel/component/aws/ddb/DescribeTableCommandTest.java | 2 +-
.../apache/camel/component/aws/ddb/GetItemCommandTest.java | 2 +-
.../apache/camel/component/aws/ddb/PutItemCommandTest.java | 4 ++--
.../apache/camel/component/aws/ddb/QueryCommandTest.java | 6 +++---
.../apache/camel/component/aws/ddb/ScanCommandTest.java | 4 ++--
.../camel/component/aws/ddb/UpdateItemCommandTest.java | 6 +++---
.../aws/ddb/integration/DdbComponentIntegrationTest.java | 2 +-
.../camel/component/aws/ec2/AmazonEC2ClientMock.java | 14 +++++++-------
.../apache/camel/component/aws/ec2/EC2ProducerTest.java | 2 +-
.../aws/ec2/integration/EC2ComponentIntegrationTest.java | 2 +-
.../camel/component/aws/kms/AmazonKMSClientMock.java | 2 +-
.../camel/component/aws/lambda/AmazonLambdaClientMock.java | 4 ++--
.../apache/camel/component/aws/s3/AmazonS3ClientMock.java | 6 +++---
.../component/aws/s3/AmazonS3EncryptionClientMock.java | 6 +++---
.../component/aws/s3/S3ComponentExistingBucketTest.java | 4 ++--
.../component/aws/s3/S3ComponentNonExistingBucketTest.java | 2 +-
.../aws/sdb/BatchDeleteAttributesCommandTest.java | 4 ++--
.../component/aws/sdb/BatchPutAttributesCommandTest.java | 4 ++--
.../component/aws/sdb/DeleteAttributesCommandTest.java | 6 +++---
.../camel/component/aws/sdb/GetAttributesCommandTest.java | 6 +++---
.../camel/component/aws/sdb/PutAttributesCommandTest.java | 6 +++---
.../camel/component/aws/sns/AmazonSNSClientMock.java | 2 +-
.../camel/component/aws/sqs/AmazonSQSClientMock.java | 10 +++++-----
.../camel/component/aws/sqs/SqsConcurrentConsumerTest.java | 2 +-
.../apache/camel/component/aws/sqs/SqsEndpointTest.java | 7 ++++---
.../apache/camel/component/aws/sqs/SqsProducerTest.java | 6 +++---
.../camel/component/azure/blob/BlobServiceProducer.java | 8 ++++----
.../camel/component/azure/queue/QueueServiceUtil.java | 2 +-
.../component/azure/queue/QueueServiceProducerTest.java | 2 +-
76 files changed, 122 insertions(+), 133 deletions(-)
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 10da4ac..c34b6ae 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public class WsEndpoint extends AhcEndpoint {
private static final transient Logger LOG = LoggerFactory.getLogger(WsEndpoint.class);
- private final Set<WsConsumer> consumers = new HashSet<WsConsumer>();
+ private final Set<WsConsumer> consumers = new HashSet<>();
private final WsListener listener = new WsListener();
private transient WebSocket websocket;
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
index b6bbac6..098edae 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
@@ -231,7 +231,7 @@ public class DefaultAhcBinding implements AhcBinding {
@Override
public void onHeadersReceived(AhcEndpoint endpoint, Exchange exchange, HttpHeaders headers) throws Exception {
- Map<String, List<String>> m = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> m = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (String name:headers.names()) {
List<String> values = headers.getAll(name);
if (values.size() == 1) {
@@ -332,7 +332,7 @@ public class DefaultAhcBinding implements AhcBinding {
}
private Map<String, String> extractResponseHeaders(Exchange exchange) {
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
for (Map.Entry<String, Object> entry : exchange.getOut().getHeaders().entrySet()) {
String key = entry.getKey();
String value = exchange.getContext().getTypeConverter().convertTo(String.class, entry.getValue());
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceGetHeadersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceGetHeadersTest.java
index 16447eb..8e42d1b 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceGetHeadersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceGetHeadersTest.java
@@ -34,7 +34,7 @@ public class AhcProduceGetHeadersTest extends BaseAhcTest {
getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.HTTP_RESPONSE_TEXT, "OK");
getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.CONTENT_LENGTH, 9);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", 123);
headers.put("bar", "cool");
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducePostHeadersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducePostHeadersTest.java
index d5f642b..4791aaa 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducePostHeadersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducePostHeadersTest.java
@@ -33,7 +33,7 @@ public class AhcProducePostHeadersTest extends BaseAhcTest {
getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.HTTP_RESPONSE_CODE, 200);
getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.CONTENT_LENGTH, 9);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", 123);
headers.put("bar", "cool");
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerConnectionCloseHeadersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerConnectionCloseHeadersTest.java
index 946184d..1e92836 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerConnectionCloseHeadersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerConnectionCloseHeadersTest.java
@@ -35,7 +35,7 @@ public class AhcProducerConnectionCloseHeadersTest extends BaseAhcTest {
getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.CONTENT_LENGTH, 9);
getMockEndpoint("mock:result").expectedHeaderReceived("Connection", "close");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", 123);
headers.put("bar", "cool");
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
index d0db2d7..95f0efc 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
@@ -45,7 +45,7 @@ public class AhcProducerTwoParametersWithSameKeyTest extends BaseAhcTest {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody(null);
exchange.getIn().setHeader("from", "me");
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add("foo");
list.add("bar");
exchange.getIn().setHeader("to", list);
@@ -79,7 +79,7 @@ public class AhcProducerTwoParametersWithSameKeyTest extends BaseAhcTest {
// response
exchange.getOut().setBody("OK");
// use multiple values for the foo header in the reply
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
list.add(123);
list.add(456);
exchange.getOut().setHeader("foo", list);
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java
index e9b749a..4591a9c 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java
@@ -63,7 +63,7 @@ public class ApnsConsumer extends ScheduledPollConsumer {
Map<String, Date> inactiveDeviceMap = ae.getApnsService().getInactiveDevices();
- List<InactiveDevice> inactiveDeviceList = new ArrayList<InactiveDevice>();
+ List<InactiveDevice> inactiveDeviceList = new ArrayList<>();
for (Entry<String, Date> inactiveDeviceEntry : inactiveDeviceMap.entrySet()) {
String deviceToken = inactiveDeviceEntry.getKey();
Date date = inactiveDeviceEntry.getValue();
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
index ca02275..380b94c 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.spi.UriPath;
@UriEndpoint(firstVersion = "2.8.0", scheme = "apns", title = "APNS", syntax = "apns:name", consumerClass = ApnsConsumer.class, label = "eventbus,mobile")
public class ApnsEndpoint extends ScheduledPollEndpoint {
- private final CopyOnWriteArraySet<DefaultConsumer> consumers = new CopyOnWriteArraySet<DefaultConsumer>();
+ private final CopyOnWriteArraySet<DefaultConsumer> consumers = new CopyOnWriteArraySet<>();
@UriPath(description = "Name of the endpoint")
private String name;
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java
index ce021fb..c42bee3 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java
@@ -82,7 +82,7 @@ public class ApnsProducer extends DefaultProducer {
if (hasTokensHeader(exchange)) {
throw new IllegalArgumentException("Tokens already configured on endpoint " + ApnsConstants.HEADER_TOKENS);
}
- tokens = new ArrayList<String>(tokenList);
+ tokens = new ArrayList<>(tokenList);
} else {
String tokensHeader = getHeaderTokens(exchange);
tokens = extractTokensFromString(tokensHeader);
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java
index fc74b83..93483a1 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java
@@ -77,8 +77,8 @@ public final class ApnsUtils {
}
public static String getAlgorithm() {
- List<String> keys = new LinkedList<String>();
- List<String> trusts = new LinkedList<String>();
+ List<String> keys = new LinkedList<>();
+ List<String> trusts = new LinkedList<>();
for (Provider p : Security.getProviders()) {
for (Service s : p.getServices()) {
if ("KeyManagerFactory".equals(s.getType())
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
index c2a9756..3db5d7f 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
index aba9702..0db7335 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.util.List;
import org.apache.camel.Exchange;
-import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
index 77a9ded..0ee6bdc 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
@@ -103,7 +103,7 @@ public final class AtmosAPIFacade {
throw new AtmosException(atmosPath + " exists on atmos and is not a folder!");
}
atmosPath = atmosPath + fileLocalPath.getName();
- resultEntries = new HashMap<String, AtmosResultCode>(1);
+ resultEntries = new HashMap<>(1);
try {
ObjectId uploadedFile = putSingleFile(fileLocalPath, atmosPath);
if (uploadedFile == null) {
@@ -131,7 +131,7 @@ public final class AtmosAPIFacade {
if (listFiles == null || listFiles.isEmpty()) {
throw new AtmosException(localPath + " does not contain any files");
}
- resultEntries = new HashMap<String, AtmosResultCode>(listFiles.size());
+ resultEntries = new HashMap<>(listFiles.size());
for (File file : listFiles) {
String absPath = file.getAbsolutePath();
int indexRemainingPath = localPath.length();
@@ -216,7 +216,7 @@ public final class AtmosAPIFacade {
public AtmosResult get(String remotePath) throws AtmosException {
AtmosResult result = new AtmosFileDownloadResult();
//a map representing for each path the result of the baos
- Map<String, ByteArrayOutputStream> resultEntries = new HashMap<String, ByteArrayOutputStream>();
+ Map<String, ByteArrayOutputStream> resultEntries = new HashMap<>();
//iterate from the remotePath
downloadFilesInFolder(remotePath, resultEntries);
//put the map of baos as result
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
index 7cbc681..84b4191 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
@@ -65,7 +65,7 @@ public final class AtmosConfigurationValidator {
throw new AtmosException("option <uri> is not present!");
} else {
try {
- URI uri = new URI(configuration.getUri());
+ new URI(configuration.getUri());
} catch (URISyntaxException use) {
throw new AtmosException("option <uri> is not valid!", use);
}
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStore.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStore.java
index 899df2b..116b5c5 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStore.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStore.java
@@ -34,8 +34,8 @@ public class MemoryWebSocketStore implements WebSocketStore {
private Map<WebSocket, String> keys;
public MemoryWebSocketStore() {
- values = new ConcurrentHashMap<String, WebSocket>();
- keys = new ConcurrentHashMap<WebSocket, String>();
+ values = new ConcurrentHashMap<>();
+ keys = new ConcurrentHashMap<>();
}
/* (non-Javadoc)
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponent.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponent.java
index fa9e843..82b0bca 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponent.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponent.java
@@ -34,7 +34,7 @@ public class WebsocketComponent extends ServletComponent {
super(WebsocketEndpoint.class);
setServletName("CamelWsServlet");
- this.stores = new HashMap<String, WebSocketStore>();
+ this.stores = new HashMap<>();
}
@Override
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java
index ec75e7b..8aebd60 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/TestClient.java
@@ -55,7 +55,7 @@ public class TestClient {
}
public TestClient(String url, AsyncHttpClientConfig conf, int count) {
- this.received = new ArrayList<Object>();
+ this.received = new ArrayList<>();
this.latch = new CountDownLatch(count);
this.client = conf == null ? new DefaultAsyncHttpClient() : new DefaultAsyncHttpClient(conf);
this.url = url;
@@ -89,7 +89,7 @@ public class TestClient {
}
public <T> List<T> getReceived(Class<T> cls) {
- List<T> list = new ArrayList<T>();
+ List<T> list = new ArrayList<>();
for (Object o : received) {
list.add(getValue(o, cls));
}
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
index fc83b7e..42efdcf 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
@@ -31,7 +31,7 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
private static final String[] EXISTED_USERS = {"Kim", "Pavlo", "Peter"};
private static String[] broadcastMessageTo = {};
- private static Map<String, String> connectionKeyUserMap = new HashMap<String, String>();
+ private static Map<String, String> connectionKeyUserMap = new HashMap<>();
@Test
public void testWebsocketEventsResendingEnabled() throws Exception {
diff --git a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
index da76a0e..4688ca0 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroComponent.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.URISupport;
public class AvroComponent extends UriEndpointComponent {
- private ConcurrentMap<String, AvroListener> listenerRegistry = new ConcurrentHashMap<String, AvroListener>();
+ private ConcurrentMap<String, AvroListener> listenerRegistry = new ConcurrentHashMap<>();
@Metadata(label = "advanced")
private AvroConfiguration configuration;
diff --git a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
index 9b040f7..4dae923 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
@@ -42,7 +42,7 @@ import static org.apache.camel.component.avro.AvroConstants.AVRO_NETTY_TRANSPORT
*/
public class AvroListener {
- private ConcurrentMap<String, AvroConsumer> consumerRegistry = new ConcurrentHashMap<String, AvroConsumer>();
+ private ConcurrentMap<String, AvroConsumer> consumerRegistry = new ConcurrentHashMap<>();
private AvroConsumer defaultConsumer;
private final Server server;
diff --git a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
index 6a6bd19..03e449b 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
@@ -126,7 +126,7 @@ public class AvroDataFormat extends ServiceSupport implements DataFormat, DataFo
// the schema should be from the graph class name
Schema useSchema = actualSchema != null ? actualSchema : loadSchema(graph.getClass().getName());
- DatumWriter<Object> datum = new SpecificDatumWriter<Object>(useSchema);
+ DatumWriter<Object> datum = new SpecificDatumWriter<>(useSchema);
Encoder encoder = EncoderFactory.get().binaryEncoder(outputStream, null);
datum.write(graph, encoder);
encoder.flush();
@@ -142,7 +142,7 @@ public class AvroDataFormat extends ServiceSupport implements DataFormat, DataFo
classLoader = clazz.getClassLoader();
}
SpecificData specificData = new SpecificDataNoCache(classLoader);
- DatumReader<GenericRecord> reader = new SpecificDatumReader<GenericRecord>(null, null, specificData);
+ DatumReader<GenericRecord> reader = new SpecificDatumReader<>(null, null, specificData);
reader.setSchema(actualSchema);
Decoder decoder = DecoderFactory.get().binaryDecoder(inputStream, null);
Object result = reader.read(null, decoder);
diff --git a/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java b/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java
index 024bcc9..7351f30 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/avro/impl/KeyValueProtocolImpl.java
@@ -28,7 +28,7 @@ import org.apache.camel.avro.generated.Value;
public class KeyValueProtocolImpl implements KeyValueProtocol {
- private Map<Key, Value> store = new HashMap<Key, Value>();
+ private Map<Key, Value> store = new HashMap<>();
@Override
public Void put(Key key, Value value) throws AvroRemoteException {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
index 67bceae..ec2d0a9 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
@@ -32,7 +32,6 @@ import static org.apache.camel.component.aws.xray.TestDataBuilder.createTrace;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertThat;
/**
* This test uses a custom component that will trigger a long-running backing task for certain
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
index a06c805..361ba3b 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
@@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class ErrorTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
index 4e8ea91..b7a204c 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
@@ -196,7 +196,7 @@ public class FakeAWSDaemon extends ExternalResource {
if (json.has("annotations")) {
JsonObject annotations = (JsonObject) json.get("annotations");
for (String key : annotations.getKeys()) {
- entity.withAnnotation((String)key, annotations.get(key));
+ entity.withAnnotation(key, annotations.get(key));
}
}
}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
index 0c08f98..733954b 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class MulticastParallelRouteTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
index a758202..0281465 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class MulticastRouteTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
index 228b0f8..21280ca 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class Route2ConcurrentTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
index 514d876..4832022 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class RouteConcurrentTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
index 962d170..ec8e25b 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
@@ -30,7 +30,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class SpringAwsXRaySimpleRouteTest extends CamelSpringTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
index cf6fab6..913bf7d 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
@@ -25,7 +25,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class TwoService2Test extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
index 89faa75..6c21700 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class TwoServiceTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
index 9a78792..a2a940f 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class TwoServiceWithExcludeTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
index 3653c9d..ca122d3 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
@@ -83,7 +83,7 @@ public class CwProducer extends DefaultProducer {
} else {
Map<String, String> dimensions = exchange.getIn().getHeader(CwConstants.METRIC_DIMENSIONS, Map.class);
if (dimensions != null) {
- Collection<Dimension> dimensionCollection = new ArrayList<Dimension>();
+ Collection<Dimension> dimensionCollection = new ArrayList<>();
for (Map.Entry<String, String> dimensionEntry : dimensions.entrySet()) {
Dimension dimension = new Dimension().withName(dimensionEntry.getKey()).withValue(dimensionEntry.getValue());
dimensionCollection.add(dimension);
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
index 7483ecd..9bc409d 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
@@ -105,7 +105,7 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
}
protected Queue<Exchange> createExchanges(S3Object s3Object) {
- Queue<Exchange> answer = new LinkedList<Exchange>();
+ Queue<Exchange> answer = new LinkedList<>();
Exchange exchange = getEndpoint().createExchange(s3Object);
answer.add(exchange);
return answer;
@@ -117,7 +117,7 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
}
Collection<S3Object> s3Objects = new ArrayList<>();
- Queue<Exchange> answer = new LinkedList<Exchange>();
+ Queue<Exchange> answer = new LinkedList<>();
try {
for (S3ObjectSummary s3ObjectSummary : s3ObjectSummaries) {
S3Object s3Object = getAmazonS3Client().getObject(s3ObjectSummary.getBucketName(), s3ObjectSummary.getKey());
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index 2efb990..fb21dd9 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -167,7 +167,7 @@ public class S3Producer extends DefaultProducer {
final InitiateMultipartUploadResult initResponse = getEndpoint().getS3Client().initiateMultipartUpload(initRequest);
final long contentLength = objectMetadata.getContentLength();
- final List<PartETag> partETags = new ArrayList<PartETag>();
+ final List<PartETag> partETags = new ArrayList<>();
long partSize = getConfiguration().getPartSize();
CompleteMultipartUploadResult uploadResult = null;
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index d87add7..cdfd52d 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -88,7 +88,7 @@ public class SnsProducer extends DefaultProducer {
}
Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> headers, Exchange exchange) {
- Map<String, MessageAttributeValue> result = new HashMap<String, MessageAttributeValue>();
+ Map<String, MessageAttributeValue> result = new HashMap<>();
HeaderFilterStrategy headerFilterStrategy = getEndpoint().getHeaderFilterStrategy();
for (Entry<String, Object> entry : headers.entrySet()) {
// only put the message header which is not filtered into the message attribute
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index bbc3d60..fe8b559 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -132,7 +132,7 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
LOG.trace("Received {} messages in this poll", messages.size());
}
- Queue<Exchange> answer = new LinkedList<Exchange>();
+ Queue<Exchange> answer = new LinkedList<>();
for (Message message : messages) {
Exchange exchange = getEndpoint().createExchange(message);
answer.add(exchange);
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 231f9b6..1ec145b 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -119,7 +119,7 @@ public class SqsProducer extends DefaultProducer {
}
Map<String, MessageAttributeValue> translateAttributes(Map<String, Object> headers, Exchange exchange) {
- Map<String, MessageAttributeValue> result = new HashMap<String, MessageAttributeValue>();
+ Map<String, MessageAttributeValue> result = new HashMap<>();
HeaderFilterStrategy headerFilterStrategy = getEndpoint().getHeaderFilterStrategy();
for (Entry<String, Object> entry : headers.entrySet()) {
// only put the message header which is not filtered into the message attribute
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelActivityImplementationFactory.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelActivityImplementationFactory.java
index 15a487e..33ec393 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelActivityImplementationFactory.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelActivityImplementationFactory.java
@@ -37,7 +37,7 @@ public class CamelActivityImplementationFactory extends ActivityImplementationFa
@Override
public Iterable<ActivityType> getActivityTypesToRegister() {
- ArrayList<ActivityType> activityTypes = new ArrayList<ActivityType>(1);
+ ArrayList<ActivityType> activityTypes = new ArrayList<>(1);
ActivityType activityType = new ActivityType();
activityType.setName(configuration.getEventName());
activityType.setVersion(configuration.getVersion());
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
index 3a07c91..bc33778 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
@@ -94,7 +94,7 @@ public class CamelSWFWorkflowClient {
WorkflowExecutionDetail executionDetail = endpoint.getSWClient().describeWorkflowExecution(describeRequest);
WorkflowExecutionInfo instanceMetadata = executionDetail.getExecutionInfo();
- Map<String, Object> info = new HashMap<String, Object>();
+ Map<String, Object> info = new HashMap<>();
info.put("closeStatus", instanceMetadata.getCloseStatus());
info.put("closeTimestamp", instanceMetadata.getCloseTimestamp());
info.put("executionStatus", instanceMetadata.getExecutionStatus());
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
index 5c724f2..1adb64d 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
@@ -52,8 +52,8 @@ public class CamelWorkflowDefinition extends WorkflowDefinition {
@Override
public Promise<String> execute(final String input) throws WorkflowException {
- final Settable<String> result = new Settable<String>();
- final AtomicReference<Promise<?>> methodResult = new AtomicReference<Promise<?>>();
+ final Settable<String> result = new Settable<>();
+ final AtomicReference<Promise<?>> methodResult = new AtomicReference<>();
new TryCatchFinally() {
@Override
@@ -67,7 +67,7 @@ public class CamelWorkflowDefinition extends WorkflowDefinition {
if (r instanceof Promise) {
methodResult.set((Promise<?>) r);
} else if (r != null) {
- methodResult.set(new Settable<Object>(r));
+ methodResult.set(new Settable<>(r));
}
}
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
index ae4d779..9ffbad1 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
@@ -45,7 +45,7 @@ public class CamelWorkflowDefinitionFactoryFactory extends WorkflowDefinitionFac
@Override
public Iterable<WorkflowType> getWorkflowTypesToRegister() {
- ArrayList<WorkflowType> workflowTypes = new ArrayList<WorkflowType>(1);
+ ArrayList<WorkflowType> workflowTypes = new ArrayList<>(1);
WorkflowType workflowType = new WorkflowType();
workflowType.setName(configuration.getEventName());
workflowType.setVersion(configuration.getVersion());
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
index 86dc0b1..f0c590e 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
@@ -108,7 +108,7 @@ public class CwComponentTest extends CamelTestSupport {
template.send("direct:start", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(CwConstants.METRIC_NAME, "errorCount");
- Map<String, String> dimensionsMap = new LinkedHashMap<String, String>();
+ Map<String, String> dimensionsMap = new LinkedHashMap<>();
dimensionsMap.put("keyOne", "valueOne");
dimensionsMap.put("keyTwo", "valueTwo");
exchange.getIn().setHeader(CwConstants.METRIC_DIMENSIONS, dimensionsMap);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
index 2ddb5d6..d5d549a 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
@@ -134,7 +134,7 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient {
}
private Map<String, AttributeValue> getAttributes() {
- Map<String, AttributeValue> attributes = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> attributes = new HashMap<>();
attributes.put("attrName", new AttributeValue("attrValue"));
return attributes;
}
@@ -161,13 +161,13 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient {
@Override
public BatchGetItemResult batchGetItem(BatchGetItemRequest batchGetItemRequest) {
this.batchGetItemRequest = batchGetItemRequest;
- Map<String, List<Map<String, AttributeValue>>> responseMap = new HashMap<String, List<Map<String, AttributeValue>>>();
- List<Map<String, AttributeValue>> p = new ArrayList<Map<String, AttributeValue>>();
+ Map<String, List<Map<String, AttributeValue>>> responseMap = new HashMap<>();
+ List<Map<String, AttributeValue>> p = new ArrayList<>();
p.add(getAttributes());
responseMap.put("DOMAIN1", p);
- Map<String, AttributeValue> keysMap = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> keysMap = new HashMap<>();
keysMap.put("1", new AttributeValue("UNPROCESSED_KEY"));
- Map<String, KeysAndAttributes> unprocessedKeys = new HashMap<String, KeysAndAttributes>();
+ Map<String, KeysAndAttributes> unprocessedKeys = new HashMap<>();
unprocessedKeys.put("DOMAIN1", new KeysAndAttributes().withKeys(keysMap));
return new BatchGetItemResult()
@@ -181,7 +181,7 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient {
this.scanRequest = scanRequest;
ConsumedCapacity consumed = new ConsumedCapacity();
consumed.setCapacityUnits(1.0);
- Map<String, AttributeValue> lastEvaluatedKey = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> lastEvaluatedKey = new HashMap<>();
lastEvaluatedKey.put("1", new AttributeValue("LAST_KEY"));
return new ScanResult()
.withConsumedCapacity(consumed)
@@ -197,7 +197,7 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient {
this.queryRequest = queryRequest;
ConsumedCapacity consumed = new ConsumedCapacity();
consumed.setCapacityUnits(1.0);
- Map<String, AttributeValue> lastEvaluatedKey = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> lastEvaluatedKey = new HashMap<>();
lastEvaluatedKey.put("1", new AttributeValue("LAST_KEY"));
return new QueryResult()
.withConsumedCapacity(consumed)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
index e8af0f9..8194bc9 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
@@ -47,11 +47,11 @@ public class BatchGetItemsCommandTest {
@Test
public void execute() {
- Map<String, AttributeValue> key = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> key = new HashMap<>();
key.put("1", new AttributeValue("Key_1"));
- Map<String, AttributeValue> unprocessedKey = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> unprocessedKey = new HashMap<>();
unprocessedKey.put("1", new AttributeValue("UNPROCESSED_KEY"));
- Map<String, KeysAndAttributes> keysAndAttributesMap = new HashMap<String, KeysAndAttributes>();
+ Map<String, KeysAndAttributes> keysAndAttributesMap = new HashMap<>();
KeysAndAttributes keysAndAttributes = new KeysAndAttributes().withKeys(key);
keysAndAttributesMap.put("DOMAIN1", keysAndAttributes);
exchange.getIn().setHeader(DdbConstants.BATCH_ITEMS, keysAndAttributesMap);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
index 4665f76..9e58913 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
@@ -47,12 +47,12 @@ public class DeleteItemCommandTest {
@Test
public void execute() {
- Map<String, AttributeValue> key = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> key = new HashMap<>();
key.put("1", new AttributeValue("Key_1"));
exchange.getIn().setHeader(DdbConstants.KEY, key);
- Map<String, ExpectedAttributeValue> updateCondition = new HashMap<String, ExpectedAttributeValue>();
+ Map<String, ExpectedAttributeValue> updateCondition = new HashMap<>();
updateCondition
.put("name", new ExpectedAttributeValue(new AttributeValue("expected value")));
exchange.getIn().setHeader(DdbConstants.UPDATE_CONDITION, updateCondition);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
index 06f7682..b0fbadd 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
@@ -48,7 +48,7 @@ public class DescribeTableCommandTest {
@Test
public void testExecute() {
command.execute();
- List<KeySchemaElement> keySchema = new ArrayList<KeySchemaElement>();
+ List<KeySchemaElement> keySchema = new ArrayList<>();
keySchema.add(new KeySchemaElement().withAttributeName("name"));
assertEquals("FULL_DESCRIBE_TABLE", ddbClient.describeTableRequest.getTableName());
assertEquals("FULL_DESCRIBE_TABLE", exchange.getIn().getHeader(DdbConstants.TABLE_NAME));
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
index a813fe4..da3de60 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
@@ -47,7 +47,7 @@ public class GetItemCommandTest {
@Test
public void execute() {
- Map<String, AttributeValue> key = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> key = new HashMap<>();
key.put("1", new AttributeValue("Key_1"));
exchange.getIn().setHeader(DdbConstants.KEY, key);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
index 63a4a01..8a94314 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
@@ -47,12 +47,12 @@ public class PutItemCommandTest {
@Test
public void execute() {
- Map<String, AttributeValue> attributeMap = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> attributeMap = new HashMap<>();
AttributeValue attributeValue = new AttributeValue("test value");
attributeMap.put("name", attributeValue);
exchange.getIn().setHeader(DdbConstants.ITEM, attributeMap);
- Map<String, ExpectedAttributeValue> expectedAttributeValueMap = new HashMap<String, ExpectedAttributeValue>();
+ Map<String, ExpectedAttributeValue> expectedAttributeValueMap = new HashMap<>();
expectedAttributeValueMap.put("name", new ExpectedAttributeValue(attributeValue));
exchange.getIn().setHeader(DdbConstants.UPDATE_CONDITION, expectedAttributeValueMap);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
index 97e5897..d5919b6 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
@@ -52,7 +52,7 @@ public class QueryCommandTest {
@Test
public void execute() {
- Map<String, AttributeValue> startKey = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> startKey = new HashMap<>();
startKey.put("1", new AttributeValue("startKey"));
List<String> attributeNames = Arrays.asList("attrNameOne", "attrNameTwo");
@@ -62,7 +62,7 @@ public class QueryCommandTest {
exchange.getIn().setHeader(DdbConstants.LIMIT, 10);
exchange.getIn().setHeader(DdbConstants.SCAN_INDEX_FORWARD, true);
- Map<String, Condition> keyConditions = new HashMap<String, Condition>();
+ Map<String, Condition> keyConditions = new HashMap<>();
Condition condition = new Condition()
.withComparisonOperator(ComparisonOperator.GT.toString())
.withAttributeValueList(new AttributeValue().withN("1985"));
@@ -73,7 +73,7 @@ public class QueryCommandTest {
command.execute();
- Map<String, AttributeValue> mapAssert = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> mapAssert = new HashMap<>();
mapAssert.put("1", new AttributeValue("LAST_KEY"));
ConsumedCapacity consumed = (ConsumedCapacity) exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY);
assertEquals(Integer.valueOf(1), exchange.getIn().getHeader(DdbConstants.COUNT, Integer.class));
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
index 9bcfc6a..4c3d99b 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
@@ -50,7 +50,7 @@ public class ScanCommandTest {
@Test
public void execute() {
- Map<String, Condition> scanFilter = new HashMap<String, Condition>();
+ Map<String, Condition> scanFilter = new HashMap<>();
Condition condition = new Condition()
.withComparisonOperator(ComparisonOperator.GT.toString())
.withAttributeValueList(new AttributeValue().withN("1985"));
@@ -59,7 +59,7 @@ public class ScanCommandTest {
command.execute();
- Map<String, AttributeValue> mapAssert = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> mapAssert = new HashMap<>();
mapAssert.put("1", new AttributeValue("LAST_KEY"));
ConsumedCapacity consumed = (ConsumedCapacity) exchange.getIn().getHeader(DdbConstants.CONSUMED_CAPACITY);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
index 5f2f0e5..37c84e6 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
@@ -49,17 +49,17 @@ public class UpdateItemCommandTest {
@Test
public void execute() {
- Map<String, AttributeValue> key = new HashMap<String, AttributeValue>();
+ Map<String, AttributeValue> key = new HashMap<>();
key.put("1", new AttributeValue("Key_1"));
exchange.getIn().setHeader(DdbConstants.KEY, key);
- Map<String, AttributeValueUpdate> attributeMap = new HashMap<String, AttributeValueUpdate>();
+ Map<String, AttributeValueUpdate> attributeMap = new HashMap<>();
AttributeValueUpdate attributeValue = new AttributeValueUpdate(
new AttributeValue("new value"), AttributeAction.ADD);
attributeMap.put("name", attributeValue);
exchange.getIn().setHeader(DdbConstants.UPDATE_VALUES, attributeMap);
- Map<String, ExpectedAttributeValue> expectedAttributeValueMap = new HashMap<String, ExpectedAttributeValue>();
+ Map<String, ExpectedAttributeValue> expectedAttributeValueMap = new HashMap<>();
expectedAttributeValueMap
.put("name", new ExpectedAttributeValue(new AttributeValue("expected value")));
exchange.getIn().setHeader(DdbConstants.UPDATE_CONDITION, expectedAttributeValueMap);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
index 0c485fc..968d9d8 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
@@ -41,7 +41,7 @@ public class DdbComponentIntegrationTest extends CamelTestSupport {
@Test
public void select() {
- final Map<String, AttributeValue> attributeMap = new HashMap<String, AttributeValue>();
+ final Map<String, AttributeValue> attributeMap = new HashMap<>();
AttributeValue attributeValue = new AttributeValue("test value");
attributeMap.put("name", attributeValue);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
index a8689e7..ff9502f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
@@ -119,7 +119,7 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
public StartInstancesResult startInstances(StartInstancesRequest startInstancesRequest) {
StartInstancesResult result = new StartInstancesResult();
if (startInstancesRequest.getInstanceIds().get(0).equals("test-1")) {
- Collection<InstanceStateChange> coll = new ArrayList<InstanceStateChange>();
+ Collection<InstanceStateChange> coll = new ArrayList<>();
InstanceStateChange sc = new InstanceStateChange();
InstanceState previousState = new InstanceState();
previousState.setCode(80);
@@ -142,7 +142,7 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
public StopInstancesResult stopInstances(StopInstancesRequest stopInstancesRequest) {
StopInstancesResult result = new StopInstancesResult();
if (stopInstancesRequest.getInstanceIds().get(0).equals("test-1")) {
- Collection<InstanceStateChange> coll = new ArrayList<InstanceStateChange>();
+ Collection<InstanceStateChange> coll = new ArrayList<>();
InstanceStateChange sc = new InstanceStateChange();
InstanceState previousState = new InstanceState();
previousState.setCode(80);
@@ -165,7 +165,7 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
public TerminateInstancesResult terminateInstances(TerminateInstancesRequest terminateInstancesRequest) {
TerminateInstancesResult result = new TerminateInstancesResult();
if (terminateInstancesRequest.getInstanceIds().contains("test-1")) {
- Collection<InstanceStateChange> coll = new ArrayList<InstanceStateChange>();
+ Collection<InstanceStateChange> coll = new ArrayList<>();
InstanceStateChange sc = new InstanceStateChange();
InstanceState previousState = new InstanceState();
previousState.setCode(80);
@@ -188,7 +188,7 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
public DescribeInstancesResult describeInstances(DescribeInstancesRequest describeInstancesRequest) {
DescribeInstancesResult result = new DescribeInstancesResult();
if (describeInstancesRequest.getInstanceIds().isEmpty()) {
- Collection<Reservation> list = new ArrayList<Reservation>();
+ Collection<Reservation> list = new ArrayList<>();
Reservation res = new Reservation();
res.setOwnerId("1");
res.setRequesterId("user-test");
@@ -209,7 +209,7 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
result.setReservations(list);
} else {
if (describeInstancesRequest.getInstanceIds().contains("instance-1")) {
- Collection<Reservation> list = new ArrayList<Reservation>();
+ Collection<Reservation> list = new ArrayList<>();
Reservation res = new Reservation();
res.setOwnerId("1");
res.setRequesterId("user-test");
@@ -270,7 +270,7 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
Collection<InstanceMonitoring> coll = new ArrayList<>();
Iterator<String> it = monitorInstancesRequest.getInstanceIds().iterator();
while (it.hasNext()) {
- String id = (String) it.next();
+ String id = it.next();
InstanceMonitoring mon = new InstanceMonitoring();
mon.setInstanceId(id);
Monitoring monitoring = new Monitoring();
@@ -290,7 +290,7 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
Collection<InstanceMonitoring> coll = new ArrayList<>();
Iterator<String> it = unmonitorInstancesRequest.getInstanceIds().iterator();
while (it.hasNext()) {
- String id = (String) it.next();
+ String id = it.next();
InstanceMonitoring mon = new InstanceMonitoring();
mon.setInstanceId(id);
Monitoring monitoring = new Monitoring();
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
index 39f7997..39a19a4 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
@@ -82,7 +82,7 @@ public class EC2ProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(EC2Constants.INSTANCE_TYPE, InstanceType.T2Micro);
exchange.getIn().setHeader(EC2Constants.INSTANCE_MIN_COUNT, 1);
exchange.getIn().setHeader(EC2Constants.INSTANCE_MAX_COUNT, 1);
- Collection<String> secGroups = new ArrayList<String>();
+ Collection<String> secGroups = new ArrayList<>();
secGroups.add("secgroup-1");
secGroups.add("secgroup-2");
exchange.getIn().setHeader(EC2Constants.INSTANCE_SECURITY_GROUPS, secGroups);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
index 49212f4..9ecb178 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
@@ -55,7 +55,7 @@ public class EC2ComponentIntegrationTest extends CamelTestSupport {
exchange.getIn().setHeader(EC2Constants.INSTANCE_TYPE, InstanceType.T2Micro);
exchange.getIn().setHeader(EC2Constants.INSTANCE_MIN_COUNT, 1);
exchange.getIn().setHeader(EC2Constants.INSTANCE_MAX_COUNT, 1);
- Collection<String> secGroups = new ArrayList<String>();
+ Collection<String> secGroups = new ArrayList<>();
secGroups.add("secgroup-1");
secGroups.add("secgroup-2");
exchange.getIn().setHeader(EC2Constants.INSTANCE_SECURITY_GROUPS, secGroups);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
index b50acf9..e5aa059 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
@@ -256,7 +256,7 @@ public class AmazonKMSClientMock implements AWSKMS {
@Override
public ListKeysResult listKeys(ListKeysRequest listKeysRequest) {
ListKeysResult result = new ListKeysResult();
- List<KeyListEntry> keyList = new ArrayList<KeyListEntry>();
+ List<KeyListEntry> keyList = new ArrayList<>();
KeyListEntry kle = new KeyListEntry();
kle.withKeyId("keyId");
keyList.add(kle);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
index d7599de..b367195 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
@@ -210,7 +210,7 @@ public class AmazonLambdaClientMock implements AWSLambda {
public InvokeResult invoke(InvokeRequest invokeRequest) {
InvokeResult result = new InvokeResult();
- Map<String, Object> payload = new HashMap<String, Object>();
+ Map<String, Object> payload = new HashMap<>();
try {
ObjectMapper mapper = new ObjectMapper();
payload = mapper.readValue(StandardCharsets.UTF_8.decode(invokeRequest.getPayload()).toString(), new TypeReference<Map<String, String>>() {
@@ -247,7 +247,7 @@ public class AmazonLambdaClientMock implements AWSLambda {
public ListFunctionsResult listFunctions() {
ListFunctionsResult result = new ListFunctionsResult();
- Collection<FunctionConfiguration> listFunctions = new ArrayList<FunctionConfiguration>();
+ Collection<FunctionConfiguration> listFunctions = new ArrayList<>();
FunctionConfiguration configuration = new FunctionConfiguration();
configuration.setFunctionName("GetHelloWithName");
configuration.setFunctionArn("arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index 64680f1..4b458af 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -82,8 +82,8 @@ import org.junit.Assert;
public class AmazonS3ClientMock extends AmazonS3Client {
- List<S3Object> objects = new CopyOnWriteArrayList<S3Object>();
- List<PutObjectRequest> putObjectRequests = new CopyOnWriteArrayList<PutObjectRequest>();
+ List<S3Object> objects = new CopyOnWriteArrayList<>();
+ List<PutObjectRequest> putObjectRequests = new CopyOnWriteArrayList<>();
private boolean nonExistingBucketCreated;
@@ -167,7 +167,7 @@ public class AmazonS3ClientMock extends AmazonS3Client {
@Override
public List<Bucket> listBuckets() throws AmazonClientException, AmazonServiceException {
- ArrayList<Bucket> list = new ArrayList<Bucket>();
+ ArrayList<Bucket> list = new ArrayList<>();
Bucket bucket = new Bucket("camel-bucket");
bucket.setOwner(new Owner("Camel", "camel"));
bucket.setCreationDate(new Date());
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
index 06e64fd..deac036 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
@@ -83,8 +83,8 @@ import org.junit.Assert;
public class AmazonS3EncryptionClientMock extends AmazonS3EncryptionClient {
- List<S3Object> objects = new CopyOnWriteArrayList<S3Object>();
- List<PutObjectRequest> putObjectRequests = new CopyOnWriteArrayList<PutObjectRequest>();
+ List<S3Object> objects = new CopyOnWriteArrayList<>();
+ List<PutObjectRequest> putObjectRequests = new CopyOnWriteArrayList<>();
private boolean nonExistingBucketCreated;
@@ -168,7 +168,7 @@ public class AmazonS3EncryptionClientMock extends AmazonS3EncryptionClient {
@Override
public List<Bucket> listBuckets() throws AmazonClientException, AmazonServiceException {
- ArrayList<Bucket> list = new ArrayList<Bucket>();
+ ArrayList<Bucket> list = new ArrayList<>();
Bucket bucket = new Bucket("camel-bucket");
bucket.setOwner(new Owner("Camel", "camel"));
bucket.setCreationDate(new Date());
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
index 8a79e57..dd25cc9 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
@@ -93,9 +93,9 @@ public class S3ComponentExistingBucketTest extends CamelTestSupport {
public void sendCustomHeaderValues() throws Exception {
result.expectedMessageCount(1);
final Date now = new Date();
- final Map<String, String> userMetadata = new HashMap<String, String>();
+ final Map<String, String> userMetadata = new HashMap<>();
userMetadata.put("CamelName", "Camel");
- final Map<String, String> s3Headers = new HashMap<String, String>();
+ final Map<String, String> s3Headers = new HashMap<>();
s3Headers.put("x-aws-s3-header", "extra");
Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor() {
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
index 95314ca..adce3f9 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
@@ -93,7 +93,7 @@ public class S3ComponentNonExistingBucketTest extends CamelTestSupport {
public void sendCustomHeaderValues() throws Exception {
result.expectedMessageCount(1);
final Date now = new Date();
- final Map<String, String> s3Headers = new HashMap<String, String>();
+ final Map<String, String> s3Headers = new HashMap<>();
s3Headers.put("x-aws-s3-header", "extra");
Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor() {
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
index 8bc11c5..088ef8f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
@@ -49,7 +49,7 @@ public class BatchDeleteAttributesCommandTest {
@Test
public void execute() {
- List<Item> deletableItems = new ArrayList<Item>();
+ List<Item> deletableItems = new ArrayList<>();
deletableItems.add(new Item());
exchange.getIn().setHeader(SdbConstants.DELETABLE_ITEMS, deletableItems);
@@ -63,7 +63,7 @@ public class BatchDeleteAttributesCommandTest {
public void determineDeletableItems() {
assertNull(this.command.determineDeletableItems());
- List<Item> deletableItems = new ArrayList<Item>();
+ List<Item> deletableItems = new ArrayList<>();
deletableItems.add(new Item());
exchange.getIn().setHeader(SdbConstants.DELETABLE_ITEMS, deletableItems);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
index 28b2923..14e2447 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
@@ -49,7 +49,7 @@ public class BatchPutAttributesCommandTest {
@Test
public void execute() {
- List<ReplaceableItem> replaceableItems = new ArrayList<ReplaceableItem>();
+ List<ReplaceableItem> replaceableItems = new ArrayList<>();
replaceableItems.add(new ReplaceableItem("ITEM1"));
exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ITEMS, replaceableItems);
@@ -63,7 +63,7 @@ public class BatchPutAttributesCommandTest {
public void determineReplaceableItems() {
assertNull(this.command.determineReplaceableItems());
- List<ReplaceableItem> replaceableItems = new ArrayList<ReplaceableItem>();
+ List<ReplaceableItem> replaceableItems = new ArrayList<>();
replaceableItems.add(new ReplaceableItem("ITEM1"));
exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ITEMS, replaceableItems);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
index 1123972..a1b6961 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
@@ -50,7 +50,7 @@ public class DeleteAttributesCommandTest {
@Test
public void execute() {
- List<Attribute> attributes = new ArrayList<Attribute>();
+ List<Attribute> attributes = new ArrayList<>();
attributes.add(new Attribute("NAME1", "VALUE1"));
exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
@@ -67,7 +67,7 @@ public class DeleteAttributesCommandTest {
@Test(expected = IllegalArgumentException.class)
public void executeWithoutItemName() {
- List<Attribute> attributes = new ArrayList<Attribute>();
+ List<Attribute> attributes = new ArrayList<>();
attributes.add(new Attribute("NAME1", "VALUE1"));
exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
@@ -80,7 +80,7 @@ public class DeleteAttributesCommandTest {
public void determineAttributes() {
assertNull(this.command.determineAttributes());
- List<Attribute> attributes = new ArrayList<Attribute>();
+ List<Attribute> attributes = new ArrayList<>();
attributes.add(new Attribute("NAME1", "VALUE1"));
exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
index 85c30b2..0926154 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
@@ -51,7 +51,7 @@ public class GetAttributesCommandTest {
@SuppressWarnings("unchecked")
@Test
public void execute() {
- List<String> attributeNames = new ArrayList<String>();
+ List<String> attributeNames = new ArrayList<>();
attributeNames.add("ATTRIBUTE1");
exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
@@ -73,7 +73,7 @@ public class GetAttributesCommandTest {
@Test(expected = IllegalArgumentException.class)
public void executeWithoutItemName() {
- List<String> attributeNames = new ArrayList<String>();
+ List<String> attributeNames = new ArrayList<>();
attributeNames.add("ATTRIBUTE1");
exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
@@ -84,7 +84,7 @@ public class GetAttributesCommandTest {
public void determineAttributeNames() {
assertNull(this.command.determineAttributeNames());
- List<String> attributeNames = new ArrayList<String>();
+ List<String> attributeNames = new ArrayList<>();
attributeNames.add("ATTRIBUTE1");
exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
index c961461..9d58256 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
@@ -50,7 +50,7 @@ public class PutAttributesCommandTest {
@Test
public void execute() {
- List<ReplaceableAttribute> replaceableAttributes = new ArrayList<ReplaceableAttribute>();
+ List<ReplaceableAttribute> replaceableAttributes = new ArrayList<>();
replaceableAttributes.add(new ReplaceableAttribute("NAME1", "VALUE1", true));
exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
exchange.getIn().setHeader(SdbConstants.ITEM_NAME, "ITEM1");
@@ -67,7 +67,7 @@ public class PutAttributesCommandTest {
@Test(expected = IllegalArgumentException.class)
public void executeWithoutItemName() {
- List<ReplaceableAttribute> replaceableAttributes = new ArrayList<ReplaceableAttribute>();
+ List<ReplaceableAttribute> replaceableAttributes = new ArrayList<>();
replaceableAttributes.add(new ReplaceableAttribute("NAME1", "VALUE1", true));
exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
@@ -80,7 +80,7 @@ public class PutAttributesCommandTest {
public void determineReplaceableAttributes() {
assertNull(this.command.determineReplaceableAttributes());
- List<ReplaceableAttribute> replaceableAttributes = new ArrayList<ReplaceableAttribute>();
+ List<ReplaceableAttribute> replaceableAttributes = new ArrayList<>();
replaceableAttributes.add(new ReplaceableAttribute("NAME1", "VALUE1", true));
exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
index dbbb410..4de4323 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
@@ -160,7 +160,7 @@ public class AmazonSNSClientMock extends AmazonSNSClient {
ListTopicsResult res = new ListTopicsResult();
Topic topic = new Topic();
topic.setTopicArn(DEFAULT_TOPIC_ARN);
- List<Topic> list = new ArrayList<Topic>();
+ List<Topic> list = new ArrayList<>();
list.add(topic);
res.setTopics(list);
return res;
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
index 5c8d71c..691900c 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
@@ -49,10 +49,10 @@ import com.amazonaws.services.sqs.model.SetQueueAttributesResult;
public class AmazonSQSClientMock extends AmazonSQSClient {
- List<Message> messages = new ArrayList<Message>();
- Map<String, Map<String, String>> queueAttributes = new HashMap<String, Map<String, String>>();
- List<ChangeMessageVisibilityRequest> changeMessageVisibilityRequests = new CopyOnWriteArrayList<ChangeMessageVisibilityRequest>();
- private Map<String, CreateQueueRequest> queues = new LinkedHashMap<String, CreateQueueRequest>();
+ List<Message> messages = new ArrayList<>();
+ Map<String, Map<String, String>> queueAttributes = new HashMap<>();
+ List<ChangeMessageVisibilityRequest> changeMessageVisibilityRequests = new CopyOnWriteArrayList<>();
+ private Map<String, CreateQueueRequest> queues = new LinkedHashMap<>();
private Map<String, ScheduledFuture<?>> inFlight = new LinkedHashMap<>();
private ScheduledExecutorService scheduler;
@@ -98,7 +98,7 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
public ReceiveMessageResult receiveMessage(ReceiveMessageRequest receiveMessageRequest) throws AmazonServiceException, AmazonClientException {
Integer maxNumberOfMessages = receiveMessageRequest.getMaxNumberOfMessages() != null ? receiveMessageRequest.getMaxNumberOfMessages() : Integer.MAX_VALUE;
ReceiveMessageResult result = new ReceiveMessageResult();
- Collection<Message> resultMessages = new ArrayList<Message>();
+ Collection<Message> resultMessages = new ArrayList<>();
synchronized (messages) {
int fetchSize = 0;
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
index e8b5bde..a142a45 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
@@ -33,7 +33,7 @@ public class SqsConcurrentConsumerTest extends CamelTestSupport {
private static final int NUM_CONCURRENT = 10;
private static final int NUM_MESSAGES = 100;
- final Set<Long> threadNumbers = new HashSet<Long>();
+ final Set<Long> threadNumbers = new HashSet<>();
@Test
public void consumeMessagesFromQueue() throws Exception {
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
index 4f4eb22..f62e3d1 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
@@ -27,6 +27,7 @@ import com.amazonaws.services.sqs.model.QueueAttributeName;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import static org.junit.Assert.assertEquals;
@@ -83,7 +84,7 @@ public class SqsEndpointTest {
CreateQueueRequest expectedCreateQueueRequest = new CreateQueueRequest("test-queue.fifo")
.addAttributesEntry(QueueAttributeName.FifoQueue.name(), "true")
.addAttributesEntry(QueueAttributeName.ContentBasedDeduplication.name(), "true");
- Mockito.when(amazonSQSClient.createQueue(Mockito.any(CreateQueueRequest.class)))
+ Mockito.when(amazonSQSClient.createQueue(ArgumentMatchers.any(CreateQueueRequest.class)))
.thenReturn(new CreateQueueResult()
.withQueueUrl("https://sqs.us-east-1.amazonaws.com/111222333/test-queue.fifo"));
@@ -101,7 +102,7 @@ public class SqsEndpointTest {
CreateQueueRequest expectedCreateQueueRequest = new CreateQueueRequest("test-queue.fifo")
.addAttributesEntry(QueueAttributeName.FifoQueue.name(), "true")
.addAttributesEntry(QueueAttributeName.ContentBasedDeduplication.name(), "false");
- Mockito.when(amazonSQSClient.createQueue(Mockito.any(CreateQueueRequest.class)))
+ Mockito.when(amazonSQSClient.createQueue(ArgumentMatchers.any(CreateQueueRequest.class)))
.thenReturn(new CreateQueueResult()
.withQueueUrl("https://sqs.us-east-1.amazonaws.com/111222333/test-queue.fifo"));
@@ -127,7 +128,7 @@ public class SqsEndpointTest {
.addAttributesEntry(QueueAttributeName.Policy.name(), "{\"Version\": \"2012-10-17\"}")
.addAttributesEntry(QueueAttributeName.ReceiveMessageWaitTimeSeconds.name(), "5")
.addAttributesEntry(QueueAttributeName.RedrivePolicy.name(), "{ \"deadLetterTargetArn\" : String, \"maxReceiveCount\" : Integer }");
- Mockito.when(amazonSQSClient.createQueue(Mockito.any(CreateQueueRequest.class)))
+ Mockito.when(amazonSQSClient.createQueue(ArgumentMatchers.any(CreateQueueRequest.class)))
.thenReturn(new CreateQueueResult()
.withQueueUrl("https://sqs.us-east-1.amazonaws.com/111222333/test-queue"));
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
index 74663c4..62c7864 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
@@ -160,7 +160,7 @@ public class SqsProducerTest {
@Test
public void isAttributeMessageStringHeaderOnTheRequest() throws Exception {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(SAMPLE_MESSAGE_HEADER_NAME_1, SAMPLE_MESSAGE_HEADER_VALUE_1);
when(inMessage.getHeaders()).thenReturn(headers);
underTest.process(exchange);
@@ -174,7 +174,7 @@ public class SqsProducerTest {
@Test
public void isAttributeMessageByteBufferHeaderOnTheRequest() throws Exception {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(SAMPLE_MESSAGE_HEADER_NAME_2, SAMPLE_MESSAGE_HEADER_VALUE_2);
when(inMessage.getHeaders()).thenReturn(headers);
underTest.process(exchange);
@@ -188,7 +188,7 @@ public class SqsProducerTest {
@Test
public void isAllAttributeMessagesOnTheRequest() throws Exception {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(SAMPLE_MESSAGE_HEADER_NAME_1, SAMPLE_MESSAGE_HEADER_VALUE_1);
headers.put(SAMPLE_MESSAGE_HEADER_NAME_2, SAMPLE_MESSAGE_HEADER_VALUE_2);
headers.put(SAMPLE_MESSAGE_HEADER_NAME_3, SAMPLE_MESSAGE_HEADER_VALUE_3);
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java
index 6a93c7e..8e4f6b8 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java
@@ -157,7 +157,7 @@ public class BlobServiceProducer extends DefaultProducer {
List<BlobBlock> blobBlocks = null;
if (object instanceof List) {
- blobBlocks = (List<BlobBlock>)blobBlocks;
+ blobBlocks = blobBlocks;
} else if (object instanceof BlobBlock) {
blobBlocks = Collections.singletonList((BlobBlock)object);
}
@@ -170,7 +170,7 @@ public class BlobServiceProducer extends DefaultProducer {
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
LOG.trace("Putting a blob [{}] from blocks from exchange [{}]...", getConfiguration().getBlobName(), exchange);
- List<BlockEntry> blockEntries = new LinkedList<BlockEntry>();
+ List<BlockEntry> blockEntries = new LinkedList<>();
for (BlobBlock blobBlock : blobBlocks) {
blockEntries.add(blobBlock.getBlockEntry());
client.uploadBlock(blobBlock.getBlockEntry().getId(), blobBlock.getBlockStream(), -1,
@@ -189,7 +189,7 @@ public class BlobServiceProducer extends DefaultProducer {
List<BlockEntry> blockEntries = null;
if (object instanceof List) {
- blockEntries = (List<BlockEntry>)blockEntries;
+ blockEntries = blockEntries;
} else if (object instanceof BlockEntry) {
blockEntries = Collections.singletonList((BlockEntry)object);
}
@@ -435,7 +435,7 @@ public class BlobServiceProducer extends DefaultProducer {
client.setStreamWriteSizeInBytes(getConfiguration().getStreamWriteSize());
}
if (getConfiguration().getBlobMetadata() != null) {
- client.setMetadata(new HashMap<String, String>(getConfiguration().getBlobMetadata()));
+ client.setMetadata(new HashMap<>(getConfiguration().getBlobMetadata()));
}
}
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceUtil.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceUtil.java
index 9669dbe..410cb32 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceUtil.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceUtil.java
@@ -42,7 +42,7 @@ public final class QueueServiceUtil {
public static CloudQueue createQueueClient(QueueServiceConfiguration cfg)
throws Exception {
- CloudQueue client = (CloudQueue) getConfiguredClient(cfg);
+ CloudQueue client = getConfiguredClient(cfg);
if (client == null) {
URI uri = prepareStorageQueueUri(cfg);
StorageCredentials creds = getAccountCredentials(cfg);
diff --git a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java
index 2174597c..3e916f9 100644
--- a/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java
+++ b/components/camel-azure/src/test/java/org/apache/camel/component/azure/queue/QueueServiceProducerTest.java
@@ -106,6 +106,6 @@ public class QueueServiceProducerTest {
private Context createJndiContext() throws Exception {
Properties properties = new Properties();
properties.put("java.naming.factory.initial", "org.apache.camel.util.jndi.CamelInitialContextFactory");
- return new InitialContext(new Hashtable<Object, Object>(properties));
+ return new InitialContext(new Hashtable<>(properties));
}
}
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.
[camel] 02/04: 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 a3c9d73b05e7df284992d950803f309c1c6af691
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 14:39:47 2018 +0200
polish
---
.../java/org/apache/camel/bam/ProcessBuilder.java | 6 ++--
.../apache/camel/bam/model/ProcessInstance.java | 2 +-
.../camel/bam/processor/ActivityMonitorEngine.java | 2 +-
.../org/apache/camel/bam/rules/ActivityRules.java | 2 +-
.../org/apache/camel/bam/rules/ProcessRules.java | 2 +-
.../dataformat/barcode/BarcodeDataFormat.java | 4 +--
.../camel/dataformat/beanio/BeanIODataFormat.java | 4 +--
.../beanio/BeanIODataFormatComplexTest.java | 2 +-
...rmatSimpleCustomBeanReaderErrorHandlerTest.java | 2 +-
.../beanio/BeanIODataFormatSimpleTest.java | 2 +-
...IOSplitterCustomBeanReaderErrorHandlerTest.java | 2 +-
.../dataformat/beanio/BeanIOSplitterTest.java | 2 +-
.../org/apache/camel/dataformat/beanio/Header.java | 2 +-
.../beanio/SpringBeanIODataFormatSimpleTest.java | 2 +-
.../camel/dataformat/beanio/csv/CsvTest.java | 2 +-
.../component/beanstalk/ConnectionSettings.java | 2 +-
.../beanstalk/ConsumerToProducerHeadersTest.java | 2 +-
.../dataformat/bindy/BindyAbstractFactory.java | 8 ++---
.../camel/dataformat/bindy/BindyCsvFactory.java | 31 +++++++++-----------
.../dataformat/bindy/BindyFixedLengthFactory.java | 15 ++++------
.../dataformat/bindy/BindyKeyValuePairFactory.java | 23 +++++++--------
.../dataformat/bindy/csv/BindyCsvDataFormat.java | 10 +++----
.../bindy/fixed/BindyFixedLengthDataFormat.java | 6 ++--
.../bindy/kvp/BindyKeyValuePairDataFormat.java | 4 +--
.../bindy/util/AnnotationModelLoader.java | 4 +--
.../BindyComplexCsvGenerateHeaderMarshallTest.java | 4 +--
.../bindy/csv/BindyComplexCsvMarshallTest.java | 4 +--
.../BindySimpleCsvBooleanFalseMarshallTest.java | 4 +--
.../csv/BindySimpleCsvBooleanTrueMarshallTest.java | 4 +--
.../BindySimpleCsvGenerateHeaderMarshallTest.java | 4 +--
.../bindy/csv/BindySimpleCsvMarshallDslTest.java | 4 +--
...BindySimpleCsvMarshallPositionModifiedTest.java | 4 +--
.../bindy/csv/BindySimpleCsvMarshallTest.java | 4 +--
.../bindy/csv/BindySimpleCsvNullMarshallTest.java | 4 +--
.../csv/BindySimpleCsvOneToManyMarshallTest.java | 6 ++--
.../bindy/csv/BindySimpleCsvUnmarshallTest.java | 1 -
.../bindy/csv/WickedHeaderWithCommaCsvTest.java | 2 +-
.../BindyComplexKeyValuePairStandaloneTest.java | 4 +--
.../BindySimpleKeyValuePairMarshallDslTest.java | 4 +--
.../fix/BindySimpleKeyValuePairMarshallTest.java | 4 +--
.../BindySimpleKeyValuePairNullMarshallTest.java | 4 +--
.../BindySimpleKeyValuePairSortedMarshallTest.java | 4 +--
.../BindySimpleKeyValuePairTabMarshallTest.java | 4 +--
...eKeyValuePairWithoutSectionMarshallDslTest.java | 4 +--
.../BindySimpleFixedLengthHeaderFooterTest.java | 14 ++++-----
.../simple/BindySimpleFixedLengthMarshallTest.java | 4 +--
...mpleFixedLengthMarshallWithClipAndTrimTest.java | 4 +--
...BindySimpleFixedLengthMarshallWithClipTest.java | 4 +--
...ndySimpleFixedLengthMarshallWithNoClipTest.java | 4 +--
.../BindySimpleFixedLengthObjectMarshallTest.java | 2 +-
...BindyFixedLengthHeaderFooterSkipHeaderTest.java | 8 ++---
.../BlueprintCamelContextLookupHelper.java | 2 +-
.../blueprint/BlueprintContainerRegistry.java | 4 +--
.../BlueprintModelJAXBContextFactory.java | 2 +-
.../camel/blueprint/BlueprintPropertiesParser.java | 4 +--
.../camel/blueprint/CamelContextFactoryBean.java | 20 ++++++-------
.../blueprint/CamelRestContextFactoryBean.java | 2 +-
.../blueprint/CamelRouteContextFactoryBean.java | 2 +-
.../blueprint/handler/CamelNamespaceHandler.java | 4 +--
.../bonita/api/filter/BonitaAuthFilter.java | 2 +-
.../component/bonita/BonitaConfigurationTest.java | 3 +-
.../camel/component/boon/BoonDataFormatTest.java | 6 ++--
.../component/box/api/BoxEventLogsManager.java | 8 ++---
.../camel/component/box/api/BoxFilesManager.java | 4 +--
.../camel/component/box/api/BoxFoldersManager.java | 6 ++--
.../camel/component/box/api/BoxGroupsManager.java | 2 +-
.../camel/component/box/api/BoxSearchManager.java | 2 +-
.../camel/component/box/api/BoxTasksManager.java | 2 +-
.../camel/component/box/api/BoxUsersManager.java | 2 +-
.../apache/camel/component/box/BoxComponent.java | 2 --
.../camel/component/box/BoxConfiguration.java | 1 -
.../apache/camel/component/box/BoxConsumer.java | 3 +-
.../apache/camel/component/box/BoxEndpoint.java | 2 --
.../apache/camel/component/box/BoxProducer.java | 1 -
.../box/internal/BoxConnectionHelper.java | 2 +-
.../component/box/AbstractBoxTestSupport.java | 2 +-
.../BoxCollaborationsManagerIntegrationTest.java | 8 ++---
.../box/BoxCommentsManagerIntegrationTest.java | 8 ++---
.../box/BoxEventLogsManagerIntegrationTest.java | 4 +--
.../box/BoxEventsManagerIntegrationTest.java | 2 --
.../box/BoxFilesManagerIntegrationTest.java | 34 ++++++++++------------
.../box/BoxFoldersManagerIntegrationTest.java | 20 ++++++-------
.../box/BoxGroupsManagerIntegrationTest.java | 8 ++---
.../box/BoxSearchManagerIntegrationTest.java | 4 +--
.../box/BoxTasksManagerIntegrationTest.java | 10 +++----
.../box/BoxUsersManagerIntegrationTest.java | 18 +++++-------
.../component/braintree/BraintreeComponent.java | 2 --
.../braintree/BraintreeConfiguration.java | 1 -
.../component/braintree/BraintreeConsumer.java | 1 -
.../component/braintree/BraintreeEndpoint.java | 2 --
.../component/braintree/BraintreeProducer.java | 1 -
.../braintree/AbstractBraintreeTestSupport.java | 2 --
.../braintree/AddOnGatewayIntegrationTest.java | 1 -
.../braintree/AddressGatewayIntegrationTest.java | 2 --
.../ClientTokenGatewayIntegrationTest.java | 1 -
...editCardVerificationGatewayIntegrationTest.java | 2 --
.../braintree/CustomerGatewayIntegrationTest.java | 1 -
.../braintree/DiscountGatewayIntegrationTest.java | 2 --
.../MerchantAccountGatewayIntegrationTest.java | 2 --
.../PaymentMethodGatewayIntegrationTest.java | 1 -
.../PaymentMethodNonceGatewayIntegrationTest.java | 2 --
.../braintree/PlanGatewayIntegrationTest.java | 1 -
...ttlementBatchSummaryGatewayIntegrationTest.java | 4 +--
.../SubscriptionGatewayIntegrationTest.java | 8 ++---
.../TransactionGatewayIntegrationTest.java | 4 +--
.../WebhookNotificationGatewayIntegrationTest.java | 2 --
106 files changed, 217 insertions(+), 287 deletions(-)
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java b/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
index 49f459b..fa4f39e 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
@@ -52,7 +52,7 @@ public abstract class ProcessBuilder extends RouteBuilder {
private EntityManagerTemplate entityManagerTemplate;
private TransactionTemplate transactionTemplate;
private String processName;
- private final List<ActivityBuilder> activityBuilders = new ArrayList<ActivityBuilder>();
+ private final List<ActivityBuilder> activityBuilders = new ArrayList<>();
private Class<ProcessInstance> entityType = ProcessInstance.class;
private final ProcessRules processRules = new ProcessRules();
private volatile ProcessDefinition processDefinition;
@@ -181,7 +181,7 @@ public abstract class ProcessBuilder extends RouteBuilder {
public ActivityDefinition findOrCreateActivityDefinition(String activityName) {
ProcessDefinition definition = getProcessDefinition();
- Map<String, Object> params = new HashMap<String, Object>(2);
+ Map<String, Object> params = new HashMap<>(2);
params.put("definition", definition);
params.put("name", activityName);
@@ -199,7 +199,7 @@ public abstract class ProcessBuilder extends RouteBuilder {
}
protected ProcessDefinition findOrCreateProcessDefinition() {
- Map<String, Object> params = new HashMap<String, Object>(1);
+ Map<String, Object> params = new HashMap<>(1);
params.put("name", processName);
List<ProcessDefinition> list = entityManagerTemplate.find(ProcessDefinition.class, "select x from "
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
index f8d1946..8dd50be 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
@@ -42,7 +42,7 @@ import org.apache.camel.bam.rules.ActivityRules;
@Table(name = "CAMEL_PROCESSINSTANCE")
public class ProcessInstance {
private ProcessDefinition processDefinition;
- private Collection<ActivityState> activityStates = new CopyOnWriteArraySet<ActivityState>();
+ private Collection<ActivityState> activityStates = new CopyOnWriteArraySet<>();
private String correlationKey;
private Date timeStarted;
private Date timeCompleted;
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
index 4ad2ebb..fbbd9c4 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
@@ -79,7 +79,7 @@ public class ActivityMonitorEngine extends ServiceSupport implements Runnable {
transactionTemplate.execute(new TransactionCallbackWithoutResult() {
protected void doInTransactionWithoutResult(TransactionStatus status) {
- Map<String, Object> params = new HashMap<String, Object>(1);
+ Map<String, Object> params = new HashMap<>(1);
params.put("timeNow", timeNow);
String activityStateQuery = "select x from "
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
index d6c1a46..45421b3 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
@@ -35,7 +35,7 @@ import org.apache.camel.util.ServiceHelper;
public class ActivityRules extends ServiceSupport {
private int expectedMessages = 1;
private ProcessRules processRules;
- private List<TemporalRule> rules = new ArrayList<TemporalRule>();
+ private List<TemporalRule> rules = new ArrayList<>();
private String activityName;
private final org.apache.camel.bam.ProcessBuilder builder;
diff --git a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
index 0912dd7..cc28e3e 100644
--- a/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
+++ b/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
@@ -31,7 +31,7 @@ import org.apache.camel.util.ServiceHelper;
*/
public class ProcessRules extends ServiceSupport {
private ProcessDefinition processDefinition;
- private List<ActivityRules> activities = new CopyOnWriteArrayList<ActivityRules>();
+ private List<ActivityRules> activities = new CopyOnWriteArrayList<>();
public synchronized void processExpired(ActivityState activityState) throws Exception {
for (ActivityRules activityRules : activities) {
diff --git a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
index c062aa0..8c16985 100644
--- a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
+++ b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
@@ -66,12 +66,12 @@ public class BarcodeDataFormat extends ServiceSupport implements DataFormat, Dat
/**
* The encoding hint map, used for writing a barcode.
*/
- private final Map<EncodeHintType, Object> writerHintMap = new EnumMap<EncodeHintType, Object>(EncodeHintType.class);
+ private final Map<EncodeHintType, Object> writerHintMap = new EnumMap<>(EncodeHintType.class);
/**
* The decoding hint map, used for reading a barcode.
*/
- private final Map<DecodeHintType, Object> readerHintMap = new EnumMap<DecodeHintType, Object>(DecodeHintType.class);
+ private final Map<DecodeHintType, Object> readerHintMap = new EnumMap<>(DecodeHintType.class);
/**
diff --git a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
index 48e974f..fcb38b5 100644
--- a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
+++ b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
@@ -124,7 +124,7 @@ public class BeanIODataFormat extends ServiceSupport implements DataFormat, Data
private List<Object> getModels(Exchange exchange, Object body) {
List<Object> models;
if ((models = exchange.getContext().getTypeConverter().convertTo(List.class, body)) == null) {
- models = new ArrayList<Object>();
+ models = new ArrayList<>();
Iterator<Object> it = ObjectHelper.createIterator(body);
while (it.hasNext()) {
models.add(it.next());
@@ -146,7 +146,7 @@ public class BeanIODataFormat extends ServiceSupport implements DataFormat, Data
}
private List<Object> readModels(Exchange exchange, InputStream stream) throws Exception {
- List<Object> results = new ArrayList<Object>();
+ List<Object> results = new ArrayList<>();
BufferedReader streamReader = IOHelper.buffered(new InputStreamReader(stream, getEncoding()));
BeanReader in = factory.createReader(getStreamName(), streamReader);
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
index e5f69b9..65c26d9 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
@@ -177,7 +177,7 @@ public class BeanIODataFormatComplexTest extends CamelTestSupport {
private List<Object> createTestData(boolean skipB1header) throws ParseException {
String source = "camel-beanio";
- List<Object> body = new ArrayList<Object>();
+ List<Object> body = new ArrayList<>();
Date date = new SimpleDateFormat("ddMMyy").parse("030808");
Header hFirst = new Header("A1", date, "PRICE");
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
index d078183..ee43258 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest.java
@@ -112,7 +112,7 @@ public class BeanIODataFormatSimpleCustomBeanReaderErrorHandlerTest extends Came
}
private List<Employee> getEmployees() throws ParseException {
- List<Employee> employees = new ArrayList<Employee>();
+ List<Employee> employees = new ArrayList<>();
Employee one = new Employee();
one.setFirstName("Joe");
one.setLastName("Smith");
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java
index f33d6b8..31f4de0 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatSimpleTest.java
@@ -89,7 +89,7 @@ public class BeanIODataFormatSimpleTest extends CamelTestSupport {
}
private List<Employee> getEmployees() throws ParseException {
- List<Employee> employees = new ArrayList<Employee>();
+ List<Employee> employees = new ArrayList<>();
Employee one = new Employee();
one.setFirstName("Joe");
one.setLastName("Smith");
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java
index 9eed374..da64577 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterCustomBeanReaderErrorHandlerTest.java
@@ -93,7 +93,7 @@ public class BeanIOSplitterCustomBeanReaderErrorHandlerTest extends CamelTestSup
}
private List<Employee> getEmployees() throws ParseException {
- List<Employee> employees = new ArrayList<Employee>();
+ List<Employee> employees = new ArrayList<>();
Employee one = new Employee();
one.setFirstName("Joe");
one.setLastName("Smith");
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java
index e8d3033..e9f1d43 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIOSplitterTest.java
@@ -71,7 +71,7 @@ public class BeanIOSplitterTest extends CamelTestSupport {
}
private List<Employee> getEmployees() throws ParseException {
- List<Employee> employees = new ArrayList<Employee>();
+ List<Employee> employees = new ArrayList<>();
Employee one = new Employee();
one.setFirstName("Joe");
one.setLastName("Smith");
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/Header.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/Header.java
index d949942..63a1f04 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/Header.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/Header.java
@@ -104,7 +104,7 @@ public class Header implements BeanIOHeader {
@Override
public Map<String, Object> getHeaders() {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(recordType + "Date", headerDate);
return headers;
}
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java
index af4530c..fb5b243 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/SpringBeanIODataFormatSimpleTest.java
@@ -63,7 +63,7 @@ public class SpringBeanIODataFormatSimpleTest extends CamelSpringTestSupport {
}
private List<Employee> getEmployees() throws ParseException {
- List<Employee> employees = new ArrayList<Employee>();
+ List<Employee> employees = new ArrayList<>();
Employee one = new Employee();
one.setFirstName("Joe");
one.setLastName("Smith");
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
index 6b1c8e1..0bbaa53 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTest.java
@@ -66,7 +66,7 @@ public class CsvTest extends CamelTestSupport {
log.info("received message {} of class {}", body, body.getClass().getName());
}
}
- List<Map> results = new ArrayList<Map>();
+ List<Map> results = new ArrayList<>();
for (Exchange exchange : exchanges) {
Map body = exchange.getIn().getBody(Map.class);
if (body != null) {
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/ConnectionSettings.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/ConnectionSettings.java
index d79db06..950bb96 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/ConnectionSettings.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/ConnectionSettings.java
@@ -49,7 +49,7 @@ public class ConnectionSettings {
final Scanner scanner = new Scanner(tube);
scanner.useDelimiter("\\+");
- final ArrayList<String> buffer = new ArrayList<String>();
+ final ArrayList<String> buffer = new ArrayList<>();
while (scanner.hasNext()) {
final String tubeRaw = scanner.next();
try {
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
index b03f484..146c374 100644
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
+++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
@@ -54,7 +54,7 @@ public class ConsumerToProducerHeadersTest extends BeanstalkMockTestSupport {
final Job jobMock = mock(Job.class);
// stats that may be set in the consumer:
// mock stats : "tube", "state", "age", "time-left", "timeouts", "releases", "buries", "kicks"
- Map<String, String> stats = new HashMap<String, String>();
+ Map<String, String> stats = new HashMap<>();
stats.put("tube", "A");
stats.put("state", "Test");
stats.put("age", "0");
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
index fd1c149..1b9a078 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class BindyAbstractFactory implements BindyFactory {
private static final Logger LOG = LoggerFactory.getLogger(BindyAbstractFactory.class);
- protected final Map<String, List<Field>> annotatedLinkFields = new LinkedHashMap<String, List<Field>>();
+ protected final Map<String, List<Field>> annotatedLinkFields = new LinkedHashMap<>();
protected FormatFactory formatFactory;
protected Set<Class<?>> models;
protected Set<String> modelClassNames;
@@ -68,8 +68,8 @@ public abstract class BindyAbstractFactory implements BindyFactory {
* @throws Exception
*/
public void initModel() throws Exception {
- models = new HashSet<Class<?>>();
- modelClassNames = new HashSet<String>();
+ models = new HashSet<>();
+ modelClassNames = new HashSet<>();
loadModels(type);
}
@@ -161,7 +161,7 @@ public abstract class BindyAbstractFactory implements BindyFactory {
* @throws Exception can be thrown
*/
public Map<String, Object> factory() throws Exception {
- Map<String, Object> mapModel = new HashMap<String, Object>();
+ Map<String, Object> mapModel = new HashMap<>();
for (Class<?> cl : models) {
Object obj = ObjectHelper.newInstance(cl);
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
index 8bd5b19..171630c 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
@@ -55,9 +55,9 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
boolean isOneToMany;
- private Map<Integer, DataField> dataFields = new LinkedHashMap<Integer, DataField>();
- private Map<Integer, Field> annotatedFields = new LinkedHashMap<Integer, Field>();
- private Map<String, Integer> sections = new HashMap<String, Integer>();
+ private Map<Integer, DataField> dataFields = new LinkedHashMap<>();
+ private Map<Integer, Field> annotatedFields = new LinkedHashMap<>();
+ private Map<String, Integer> sections = new HashMap<>();
private int numberOptionalFields;
private int numberMandatoryFields;
@@ -106,7 +106,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
maxpos = 0;
for (Class<?> cl : models) {
- List<Field> linkFields = new ArrayList<Field>();
+ List<Field> linkFields = new ArrayList<>();
if (LOG.isDebugEnabled()) {
LOG.debug("Class retrieved: {}", cl.getName());
@@ -296,7 +296,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
public String unbind(CamelContext camelContext, Map<String, Object> model) throws Exception {
StringBuilder buffer = new StringBuilder();
- Map<Integer, List<String>> results = new HashMap<Integer, List<String>>();
+ Map<Integer, List<String>> results = new HashMap<>();
// Check if separator exists
ObjectHelper.notNull(this.separator, "The separator has not been instantiated or property not defined in the @CsvRecord annotation");
@@ -324,13 +324,13 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
}
// Transpose result
- List<List<String>> l = new ArrayList<List<String>>();
+ List<List<String>> l = new ArrayList<>();
if (isOneToMany) {
l = product(results);
} else {
// Convert Map<Integer, List> into List<List>
- TreeMap<Integer, List<String>> sortValues = new TreeMap<Integer, List<String>>(results);
- List<String> temp = new ArrayList<String>();
+ TreeMap<Integer, List<String>> sortValues = new TreeMap<>(results);
+ List<String> temp = new ArrayList<>();
for (Entry<Integer, List<String>> entry : sortValues.entrySet()) {
// Get list of values
@@ -395,16 +395,16 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
}
private List<List<String>> product(Map<Integer, List<String>> values) {
- TreeMap<Integer, List<String>> sortValues = new TreeMap<Integer, List<String>>(values);
+ TreeMap<Integer, List<String>> sortValues = new TreeMap<>(values);
- List<List<String>> product = new ArrayList<List<String>>();
- Map<Integer, Integer> index = new HashMap<Integer, Integer>();
+ List<List<String>> product = new ArrayList<>();
+ Map<Integer, Integer> index = new HashMap<>();
int idx = 0;
int idxSize = 0;
do {
idxSize = 0;
- List<String> v = new ArrayList<String>();
+ List<String> v = new ArrayList<>();
for (int ii = 1; ii <= sortValues.lastKey(); ii++) {
List<String> l = values.get(ii);
@@ -460,9 +460,6 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
if (obj != null) {
- // Retrieve the format, pattern and precision associated to the type
- Class<?> type = field.getType();
-
// Create format
FormattingOptions formattingOptions = ConverterUtils.convert(datafield,
field.getType(),
@@ -517,7 +514,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
}
if (!results.containsKey(key)) {
- List<String> list = new LinkedList<String>();
+ List<String> list = new LinkedList<>();
list.add(result);
results.put(key, list);
} else {
@@ -562,7 +559,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
*/
public String generateHeader() {
- Map<Integer, DataField> dataFieldsSorted = new TreeMap<Integer, DataField>(dataFields);
+ Map<Integer, DataField> dataFieldsSorted = new TreeMap<>(dataFields);
Iterator<Integer> it = dataFieldsSorted.keySet().iterator();
StringBuilder builderHeader = new StringBuilder();
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index fc3e0f3..d80f862 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -52,8 +52,8 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
boolean isOneToMany;
- private Map<Integer, DataField> dataFields = new TreeMap<Integer, DataField>();
- private Map<Integer, Field> annotatedFields = new TreeMap<Integer, Field>();
+ private Map<Integer, DataField> dataFields = new TreeMap<>();
+ private Map<Integer, Field> annotatedFields = new TreeMap<>();
private int numberOptionalFields;
private int numberMandatoryFields;
@@ -103,7 +103,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
for (Class<?> cl : models) {
- List<Field> linkFields = new ArrayList<Field>();
+ List<Field> linkFields = new ArrayList<>();
if (LOG.isDebugEnabled()) {
LOG.debug("Class retrieved: {}", cl.getName());
@@ -368,7 +368,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
public String unbind(CamelContext camelContext, Map<String, Object> model) throws Exception {
StringBuilder buffer = new StringBuilder();
- Map<Integer, List<String>> results = new HashMap<Integer, List<String>>();
+ Map<Integer, List<String>> results = new HashMap<>();
for (Class<?> clazz : models) {
@@ -391,7 +391,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
}
// Convert Map<Integer, List> into List<List>
- Map<Integer, List<String>> sortValues = new TreeMap<Integer, List<String>>(results);
+ Map<Integer, List<String>> sortValues = new TreeMap<>(results);
for (Entry<Integer, List<String>> entry : sortValues.entrySet()) {
// Get list of values
@@ -423,9 +423,6 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
if (obj != null) {
- // Retrieve the format, pattern and precision associated to the type
- Class<?> type = field.getType();
-
// Create format
FormattingOptions formattingOptions = ConverterUtils.convert(datafield,
field.getType(),
@@ -521,7 +518,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
key = datafield.pos();
if (!results.containsKey(key)) {
- List<String> list = new LinkedList<String>();
+ List<String> list = new LinkedList<>();
list.add(result);
results.put(key, list);
} else {
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
index 30af7b0..e03e39a 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
@@ -49,9 +49,9 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
private static final Logger LOG = LoggerFactory.getLogger(BindyKeyValuePairFactory.class);
- private Map<Integer, KeyValuePairField> keyValuePairFields = new LinkedHashMap<Integer, KeyValuePairField>();
- private Map<Integer, Field> annotatedFields = new LinkedHashMap<Integer, Field>();
- private Map<String, Integer> sections = new HashMap<String, Integer>();
+ private Map<Integer, KeyValuePairField> keyValuePairFields = new LinkedHashMap<>();
+ private Map<Integer, Field> annotatedFields = new LinkedHashMap<>();
+ private Map<String, Integer> sections = new HashMap<>();
private String keyValuePairSeparator;
private String pairSeparator;
private boolean messageOrdered;
@@ -87,7 +87,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
for (Class<?> cl : models) {
- List<Field> linkFields = new ArrayList<Field>();
+ List<Field> linkFields = new ArrayList<>();
for (Field field : cl.getDeclaredFields()) {
KeyValuePairField keyValuePairField = field.getAnnotation(KeyValuePairField.class);
@@ -120,14 +120,14 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
public void bind(CamelContext camelContext, List<String> data, Map<String, Object> model, int line) throws Exception {
// Map to hold the model @OneToMany classes while binding
- Map<String, List<Object>> lists = new HashMap<String, List<Object>>();
+ Map<String, List<Object>> lists = new HashMap<>();
bind(camelContext, data, model, line, lists);
}
public void bind(CamelContext camelContext, List<String> data, Map<String, Object> model, int line, Map<String, List<Object>> lists) throws Exception {
- Map<Integer, List<String>> results = new HashMap<Integer, List<String>>();
+ Map<Integer, List<String>> results = new HashMap<>();
LOG.debug("Key value pairs data : {}", data);
@@ -155,7 +155,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
// Add value to the Map using key value as key
if (!results.containsKey(key)) {
- List<String> list = new LinkedList<String>();
+ List<String> list = new LinkedList<>();
list.add(value);
results.put(key, list);
} else {
@@ -391,7 +391,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
}
if (!lists.containsKey(cl.getName())) {
- lists.put(cl.getName(), new ArrayList<Object>());
+ lists.put(cl.getName(), new ArrayList<>());
}
generateModelFromKeyValueMap(cl, null, results, line, lists);
@@ -417,13 +417,13 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
StringBuilder builder = new StringBuilder();
- Map<Integer, KeyValuePairField> keyValuePairFieldsSorted = new TreeMap<Integer, KeyValuePairField>(keyValuePairFields);
+ Map<Integer, KeyValuePairField> keyValuePairFieldsSorted = new TreeMap<>(keyValuePairFields);
Iterator<Integer> it = keyValuePairFieldsSorted.keySet().iterator();
// Map containing the OUT position of the field
// The key is double and is created using the position of the field and
// location of the class in the message (using section)
- Map<Integer, String> positions = new TreeMap<Integer, String>();
+ Map<Integer, String> positions = new TreeMap<>();
// Check if separator exists
ObjectHelper.notNull(this.pairSeparator, "The pair separator has not been instantiated or property not defined in the @Message annotation");
@@ -448,9 +448,6 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
LOG.debug("Tag: {}, Field type: {}, class: {}", new Object[]{keyValuePairField.tag(), field.getType(), field.getDeclaringClass().getName()});
}
- // Retrieve the format, pattern and precision associated to the type
- Class<?> type = field.getType();
-
// Create format
FormattingOptions formattingOptions = ConverterUtils.convert(keyValuePairField,
field.getType(),
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
index 9b5b1c4..ed5845c 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
@@ -80,7 +80,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
outputStream.write(bytesCRLF);
}
- List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> models = new ArrayList<>();
// the body is not a prepared list of map that bindy expects so help a bit here and create one for us
Iterator<Object> it = ObjectHelper.createIterator(body);
@@ -90,7 +90,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
models.add((Map<String, Object>) model);
} else {
String name = model.getClass().getName();
- Map<String, Object> row = new HashMap<String, Object>(1);
+ Map<String, Object> row = new HashMap<>(1);
row.put(name, model);
row.putAll(createLinkedFieldsModel(model));
models.add(row);
@@ -136,7 +136,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
ObjectHelper.notNull(factory, "not instantiated");
// List of Pojos
- List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> models = new ArrayList<>();
// Pojos of the model
Map<String, Object> model;
@@ -188,7 +188,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
// annotated class @CSVRecord
Pattern pattern = Pattern.compile(separator);
Matcher matcher = pattern.matcher(line);
- List<String> separators = new ArrayList<String>();
+ List<String> separators = new ArrayList<>();
// Retrieve separators for each match
while (matcher.find()) {
@@ -256,7 +256,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
// to fix this afterwards
StringBuilder current = new StringBuilder();
boolean inProgress = false;
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
int idxSeparator = 0;
//parsing assumes matching close and end quotes
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index d5c9799..8ea285d 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -78,12 +78,12 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
// the body is not a prepared list so help a bit here and create one for us
if (!isPreparedList(body)) {
- models = new ArrayList<Map<String, Object>>();
+ models = new ArrayList<>();
Iterator<?> it = ObjectHelper.createIterator(body);
while (it.hasNext()) {
Object model = it.next();
String name = model.getClass().getName();
- Map<String, Object> row = new HashMap<String, Object>();
+ Map<String, Object> row = new HashMap<>();
row.put(name, model);
row.putAll(createLinkedFieldsModel(model));
models.add(row);
@@ -180,7 +180,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
ObjectHelper.notNull(factory, "not instantiated");
// List of Pojos
- List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> models = new ArrayList<>();
// Pojos of the model
Map<String, Object> model;
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
index bbac5da..f12ad98 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
@@ -91,13 +91,13 @@ public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat {
BindyKeyValuePairFactory factory = (BindyKeyValuePairFactory)getFactory();
// List of Pojos
- List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> models = new ArrayList<>();
// Pojos of the model
Map<String, Object> model;
// Map to hold the model @OneToMany classes while binding
- Map<String, List<Object>> lists = new HashMap<String, List<Object>>();
+ Map<String, List<Object>> lists = new HashMap<>();
InputStreamReader in = new InputStreamReader(inputStream, IOHelper.getCharsetName(exchange));
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java
index ae3e1f9..3b9785b 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/AnnotationModelLoader.java
@@ -41,7 +41,7 @@ public class AnnotationModelLoader {
public AnnotationModelLoader(PackageScanClassResolver resolver) {
this.resolver = resolver;
- annotations = new LinkedHashSet<Class<? extends Annotation>>();
+ annotations = new LinkedHashSet<>();
annotations.add(CsvRecord.class);
annotations.add(Link.class);
annotations.add(Message.class);
@@ -59,7 +59,7 @@ public class AnnotationModelLoader {
//TODO; this logic could be moved into the PackageScanClassResolver by creating:
// findAnnotated(annotations, packageNames, filter)
- Set<Class<?>> resultsToRemove = new HashSet<Class<?>>();
+ Set<Class<?>> resultsToRemove = new HashSet<>();
if (filter != null) {
for (Class<?> clazz : results) {
if (!filter.matches(clazz)) {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
index a17b459..5759a9b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
@@ -39,7 +39,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindyComplexCsvGenerateHeaderMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "Order Nr,Client Nr,First Name,Last Name,Instrument Code,Instrument Nr,Order Type,Instrument Type,amount,currency,Order Date\r\n"
+ "10,A1,Julia,Roberts,ISIN,LU123456789,BUY,Share,150.00,USD,14-01-2009\r\n";
@@ -59,7 +59,7 @@ public class BindyComplexCsvGenerateHeaderMarshallTest extends AbstractJUnit4Spr
}
private List<Map<String, Object>> generateModel() {
- Map<String, Object> model = new HashMap<String, Object>();
+ Map<String, Object> model = new HashMap<>();
Order order = new Order();
order.setOrderNr(10);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java
index 94f93ba..82ffbf6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java
@@ -39,7 +39,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindyComplexCsvMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "10,A1,Julia,Roberts,ISIN,LU123456789,BUY,Share,150.00,USD,14-01-2009\r\n";
@Produce(uri = "direct:start")
@@ -58,7 +58,7 @@ public class BindyComplexCsvMarshallTest extends AbstractJUnit4SpringContextTest
}
private List<Map<String, Object>> generateModel() {
- Map<String, Object> model = new HashMap<String, Object>();
+ Map<String, Object> model = new HashMap<>();
Order order = new Order();
order.setOrderNr(10);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
index 59af0e5..99d15a4 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleCsvBooleanFalseMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "andrew,false\r\n";
@Produce(uri = "direct:start")
@@ -54,7 +54,7 @@ public class BindySimpleCsvBooleanFalseMarshallTest extends AbstractJUnit4Spring
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
BooleanExample example = new BooleanExample();
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
index 6633b72..3903c52 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleCsvBooleanTrueMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "andrew,true\r\n";
@Produce(uri = "direct:start")
@@ -54,7 +54,7 @@ public class BindySimpleCsvBooleanTrueMarshallTest extends AbstractJUnit4SpringC
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
BooleanExample example = new BooleanExample();
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
index 5dbfdba..7e5a3ee 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleCsvGenerateHeaderMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "Order Nr,Client Nr,First Name,Last Name,Instrument Code,Instrument Nr,Order Type,Instrument Type,amount,currency,Order Date\r\n"
+ "1,B2,Keira,Knightley,ISIN,XX23456789,BUY,Share,400.25,EUR,14-01-2009\r\n";
@@ -57,7 +57,7 @@ public class BindySimpleCsvGenerateHeaderMarshallTest extends AbstractJUnit4Spri
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(1);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
index 25fa9cc..efa628e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
@@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleCsvMarshallDslTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "1,B2,Keira,Knightley,ISIN,XX23456789,BUY,Share,450.45,EUR,14-01-2009,17-05-2010 23:21:59\r\n";
@Produce(uri = "direct:start")
@@ -59,7 +59,7 @@ public class BindySimpleCsvMarshallDslTest extends AbstractJUnit4SpringContextTe
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(1);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
index aaf431f..d7e8b3b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
@@ -36,7 +36,7 @@ import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration
public class BindySimpleCsvMarshallPositionModifiedTest extends CommonBindyTest {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String expected;
@Test
@@ -51,7 +51,7 @@ public class BindySimpleCsvMarshallPositionModifiedTest extends CommonBindyTest
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> model = new HashMap<String, Object>();
+ Map<String, Object> model = new HashMap<>();
Order order = new Order();
order.setOrderNr(1);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
index b4f98ff..70689f9 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
@@ -45,7 +45,7 @@ public class BindySimpleCsvMarshallTest extends AbstractJUnit4SpringContextTests
private static final String URI_MOCK_ERROR = "mock:error";
private static final String URI_DIRECT_START = "direct:start";
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String expected;
@Produce(uri = URI_DIRECT_START)
@@ -68,7 +68,7 @@ public class BindySimpleCsvMarshallTest extends AbstractJUnit4SpringContextTests
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(1);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java
index 3b2de59..2f562ea 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleCsvNullMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "1,B2,Keira,Knightley,ISIN,XX23456789,BUY,,450.45,EUR,14-01-2009,\r\n";
@Produce(uri = "direct:start")
@@ -56,7 +56,7 @@ public class BindySimpleCsvNullMarshallTest extends AbstractJUnit4SpringContextT
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(1);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
index eb562e0..d7343f7 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleCsvOneToManyMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "Charles,Moulliard,Camel in Action 1,2010,43\r\n" + "Charles,Moulliard,Camel in Action 2,2012,43\r\n"
+ "Charles,Moulliard,Camel in Action 3,2013,43\r\n" + "Charles,Moulliard,Camel in Action 4,,43\r\n";
@@ -58,8 +58,8 @@ public class BindySimpleCsvOneToManyMarshallTest extends AbstractJUnit4SpringCon
Author author;
Book book;
- Map<String, Object> model = new HashMap<String, Object>();
- List<Book> books = new ArrayList<Book>();
+ Map<String, Object> model = new HashMap<>();
+ List<Book> books = new ArrayList<>();
// List<Reference> references = new ArrayList<Reference>();
// List<Editor> editors = new ArrayList<Editor>();
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
index d507c3f..6b08831 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.format.FormatException;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.processor.interceptor.Tracer;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java
index 0d4f87f..6b8eb0d 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java
@@ -45,7 +45,7 @@ public class WickedHeaderWithCommaCsvTest extends CamelTestSupport {
assertEquals("1,000.00", row1000.getFoo());
assertEquals("1,500.00", row1000.getBar());
- final WickedHeaderWithCommaCsv row2000 = (WickedHeaderWithCommaCsv) wickedHeaderWithCommaCsvs.get(1);
+ final WickedHeaderWithCommaCsv row2000 = wickedHeaderWithCommaCsvs.get(1);
assertEquals("2,000.00", row2000.getFoo());
assertEquals("2,700.00", row2000.getBar());
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
index 39bd902..58d4032 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
@@ -40,8 +40,8 @@ public class BindyComplexKeyValuePairStandaloneTest {
private static final Logger LOG = LoggerFactory.getLogger(BindyComplexKeyValuePairStandaloneTest.class);
- protected Map<String, Object> model = new HashMap<String, Object>();
- protected Set<Class<?>> models = new HashSet<Class<?>>();
+ protected Map<String, Object> model = new HashMap<>();
+ protected Set<Class<?>> models = new HashSet<>();
BindyAbstractFactory factory;
int counter;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java
index 1a0ed18..7c0b792 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleKeyValuePairMarshallDslTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "1=BE.CHM.00111=CHM0001-0122=448=BE0001245678"
+ "54=158=this is a camel - bindy test777=17-02-2011 23:29:59\r\n";
@@ -56,7 +56,7 @@ public class BindySimpleKeyValuePairMarshallDslTest extends AbstractJUnit4Spring
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setAccount("BE.CHM.001");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java
index 3406dc9..8c30a1a 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class BindySimpleKeyValuePairMarshallTest extends AbstractJUnit4SpringContextTests {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String result = "1=BE.CHM.0018=FIX 4.19=2010=22011=CHM0001-0122=434=135=048=BE000124567849=INVMGR54=156=BRKR58=this is a camel - bindy test\r\n";
@Produce(uri = "direct:start")
@@ -55,7 +55,7 @@ public class BindySimpleKeyValuePairMarshallTest extends AbstractJUnit4SpringCon
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Header header = new Header();
header.setBeginString("FIX 4.1");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java
index 2ec0959..cefb4a6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java
@@ -57,8 +57,8 @@ public class BindySimpleKeyValuePairNullMarshallTest extends AbstractJUnit4Sprin
}
public List<Map<String, Object>> generateModel() {
- List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
- Map<String, Object> model = new HashMap<String, Object>();
+ List<Map<String, Object>> models = new ArrayList<>();
+ Map<String, Object> model = new HashMap<>();
Header header = new Header();
header.setBeginString("FIX 4.1");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
index 6290a62..9da73b4 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
@@ -56,8 +56,8 @@ public class BindySimpleKeyValuePairSortedMarshallTest extends CommonBindyTest {
public List<Map<String, Object>> generateModel() {
- List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ List<Map<String, Object>> models = new ArrayList<>();
+ Map<String, Object> modelObjects = new HashMap<>();
Header header = new Header();
header.setBeginString("FIX 4.1");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
index 9f72d32..0ee0020 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
@@ -48,8 +48,8 @@ public class BindySimpleKeyValuePairTabMarshallTest extends CommonBindyTest {
public List<Map<String, Object>> generateModel() {
- List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ List<Map<String, Object>> models = new ArrayList<>();
+ Map<String, Object> modelObjects = new HashMap<>();
Header header = new Header();
header.setBeginString("FIX 4.1");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
index 244eb59..d392a8b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
@@ -45,7 +45,7 @@ public class BindySimpleKeyValuePairWithoutSectionMarshallDslTest extends Abstra
private static final String URI_MOCK_ERROR = "mock:error";
private static final String URI_DIRECT_START = "direct:start";
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
@Produce(uri = URI_DIRECT_START)
private ProducerTemplate template;
@@ -78,7 +78,7 @@ public class BindySimpleKeyValuePairWithoutSectionMarshallDslTest extends Abstra
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setAccount("BE.CHM.001");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java
index a64a6dc..154afba 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java
@@ -126,8 +126,8 @@ public class BindySimpleFixedLengthHeaderFooterTest extends CamelTestSupport {
calendar.set(2009, 7, 1, 0, 0, 0);
order.setOrderDate(calendar.getTime());
- List<Map<String, Object>> input = new ArrayList<Map<String, Object>>();
- Map<String, Object> bodyRow = new HashMap<String, Object>();
+ List<Map<String, Object>> input = new ArrayList<>();
+ Map<String, Object> bodyRow = new HashMap<>();
bodyRow.put(Order.class.getName(), order);
input.add(createHeaderRow());
input.add(bodyRow);
@@ -161,13 +161,13 @@ public class BindySimpleFixedLengthHeaderFooterTest extends CamelTestSupport {
calendar.set(2009, 7, 1, 0, 0, 0);
order.setOrderDate(calendar.getTime());
- List<Map<String, Object>> input = new ArrayList<Map<String, Object>>();
- Map<String, Object> bodyRow = new HashMap<String, Object>();
+ List<Map<String, Object>> input = new ArrayList<>();
+ Map<String, Object> bodyRow = new HashMap<>();
bodyRow.put(Order.class.getName(), order);
input.add(bodyRow);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(BindyFixedLengthDataFormat.CAMEL_BINDY_FIXED_LENGTH_HEADER, createHeaderRow());
headers.put(BindyFixedLengthDataFormat.CAMEL_BINDY_FIXED_LENGTH_FOOTER, createFooterRow());
@@ -181,7 +181,7 @@ public class BindySimpleFixedLengthHeaderFooterTest extends CamelTestSupport {
}
private Map<String, Object> createHeaderRow() {
- Map<String, Object> headerMap = new HashMap<String, Object>();
+ Map<String, Object> headerMap = new HashMap<>();
OrderHeader header = new OrderHeader();
Calendar calendar = new GregorianCalendar();
calendar.set(2009, 7, 1, 0, 0, 0);
@@ -191,7 +191,7 @@ public class BindySimpleFixedLengthHeaderFooterTest extends CamelTestSupport {
}
private Map<String, Object> createFooterRow() {
- Map<String, Object> footerMap = new HashMap<String, Object>();
+ Map<String, Object> footerMap = new HashMap<>();
OrderFooter footer = new OrderFooter();
footer.setNumberOfRecordsInTheFile(1);
footerMap.put(OrderFooter.class.getName(), footer);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
index 33142a0..ac8cdf2 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
@@ -48,7 +48,7 @@ public class BindySimpleFixedLengthMarshallTest extends AbstractJUnit4SpringCont
private static final String URI_MOCK_ERROR = "mock:error";
private static final String URI_DIRECT_START = "direct:start";
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
private String expected;
@Produce(uri = URI_DIRECT_START)
@@ -69,7 +69,7 @@ public class BindySimpleFixedLengthMarshallTest extends AbstractJUnit4SpringCont
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(10);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
index 8bf1447..a77a787 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class BindySimpleFixedLengthMarshallWithClipAndTrimTest extends CamelTestSupport {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -62,7 +62,7 @@ public class BindySimpleFixedLengthMarshallWithClipAndTrimTest extends CamelTest
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(10);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
index 24e0953..dc4eb20 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class BindySimpleFixedLengthMarshallWithClipTest extends CamelTestSupport {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -62,7 +62,7 @@ public class BindySimpleFixedLengthMarshallWithClipTest extends CamelTestSupport
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(10);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
index 3283df0..ea2a06d 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
public class BindySimpleFixedLengthMarshallWithNoClipTest extends CamelTestSupport {
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+ private List<Map<String, Object>> models = new ArrayList<>();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -63,7 +63,7 @@ public class BindySimpleFixedLengthMarshallWithNoClipTest extends CamelTestSuppo
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
+ Map<String, Object> modelObjects = new HashMap<>();
Order order = new Order();
order.setOrderNr(10);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
index 348162b..e826ac6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
@@ -118,7 +118,7 @@ public class BindySimpleFixedLengthObjectMarshallTest extends AbstractJUnit4Spri
result.expectedBodiesReceived(expected);
error.expectedMessageCount(0);
- List<Order> list = new ArrayList<Order>();
+ List<Order> list = new ArrayList<>();
list.add(generateModel("Pauline"));
list.add(generateModel("Marcool"));
template.sendBody(list);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
index 8dea93f..1a2c716 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
@@ -108,8 +108,8 @@ public class BindyFixedLengthHeaderFooterSkipHeaderTest extends CamelTestSupport
calendar.set(2009, 7, 1);
order.setOrderDate(calendar.getTime());
- List<Map<String, Object>> input = new ArrayList<Map<String, Object>>();
- Map<String, Object> bodyRow = new HashMap<String, Object>();
+ List<Map<String, Object>> input = new ArrayList<>();
+ Map<String, Object> bodyRow = new HashMap<>();
bodyRow.put(Order.class.getName(), order);
input.add(createHeaderRow());
input.add(bodyRow);
@@ -124,7 +124,7 @@ public class BindyFixedLengthHeaderFooterSkipHeaderTest extends CamelTestSupport
}
private Map<String, Object> createHeaderRow() {
- Map<String, Object> headerMap = new HashMap<String, Object>();
+ Map<String, Object> headerMap = new HashMap<>();
OrderHeader header = new OrderHeader();
Calendar calendar = new GregorianCalendar();
calendar.set(2009, 7, 1);
@@ -134,7 +134,7 @@ public class BindyFixedLengthHeaderFooterSkipHeaderTest extends CamelTestSupport
}
private Map<String, Object> createFooterRow() {
- Map<String, Object> footerMap = new HashMap<String, Object>();
+ Map<String, Object> footerMap = new HashMap<>();
OrderFooter footer = new OrderFooter();
footer.setNumberOfRecordsInTheFile(1);
footerMap.put(OrderFooter.class.getName(), footer);
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContextLookupHelper.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContextLookupHelper.java
index 61446ef..c0b095e 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContextLookupHelper.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContextLookupHelper.java
@@ -39,7 +39,7 @@ public final class BlueprintCamelContextLookupHelper {
* @return a set with the ids of the {@link BlueprintCamelContext}, never <tt>null</tt>, but can be empty set.
*/
public static Set<String> lookupBlueprintCamelContext(BlueprintContainer container) {
- Set<String> ids = new LinkedHashSet<String>();
+ Set<String> ids = new LinkedHashSet<>();
for (Object id : container.getComponentIds()) {
ComponentMetadata meta = container.getComponentMetadata(id.toString());
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
index 84f9c93..9a60984 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
@@ -78,7 +78,7 @@ public class BlueprintContainerRegistry implements Registry {
@Override
public <T> Set<T> findByType(Class<T> type) {
Map<String, T> map = lookupByType(blueprintContainer, type);
- return new HashSet<T>(map.values());
+ return new HashSet<>(map.values());
}
@Override
@@ -102,7 +102,7 @@ public class BlueprintContainerRegistry implements Registry {
public static <T> Map<String, T> lookupByType(BlueprintContainer blueprintContainer, Class<T> type, boolean includeNonSingletons) {
Bundle bundle = (Bundle) blueprintContainer.getComponentInstance("blueprintBundle");
- Map<String, T> objects = new LinkedHashMap<String, T>();
+ Map<String, T> objects = new LinkedHashMap<>();
Set<String> ids = blueprintContainer.getComponentIds();
for (String id : ids) {
try {
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
index e366f35..1ea5153f 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
@@ -36,7 +36,7 @@ public class BlueprintModelJAXBContextFactory implements ModelJAXBContextFactory
private String getPackages() {
// we nedd to have a class from each different package with jaxb models
// and we must use the .class for the classloader to work in OSGi
- Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+ Set<Class<?>> classes = new LinkedHashSet<>();
classes.add(CamelContextFactoryBean.class);
classes.add(AbstractCamelContextFactoryBean.class);
classes.add(SSLContextParametersFactoryBean.class);
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
index d16762a..ad9a5ca 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
@@ -47,7 +47,7 @@ public class BlueprintPropertiesParser extends DefaultPropertiesParser {
private final PropertiesComponent propertiesComponent;
private final BlueprintContainer container;
private final PropertiesParser delegate;
- private final Set<AbstractPropertyPlaceholder> placeholders = new LinkedHashSet<AbstractPropertyPlaceholder>();
+ private final Set<AbstractPropertyPlaceholder> placeholders = new LinkedHashSet<>();
private Method method;
public BlueprintPropertiesParser(PropertiesComponent propertiesComponent, BlueprintContainer container, PropertiesParser delegate) {
@@ -64,7 +64,7 @@ public class BlueprintPropertiesParser extends DefaultPropertiesParser {
* @return the ids, will be an empty array if none found.
*/
public String[] lookupPropertyPlaceholderIds() {
- List<String> ids = new ArrayList<String>();
+ List<String> ids = new ArrayList<>();
for (Object componentId : container.getComponentIds()) {
String id = (String) componentId;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 4655717..6d80eb4 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -173,11 +173,11 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
@XmlElement(name = "hystrixConfiguration", type = HystrixConfigurationDefinition.class)
private List<HystrixConfigurationDefinition> hystrixConfigurations;
@XmlElement(name = "routeBuilder")
- private List<RouteBuilderDefinition> builderRefs = new ArrayList<RouteBuilderDefinition>();
+ private List<RouteBuilderDefinition> builderRefs = new ArrayList<>();
@XmlElement(name = "routeContextRef")
- private List<RouteContextRefDefinition> routeRefs = new ArrayList<RouteContextRefDefinition>();
+ private List<RouteContextRefDefinition> routeRefs = new ArrayList<>();
@XmlElement(name = "restContextRef")
- private List<RestContextRefDefinition> restRefs = new ArrayList<RestContextRefDefinition>();
+ private List<RestContextRefDefinition> restRefs = new ArrayList<>();
@XmlElement(name = "threadPoolProfile")
private List<ThreadPoolProfileDefinition> threadPoolProfiles;
@XmlElement(name = "threadPool")
@@ -193,21 +193,21 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
@XmlElement(name = "redeliveryPolicyProfile")
private List<CamelRedeliveryPolicyFactoryBean> redeliveryPolicies;
@XmlElement(name = "onException")
- private List<OnExceptionDefinition> onExceptions = new ArrayList<OnExceptionDefinition>();
+ private List<OnExceptionDefinition> onExceptions = new ArrayList<>();
@XmlElement(name = "onCompletion")
- private List<OnCompletionDefinition> onCompletions = new ArrayList<OnCompletionDefinition>();
+ private List<OnCompletionDefinition> onCompletions = new ArrayList<>();
@XmlElement(name = "intercept")
- private List<InterceptDefinition> intercepts = new ArrayList<InterceptDefinition>();
+ private List<InterceptDefinition> intercepts = new ArrayList<>();
@XmlElement(name = "interceptFrom")
- private List<InterceptFromDefinition> interceptFroms = new ArrayList<InterceptFromDefinition>();
+ private List<InterceptFromDefinition> interceptFroms = new ArrayList<>();
@XmlElement(name = "interceptSendToEndpoint")
- private List<InterceptSendToEndpointDefinition> interceptSendToEndpoints = new ArrayList<InterceptSendToEndpointDefinition>();
+ private List<InterceptSendToEndpointDefinition> interceptSendToEndpoints = new ArrayList<>();
@XmlElement(name = "restConfiguration")
private RestConfigurationDefinition restConfiguration;
@XmlElement(name = "rest")
- private List<RestDefinition> rests = new ArrayList<RestDefinition>();
+ private List<RestDefinition> rests = new ArrayList<>();
@XmlElement(name = "route")
- private List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
+ private List<RouteDefinition> routes = new ArrayList<>();
@XmlTransient
private BlueprintCamelContext context;
@XmlTransient
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java
index 41c7040..0f9adf5 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java
@@ -31,7 +31,7 @@ import org.apache.camel.model.rest.RestDefinition;
public class CamelRestContextFactoryBean extends IdentifiedType {
@XmlElement(name = "rest", required = true)
- private List<RestDefinition> rests = new ArrayList<RestDefinition>();
+ private List<RestDefinition> rests = new ArrayList<>();
public List<RestDefinition> getRests() throws Exception {
return rests;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
index 1bb94ee..b5dda50 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
@@ -31,7 +31,7 @@ import org.apache.camel.model.RouteDefinition;
public class CamelRouteContextFactoryBean extends IdentifiedType {
@XmlElement(name = "route", required = true)
- private List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
+ private List<RouteDefinition> routes = new ArrayList<>();
public List<RouteDefinition> getRoutes() throws Exception {
return routes;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index d810f05..5d862c5 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -182,7 +182,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
@SuppressWarnings({"rawtypes"})
public Set<Class> getManagedClasses() {
- return new HashSet<Class>(Arrays.asList(BlueprintCamelContext.class));
+ return new HashSet<>(Arrays.asList(BlueprintCamelContext.class));
}
public Metadata parse(Element element, ParserContext context) {
@@ -257,7 +257,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
MutablePassThroughMetadata factory = context.createMetadata(MutablePassThroughMetadata.class);
factory.setId(".camelBlueprint.passThrough." + contextId);
- factory.setObject(new PassThroughCallable<Object>(value));
+ factory.setObject(new PassThroughCallable<>(value));
MutableBeanMetadata factory2 = context.createMetadata(MutableBeanMetadata.class);
factory2.setId(".camelBlueprint.factory." + contextId);
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
index b5761f9..9f0cb76 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
@@ -60,7 +60,7 @@ public class BonitaAuthFilter implements ClientRequestFilter {
Client client = clientBuilder.build();
WebTarget webTarget =
client.target(bonitaApiConfig.getBaseBonitaURI()).path("loginservice");
- MultivaluedMap<String, String> form = new MultivaluedHashMap<String, String>();
+ MultivaluedMap<String, String> form = new MultivaluedHashMap<>();
form.add("username", username);
form.add("password", password);
form.add("redirect", "false");
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
index c6b06f6..72061eb 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
@@ -51,8 +51,7 @@ public class BonitaConfigurationTest extends CamelTestSupport {
@Test(expected = ResolveEndpointFailedException.class)
public void testBonitaConfigurationWrongOperation() {
- BonitaEndpoint bonitaEndpoint =
- context.getEndpoint("bonita:wrongOperation", BonitaEndpoint.class);
+ context.getEndpoint("bonita:wrongOperation", BonitaEndpoint.class);
}
}
diff --git a/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java b/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java
index feaaf25..af84f51 100644
--- a/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java
+++ b/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java
@@ -30,7 +30,7 @@ public class BoonDataFormatTest extends CamelTestSupport {
@Test
public void testMarshalAndUnmarshalMap() throws Exception {
- Map<String, String> in = new LinkedHashMap<String, String>();
+ Map<String, String> in = new LinkedHashMap<>();
in.put("name", "Camel");
MockEndpoint mock = getMockEndpoint("mock:reverse");
@@ -68,7 +68,7 @@ public class BoonDataFormatTest extends CamelTestSupport {
@Test
public void testMarshalAndUnmarshalList() throws Exception {
- List<String> in = new ArrayList<String>();
+ List<String> in = new ArrayList<>();
in.add("Karaf");
in.add("Camel");
in.add("Servicemix");
@@ -92,7 +92,7 @@ public class BoonDataFormatTest extends CamelTestSupport {
TestPojo in = new TestPojo();
in.setName("Camel");
- Map<String, TestPojo> map = new LinkedHashMap<String, TestPojo>();
+ Map<String, TestPojo> map = new LinkedHashMap<>();
map.put("test1", in);
map.put("test2", in);
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java
index 84ce3eb..841e0ca 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.box.api;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -78,8 +78,8 @@ public class BoxEventLogsManager {
public List<BoxEvent> getEnterpriseEvents(String position, Date after, Date before, BoxEvent.Type... types) {
try {
LOG.debug("Getting all enterprise events occuring between "
- + (after == null ? after : SimpleDateFormat.getDateTimeInstance().format(after)) + " and "
- + (before == null ? before : SimpleDateFormat.getDateTimeInstance().format(before))
+ + (after == null ? after : DateFormat.getDateTimeInstance().format(after)) + " and "
+ + (before == null ? before : DateFormat.getDateTimeInstance().format(before))
+ (position == null ? position : (" starting at " + position)));
if (after == null) {
@@ -95,7 +95,7 @@ public class BoxEventLogsManager {
EventLog eventLog = EventLog.getEnterpriseEvents(boxConnection, position, after, before, types);
- List<BoxEvent> results = new ArrayList<BoxEvent>();
+ List<BoxEvent> results = new ArrayList<>();
for (BoxEvent event : eventLog) {
results.add(event);
}
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java
index e61264f..e8d87d0 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.box.api;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -560,7 +560,7 @@ public class BoxFilesManager {
try {
LOG.debug("Creating shared link for file(id=" + fileId + ") with access=" + access
+ (unshareDate == null ? ""
- : " unsharedDate=" + SimpleDateFormat.getDateTimeInstance().format(unshareDate)
+ : " unsharedDate=" + DateFormat.getDateTimeInstance().format(unshareDate)
+ " permissions=" + permissions));
if (fileId == null) {
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
index dbe4e55..1fe7d99 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.box.api;
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -143,7 +143,7 @@ public class BoxFoldersManager {
if (offset != null && limit != null) {
return folder.getChildrenRange(offset, limit, fields);
} else {
- Collection<BoxItem.Info> folderItems = new ArrayList<BoxItem.Info>();
+ Collection<BoxItem.Info> folderItems = new ArrayList<>();
Iterable<BoxItem.Info> iterable;
if (fields.length > 0) {
iterable = folder.getChildren(fields);
@@ -423,7 +423,7 @@ public class BoxFoldersManager {
try {
LOG.debug("Creating shared link for folder(id=" + folderId + ") with access=" + access
+ (unshareDate == null ? ""
- : " unsharedDate=" + SimpleDateFormat.getDateTimeInstance().format(unshareDate)
+ : " unsharedDate=" + DateFormat.getDateTimeInstance().format(unshareDate)
+ " permissions=" + permissions));
if (folderId == null) {
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
index 6ad31f9..82dede3 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
@@ -66,7 +66,7 @@ public class BoxGroupsManager {
try {
LOG.debug("Getting all groups");
- Collection<BoxGroup> groups = new ArrayList<BoxGroup>();
+ Collection<BoxGroup> groups = new ArrayList<>();
for (BoxGroup.Info groupInfo : BoxGroup.getAllGroups(boxConnection)) {
groups.add(groupInfo.getResource());
}
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
index c44e44f..1c7f122 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
@@ -79,7 +79,7 @@ public class BoxSearchManager {
BoxFolder folder = new BoxFolder(boxConnection, folderId);
- Collection<BoxItem> results = new ArrayList<BoxItem>();
+ Collection<BoxItem> results = new ArrayList<>();
for (BoxItem.Info info : folder.search(query)) {
results.add((BoxItem) info.getResource());
}
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java
index a345e8d..777d30d 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java
@@ -109,7 +109,7 @@ public class BoxTasksManager {
}
BoxFile fileToAddTaskOn = new BoxFile(boxConnection, fileId);
- return (BoxTask) fileToAddTaskOn.addTask(action, message, dueAt).getResource();
+ return fileToAddTaskOn.addTask(action, message, dueAt).getResource();
} catch (BoxAPIException e) {
throw new RuntimeException(
String.format("Box API returned the error code %d\n\n%s", e.getResponseCode(), e.getResponse()), e);
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java
index b496828..23209fe 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java
@@ -96,7 +96,7 @@ public class BoxUsersManager {
try {
LOG.debug("Getting all enterprise users matching filterTerm=" + filterTerm);
- List<BoxUser.Info> users = new ArrayList<BoxUser.Info>();
+ List<BoxUser.Info> users = new ArrayList<>();
Iterable<BoxUser.Info> iterable;
if (filterTerm == null) {
iterable = BoxUser.getAllEnterpriseUsers(boxConnection);
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java
index f825ed0..5271820 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.box;
import com.box.sdk.BoxAPIConnection;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxApiName;
import org.apache.camel.component.box.internal.BoxConnectionHelper;
import org.apache.camel.spi.Metadata;
import org.apache.camel.util.component.AbstractApiComponent;
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
index 935b287..dc820be 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
@@ -22,7 +22,6 @@ import com.box.sdk.EncryptionAlgorithm;
import com.box.sdk.IAccessTokenCache;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.box.internal.BoxApiName;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
index 95a3484..e2fafd3 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
@@ -26,7 +26,6 @@ import com.box.sdk.EventListener;
import org.apache.camel.Processor;
import org.apache.camel.component.box.api.BoxEventsManager;
-import org.apache.camel.component.box.internal.BoxApiName;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.component.AbstractApiConsumer;
import org.apache.camel.util.component.ApiConsumerHelper;
@@ -55,7 +54,7 @@ public class BoxConsumer extends AbstractApiConsumer<BoxApiName, BoxConfiguratio
// Add listener property to register this consumer as listener for
// events.
- properties = new HashMap<String, Object>();
+ properties = new HashMap<>();
properties.putAll(endpoint.getEndpointProperties());
properties.put(LISTENER_PROPERTY, this);
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
index e033839..e0f9c23 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
@@ -32,8 +32,6 @@ import org.apache.camel.component.box.api.BoxGroupsManager;
import org.apache.camel.component.box.api.BoxSearchManager;
import org.apache.camel.component.box.api.BoxTasksManager;
import org.apache.camel.component.box.api.BoxUsersManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxApiName;
import org.apache.camel.component.box.internal.BoxConnectionHelper;
import org.apache.camel.component.box.internal.BoxConstants;
import org.apache.camel.component.box.internal.BoxPropertiesHelper;
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java
index ea537da..7a98024 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.box;
-import org.apache.camel.component.box.internal.BoxApiName;
import org.apache.camel.component.box.internal.BoxPropertiesHelper;
import org.apache.camel.util.component.AbstractApiProducer;
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
index f8e0e5f..e565414 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
@@ -186,7 +186,7 @@ public final class BoxConnectionHelper {
final String location = e.getResponse().getResponseHeaderValue("Location");
redirectQuery = new URL(location).getQuery();
}
- final Map<String, String> params = new HashMap<String, String>();
+ final Map<String, String> params = new HashMap<>();
final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);
while (matcher.find()) {
params.put(matcher.group(1), matcher.group(2));
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
index ecee8e9..13f93f4 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/AbstractBoxTestSupport.java
@@ -52,7 +52,7 @@ public class AbstractBoxTestSupport extends CamelTestSupport {
e);
}
- Map<String, Object> options = new HashMap<String, Object>();
+ Map<String, Object> options = new HashMap<>();
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
options.put(entry.getKey().toString(), entry.getValue());
}
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
index 6146227..5a73ea5 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
@@ -29,8 +29,6 @@ import com.box.sdk.CreateUserParams;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxCollaborationsManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxCollaborationsManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -57,7 +55,7 @@ public class BoxCollaborationsManagerIntegrationTest extends AbstractBoxTestSupp
// delete collaborator created by setupTest
deleteTestCollaborator();
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is String
@@ -83,7 +81,7 @@ public class BoxCollaborationsManagerIntegrationTest extends AbstractBoxTestSupp
params.setSpaceAmount(1073741824); // 1 GB
user = BoxUser.createAppUser(getConnection(), CAMEL_TEST_COLLABORATOR_NAME, params).getResource();
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is String
@@ -136,7 +134,7 @@ public class BoxCollaborationsManagerIntegrationTest extends AbstractBoxTestSupp
@Test
public void testUpdateCollaborationInfo() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.collaborationId", testCollaboration.getID());
// parameter type is com.box.sdk.BoxCollaboration.Info
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
index bda21b5..596e23a 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
@@ -28,8 +28,6 @@ import com.box.sdk.BoxFolder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxCommentsManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxCommentsManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -53,7 +51,7 @@ public class BoxCommentsManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testAddFileComment() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is String
@@ -74,7 +72,7 @@ public class BoxCommentsManagerIntegrationTest extends AbstractBoxTestSupport {
BoxComment.Info commentInfo = testFile.addComment(CAMEL_TEST_FILE_COMMENT);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.commentId", commentInfo.getID());
// parameter type is String
@@ -131,7 +129,7 @@ public class BoxCommentsManagerIntegrationTest extends AbstractBoxTestSupport {
BoxComment.Info commentInfo = testFile.addComment(CAMEL_TEST_FILE_COMMENT);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.commentId", commentInfo.getID());
// parameter type is String
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java
index 8200b8c..52c497f 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIntegrationTest.java
@@ -22,8 +22,6 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxEventLogsManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxEventLogsManagerApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -47,7 +45,7 @@ public class BoxEventLogsManagerIntegrationTest extends AbstractBoxTestSupport {
Date after = new Date();
after.setTime(before.getTime() - ONE_MINUTE_OF_MILLISECONDS);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.position", null);
// parameter type is java.util.Date
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
index 77debfd..d4e333c 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
@@ -27,8 +27,6 @@ import com.box.sdk.BoxFolder;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxEventsManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxEventsManagerApiMethod;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
index 60bbb94..110cd8a 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
@@ -34,8 +34,6 @@ import com.box.sdk.Metadata;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxFilesManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxFilesManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -66,7 +64,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
com.box.sdk.BoxFile result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is String
@@ -91,7 +89,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
Metadata metadata = new Metadata();
metadata.add("/foo", "bar");
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is com.box.sdk.Metadata
@@ -108,7 +106,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testCreateFileSharedLink() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is com.box.sdk.BoxSharedLink.Access
@@ -162,7 +160,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
public void testDeleteFileVersion() throws Exception {
testFile.uploadVersion(getClass().getResourceAsStream(CAMEL_TEST_FILE));
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is Integer
@@ -175,7 +173,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testDownloadFile() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is java.io.OutputStream
@@ -197,7 +195,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
@Ignore // Requires premium user account to test
@Test
public void testDownloadPreviousFileVersion() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is Integer
@@ -226,7 +224,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testGetFileInfo() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is String[]
@@ -242,7 +240,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
public void testGetFileMetadata() throws Exception {
testFile.createMetadata(new Metadata());
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is String
@@ -265,7 +263,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testGetFileThumbnail() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is com.box.sdk.BoxFile.ThumbnailFileType
@@ -300,7 +298,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
com.box.sdk.BoxFile result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is String
@@ -325,7 +323,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
public void testPromoteFileVersion() throws Exception {
testFile.uploadVersion(getClass().getResourceAsStream(CAMEL_TEST_FILE));
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is Integer
@@ -343,7 +341,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
com.box.sdk.BoxFile result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is String
@@ -366,7 +364,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
BoxFile.Info info = testFile.getInfo();
info.setDescription(CAMEL_TEST_FILE_DESCRIPTION);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is com.box.sdk.BoxFile.Info
@@ -385,7 +383,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
// metadata.add("/foo", "bar");
metadata = testFile.createMetadata(metadata);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is com.box.sdk.Metadata
@@ -403,7 +401,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
com.box.sdk.BoxFile result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelBox.parentFolderId", "0");
headers.put("CamelBox.content", getClass().getResourceAsStream(CAMEL_TEST_FILE));
headers.put("CamelBox.fileName", CAMEL_TEST_UPLOAD_FILE_NAME);
@@ -431,7 +429,7 @@ public class BoxFilesManagerIntegrationTest extends AbstractBoxTestSupport {
com.box.sdk.BoxFile result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is java.io.InputStream
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
index 7d2638e..1ba739a 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
@@ -27,8 +27,6 @@ import com.box.sdk.BoxSharedLink;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxFoldersManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxFoldersManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -59,7 +57,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
// delete folder created in test setup.
deleteTestFolder();
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.parentFolderId", "0");
// parameter type is String
@@ -78,7 +76,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
// delete folder created in test setup.
deleteTestFolder();
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.parentFolderId", "0");
// parameter type is String[]
@@ -108,7 +106,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
public void testCopyFolder() throws Exception {
com.box.sdk.BoxFolder result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is String
@@ -131,7 +129,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testCreateSharedLink() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is com.box.sdk.BoxSharedLink.Access
@@ -160,7 +158,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testGetFolderInfo() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is String[]
@@ -176,7 +174,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testGetFolderItems() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", CAMEL_TEST_ROOT_FOLDER_ID);
// parameter type is Long
@@ -203,7 +201,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testMoveFolder() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is String
@@ -220,7 +218,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testRenameFolder() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is String
@@ -237,7 +235,7 @@ public class BoxFoldersManagerIntegrationTest extends AbstractBoxTestSupport {
public void testUpdateInfo() throws Exception {
final BoxFolder.Info testFolderInfo = testFolder.getInfo();
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", testFolder.getID());
// parameter type is com.box.sdk.BoxFolder.Info
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java
index 24ea2ec..f45123c 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIntegrationTest.java
@@ -26,8 +26,6 @@ import com.box.sdk.BoxGroupMembership;
import com.box.sdk.BoxUser;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxGroupsManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxGroupsManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -51,7 +49,7 @@ public class BoxGroupsManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testAddGroupMembership() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.groupId", testGroup.getID());
// parameter type is String
@@ -135,7 +133,7 @@ public class BoxGroupsManagerIntegrationTest extends AbstractBoxTestSupport {
info.setDescription(CAMEL_TEST_GROUP_DESCRIPTION);
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.groupId", testGroup.getID());
// parameter type is com.box.sdk.BoxGroup.Info
@@ -175,7 +173,7 @@ public class BoxGroupsManagerIntegrationTest extends AbstractBoxTestSupport {
BoxGroupMembership.Info info = testGroup.addMembership(testUser, BoxGroupMembership.Role.MEMBER);
info.setRole(BoxGroupMembership.Role.ADMIN);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.groupMemebershipId", info.getID());
// parameter type is com.box.sdk.BoxGroupMembership.Info
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
index c491d6c..b219103 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIntegrationTest.java
@@ -26,8 +26,6 @@ import com.box.sdk.BoxFolder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxSearchManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxSearchManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +46,7 @@ public class BoxSearchManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testSearchFolder() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.folderId", "0");
// parameter type is String
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
index 5aa0561..82db740 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
@@ -32,8 +32,6 @@ import com.box.sdk.BoxUser;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxTasksManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxTasksManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -61,7 +59,7 @@ public class BoxTasksManagerIntegrationTest extends AbstractBoxTestSupport {
public void testAddAssignmentToTask() throws Exception {
com.box.sdk.BoxTask result = null;
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.taskId", testTask.getID());
// parameter type is com.box.sdk.BoxUser
@@ -78,7 +76,7 @@ public class BoxTasksManagerIntegrationTest extends AbstractBoxTestSupport {
com.box.sdk.BoxTask result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.fileId", testFile.getID());
// parameter type is com.box.sdk.BoxTask.Action
@@ -183,7 +181,7 @@ public class BoxTasksManagerIntegrationTest extends AbstractBoxTestSupport {
public void testUpdateTaskInfo() throws Exception {
BoxTask.Info info = testTask.getInfo();
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.taskId", testTask.getID());
// parameter type is com.box.sdk.BoxTask.Info
@@ -252,7 +250,7 @@ public class BoxTasksManagerIntegrationTest extends AbstractBoxTestSupport {
private void createTestTask() {
Date now = new Date();
Date dueAt = new Date(now.getTime() + TEN_MINUTES_IN_MILLIS);
- testTask = (BoxTask) testFile.addTask(Action.REVIEW, CAMEL_TEST_MESSAGE, dueAt).getResource();
+ testTask = testFile.addTask(Action.REVIEW, CAMEL_TEST_MESSAGE, dueAt).getResource();
}
private void deleteTestTask() {
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
index 6e50cc3..8c526a4 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
@@ -28,8 +28,6 @@ import com.box.sdk.EmailAlias;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxUsersManager;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxUsersManagerApiMethod;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -61,7 +59,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
public void testAddUserEmailAlias() throws Exception {
com.box.sdk.EmailAlias result = null;
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.userId", testUser.getID());
// parameter type is String
@@ -87,7 +85,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
CreateUserParams params = new CreateUserParams();
params.setSpaceAmount(1073741824); // 1 GB
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.name", CAMEL_TEST_CREATE_APP_USER_NAME);
// parameter type is com.box.sdk.CreateUserParams
@@ -115,7 +113,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
CreateUserParams params = new CreateUserParams();
params.setSpaceAmount(1073741824); // 1 GB
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.login", CAMEL_TEST_CREATE_ENTERPRISE_USER_LOGIN);
// parameter type is String
@@ -141,7 +139,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
public void testDeleteUser() throws Exception {
BoxUser.Info info = BoxUser.createAppUser(getConnection(), CAMEL_TEST_CREATE_APP_USER_NAME);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.userId", info.getID());
headers.put("CamelBox.notifyUser", Boolean.FALSE);
@@ -167,7 +165,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
String.format("Box API returned the error code %d\n\n%s", e.getResponseCode(), e.getResponse()), e);
}
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.userId", testUser.getID());
// parameter type is String
@@ -181,7 +179,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
@Test
public void testGetAllEnterpriseOrExternalUsers() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.filterTerm", null);
// parameter type is String[]
@@ -227,7 +225,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
info.setJobTitle(CAMEL_TEST_USER_JOB_TITLE);
try {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.userId", testUser.getID());
// parameter type is com.box.sdk.BoxUser.Info
@@ -249,7 +247,7 @@ public class BoxUsersManagerIntegrationTest extends AbstractBoxTestSupport {
BoxUser.Info user2 = BoxUser.createEnterpriseUser(getConnection(),
CAMEL_TEST_CREATE_ENTERPRISE_USER2_LOGIN, CAMEL_TEST_CREATE_ENTERPRISE_USER2_NAME);
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBox.userId", user1.getID());
headers.put("CamelBox.sourceUserId", user2.getID());
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
index c50d7a7..713e3bf 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
@@ -22,8 +22,6 @@ import java.util.Map;
import com.braintreegateway.BraintreeGateway;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.BraintreeApiName;
import org.apache.camel.util.component.AbstractApiComponent;
/**
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
index 420a362..c704bd5 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
@@ -22,7 +22,6 @@ import java.util.logging.Logger;
import com.braintreegateway.BraintreeGateway;
import com.braintreegateway.Environment;
-import org.apache.camel.component.braintree.internal.BraintreeApiName;
import org.apache.camel.component.braintree.internal.BraintreeLogHandler;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConsumer.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConsumer.java
index 545ca87..61ba398 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConsumer.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConsumer.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.braintree;
import org.apache.camel.Processor;
-import org.apache.camel.component.braintree.internal.BraintreeApiName;
import org.apache.camel.util.component.AbstractApiConsumer;
/**
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java
index f2a9d04..0e1ff01 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java
@@ -24,8 +24,6 @@ import com.braintreegateway.BraintreeGateway;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.BraintreeApiName;
import org.apache.camel.component.braintree.internal.BraintreeConstants;
import org.apache.camel.component.braintree.internal.BraintreePropertiesHelper;
import org.apache.camel.spi.UriEndpoint;
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeProducer.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeProducer.java
index ee86492..fcf97fe 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeProducer.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeProducer.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.braintree;
-import org.apache.camel.component.braintree.internal.BraintreeApiName;
import org.apache.camel.component.braintree.internal.BraintreePropertiesHelper;
import org.apache.camel.util.component.AbstractApiProducer;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java
index 837919f..5a53db1 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AbstractBraintreeTestSupport.java
@@ -26,8 +26,6 @@ import com.braintreegateway.BraintreeGateway;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.BraintreeApiName;
import org.apache.camel.component.braintree.internal.BraintreeConstants;
import org.apache.camel.component.braintree.internal.BraintreeLogHandler;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddOnGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddOnGatewayIntegrationTest.java
index ecf9c02..13a2ea7 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddOnGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddOnGatewayIntegrationTest.java
@@ -20,7 +20,6 @@ import java.util.List;
import com.braintreegateway.AddOn;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.AddOnGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java
index 1a71632..a0f127d 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java
@@ -27,8 +27,6 @@ import com.braintreegateway.Customer;
import com.braintreegateway.CustomerRequest;
import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.AddressGatewayApiMethod;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java
index 7be0c58..46ed9f8 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.braintree;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.ClientTokenGatewayApiMethod;
import org.apache.camel.util.ObjectHelper;
import org.junit.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayIntegrationTest.java
index b32c135..4cc0456 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CreditCardVerificationGatewayIntegrationTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.braintree;
import com.braintreegateway.CreditCardVerification;
import com.braintreegateway.ResourceCollection;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.CreditCardVerificationGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java
index d408360..cd6d5e4 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java
@@ -30,7 +30,6 @@ import com.braintreegateway.ValidationErrors;
import com.braintreegateway.exceptions.NotFoundException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.CustomerGatewayApiMethod;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DiscountGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DiscountGatewayIntegrationTest.java
index a0056c3..191bd79 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DiscountGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DiscountGatewayIntegrationTest.java
@@ -20,8 +20,6 @@ import java.util.List;
import com.braintreegateway.Discount;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.DiscountGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIntegrationTest.java
index 71f4a9d..35000b4 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/MerchantAccountGatewayIntegrationTest.java
@@ -24,9 +24,7 @@ import com.braintreegateway.MerchantAccount;
import com.braintreegateway.MerchantAccountRequest;
import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.BraintreeConstants;
-import org.apache.camel.component.braintree.internal.MerchantAccountGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java
index 4c5c2c3..e9f441b 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java
@@ -27,7 +27,6 @@ import com.braintreegateway.PaymentMethod;
import com.braintreegateway.PaymentMethodRequest;
import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.PaymentMethodGatewayApiMethod;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIntegrationTest.java
index 99ddcd0..94c2e62 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIntegrationTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.component.braintree;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.PaymentMethodNonceGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java
index 0ec6ee8..389baf6 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java
@@ -20,7 +20,6 @@ import java.util.List;
import com.braintreegateway.Plan;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.PlanGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java
index 201ca8f..0e0937b 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java
@@ -20,8 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.SettlementBatchSummaryGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -47,7 +45,7 @@ public class SettlementBatchSummaryGatewayIntegrationTest extends AbstractBraint
@Ignore
@Test
public void testGenerateWithCustomFields() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is java.util.Calendar
headers.put("CamelBraintree.settlementDate", null);
// parameter type is String
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIntegrationTest.java
index 0694ae9..68c6ea4 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIntegrationTest.java
@@ -20,8 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.SubscriptionGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -58,7 +56,7 @@ public class SubscriptionGatewayIntegrationTest extends AbstractBraintreeTestSup
@Ignore
@Test
public void testDelete() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBraintree.customerId", null);
// parameter type is String
@@ -96,7 +94,7 @@ public class SubscriptionGatewayIntegrationTest extends AbstractBraintreeTestSup
@Ignore
@Test
public void testRetryChargeWithAmount() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBraintree.subscriptionId", null);
// parameter type is java.math.BigDecimal
@@ -123,7 +121,7 @@ public class SubscriptionGatewayIntegrationTest extends AbstractBraintreeTestSup
@Ignore
@Test
public void testUpdate() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBraintree.id", null);
// parameter type is com.braintreegateway.SubscriptionRequest
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java
index 01f5fbb..d89dc8d 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java
@@ -30,8 +30,6 @@ import com.braintreegateway.TransactionRefundRequest;
import com.braintreegateway.TransactionRequest;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.TransactionGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -437,7 +435,7 @@ public class TransactionGatewayIntegrationTest extends AbstractBraintreeTestSupp
@Ignore
@Test
public void testSubmitForPartialSettlement() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelBraintree.id", null);
// parameter type is java.math.BigDecimal
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIntegrationTest.java
index 4d74a2c..68b6f67 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/WebhookNotificationGatewayIntegrationTest.java
@@ -25,9 +25,7 @@ import com.braintreegateway.ConnectedMerchantPayPalStatusChanged;
import com.braintreegateway.ConnectedMerchantStatusTransitioned;
import com.braintreegateway.WebhookNotification;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.BraintreeConstants;
-import org.apache.camel.component.braintree.internal.WebhookNotificationGatewayApiMethod;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.
[camel] 04/04: 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 0cc235105f2b48c4551a83bc6028564fcbf279d7
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 14:40:35 2018 +0200
polish
---
.../maven/connector/model/EndpointOptionModel.java | 1 -
.../maven/connector/util/JSonSchemaHelper.java | 2 -
.../component/connector/ConnectorComponent.java | 1 +
.../camel/component/connector/ConnectorModel.java | 3 --
.../camel/catalog/karaf/KarafRuntimeProvider.java | 8 ++--
.../springboot/SpringBootRuntimeProvider.java | 8 ++--
.../apache/camel/catalog/DefaultCamelCatalog.java | 34 +++++++--------
.../camel/catalog/DefaultRuntimeProvider.java | 8 ++--
.../org/apache/camel/catalog/CamelCatalogTest.java | 24 +++++------
.../camel/commands/AbstractCamelController.java | 2 +-
.../commands/AbstractLocalCamelController.java | 38 ++++++++--------
.../camel/commands/ComponentListCommand.java | 2 +-
.../camel/commands/ContextInflightCommand.java | 2 +-
.../apache/camel/commands/ContextListCommand.java | 2 +-
.../camel/commands/EndpointStatisticCommand.java | 2 +-
.../camel/commands/RestRegistryListCommand.java | 2 +-
.../apache/camel/commands/RouteListCommand.java | 2 +-
.../camel/commands/DummyCamelController.java | 6 +--
.../jolokia/DefaultJolokiaCamelController.java | 50 +++++++++++-----------
.../cxf/jaxrs/testbean/CustomerService.java | 6 +--
.../camel/component/cxf/jaxrs/testbean/Order.java | 2 +-
.../test/cxf/blueprint/CxfEndpointBeansTest.java | 2 +-
.../builder/AddComponentInConfigureBuilder.java | 6 +--
.../tools/apt/CoreEipAnnotationProcessor.java | 40 ++++++++---------
.../tools/apt/EndpointAnnotationProcessor.java | 20 ++++-----
.../camel/tools/apt/SpringAnnotationProcessor.java | 12 +++---
.../camel/tools/apt/model/ComponentOption.java | 2 -
.../camel/tools/apt/model/EndpointOption.java | 2 -
.../apache/camel/tools/apt/model/EndpointPath.java | 2 -
.../tools/apt/EndpointOptionComparatorTest.java | 2 +-
.../maven/AbstractApiMethodGeneratorMojo.java | 4 +-
.../apache/camel/maven/DocumentGeneratorMojo.java | 34 +++++++--------
.../camel/maven/FileApiMethodGeneratorMojo.java | 2 +-
.../camel/maven/JavadocApiMethodGeneratorMojo.java | 6 +--
.../java/org/apache/camel/maven/JavadocParser.java | 4 +-
.../org/apache/camel/component/test/TestProxy.java | 2 +-
.../camel/maven/ApiComponentGeneratorMojoTest.java | 2 +-
37 files changed, 166 insertions(+), 181 deletions(-)
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java
index 07d536a..5c97a2b 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/EndpointOptionModel.java
@@ -66,7 +66,6 @@ public class EndpointOptionModel extends OptionModel {
}
public String getShortJavaType(int watermark) {
- String group = getGroup();
String type = getType();
String javaType = getJavaType();
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
index f507e4b..bc9d606 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
@@ -22,8 +22,6 @@ import java.net.URL;
import java.util.Date;
import java.util.Set;
-import org.apache.camel.json.simple.Jsoner;
-
/**
* A helper class for <a href="http://json-schema.org/">JSON schema</a>.
*/
diff --git a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
index 42b81f8..1fc0ab2 100644
--- a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
+++ b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorComponent.java
@@ -97,6 +97,7 @@ public interface ConnectorComponent extends Component {
*
* @deprecated use {@link #setOptions(Map)} instead
*/
+ @Deprecated
default void setComponentOptions(Map<String, Object> options) {
setOptions(options);
}
diff --git a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
index ac01f55..bb20b15 100644
--- a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
+++ b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
@@ -24,9 +24,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Map;
-import org.apache.camel.json.simple.DeserializationException;
-import org.apache.camel.json.simple.JsonObject;
-import org.apache.camel.json.simple.Jsoner;
import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java b/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java
index f02c1e8..977a94f 100644
--- a/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java
+++ b/platforms/camel-catalog-provider-karaf/src/main/java/org/apache/camel/catalog/karaf/KarafRuntimeProvider.java
@@ -89,7 +89,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findComponentNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(COMPONENTS_CATALOG);
if (is != null) {
try {
@@ -103,7 +103,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findDataFormatNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(DATA_FORMATS_CATALOG);
if (is != null) {
try {
@@ -117,7 +117,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findLanguageNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(LANGUAGE_CATALOG);
if (is != null) {
try {
@@ -131,7 +131,7 @@ public class KarafRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findOtherNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(OTHER_CATALOG);
if (is != null) {
try {
diff --git a/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java b/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java
index 989f557..4288285 100644
--- a/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java
+++ b/platforms/camel-catalog-provider-springboot/src/main/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProvider.java
@@ -89,7 +89,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findComponentNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(COMPONENTS_CATALOG);
if (is != null) {
try {
@@ -103,7 +103,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findDataFormatNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(DATA_FORMATS_CATALOG);
if (is != null) {
try {
@@ -117,7 +117,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findLanguageNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(LANGUAGE_CATALOG);
if (is != null) {
try {
@@ -131,7 +131,7 @@ public class SpringBootRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findOtherNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = camelCatalog.getVersionManager().getResourceAsStream(OTHER_CATALOG);
if (is != null) {
try {
diff --git a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index e4b3f9e..4fde346 100644
--- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -49,13 +49,13 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
private final VersionHelper version = new VersionHelper();
// 3rd party components/data-formats
- private final Map<String, String> extraComponents = new HashMap<String, String>();
- private final Map<String, String> extraComponentsJSonSchema = new HashMap<String, String>();
- private final Map<String, String> extraDataFormats = new HashMap<String, String>();
- private final Map<String, String> extraDataFormatsJSonSchema = new HashMap<String, String>();
+ private final Map<String, String> extraComponents = new HashMap<>();
+ private final Map<String, String> extraComponentsJSonSchema = new HashMap<>();
+ private final Map<String, String> extraDataFormats = new HashMap<>();
+ private final Map<String, String> extraDataFormatsJSonSchema = new HashMap<>();
// 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;
private VersionManager versionManager = new DefaultVersionManager(this);
@@ -260,7 +260,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (names == null) {
- names = new ArrayList<String>();
+ names = new ArrayList<>();
InputStream is = versionManager.getResourceAsStream(MODELS_CATALOG);
if (is != null) {
try {
@@ -297,7 +297,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findModelNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findModelNames();
for (String name : names) {
@@ -328,7 +328,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findComponentNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findComponentNames();
for (String name : names) {
@@ -359,7 +359,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findDataFormatNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findDataFormatNames();
for (String name : names) {
@@ -390,7 +390,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findLanguageNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findLanguageNames();
for (String name : names) {
@@ -421,7 +421,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<String> findOtherNames(String filter) {
// should not cache when filter parameter can by any kind of value
- List<String> answer = new ArrayList<String>();
+ List<String> answer = new ArrayList<>();
List<String> names = findOtherNames();
for (String name : names) {
@@ -925,7 +925,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findModelNames();
for (String name : names) {
String json = modelJSonSchema(name);
@@ -959,7 +959,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findComponentNames();
for (String name : names) {
String json = componentJSonSchema(name);
@@ -993,7 +993,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findDataFormatNames();
for (String name : names) {
String json = dataFormatJSonSchema(name);
@@ -1027,7 +1027,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findLanguageNames();
for (String name : names) {
String json = languageJSonSchema(name);
@@ -1061,7 +1061,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
}
if (answer == null) {
- answer = new TreeSet<String>();
+ answer = new TreeSet<>();
List<String> names = findOtherNames();
for (String name : names) {
String json = otherJSonSchema(name);
@@ -1171,7 +1171,7 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
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/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
index 5e3ec9b..2c7a8b8 100644
--- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
+++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
@@ -104,7 +104,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findComponentNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getComponentsCatalog());
if (is != null) {
try {
@@ -118,7 +118,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findDataFormatNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getDataFormatsCatalog());
if (is != null) {
try {
@@ -132,7 +132,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findLanguageNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getLanguageCatalog());
if (is != null) {
try {
@@ -146,7 +146,7 @@ public class DefaultRuntimeProvider implements RuntimeProvider {
@Override
public List<String> findOtherNames() {
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getOtherCatalog());
if (is != null) {
try {
diff --git a/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index bb9173d..bd77675 100644
--- a/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -171,7 +171,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapFile() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("directoryName", "src/data/inbox");
map.put("noop", "true");
map.put("delay", "5000");
@@ -185,7 +185,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapFtp() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("host", "someserver");
map.put("port", "21");
map.put("directoryName", "foo");
@@ -200,7 +200,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapJms() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("destinationType", "queue");
map.put("destinationName", "foo");
@@ -210,7 +210,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriNetty4http() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
// use http protocol
map.put("protocol", "http");
map.put("host", "localhost");
@@ -237,7 +237,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriTimer() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("timerName", "foo");
map.put("period", "5000");
@@ -247,7 +247,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointDefaultValue() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("destinationName", "cheese");
map.put("maxMessagesPerTask", "-1");
@@ -257,7 +257,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriPropertiesPlaceholders() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("timerName", "foo");
map.put("period", "{{howoften}}");
map.put("repeatCount", "5");
@@ -271,7 +271,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriBeanLookup() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("resourceUri", "foo.xslt");
map.put("converter", "#myConverter");
@@ -284,7 +284,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriMapJmsRequiredOnly() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("destinationName", "foo");
String uri = catalog.asEndpointUri("jms", map, true);
assertEquals("jms:foo", uri);
@@ -429,7 +429,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriLog() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("loggerName", "foo");
map.put("loggerLevel", "WARN");
map.put("multiline", "true");
@@ -444,7 +444,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriLogShort() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("loggerName", "foo");
map.put("loggerLevel", "DEBUG");
@@ -453,7 +453,7 @@ public class CamelCatalogTest {
@Test
public void testAsEndpointUriWithplaceholder() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("query", "{{insert}}");
assertEquals("sql:{{insert}}", catalog.asEndpointUri("sql", map, false));
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
index 2937d10..2249d13 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
@@ -34,7 +34,7 @@ public abstract class AbstractCamelController implements CamelController {
@Override
public List<Map<String, String>> getCamelContexts(String filter) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
List<Map<String, String>> context = getCamelContexts();
if (filter != null) {
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index 4d0a004..f72ce91 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -67,7 +67,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
@Override
public Map<String, Object> getCamelContextInformation(String name) throws Exception {
- Map<String, Object> answer = new LinkedHashMap<String, Object>();
+ Map<String, Object> answer = new LinkedHashMap<>();
CamelContext context = getLocalCamelContext(name);
if (context != null) {
answer.put("name", context.getName());
@@ -184,7 +184,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
return null;
}
- List<Map<String, Object>> answer = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> answer = new ArrayList<>();
ManagementAgent agent = context.getManagementStrategy().getManagementAgent();
if (agent != null) {
@@ -194,7 +194,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
TabularData list = (TabularData) mBeanServer.invoke(on, "browse", new Object[]{route, limit, sortByLongestDuration}, new String[]{"java.lang.String", "int", "boolean"});
Collection<CompositeData> values = (Collection<CompositeData>) list.values();
for (CompositeData data : values) {
- Map<String, Object> row = new LinkedHashMap<String, Object>();
+ Map<String, Object> row = new LinkedHashMap<>();
Object exchangeId = data.get("exchangeId");
if (exchangeId != null) {
row.put("exchangeId", exchangeId);
@@ -260,14 +260,14 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getRoutes(String camelContextName, String filter) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
for (Route route : context.getRoutes()) {
if (filter == null || route.getId().matches(filter)) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("routeId", route.getId());
row.put("state", getRouteState(route));
@@ -428,12 +428,12 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getEndpoints(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
- List<Endpoint> endpoints = new ArrayList<Endpoint>(context.getEndpoints());
+ List<Endpoint> endpoints = new ArrayList<>(context.getEndpoints());
// sort routes
Collections.sort(endpoints, new Comparator<Endpoint>() {
@Override
@@ -442,7 +442,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
});
for (Endpoint endpoint : endpoints) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("uri", endpoint.getEndpointUri());
row.put("state", getEndpointState(endpoint));
@@ -454,7 +454,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getEndpointRuntimeStatistics(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
@@ -469,7 +469,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
Boolean isDynamic = staticRegistry.isDynamic(url);
long hits = stat.getHits();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("uri", url);
row.put("routeId", routeId);
@@ -504,12 +504,12 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
public List<Map<String, String>> getRestServices(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
- List<RestRegistry.RestService> services = new ArrayList<RestRegistry.RestService>(context.getRestRegistry().listAllRestServices());
+ List<RestRegistry.RestService> services = new ArrayList<>(context.getRestRegistry().listAllRestServices());
Collections.sort(services, new Comparator<RestRegistry.RestService>() {
@Override
public int compare(RestRegistry.RestService o1, RestRegistry.RestService o2) {
@@ -517,7 +517,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
});
for (RestRegistry.RestService service : services) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("basePath", service.getBasePath());
row.put("baseUrl", service.getBaseUrl());
row.put("consumes", service.getConsumes());
@@ -559,7 +559,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
return null;
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
// find all components
Map<String, Properties> components = context.findComponents();
@@ -598,7 +598,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
}
}
- Map<String, String> row = new HashMap<String, String>();
+ Map<String, String> row = new HashMap<>();
row.put("name", name);
row.put("status", status);
if (description != null) {
@@ -628,14 +628,14 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
@Override
public List<Map<String, String>> getTransformers(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
List<Transformer> transformers = new ArrayList<Transformer>(context.getTransformerRegistry().values());
for (Transformer transformer : transformers) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("scheme", transformer.getModel());
row.put("from", transformer.getFrom().toString());
@@ -651,14 +651,14 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
@Override
public List<Map<String, String>> getValidators(String camelContextName) throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
if (camelContextName != null) {
CamelContext context = this.getLocalCamelContext(camelContextName);
if (context != null) {
List<Validator> validators = new ArrayList<Validator>(context.getValidatorRegistry().values());
for (Validator validator : validators) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", context.getName());
row.put("type", validator.getType().toString());
row.put("state", validator.getStatus().toString());
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java
index bd02d2c..c59fbe7 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ComponentListCommand.java
@@ -118,7 +118,7 @@ public class ComponentListCommand extends AbstractContextCommand {
}
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>(4);
+ final Map<String, Integer> retval = new Hashtable<>(4);
retval.put(NAME_COLUMN_LABEL, maxNameLen);
retval.put(STATUS_COLUMN_LABEL, maxStatusLen);
retval.put(MAVEN_COLUMN_LABEL, maxMavenLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java
index 8c78aac..b61a24a 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInflightCommand.java
@@ -109,7 +109,7 @@ public class ContextInflightCommand extends AbstractContextCommand {
maxDurationLen = java.lang.Math.max(maxDurationLen, duration == null ? 0 : duration.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>(5);
+ final Map<String, Integer> retval = new Hashtable<>(5);
retval.put(EXCHANGE_COLUMN_LABEL, maxExchangeLen);
retval.put(FROM_ROUTE_COLUMN_LABEL, maxFromRouteLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
index 41a4ec1..2c91804 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
@@ -92,7 +92,7 @@ public class ContextListCommand extends AbstractCamelCommand {
maxUptimeLen = java.lang.Math.max(maxUptimeLen, uptime == null ? 0 : uptime.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>();
+ final Map<String, Integer> retval = new Hashtable<>();
retval.put(CONTEXT_COLUMN_LABEL, maxNameLen);
retval.put(STATUS_COLUMN_LABEL, maxStatusLen);
retval.put(TOTAL_COLUMN_LABEL, maxTotalLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
index 48d1b21..ce87293 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
@@ -180,7 +180,7 @@ public class EndpointStatisticCommand extends AbstractCamelCommand {
}
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>();
+ final Map<String, Integer> retval = new Hashtable<>();
retval.put(CONTEXT_COLUMN_LABEL, maxContextLen);
retval.put(URI_COLUMN_LABEL, maxUriLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteIdLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java
index f1d4b9f..d66e06b 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RestRegistryListCommand.java
@@ -136,7 +136,7 @@ public class RestRegistryListCommand extends AbstractContextCommand {
maxRouteLen = Math.max(maxRouteLen, routeId == null ? 0 : routeId.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>();
+ final Map<String, Integer> retval = new Hashtable<>();
retval.put(URL_COLUMN_NAME, maxUriLen);
retval.put(BASE_PATH_LABEL, maxBasePathLen);
retval.put(URI_TEMPLATE_LABEL, maxUriTemplateLen);
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java
index 95bdd3e..60839da 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteListCommand.java
@@ -111,7 +111,7 @@ public class RouteListCommand extends AbstractCamelCommand {
maxUptimeLen = java.lang.Math.max(maxUptimeLen, uptime == null ? 0 : uptime.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>(3);
+ final Map<String, Integer> retval = new Hashtable<>(3);
retval.put(CONTEXT_COLUMN_LABEL, maxContextLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteLen);
retval.put(STATUS_COLUMN_LABEL, maxStatusLen);
diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java
index 9d27d0f..edc16eb 100644
--- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java
+++ b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/DummyCamelController.java
@@ -33,15 +33,15 @@ public class DummyCamelController extends AbstractLocalCamelController {
@Override
public List<CamelContext> getLocalCamelContexts() {
- List<CamelContext> answer = new ArrayList<CamelContext>(1);
+ List<CamelContext> answer = new ArrayList<>(1);
answer.add(camelContext);
return answer;
}
@Override
public List<Map<String, String>> getCamelContexts() throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>(1);
- Map<String, String> row = new LinkedHashMap<String, String>();
+ List<Map<String, String>> answer = new ArrayList<>(1);
+ Map<String, String> row = new LinkedHashMap<>();
row.put("name", camelContext.getName());
row.put("state", camelContext.getStatus().name());
row.put("uptime", camelContext.getUptime());
diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
index 867a052..397ec20 100644
--- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
+++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
@@ -48,7 +48,7 @@ import org.json.simple.JSONObject;
*/
public class DefaultJolokiaCamelController extends AbstractCamelController implements JolokiaCamelController {
- private Map<String, ObjectName> cache = new HashMap<String, ObjectName>(100);
+ private Map<String, ObjectName> cache = new HashMap<>(100);
private J4pClient jolokia;
private String url;
@@ -109,7 +109,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- Map<String, Object> answer = new LinkedHashMap<String, Object>();
+ Map<String, Object> answer = new LinkedHashMap<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -120,7 +120,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
String pattern2 = String.format("%s:context=%s,type=services,name=DefaultAsyncProcessorAwaitManager", found.getDomain(), found.getKeyProperty("context"));
ObjectName am = ObjectName.getInstance(pattern2);
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
list.add(new J4pReadRequest(found));
list.add(new J4pReadRequest(tc));
list.add(new J4pReadRequest(am));
@@ -193,18 +193,18 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest("*:type=context,*"));
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pReadRequest(on, "CamelId", "State", "Uptime", "ExchangesTotal", "ExchangesInflight", "ExchangesFailed"));
}
List<J4pReadResponse> lrr = jolokia.execute(list);
for (J4pReadResponse rr : lrr) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("name", rr.getValue("CamelId").toString());
row.put("state", rr.getValue("State").toString());
row.put("uptime", rr.getValue("Uptime").toString());
@@ -241,7 +241,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, Object>> answer = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -254,7 +254,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
for (Object obj : data.values()) {
JSONObject inflight = (JSONObject) obj;
- Map<String, Object> row = new LinkedHashMap<String, Object>();
+ Map<String, Object> row = new LinkedHashMap<>();
row.put("exchangeId", asString(inflight.get("exchangeId")));
row.put("fromRouteId", asString(inflight.get("fromRouteId")));
row.put("routeId", asString(inflight.get("routeId")));
@@ -329,7 +329,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = camelContextName != null ? lookupCamelContext(camelContextName) : null;
if (found != null) {
@@ -337,7 +337,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
String pattern = String.format("%s:context=%s,type=routes,*", found.getDomain(), found.getKeyProperty("context"));
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest(pattern));
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pReadRequest(on, "CamelId", "RouteId", "State", "Uptime", "ExchangesTotal", "ExchangesInflight", "ExchangesFailed"));
}
@@ -346,7 +346,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
for (J4pReadResponse rr : lrr) {
String routeId = rr.getValue("RouteId").toString();
if (filter == null || routeId.matches(filter)) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", rr.getValue("CamelId").toString());
row.put("routeId", routeId);
row.put("state", rr.getValue("State").toString());
@@ -397,7 +397,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
String pattern = String.format("%s:context=%s,type=routes,name=*", found.getDomain(), found.getKeyProperty("context"));
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest(pattern));
- List<J4pExecRequest> list = new ArrayList<J4pExecRequest>();
+ List<J4pExecRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pExecRequest(on, "reset(boolean)", true));
}
@@ -547,21 +547,21 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
String pattern = String.format("%s:context=%s,type=endpoints,*", found.getDomain(), found.getKeyProperty("context"));
J4pSearchResponse sr = jolokia.execute(new J4pSearchRequest(pattern));
- List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
+ List<J4pReadRequest> list = new ArrayList<>();
for (ObjectName on : sr.getObjectNames()) {
list.add(new J4pReadRequest(on, "CamelId", "EndpointUri", "State"));
}
List<J4pReadResponse> lrr = jolokia.execute(list);
for (J4pReadResponse rr : lrr) {
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("camelContextName", rr.getValue("CamelId").toString());
row.put("uri", rr.getValue("EndpointUri").toString());
row.put("state", rr.getValue("State").toString());
@@ -578,7 +578,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -592,7 +592,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("index", asString(service.get("index")));
row.put("url", asString(service.get("url")));
row.put("routeId", asString(service.get("routeId")));
@@ -633,7 +633,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -648,7 +648,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("basePath", asString(service.get("basePath")));
row.put("baseUrl", asString(service.get("baseUrl")));
row.put("consumes", asString(service.get("consumes")));
@@ -722,7 +722,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -732,7 +732,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
for (Object obj : data.values()) {
JSONObject component = (JSONObject) obj;
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("artifactId", asString(component.get("artifactId")));
row.put("title", asString(component.get("title")));
row.put("description", asString(component.get("description")));
@@ -766,7 +766,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -781,7 +781,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("scheme", asString(service.get("scheme")));
row.put("from", asString(service.get("from")));
row.put("to", asString(service.get("to")));
@@ -827,7 +827,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
throw new IllegalStateException("Need to connect to remote jolokia first");
}
- List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+ List<Map<String, String>> answer = new ArrayList<>();
ObjectName found = lookupCamelContext(camelContextName);
if (found != null) {
@@ -842,7 +842,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
JSONObject data2 = (JSONObject) obj;
JSONObject service = (JSONObject) data2.values().iterator().next();
- Map<String, String> row = new LinkedHashMap<String, String>();
+ Map<String, String> row = new LinkedHashMap<>();
row.put("type", asString(service.get("type")));
row.put("static", asString(service.get("static")));
row.put("dynamic", asString(service.get("dynamic")));
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index 39ec9df..8f971a0 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -41,8 +41,8 @@ import javax.ws.rs.core.Response;
@Path("/customerservice/")
public class CustomerService {
private final AtomicLong currentId = new AtomicLong(123L);
- private final Map<Long, Customer> customers = new ConcurrentHashMap<Long, Customer>();
- private final Map<Long, Order> orders = new ConcurrentHashMap<Long, Order>();
+ private final Map<Long, Customer> customers = new ConcurrentHashMap<>();
+ private final Map<Long, Order> orders = new ConcurrentHashMap<>();
public CustomerService() {
init();
@@ -68,7 +68,7 @@ public class CustomerService {
@Path("/customers/")
@Produces("application/xml")
public List<Customer> getCustomers() {
- List<Customer> list = new ArrayList<Customer>(customers.values());
+ List<Customer> list = new ArrayList<>(customers.values());
return list;
}
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 2e2728c..d10046a 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Order {
private long id;
private String description;
- private Map<Long, Product> products = new HashMap<Long, Product>();
+ private Map<Long, Product> products = new HashMap<>();
public Order() {
init();
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
index 6e00810..6821175 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
@@ -101,7 +101,7 @@ public class CxfEndpointBeansTest extends CamelBlueprintTestSupport {
Exchange reply = template.request("cxf:bean:serviceEndpoint", new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add("hello");
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo");
diff --git a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java
index fead2db..89684a1 100644
--- a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java
+++ b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/test/builder/AddComponentInConfigureBuilder.java
@@ -19,15 +19,11 @@ package org.apache.camel.blueprint.test.builder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.timer.TimerComponent;
-import org.apache.camel.model.ModelCamelContext;
public class AddComponentInConfigureBuilder extends RouteBuilder {
@Override
public void configure() throws Exception {
- ModelCamelContext context = getContext();
- TimerComponent timerComponent = new TimerComponent();
-
- getContext().addComponent("my-timer", timerComponent);
+ getContext().addComponent("my-timer", new TimerComponent());
from("my-timer://test-timer?period=1000")
.to("mock://result");
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
index ae30ce7..35e26fe 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessor.java
@@ -144,7 +144,7 @@ public class CoreEipAnnotationProcessor {
EipModel eipModel = findEipModelProperties(processingEnv, roundEnv, classElement, javaTypeName, modelName);
// get endpoint information which is divided into paths and options (though there should really only be one path)
- Set<EipOption> eipOptions = new TreeSet<EipOption>(new EipOptionComparator(eipModel));
+ Set<EipOption> eipOptions = new TreeSet<>(new EipOptionComparator(eipModel));
findClassProperties(processingEnv, writer, roundEnv, eipOptions, classElement, classElement, "", modelName);
// after we have found all the options then figure out if the model accepts input/output
@@ -354,7 +354,7 @@ public class CoreEipAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather enums
- Set<String> enums = new TreeSet<String>();
+ Set<String> enums = new TreeSet<>();
boolean isEnum;
if (metadata != null && !Strings.isNullOrEmpty(metadata.enums())) {
isEnum = true;
@@ -468,7 +468,7 @@ public class CoreEipAnnotationProcessor {
}
// gather enums
- Set<String> enums = new TreeSet<String>();
+ Set<String> enums = new TreeSet<>();
boolean isEnum;
if (metadata != null && !Strings.isNullOrEmpty(metadata.enums())) {
isEnum = true;
@@ -494,7 +494,7 @@ public class CoreEipAnnotationProcessor {
}
// gather oneOf expression/predicates which uses language
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
boolean isOneOf = ONE_OF_TYPE_NAME.equals(fieldTypeName);
if (isOneOf) {
// okay its actually an language expression, so favor using that in the eip option
@@ -505,7 +505,7 @@ public class CoreEipAnnotationProcessor {
if (languages != null) {
String superClassName = canonicalClassName(languages.toString());
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
findTypeElementChildren(processingEnv, roundEnv, children, superClassName);
for (TypeElement child : children) {
XmlRootElement rootElement = child.getAnnotation(XmlRootElement.class);
@@ -559,7 +559,7 @@ public class CoreEipAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather oneOf of the elements
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
for (XmlElement element : elements.value()) {
String child = element.name();
oneOfTypes.add(child);
@@ -653,7 +653,7 @@ public class CoreEipAnnotationProcessor {
eipOptions.add(ep);
// shutdownRoute
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
enums.add("Default");
enums.add("Defer");
docComment = findJavaDoc(elementUtils, null, "shutdownRoute", "Default", classElement, true);
@@ -662,7 +662,7 @@ public class CoreEipAnnotationProcessor {
eipOptions.add(ep);
// shutdownRunningTask
- enums = new LinkedHashSet<String>();
+ enums = new LinkedHashSet<>();
enums.add("CompleteCurrentTaskOnly");
enums.add("CompleteAllTasks");
docComment = findJavaDoc(elementUtils, null, "shutdownRunningTask", "CompleteCurrentTaskOnly", classElement, true);
@@ -671,7 +671,7 @@ public class CoreEipAnnotationProcessor {
eipOptions.add(ep);
// inputs
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("from");
docComment = findJavaDoc(elementUtils, null, "inputs", null, classElement, true);
ep = new EipOption("inputs", "Inputs", "element", "java.util.List<org.apache.camel.model.FromDefinition>", true, "", docComment,
@@ -680,9 +680,9 @@ public class CoreEipAnnotationProcessor {
// outputs
// gather oneOf which extends any of the output base classes
- oneOfTypes = new TreeSet<String>();
+ oneOfTypes = new TreeSet<>();
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
for (String superclass : ONE_OF_OUTPUTS) {
findTypeElementChildren(processingEnv, roundEnv, children, superclass);
}
@@ -743,7 +743,7 @@ public class CoreEipAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("route");
EipOption ep = new EipOption("routes", "Routes", "element", fieldTypeName, false, "", "Contains the Camel routes",
@@ -762,7 +762,7 @@ public class CoreEipAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("rest");
EipOption ep = new EipOption("rests", "Rests", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl",
@@ -787,9 +787,9 @@ public class CoreEipAnnotationProcessor {
String fieldTypeName = fieldType.toString();
// gather oneOf which extends any of the output base classes
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
for (String superclass : ONE_OF_OUTPUTS) {
findTypeElementChildren(processingEnv, roundEnv, children, superclass);
}
@@ -840,9 +840,9 @@ public class CoreEipAnnotationProcessor {
String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, originalClassType, true);
// gather oneOf which extends any of the output base classes
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
for (String superclass : ONE_OF_VERBS) {
findTypeElementChildren(processingEnv, roundEnv, children, superclass);
}
@@ -902,12 +902,12 @@ public class CoreEipAnnotationProcessor {
}
// gather oneOf expression/predicates which uses language
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
for (String language : ONE_OF_LANGUAGES) {
TypeElement languages = findTypeElement(processingEnv, roundEnv, language);
String superClassName = canonicalClassName(languages.toString());
// find all classes that has that superClassName
- Set<TypeElement> children = new LinkedHashSet<TypeElement>();
+ Set<TypeElement> children = new LinkedHashSet<>();
findTypeElementChildren(processingEnv, roundEnv, children, superClassName);
for (TypeElement child : children) {
XmlRootElement rootElement = child.getAnnotation(XmlRootElement.class);
@@ -955,7 +955,7 @@ public class CoreEipAnnotationProcessor {
String docComment = findJavaDoc(elementUtils, fieldElement, fieldName, name, originalClassType, true);
// indicate that this element is one of when
- Set<String> oneOfTypes = new HashSet<String>();
+ Set<String> oneOfTypes = new HashSet<>();
oneOfTypes.add("when");
// when is predicate
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 6c7ecec..57b2f44 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -141,9 +141,9 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
ComponentModel componentModel = findComponentProperties(roundEnv, uriEndpoint, classElement, title, scheme, extendsScheme, label);
// get endpoint information which is divided into paths and options (though there should really only be one path)
- Set<EndpointPath> endpointPaths = new LinkedHashSet<EndpointPath>();
- Set<EndpointOption> endpointOptions = new LinkedHashSet<EndpointOption>();
- Set<ComponentOption> componentOptions = new LinkedHashSet<ComponentOption>();
+ Set<EndpointPath> endpointPaths = new LinkedHashSet<>();
+ Set<EndpointOption> endpointOptions = new LinkedHashSet<>();
+ Set<ComponentOption> componentOptions = new LinkedHashSet<>();
TypeElement componentClassElement = findTypeElement(processingEnv, roundEnv, componentModel.getJavaType());
if (componentClassElement != null) {
@@ -240,7 +240,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
first = true;
// sort the endpoint options in the standard order we prefer
- List<EndpointPath> paths = new ArrayList<EndpointPath>();
+ List<EndpointPath> paths = new ArrayList<>();
paths.addAll(endpointPaths);
Collections.sort(paths, EndpointHelper.createPathComparator(componentModel.getSyntax()));
@@ -288,7 +288,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// sort the endpoint options in the standard order we prefer
- List<EndpointOption> options = new ArrayList<EndpointOption>();
+ List<EndpointOption> options = new ArrayList<>();
options.addAll(endpointOptions);
Collections.sort(options, EndpointHelper.createGroupAndLabelComparator());
@@ -509,7 +509,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum;
if (metadata != null && !Strings.isNullOrEmpty(metadata.enums())) {
@@ -595,7 +595,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
if (Strings.isNullOrEmpty(defaultValue) && metadata != null) {
defaultValue = metadata.defaultValue();
}
- String defaultValueNote = path.defaultValueNote();
+ path.defaultValueNote();
String required = metadata != null ? metadata.required() : null;
String label = path.label();
if (Strings.isNullOrEmpty(label) && metadata != null) {
@@ -616,7 +616,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum;
if (!Strings.isNullOrEmpty(path.enums())) {
@@ -711,7 +711,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum;
if (!Strings.isNullOrEmpty(param.enums())) {
@@ -777,7 +777,7 @@ public class EndpointAnnotationProcessor extends AbstractProcessor {
}
private static Map<String, String> parseAsMap(String data) {
- Map<String, String> answer = new HashMap<String, String>();
+ Map<String, String> answer = new HashMap<>();
String[] lines = data.split("\n");
for (String line : lines) {
if (!line.isEmpty()) {
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
index a346f5f..d7357cd 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/SpringAnnotationProcessor.java
@@ -107,7 +107,7 @@ public class SpringAnnotationProcessor {
EipModel eipModel = findEipModelProperties(processingEnv, roundEnv, classElement, javaTypeName, modelName);
// collect eip information
- Set<EipOption> eipOptions = new TreeSet<EipOption>(new EipOptionComparator(eipModel));
+ Set<EipOption> eipOptions = new TreeSet<>(new EipOptionComparator(eipModel));
findClassProperties(processingEnv, writer, roundEnv, eipOptions, classElement, classElement, "", modelName);
String json = createParameterJsonSchema(eipModel, eipOptions);
@@ -272,7 +272,7 @@ public class SpringAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather enums
- Set<String> enums = new TreeSet<String>();
+ Set<String> enums = new TreeSet<>();
boolean isEnum = fieldTypeElement != null && fieldTypeElement.getKind() == ElementKind.ENUM;
if (isEnum) {
TypeElement enumClass = findTypeElement(processingEnv, roundEnv, fieldTypeElement.asType().toString());
@@ -322,7 +322,7 @@ public class SpringAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("route");
EipOption ep = new EipOption("route", "Route", "element", fieldTypeName, false, "", "Contains the Camel routes",
@@ -339,7 +339,7 @@ public class SpringAnnotationProcessor {
TypeMirror fieldType = fieldElement.asType();
String fieldTypeName = fieldType.toString();
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
oneOfTypes.add("rest");
EipOption ep = new EipOption("rest", "Rest", "element", fieldTypeName, false, "", "Contains the rest services defined using the rest-dsl",
@@ -377,7 +377,7 @@ public class SpringAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather enums
- Set<String> enums = new LinkedHashSet<String>();
+ Set<String> enums = new LinkedHashSet<>();
boolean isEnum = fieldTypeElement != null && fieldTypeElement.getKind() == ElementKind.ENUM;
if (isEnum) {
TypeElement enumClass = findTypeElement(processingEnv, roundEnv, fieldTypeElement.asType().toString());
@@ -462,7 +462,7 @@ public class SpringAnnotationProcessor {
required = findRequired(fieldElement, required);
// gather oneOf of the elements
- Set<String> oneOfTypes = new TreeSet<String>();
+ Set<String> oneOfTypes = new TreeSet<>();
for (XmlElement element : elements.value()) {
String child = element.name();
oneOfTypes.add(child);
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
index 3bd678f..cdd50de 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
@@ -18,8 +18,6 @@ package org.apache.camel.tools.apt.model;
import java.util.Set;
-import org.apache.camel.tools.apt.helper.CollectionStringBuffer;
-
import static org.apache.camel.tools.apt.helper.Strings.isNullOrEmpty;
public final class ComponentOption {
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
index 29d0bab..09a7db0 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointOption.java
@@ -18,8 +18,6 @@ package org.apache.camel.tools.apt.model;
import java.util.Set;
-import org.apache.camel.tools.apt.helper.CollectionStringBuffer;
-
import static org.apache.camel.tools.apt.helper.Strings.isNullOrEmpty;
public final class EndpointOption {
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
index 41a2072..8c6d99b 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/EndpointPath.java
@@ -18,8 +18,6 @@ package org.apache.camel.tools.apt.model;
import java.util.Set;
-import org.apache.camel.tools.apt.helper.CollectionStringBuffer;
-
public final class EndpointPath {
private String name;
diff --git a/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java b/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
index feabf55..a47aa3a 100644
--- a/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
+++ b/tooling/apt/src/test/java/org/apache/camel/tools/apt/EndpointOptionComparatorTest.java
@@ -48,7 +48,7 @@ public class EndpointOptionComparatorTest {
EndpointOption op4 = new EndpointOption("country", "Country", "string", "true", "", "", "blah", null, null, false,
false, null, false, group4, label4, false, null);
- List<EndpointOption> list = new ArrayList<EndpointOption>();
+ List<EndpointOption> list = new ArrayList<>();
list.add(op1);
list.add(op2);
list.add(op3);
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
index db16da0..7a71bc6 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
@@ -154,7 +154,7 @@ public abstract class AbstractApiMethodGeneratorMojo extends AbstractApiMethodBa
context.put("componentPackage", componentPackage);
// generate parameter names and types for configuration, sorted by parameter name
- Map<String, ApiMethodArg> parameters = new TreeMap<String, ApiMethodArg>();
+ Map<String, ApiMethodArg> parameters = new TreeMap<>();
for (ApiMethodParser.ApiMethodModel model : models) {
for (ApiMethodArg argument : model.getArguments()) {
@@ -272,7 +272,7 @@ public abstract class AbstractApiMethodGeneratorMojo extends AbstractApiMethodBa
}
static {
- PRIMITIVE_VALUES = new HashMap<Class<?>, String>();
+ PRIMITIVE_VALUES = new HashMap<>();
PRIMITIVE_VALUES.put(Boolean.TYPE, "Boolean.FALSE");
PRIMITIVE_VALUES.put(Byte.TYPE, "(byte) 0");
PRIMITIVE_VALUES.put(Character.TYPE, "(char) 0");
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java
index f1f9881..b67b9bd 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java
@@ -138,7 +138,7 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
context.put("uriFormat", scheme + suffix);
// API helpers
- final Map<String, ApiMethodHelper> apiHelpers = new TreeMap<String, ApiMethodHelper>();
+ final Map<String, ApiMethodHelper> apiHelpers = new TreeMap<>();
for (Object element : collection.getApiHelpers().entrySet()) {
Map.Entry entry = (Map.Entry) element;
apiHelpers.put(((ApiName) entry.getKey()).getName(), (ApiMethodHelper) entry.getValue());
@@ -146,8 +146,8 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
context.put("apiHelpers", apiHelpers);
// API methods and endpoint configurations
- final Map<String, Class<? extends ApiMethod>> apiMethods = new TreeMap<String, Class<? extends ApiMethod>>();
- final Map<String, Class<?>> apiConfigs = new TreeMap<String, Class<?>>();
+ final Map<String, Class<? extends ApiMethod>> apiMethods = new TreeMap<>();
+ final Map<String, Class<?>> apiConfigs = new TreeMap<>();
for (Object element : collection.getApiMethods().entrySet()) {
Map.Entry entry = (Map.Entry) element;
final String name = ((ApiName) entry.getValue()).getName();
@@ -184,7 +184,7 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
// get declared and derived fields for component config
// use get/set methods instead of fields, since this class could inherit others, that have private fields
// so getDeclaredFields() won't work, like it does for generated endpoint config classes!!!
- final Map<String, String> configFields = new TreeMap<String, String>();
+ final Map<String, String> configFields = new TreeMap<>();
do {
IntrospectionSupport.ClassInfo classInfo = IntrospectionSupport.cacheClass(configClass);
for (IntrospectionSupport.MethodInfo method : classInfo.methods) {
@@ -315,32 +315,32 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
public static List<EndpointInfo> getEndpoints(Class<? extends ApiMethod> apiMethod,
ApiMethodHelper<?> helper, Class<?> endpointConfig) {
// get list of valid options
- final Set<String> validOptions = new HashSet<String>();
+ final Set<String> validOptions = new HashSet<>();
for (Field field : endpointConfig.getDeclaredFields()) {
validOptions.add(field.getName());
}
// create method name map
- final Map<String, List<ApiMethod>> methodMap = new TreeMap<String, List<ApiMethod>>();
+ final Map<String, List<ApiMethod>> methodMap = new TreeMap<>();
for (ApiMethod method : apiMethod.getEnumConstants()) {
String methodName = method.getName();
List<ApiMethod> apiMethods = methodMap.get(methodName);
if (apiMethods == null) {
- apiMethods = new ArrayList<ApiMethod>();
+ apiMethods = new ArrayList<>();
methodMap.put(methodName, apiMethods);
}
apiMethods.add(method);
}
// create method name to alias name map
- final Map<String, Set<String>> aliasMap = new TreeMap<String, Set<String>>();
+ final Map<String, Set<String>> aliasMap = new TreeMap<>();
final Map<String, Set<String>> aliasToMethodMap = helper.getAliases();
for (Map.Entry<String, Set<String>> entry : aliasToMethodMap.entrySet()) {
final String alias = entry.getKey();
for (String method : entry.getValue()) {
Set<String> aliases = aliasMap.get(method);
if (aliases == null) {
- aliases = new TreeSet<String>();
+ aliases = new TreeSet<>();
aliasMap.put(method, aliases);
}
aliases.add(alias);
@@ -348,16 +348,16 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
}
// create options map and return type map
- final Map<String, Set<String>> optionMap = new TreeMap<String, Set<String>>();
- final Map<String, Set<String>> returnType = new TreeMap<String, Set<String>>();
+ final Map<String, Set<String>> optionMap = new TreeMap<>();
+ final Map<String, Set<String>> returnType = new TreeMap<>();
for (Map.Entry<String, List<ApiMethod>> entry : methodMap.entrySet()) {
final String name = entry.getKey();
final List<ApiMethod> apiMethods = entry.getValue();
// count the number of times, every valid option shows up across methods
// and also collect return types
- final Map<String, Integer> optionCount = new TreeMap<String, Integer>();
- final TreeSet<String> resultTypes = new TreeSet<String>();
+ final Map<String, Integer> optionCount = new TreeMap<>();
+ final TreeSet<String> resultTypes = new TreeSet<>();
returnType.put(name, resultTypes);
for (ApiMethod method : apiMethods) {
@@ -383,14 +383,14 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
}
// collect method options
- final TreeSet<String> options = new TreeSet<String>();
+ final TreeSet<String> options = new TreeSet<>();
optionMap.put(name, options);
- final Set<String> mandatory = new TreeSet<String>();
+ final Set<String> mandatory = new TreeSet<>();
// generate optional and mandatory lists for overloaded methods
int nMethods = apiMethods.size();
for (ApiMethod method : apiMethods) {
- final Set<String> optional = new TreeSet<String>();
+ final Set<String> optional = new TreeSet<>();
for (String arg : method.getArgNames()) {
if (validOptions.contains(arg)) {
@@ -417,7 +417,7 @@ public class DocumentGeneratorMojo extends AbstractGeneratorMojo implements Mave
}
// create endpoint data
- final List<EndpointInfo> infos = new ArrayList<EndpointInfo>();
+ final List<EndpointInfo> infos = new ArrayList<>();
for (Map.Entry<String, List<ApiMethod>> methodEntry : methodMap.entrySet()) {
final String endpoint = methodEntry.getKey();
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
index e011544..bcea4a1 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
@@ -43,7 +43,7 @@ public class FileApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMojo {
@Override
public List<String> getSignatureList() throws MojoExecutionException {
// get signatureFile as a list of Strings
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
try {
BufferedReader reader = new BufferedReader(new FileReader(this.signatureFile));
String line = reader.readLine();
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
index b43adf6..357bd64 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
@@ -70,7 +70,7 @@ public class JavadocApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMoj
@Override
public List<String> getSignatureList() throws MojoExecutionException {
// signatures as map from signature with no arg names to arg names from JavadocParser
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
final Pattern packagePatterns = Pattern.compile(excludePackages);
final Pattern classPatterns = (excludeClasses != null) ? Pattern.compile(excludeClasses) : null;
@@ -121,7 +121,7 @@ public class JavadocApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMoj
types = new String[0];
} else {
// get raw types from args
- final List<String> rawTypes = new ArrayList<String>();
+ final List<String> rawTypes = new ArrayList<>();
final Matcher argTypesMatcher = RAW_ARGTYPES_PATTERN.matcher(args);
while (argTypesMatcher.find()) {
rawTypes.add(argTypesMatcher.group(1));
@@ -145,7 +145,7 @@ public class JavadocApiMethodGeneratorMojo extends AbstractApiMethodGeneratorMoj
throw new MojoExecutionException("No public non-static methods found, "
+ "make sure Javadoc is available as project test dependency");
}
- return new ArrayList<String>(result.values());
+ return new ArrayList<>(result.values());
}
private String getResultType(Class<?> aClass, String name, String[] types) throws MojoExecutionException {
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
index bda641c..f8ec14f 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java
@@ -45,8 +45,8 @@ public class JavadocParser extends Parser {
private String methodWithTypes;
private StringBuilder methodTextBuilder = new StringBuilder();
- private List<String> methods = new ArrayList<String>();
- private Map<String, String> methodText = new HashMap<String, String>();
+ private List<String> methods = new ArrayList<>();
+ private Map<String, String> methodText = new HashMap<>();
private String errorMessage;
public JavadocParser(DTD dtd, String docPath) {
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java
index e6c4c1c..9fcde60 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/TestProxy.java
@@ -59,7 +59,7 @@ public class TestProxy {
}
public final String[] greetTimes(String name, int times) {
- final List<String> result = new ArrayList<String>();
+ final List<String> result = new ArrayList<>();
for (int i = 0; i < times; i++) {
result.add("Greetings " + name);
}
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java
index 4170ec1..640edb7 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java
@@ -63,7 +63,7 @@ public class ApiComponentGeneratorMojoTest extends AbstractGeneratorMojoTest {
mojo.apis[0].setExcludeConfigTypes("int");
mojo.apis[0].setNullableOptions(new String[] {"namesList"});
- List<ApiMethodAlias> aliases = new ArrayList<ApiMethodAlias>();
+ List<ApiMethodAlias> aliases = new ArrayList<>();
aliases.add(new ApiMethodAlias("get(.+)", "$1"));
aliases.add(new ApiMethodAlias("set(.+)", "$1"));
mojo.apis[1] = new ApiProxy();
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.