From commits-return-71999-apmail-camel-commits-archive=camel.apache.org@camel.apache.org Mon May 6 07:02:05 2019 Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id A415C19220 for ; Mon, 6 May 2019 07:02:03 +0000 (UTC) Received: (qmail 45194 invoked by uid 500); 6 May 2019 07:02:03 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 45161 invoked by uid 500); 6 May 2019 07:02:02 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 45152 invoked by uid 99); 6 May 2019 07:02:02 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 May 2019 07:02:02 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8134787249; Mon, 6 May 2019 07:02:02 +0000 (UTC) Date: Mon, 06 May 2019 07:02:02 +0000 To: "commits@camel.apache.org" Subject: [camel] branch master updated: Do not use the deprecated uri field in @EndpointInject / @Consume / @Produce MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155712612190.32280.3624016677387085782@gitbox.apache.org> From: gnodet@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8a0acd3e10824effbf7d84e31ad8ccd6c08ac86a X-Git-Newrev: ae7600184ce855c68ca74ed5babb743032094c76 X-Git-Rev: ae7600184ce855c68ca74ed5babb743032094c76 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new ae76001 Do not use the deprecated uri field in @EndpointInject / @Consume / @Produce ae76001 is described below commit ae7600184ce855c68ca74ed5babb743032094c76 Author: Guillaume Nodet AuthorDate: Tue Apr 30 17:50:19 2019 +0200 Do not use the deprecated uri field in @EndpointInject / @Consume / @Produce --- .../camel/parser/java/MyCdiConcatRouteBuilder.java | 2 +- .../camel/component/activemq/SetHeaderTest.java | 2 +- .../camel/component/atmos/AtmosConsumerTest.java | 2 +- .../client/map/AtomixMapNodesProducerTest.java | 2 +- .../atomix/client/map/AtomixMapProducerTest.java | 2 +- .../client/messaging/AtomixMessagingTest.java | 2 +- .../multimap/AtomixMultiMapProducerTest.java | 2 +- .../client/queue/AtomixQueueProducerTest.java | 2 +- .../atomix/client/set/AtomixSetProducerTest.java | 2 +- .../client/value/AtomixValueProducerTest.java | 2 +- .../cw/integration/CwComponentIntegrationTest.java | 2 +- .../integration/DdbComponentIntegrationTest.java | 2 +- .../component/aws/ecs/ECSProducerSpringTest.java | 2 +- .../aws/sqs/SqsExtendMessageVisibilityTest.java | 2 +- .../aws/swf/integration/CamelSWFEndToEndTest.java | 6 +++--- .../base64/Base64DataFormatTestBase.java | 2 +- .../base64/SpringBase64DataFormatTestBase.java | 2 +- .../HibernateValidationProviderResolverTest.java | 2 +- .../camel/component/beanstalk/ProducerTest.java | 2 +- .../camel/dataformat/bindy/CommonBindyTest.java | 6 +++--- .../BindyComplexCsvGenerateHeaderMarshallTest.java | 4 ++-- .../bindy/csv/BindyComplexCsvMarshallTest.java | 4 ++-- .../bindy/csv/BindyComplexCsvUnmarshallTest.java | 4 ++-- ...mplexCsvUnmarshallUnwrapSingleInstanceTest.java | 4 ++-- .../bindy/csv/BindyCsvBigFileUnmarshallTest.java | 2 +- .../bindy/csv/BindyCsvSkipFieldTest.java | 4 ++-- .../BindyDoNotRemoveQuotesCsvUnmarshallTest.java | 4 ++-- .../csv/BindyDoubleQuotesCsvUnmarshallTest.java | 4 ++-- .../BindyDoubleQuotesInFieldCsvUnmarshallTest.java | 4 ++-- .../csv/BindyInlinedQuotesCsvUnmarshallTest.java | 4 ++-- .../csv/BindyMarshalOneToManyWithHeadersTest.java | 4 ++-- .../bindy/csv/BindyPojoSimpleCsvMarshallTest.java | 4 ++-- ...dyRecordFieldStartingWithSeperatorCharTest.java | 2 +- .../BindySimpleCsvBooleanFalseMarshallTest.java | 4 ++-- .../csv/BindySimpleCsvBooleanTrueMarshallTest.java | 4 ++-- .../csv/BindySimpleCsvBooleanUnmarshallTest.java | 6 +++--- ...CsvContainingMultiQuoteCharEscapeFalseTest.java | 8 ++++---- ...eCsvContainingMultiQuoteCharEscapeTrueTest.java | 8 ++++---- .../BindySimpleCsvFunctionWithClassMethodTest.java | 8 ++++---- ...ndySimpleCsvFunctionWithExternalMethodTest.java | 8 ++++---- .../BindySimpleCsvGenerateHeaderMarshallTest.java | 4 ++-- .../csv/BindySimpleCsvIntegerMarshallTest.java | 4 ++-- ...indySimpleCsvMandatoryFieldsUnmarshallTest.java | 12 ++++++------ .../bindy/csv/BindySimpleCsvMarshallDslTest.java | 4 ++-- .../bindy/csv/BindySimpleCsvMarshallTest.java | 4 ++-- .../csv/BindySimpleCsvMarshallTrimClipTest.java | 4 ++-- .../bindy/csv/BindySimpleCsvNullMarshallTest.java | 4 ++-- .../csv/BindySimpleCsvOneToManyMarshallTest.java | 4 ++-- ...ndySimpleCsvRemoveWhitespaceUnmarshallTest.java | 4 ++-- .../BindySimpleCsvSkipFirstLineUnmarshallTest.java | 4 ++-- .../BindySimpleCsvUnmarshallBadIntegerTest.java | 6 +++--- ...ndySimpleCsvUnmarshallPositionModifiedTest.java | 6 +++--- .../bindy/csv/BindySimpleCsvUnmarshallTest.java | 6 +++--- ...indySimpleCsvUnmarshallUnicodeNextLineTest.java | 4 ++-- ...BindySingleQuoteStartWordCsvUnmarshallTest.java | 4 ++-- .../csv/BindySingleQuotesCsvUnmarshallTest.java | 4 ++-- ...esWithDoubleQuotesInFieldCsvUnmarshallTest.java | 4 ++-- .../bindy/fix/BindySimpleKeyValuePairFixTest.java | 4 ++-- .../BindySimpleKeyValuePairMarshallDslTest.java | 4 ++-- .../fix/BindySimpleKeyValuePairMarshallTest.java | 4 ++-- .../BindySimpleKeyValuePairNullMarshallTest.java | 4 ++-- ...BindySimpleKeyValuePairUnicodeNextLineTest.java | 4 ++-- ...eKeyValuePairWithoutSectionMarshallDslTest.java | 6 +++--- .../bindy/fixed/BindyPaddingAndTrimmingTest.java | 2 +- .../bindy/fixed/converter/BindyConverterTest.java | 12 ++++++------ .../BindyFixedLengthDelimitedFieldTest.java | 4 ++-- .../dynamic/BindyFixedLengthDynamicFieldTest.java | 4 ++-- .../BindySimpleFixedLengthHeaderFooterTest.java | 4 ++-- .../BindySimpleIgnoreTrailingCharsTest.java | 4 ++-- .../bindy/fixed/implied/BindyImpliedTest.java | 8 ++++---- .../link/BindySimpleFixedLengthWithLinkTest.java | 4 ++-- .../simple/BindySimpleFixedLengthMarshallTest.java | 4 ++-- .../BindySimpleFixedLengthObjectMarshallTest.java | 6 +++--- .../bindy/fixed/number/BindyNumberTest.java | 8 ++++---- .../BindySimpleFixedLengthOrdinalPosTest.java | 4 ++-- .../skipfields/BindySimpleSkipFieldsTest.java | 4 ++-- ...BindyFixedLengthHeaderFooterSkipHeaderTest.java | 4 ++-- ...SimpleFixedLengthUnmarshallClassMethodTest.java | 4 ++-- ...pleFixedLengthUnmarshallExternalMethodTest.java | 4 ++-- .../trim/BindySimpleFixedLengthUnmarshallTest.java | 4 ++-- ...FixedLengthUnmarshallTrimAlignedBFieldTest.java | 4 ++-- ...dySimpleFixedLengthUnmarshallTrimFieldTest.java | 4 ++-- .../date/BindyDatePatternCsvUnmarshallTest.java | 4 ++-- .../BindyBigDecimalGroupingUnmarshallTest.java | 4 ++-- .../BindyBigDecimalRoundingUnmarshallTest.java | 4 ++-- .../CaffeineAggregationRepositoryRoutesTest.java | 4 ++-- .../cassandra/CassandraComponentBeanRefTest.java | 2 +- .../cassandra/CassandraComponentProducerTest.java | 10 +++++----- .../CassandraComponentProducerUnpreparedTest.java | 4 ++-- components/camel-cdi/src/main/docs/cdi.adoc | 4 ++-- .../apache/camel/cdi/bean/EndpointInjectRoute.java | 4 ++-- .../cdi/bean/EndpointInjectWrongContextRoute.java | 4 ++-- .../bean/FirstCamelContextProduceTemplateBean.java | 2 +- .../camel/cdi/bean/FluentProduceTemplateBean.java | 2 +- .../apache/camel/cdi/bean/ProduceTemplateBean.java | 2 +- .../SecondCamelContextEndpointInjectRoute.java | 2 +- .../SecondCamelContextProduceTemplateBean.java | 2 +- ...svMarshalAutogenColumnsSpringQuoteModeTest.java | 4 ++-- .../csv/CsvMarshalAutogenColumnsSpringTest.java | 4 ++-- .../camel/dataformat/csv/CsvMarshalHeaderTest.java | 2 +- ...MarshalHeaderWithCustomMarshallFactoryTest.java | 2 +- .../csv/CsvMarshalPipeDelimiterSpringTest.java | 2 +- .../csv/CsvMarshalPipeDelimiterTest.java | 2 +- .../camel/dataformat/csv/CsvMarshalTest.java | 2 +- .../csv/CsvUnmarshalMapLineSpringTest.java | 2 +- .../csv/CsvUnmarshalPipeDelimiterSpringTest.java | 2 +- .../csv/CsvUnmarshalPipeDelimiterTest.java | 2 +- .../csv/CsvUnmarshalSkipFirstLineSpringTest.java | 2 +- .../csv/CsvUnmarshalStreamSpringTest.java | 2 +- .../dataformat/csv/CsvUnmarshalStreamTest.java | 2 +- .../csv/CsvUnmarshalTabDelimiterSpringTest.java | 2 +- .../csv/CsvUnmarshalTabDelimiterTest.java | 2 +- .../camel/dataformat/csv/CsvUnmarshalTest.java | 4 ++-- ...CsvUnmarshalTwoCsvDataFormatConcurrentTest.java | 4 ++-- .../src/main/docs/disruptor-component.adoc | 2 +- .../DisruptorWaitClaimStrategyComponentTest.java | 2 +- .../src/main/docs/ehcache-component.adoc | 2 +- .../EhcacheAggregationRepositoryRoutesTest.java | 4 ++-- .../exec/impl/ExecDocumentationExamplesTest.java | 10 +++++----- .../camel/component/flatpack/CharsetTest.java | 2 +- .../google/pubsub/integration/AckModeNoneTest.java | 4 ++-- .../integration/GroupedExchangeRoundtripTest.java | 2 +- .../google/pubsub/unit/PubsubEndpointTest.java | 4 ++-- .../HazelcastSedaConcurrentConsumersTest.java | 2 +- .../component/hazelcast/HazelcastSedaFIFOTest.java | 2 +- .../hazelcast/HazelcastSedaInOnlyTest.java | 2 +- .../hazelcast/HazelcastSedaInOutTest.java | 2 +- .../HazelcastSedaRecoverableConsumerTest.java | 2 +- .../hazelcast/HazelcastSedaSpringSupportTest.java | 2 +- .../HazelcastSedaTransferExchangeTest.java | 2 +- ...AggregationRepositoryRecoverableRoutesTest.java | 8 ++++---- .../HazelcastAggregationRepositoryRoutesTest.java | 6 +++--- .../http4/HttpProducerConnectionCloseTest.java | 2 +- .../HttpProducerExplicitConnectionCloseTest.java | 2 +- .../camel/component/iec60870/ConnectionTest.java | 10 +++++----- .../irc/it/IrcIntegrationTestSupport.java | 2 +- .../component/irc/it/IrcMultiChannelRouteTest.java | 2 +- .../component/ironmq/FromQueueToQueueTest.java | 6 +++--- .../ironmq/IronMQComponentSpringTest.java | 4 ++-- .../component/ironmq/IronMQComponentTest.java | 2 +- .../ironmq/IronMQPreserveHeadersTest.java | 2 +- .../integrationtest/IronMQComponentTest.java | 4 ++-- .../ironmq/integrationtest/IronMQFIFOTest.java | 4 ++-- .../IronMQRackspaceComponentTest.java | 4 ++-- ...ncurrentJaxbDataFormatSchemaValidationTest.java | 4 ++-- .../jaxb/JaxbDataFormatMultipleNamespacesTest.java | 4 ++-- .../jaxb/JaxbDataFormatPartClassHeaderTest.java | 2 +- .../jaxb/JaxbDataFormatPartClassTest.java | 2 +- .../JaxbDataFormatSchemaValidationSpringTest.java | 4 ++-- .../jaxb/JaxbDataFormatSchemaValidationTest.java | 4 ++-- ...ormatSchemaValidationTestWithObjectFactory.java | 4 ++-- .../SplitterAndExceptionRouteTwistIssueTest.java | 8 ++++---- .../CamelWorkItemHandlerIntegrationTests.java | 4 ++-- .../component/jcache/JCacheConfigurationTest.java | 4 ++-- .../JCacheAggregationRepositoryRoutesTest.java | 6 +++--- .../jclouds/JcloudsSpringBlobstoreTest.java | 4 ++-- .../jclouds/JcloudsSpringComputeTest.java | 4 ++-- .../camel/component/jcr/JcrGetNodeByIdTest.java | 2 +- .../camel/component/jdbc/JdbcAnotherRouteTest.java | 2 +- .../component/jdbc/JdbcDefaultDataSourceTest.java | 2 +- .../camel/component/jdbc/JdbcFix9491Test.java | 4 ++-- .../camel/component/jdbc/JdbcOptionsTest.java | 2 +- .../jdbc/JdbcProducerConcurrenctTest.java | 2 +- ...roducerOutputTypeSelectListOutputClassTest.java | 2 +- .../jdbc/JdbcProducerOutputTypeSelectListTest.java | 2 +- ...ProducerOutputTypeSelectOneOutputClassTest.java | 2 +- .../jdbc/JdbcProducerOutputTypeSelectOneTest.java | 2 +- .../jdbc/JdbcProducerOutputTypeStreamListTest.java | 2 +- .../camel/component/jdbc/JdbcRouteSplitTest.java | 2 +- .../component/jdbc/JdbcSpringAnotherRouteTest.java | 2 +- .../component/jdbc/JdbcTransformSimpleTest.java | 2 +- .../component/jetty/SpringHttpsRouteTest.java | 2 +- .../component/jgroups/JGroupsConsumerTest.java | 2 +- .../apache/camel/component/jms/JmsFilterTest.java | 4 ++-- .../jms/JmsInOutTransferExchangeTest.java | 4 ++-- ...geAsOriginalMessageInDefaultUnitOfWorkTest.java | 2 +- .../jms/JmsRequestReplyManualReplyTest.java | 2 +- .../JmsRequestReplyManualWithJMSReplyToTest.java | 2 +- .../apache/camel/component/jms/bind/MyBean.java | 4 ++-- .../camel/component/jms/temp/JmsReconnectTest.java | 2 +- .../camel/component/jms/tuning/RoutePojo.java | 4 ++-- .../component/jms/tx/JMXTXUseOriginalBodyTest.java | 12 ++++++------ ...MXTXUseOriginalBodyWithDLCErrorHandlerTest.java | 16 ++++++++-------- ...JMXTXUseOriginalBodyWithTXErrorHandlerTest.java | 12 ++++++------ .../jsonvalidator/ValidatorRouteTest.java | 6 +++--- .../kafka/KafkaConsumerBatchSizeTest.java | 4 ++-- .../component/kafka/KafkaConsumerFullTest.java | 4 ++-- .../kafka/KafkaConsumerLastRecordHeaderTest.java | 2 +- .../kafka/KafkaConsumerManualCommitTest.java | 4 ++-- .../KafkaConsumerOffsetRepositoryEmptyTest.java | 2 +- .../KafkaConsumerOffsetRepositoryResumeTest.java | 2 +- .../KafkaConsumerRebalancePartitionRevokeTest.java | 2 +- .../kafka/KafkaConsumerRebalanceTest.java | 2 +- .../kafka/KafkaConsumerTopicIsPatternTest.java | 4 ++-- .../component/kafka/KafkaProducerFullTest.java | 22 +++++++++++----------- .../kafka/KafkaIdempotentRepositoryEagerTest.java | 4 ++-- .../KafkaIdempotentRepositoryNonEagerTest.java | 4 ++-- .../consumer/KubernetesNamespacesConsumerTest.java | 2 +- .../consumer/KubernetesNodesConsumerTest.java | 2 +- .../consumer/KubernetesPodsConsumerTest.java | 2 +- ...bernetesReplicationControllersConsumerTest.java | 2 +- .../consumer/KubernetesServicesConsumerTest.java | 2 +- .../camel/component/metrics/CounterRouteTest.java | 10 +++++----- .../camel/component/metrics/GaugeRouteTest.java | 6 +++--- .../component/metrics/HistogramRouteTest.java | 4 ++-- .../camel/component/metrics/MeterRouteTest.java | 6 +++--- .../metrics/MetricComponentSpringTest.java | 4 ++-- .../metrics/MetricsComponentRouteTest.java | 4 ++-- .../camel/component/metrics/TimerRouteTest.java | 6 +++--- .../component/micrometer/CounterRouteTest.java | 10 +++++----- .../micrometer/DistributionSummaryRouteTest.java | 6 +++--- .../micrometer/MetricComponentSpringTest.java | 4 ++-- .../micrometer/MicrometerComponentRouteTest.java | 2 +- .../camel/component/micrometer/TimerRouteTest.java | 8 ++++---- .../milo/MonitorItemMultiConnectionsCertTest.java | 8 ++++---- .../milo/MonitorItemMultiConnectionsTest.java | 8 ++++---- .../camel/component/milo/MonitorItemTest.java | 4 ++-- .../camel/component/milo/WriteClientTest.java | 12 ++++++------ .../camel/component/milo/call/CallClientTest.java | 2 +- .../component/milo/server/ServerLocalTest.java | 2 +- .../MllpTcpServerConsumerLenientBindTest.java | 2 +- .../mllp/MllpConfigurationBeanBlueprintTest.java | 2 +- .../mllp/MllpProducerConsumerLoopbackTest.java | 4 ++-- .../mllp/MllpTcpClientProducerBlueprintTest.java | 10 +++++----- .../MllpTcpClientProducerConnectionErrorTest.java | 12 ++++++------ ...TcpClientProducerIdleConnectionTimeoutTest.java | 8 ++++---- .../component/mllp/MllpTcpServerCharsetTest.java | 2 +- .../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 2 +- .../mllp/MllpTcpServerConsumerBlueprintTest.java | 2 +- .../mllp/MllpTcpServerConsumerConnectionTest.java | 2 +- .../MllpTcpServerConsumerMessageHeadersTest.java | 4 ++-- ...MllpTcpServerConsumerMulitpleTcpPacketTest.java | 2 +- .../mllp/MllpTcpServerConsumerTransactionTest.java | 6 +++--- ...tProducerEndOfDataAndValidationTestSupport.java | 16 ++++++++-------- ...cpServerConsumerAcknowledgementTestSupport.java | 10 +++++----- ...rConsumerEndOfDataAndValidationTestSupport.java | 6 +++--- .../mongodb3/MongoDbStopEndpointTest.java | 2 +- .../apache/camel/component/mqtt/MQTTBrigeTest.java | 6 +++--- .../camel/component/mqtt/MQTTDuplicatesTest.java | 6 +++--- .../component/mustache/MustacheComponentTest.java | 4 ++-- .../NettyHttpHeaderFilterStrategyRemovalTest.java | 2 +- .../netty4/http/NettyHttpRawQueryTest.java | 2 +- .../netty4/http/SpringNettyHttpBasicAuthTest.java | 2 +- .../netty4/http/SpringNettyHttpSSLTest.java | 2 +- .../component/netty4/NettyRedeliveryTest.java | 4 ++-- .../camel/component/netty4/NettyTCPAsyncTest.java | 2 +- .../component/netty4/NettyTCPChainedTest.java | 2 +- .../camel/component/nsq/NsqConsumerTest.java | 2 +- .../agent/InstallOpenTracingTracerRuleTest.java | 4 ++-- .../camel/component/paho/PahoComponentTest.java | 4 ++-- .../apache/camel/component/pdf/PdfAppendTest.java | 2 +- .../camel/component/pdf/PdfCreationTest.java | 2 +- .../camel/component/pdf/PdfTextExtractionTest.java | 2 +- .../integration/PgEventPubSubIntegrationTest.java | 8 ++++---- ...gEventWithDefinedDatasourceIntegrationTest.java | 8 ++++---- .../camel/component/pubnub/PubNubFireTest.java | 2 +- .../camel/component/pubnub/PubNubPresenceTest.java | 2 +- .../camel/component/pubnub/PubNubPublishTest.java | 2 +- .../component/pubnub/PubNubSubscriberTest.java | 2 +- .../pubnub/example/PubNubSensor2Example.java | 2 +- .../component/pulsar/PulsarProducerInTest.java | 2 +- .../component/rabbitmq/RabbitMQBasicIntTest.java | 6 +++--- .../rabbitmq/RabbitMQConsumerIntTest.java | 8 ++++---- .../rabbitmq/RabbitMQConsumerIntTestReplyTo.java | 2 +- .../component/rabbitmq/RabbitMQInOutIntTest.java | 10 +++++----- .../component/rabbitmq/RabbitMQLoadIntTest.java | 8 ++++---- .../rabbitmq/RabbitMQProducerIntTest.java | 14 +++++++------- .../rabbitmq/RabbitMQReConnectionIntTest.java | 8 ++++---- .../RabbitMQRequeueHandledExceptionIntTest.java | 8 ++++---- .../component/rabbitmq/RabbitMQRequeueIntTest.java | 8 ++++---- .../RabbitMQRequeueUnhandledExceptionIntTest.java | 8 ++++---- .../component/rabbitmq/RabbitMQSpringIntTest.java | 2 +- .../rabbitmq/RabbitMQSupendResumeIntTest.java | 6 +++--- .../xquery/XQueryPredicateFilterTest.java | 2 +- .../servicenow/ServiceNowAttachmentTest.java | 2 +- .../servicenow/ServiceNowScorecardTest.java | 2 +- .../servicenow/ServiceNowServiceCatalogTest.java | 2 +- .../security/ShiroAuthenticationBase64Test.java | 4 ++-- ...nticationReauthenticateFalseAndNewUserTest.java | 4 ++-- .../shiro/security/ShiroAuthenticationTest.java | 4 ++-- .../shiro/security/ShiroAuthorizationTest.java | 4 ++-- .../security/ShiroRolesAuthorizationTest.java | 4 ++-- .../camel/component/sip/PublishSubscribeTest.java | 6 +++--- .../sjms/consumer/InOutConcurrentConsumerTest.java | 2 +- .../sjms/producer/QueueProducerQoSTest.java | 2 +- .../camel/component/slack/SlackProducerTest.java | 6 +++--- .../integration/SmppComponentIntegrationTest.java | 4 ++-- .../SmppComponentSpringIntegrationTest.java | 4 ++-- .../camel/dataformat/soap/SoapClientTest.java | 2 +- .../camel/dataformat/soap/SoapCxfServerTest.java | 2 +- .../camel/dataformat/soap/SoapMarshalTest.java | 4 ++-- .../camel/dataformat/soap/SoapRoundtripTest.java | 4 ++-- .../camel/dataformat/soap/SoapServerTest.java | 2 +- .../dataformat/soap/SoapSpringRoundtripTest.java | 4 ++-- .../camel/dataformat/soap/SoapUnMarshalTest.java | 4 ++-- .../camel/dataformat/soap12/Soap12MarshalTest.java | 4 ++-- .../soap12/Soap12SpringRoundtripTest.java | 4 ++-- .../dataformat/soap12/Soap12UnMarshalTest.java | 4 ++-- .../camel/component/splunk/ProducerTest.java | 6 +++--- .../camel/component/splunk/RawProducerTest.java | 6 +++--- .../spring/batch/SpringBatchEndpointTest.java | 4 ++-- .../spring/batch/SpringBatchIntegrationTest.java | 6 +++--- .../spring/batch/SpringBatchJobLauncherTest.java | 4 ++-- .../spring/batch/SpringBatchJobRegistryTest.java | 4 ++-- .../src/main/docs/spring-boot.adoc | 2 +- .../camel/spring/boot/CamelAnnotationsTest.java | 2 +- .../spring/boot/CamelAutoConfigurationTest.java | 2 +- .../spring/boot/XPathPropertyPlaceholderTest.java | 6 +++--- .../boot/componentroute/ComponentRouteTest.java | 2 +- .../camel/spring/boot/issues/RestDslPostTest.java | 4 ++-- .../camel/spring/boot/issues/SimpleOgnlTest.java | 4 ++-- .../spring/boot/issues/StreamCachingTest.java | 2 +- .../MockEndpointsAndSkipDirtiesContextTest.java | 6 +++--- .../spring/javaconfig/BeanJavaConfigTest.java | 6 +++--- .../autowire/AutodetectingConfigTest.java | 4 ++-- .../autowire/LoadingRawCamelConfigurationTest.java | 2 +- .../spring/javaconfig/patterns/FilterTest.java | 4 ++-- ...CamelSpringDelegatingTestContextLoaderTest.java | 6 +++--- .../redis/RedisComponentSpringIntegrationTest.java | 4 ++-- .../camel/component/redis/RedisTestSupport.java | 2 +- ...sStringIdempotentRepositoryIntegrationTest.java | 4 ++-- .../ws/ConsumerEndpointMappingRouteTest.java | 10 +++++----- .../spring/ws/ProducerLocalRouteTest.java | 4 ++-- .../ws/addressing/CamelDirectSenderTest.java | 2 +- .../ConsumerWSAEndpointMappingRouteTest.java | 18 +++++++++--------- .../component/bean/BeanWithRecipientListTest.java | 4 ++-- .../apache/camel/component/bean/RouterBean.java | 2 +- .../spring/CircularComponentInjectionTest.java | 4 ++-- .../java/org/apache/camel/spring/InjectedBean.java | 16 ++++++++-------- .../apache/camel/spring/NodeIdReferenceTest.java | 4 ++-- .../camel/spring/SpringConsumerTemplateTest.java | 2 +- .../config/DependencyInjectCamelTemplateTest.java | 2 +- .../apache/camel/spring/config/MyProduceBean.java | 2 +- .../camel/spring/config/NamespacePrefixTest.java | 2 +- .../spring/config/scan/route/MyRouteBuilder.java | 4 ++-- .../spring/example/AnotherFooEventConsumer.java | 4 ++-- .../camel/spring/example/FooEventConsumer.java | 4 ++-- .../camel/spring/example/MyCamel1Consumer.java | 4 ++-- .../camel/spring/example/MyCamel2Consumer.java | 4 ++-- .../spring/example/MyCamel2RecipientList.java | 2 +- .../apache/camel/spring/example/MyConsumer.java | 4 ++-- .../org/apache/camel/spring/example/MySender.java | 4 ++-- .../apache/camel/spring/example/MyVmConsumer.java | 4 ++-- .../SpringFileAntPathMatcherFileFilterTest.java | 4 ++-- .../camel/spring/file/SpringFileRouteTest.java | 2 +- .../file/SpringSimpleFileNameWithQuoteTest.java | 2 +- .../interceptor/AnnotatedBookServiceImpl.java | 2 +- .../spring/interceptor/AnnotatedConsumeImpl.java | 4 ++-- .../apache/camel/spring/issues/CoolService.java | 2 +- .../org/apache/camel/spring/management/MyBean.java | 2 +- .../apache/camel/spring/management/MyBeanRef.java | 2 +- .../camel/spring/management/MyRouteBuilder.java | 2 +- .../org/apache/camel/spring/mock/MyAssertions.java | 4 ++-- .../apache/camel/spring/patterns/FilterTest.java | 4 ++-- ...uageWithSpringPropertyPlaceholderRouteTest.java | 2 +- .../MyRouteBuilderWithAutowiredPojo.java | 2 +- .../camel/spring/postprocessor/TestPojo.java | 2 +- .../camel/spring/processor/MyProduceBean.java | 2 +- .../processor/SpringMulticastAggregatorTest.java | 2 +- .../apache/camel/spring/processor/XsltTest.java | 2 +- .../spring/processor/scattergather/MyVendor.java | 2 +- .../spring/produce/FluentProduceTemplateTest.java | 2 +- .../apache/camel/spring/produce/MyCoolBean.java | 2 +- .../camel/spring/produce/MyListenerService.java | 2 +- .../camel/spring/produce/ProduceTemplateTest.java | 2 +- .../ProduceTemplateWithTwoCamelContextTest.java | 2 +- .../apache/camel/spring/produce/ProduceTest.java | 2 +- .../spring/produce/generics/MyServiceImpl.java | 2 +- .../spring/produce/generics/MyServiceInvoker.java | 2 +- .../org/apache/camel/spring/remoting/EchoPojo.java | 4 ++-- .../camel/spring/remoting/EchoPojoDirect.java | 4 ++-- .../camel/spring/remoting/MyMultiArgument.java | 2 +- .../spring/remoting/MyMultiArgumentService.java | 2 +- .../remoting/SpringRemotingWithOneWayTest.java | 2 +- .../component/sql/SqlProducerConcurrentTest.java | 2 +- .../sql/SqlProducerExpressionParameterTest.java | 4 ++-- ...SqlProducerOutputTypeSelectOneNoResultTest.java | 2 +- .../CustomizedJdbcMessageIdRepositoryTest.java | 4 ++-- .../jdbc/JdbcMessageIdRepositoryTest.java | 4 ++-- .../stax/SpringStAXJAXBIteratorExpressionTest.java | 2 +- .../camel/component/stax/StAXComponentRefTest.java | 2 +- .../camel/component/stax/StAXComponentTest.java | 2 +- .../stax/StAXJAXBIteratorExpressionTest.java | 2 +- .../telegram/TelegramConsumerChannelPostTest.java | 2 +- .../TelegramConsumerEmptyResponseTest.java | 2 +- .../TelegramConsumerFallbackConversionTest.java | 2 +- .../telegram/TelegramConsumerMappingTest.java | 2 +- .../TelegramConsumerMediaDocumentTest.java | 2 +- .../telegram/TelegramConsumerMediaPhotoTest.java | 2 +- .../telegram/TelegramConsumerMediaVideoTest.java | 2 +- .../telegram/TelegramConsumerMultipleTest.java | 2 +- .../telegram/TelegramConsumerServiceErrorTest.java | 2 +- .../telegram/TelegramConsumerSingleTest.java | 2 +- .../TelegramProducerChatIdResolutionTest.java | 2 +- .../telegram/TelegramProducerMediaTest.java | 2 +- .../blueprint/BlueprintMultipleServiceTest.java | 4 ++-- .../apache/camel/test/blueprint/FilterTest.java | 4 ++-- .../test/blueprint/IsMockEndpointJUnit4Test.java | 6 +++--- .../apache/camel/test/blueprint/MyProducer.java | 2 +- .../SimpleTransformAnnotationsBlueprintTest.java | 4 ++-- .../test/blueprint/management/MyRouteBuilder.java | 2 +- .../test/blueprint/scan2/MyOtherCoolRoute.java | 2 +- .../java/org/apache/camel/test/cdi/FilterTest.java | 4 ++-- .../src/main/docs/test-spring.adoc | 18 +++++++++--------- .../apache/camel/test/patterns/MyProduceBean.java | 4 ++-- .../test/spring/CamelSpringActiveProfileTest.java | 2 +- .../spring/CamelSpringOverridePropertiesTest.java | 8 ++++---- .../CamelSpringPropertiesLocationElementTest.java | 2 +- .../CamelSpringRunnerMockEndpointsAndSkipTest.java | 4 ++-- .../spring/CamelSpringRunnerMockEndpointsTest.java | 4 ++-- .../test/spring/CamelSpringRunnerPlainTest.java | 10 +++++----- .../CamelSpringRunnerTestPropertySourceTest.java | 4 ++-- .../test/patterns/FilterFluentTemplateTest.java | 4 ++-- .../camel/test/patterns/FilterJUnit4Test.java | 4 ++-- .../org/apache/camel/test/patterns/FilterTest.java | 4 ++-- .../patterns/MockEndpointFailNoHeaderTest.java | 4 ++-- .../apache/camel/test/patterns/MyProduceBean.java | 2 +- .../camel/component/tika/TikaDetectTest.java | 2 +- .../apache/camel/component/tika/TikaParseTest.java | 2 +- .../twitter/DirectMessageProducerTest.java | 2 +- .../twitter/SearchByExchangeDirectTest.java | 6 +++--- .../camel/component/twitter/SearchEventTest.java | 2 +- .../component/twitter/UserProducerInOnlyTest.java | 2 +- .../component/twitter/UserProducerInOutTest.java | 2 +- .../deprecated/SearchByExchangeDirectTest.java | 6 +++--- .../twitter/deprecated/SearchEventTest.java | 2 +- .../twitter/deprecated/UserProducerInOnlyTest.java | 2 +- .../twitter/deprecated/UserProducerInOutTest.java | 2 +- .../undertow/UndertowHttpsSpringTest.java | 2 +- .../ws/UndertowWsProducerRouteRestartTest.java | 2 +- .../undertow/ws/UndertowWsProducerRouteTest.java | 2 +- .../UniVocityCsvDataFormatMarshalSpringTest.java | 2 +- .../UniVocityCsvDataFormatMarshalTest.java | 2 +- .../UniVocityCsvDataFormatUnmarshalSpringTest.java | 2 +- .../UniVocityCsvDataFormatUnmarshalTest.java | 2 +- ...ocityFixedWidthDataFormatMarshalSpringTest.java | 2 +- .../UniVocityFixedWidthDataFormatMarshalTest.java | 2 +- ...ityFixedWidthDataFormatUnmarshalSpringTest.java | 2 +- ...UniVocityFixedWidthDataFormatUnmarshalTest.java | 2 +- .../UniVocityTsvDataFormatMarshalSpringTest.java | 2 +- .../UniVocityTsvDataFormatMarshalTest.java | 2 +- .../UniVocityTsvDataFormatUnmarshalSpringTest.java | 2 +- .../UniVocityTsvDataFormatUnmarshalTest.java | 2 +- .../velocity/VelocitySupplementalContextTest.java | 4 ++-- .../velocity/VelocityValuesInPropertiesTest.java | 2 +- .../component/web3j/Web3jMockTestSupport.java | 4 ++-- .../camel/component/web3j/Web3jProducerTest.java | 2 +- .../component/web3j/Web3jQuorumProducerTest.java | 2 +- .../integration/Web3jIntegrationTestSupport.java | 4 ++-- .../integration/Web3jProducerGanacheTest.java | 2 +- .../integration/Web3jProducerMainnetTest.java | 2 +- .../camel/websocket/jsr356/JSR356ProducerTest.java | 2 +- .../WebsocketProducerRouteExampleTest.java | 2 +- .../WebsocketProducerRouteRestartTest.java | 2 +- .../camel/dataformat/xstream/MarshalListTest.java | 2 +- .../zookeepermaster/MasterEndpointTest.java | 4 ++-- .../zookeepermaster/MasterQuartz2EndpointTest.java | 2 +- docs/components/modules/ROOT/pages/cdi.adoc | 4 ++-- .../modules/ROOT/pages/disruptor-component.adoc | 2 +- .../modules/ROOT/pages/ehcache-component.adoc | 2 +- .../components/modules/ROOT/pages/spring-boot.adoc | 2 +- .../components/modules/ROOT/pages/test-spring.adoc | 18 +++++++++--------- .../modules/ROOT/pages/spring-testing.adoc | 12 ++++++------ .../java/sample/camel/MyCamelApplicationTest.java | 2 +- .../java/sample/camel/MyCamelApplicationTest.java | 2 +- .../test/java/sample/camel/FooApplicationTest.java | 2 +- .../example/transformer/OrderRouteSpringTest.java | 8 ++++---- ...eprintResolveComponentFromCamelContextTest.java | 2 +- .../org/apache/camel/itest/cdi/RoutesContextA.java | 2 +- .../org/apache/camel/itest/cdi/RoutesContextB.java | 2 +- .../org/apache/camel/itest/cdi/RoutesContextC.java | 2 +- .../org/apache/camel/itest/cdi/RoutesContextD.java | 2 +- ...ringFileAntPathMatcherRemoteFileFilterTest.java | 4 ++-- .../camel/itest/ftp/SpringFtpEndpointTest.java | 4 ++-- .../camel/itest/greeter/CamelGreeterTest.java | 2 +- .../camel/itest/greeter/CxfToJmsInOutTest.java | 4 ++-- .../camel/itest/greeter/MulticastCxfTest.java | 6 +++--- .../camel/itest/greeter/RecipientListCxf2Test.java | 6 +++--- .../camel/itest/greeter/RecipientListCxfTest.java | 6 +++--- .../apache/camel/itest/http/Http4EndpointTest.java | 4 ++-- .../itest/http/Http4MaxConnectionPerHostTest.java | 4 ++-- .../apache/camel/itest/http/HttpEndpointTest.java | 4 ++-- .../itest/http/HttpMaxConnectionPerHostTest.java | 4 ++-- .../camel/itest/http/InterceptEndpointTest.java | 4 ++-- .../itest/issues/IntercepFromAndStrategyTest.java | 6 +++--- .../camel/itest/jetty/JettyFileMulticastTest.java | 4 ++-- .../org/apache/camel/itest/jetty/JettyJmsTest.java | 2 +- .../org/apache/camel/itest/jms/FileToJmsTest.java | 2 +- .../camel/itest/jms/JmsConsumerShutdownTest.java | 8 ++++---- .../camel/itest/jms/JmsPollingConsumerTest.java | 8 ++++---- .../camel/itest/mail/SpringMailEndpointTest.java | 2 +- .../apache/camel/itest/proxy/EchoProduceTest.java | 2 +- .../apache/camel/itest/tx/Jms2RequiresNewTest.java | 8 ++++---- .../org/apache/camel/itest/tx/JmsToHttpRoute.java | 2 +- .../org/apache/camel/itest/tx/JmsToHttpTXTest.java | 4 ++-- ...AndNoTransactionErrorHandlerConfiguredTest.java | 4 ++-- .../itest/tx/JmsToHttpTXWithOnExceptionTest.java | 4 ++-- .../itest/tx/JmsToHttpTXWithRollbackTest.java | 4 ++-- 498 files changed, 954 insertions(+), 954 deletions(-) diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java index c6b9c6b..671b23a 100644 --- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java +++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java @@ -36,7 +36,7 @@ public class MyCdiConcatRouteBuilder extends RouteBuilder { @Uri("log:a") private Endpoint loga; - @EndpointInject(uri = "netty4-http:http:someserver:" + PORT + "/hello") + @EndpointInject("netty4-http:http:someserver:" + PORT + "/hello") private Endpoint mynetty; @Override diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java index 60a8f2f..e64c4ea 100644 --- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java +++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java @@ -43,7 +43,7 @@ public class SetHeaderTest { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") protected MockEndpoint expectedEndpoint; @Test diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java index ba13c39..a5f4522 100644 --- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java +++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosConsumerTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class AtmosConsumerTest extends CamelTestSupport { - @EndpointInject(uri = "atmos:foo/get?remotePath=/path&fullTokenId=fakeToken&secretKey=fakeSecret&uri=https://fake/uri") + @EndpointInject("atmos:foo/get?remotePath=/path&fullTokenId=fakeToken&secretKey=fakeSecret&uri=https://fake/uri") private AtmosEndpoint atmosEndpoint; @Override diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java index dabc37d..f0b268b 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java @@ -36,7 +36,7 @@ public class AtomixMapNodesProducerTest extends AtomixClientTestSupport { private static final String MAP_NAME = UUID.randomUUID().toString(); private DistributedMap map; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private FluentProducerTemplate fluent; // ************************************ diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java index e7d61f1..f8d7552 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java @@ -40,7 +40,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport { private static final String MAP_NAME = UUID.randomUUID().toString(); private DistributedMap map; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private FluentProducerTemplate fluent; // ************************************ diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java index aa2ba48..283e4fe 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java @@ -34,7 +34,7 @@ import org.junit.Test; public class AtomixMessagingTest extends AtomixClientTestSupport { private static final String NODE_NAME = UUID.randomUUID().toString(); - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private FluentProducerTemplate template; // ************************************ diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java index 2274b98..d245c65 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java @@ -39,7 +39,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport { private static final String MAP_NAME = UUID.randomUUID().toString(); private DistributedMultiMap map; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private FluentProducerTemplate fluent; // ************************************ diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java index ce3f150..f997c2d 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java @@ -35,7 +35,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport { private static final String QUEUE_NAME = UUID.randomUUID().toString(); private DistributedQueue queue; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private FluentProducerTemplate fluent; // ************************************ diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java index 5d89460..b59fcd5 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java @@ -35,7 +35,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport { private static final String SET_NAME = UUID.randomUUID().toString(); private DistributedSet set; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private FluentProducerTemplate fluent; // ************************************ diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java index d5c1829..9593493 100644 --- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java +++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java @@ -35,7 +35,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport { private static final String VALUE_NAME = UUID.randomUUID().toString(); private DistributedValue value; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private FluentProducerTemplate fluent; // ************************************ diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java index cf14e39..c0e1155 100644 --- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java +++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java @@ -32,7 +32,7 @@ import org.junit.Test; @Ignore("Must be manually tested. Provide your own accessKey and secretKey!") public class CwComponentIntegrationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java index 823a6db..5287b3e 100644 --- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java +++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java @@ -36,7 +36,7 @@ import org.junit.Test; @Ignore("Must be manually tested. Provide your own accessKey and secretKey!") public class DdbComponentIntegrationTest extends CamelTestSupport { - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate template; @Test diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java index 707318b..c57b6c5 100644 --- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java +++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java @@ -31,7 +31,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class ECSProducerSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java index c325ec8..0ca94eb 100644 --- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java +++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java @@ -32,7 +32,7 @@ public class SqsExtendMessageVisibilityTest extends CamelTestSupport { private static final int TIMEOUT = 4; // 4 seconds. private static final String RECEIPT_HANDLE = "0NNAq8PwvXsyZkR6yu4nQ07FGxNmOBWi5"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; private AmazonSQSClientMock clientMock; diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java index 578e40b..5fdcaff 100644 --- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java +++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java @@ -37,13 +37,13 @@ public class CamelSWFEndToEndTest extends CamelTestSupport { + "&clientConfiguration.endpoint=swf.eu-west-1.amazonaws.com" + "&version=1.0"; - @EndpointInject(uri = "mock:starter") + @EndpointInject("mock:starter") private MockEndpoint starter; - @EndpointInject(uri = "mock:decider") + @EndpointInject("mock:decider") private MockEndpoint decider; - @EndpointInject(uri = "mock:worker") + @EndpointInject("mock:worker") private MockEndpoint worker; @Test diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java index fa26b1f..1a92267 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64DataFormatTestBase.java @@ -97,7 +97,7 @@ public abstract class Base64DataFormatTestBase extends CamelTestSupport { protected Base64DataFormat format = new Base64DataFormat(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; protected void runEncoderTest(byte[] raw, byte[] expected) throws Exception { diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java index fe85a63..232aee7 100644 --- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java +++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatTestBase.java @@ -24,7 +24,7 @@ public abstract class SpringBase64DataFormatTestBase extends CamelSpringTestSupp protected Base64DataFormat format = new Base64DataFormat(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; protected void runEncoderTest(byte[] raw, byte[] expected) throws Exception { diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java index b67cf33..51113e0 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java @@ -27,7 +27,7 @@ public class HibernateValidationProviderResolverTest extends CamelTestSupport { // Routing fixtures - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") MockEndpoint mockEndpoint; @Override diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ProducerTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ProducerTest.java index cb5099e..d75688c 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ProducerTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ProducerTest.java @@ -49,7 +49,7 @@ public class ProducerTest extends BeanstalkMockTestSupport { @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate direct; private String testMessage = "hello, world"; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java index 910f95d9..91f8c27 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/CommonBindyTest.java @@ -35,13 +35,13 @@ public abstract class CommonBindyTest extends AbstractJUnit4SpringContextTests { protected static final Logger LOG = LoggerFactory.getLogger(CommonBindyTest.class); - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) public ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) public MockEndpoint result; - @EndpointInject(uri = URI_MOCK_ERROR) + @EndpointInject(URI_MOCK_ERROR) public MockEndpoint error; } 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 55ae716..02df499 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 @@ -43,10 +43,10 @@ public class BindyComplexCsvGenerateHeaderMarshallTest extends AbstractJUnit4Spr 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"; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test 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 3076a3f..d886adf 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 @@ -42,10 +42,10 @@ public class BindyComplexCsvMarshallTest extends AbstractJUnit4SpringContextTest private List> 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") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java index 234c8b6..5ec04c4 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java @@ -33,7 +33,7 @@ public class BindyComplexCsvUnmarshallTest extends AbstractJUnit4SpringContextTe private static final Class TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; private String record = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" @@ -45,7 +45,7 @@ public class BindyComplexCsvUnmarshallTest extends AbstractJUnit4SpringContextTe private String singleRecord = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java index c70c3e6..fda9f8d 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java @@ -34,12 +34,12 @@ public class BindyComplexCsvUnmarshallUnwrapSingleInstanceTest extends AbstractJ private static final Class TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; private String singleRecord = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java index b0cd4830..34a03d2 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; @ContextConfiguration public class BindyCsvBigFileUnmarshallTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java index dad4a78..d54daca 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java @@ -39,10 +39,10 @@ public class BindyCsvSkipFieldTest extends AbstractJUnit4SpringContextTests { private static String input = "VOA,12 abc street,Skip Street,Melbourne,VIC,3000,Australia,Skip dummy1,end of record"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java index 61fa0ea..56b0a91 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java @@ -35,10 +35,10 @@ public class BindyDoNotRemoveQuotesCsvUnmarshallTest extends AbstractJUnit4Sprin private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java index 7a3fd7d..1105b9b 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java @@ -37,10 +37,10 @@ public class BindyDoubleQuotesCsvUnmarshallTest extends AbstractJUnit4SpringCont private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java index 7817840..f1c06c4 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java @@ -38,10 +38,10 @@ public class BindyDoubleQuotesInFieldCsvUnmarshallTest extends AbstractJUnit4Spr private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java index d8af8ec..55cb468 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java @@ -34,10 +34,10 @@ public class BindyInlinedQuotesCsvUnmarshallTest extends AbstractJUnit4SpringCon private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java index 75e36c3..32b0354 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java @@ -41,10 +41,10 @@ public class BindyMarshalOneToManyWithHeadersTest extends AbstractJUnit4SpringCo private String expected; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java index 05e1b89..ef0aa98 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java @@ -42,10 +42,10 @@ public class BindyPojoSimpleCsvMarshallTest extends AbstractJUnit4SpringContextT private String expected; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java index fc81f44..5126f74 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyRecordFieldStartingWithSeperatorCharTest.java @@ -30,7 +30,7 @@ import org.junit.Test; public class BindyRecordFieldStartingWithSeperatorCharTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockEndPoint; @Test 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 74f58a6..719900d 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 @@ -37,10 +37,10 @@ public class BindySimpleCsvBooleanFalseMarshallTest extends AbstractJUnit4Spring private List> models = new ArrayList<>(); private String result = "andrew,false\r\n"; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test 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 da019d2..96a9025 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 @@ -37,10 +37,10 @@ public class BindySimpleCsvBooleanTrueMarshallTest extends AbstractJUnit4SpringC private List> models = new ArrayList<>(); private String result = "andrew,true\r\n"; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java index 0b2d940..3e12545 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java @@ -42,13 +42,13 @@ public class BindySimpleCsvBooleanUnmarshallTest extends AbstractJUnit4SpringCon private static final String URI_MOCK_ERROR = "mock:error"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; - @EndpointInject(uri = URI_MOCK_ERROR) + @EndpointInject(URI_MOCK_ERROR) private MockEndpoint error; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java index 06049ce..f941657 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest.java @@ -31,16 +31,16 @@ import org.junit.Test; public class BindySimpleCsvContainingMultiQuoteCharEscapeFalseTest extends CamelTestSupport { - @EndpointInject(uri = "mock:resultMarshal1") + @EndpointInject("mock:resultMarshal1") private MockEndpoint mockEndPointMarshal1; - @EndpointInject(uri = "mock:resultUnMarshal1") + @EndpointInject("mock:resultUnMarshal1") private MockEndpoint mockEndPointUnMarshal1; - @EndpointInject(uri = "mock:resultMarshal2") + @EndpointInject("mock:resultMarshal2") private MockEndpoint mockEndPointMarshal2; - @EndpointInject(uri = "mock:resultUnMarshal2") + @EndpointInject("mock:resultUnMarshal2") private MockEndpoint mockEndPointUnMarshal2; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java index 7028042..14b8914 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest.java @@ -31,16 +31,16 @@ import org.junit.Test; public class BindySimpleCsvContainingMultiQuoteCharEscapeTrueTest extends CamelTestSupport { - @EndpointInject(uri = "mock:resultMarshal1") + @EndpointInject("mock:resultMarshal1") private MockEndpoint mockEndPointMarshal1; - @EndpointInject(uri = "mock:resultUnMarshal1") + @EndpointInject("mock:resultUnMarshal1") private MockEndpoint mockEndPointUnMarshal1; - @EndpointInject(uri = "mock:resultMarshal2") + @EndpointInject("mock:resultMarshal2") private MockEndpoint mockEndPointMarshal2; - @EndpointInject(uri = "mock:resultUnMarshal2") + @EndpointInject("mock:resultUnMarshal2") private MockEndpoint mockEndPointUnMarshal2; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java index 480549c..20d3eaa 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithClassMethodTest.java @@ -31,16 +31,16 @@ import org.junit.Test; public class BindySimpleCsvFunctionWithClassMethodTest extends CamelTestSupport { - @EndpointInject(uri = "mock:resultMarshal1") + @EndpointInject("mock:resultMarshal1") private MockEndpoint mockEndPointMarshal1; - @EndpointInject(uri = "mock:resultUnMarshal1") + @EndpointInject("mock:resultUnMarshal1") private MockEndpoint mockEndPointUnMarshal1; - @EndpointInject(uri = "mock:resultMarshal2") + @EndpointInject("mock:resultMarshal2") private MockEndpoint mockEndPointMarshal2; - @EndpointInject(uri = "mock:resultUnMarshal2") + @EndpointInject("mock:resultUnMarshal2") private MockEndpoint mockEndPointUnMarshal2; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java index 503d142..41e1144 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvFunctionWithExternalMethodTest.java @@ -31,16 +31,16 @@ import org.junit.Test; public class BindySimpleCsvFunctionWithExternalMethodTest extends CamelTestSupport { - @EndpointInject(uri = "mock:resultMarshal1") + @EndpointInject("mock:resultMarshal1") private MockEndpoint mockEndPointMarshal1; - @EndpointInject(uri = "mock:resultUnMarshal1") + @EndpointInject("mock:resultUnMarshal1") private MockEndpoint mockEndPointUnMarshal1; - @EndpointInject(uri = "mock:resultMarshal2") + @EndpointInject("mock:resultMarshal2") private MockEndpoint mockEndPointMarshal2; - @EndpointInject(uri = "mock:resultUnMarshal2") + @EndpointInject("mock:resultUnMarshal2") private MockEndpoint mockEndPointUnMarshal2; public static String replaceToBar(String fooString) { 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 ee43a1e..036595c 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 @@ -41,10 +41,10 @@ public class BindySimpleCsvGenerateHeaderMarshallTest extends AbstractJUnit4Spri 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"; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java index 25ba290..8527447 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java @@ -36,10 +36,10 @@ public class BindySimpleCsvIntegerMarshallTest extends AbstractJUnit4SpringConte private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java index 2c422b7..334ac44 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java @@ -33,22 +33,22 @@ import static org.junit.Assert.fail; @ContextConfiguration public class BindySimpleCsvMandatoryFieldsUnmarshallTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:result1") + @EndpointInject("mock:result1") protected MockEndpoint resultEndpoint1; - @EndpointInject(uri = "mock:result2") + @EndpointInject("mock:result2") protected MockEndpoint resultEndpoint2; - @EndpointInject(uri = "mock:result3") + @EndpointInject("mock:result3") protected MockEndpoint resultEndpoint3; - @Produce(uri = "direct:start1") + @Produce("direct:start1") protected ProducerTemplate template1; - @Produce(uri = "direct:start2") + @Produce("direct:start2") protected ProducerTemplate template2; - @Produce(uri = "direct:start3") + @Produce("direct:start3") protected ProducerTemplate template3; String header = "order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r\n"; 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 62fb3a7..72dde24 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 @@ -43,10 +43,10 @@ public class BindySimpleCsvMarshallDslTest extends AbstractJUnit4SpringContextTe private List> 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") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test 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 e520dc6..0a00c41 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 @@ -47,10 +47,10 @@ public class BindySimpleCsvMarshallTest extends AbstractJUnit4SpringContextTests private List> models = new ArrayList<>(); private String expected; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java index d7818a3..c2ff835 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java @@ -35,10 +35,10 @@ public class BindySimpleCsvMarshallTrimClipTest extends AbstractJUnit4SpringCont private String expected; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; @Test 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 30f5f6a..840ae31 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 @@ -40,10 +40,10 @@ public class BindySimpleCsvNullMarshallTest extends AbstractJUnit4SpringContextT private List> 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") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test 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 f126d8b..c124f1d 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 @@ -39,10 +39,10 @@ public class BindySimpleCsvOneToManyMarshallTest extends AbstractJUnit4SpringCon 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"; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java index d4ce0f7..f20fdc1 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java @@ -34,13 +34,13 @@ import static org.junit.Assert.assertEquals; @ContextConfiguration public class BindySimpleCsvRemoveWhitespaceUnmarshallTest extends AbstractJUnit4SpringContextTests { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; private String record = "1 , 2,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" + ",,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java index 36e071c..cb94294 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java @@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration public class BindySimpleCsvSkipFirstLineUnmarshallTest extends AbstractJUnit4SpringContextTests { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; private String record = "order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r\n" @@ -39,7 +39,7 @@ public class BindySimpleCsvSkipFirstLineUnmarshallTest extends AbstractJUnit4Spr + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n" + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java index e7cfe1f..7a31b23 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java @@ -42,15 +42,15 @@ public class BindySimpleCsvUnmarshallBadIntegerTest extends AbstractJUnit4Spring private static final String URI_MOCK_ERROR = "mock:error"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) protected ProducerTemplate template; private String record; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; - @EndpointInject(uri = URI_MOCK_ERROR) + @EndpointInject(URI_MOCK_ERROR) private MockEndpoint error; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java index 2938a06..ac9d7a9 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java @@ -38,15 +38,15 @@ public class BindySimpleCsvUnmarshallPositionModifiedTest extends AbstractJUnit4 private static final String URI_MOCK_ERROR = "mock:error"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) protected ProducerTemplate template; private String record; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; - @EndpointInject(uri = URI_MOCK_ERROR) + @EndpointInject(URI_MOCK_ERROR) private MockEndpoint error; @Test 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 7a5f764..5b3ac9b 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 @@ -43,13 +43,13 @@ public class BindySimpleCsvUnmarshallTest extends AbstractJUnit4SpringContextTes private static final String URI_MOCK_ERROR = "mock:error"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; - @EndpointInject(uri = URI_MOCK_ERROR) + @EndpointInject(URI_MOCK_ERROR) private MockEndpoint error; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java index c0b4920..5d421b0 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java @@ -35,10 +35,10 @@ public class BindySimpleCsvUnmarshallUnicodeNextLineTest extends AbstractJUnit4S private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) protected ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String record; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java index f53ff7c..5f02074 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java @@ -34,10 +34,10 @@ public class BindySingleQuoteStartWordCsvUnmarshallTest extends AbstractJUnit4Sp private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java index 27be72f..8a291ee 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java @@ -32,10 +32,10 @@ public class BindySingleQuotesCsvUnmarshallTest extends AbstractJUnit4SpringCont private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java index e962991..aaca356 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java @@ -34,10 +34,10 @@ public class BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest extends A private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java index 7097a37..aeca416 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java @@ -48,10 +48,10 @@ public class BindySimpleKeyValuePairFixTest extends AbstractJUnit4SpringContextT "37=3 38=6 40=bread \r\n" }; - @Produce(uri = "direct:fix") + @Produce("direct:fix") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test 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 61d243b..3e6968c 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 @@ -41,10 +41,10 @@ public class BindySimpleKeyValuePairMarshallDslTest extends AbstractJUnit4Spring 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"; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test 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 f75879a..c9e02a5 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 @@ -40,10 +40,10 @@ public class BindySimpleKeyValuePairMarshallTest extends AbstractJUnit4SpringCon private List> 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") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test 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 4f29c50..8e15d3c 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 @@ -38,10 +38,10 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration public class BindySimpleKeyValuePairNullMarshallTest extends AbstractJUnit4SpringContextTests { - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java index 34d4c81..8336c0c 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java @@ -36,10 +36,10 @@ public class BindySimpleKeyValuePairUnicodeNextLineTest extends AbstractJUnit4Sp private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; 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 6b98239..db788ff 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 @@ -46,13 +46,13 @@ public class BindySimpleKeyValuePairWithoutSectionMarshallDslTest extends Abstra private List> models = new ArrayList<>(); - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; - @EndpointInject(uri = URI_MOCK_ERROR) + @EndpointInject(URI_MOCK_ERROR) private MockEndpoint error; @Test diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java index fdd9098..e4a3abe 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyPaddingAndTrimmingTest.java @@ -31,7 +31,7 @@ public class BindyPaddingAndTrimmingTest extends CamelTestSupport { private static final String URI_DIRECT_UNMARSHAL = "direct:unmarshall"; private static final String URI_MOCK_UNMARSHAL_RESULT = "mock:unmarshal_result"; - @EndpointInject(uri = URI_MOCK_UNMARSHAL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHAL_RESULT) private MockEndpoint unmarhsalResult; @Override diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java index f31c1cd..835e275 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java @@ -51,22 +51,22 @@ public class BindyConverterTest extends CamelTestSupport { // // ************************************************************************* - @Produce(uri = URI_DIRECT_MARSHALL) + @Produce(URI_DIRECT_MARSHALL) private ProducerTemplate mtemplate; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint mresult; - @Produce(uri = URI_DIRECT_UNMARSHALL) + @Produce(URI_DIRECT_UNMARSHALL) private ProducerTemplate utemplate; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint uresult; - @Produce(uri = URI_DIRECT_THROUGH) + @Produce(URI_DIRECT_THROUGH) private ProducerTemplate ttemplate; - @EndpointInject(uri = URI_MOCK_THROUGH) + @EndpointInject(URI_MOCK_THROUGH) private MockEndpoint tresult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java index 48b0418..6f06488 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java @@ -47,10 +47,10 @@ public class BindyFixedLengthDelimitedFieldTest extends CamelTestSupport { private static final String TEST_RECORD_WITH_SINGLE_EXTRA_CHAR = "10A9Pauline^M^ISINXD12345678BUYShare000002500.45USD01-08-2009x\r\n"; private static final String TEST_RECORD_WITH_WHITSPACE_THEN_EXTRA_CHAR = "10A9Pauline^M^ISINXD12345678BUYShare000002500.45USD01-08-2009 x\r\n"; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java index 3885d6b..bdb3f96 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java @@ -47,10 +47,10 @@ public class BindyFixedLengthDynamicFieldTest extends CamelTestSupport { private static final String TEST_RECORD = "10A9Pauline^M^ISIN10XD12345678BUYShare000002500.45USD01-08-2009\r\n"; private static final String TEST_RECORD_WITH_EXTRA_CHARS = "10A9Pauline^M^ISIN10XD12345678BUYShare000002500.45USD01-08-2009x\r\n"; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; // ************************************************************************* 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 5bf3385..bb5d7850 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 @@ -50,10 +50,10 @@ public class BindySimpleFixedLengthHeaderFooterTest extends CamelTestSupport { private static final String TEST_RECORD = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n"; private static final String TEST_FOOTER = "9000000001\r\n"; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java index ac19434..40d0f3a 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java @@ -42,10 +42,10 @@ public class BindySimpleIgnoreTrailingCharsTest extends CamelTestSupport { private static final String TEST_RECORD = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009Hello xxx\r\n"; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java index 6f19d75..871886c 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java @@ -48,16 +48,16 @@ public class BindyImpliedTest extends AbstractJUnit4SpringContextTests { // // ************************************************************************* - @Produce(uri = URI_DIRECT_MARSHALL) + @Produce(URI_DIRECT_MARSHALL) private ProducerTemplate mtemplate; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint mresult; - @Produce(uri = URI_DIRECT_UNMARSHALL) + @Produce(URI_DIRECT_UNMARSHALL) private ProducerTemplate utemplate; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint uresult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java index 9b3b385..4cfa0b6 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java @@ -44,9 +44,9 @@ public class BindySimpleFixedLengthWithLinkTest extends CamelTestSupport { private static final String TEST_RECORD = "AAABBBCCC\r\n"; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; // ************************************************************************* 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 96efe73..be9c2b3 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 @@ -50,10 +50,10 @@ public class BindySimpleFixedLengthMarshallTest extends AbstractJUnit4SpringCont private List> models = new ArrayList<>(); private String expected; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; @Test 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 8e0d3be..379f68c 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 @@ -57,13 +57,13 @@ public class BindySimpleFixedLengthObjectMarshallTest extends AbstractJUnit4Spri private String expected; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; - @EndpointInject(uri = URI_MOCK_ERROR) + @EndpointInject(URI_MOCK_ERROR) private MockEndpoint error; public static class Configuration extends SingleRouteCamelConfiguration { diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java index 6d655a6..612ef3c 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java @@ -46,16 +46,16 @@ public class BindyNumberTest extends AbstractJUnit4SpringContextTests { // // ************************************************************************* - @Produce(uri = URI_DIRECT_MARSHALL) + @Produce(URI_DIRECT_MARSHALL) private ProducerTemplate mtemplate; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint mresult; - @Produce(uri = URI_DIRECT_UNMARSHALL) + @Produce(URI_DIRECT_UNMARSHALL) private ProducerTemplate utemplate; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint uresult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java index 1b8cd01..0c13370 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java @@ -47,10 +47,10 @@ public class BindySimpleFixedLengthOrdinalPosTest extends CamelTestSupport { private static final String TEST_RECORD = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009Hello \r\n"; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java index 1bff82d..aefe609 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java @@ -43,10 +43,10 @@ public class BindySimpleSkipFieldsTest extends CamelTestSupport { private static final String TEST_RECORD = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009Hello \r\n"; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; // ************************************************************************* 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 7bcf048..50b3637 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 @@ -50,10 +50,10 @@ public class BindyFixedLengthHeaderFooterSkipHeaderTest extends CamelTestSupport private static final String TEST_RECORD = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n"; private static final String TEST_FOOTER = "9000000001\r\n"; - @EndpointInject(uri = URI_MOCK_MARSHALL_RESULT) + @EndpointInject(URI_MOCK_MARSHALL_RESULT) private MockEndpoint marshallResult; - @EndpointInject(uri = URI_MOCK_UNMARSHALL_RESULT) + @EndpointInject(URI_MOCK_UNMARSHALL_RESULT) private MockEndpoint unmarshallResult; // ************************************************************************* diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java index 7468121..dba090d 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java @@ -39,10 +39,10 @@ public class BindySimpleFixedLengthUnmarshallClassMethodTest extends AbstractJUn private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java index 91785a6..36a9f5f 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java @@ -39,10 +39,10 @@ public class BindySimpleFixedLengthUnmarshallExternalMethodTest extends Abstract private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java index f7bb4e9..f555432 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java @@ -39,10 +39,10 @@ public class BindySimpleFixedLengthUnmarshallTest extends AbstractJUnit4SpringCo private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java index a75eb2c..ca805d1 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java @@ -39,10 +39,10 @@ public class BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest extends Abstr private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java index 313582a..7d84231 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java @@ -39,10 +39,10 @@ public class BindySimpleFixedLengthUnmarshallTrimFieldTest extends AbstractJUnit private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java index c448141..0847a7a 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java @@ -44,10 +44,10 @@ public class BindyDatePatternCsvUnmarshallTest extends AbstractJUnit4SpringConte private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String expected; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java index 4eb4552..e1fe2d5 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/grouping/BindyBigDecimalGroupingUnmarshallTest.java @@ -36,10 +36,10 @@ public class BindyBigDecimalGroupingUnmarshallTest extends CamelTestSupport { private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String record; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java index f6d0945..4af44a7 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java @@ -37,10 +37,10 @@ public class BindyBigDecimalRoundingUnmarshallTest extends CamelTestSupport { private static final String URI_MOCK_RESULT = "mock:result"; private static final String URI_DIRECT_START = "direct:start"; - @Produce(uri = URI_DIRECT_START) + @Produce(URI_DIRECT_START) private ProducerTemplate template; - @EndpointInject(uri = URI_MOCK_RESULT) + @EndpointInject(URI_MOCK_RESULT) private MockEndpoint result; private String record; diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java index 96f18f4..871f153 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryRoutesTest.java @@ -37,10 +37,10 @@ public class CaffeineAggregationRepositoryRoutesTest extends CamelTestSupport { private static final int SUM = IntStream.of(VALUES).reduce(0, (a, b) -> a + b); private static final String CORRELATOR = "CORRELATOR"; - @EndpointInject(uri = ENDPOINT_MOCK) + @EndpointInject(ENDPOINT_MOCK) private MockEndpoint mock; - @Produce(uri = ENDPOINT_DIRECT) + @Produce(ENDPOINT_DIRECT) private ProducerTemplate producer; @Test diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java index 01963a3..61196ad 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java @@ -30,7 +30,7 @@ public class CassandraComponentBeanRefTest extends BaseCassandraTest { public static final String SESSION_URI = "cql:bean:cassandraSession?cql=#insertCql"; public static final String CLUSTER_URI = "cql:bean:cassandraCluster/camel_ks?cql=#insertCql"; - @Produce(uri = "direct:input") + @Produce("direct:input") public ProducerTemplate producerTemplate; @Rule 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 45e08cd..3b89cc9 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 @@ -47,19 +47,19 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { @Rule public CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); - @Produce(uri = "direct:input") + @Produce("direct:input") ProducerTemplate producerTemplate; - @Produce(uri = "direct:inputNoParameter") + @Produce("direct:inputNoParameter") ProducerTemplate noParameterProducerTemplate; - @Produce(uri = "direct:inputNotConsistent") + @Produce("direct:inputNotConsistent") ProducerTemplate notConsistentProducerTemplate; - @Produce(uri = "direct:loadBalancingPolicy") + @Produce("direct:loadBalancingPolicy") ProducerTemplate loadBalancingPolicyTemplate; - @Produce(uri = "direct:inputNoEndpointCql") + @Produce("direct:inputNoEndpointCql") ProducerTemplate producerTemplateNoEndpointCql; @Override 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 c48e534..d0d17a0 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 @@ -43,10 +43,10 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest @Rule public CassandraCQLUnit cassandra = CassandraUnitUtils.cassandraCQLUnit(); - @Produce(uri = "direct:input") + @Produce("direct:input") ProducerTemplate producerTemplate; - @Produce(uri = "direct:inputNoParameter") + @Produce("direct:inputNoParameter") ProducerTemplate noParameterProducerTemplate; @Override diff --git a/components/camel-cdi/src/main/docs/cdi.adoc b/components/camel-cdi/src/main/docs/cdi.adoc index 0b85d64..21771b2 100644 --- a/components/camel-cdi/src/main/docs/cdi.adoc +++ b/components/camel-cdi/src/main/docs/cdi.adoc @@ -440,7 +440,7 @@ FluentProducerTemplate producer; |Endpoint injection (default Camel context) a| [source,java] ---- -@EndpointInject(uri = "direct:inbound") +@EndpointInject("direct:inbound") Endpoint endpoint; ---- @@ -455,7 +455,7 @@ Endpoint endpoint; |Endpoint injection (Camel context by name) a| [source,java] ---- -@EndpointInject(uri = "direct:inbound", +@EndpointInject(value = "direct:inbound", context = "foo") Endpoint contextEndpoint; ---- diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectRoute.java index 3db6323..6c02c70 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectRoute.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectRoute.java @@ -22,10 +22,10 @@ import org.apache.camel.builder.RouteBuilder; public class EndpointInjectRoute extends RouteBuilder { - @EndpointInject(uri = "direct:inbound") + @EndpointInject("direct:inbound") private Endpoint inbound; - @EndpointInject(uri = "mock:outbound") + @EndpointInject("mock:outbound") private Endpoint outbound; @Override diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectWrongContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectWrongContextRoute.java index 9d60cda..c1d01a0 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectWrongContextRoute.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EndpointInjectWrongContextRoute.java @@ -22,11 +22,11 @@ import org.apache.camel.builder.RouteBuilder; public class EndpointInjectWrongContextRoute extends RouteBuilder { - @EndpointInject(uri = "direct:inbound") + @EndpointInject("direct:inbound") private Endpoint inbound; // Wrong context name should lead to resolution exception - @EndpointInject(uri = "mock:outbound", context = "foo") + @EndpointInject(value = "mock:outbound", context = "foo") private Endpoint outbound; @Override diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextProduceTemplateBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextProduceTemplateBean.java index 644f93a..aca5fe4 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextProduceTemplateBean.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextProduceTemplateBean.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; public class FirstCamelContextProduceTemplateBean { - @Produce(uri = "mock:outbound", context = "first") + @Produce(value = "mock:outbound", context = "first") private ProducerTemplate producer; public void sendToProducer(String body) { diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FluentProduceTemplateBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FluentProduceTemplateBean.java index 5b2bc58..3234d57 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FluentProduceTemplateBean.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FluentProduceTemplateBean.java @@ -21,7 +21,7 @@ import org.apache.camel.Produce; public class FluentProduceTemplateBean { - @Produce(uri = "mock:outbound") + @Produce("mock:outbound") private FluentProducerTemplate producer; public void sendToProducer(String body) { diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ProduceTemplateBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ProduceTemplateBean.java index df87c68..ae6586c 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ProduceTemplateBean.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ProduceTemplateBean.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; public class ProduceTemplateBean { - @Produce(uri = "mock:outbound") + @Produce("mock:outbound") private ProducerTemplate producer; public void sendToProducer(String body) { diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEndpointInjectRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEndpointInjectRoute.java index 2a69d17..3936923 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEndpointInjectRoute.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEndpointInjectRoute.java @@ -24,7 +24,7 @@ import org.apache.camel.cdi.ContextName; @ContextName("second") public class SecondCamelContextEndpointInjectRoute extends RouteBuilder { - @EndpointInject(uri = "direct:inbound", context = "second") + @EndpointInject(value = "direct:inbound", context = "second") private Endpoint inbound; @Override diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextProduceTemplateBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextProduceTemplateBean.java index 7c5db16..c475d81 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextProduceTemplateBean.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextProduceTemplateBean.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; public class SecondCamelContextProduceTemplateBean { - @Produce(uri = "mock:outbound", context = "second") + @Produce(value = "mock:outbound", context = "second") private ProducerTemplate producer; public void sendToProducer(String body) { 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 391ff09..0207696 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 @@ -34,10 +34,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class CsvMarshalAutogenColumnsSpringQuoteModeTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; - @EndpointInject(uri = "mock:result2") + @EndpointInject("mock:result2") private MockEndpoint result2; @Test 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 d55f9f9..e7f870a 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 @@ -33,10 +33,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class CsvMarshalAutogenColumnsSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; - @EndpointInject(uri = "mock:result2") + @EndpointInject("mock:result2") private MockEndpoint result2; @Test diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java index cfbfdff..a5a4e92 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java @@ -45,7 +45,7 @@ public class CsvMarshalHeaderTest extends CamelTestSupport { @Rule public TemporaryFolder folder = new TemporaryFolder(); - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate producerTemplate; private File outputFile; diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java index 18c4f59..a632fce 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java @@ -51,7 +51,7 @@ public class CsvMarshalHeaderWithCustomMarshallFactoryTest extends CamelTestSupp @Rule public TemporaryFolder folder = new TemporaryFolder(); - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate producerTemplate; private File outputFile; 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 11267a6..70204d8 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 @@ -32,7 +32,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class CsvMarshalPipeDelimiterSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test 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 66391f4..31f6015 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 @@ -29,7 +29,7 @@ import org.junit.Test; public class CsvMarshalPipeDelimiterTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java index d3a93d4..613bc49 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java @@ -30,7 +30,7 @@ import org.junit.Test; * This class tests standard marshalling */ public class CsvMarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") MockEndpoint output; @Test diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java index 6b40cbe..c917e9a 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalMapLineSpringTest.java @@ -30,7 +30,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * the useMaps option. */ public class CsvUnmarshalMapLineSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @SuppressWarnings("unchecked") diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java index 961860e..1e3fe43 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterSpringTest.java @@ -29,7 +29,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class CsvUnmarshalPipeDelimiterSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @SuppressWarnings("unchecked") diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java index ad61648..9d32149 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java @@ -29,7 +29,7 @@ import org.junit.Test; */ public class CsvUnmarshalPipeDelimiterTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @SuppressWarnings("unchecked") diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java index 201c8fb..6cb9a32 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalSkipFirstLineSpringTest.java @@ -30,7 +30,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class CsvUnmarshalSkipFirstLineSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @SuppressWarnings("unchecked") diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java index 41ff6ac..05ee4e3 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamSpringTest.java @@ -30,7 +30,7 @@ public class CsvUnmarshalStreamSpringTest extends CamelSpringTestSupport { private static final String CSV_SAMPLE = "A,B,C\r1,2,3\rone,two,three"; - @EndpointInject(uri = "mock:line") + @EndpointInject("mock:line") private MockEndpoint line; @Test diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java index 02663ce..e476b7c 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java @@ -35,7 +35,7 @@ public class CsvUnmarshalStreamTest extends CamelTestSupport { public static final int EXPECTED_COUNT = 3; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @SuppressWarnings("unchecked") diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java index 8a269dd..61de960 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterSpringTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; public class CsvUnmarshalTabDelimiterSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @SuppressWarnings("unchecked") diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java index c9b2f22..3f848f6 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTabDelimiterTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class CsvUnmarshalTabDelimiterTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @SuppressWarnings("unchecked") diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java index 486bdf6..63616cb 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java @@ -37,10 +37,10 @@ import static org.apache.camel.dataformat.csv.TestUtils.asMap; public class CsvUnmarshalTest extends CamelTestSupport { private static final String CSV_SAMPLE = "A,B,C\r1,2,3\rone,two,three"; - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") MockEndpoint output; - @EndpointInject(uri = "mock:line") + @EndpointInject("mock:line") MockEndpoint line; @Test diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java index 7d4c5a0..044cd41 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTwoCsvDataFormatConcurrentTest.java @@ -26,10 +26,10 @@ import org.junit.Test; public class CsvUnmarshalTwoCsvDataFormatConcurrentTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; - @EndpointInject(uri = "mock:result2") + @EndpointInject("mock:result2") private MockEndpoint result2; @Test diff --git a/components/camel-disruptor/src/main/docs/disruptor-component.adoc b/components/camel-disruptor/src/main/docs/disruptor-component.adoc index bdaad16..8e1d0ab 100644 --- a/components/camel-disruptor/src/main/docs/disruptor-component.adoc +++ b/components/camel-disruptor/src/main/docs/disruptor-component.adoc @@ -342,7 +342,7 @@ but notice how we can use @Consume to consume from the Disruptor. ------------------------------------------- public class FooEventConsumer { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private ProducerTemplate destination; @Consume(ref = "foo") diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java index 797ca33..b3bb892 100644 --- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java +++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java @@ -39,7 +39,7 @@ import org.junit.runners.Parameterized.Parameters; public class DisruptorWaitClaimStrategyComponentTest extends CamelTestSupport { private static final Integer VALUE = Integer.valueOf(42); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce diff --git a/components/camel-ehcache/src/main/docs/ehcache-component.adoc b/components/camel-ehcache/src/main/docs/ehcache-component.adoc index 02ebb16..189af6d 100644 --- a/components/camel-ehcache/src/main/docs/ehcache-component.adoc +++ b/components/camel-ehcache/src/main/docs/ehcache-component.adoc @@ -218,7 +218,7 @@ public class EhcacheAggregationRepositoryRoutesTest extends CamelTestSupport { private static final int SUM = IntStream.of(VALUES).reduce(0, (a, b) -> a + b); private static final String CORRELATOR = "CORRELATOR"; - @EndpointInject(uri = ENDPOINT_MOCK) + @EndpointInject(ENDPOINT_MOCK) private MockEndpoint mock; @Produce(uri = ENDPOINT_DIRECT) diff --git a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepositoryRoutesTest.java b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepositoryRoutesTest.java index 8eec202..ea3895c 100644 --- a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepositoryRoutesTest.java +++ b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepositoryRoutesTest.java @@ -36,10 +36,10 @@ public class EhcacheAggregationRepositoryRoutesTest extends EhcacheTestSupport { private static final int SUM = IntStream.of(VALUES).reduce(0, (a, b) -> a + b); private static final String CORRELATOR = "CORRELATOR"; - @EndpointInject(uri = ENDPOINT_MOCK) + @EndpointInject(ENDPOINT_MOCK) private MockEndpoint mock; - @Produce(uri = ENDPOINT_DIRECT) + @Produce(ENDPOINT_DIRECT) private ProducerTemplate producer; @Test diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java index d390ed1..5b2f2f1 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ExecDocumentationExamplesTest.java @@ -49,19 +49,19 @@ public class ExecDocumentationExamplesTest extends CamelTestSupport { private static final String TEST_MSG = "Hello Camel Exec!"; - @Produce(uri = "direct:javaVersion") + @Produce("direct:javaVersion") protected ProducerTemplate templateJavaVersion; - @Produce(uri = "direct:javaVersionWorkingDir") + @Produce("direct:javaVersionWorkingDir") protected ProducerTemplate templateJavaVersionWorkingDir; - @Produce(uri = "direct:execAnt") + @Produce("direct:execAnt") protected ProducerTemplate templateExecAnt; - @Produce(uri = "direct:execAntWithOutFile") + @Produce("direct:execAntWithOutFile") protected ProducerTemplate templateExecAntWithOutFile; - @Produce(uri = "direct:wordCount") + @Produce("direct:wordCount") protected ProducerTemplate templateWordCount; @Test diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java index fae8b81..0a769e1 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/CharsetTest.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull; public class CharsetTest extends AbstractJUnit4SpringContextTests { private static final Logger LOG = LoggerFactory.getLogger(FixedLengthTest.class); - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") protected MockEndpoint results; protected String[] expectedItemDesc = {"SOME VALVE", "AN ENGINE", "A BELT", "A ÄöÜ"}; diff --git a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java index 3e5f134..b2c8360 100644 --- a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java +++ b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java @@ -46,10 +46,10 @@ public class AckModeNoneTest extends PubsubTestSupport { + "?ackMode=NONE") private Endpoint pubsubSub; - @EndpointInject(uri = "mock:receiveResult") + @EndpointInject("mock:receiveResult") private MockEndpoint receiveResult; - @Produce(uri = "direct:in") + @Produce("direct:in") private ProducerTemplate producer; @BeforeClass diff --git a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java index b0e6a0d..63c7b2b 100644 --- a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java +++ b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java @@ -50,7 +50,7 @@ public class GroupedExchangeRoundtripTest extends PubsubTestSupport { @EndpointInject("mock:receiveResult") private MockEndpoint receiveResult; - @Produce(uri = "direct:aggregator") + @Produce("direct:aggregator") private ProducerTemplate producer; @BeforeClass diff --git a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubEndpointTest.java b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubEndpointTest.java index 62ef614..e9e1ce6 100644 --- a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubEndpointTest.java +++ b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/unit/PubsubEndpointTest.java @@ -35,10 +35,10 @@ public class PubsubEndpointTest extends PubsubTestSupport { + "&concurrentConsumers=5" + "&maxMessagesPerPoll=2"; - @EndpointInject(uri = "google-pubsub://{{project.id}}:" + SUBSCRIPTION_URI) + @EndpointInject("google-pubsub://{{project.id}}:" + SUBSCRIPTION_URI) private Endpoint from; - @EndpointInject(uri = "direct:to") + @EndpointInject("direct:to") private Endpoint to; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java index ec39f83..ff928f9 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java @@ -27,7 +27,7 @@ import org.junit.Test; */ public class HazelcastSedaConcurrentConsumersTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java index 5a732eb..0bf698e 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java @@ -30,7 +30,7 @@ import org.junit.Test; */ public class HazelcastSedaFIFOTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java index 3188fa7..9d6c96c 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java @@ -27,7 +27,7 @@ import org.junit.Test; public class HazelcastSedaInOnlyTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java index f7aede9d..2d70b6b 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java @@ -27,7 +27,7 @@ import org.junit.Test; public class HazelcastSedaInOutTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java index 4b7aca9..4646f33 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java @@ -38,7 +38,7 @@ public abstract class HazelcastSedaRecoverableConsumerTest extends HazelcastCame @Mock protected TransactionalQueue tqueue; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mock; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java index 8bf36ff..a85eef4 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java @@ -27,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class HazelcastSedaSpringSupportTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java index 31eb3a9..e4026c5 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java @@ -25,7 +25,7 @@ import org.junit.Test; public class HazelcastSedaTransferExchangeTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java index f9241d5..7a63e76 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java @@ -32,16 +32,16 @@ public class HazelcastAggregationRepositoryRecoverableRoutesTest extends Hazelca private static final String DIRECT_ONE = "direct:one"; private static final String DIRECT_TWO = "direct:two"; - @EndpointInject(uri = MOCK_GOTCHA) + @EndpointInject(MOCK_GOTCHA) private MockEndpoint mockGotcha; - @EndpointInject(uri = MOCK_FAILURE) + @EndpointInject(MOCK_FAILURE) private MockEndpoint mockFailure; - @Produce(uri = DIRECT_ONE) + @Produce(DIRECT_ONE) private ProducerTemplate produceOne; - @Produce(uri = DIRECT_TWO) + @Produce(DIRECT_TWO) private ProducerTemplate produceTwo; @Test diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java index 89bf1fb..dfe2831 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java @@ -31,13 +31,13 @@ public class HazelcastAggregationRepositoryRoutesTest extends HazelcastAggregati private static final String DIRECT_ONE = "direct:one"; private static final String DIRECT_TWO = "direct:two"; - @EndpointInject(uri = MOCK_GOTCHA) + @EndpointInject(MOCK_GOTCHA) private MockEndpoint mock; - @Produce(uri = DIRECT_ONE) + @Produce(DIRECT_ONE) private ProducerTemplate produceOne; - @Produce(uri = DIRECT_TWO) + @Produce(DIRECT_TWO) private ProducerTemplate produceTwo; diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerConnectionCloseTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerConnectionCloseTest.java index 50a5d24..d05efbc 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerConnectionCloseTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerConnectionCloseTest.java @@ -34,7 +34,7 @@ import org.junit.Test; */ public class HttpProducerConnectionCloseTest extends BaseHttpTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; private HttpServer localServer; diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerExplicitConnectionCloseTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerExplicitConnectionCloseTest.java index 61220a9..26a1be6 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerExplicitConnectionCloseTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerExplicitConnectionCloseTest.java @@ -32,7 +32,7 @@ import org.junit.Test; */ public class HttpProducerExplicitConnectionCloseTest extends BaseHttpTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; private HttpServer localServer; diff --git a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java index 2fb0e1b..7766bd4 100644 --- a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java +++ b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java @@ -43,19 +43,19 @@ public class ConnectionTest extends CamelTestSupport { private static final String MOCK_SERVER_1 = "mock:testServer1"; - @Produce(uri = DIRECT_SEND_S_1) + @Produce(DIRECT_SEND_S_1) protected ProducerTemplate producerServer1; - @Produce(uri = DIRECT_SEND_C_1) + @Produce(DIRECT_SEND_C_1) protected ProducerTemplate producerClient1; - @EndpointInject(uri = MOCK_CLIENT_1) + @EndpointInject(MOCK_CLIENT_1) protected MockEndpoint testClient1Endpoint; - @EndpointInject(uri = MOCK_CLIENT_2) + @EndpointInject(MOCK_CLIENT_2) protected MockEndpoint testClient2Endpoint; - @EndpointInject(uri = MOCK_SERVER_1) + @EndpointInject(MOCK_SERVER_1) protected MockEndpoint testServer1Endpoint; @Override diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java index b385fc8..20501b8 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java @@ -26,7 +26,7 @@ import org.junit.Before; public class IrcIntegrationTestSupport extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; protected Properties properties; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java index 67f5025..4b05b14 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java @@ -30,7 +30,7 @@ public class IrcMultiChannelRouteTest extends IrcIntegrationTestSupport { protected String body2 = "Message Two"; protected String body3 = "Message Three"; - @EndpointInject(uri = "mock:joined") + @EndpointInject("mock:joined") private MockEndpoint joined; diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java index 430b3a7..93f1913 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java @@ -32,13 +32,13 @@ import org.junit.Test; public class FromQueueToQueueTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; - @EndpointInject(uri = "ironmq:testqueue?client=#ironMock") + @EndpointInject("ironmq:testqueue?client=#ironMock") private IronMQEndpoint queue1; - @EndpointInject(uri = "ironmq:testqueue2?client=#ironMock") + @EndpointInject("ironmq:testqueue2?client=#ironMock") private IronMQEndpoint queue2; @Test diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java index 01abfbd..da53097 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java @@ -28,10 +28,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class IronMQComponentSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java index 3b026ff..d6c0100 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java @@ -35,7 +35,7 @@ public class IronMQComponentTest extends CamelTestSupport { private IronMQEndpoint endpoint; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java index cc16fd6..62f08a8 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java @@ -28,7 +28,7 @@ public class IronMQPreserveHeadersTest extends CamelTestSupport { private IronMQEndpoint endpoint; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java index d5405f7..0e8c11e 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java @@ -30,10 +30,10 @@ public class IronMQComponentTest extends CamelTestSupport { private String projectId = "myIronMQproject"; private String token = "myIronMQToken"; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java index 54fbad1..0284a61 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java @@ -37,10 +37,10 @@ public class IronMQFIFOTest extends CamelTestSupport { private final String ironMQEndpoint = "ironmq:testqueue?projectId=" + projectId + "&token=" + token + "&maxMessagesPerPoll=20&ironMQCloud=https://mq-v3-aws-us-east-1.iron.io"; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Before diff --git a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java index 72d30c2..be92cad 100644 --- a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java +++ b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java @@ -30,10 +30,10 @@ public class IronMQRackspaceComponentTest extends CamelTestSupport { private String projectId = "myIronMQproject"; private String token = "myIronMQToken"; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java index 599f9b7..0138c27 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java @@ -28,10 +28,10 @@ import org.junit.Test; public class ConcurrentJaxbDataFormatSchemaValidationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:marshall") + @EndpointInject("mock:marshall") private MockEndpoint mockMarshall; - @EndpointInject(uri = "mock:unmarshall") + @EndpointInject("mock:unmarshall") private MockEndpoint mockUnmarshall; private int testCount = 1000; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java index 523b641..e2eff56 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java @@ -28,10 +28,10 @@ import org.junit.Test; public class JaxbDataFormatMultipleNamespacesTest extends CamelTestSupport { - @EndpointInject(uri = "mock:marshall") + @EndpointInject("mock:marshall") private MockEndpoint mockMarshall; - @EndpointInject(uri = "mock:unmarshall") + @EndpointInject("mock:unmarshall") private MockEndpoint mockUnmarshall; @Test diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java index 91376a6..4216ca5 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassHeaderTest.java @@ -27,7 +27,7 @@ import org.junit.Test; public class JaxbDataFormatPartClassHeaderTest extends CamelTestSupport { - @EndpointInject(uri = "mock:marshall") + @EndpointInject("mock:marshall") private MockEndpoint mockMarshall; @Test diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java index f697072..4dd3a37 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatPartClassTest.java @@ -27,7 +27,7 @@ import org.junit.Test; public class JaxbDataFormatPartClassTest extends CamelTestSupport { - @EndpointInject(uri = "mock:marshall") + @EndpointInject("mock:marshall") private MockEndpoint mockMarshall; @Test diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java index 7d467ab..42b02f8 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java @@ -39,10 +39,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:marshall") + @EndpointInject("mock:marshall") private MockEndpoint mockMarshall; - @EndpointInject(uri = "mock:unmarshall") + @EndpointInject("mock:unmarshall") private MockEndpoint mockUnmarshall; private JAXBContext jbCtx; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java index 8e75878..42c71dd 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java @@ -29,10 +29,10 @@ import org.junit.Test; public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:marshall") + @EndpointInject("mock:marshall") private MockEndpoint mockMarshall; - @EndpointInject(uri = "mock:unmarshall") + @EndpointInject("mock:unmarshall") private MockEndpoint mockUnmarshall; @Test diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java index 0e67b13..93fafd1 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTestWithObjectFactory.java @@ -34,10 +34,10 @@ import org.junit.Test; public class JaxbDataFormatSchemaValidationTestWithObjectFactory extends CamelTestSupport { - @EndpointInject(uri = "mock:marshall") + @EndpointInject("mock:marshall") private MockEndpoint mockMarshall; - @EndpointInject(uri = "mock:unmarshall") + @EndpointInject("mock:unmarshall") private MockEndpoint mockUnmarshall; private JAXBContext jbCtx; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java index bf8d842..e712e2e 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java @@ -41,16 +41,16 @@ import org.junit.Test; */ public class SplitterAndExceptionRouteTwistIssueTest extends CamelTestSupport { - @Produce(uri = "direct:error") + @Produce("direct:error") protected ProducerTemplate templateError; - @Produce(uri = "direct:error2") + @Produce("direct:error2") protected ProducerTemplate templateError2; - @EndpointInject(uri = "mock:mockReject") + @EndpointInject("mock:mockReject") protected MockEndpoint mockRejectEndpoint; - @EndpointInject(uri = "mock:mock_output") + @EndpointInject("mock:mock_output") protected MockEndpoint mockOutput; @Test diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java index 2390422..d646060 100644 --- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java +++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java @@ -39,10 +39,10 @@ import static org.hamcrest.CoreMatchers.*; //http://camel.apache.org/async.html public class CamelWorkItemHandlerIntegrationTests extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Test diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java index 14da8ae..de16a9a 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java @@ -43,14 +43,14 @@ public class JCacheConfigurationTest extends JCacheComponentTestSupport { private static final Factory> CACHE_LOADER_FACTORY = MyCacheLoader.factory(); @EndpointInject( - uri = "jcache://test-cache" + value = "jcache://test-cache" + "?expiryPolicyFactory=#myExpiryPolicyFactory" + "&cacheWriterFactory=#myCacheWriterFactory" + "&cacheLoaderFactory=#myCacheLoaderFactory" ) JCacheEndpoint from; - @EndpointInject(uri = "mock:to") + @EndpointInject("mock:to") MockEndpoint to; @Override diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java index edd7105..1d07ec2 100644 --- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java +++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java @@ -32,13 +32,13 @@ public class JCacheAggregationRepositoryRoutesTest extends JCacheAggregationRepo private static final String DIRECT_ONE = "direct:one"; private static final String DIRECT_TWO = "direct:two"; - @EndpointInject(uri = MOCK_GOTCHA) + @EndpointInject(MOCK_GOTCHA) private MockEndpoint mock; - @Produce(uri = DIRECT_ONE) + @Produce(DIRECT_ONE) private ProducerTemplate produceOne; - @Produce(uri = DIRECT_TWO) + @Produce(DIRECT_TWO) private ProducerTemplate produceTwo; @Test diff --git a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java index afae768..78f24ff 100644 --- a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java +++ b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java @@ -33,10 +33,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result-foo") + @EndpointInject("mock:result-foo") protected MockEndpoint resultFoo; - @EndpointInject(uri = "mock:result-bar") + @EndpointInject("mock:result-bar") protected MockEndpoint resultBar; @BeforeClass diff --git a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java index da89a05..01a47cb 100644 --- a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java +++ b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java @@ -36,10 +36,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JcloudsSpringComputeTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; - @EndpointInject(uri = "mock:resultlist") + @EndpointInject("mock:resultlist") protected MockEndpoint resultlist; @After diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java index 3215de0..73f6f32 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrGetNodeByIdTest.java @@ -33,7 +33,7 @@ public class JcrGetNodeByIdTest extends JcrRouteTestSupport { public static final Boolean APPROVED = true; private String identifier; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Override diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java index 2ce9aef..28225df 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java @@ -26,7 +26,7 @@ import org.junit.Test; */ public class JdbcAnotherRouteTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcDefaultDataSourceTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcDefaultDataSourceTest.java index 9b047ee..8b38019 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcDefaultDataSourceTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcDefaultDataSourceTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class JdbcDefaultDataSourceTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @SuppressWarnings("rawtypes") diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java index 89a9b93..6cba5e2 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcFix9491Test.java @@ -30,10 +30,10 @@ import org.junit.Test; */ public class JdbcFix9491Test extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate direct; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java index efa92cb..ff9d238 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java @@ -28,7 +28,7 @@ import org.junit.Test; public class JdbcOptionsTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @SuppressWarnings("rawtypes") diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java index b79a9e9..ab723d3 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java @@ -31,7 +31,7 @@ import org.junit.Test; public class JdbcProducerConcurrenctTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java index cc6c789..df98940 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListOutputClassTest.java @@ -25,7 +25,7 @@ import org.junit.Test; public class JdbcProducerOutputTypeSelectListOutputClassTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java index a50f23c..5457f24 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectListTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class JdbcProducerOutputTypeSelectListTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @SuppressWarnings({"unchecked"}) diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java index 9599f75..04cf175 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneOutputClassTest.java @@ -23,7 +23,7 @@ import org.junit.Test; public class JdbcProducerOutputTypeSelectOneOutputClassTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java index 09403f1..b612722 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeSelectOneTest.java @@ -25,7 +25,7 @@ import org.junit.Test; public class JdbcProducerOutputTypeSelectOneTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java index 8dbb408..f09d84f 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerOutputTypeStreamListTest.java @@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; public class JdbcProducerOutputTypeStreamListTest extends AbstractJdbcTestSupport { private static final String QUERY = "select * from customer"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteSplitTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteSplitTest.java index 391990b..503e061 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteSplitTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteSplitTest.java @@ -23,7 +23,7 @@ import org.junit.Test; public class JdbcRouteSplitTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java index 0685df2..8a374c7 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcSpringAnotherRouteTest.java @@ -25,7 +25,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JdbcSpringAnotherRouteTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcTransformSimpleTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcTransformSimpleTest.java index c4ead1d..4de5182 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcTransformSimpleTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcTransformSimpleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; public class JdbcTransformSimpleTest extends AbstractJdbcTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java index 19d7184..8447151 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java @@ -56,7 +56,7 @@ public class SpringHttpsRouteTest { protected transient Logger log = LoggerFactory.getLogger(TestSupport.class); - @EndpointInject(uri = "mock:a") + @EndpointInject("mock:a") MockEndpoint mockEndpoint; @Produce diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java index c4106db..a9831f6 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java @@ -38,7 +38,7 @@ public class JGroupsConsumerTest extends CamelTestSupport { // Routes fixture - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") MockEndpoint mockEndpoint; @Override diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java index 915fbd2..c4b1567 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java @@ -33,10 +33,10 @@ import org.junit.Test; // START SNIPPET: example public class JmsFilterTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Test diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java index 8699151..ad79cae 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java @@ -36,10 +36,10 @@ import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow public class JmsInOutTransferExchangeTest extends CamelTestSupport { - @EndpointInject(uri = "mock:transfer") + @EndpointInject("mock:transfer") protected MockEndpoint transfer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Override diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java index 1eed4f9..4cfd4a4 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java @@ -27,7 +27,7 @@ import org.junit.Test; public class JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockResult; @Test diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java index 638da96..82c31b9 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java @@ -49,7 +49,7 @@ public class JmsRequestReplyManualReplyTest extends CamelTestSupport { return false; } - @Consume(uri = "activemq:queue:foo") + @Consume("activemq:queue:foo") public void doSomething(@Header("JMSReplyTo") Destination jmsReplyTo, @Body String body) throws Exception { assertEquals("Hello World", body); diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java index 0ab6b59..3066fc9 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java @@ -37,7 +37,7 @@ public class JmsRequestReplyManualWithJMSReplyToTest extends CamelTestSupport { return false; } - @Consume(uri = "activemq:queue:foo") + @Consume("activemq:queue:foo") public void doSomething(@Header("JMSReplyTo") Destination jmsReplyTo, @Body String body) throws Exception { assertEquals("Hello World", body); diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java index 1bd6646..ba7dfd0 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java @@ -26,10 +26,10 @@ import org.apache.camel.ProducerTemplate; public class MyBean { private Map headers; private String body; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private ProducerTemplate producer; - @Consume(uri = "activemq:Test.BindingQueue") + @Consume("activemq:Test.BindingQueue") public void myMethod(@Headers Map headers, String body) { this.headers = headers; this.body = body; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java index 1e26523..2e29f25 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java @@ -46,7 +46,7 @@ public class JmsReconnectTest { } - @Produce(uri = "direct:test") + @Produce("direct:test") MyService proxy; /** diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/RoutePojo.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/RoutePojo.java index 028e225..8ca3ce7 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/RoutePojo.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/RoutePojo.java @@ -24,10 +24,10 @@ import org.apache.camel.RecipientList; public class RoutePojo { - @Produce(uri = "activemq:topic:audit") + @Produce("activemq:topic:audit") private ProducerTemplate topic; - @Consume(uri = "activemq:queue:inbox?concurrentConsumers=10") + @Consume("activemq:queue:inbox?concurrentConsumers=10") @RecipientList public String listen(Exchange exchange) { topic.send(exchange); diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java index 031e4d2..9befe29 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyTest.java @@ -30,22 +30,22 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JMXTXUseOriginalBodyTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:end") + @EndpointInject("mock:end") protected MockEndpoint endpoint; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint error; - @EndpointInject(uri = "mock:checkpoint1") + @EndpointInject("mock:checkpoint1") protected MockEndpoint checkpoint1; - @EndpointInject(uri = "mock:checkpoint2") + @EndpointInject("mock:checkpoint2") protected MockEndpoint checkpoint2; - @Produce(uri = "activemq:start") + @Produce("activemq:start") protected ProducerTemplate start; - @Produce(uri = "activemq:broken") + @Produce("activemq:broken") protected ProducerTemplate broken; @Override diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java index 0bd8797..31f9fa3 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java @@ -29,28 +29,28 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JMXTXUseOriginalBodyWithDLCErrorHandlerTest extends JMXTXUseOriginalBodyTest { - @EndpointInject(uri = "mock:end") + @EndpointInject("mock:end") protected MockEndpoint endpoint; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint error; - @EndpointInject(uri = "mock:dead") + @EndpointInject("mock:dead") protected MockEndpoint dead; - @EndpointInject(uri = "mock:checkpoint1") + @EndpointInject("mock:checkpoint1") protected MockEndpoint checkpoint1; - @EndpointInject(uri = "mock:checkpoint2") + @EndpointInject("mock:checkpoint2") protected MockEndpoint checkpoint2; - @Produce(uri = "activemq:start") + @Produce("activemq:start") protected ProducerTemplate start; - @Produce(uri = "activemq:broken") + @Produce("activemq:broken") protected ProducerTemplate broken; - @Produce(uri = "activemq:ok") + @Produce("activemq:ok") protected ProducerTemplate ok; @Override diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java index df98aac..cb4d2d0 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java @@ -29,22 +29,22 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JMXTXUseOriginalBodyWithTXErrorHandlerTest extends JMXTXUseOriginalBodyTest { - @EndpointInject(uri = "mock:end") + @EndpointInject("mock:end") protected MockEndpoint endpoint; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint error; - @EndpointInject(uri = "mock:checkpoint1") + @EndpointInject("mock:checkpoint1") protected MockEndpoint checkpoint1; - @EndpointInject(uri = "mock:checkpoint2") + @EndpointInject("mock:checkpoint2") protected MockEndpoint checkpoint2; - @Produce(uri = "activemq:start") + @Produce("activemq:start") protected ProducerTemplate start; - @Produce(uri = "activemq:broken") + @Produce("activemq:broken") protected ProducerTemplate broken; @Override diff --git a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java index d07bafa..2f115402 100644 --- a/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java +++ b/components/camel-json-validator/src/test/java/org/apache/camel/component/jsonvalidator/ValidatorRouteTest.java @@ -27,13 +27,13 @@ import org.junit.Test; public class ValidatorRouteTest extends CamelTestSupport { - @EndpointInject(uri = "mock:valid") + @EndpointInject("mock:valid") protected MockEndpoint validEndpoint; - @EndpointInject(uri = "mock:finally") + @EndpointInject("mock:finally") protected MockEndpoint finallyEndpoint; - @EndpointInject(uri = "mock:invalid") + @EndpointInject("mock:invalid") protected MockEndpoint invalidEndpoint; @Test diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java index 390bb52..8cfa20e 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerBatchSizeTest.java @@ -31,14 +31,14 @@ public class KafkaConsumerBatchSizeTest extends BaseEmbeddedKafkaTest { public static final String TOPIC = "test"; - @EndpointInject(uri = "kafka:" + TOPIC + @EndpointInject("kafka:" + TOPIC + "?autoOffsetReset=earliest" + "&autoCommitEnable=false" + "&consumerStreams=10" ) private Endpoint from; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint to; private org.apache.kafka.clients.producer.KafkaProducer producer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java index 0c7f984..964efc4 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java @@ -38,13 +38,13 @@ public class KafkaConsumerFullTest extends BaseEmbeddedKafkaTest { public static final String TOPIC = "test"; - @EndpointInject(uri = "kafka:" + TOPIC + @EndpointInject("kafka:" + TOPIC + "?groupId=group1&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer&" + "valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer" + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor") private Endpoint from; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint to; private org.apache.kafka.clients.producer.KafkaProducer producer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerLastRecordHeaderTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerLastRecordHeaderTest.java index 2b79564..6a71eb3 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerLastRecordHeaderTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerLastRecordHeaderTest.java @@ -31,7 +31,7 @@ import org.junit.Test; public class KafkaConsumerLastRecordHeaderTest extends BaseEmbeddedKafkaTest { private static final String TOPIC = "last-record"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; private org.apache.kafka.clients.producer.KafkaProducer producer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerManualCommitTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerManualCommitTest.java index 78c01ae..cda06c9 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerManualCommitTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerManualCommitTest.java @@ -35,11 +35,11 @@ public class KafkaConsumerManualCommitTest extends BaseEmbeddedKafkaTest { public static final String TOPIC = "test"; - @EndpointInject(uri = "kafka:" + TOPIC + @EndpointInject("kafka:" + TOPIC + "?groupId=group1&sessionTimeoutMs=30000&autoCommitEnable=false&allowManualCommit=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor") private Endpoint from; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint to; private org.apache.kafka.clients.producer.KafkaProducer producer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java index 7ec8dcd..c0ae082 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryEmptyTest.java @@ -30,7 +30,7 @@ import org.junit.Test; public class KafkaConsumerOffsetRepositoryEmptyTest extends BaseEmbeddedKafkaTest { private static final String TOPIC = "offset-initialize"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; private org.apache.kafka.clients.producer.KafkaProducer producer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java index 33bf5e5..3a05ee7 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerOffsetRepositoryResumeTest.java @@ -30,7 +30,7 @@ import org.junit.Test; public class KafkaConsumerOffsetRepositoryResumeTest extends BaseEmbeddedKafkaTest { private static final String TOPIC = "offset-resume"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; private org.apache.kafka.clients.producer.KafkaProducer producer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java index 46d3f4f..a3fbc88 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java @@ -32,7 +32,7 @@ import org.junit.Test; public class KafkaConsumerRebalancePartitionRevokeTest extends BaseEmbeddedKafkaTest { private static final String TOPIC = "offset-rebalance"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; private OffsetStateRepository stateRepository; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java index 077d689..349ee71 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java @@ -29,7 +29,7 @@ import org.junit.Test; public class KafkaConsumerRebalanceTest extends BaseEmbeddedKafkaTest { private static final String TOPIC = "offset-rebalance"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; private OffsetStateRepository stateRepository; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTopicIsPatternTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTopicIsPatternTest.java index 0242737..e8d89a6 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTopicIsPatternTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTopicIsPatternTest.java @@ -33,12 +33,12 @@ public class KafkaConsumerTopicIsPatternTest extends BaseEmbeddedKafkaTest { public static final String TOPIC = "test"; public static final String TOPIC_PATTERN = "t\\w\\wt"; - @EndpointInject(uri = "kafka:" + TOPIC_PATTERN + @EndpointInject("kafka:" + TOPIC_PATTERN + "?topicIsPattern=true&groupId=group1&autoOffsetReset=earliest" + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor") private Endpoint from; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint to; private org.apache.kafka.clients.producer.KafkaProducer producer; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java index 1b8b60f..9e11db5 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerFullTest.java @@ -61,40 +61,40 @@ public class KafkaProducerFullTest extends BaseEmbeddedKafkaTest { private static KafkaConsumer stringsConsumerConn; private static KafkaConsumer bytesConsumerConn; - @EndpointInject(uri = "kafka:" + TOPIC_STRINGS + "?requestRequiredAcks=-1") + @EndpointInject("kafka:" + TOPIC_STRINGS + "?requestRequiredAcks=-1") private Endpoint toStrings; - @EndpointInject(uri = "kafka:" + TOPIC_STRINGS + "?requestRequiredAcks=-1&partitionKey=1") + @EndpointInject("kafka:" + TOPIC_STRINGS + "?requestRequiredAcks=-1&partitionKey=1") private Endpoint toStrings2; - @EndpointInject(uri = "kafka:" + TOPIC_INTERCEPTED + "?requestRequiredAcks=-1" + @EndpointInject("kafka:" + TOPIC_INTERCEPTED + "?requestRequiredAcks=-1" + "&interceptorClasses=org.apache.camel.component.kafka.MockProducerInterceptor") private Endpoint toStringsWithInterceptor; - @EndpointInject(uri = "mock:kafkaAck") + @EndpointInject("mock:kafkaAck") private MockEndpoint mockEndpoint; - @EndpointInject(uri = "kafka:" + TOPIC_BYTES + "?requestRequiredAcks=-1" + @EndpointInject("kafka:" + TOPIC_BYTES + "?requestRequiredAcks=-1" + "&serializerClass=org.apache.kafka.common.serialization.ByteArraySerializer&" + "keySerializerClass=org.apache.kafka.common.serialization.ByteArraySerializer") private Endpoint toBytes; - @EndpointInject(uri = "kafka:" + TOPIC_PROPAGATED_HEADERS + "?requestRequiredAcks=-1") + @EndpointInject("kafka:" + TOPIC_PROPAGATED_HEADERS + "?requestRequiredAcks=-1") private Endpoint toPropagatedHeaders; - @Produce(uri = "direct:startStrings") + @Produce("direct:startStrings") private ProducerTemplate stringsTemplate; - @Produce(uri = "direct:startStrings2") + @Produce("direct:startStrings2") private ProducerTemplate stringsTemplate2; - @Produce(uri = "direct:startBytes") + @Produce("direct:startBytes") private ProducerTemplate bytesTemplate; - @Produce(uri = "direct:startTraced") + @Produce("direct:startTraced") private ProducerTemplate interceptedTemplate; - @Produce(uri = "direct:propagatedHeaders") + @Produce("direct:propagatedHeaders") private ProducerTemplate propagatedHeadersTemplate; @Override diff --git a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java index 0ed46c6..5f73155 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryEagerTest.java @@ -41,10 +41,10 @@ public class KafkaIdempotentRepositoryEagerTest extends CamelTestSupport { private KafkaIdempotentRepository kafkaIdempotentRepository; - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint mockOut; - @EndpointInject(uri = "mock:before") + @EndpointInject("mock:before") private MockEndpoint mockBefore; @Override diff --git a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java index e645c8c..1b78576 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepositoryNonEagerTest.java @@ -41,10 +41,10 @@ public class KafkaIdempotentRepositoryNonEagerTest extends CamelTestSupport { private KafkaIdempotentRepository kafkaIdempotentRepository; - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint mockOut; - @EndpointInject(uri = "mock:before") + @EndpointInject("mock:before") private MockEndpoint mockBefore; @Override diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java index c297000..fc3f7a3 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java @@ -38,7 +38,7 @@ import org.junit.Test; @Ignore("Requires a running Kubernetes Cluster") public class KubernetesNamespacesConsumerTest extends KubernetesTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; @Test diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java index 1e9f802..5646c7a 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java @@ -41,7 +41,7 @@ import org.junit.Test; @Ignore("Requires a running Kubernetes Cluster") public class KubernetesNodesConsumerTest extends KubernetesTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; @Test diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java index a6b92a3..c7de7a8 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java @@ -41,7 +41,7 @@ import org.junit.Test; @Ignore("Requires a running Kubernetes Cluster") public class KubernetesPodsConsumerTest extends KubernetesTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; @Test diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java index 2be020f..41f7e93 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java @@ -39,7 +39,7 @@ import org.junit.Test; @Ignore("Requires a running Kubernetes Cluster") public class KubernetesReplicationControllersConsumerTest extends KubernetesTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; @Test diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java index 0f0e6c7..7a04505 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java @@ -41,7 +41,7 @@ import org.junit.Test; @Ignore("Requires a running Kubernetes Cluster") public class KubernetesServicesConsumerTest extends KubernetesTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; @Test diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java index 3e2548d..ecd4d44 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java @@ -56,19 +56,19 @@ import static org.mockito.Mockito.when; @MockEndpoints public class CounterRouteTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in-1") + @Produce("direct:in-1") private ProducerTemplate producer1; - @Produce(uri = "direct:in-2") + @Produce("direct:in-2") private ProducerTemplate producer2; - @Produce(uri = "direct:in-3") + @Produce("direct:in-3") private ProducerTemplate producer3; - @Produce(uri = "direct:in-4") + @Produce("direct:in-4") private ProducerTemplate producer4; private MetricRegistry mockRegistry; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java index 777ba8c..24666e0 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java @@ -63,13 +63,13 @@ public class GaugeRouteTest { private static SortedMap mockGauges = new TreeMap<>(); - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in-1") + @Produce("direct:in-1") private ProducerTemplate producer1; - @Produce(uri = "direct:in-2") + @Produce("direct:in-2") private ProducerTemplate producer2; private MetricRegistry mockRegistry; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java index 9ef22ed..3a6484d 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java @@ -51,10 +51,10 @@ import static org.mockito.Mockito.when; @MockEndpoints public class HistogramRouteTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in") + @Produce("direct:in") private ProducerTemplate producer; private MetricRegistry mockRegistry; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java index c07ddc8..daca0a8 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java @@ -51,13 +51,13 @@ import static org.mockito.Mockito.when; @MockEndpoints public class MeterRouteTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in-1") + @Produce("direct:in-1") private ProducerTemplate producer1; - @Produce(uri = "direct:in-2") + @Produce("direct:in-2") private ProducerTemplate producer2; private MetricRegistry mockRegistry; diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java index 6dc91bc..261a7e5 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java @@ -45,10 +45,10 @@ import static org.mockito.Mockito.when; @MockEndpoints public class MetricComponentSpringTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in") + @Produce("direct:in") private ProducerTemplate producer; @Configuration diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java index 7dda6f9..2cf0f20 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java @@ -33,10 +33,10 @@ import static org.apache.camel.component.metrics.MetricsConstants.HEADER_PREFIX; public class MetricsComponentRouteTest extends CamelTestSupport { - @Produce(uri = "direct:start-1") + @Produce("direct:start-1") protected ProducerTemplate template1; - @Produce(uri = "direct:start-2") + @Produce("direct:start-2") protected ProducerTemplate template2; @Test diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java index 609dc96..de4c2c7 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java @@ -51,13 +51,13 @@ import static org.mockito.Mockito.when; @MockEndpoints public class TimerRouteTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in-1") + @Produce("direct:in-1") private ProducerTemplate producer1; - @Produce(uri = "direct:in-2") + @Produce("direct:in-2") private ProducerTemplate producer2; private MetricRegistry mockRegistry; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java index 18e35a8..59e7055 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/CounterRouteTest.java @@ -48,19 +48,19 @@ import static org.junit.Assert.assertEquals; @MockEndpoints public class CounterRouteTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in-1") + @Produce("direct:in-1") private ProducerTemplate producer1; - @Produce(uri = "direct:in-2") + @Produce("direct:in-2") private ProducerTemplate producer2; - @Produce(uri = "direct:in-3") + @Produce("direct:in-3") private ProducerTemplate producer3; - @Produce(uri = "direct:in-4") + @Produce("direct:in-4") private ProducerTemplate producer4; private MeterRegistry registry; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java index c5de096..ab17d75 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/DistributionSummaryRouteTest.java @@ -48,13 +48,13 @@ import static org.junit.Assert.assertEquals; @MockEndpoints public class DistributionSummaryRouteTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in-1") + @Produce("direct:in-1") private ProducerTemplate producer1; - @Produce(uri = "direct:in-2") + @Produce("direct:in-2") private ProducerTemplate producer2; private MeterRegistry registry; diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java index 0ec0056..85ccc6a 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MetricComponentSpringTest.java @@ -46,10 +46,10 @@ import static org.mockito.Mockito.when; @MockEndpoints public class MetricComponentSpringTest { - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in") + @Produce("direct:in") private ProducerTemplate producer; @Configuration diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java index 045c016..762046f 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentRouteTest.java @@ -28,7 +28,7 @@ import org.junit.Test; public class MicrometerComponentRouteTest extends CamelTestSupport { - @Produce(uri = "direct:start-1") + @Produce("direct:start-1") protected ProducerTemplate template1; @Test diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java index a670f11..71badd7 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/TimerRouteTest.java @@ -51,16 +51,16 @@ public class TimerRouteTest { private static final long DELAY = 20L; - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint endpoint; - @Produce(uri = "direct:in-1") + @Produce("direct:in-1") private ProducerTemplate producer1; - @Produce(uri = "direct:in-2") + @Produce("direct:in-2") private ProducerTemplate producer2; - @Produce(uri = "direct:in-3") + @Produce("direct:in-3") private ProducerTemplate producer3; private MeterRegistry registry; diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java index f02a228..ed855f2 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java @@ -62,16 +62,16 @@ public class MonitorItemMultiConnectionsCertTest extends AbstractMiloServerTest private static final String MOCK_TEST_2 = "mock:test2"; private static final String MOCK_TEST_3 = "mock:test3"; - @EndpointInject(uri = MOCK_TEST_1) + @EndpointInject(MOCK_TEST_1) protected MockEndpoint test1Endpoint; - @EndpointInject(uri = MOCK_TEST_2) + @EndpointInject(MOCK_TEST_2) protected MockEndpoint test2Endpoint; - @EndpointInject(uri = MOCK_TEST_3) + @EndpointInject(MOCK_TEST_3) protected MockEndpoint test3Endpoint; - @Produce(uri = DIRECT_START_1) + @Produce(DIRECT_START_1) protected ProducerTemplate producer1; @Override diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java index d3170df..dcccaf9 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java @@ -47,16 +47,16 @@ public class MonitorItemMultiConnectionsTest extends AbstractMiloServerTest { private static final String MOCK_TEST_2 = "mock:test2"; private static final String MOCK_TEST_3 = "mock:test3"; - @EndpointInject(uri = MOCK_TEST_1) + @EndpointInject(MOCK_TEST_1) protected MockEndpoint test1Endpoint; - @EndpointInject(uri = MOCK_TEST_2) + @EndpointInject(MOCK_TEST_2) protected MockEndpoint test2Endpoint; - @EndpointInject(uri = MOCK_TEST_3) + @EndpointInject(MOCK_TEST_3) protected MockEndpoint test3Endpoint; - @Produce(uri = DIRECT_START_1) + @Produce(DIRECT_START_1) protected ProducerTemplate producer1; @Override diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java index 761709f..b4d9b3e 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java @@ -40,10 +40,10 @@ public class MonitorItemTest extends AbstractMiloServerTest { private static final String MOCK_TEST_1 = "mock:test1"; - @EndpointInject(uri = MOCK_TEST_1) + @EndpointInject(MOCK_TEST_1) protected MockEndpoint test1Endpoint; - @Produce(uri = DIRECT_START_1) + @Produce(DIRECT_START_1) protected ProducerTemplate producer1; @Override diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java index d9553eb..43214b3 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java @@ -57,22 +57,22 @@ public class WriteClientTest extends AbstractMiloServerTest { private static final String MOCK_TEST_1 = "mock:test1"; private static final String MOCK_TEST_2 = "mock:test2"; - @EndpointInject(uri = MOCK_TEST_1) + @EndpointInject(MOCK_TEST_1) protected MockEndpoint test1Endpoint; - @EndpointInject(uri = MOCK_TEST_2) + @EndpointInject(MOCK_TEST_2) protected MockEndpoint test2Endpoint; - @Produce(uri = DIRECT_START_1) + @Produce(DIRECT_START_1) protected ProducerTemplate producer1; - @Produce(uri = DIRECT_START_2) + @Produce(DIRECT_START_2) protected ProducerTemplate producer2; - @Produce(uri = DIRECT_START_3) + @Produce(DIRECT_START_3) protected ProducerTemplate producer3; - @Produce(uri = DIRECT_START_4) + @Produce(DIRECT_START_4) protected ProducerTemplate producer4; @Override diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java index 5ebcfab..56ef9ee 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java @@ -54,7 +54,7 @@ public class CallClientTest extends AbstractMiloServerTest { private static final String MILO_CLIENT_ITEM_C1_1 = MILO_CLIENT_BASE_C1 + "?node=" + nodeValue(MockNamespace.URI, MockNamespace.FOLDER_ID) + "&method=" + nodeValue(MockNamespace.URI, "id1") + "&overrideHost=true"; - @Produce(uri = DIRECT_START_1) + @Produce(DIRECT_START_1) protected ProducerTemplate producer1; private OpcUaServer server; diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java index acd8ebe..b835f66 100644 --- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java +++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java @@ -38,7 +38,7 @@ public class ServerLocalTest extends CamelTestSupport { private static final String MOCK_TEST = "mock:test"; - @EndpointInject(uri = MOCK_TEST) + @EndpointInject(MOCK_TEST) protected MockEndpoint testEndpoint; @Before diff --git a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java index 4f727e6..54925ce 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java @@ -36,7 +36,7 @@ public class MllpTcpServerConsumerLenientBindTest extends CamelTestSupport { @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; ServerSocket portBlocker; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpConfigurationBeanBlueprintTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpConfigurationBeanBlueprintTest.java index 1a0e419..e8d2d32 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpConfigurationBeanBlueprintTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpConfigurationBeanBlueprintTest.java @@ -29,7 +29,7 @@ import org.apache.camel.util.KeyValueHolder; import org.junit.Test; public class MllpConfigurationBeanBlueprintTest extends CamelBlueprintTestSupport { - @EndpointInject(uri = "mock://target") + @EndpointInject("mock://target") MockEndpoint received; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java index 6420a96..975f605 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java @@ -41,10 +41,10 @@ public class MllpProducerConsumerLoopbackTest extends CamelTestSupport { int mllpPort = AvailablePortFinder.getNextAvailable(); String mllpHost = "localhost"; - @EndpointInject(uri = "direct://source") + @EndpointInject("direct://source") ProducerTemplate source; - @EndpointInject(uri = "mock://acknowledged") + @EndpointInject("mock://acknowledged") MockEndpoint acknowledged; @BeforeClass diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerBlueprintTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerBlueprintTest.java index 6e14772..c043a65 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerBlueprintTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerBlueprintTest.java @@ -44,19 +44,19 @@ public class MllpTcpClientProducerBlueprintTest extends CamelBlueprintTestSuppor @Rule public MllpServerResource mllpServer = new MllpServerResource("0.0.0.0", AvailablePortFinder.getNextAvailable()); - @EndpointInject(uri = MOCK_ACKNOWLEDGED_URI) + @EndpointInject(MOCK_ACKNOWLEDGED_URI) MockEndpoint acknowledged; - @EndpointInject(uri = MOCK_TIMEOUT_URI) + @EndpointInject(MOCK_TIMEOUT_URI) MockEndpoint timeout; - @EndpointInject(uri = MOCK_AE_EX_URI) + @EndpointInject(MOCK_AE_EX_URI) MockEndpoint ae; - @EndpointInject(uri = MOCK_AR_EX_URI) + @EndpointInject(MOCK_AR_EX_URI) MockEndpoint ar; - @EndpointInject(uri = MOCK_FRAME_EX_URI) + @EndpointInject(MOCK_FRAME_EX_URI) MockEndpoint frame; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java index 725fd29..637864d 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java @@ -38,22 +38,22 @@ public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport { @Rule public MllpServerResource mllpServer = new MllpServerResource("localhost", AvailablePortFinder.getNextAvailable()); - @EndpointInject(uri = "direct://source") + @EndpointInject("direct://source") ProducerTemplate source; - @EndpointInject(uri = "mock://target") + @EndpointInject("mock://target") MockEndpoint target; - @EndpointInject(uri = "mock://complete") + @EndpointInject("mock://complete") MockEndpoint complete; - @EndpointInject(uri = "mock://write-ex") + @EndpointInject("mock://write-ex") MockEndpoint writeEx; - @EndpointInject(uri = "mock://connect-ex") + @EndpointInject("mock://connect-ex") MockEndpoint connectEx; - @EndpointInject(uri = "mock://acknowledgement-ex") + @EndpointInject("mock://acknowledgement-ex") MockEndpoint acknowledgementEx; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java index 93c7003..e26c76c 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java @@ -44,16 +44,16 @@ public class MllpTcpClientProducerIdleConnectionTimeoutTest extends CamelTestSup @Rule public MllpServerResource mllpServer = new MllpServerResource("localhost", AvailablePortFinder.getNextAvailable()); - @EndpointInject(uri = "direct://source") + @EndpointInject("direct://source") ProducerTemplate source; - @EndpointInject(uri = "mock://complete") + @EndpointInject("mock://complete") MockEndpoint complete; - @EndpointInject(uri = "mock://write-ex") + @EndpointInject("mock://write-ex") MockEndpoint writeEx; - @EndpointInject(uri = "mock://receive-ex") + @EndpointInject("mock://receive-ex") MockEndpoint receiveEx; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java index 4386fa4..69be94b 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java @@ -95,7 +95,7 @@ public class MllpTcpServerCharsetTest extends CamelTestSupport { @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = TARGET_URI) + @EndpointInject(TARGET_URI) MockEndpoint target; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java index c849dc7..6a6b31d 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java @@ -36,7 +36,7 @@ public class MllpTcpServerConsumerBindTimeoutTest extends CamelTestSupport { @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBlueprintTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBlueprintTest.java index 55b68ee..6cc6cb3 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBlueprintTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBlueprintTest.java @@ -39,7 +39,7 @@ public class MllpTcpServerConsumerBlueprintTest extends CamelBlueprintTestSuppor @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = RECEIVED_URI) + @EndpointInject(RECEIVED_URI) MockEndpoint received; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java index f738ce1..0faa6d0 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java @@ -37,7 +37,7 @@ public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport { public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java index 6840b04..975dd8a 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java @@ -35,10 +35,10 @@ public class MllpTcpServerConsumerMessageHeadersTest extends CamelTestSupport { @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; - @EndpointInject(uri = "mock://on-completion-result") + @EndpointInject("mock://on-completion-result") MockEndpoint onCompletionResult; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java index f23416b..33d1b24 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java @@ -38,7 +38,7 @@ public class MllpTcpServerConsumerMulitpleTcpPacketTest extends CamelTestSupport @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java index b2bde4b..59ab2cf 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java @@ -42,13 +42,13 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport { @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; - @EndpointInject(uri = "mock://on-complete-only") + @EndpointInject("mock://on-complete-only") MockEndpoint complete; - @EndpointInject(uri = "mock://on-failure-only") + @EndpointInject("mock://on-failure-only") MockEndpoint failure; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java index e02df6e..48f603a 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java @@ -73,26 +73,26 @@ public abstract class TcpClientProducerEndOfDataAndValidationTestSupport extends @Rule public MllpServerResource mllpServer = new MllpServerResource("localhost", AvailablePortFinder.getNextAvailable()); - @EndpointInject(uri = "direct://source") + @EndpointInject("direct://source") protected ProducerTemplate source; - @EndpointInject(uri = "mock://aa-ack") + @EndpointInject("mock://aa-ack") protected MockEndpoint aa; - @EndpointInject(uri = "mock://ae-nack") + @EndpointInject("mock://ae-nack") protected MockEndpoint ae; - @EndpointInject(uri = "mock://ar-nack") + @EndpointInject("mock://ar-nack") protected MockEndpoint ar; - @EndpointInject(uri = "mock://invalid-ack") + @EndpointInject("mock://invalid-ack") protected MockEndpoint invalid; - @EndpointInject(uri = "mock://ack-receive-error") + @EndpointInject("mock://ack-receive-error") protected MockEndpoint ackReceiveError; - @EndpointInject(uri = "mock://ack-timeout-error") + @EndpointInject("mock://ack-timeout-error") protected MockEndpoint ackTimeoutError; - @EndpointInject(uri = "mock://failed") + @EndpointInject("mock://failed") protected MockEndpoint failed; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java index 4c21892..98dec55 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java @@ -43,20 +43,20 @@ public abstract class TcpServerConsumerAcknowledgementTestSupport extends CamelT @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; - @EndpointInject(uri = "mock://on-complete-only") + @EndpointInject("mock://on-complete-only") MockEndpoint complete; - @EndpointInject(uri = "mock://on-failure-only") + @EndpointInject("mock://on-failure-only") MockEndpoint failure; - @EndpointInject(uri = "mock://invalid-ack-ex") + @EndpointInject("mock://invalid-ack-ex") MockEndpoint invalidAckEx; - @EndpointInject(uri = "mock://ack-generation-ex") + @EndpointInject("mock://ack-generation-ex") MockEndpoint ackGenerationEx; @Override diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java index 5b7c1ec..fcf1f6e 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java @@ -45,13 +45,13 @@ public abstract class TcpServerConsumerEndOfDataAndValidationTestSupport extends @Rule public MllpClientResource mllpClient = new MllpClientResource(); - @EndpointInject(uri = "mock://complete") + @EndpointInject("mock://complete") MockEndpoint complete; - @EndpointInject(uri = "mock://failed") + @EndpointInject("mock://failed") MockEndpoint failed; - @EndpointInject(uri = "mock://invalid-ex") + @EndpointInject("mock://invalid-ex") MockEndpoint invalid; int expectedCompleteCount; diff --git a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java index 7ff63bf..b07b2f2 100644 --- a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java +++ b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/MongoDbStopEndpointTest.java @@ -27,7 +27,7 @@ public class MongoDbStopEndpointTest extends AbstractMongoDbTest { private static final String MY_ID = "myId"; - @EndpointInject(uri = "mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert") + @EndpointInject("mongodb3:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert") MongoDbEndpoint endpoint; @Override diff --git a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBrigeTest.java b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBrigeTest.java index 792fdf8..7bd0ba3 100644 --- a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBrigeTest.java +++ b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTBrigeTest.java @@ -29,13 +29,13 @@ import org.junit.Test; */ public class MQTTBrigeTest extends MQTTBaseTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; - @Produce(uri = "direct:startWorkaround") + @Produce("direct:startWorkaround") protected ProducerTemplate workaroundTemplate; @Test diff --git a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java index 1440a7a..f7dfcec 100644 --- a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java +++ b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java @@ -39,13 +39,13 @@ public class MQTTDuplicatesTest extends MQTTBaseTest { private static final int MESSAGE_COUNT = 50; private static final int WAIT_MILLIS = 100; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:withClientID") + @Produce("direct:withClientID") protected ProducerTemplate templateWithClientID; - @Produce(uri = "direct:withoutClientID") + @Produce("direct:withoutClientID") protected ProducerTemplate templateWithoutClientID; @Test diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java index dfa972b..7047183 100644 --- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java +++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java @@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory; */ public class MustacheComponentTest extends CamelTestSupport { - @EndpointInject(uri = "mock:endSimple") + @EndpointInject("mock:endSimple") protected MockEndpoint endSimpleMock; - @Produce(uri = "direct:startSimple") + @Produce("direct:startSimple") protected ProducerTemplate startSimpleProducerTemplate; /** diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java index 34d3089..27e0940 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java @@ -30,7 +30,7 @@ public class NettyHttpHeaderFilterStrategyRemovalTest extends BaseNettyTest { NettyHttpHeaderFilterStrategy headerFilterStrategy = new NettyHttpHeaderFilterStrategy(); - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") MockEndpoint mockEndpoint; @Test diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java index 18e2bf1..a51d022 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java @@ -28,7 +28,7 @@ import static org.apache.camel.Exchange.HTTP_RAW_QUERY; public class NettyHttpRawQueryTest extends BaseNettyTest { - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") MockEndpoint mockEndpoint; @Test diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java index 406df0c..c449dcd 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java @@ -37,7 +37,7 @@ public class SpringNettyHttpBasicAuthTest extends Assert { @Produce private ProducerTemplate template; - @EndpointInject(uri = "mock:input") + @EndpointInject("mock:input") private MockEndpoint mockEndpoint; private Integer port; diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java index 97a3f91..cf4c549 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java @@ -38,7 +38,7 @@ public class SpringNettyHttpSSLTest extends Assert { @Produce private ProducerTemplate template; - @EndpointInject(uri = "mock:input") + @EndpointInject("mock:input") private MockEndpoint mockEndpoint; private Integer port; diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java index 8bd0f18..91b8fbe 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java @@ -56,10 +56,10 @@ public class NettyRedeliveryTest extends CamelTestSupport { private ExecutorService listener = Executors.newSingleThreadExecutor(); - @EndpointInject(uri = "mock:exception") + @EndpointInject("mock:exception") private MockEndpoint exception; - @EndpointInject(uri = "mock:downstream") + @EndpointInject("mock:downstream") private MockEndpoint downstream; private Deque tasks = new LinkedBlockingDeque<>(); diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java index d007592..00e97ad 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java @@ -30,7 +30,7 @@ import org.apache.camel.util.IOHelper; import org.junit.Test; public class NettyTCPAsyncTest extends BaseNettyTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; private void sendFile(String uri) throws Exception { diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java index c049564..7dc2b0d 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java @@ -36,7 +36,7 @@ import org.junit.Test; * {@link io.netty.util.concurrent.BlockingOperationException} is thrown by netty. */ public class NettyTCPChainedTest extends BaseNettyTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; private void sendFile(String uri) throws Exception { diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java index e4bf30d..8d836d9 100644 --- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java +++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java @@ -33,7 +33,7 @@ public class NsqConsumerTest extends NsqTestSupport { private static final int NUMBER_OF_MESSAGES = 10000; private static final String TOPIC = "test"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResultEndpoint; @Test diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java index 9a552c3..91a316a 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java @@ -39,10 +39,10 @@ public class InstallOpenTracingTracerRuleTest extends CamelTestSupport { private static MockTracer tracer = new MockTracer(Propagator.TEXT_MAP); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Before diff --git a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java index cb50d02..5d146df 100644 --- a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java +++ b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java @@ -35,10 +35,10 @@ public class PahoComponentTest extends CamelTestSupport { MqttConnectOptions connectOptions = new MqttConnectOptions(); - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") MockEndpoint mock; - @EndpointInject(uri = "mock:testCustomizedPaho") + @EndpointInject("mock:testCustomizedPaho") MockEndpoint testCustomizedPahoMock; BrokerService broker; diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java index 0631ad0..feeb7e3 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.instanceOf; public class PdfAppendTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Override diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java index bea65a0..81541de 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.instanceOf; public class PdfCreationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Override diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java index 4b10174..0648c80 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.instanceOf; public class PdfTextExtractionTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java index 9f404ba..ae8c954 100644 --- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java +++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventPubSubIntegrationTest.java @@ -25,16 +25,16 @@ import org.junit.Test; public class PgEventPubSubIntegrationTest extends AbstractPgEventIntegrationTest { - @EndpointInject(uri = "pgevent://{{host}}:{{port}}/{{database}}/testchannel?user={{userName}}&pass={{password}}") + @EndpointInject("pgevent://{{host}}:{{port}}/{{database}}/testchannel?user={{userName}}&pass={{password}}") private Endpoint subscribeEndpoint; - @EndpointInject(uri = "pgevent://{{host}}:{{port}}/{{database}}/testchannel?user={{userName}}&pass={{password}}") + @EndpointInject("pgevent://{{host}}:{{port}}/{{database}}/testchannel?user={{userName}}&pass={{password}}") private Endpoint notifyEndpoint; - @EndpointInject(uri = "timer://test?repeatCount=1&period=1") + @EndpointInject("timer://test?repeatCount=1&period=1") private Endpoint timerEndpoint; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockEndpoint; @Test diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java index 41bb96a..8a6547e 100644 --- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java +++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java @@ -30,16 +30,16 @@ import org.junit.Test; public class PgEventWithDefinedDatasourceIntegrationTest extends AbstractPgEventIntegrationTest { - @EndpointInject(uri = "pgevent:///{{database}}/testchannel?datasource=#pgDataSource") + @EndpointInject("pgevent:///{{database}}/testchannel?datasource=#pgDataSource") private Endpoint subscribeEndpoint; - @EndpointInject(uri = "pgevent:///{{database}}/testchannel?datasource=#pgDataSource") + @EndpointInject("pgevent:///{{database}}/testchannel?datasource=#pgDataSource") private Endpoint notifyEndpoint; - @EndpointInject(uri = "timer://test?repeatCount=1&period=1") + @EndpointInject("timer://test?repeatCount=1&period=1") private Endpoint timerEndpoint; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockEndpoint; @Override diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java index a0c0b8c..05b8021 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubFireTest.java @@ -31,7 +31,7 @@ import static org.apache.camel.component.pubnub.PubNubConstants.TIMETOKEN; public class PubNubFireTest extends PubNubTestBase { private String endpoint = "pubnub:someChannel?operation=fire&pubnub=#pubnub"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockResult; @Test diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java index 1a6ff54..a3864ea 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPresenceTest.java @@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.equalTo; public class PubNubPresenceTest extends PubNubTestBase { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockResult; @Test diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java index a2c4577..614858e 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubPublishTest.java @@ -33,7 +33,7 @@ import static org.apache.camel.component.pubnub.PubNubConstants.TIMETOKEN; public class PubNubPublishTest extends PubNubTestBase { private String endpoint = "pubnub:someChannel?pubnub=#pubnub"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockResult; @Test diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java index 2defb91..27aacc9 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubSubscriberTest.java @@ -29,7 +29,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; public class PubNubSubscriberTest extends PubNubTestBase { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockResult; @Test diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java index 137b968..1e034f9 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java @@ -81,7 +81,7 @@ public final class PubNubSensor2Example { } public static class DataProcessorBean { - @EndpointInject(uri = "pubnub:iot?uuid=master&subscribeKey=" + PUBNUB_SUBSCRIBE_KEY) + @EndpointInject("pubnub:iot?uuid=master&subscribeKey=" + PUBNUB_SUBSCRIBE_KEY) private static ProducerTemplate template; public static String getUnicastChannelOfDevice() { diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java index ca65481..31d555c 100644 --- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java +++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarProducerInTest.java @@ -47,7 +47,7 @@ public class PulsarProducerInTest extends PulsarTestSupport { ) private Endpoint from; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint to; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQBasicIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQBasicIntTest.java index cf188f1..324aaca 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQBasicIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQBasicIntTest.java @@ -26,13 +26,13 @@ public class RabbitMQBasicIntTest extends AbstractRabbitMQIntTest { // Startup RabbitMQ via Docker (see readme.txt in camel-rabbitmq folder) - @EndpointInject(uri = "rabbitmq:localhost:5672/foo?username=cameltest&password=cameltest") + @EndpointInject("rabbitmq:localhost:5672/foo?username=cameltest&password=cameltest") private Endpoint foo; - @EndpointInject(uri = "rabbitmq:localhost:5672/bar?username=cameltest&password=cameltest") + @EndpointInject("rabbitmq:localhost:5672/bar?username=cameltest&password=cameltest") private Endpoint bar; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java index 4b7e727..f6711a1 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java @@ -40,16 +40,16 @@ public class RabbitMQConsumerIntTest extends AbstractRabbitMQIntTest { private static final String QUEUE = "q1"; private static final String MSG = "hello world"; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest") + @EndpointInject("rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest") private Endpoint from; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint to; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + HEADERS_EXCHANGE + "?username=cameltest&password=cameltest&exchangeType=headers&queue=" + QUEUE + "&args=#args") + @EndpointInject("rabbitmq:localhost:5672/" + HEADERS_EXCHANGE + "?username=cameltest&password=cameltest&exchangeType=headers&queue=" + QUEUE + "&args=#args") private Endpoint headersExchangeWithQueue; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + "ex7" + "?username=cameltest&password=cameltest&exchangeType=headers&autoDelete=false&durable=true&queue=q7&arg.binding.fizz=buzz") + @EndpointInject("rabbitmq:localhost:5672/" + "ex7" + "?username=cameltest&password=cameltest&exchangeType=headers&autoDelete=false&durable=true&queue=q7&arg.binding.fizz=buzz") private Endpoint headersExchangeWithQueueDefiniedInline; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java index 8d95897..43dae5a 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java @@ -45,7 +45,7 @@ public class RabbitMQConsumerIntTestReplyTo extends AbstractRabbitMQIntTest { protected Channel channel; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest&routingKey=" + ROUTING_KEY) + @EndpointInject("rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest&routingKey=" + ROUTING_KEY) private Endpoint from; private Connection connection; diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java index dda68c5..b9b8e2f 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java @@ -49,24 +49,24 @@ public class RabbitMQInOutIntTest extends AbstractRabbitMQIntTest { private static final String EXCHANGE = "ex5"; private static final String EXCHANGE_NO_ACK = "ex5.noAutoAck"; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; - @Produce(uri = "direct:rabbitMQ") + @Produce("direct:rabbitMQ") protected ProducerTemplate directProducer; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE + "?threadPoolSize=1&exchangeType=direct&username=cameltest&password=cameltest" + @EndpointInject("rabbitmq:localhost:5672/" + EXCHANGE + "?threadPoolSize=1&exchangeType=direct&username=cameltest&password=cameltest" + "&autoAck=true&queue=q4&routingKey=" + ROUTING_KEY + "&transferException=true&requestTimeout=" + TIMEOUT_MS) private Endpoint rabbitMQEndpoint; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE_NO_ACK + "?threadPoolSize=1&exchangeType=direct&username=cameltest&password=cameltest" + @EndpointInject("rabbitmq:localhost:5672/" + EXCHANGE_NO_ACK + "?threadPoolSize=1&exchangeType=direct&username=cameltest&password=cameltest" + "&autoAck=false&autoDelete=false&durable=false&queue=q5&routingKey=" + ROUTING_KEY + "&transferException=true&requestTimeout=" + TIMEOUT_MS + "&args=#args") private Endpoint noAutoAckEndpoint; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLoadIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLoadIntTest.java index c70cda5..1901d4f 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLoadIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLoadIntTest.java @@ -41,18 +41,18 @@ public class RabbitMQLoadIntTest extends AbstractRabbitMQIntTest { private static final int CONSUMER_COUNT = 10; private static final int MESSAGE_COUNT = 100; - @Produce(uri = "direct:rabbitMQ") + @Produce("direct:rabbitMQ") protected ProducerTemplate directProducer; - @EndpointInject(uri = "rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest" + @EndpointInject("rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest" + "&queue=q4&routingKey=" + ROUTING_KEY + "&threadPoolSize=" + (CONSUMER_COUNT + 5) + "&concurrentConsumers=" + CONSUMER_COUNT) private Endpoint rabbitMQEndpoint; - @EndpointInject(uri = "mock:producing") + @EndpointInject("mock:producing") private MockEndpoint producingMockEndpoint; - @EndpointInject(uri = "mock:consuming") + @EndpointInject("mock:consuming") private MockEndpoint consumingMockEndpoint; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java index 4e3e9b3..617cbd9 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java @@ -54,25 +54,25 @@ public class RabbitMQProducerIntTest extends AbstractRabbitMQIntTest { private static final String GUARANTEED_DELIVERY_BAD_ROUTE_NOT_MANDATORY_URI = String.format(BASIC_URI_FORMAT, EXCHANGE, "route2") + "&guaranteedDeliveries=true"; private static final String GUARANTEED_DELIVERY_BAD_ROUTE_URI = String.format(BASIC_URI_FORMAT, EXCHANGE, "route2") + "&mandatory=true&guaranteedDeliveries=true"; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; - @Produce(uri = "direct:start-allow-null-headers") + @Produce("direct:start-allow-null-headers") protected ProducerTemplate templateAllowNullHeaders; - @Produce(uri = "direct:start-with-confirms") + @Produce("direct:start-with-confirms") protected ProducerTemplate templateWithConfirms; - @Produce(uri = "direct:start-with-confirms-bad-route") + @Produce("direct:start-with-confirms-bad-route") protected ProducerTemplate templateWithConfirmsAndBadRoute; - @Produce(uri = "direct:start-with-guaranteed-delivery") + @Produce("direct:start-with-guaranteed-delivery") protected ProducerTemplate templateWithGuranteedDelivery; - @Produce(uri = "direct:start-with-guaranteed-delivery-bad-route") + @Produce("direct:start-with-guaranteed-delivery-bad-route") protected ProducerTemplate templateWithGuranteedDeliveryAndBadRoute; - @Produce(uri = "direct:start-with-guaranteed-delivery-bad-route-but-not-mandatory") + @Produce("direct:start-with-guaranteed-delivery-bad-route-but-not-mandatory") protected ProducerTemplate templateWithGuranteedDeliveryBadRouteButNotMandatory; private Connection connection; diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java index fdbc505..7375ad6 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java @@ -44,18 +44,18 @@ import org.junit.Test; public class RabbitMQReConnectionIntTest extends AbstractRabbitMQIntTest { private static final String EXCHANGE = "ex3"; - @Produce(uri = "direct:rabbitMQ") + @Produce("direct:rabbitMQ") protected ProducerTemplate directProducer; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest" + @EndpointInject("rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest" + "&queue=q3&routingKey=rk3" + "&automaticRecoveryEnabled=true" + "&requestedHeartbeat=1000" + "&connectionTimeout=5000") private Endpoint rabbitMQEndpoint; - @EndpointInject(uri = "mock:producing") + @EndpointInject("mock:producing") private MockEndpoint producingMockEndpoint; - @EndpointInject(uri = "mock:consuming") + @EndpointInject("mock:consuming") private MockEndpoint consumingMockEndpoint; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java index c5ec98f..8f6ba4c 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueHandledExceptionIntTest.java @@ -31,17 +31,17 @@ import org.junit.Test; public class RabbitMQRequeueHandledExceptionIntTest extends CamelTestSupport { public static final String ROUTING_KEY = "rk4"; - @Produce(uri = "direct:rabbitMQ") + @Produce("direct:rabbitMQ") protected ProducerTemplate directProducer; - @EndpointInject(uri = "rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest" + @EndpointInject("rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest" + "&autoAck=false&queue=q4&routingKey=" + ROUTING_KEY) private Endpoint rabbitMQEndpoint; - @EndpointInject(uri = "mock:producing") + @EndpointInject("mock:producing") private MockEndpoint producingMockEndpoint; - @EndpointInject(uri = "mock:consuming") + @EndpointInject("mock:consuming") private MockEndpoint consumingMockEndpoint; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java index d5654ab..b4a3e4b 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueIntTest.java @@ -30,17 +30,17 @@ import org.junit.Test; public class RabbitMQRequeueIntTest extends AbstractRabbitMQIntTest { public static final String ROUTING_KEY = "rk4"; - @Produce(uri = "direct:rabbitMQ") + @Produce("direct:rabbitMQ") protected ProducerTemplate directProducer; - @EndpointInject(uri = "rabbitmq:localhost:5672/ex4??username=cameltest&password=cameltest" + @EndpointInject("rabbitmq:localhost:5672/ex4??username=cameltest&password=cameltest" + "&autoAck=false&queue=q4&routingKey=" + ROUTING_KEY) private Endpoint rabbitMQEndpoint; - @EndpointInject(uri = "mock:producing") + @EndpointInject("mock:producing") private MockEndpoint producingMockEndpoint; - @EndpointInject(uri = "mock:consuming") + @EndpointInject("mock:consuming") private MockEndpoint consumingMockEndpoint; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java index 0c299f2..9ee8fe2 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQRequeueUnhandledExceptionIntTest.java @@ -30,17 +30,17 @@ import org.junit.Test; public class RabbitMQRequeueUnhandledExceptionIntTest extends AbstractRabbitMQIntTest { public static final String ROUTING_KEY = "rk4"; - @Produce(uri = "direct:rabbitMQ") + @Produce("direct:rabbitMQ") protected ProducerTemplate directProducer; - @EndpointInject(uri = "rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest" + @EndpointInject("rabbitmq:localhost:5672/ex4?username=cameltest&password=cameltest" + "&autoAck=false&queue=q4&routingKey=" + ROUTING_KEY) private Endpoint rabbitMQEndpoint; - @EndpointInject(uri = "mock:producing") + @EndpointInject("mock:producing") private MockEndpoint producingMockEndpoint; - @EndpointInject(uri = "mock:consuming") + @EndpointInject("mock:consuming") private MockEndpoint consumingMockEndpoint; @Override diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java index ab9ba75..36c017a 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java @@ -48,7 +48,7 @@ public class RabbitMQSpringIntTest { private static final Logger LOGGER = LoggerFactory.getLogger(RabbitMQSpringIntTest.class); - @Produce(uri = "direct:rabbitMQ") + @Produce("direct:rabbitMQ") protected ProducerTemplate template; @Autowired private ConnectionFactory connectionFactory; diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSupendResumeIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSupendResumeIntTest.java index 86e3919..8f1b2a5 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSupendResumeIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSupendResumeIntTest.java @@ -29,13 +29,13 @@ import org.junit.Test; public class RabbitMQSupendResumeIntTest extends AbstractRabbitMQIntTest { private static final String EXCHANGE = "ex6"; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; - @EndpointInject(uri = "rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest&queue=q6&routingKey=rk3&autoDelete=false") + @EndpointInject("rabbitmq:localhost:5672/" + EXCHANGE + "?username=cameltest&password=cameltest&queue=q6&routingKey=rk3&autoDelete=false") private Endpoint rabbitMQEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate template; @Override diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java index d3c3b49..a69fc31 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java @@ -32,7 +32,7 @@ public class XQueryPredicateFilterTest extends CamelTestSupport { @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:xpath") + @Produce("direct:xpath") protected ProducerTemplate template; @Test diff --git a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowAttachmentTest.java b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowAttachmentTest.java index 6db6f77..2d930cf 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowAttachmentTest.java +++ b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowAttachmentTest.java @@ -31,7 +31,7 @@ import org.junit.Test; import static org.apache.camel.support.ResourceHelper.resolveResourceAsInputStream; public class ServiceNowAttachmentTest extends ServiceNowTestSupport { - @Produce(uri = "direct:servicenow") + @Produce("direct:servicenow") ProducerTemplate template; @Test diff --git a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowScorecardTest.java b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowScorecardTest.java index d2e2421..c1ec219 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowScorecardTest.java +++ b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowScorecardTest.java @@ -25,7 +25,7 @@ import org.apache.camel.component.servicenow.model.Scorecard; import org.junit.Test; public class ServiceNowScorecardTest extends ServiceNowTestSupport { - @Produce(uri = "direct:servicenow") + @Produce("direct:servicenow") ProducerTemplate template; @Test diff --git a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowServiceCatalogTest.java b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowServiceCatalogTest.java index aeae6f0..4a0403e 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowServiceCatalogTest.java +++ b/components/camel-servicenow/camel-servicenow-component/src/test/java/org/apache/camel/component/servicenow/ServiceNowServiceCatalogTest.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.Test; public class ServiceNowServiceCatalogTest extends ServiceNowTestSupport { - @Produce(uri = "direct:servicenow") + @Produce("direct:servicenow") ProducerTemplate template; @Test diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java index 2916797..70c5ec8 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationBase64Test.java @@ -29,10 +29,10 @@ import org.junit.Test; public class ShiroAuthenticationBase64Test extends CamelTestSupport { - @EndpointInject(uri = "mock:success") + @EndpointInject("mock:success") protected MockEndpoint successEndpoint; - @EndpointInject(uri = "mock:authenticationException") + @EndpointInject("mock:authenticationException") protected MockEndpoint failureEndpoint; private byte[] passPhrase = { diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java index f65c137..aa591e4 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationReauthenticateFalseAndNewUserTest.java @@ -29,10 +29,10 @@ import org.junit.Test; public class ShiroAuthenticationReauthenticateFalseAndNewUserTest extends CamelTestSupport { - @EndpointInject(uri = "mock:success") + @EndpointInject("mock:success") protected MockEndpoint successEndpoint; - @EndpointInject(uri = "mock:authenticationException") + @EndpointInject("mock:authenticationException") protected MockEndpoint failureEndpoint; private byte[] passPhrase = { diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java index 4b3e677..760b2cfb 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java @@ -32,10 +32,10 @@ import org.junit.Test; public class ShiroAuthenticationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:success") + @EndpointInject("mock:success") protected MockEndpoint successEndpoint; - @EndpointInject(uri = "mock:authenticationException") + @EndpointInject("mock:authenticationException") protected MockEndpoint failureEndpoint; private byte[] passPhrase = { diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java index 3cbf638..238878e 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java @@ -31,10 +31,10 @@ import org.junit.Test; public class ShiroAuthorizationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:success") + @EndpointInject("mock:success") protected MockEndpoint successEndpoint; - @EndpointInject(uri = "mock:authorizationException") + @EndpointInject("mock:authorizationException") protected MockEndpoint failureEndpoint; private byte[] passPhrase = { diff --git a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java index 5890bdf..cf2c5e6 100644 --- a/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java +++ b/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroRolesAuthorizationTest.java @@ -29,10 +29,10 @@ import org.junit.Test; public class ShiroRolesAuthorizationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:success") + @EndpointInject("mock:success") protected MockEndpoint successEndpoint; - @EndpointInject(uri = "mock:authorizationException") + @EndpointInject("mock:authorizationException") protected MockEndpoint failureEndpoint; private byte[] passPhrase = { diff --git a/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java b/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java index 6e9b209..b9d7d75 100644 --- a/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java +++ b/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java @@ -35,13 +35,13 @@ public class PublishSubscribeTest extends CamelTestSupport { private int port2; private int port3; - @EndpointInject(uri = "mock:neverland") + @EndpointInject("mock:neverland") private MockEndpoint unreachableEndpoint; - @EndpointInject(uri = "mock:notification") + @EndpointInject("mock:notification") private MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate producerTemplate; @Override diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java index b60345b..8e02d6a 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java @@ -37,7 +37,7 @@ import org.junit.Test; */ public class InOutConcurrentConsumerTest extends JmsTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; @Test diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java index b13dd22..7812675 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java @@ -37,7 +37,7 @@ public class QueueProducerQoSTest extends JmsTestSupport { private static final String EXPIRED_MESSAGE_ROUTE_ID = "expiredAdvisoryRoute"; private static final String MOCK_EXPIRED_ADVISORY = "mock:expiredAdvisory"; - @EndpointInject(uri = MOCK_EXPIRED_ADVISORY) + @EndpointInject(MOCK_EXPIRED_ADVISORY) MockEndpoint mockExpiredAdvisory; @Test diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java index 04cbbcd..1fc50ad 100644 --- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java +++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java @@ -26,13 +26,13 @@ import org.junit.Test; public class SlackProducerTest extends CamelTestSupport { - @EndpointInject(uri = "mock:errors") + @EndpointInject("mock:errors") MockEndpoint errors; - @EndpointInject(uri = "direct:test") + @EndpointInject("direct:test") DirectEndpoint test; - @EndpointInject(uri = "direct:error") + @EndpointInject("direct:error") DirectEndpoint error; @Test diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java index a23efdd..d6bae46 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java @@ -41,10 +41,10 @@ import org.junit.Test; @Ignore("Must be manually tested") public class SmppComponentIntegrationTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private Endpoint start; @Test diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java index 88c8453..0fcff2b 100644 --- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java +++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java @@ -41,10 +41,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; @Ignore("Must be manually tested") public class SmppComponentSpringIntegrationTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private Endpoint start; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java index 41c1cc5..4bcd237 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java @@ -35,7 +35,7 @@ import org.junit.Test; */ public class SoapClientTest extends CamelTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") CustomerService customerService; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java index ecf0dfc..9a16333 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java @@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration public class SoapCxfServerTest extends RouteBuilder { - @Produce(uri = "direct:camelClient") + @Produce("direct:camelClient") CustomerService customerServiceProxy; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java index 0209481..83c50ee 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java @@ -34,10 +34,10 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; public class SoapMarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; /** diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java index 9483791..0b6c869 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java @@ -31,10 +31,10 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; public class SoapRoundtripTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java index 552e221..5a41d72 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java @@ -34,7 +34,7 @@ import org.junit.Test; */ public class SoapServerTest extends CamelTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java index eff452e..1a3d957 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java @@ -37,10 +37,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration public class SoapSpringRoundtripTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java index 8d1da3b..8d32f66 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java @@ -39,10 +39,10 @@ public class SoapUnMarshalTest extends CamelTestSupport { private static final String SERVICE_PACKAGE = GetCustomersByName.class .getPackage().getName(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java index 7d8adca..0891e27 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java @@ -36,10 +36,10 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; public class Soap12MarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; /** diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java index e1a1ff9..cd51a92 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java @@ -37,10 +37,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration public class Soap12SpringRoundtripTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; @Test diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java index eff60f7..06b6e7e 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java @@ -39,10 +39,10 @@ public class Soap12UnMarshalTest extends CamelTestSupport { private static final String SERVICE_PACKAGE = GetCustomersByName.class .getPackage().getName(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; @Test diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java index 80c36ed..ee943fa 100644 --- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java +++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ProducerTest.java @@ -46,13 +46,13 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class ProducerTest extends SplunkMockTestSupport { - @EndpointInject(uri = "splunk://stream") + @EndpointInject("splunk://stream") protected SplunkEndpoint streamEndpoint; - @EndpointInject(uri = "splunk://submit") + @EndpointInject("splunk://submit") protected SplunkEndpoint submitEndpoint; - @EndpointInject(uri = "splunk://tcp") + @EndpointInject("splunk://tcp") protected SplunkEndpoint tcpEndpoint; @Mock diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java index 2cbc518..0f3c627 100644 --- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java +++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/RawProducerTest.java @@ -41,13 +41,13 @@ import static org.mockito.Mockito.when; public class RawProducerTest extends SplunkMockTestSupport { private static final String PAYLOAD = "{foo:1, bar:2}"; - @EndpointInject(uri = "splunk://stream") + @EndpointInject("splunk://stream") protected SplunkEndpoint streamEndpoint; - @EndpointInject(uri = "splunk://submit") + @EndpointInject("splunk://submit") protected SplunkEndpoint submitEndpoint; - @EndpointInject(uri = "splunk://tcp") + @EndpointInject("splunk://tcp") protected SplunkEndpoint tcpEndpoint; @Mock diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java index 58c5831..c028a63 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java @@ -68,10 +68,10 @@ public class SpringBatchEndpointTest extends CamelTestSupport { Job dynamicMockjob; // Camel fixtures - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") MockEndpoint mockEndpoint; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") MockEndpoint errorEndpoint; @Override diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java index edcd6db..e1fb0ff 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java @@ -25,13 +25,13 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; public class SpringBatchIntegrationTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:header") + @EndpointInject("mock:header") MockEndpoint headerEndpoint; - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") MockEndpoint outputEndpoint; - @EndpointInject(uri = "mock:jobExecutionEventsQueue") + @EndpointInject("mock:jobExecutionEventsQueue") MockEndpoint jobExecutionEventsQueueEndpoint; String[] inputMessages = new String[]{"foo", "bar", "baz", null}; diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java index 14d89bc..0705db3 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java @@ -26,10 +26,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class SpringBatchJobLauncherTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") MockEndpoint outputEndpoint; - @EndpointInject(uri = "mock:jobExecutionEventsQueue") + @EndpointInject("mock:jobExecutionEventsQueue") MockEndpoint jobExecutionEventsQueueEndpoint; String[] inputMessages = new String[]{"foo", "bar", "baz", null}; diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java index 8b41e0b..3719913 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java @@ -55,10 +55,10 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration(classes = SpringBatchJobRegistryTest.ContextConfig.class, loader = CamelSpringDelegatingTestContextLoader.class) public class SpringBatchJobRegistryTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") MockEndpoint outputEndpoint; - @EndpointInject(uri = "mock:jobExecutionEventsQueue") + @EndpointInject("mock:jobExecutionEventsQueue") MockEndpoint jobExecutionEventsQueueEndpoint; @Autowired diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc b/components/camel-spring-boot/src/main/docs/spring-boot.adoc index 316219d..2136383 100644 --- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc +++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc @@ -629,7 +629,7 @@ public class MyApplicationTest { @Autowired private ProducerTemplate template; - @EndpointInject(uri = "mock:direct:end") + @EndpointInject("mock:direct:end") MockEndpoint mock; @Test diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java index 31044b6..6060fc4 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java @@ -45,7 +45,7 @@ public class CamelAnnotationsTest extends Assert { @Autowired ProducerTemplate producerTemplate; - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") MockEndpoint mockEndpoint; @Test diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java index 2dee082..8e1a25a 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java @@ -80,7 +80,7 @@ public class CamelAutoConfigurationTest extends Assert { // Spring context fixtures - @EndpointInject(uri = "mock:xmlAutoLoading") + @EndpointInject("mock:xmlAutoLoading") MockEndpoint xmlAutoLoadingMock; // Tests diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java index c6c9905..d9c4b3b 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java @@ -46,13 +46,13 @@ public class XPathPropertyPlaceholderTest { @Autowired private ProducerTemplate template; - @EndpointInject(uri = "mock:output-filter") + @EndpointInject("mock:output-filter") private MockEndpoint mockOutputFilter; - @EndpointInject(uri = "mock:output-choice") + @EndpointInject("mock:output-choice") private MockEndpoint mockOutputChoice; - @EndpointInject(uri = "mock:output-choice2") + @EndpointInject("mock:output-choice2") private MockEndpoint mockOutputChoice2; @Test diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java index 4e958c9..f9521d8 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java @@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest(classes = ComponentRouteTest.class) public class ComponentRouteTest extends Assert { - @EndpointInject(uri = "mock:componentRoute") + @EndpointInject("mock:componentRoute") MockEndpoint mock; @Autowired diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java index 5130a7b..3a35a4e 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java @@ -44,9 +44,9 @@ public class RestDslPostTest extends Assert { static final int PORT = SocketUtils.findAvailableTcpPort(20000); - @EndpointInject(uri = "mock:user") + @EndpointInject("mock:user") protected MockEndpoint resultEndpointUser; - @EndpointInject(uri = "mock:country") + @EndpointInject("mock:country") protected MockEndpoint resultEndpointCountry; @Autowired diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java index 6ccac6d..a6f7db7 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java @@ -36,10 +36,10 @@ import org.springframework.test.context.junit4.SpringRunner; @EnableAutoConfiguration @SpringBootTest public class SimpleOgnlTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Test diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java index 78c503a..75dcaeb 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java @@ -37,7 +37,7 @@ public class StreamCachingTest extends CamelTestSupport { public static final String URI_END_OF_ROUTE = "mock:end_of_route"; - @EndpointInject(uri = URI_END_OF_ROUTE) + @EndpointInject(URI_END_OF_ROUTE) private MockEndpoint endOfRoute; @Override diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java index ff9a0e4..6133451 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java @@ -39,13 +39,13 @@ import org.springframework.test.annotation.DirtiesContext; @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) public class MockEndpointsAndSkipDirtiesContextTest { - @Produce(uri = "direct:a") + @Produce("direct:a") private ProducerTemplate producer; - @EndpointInject(uri = "mock:end") + @EndpointInject("mock:end") private MockEndpoint end; - @EndpointInject(uri = "mock:direct:b") + @EndpointInject("mock:direct:b") private MockEndpoint directB; @Autowired diff --git a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java index 5f60c13..1dab459 100644 --- a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java +++ b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java @@ -36,13 +36,13 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration(classes = {BeanJavaConfigTest.ContextConfig.class}, loader = CamelSpringDelegatingTestContextLoader.class) public class BeanJavaConfigTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:end") + @EndpointInject("mock:end") protected MockEndpoint endpoint; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint errorEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate producer; @Test diff --git a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java index 97e005d..1eab026 100644 --- a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java +++ b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java @@ -31,10 +31,10 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration(classes = {AutowiringContextConfig.class}, loader = CamelSpringDelegatingTestContextLoader.class) public class AutodetectingConfigTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:autowire") + @EndpointInject("mock:autowire") MockEndpoint autowireMockEndpoint; - @EndpointInject(uri = "mock:module") + @EndpointInject("mock:module") MockEndpoint moduleMockEndpoint; @Produce diff --git a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java index ab98635..ab7f64d 100644 --- a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java +++ b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull; loader = CamelSpringDelegatingTestContextLoader.class) public class LoadingRawCamelConfigurationTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:rawConfigTest") + @EndpointInject("mock:rawConfigTest") MockEndpoint moduleMockEndpoint; @Test diff --git a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java index e15c141..501c83a 100644 --- a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java +++ b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java @@ -41,10 +41,10 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration(classes = {FilterTest.ContextConfig.class}, loader = CamelSpringDelegatingTestContextLoader.class) public class FilterTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @DirtiesContext diff --git a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java index be5d3ee..7e41757 100644 --- a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java +++ b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java @@ -45,13 +45,13 @@ import org.springframework.test.context.ContextConfiguration; ) @MockEndpoints public class CamelSpringDelegatingTestContextLoaderTest { - @EndpointInject(uri = "mock:direct:end") + @EndpointInject("mock:direct:end") protected MockEndpoint endEndpoint; - @EndpointInject(uri = "mock:direct:error") + @EndpointInject("mock:direct:error") protected MockEndpoint errorEndpoint; - @Produce(uri = "direct:test") + @Produce("direct:test") protected ProducerTemplate testProducer; @Configuration diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java index 64e8c0d..eefe708 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java @@ -29,10 +29,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; @Ignore ("IntegrationTest") public class RedisComponentSpringIntegrationTest extends CamelSpringTestSupport { - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint result; @Test diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java index a6ecf87..c59c945 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java @@ -34,7 +34,7 @@ public class RedisTestSupport extends CamelTestSupport { @Mock protected RedisTemplate redisTemplate; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Override diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java index b353dfd..435c26c 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java @@ -38,10 +38,10 @@ public class RedisStringIdempotentRepositoryIntegrationTest extends CamelTestSup protected RedisStringIdempotentRepository idempotentRepository; - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockResult; @Resource diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java index 767f413..dcecc0a 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java @@ -47,19 +47,19 @@ public class ConsumerEndpointMappingRouteTest extends CamelSpringTestSupport { private final String xmlRequestForGoogleStockQuoteNoNamespace = "GOOG"; private final String xmlRequestForGoogleStockQuoteNoNamespaceDifferentBody = "GRABME"; - @EndpointInject(uri = "mock:testRootQName") + @EndpointInject("mock:testRootQName") private MockEndpoint resultEndpointRootQName; - @EndpointInject(uri = "mock:testSoapAction") + @EndpointInject("mock:testSoapAction") private MockEndpoint resultEndpointSoapAction; - @EndpointInject(uri = "mock:testUri") + @EndpointInject("mock:testUri") private MockEndpoint resultEndpointUri; - @EndpointInject(uri = "mock:testUriPath") + @EndpointInject("mock:testUriPath") private MockEndpoint resultEndpointUriPath; - @EndpointInject(uri = "mock:testXPath") + @EndpointInject("mock:testXPath") private MockEndpoint resultEndpointXPath; private WebServiceTemplate webServiceTemplate; diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java index b5412f8..301e69d 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java @@ -42,10 +42,10 @@ public class ProducerLocalRouteTest extends AbstractJUnit4SpringContextTests { @Produce private ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint resultEndpoint; - @EndpointInject(uri = "mock:inOnly") + @EndpointInject("mock:inOnly") private MockEndpoint inOnlyEndpoint; @Test diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java index 30cf67e..4fc37b5 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/CamelDirectSenderTest.java @@ -40,7 +40,7 @@ public class CamelDirectSenderTest extends AbstractWSATests { private OutputChannelReceiver customChannel; - @EndpointInject(uri = "mock:camelDirect") + @EndpointInject("mock:camelDirect") private MockEndpoint endpointCamelDirect; @Before diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java index 56cbdcc..1aae1dc 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java @@ -39,31 +39,31 @@ public class ConsumerWSAEndpointMappingRouteTest extends CamelSpringTestSupport private final String xmlBody = "GOOG"; - @EndpointInject(uri = "mock:testAction") + @EndpointInject("mock:testAction") private MockEndpoint resultEndpointAction; - @EndpointInject(uri = "mock:testTo") + @EndpointInject("mock:testTo") private MockEndpoint resultEndpointTo; - @EndpointInject(uri = "mock:testActionAndTo") + @EndpointInject("mock:testActionAndTo") private MockEndpoint resultEndpointActionAndTo; - @EndpointInject(uri = "mock:testToAndAction") + @EndpointInject("mock:testToAndAction") private MockEndpoint resultEndpointToAndAction; - @EndpointInject(uri = "mock:testToMoreSpecific") + @EndpointInject("mock:testToMoreSpecific") private MockEndpoint resultEndpointToMoreSpecific; - @EndpointInject(uri = "mock:testActionMoreSpecific") + @EndpointInject("mock:testActionMoreSpecific") private MockEndpoint resultEndpointActionMoreSpecific; - @EndpointInject(uri = "mock:testOutputAndFault") + @EndpointInject("mock:testOutputAndFault") private MockEndpoint resultOutputAndFault; - @EndpointInject(uri = "mock:testOutputAndFault2") + @EndpointInject("mock:testOutputAndFault2") private MockEndpoint resultOutputAndFault2; - @EndpointInject(uri = "mock:testSoapAction") + @EndpointInject("mock:testSoapAction") private MockEndpoint resultSoapAction; private WebServiceTemplate webServiceTemplate; diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java index 17741ae..59fe180 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java @@ -28,9 +28,9 @@ import org.springframework.test.context.ContextConfiguration; public class BeanWithRecipientListTest extends SpringRunWithTestSupport { @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "mock:a") + @EndpointInject("mock:a") protected MockEndpoint a; - @EndpointInject(uri = "mock:b") + @EndpointInject("mock:b") protected MockEndpoint b; protected String body = "James"; diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java b/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java index 409f4fd..4ab6ef1 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java +++ b/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java @@ -25,7 +25,7 @@ import org.apache.camel.RecipientList; */ public class RouterBean { - @Consume(uri = "direct:start") + @Consume("direct:start") @RecipientList public String[] route(String body) { return new String[]{"mock:a", "mock:b"}; diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java index 2f7bb47..6872d56 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CircularComponentInjectionTest.java @@ -26,10 +26,10 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration public class CircularComponentInjectionTest extends SpringRunWithTestSupport { - @EndpointInject(uri = "ref:seda") + @EndpointInject("ref:seda") protected Endpoint sedaEndpoint; - @EndpointInject(uri = "ref:log") + @EndpointInject("ref:log") protected Endpoint logEndpoint; @DirtiesContext diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java b/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java index 5f8ed62..feca396 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBean.java @@ -24,19 +24,19 @@ import org.apache.camel.Producer; import org.apache.camel.ProducerTemplate; public class InjectedBean { - @EndpointInject(uri = "direct:fieldInjectedEndpoint") + @EndpointInject("direct:fieldInjectedEndpoint") private Endpoint fieldInjectedEndpoint; private Endpoint propertyInjectedEndpoint; - @EndpointInject(uri = "direct:fieldInjectedProducer") + @EndpointInject("direct:fieldInjectedProducer") private Producer fieldInjectedProducer; private Producer propertyInjectedProducer; - @EndpointInject(uri = "direct:fieldInjectedCamelTemplate") + @EndpointInject("direct:fieldInjectedCamelTemplate") private ProducerTemplate fieldInjectedCamelTemplate; private ProducerTemplate propertyInjectedCamelTemplate; @EndpointInject private ProducerTemplate injectByFieldName; private ProducerTemplate injectByPropertyName; - @EndpointInject(uri = "direct:fieldInjectedEndpoint") + @EndpointInject("direct:fieldInjectedEndpoint") private PollingConsumer fieldInjectedPollingConsumer; private PollingConsumer propertyInjectedPollingConsumer; @@ -50,7 +50,7 @@ public class InjectedBean { return propertyInjectedEndpoint; } - @EndpointInject(uri = "ref:namedEndpoint1") + @EndpointInject("ref:namedEndpoint1") public void setPropertyInjectedEndpoint(Endpoint propertyInjectedEndpoint) { this.propertyInjectedEndpoint = propertyInjectedEndpoint; } @@ -66,7 +66,7 @@ public class InjectedBean { return propertyInjectedProducer; } - @EndpointInject(uri = "direct:propertyInjectedProducer") + @EndpointInject("direct:propertyInjectedProducer") public void setPropertyInjectedProducer(Producer propertyInjectedProducer) { this.propertyInjectedProducer = propertyInjectedProducer; } @@ -81,7 +81,7 @@ public class InjectedBean { return propertyInjectedCamelTemplate; } - @EndpointInject(uri = "direct:propertyInjectedCamelTemplate") + @EndpointInject("direct:propertyInjectedCamelTemplate") public void setPropertyInjectedCamelTemplate(ProducerTemplate propertyInjectedCamelTemplate) { this.propertyInjectedCamelTemplate = propertyInjectedCamelTemplate; } @@ -121,7 +121,7 @@ public class InjectedBean { return propertyInjectedPollingConsumer; } - @EndpointInject(uri = "direct:propertyInjectedPollingConsumer") + @EndpointInject("direct:propertyInjectedPollingConsumer") public void setPropertyInjectedPollingConsumer(PollingConsumer propertyInjectedPollingConsumer) { this.propertyInjectedPollingConsumer = propertyInjectedPollingConsumer; } diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java index ef48c16..c4c72d7 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java @@ -31,10 +31,10 @@ public class NodeIdReferenceTest extends SpringRunWithTestSupport { @Autowired protected ProducerTemplate producer; - @EndpointInject(uri = "ref:foo") + @EndpointInject("ref:foo") protected Endpoint start; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java index 89fbfe9..a1d380d 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java @@ -37,7 +37,7 @@ public class SpringConsumerTemplateTest extends SpringRunWithTestSupport { @Autowired private ConsumerTemplate consumer; - @EndpointInject(uri = "ref:result") + @EndpointInject("ref:result") private MockEndpoint mock; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java index a348fe2..31c14aa 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DependencyInjectCamelTemplateTest.java @@ -31,7 +31,7 @@ public class DependencyInjectCamelTemplateTest extends SpringRunWithTestSupport @Autowired private TemplateUsingBean bean; - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") private MockEndpoint endpoint; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyProduceBean.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyProduceBean.java index 6e513e2..a4a11e1 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyProduceBean.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyProduceBean.java @@ -22,7 +22,7 @@ import org.apache.camel.Producer; public class MyProduceBean { - @Produce(uri = "direct:start") + @Produce("direct:start") private Producer producer; public void testDoSomething(String body) throws Exception { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java index 5e86c07..74aff53 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/NamespacePrefixTest.java @@ -31,7 +31,7 @@ public class NamespacePrefixTest extends SpringRunWithTestSupport { @Autowired private ProducerTemplate template; - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") private MockEndpoint endpoint; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java index c785bb2..0fd7015 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/route/MyRouteBuilder.java @@ -26,10 +26,10 @@ public class MyRouteBuilder extends RouteBuilder { MyProcessor component; - @EndpointInject(uri = "ref:start") + @EndpointInject("ref:start") Endpoint startEndpoint; - @EndpointInject(uri = "ref:result") + @EndpointInject("ref:result") Endpoint resultEndpoint; @Override diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java index 9f15224..55ddcd4 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/AnotherFooEventConsumer.java @@ -22,10 +22,10 @@ import org.apache.camel.ProducerTemplate; public class AnotherFooEventConsumer { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private ProducerTemplate destination; - @Consume(uri = "ref:foo") + @Consume("ref:foo") public void doSomething(String body) { destination.sendBody("another" + body); } diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java index 8820c12..100ae80 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/FooEventConsumer.java @@ -23,10 +23,10 @@ import org.apache.camel.ProducerTemplate; // START SNIPPET: e1 public class FooEventConsumer { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private ProducerTemplate destination; - @Consume(uri = "ref:foo") + @Consume("ref:foo") public void doSomething(String body) { destination.sendBody("foo" + body); } diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java index b414307..220483e 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel1Consumer.java @@ -27,10 +27,10 @@ public class MyCamel1Consumer { private static final Logger LOG = LoggerFactory.getLogger(MyCamel1Consumer.class); - @EndpointInject(uri = "mock:result", context = "camel-1") + @EndpointInject(value = "mock:result", context = "camel-1") private ProducerTemplate destination; - @Consume(uri = "direct:start", context = "camel-1") + @Consume(value = "direct:start", context = "camel-1") public void doSomething(String body) { ObjectHelper.notNull(destination, "destination"); diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java index 929816b..ff02888 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2Consumer.java @@ -27,10 +27,10 @@ public class MyCamel2Consumer { private static final Logger LOG = LoggerFactory.getLogger(MyCamel2Consumer.class); - @EndpointInject(uri = "mock:result", context = "camel-2") + @EndpointInject(value = "mock:result", context = "camel-2") private ProducerTemplate destination; - @Consume(uri = "direct:start", context = "camel-2") + @Consume(value = "direct:start", context = "camel-2") public void doSomething(String body) { ObjectHelper.notNull(destination, "destination"); diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java index 30a7728..5038f76 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyCamel2RecipientList.java @@ -25,7 +25,7 @@ public class MyCamel2RecipientList { private static final Logger LOG = LoggerFactory.getLogger(MyCamel2RecipientList.class); - @Consume(uri = "direct:foo", context = "camel-2") + @Consume(value = "direct:foo", context = "camel-2") @RecipientList(context = "camel-2") public String[] doSomething(String body) { LOG.info("Received body: " + body); diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java index b7bf299..9436789 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyConsumer.java @@ -28,10 +28,10 @@ import org.slf4j.LoggerFactory; */ public class MyConsumer { private static final Logger LOG = LoggerFactory.getLogger(MyConsumer.class); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private ProducerTemplate destination; - @Consume(uri = "direct:start") + @Consume("direct:start") public void doSomething(String body) { ObjectHelper.notNull(destination, "destination"); diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MySender.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MySender.java index 357b717..bb012c5 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MySender.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MySender.java @@ -25,9 +25,9 @@ import static org.apache.camel.util.ObjectHelper.notNull; * An example POJO which is injected with a CamelTemplate */ public class MySender { - @EndpointInject(uri = "mock:a") + @EndpointInject("mock:a") private ProducerTemplate successDesetination; - @EndpointInject(uri = "mock:b") + @EndpointInject("mock:b") private ProducerTemplate failureDesetination; public void doSomething(String name) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java index 10ac2a0..23567d2 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java @@ -29,10 +29,10 @@ import org.slf4j.LoggerFactory; */ public class MyVmConsumer { private static final Logger LOG = LoggerFactory.getLogger(MyVmConsumer.class); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private ProducerTemplate destination; - @Consume(uri = "vm:start") + @Consume("vm:start") public void doSomething(String body, Exchange exchange) { ObjectHelper.notNull(destination, "destination"); diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java index c50b0f7..91a3ac5 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java @@ -32,9 +32,9 @@ public class SpringFileAntPathMatcherFileFilterTest extends SpringRunWithTestSup protected String expectedBody = "Godday World"; @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "ref:myFileEndpoint") + @EndpointInject("ref:myFileEndpoint") protected Endpoint inputFile; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java index 3751cde..d488f60 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java @@ -37,7 +37,7 @@ public class SpringFileRouteTest extends SpringRunWithTestSupport { protected ProducerTemplate template; @Autowired protected Endpoint inputFile; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java index 9e30973..2b5c788 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringSimpleFileNameWithQuoteTest.java @@ -31,7 +31,7 @@ public class SpringSimpleFileNameWithQuoteTest extends SpringRunWithTestSupport protected String expectedBody = "Hello World!"; @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java index 70ee6eb..3c39e14 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java @@ -35,7 +35,7 @@ public class AnnotatedBookServiceImpl implements AnnotatedBookStore { @Autowired private DataSource dataSource; - @EndpointInject(uri = "seda:book") + @EndpointInject("seda:book") private ProducerTemplate template; public void orderBook(String title) throws Exception { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java index 57de212..ea09feb 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java @@ -24,10 +24,10 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(propagation = org.springframework.transaction.annotation.Propagation.NEVER, readOnly = true) public class AnnotatedConsumeImpl implements AnnotatedConsume { - @Produce(uri = "mock:book") + @Produce("mock:book") ProducerTemplate producer; - @Consume(uri = "seda:book") + @Consume("seda:book") public void handleTitle(String title) { Transactional tx = this.getClass().getAnnotation(Transactional.class); if (tx == null) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CoolService.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CoolService.java index bbb9d32..3e72ceb 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CoolService.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/CoolService.java @@ -20,7 +20,7 @@ import org.apache.camel.Produce; public class CoolService { - @Produce(uri = "direct:start") + @Produce("direct:start") private MyCoolStuff stuff; public String stuff(String s) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBean.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBean.java index 31f2619..b1a9ed7 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBean.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBean.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; */ public class MyBean { - @EndpointInject(uri = "seda:foo") + @EndpointInject("seda:foo") private ProducerTemplate template; public void doSomething(String body) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBeanRef.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBeanRef.java index 32e5fd9..1faca26 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBeanRef.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyBeanRef.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; */ public class MyBeanRef { - @EndpointInject(uri = "ref:foo") + @EndpointInject("ref:foo") private ProducerTemplate template; public void doSomething(String body) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java index e97a11a..36ee6cd 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyRouteBuilder.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; public class MyRouteBuilder extends RouteBuilder { - @EndpointInject(uri = "ref:foo") + @EndpointInject("ref:foo") private Endpoint foo; @Override diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/MyAssertions.java b/components/camel-spring/src/test/java/org/apache/camel/spring/mock/MyAssertions.java index 663cf31..161d9de 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/mock/MyAssertions.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/mock/MyAssertions.java @@ -27,10 +27,10 @@ import org.springframework.beans.factory.InitializingBean; */ // START SNIPPET: example public class MyAssertions implements InitializingBean { - @EndpointInject(uri = "mock:matched") + @EndpointInject("mock:matched") private MockEndpoint matched; - @EndpointInject(uri = "mock:notMatched") + @EndpointInject("mock:notMatched") private MockEndpoint notMatched; public void afterPropertiesSet() throws Exception { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java index 52f92bf..2ea204a 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java @@ -33,10 +33,10 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration public class FilterTest extends SpringRunWithTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @DirtiesContext diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java index ddcaf42..a9282c5 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSpringPropertyPlaceholderRouteTest.java @@ -34,7 +34,7 @@ import static org.awaitility.Awaitility.await; @ContextConfiguration public class SimpleLanguageWithSpringPropertyPlaceholderRouteTest extends SpringRunWithTestSupport { - @Produce(uri = "direct:startSimple") + @Produce("direct:startSimple") protected ProducerTemplate template; @Before diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java index c797624..c4b7a7e 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java @@ -26,7 +26,7 @@ public class MyRouteBuilderWithAutowiredPojo extends SpringRouteBuilder { @Autowired private TestPojo pojo; - @EndpointInject(uri = "mock:injected") + @EndpointInject("mock:injected") private Endpoint injected; public void configure() throws Exception { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java index 6381d042..9fc9eb7 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/TestPojo.java @@ -26,7 +26,7 @@ public class TestPojo { @MagicAnnotation("Changed Value") private String testValue = "Initial Value"; - @Produce(uri = "mock:foo") + @Produce("mock:foo") private ProducerTemplate producer; public String getTestValue() { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java index 6ef1164..6147088 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/MyProduceBean.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; */ public class MyProduceBean { - @Produce(uri = "seda:bar") + @Produce("seda:bar") private ProducerTemplate bar; public void doSomething(String s) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java index c7090c7..81990d5 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringMulticastAggregatorTest.java @@ -31,7 +31,7 @@ public class SpringMulticastAggregatorTest { @Autowired protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/XsltTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/XsltTest.java index 99d7dc4..c57564f 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/XsltTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/XsltTest.java @@ -27,7 +27,7 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration public class XsltTest extends SpringRunWithTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Autowired diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java index 650476c..efa309d 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java @@ -25,7 +25,7 @@ import org.apache.camel.language.xpath.XPath; public class MyVendor { private int beerPrice; - @Produce(uri = "seda:quoteAggregator") + @Produce("seda:quoteAggregator") private ProducerTemplate quoteAggregator; public MyVendor(int beerPrice) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java index 17c98b0..a8a0eba 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/FluentProduceTemplateTest.java @@ -29,7 +29,7 @@ public class FluentProduceTemplateTest extends SpringRunWithTestSupport { @Autowired protected FluentProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java index 834e152..4170e3e 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBean.java @@ -21,7 +21,7 @@ import org.apache.camel.ProducerTemplate; public class MyCoolBean { - @Produce(uri = "log:foo") + @Produce("log:foo") protected ProducerTemplate producer; public void sendMsg() { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java index 82e8e68..dc1aadc 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyListenerService.java @@ -32,7 +32,7 @@ public class MyListenerService implements MyListener { LOG.debug("Instantiated service: " + this); } - @Consume(uri = "direct:end") + @Consume("direct:end") public String greet(Map headers, String name) { return headers.get("greeter") + name; } diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java index 4cafdf7..21801d0 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateTest.java @@ -29,7 +29,7 @@ public class ProduceTemplateTest extends SpringRunWithTestSupport { @Autowired protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java index 255f6cf..b025ba9 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java @@ -29,7 +29,7 @@ public class ProduceTemplateWithTwoCamelContextTest extends SpringRunWithTestSup @Autowired protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java index 3ae0185..c70949f 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java @@ -27,7 +27,7 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration public class ProduceTest extends SpringRunWithTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") protected MyListener producer; @Test diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java index f468892..fe71966 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceImpl.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; @Service public class MyServiceImpl extends MyServiceSupport { - @Consume(uri = "direct:myService") + @Consume("direct:myService") @Override public Double sqrt(Double number) { log(number); diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java index 73ded74..1a83757 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/generics/MyServiceInvoker.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Component; @Component public class MyServiceInvoker { - @Produce(uri = "direct:myService") + @Produce("direct:myService") MyService myService; public Double invokeService(Double number) { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojo.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojo.java index 5f8561d..5ec7f8f 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojo.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojo.java @@ -22,10 +22,10 @@ import org.apache.camel.ProducerTemplate; public class EchoPojo { - @Produce(uri = "direct:echo") + @Produce("direct:echo") private ProducerTemplate service; - @Consume(uri = "direct:start") + @Consume("direct:start") public String onEcho(String name) { return (String) service.requestBody(name); } diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java index 25cc284..305f898 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java @@ -21,10 +21,10 @@ import org.apache.camel.Produce; public class EchoPojoDirect { - @Produce(uri = "direct:echo") + @Produce("direct:echo") private Echo service; - @Consume(uri = "direct:start") + @Consume("direct:start") public String onEcho(String name) { return service.echo(name); } diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java index 76c37e9..6dc4649 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java @@ -20,7 +20,7 @@ import org.apache.camel.Produce; public class MyMultiArgument { - @Produce(uri = "direct:myargs", binding = false) + @Produce(value = "direct:myargs", binding = false) MyMultiArgumentServiceInterface myMultiArgumentServiceInterface; public void doSomethingMultiple() { diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java index 099b769..7a69ecb 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgumentService.java @@ -23,7 +23,7 @@ import org.apache.camel.Consume; public class MyMultiArgumentService implements MyMultiArgumentServiceInterface { @Override - @Consume(uri = "direct:myargs") + @Consume("direct:myargs") public void doSomething(String arg1, String arg2, Long arg3) { assertEquals("Hello World 1", arg1); assertEquals("Hello World 2", arg2); diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java index 9fc3a5c..cb993a3 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java @@ -33,7 +33,7 @@ public class SpringRemotingWithOneWayTest extends SpringRunWithTestSupport { @Autowired protected IAsyncService myService; - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") protected MockEndpoint endpoint; @Test diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java index 3c3f578..52726c3 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java @@ -37,7 +37,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; public class SqlProducerConcurrentTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mockEndpoint; private EmbeddedDatabase db; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java index dc0554d..59d2944 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java @@ -31,10 +31,10 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; public class SqlProducerExpressionParameterTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; - @EndpointInject(uri = "mock:result-simple") + @EndpointInject("mock:result-simple") MockEndpoint resultSimple; private EmbeddedDatabase db; diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java index e734cd2..4789a8f 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java @@ -29,7 +29,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; public class SqlProducerOutputTypeSelectOneNoResultTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; private EmbeddedDatabase db; diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java index 686bf10..fa4f95e 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/CustomizedJdbcMessageIdRepositoryTest.java @@ -37,10 +37,10 @@ public class CustomizedJdbcMessageIdRepositoryTest extends CamelSpringTestSuppor protected JdbcTemplate jdbcTemplate; protected DataSource dataSource; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint errorEndpoint; @Override diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java index 90ae4fb..bcee2b8 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepositoryTest.java @@ -43,10 +43,10 @@ public class JdbcMessageIdRepositoryTest extends CamelSpringTestSupport { protected JdbcTemplate jdbcTemplate; protected DataSource dataSource; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint errorEndpoint; @Override diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java index 8d87e4d..bd2b4e2 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/SpringStAXJAXBIteratorExpressionTest.java @@ -27,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class SpringStAXJAXBIteratorExpressionTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:records") + @EndpointInject("mock:records") private MockEndpoint recordsEndpoint; @Override diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java index f2f54cb..1cef80c 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentRefTest.java @@ -28,7 +28,7 @@ import org.junit.Test; public class StAXComponentRefTest extends CamelTestSupport { - @EndpointInject(uri = "mock:records") + @EndpointInject("mock:records") private MockEndpoint recordsEndpoint; @BeforeClass diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java index 5b2e382..7246530 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXComponentTest.java @@ -27,7 +27,7 @@ import org.junit.Test; public class StAXComponentTest extends CamelTestSupport { - @EndpointInject(uri = "mock:records") + @EndpointInject("mock:records") private MockEndpoint recordsEndpoint; @BeforeClass diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java index bbf3bbc..ef261e2b 100644 --- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java +++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXJAXBIteratorExpressionTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import static org.apache.camel.component.stax.StAXBuilder.stax; public class StAXJAXBIteratorExpressionTest extends CamelTestSupport { - @EndpointInject(uri = "mock:records") + @EndpointInject("mock:records") private MockEndpoint recordsEndpoint; @BeforeClass diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java index 8a540b5..d544ca7 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerChannelPostTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java index bac2793..a7bd949 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerEmptyResponseTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java index c53eb1c..8401b3e 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.verify; */ public class TelegramConsumerFallbackConversionTest extends TelegramTestSupport { - @EndpointInject(uri = "direct:message") + @EndpointInject("direct:message") protected ProducerTemplate template; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java index 35fc69b..8df8568 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerMappingTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java index 1cc9857..6c9cc5f 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerMediaDocumentTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java index 50e63ba..f124290 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerMediaPhotoTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java index ddc75a1..5e1b02a 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerMediaVideoTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java index 1c3ea94..98f8765 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerMultipleTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java index 59db4be..8df6bf0 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerServiceErrorTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java index 8070fce..c85378a 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.when; */ public class TelegramConsumerSingleTest extends TelegramTestSupport { - @EndpointInject(uri = "mock:telegram") + @EndpointInject("mock:telegram") private MockEndpoint endpoint; @Before diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java index 23e70cf..af99e43 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java @@ -34,7 +34,7 @@ import static org.mockito.ArgumentMatchers.eq; */ public class TelegramProducerChatIdResolutionTest extends TelegramTestSupport { - @EndpointInject(uri = "direct:telegram") + @EndpointInject("direct:telegram") private Endpoint endpoint; @Test diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java index cd968da..413784f 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java @@ -39,7 +39,7 @@ import static org.mockito.ArgumentMatchers.eq; */ public class TelegramProducerMediaTest extends TelegramTestSupport { - @EndpointInject(uri = "direct:telegram") + @EndpointInject("direct:telegram") private Endpoint endpoint; @Test diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintMultipleServiceTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintMultipleServiceTest.java index 4d98690..a79a1e2 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintMultipleServiceTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintMultipleServiceTest.java @@ -30,10 +30,10 @@ import org.junit.Test; public class BlueprintMultipleServiceTest extends CamelBlueprintTestSupport { - @EndpointInject(uri = "fakeservice1:mock") + @EndpointInject("fakeservice1:mock") private MockEndpoint fakeServiceOneMock; - @EndpointInject(uri = "fakeservice2:mock") + @EndpointInject("fakeservice2:mock") private MockEndpoint fakeServiceTwoMock; private MockComponent mockComponentOne = new MockComponent(); diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java index d981d57..d0c4024 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java @@ -29,10 +29,10 @@ import org.junit.Test; // START SNIPPET: example public class FilterTest extends CamelBlueprintTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Override diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IsMockEndpointJUnit4Test.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IsMockEndpointJUnit4Test.java index 8e29de1..0f7f09f 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IsMockEndpointJUnit4Test.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IsMockEndpointJUnit4Test.java @@ -22,13 +22,13 @@ import org.junit.Test; public class IsMockEndpointJUnit4Test extends CamelBlueprintTestSupport { - @EndpointInject (uri = "mock:seda:result", context = "IsMockEndpoints") + @EndpointInject (value = "mock:seda:result", context = "IsMockEndpoints") private MockEndpoint mockSeda; - @EndpointInject (uri = "mock:bar", context = "IsMockEndpoints") + @EndpointInject (value = "mock:bar", context = "IsMockEndpoints") private MockEndpoint mockBar; - @EndpointInject (uri = "mock:baz", context = "IsMockEndpoints") + @EndpointInject (value = "mock:baz", context = "IsMockEndpoints") private MockEndpoint mockBaz; @Override diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java index 3c02cf0..3f8fa4f 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MyProducer.java @@ -24,7 +24,7 @@ import org.apache.camel.ProducerTemplate; */ public class MyProducer { - @EndpointInject(uri = "ref:testEndpoint") + @EndpointInject("ref:testEndpoint") private ProducerTemplate endpoint; public void doSomething(String body) { diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleTransformAnnotationsBlueprintTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleTransformAnnotationsBlueprintTest.java index 4f4d06a..8d53682 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleTransformAnnotationsBlueprintTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SimpleTransformAnnotationsBlueprintTest.java @@ -27,10 +27,10 @@ import org.junit.Test; */ public class SimpleTransformAnnotationsBlueprintTest extends CamelBlueprintTestSupport { - @Produce(uri = "direct:in") + @Produce("direct:in") private ProducerTemplate producerTemplate; - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint mockOut; @Override diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/MyRouteBuilder.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/MyRouteBuilder.java index 97b5ab4..1d4026b 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/MyRouteBuilder.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/MyRouteBuilder.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; public class MyRouteBuilder extends RouteBuilder { - @EndpointInject(uri = "ref:foo") + @EndpointInject("ref:foo") private Endpoint foo; @Override diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan2/MyOtherCoolRoute.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan2/MyOtherCoolRoute.java index ce78510..bdf7373 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan2/MyOtherCoolRoute.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/scan2/MyOtherCoolRoute.java @@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder; */ public class MyOtherCoolRoute extends RouteBuilder { - @EndpointInject(uri = "ref:foo") + @EndpointInject("ref:foo") private Endpoint foo; @Override diff --git a/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java b/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java index 9aed6d6..4171106 100644 --- a/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java +++ b/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java @@ -30,10 +30,10 @@ import org.junit.runner.RunWith; @RunWith(CamelCdiRunner.class) public class FilterTest { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Before diff --git a/components/camel-test-spring/src/main/docs/test-spring.adoc b/components/camel-test-spring/src/main/docs/test-spring.adoc index 20cf9e9..06ee76c 100644 --- a/components/camel-test-spring/src/main/docs/test-spring.adoc +++ b/components/camel-test-spring/src/main/docs/test-spring.adoc @@ -115,7 +115,7 @@ Here is a simple unit test using JUnit 3.x support from Spring Test using http:/ @ContextConfiguration public class FilterTest extends SpringRunWithTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce(uri = "direct:start") @@ -191,7 +191,7 @@ You can completely avoid using an XML configuration file by using http://camel.a @ContextConfiguration(classes = {FilterTest.ContextConfig.class}, loader = CamelSpringDelegatingTestContextLoader.class) public class FilterTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce(uri = "direct:start") @@ -250,7 +250,7 @@ public class MyCamelTest { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; @Test @@ -279,7 +279,7 @@ public class MyCamelTest { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; @Test @@ -360,13 +360,13 @@ public class CamelSpringJUnit4ClassRunnerPlainTest { protected MockEndpoint mockB; - @EndpointInject(uri = "mock:c", context = "camelContext2") + @EndpointInject(value = "mock:c", context = "camelContext2") protected MockEndpoint mockC; @Produce(uri = "direct:start2", context = "camelContext2") protected ProducerTemplate start2; - @EndpointInject(uri = "mock:log:org.apache.camel.test.junit4.spring", context = "camelContext2") + @EndpointInject(value = "mock:log:org.apache.camel.test.junit4.spring", context = "camelContext2") protected MockEndpoint mockLog; @Test @@ -391,7 +391,7 @@ public class MyCamelTest extends AbstractJUnit38SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; public void testMocksAreValid() throws Exception { @@ -416,7 +416,7 @@ public class MyCamelTest extends AbstractJUnit38SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; public void testMocksAreValid() throws Exception { @@ -442,7 +442,7 @@ To send or receive messages you should use the http://camel.apache.org/bean-inte [source,java] ---- public class Foo { - @EndpointInject(uri = "activemq:foo.bar") + @EndpointInject("activemq:foo.bar") ProducerTemplate producer; public void doSomething() { diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java index fb6346f..c692033 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java @@ -25,10 +25,10 @@ import org.apache.camel.ProducerTemplate; */ public class MyProduceBean { - @Produce(uri = "mock:result") + @Produce("mock:result") MySender sender; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") ProducerTemplate template; public void doSomething(String body) { diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java index 0fdcd36..0405251 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringActiveProfileTest.java @@ -42,7 +42,7 @@ public class CamelSpringActiveProfileTest { @Autowired protected CamelContext camelContext; - @Produce(uri = "direct:start", context = "camelContext") + @Produce(value = "direct:start", context = "camelContext") protected ProducerTemplate start; @Test diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java index 715d4fb..d28e2dd 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java @@ -37,16 +37,16 @@ import org.springframework.test.context.ContextConfiguration; @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) public class CamelSpringOverridePropertiesTest { - @Produce(uri = "direct:start") + @Produce("direct:start") private ProducerTemplate start; - @EndpointInject(uri = "mock:a") + @EndpointInject("mock:a") private MockEndpoint mockA; - @EndpointInject(uri = "mock:test") + @EndpointInject("mock:test") private MockEndpoint mockTest; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") private MockEndpoint mockFoo; @UseOverridePropertiesWithPropertiesComponent diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java index 3d831f6..c5f10c6 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java @@ -44,7 +44,7 @@ public class CamelSpringPropertiesLocationElementTest { protected CamelContext context; @Produce private ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsAndSkipTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsAndSkipTest.java index b552bd1..5e677e2 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsAndSkipTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsAndSkipTest.java @@ -30,10 +30,10 @@ import static org.junit.Assert.assertTrue; public class CamelSpringRunnerMockEndpointsAndSkipTest extends CamelSpringRunnerPlainTest { - @EndpointInject(uri = "mock:seda:context2.seda", context = "camelContext2") + @EndpointInject(value = "mock:seda:context2.seda", context = "camelContext2") protected MockEndpoint mock; - @EndpointInject(uri = "seda:context2.seda", context = "camelContext2") + @EndpointInject(value = "seda:context2.seda", context = "camelContext2") private InterceptSendToEndpoint original; @Test diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsTest.java index 685bf42..2735922 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerMockEndpointsTest.java @@ -29,10 +29,10 @@ import static org.junit.Assert.assertTrue; public class CamelSpringRunnerMockEndpointsTest extends CamelSpringRunnerPlainTest { - @EndpointInject(uri = "mock:seda:context2.seda", context = "camelContext2") + @EndpointInject(value = "mock:seda:context2.seda", context = "camelContext2") protected MockEndpoint mock; - @EndpointInject(uri = "seda:context2.seda", context = "camelContext2") + @EndpointInject(value = "seda:context2.seda", context = "camelContext2") private InterceptSendToEndpoint original; @Test diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java index 8fbb37b..64c829b 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java @@ -57,19 +57,19 @@ public class CamelSpringRunnerPlainTest { @Autowired protected CamelContext camelContext2; - @EndpointInject(uri = "mock:a", context = "camelContext") + @EndpointInject(value = "mock:a", context = "camelContext") protected MockEndpoint mockA; - @EndpointInject(uri = "mock:b", context = "camelContext") + @EndpointInject(value = "mock:b", context = "camelContext") protected MockEndpoint mockB; - @EndpointInject(uri = "mock:c", context = "camelContext2") + @EndpointInject(value = "mock:c", context = "camelContext2") protected MockEndpoint mockC; - @Produce(uri = "direct:start", context = "camelContext") + @Produce(value = "direct:start", context = "camelContext") protected ProducerTemplate start; - @Produce(uri = "direct:start2", context = "camelContext2") + @Produce(value = "direct:start2", context = "camelContext2") protected ProducerTemplate start2; @Test diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java index fc1bb92..576a4d6 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java @@ -32,10 +32,10 @@ import org.springframework.test.context.TestPropertySource; @TestPropertySource(properties = "fixedBody=Camel") public class CamelSpringRunnerTestPropertySourceTest { - @Produce(uri = "direct:in") + @Produce("direct:in") private ProducerTemplate start; - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint end; @Test diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterFluentTemplateTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterFluentTemplateTest.java index 07a9b3f..913ecbe 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterFluentTemplateTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterFluentTemplateTest.java @@ -31,10 +31,10 @@ import org.junit.Test; // tag::example[] public class FilterFluentTemplateTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected FluentProducerTemplate fluentTemplate; @Override diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java index 174d1c4..9213e5b 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java @@ -30,10 +30,10 @@ import org.junit.Test; // START SNIPPET: example public class FilterJUnit4Test extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Test diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java index 5d32cde..8ad2636 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java @@ -31,10 +31,10 @@ import org.junit.Test; // tag::example[] public class FilterTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Override diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MockEndpointFailNoHeaderTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/MockEndpointFailNoHeaderTest.java index 8c55f4d..c878091 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MockEndpointFailNoHeaderTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/MockEndpointFailNoHeaderTest.java @@ -25,10 +25,10 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; public class MockEndpointFailNoHeaderTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Override diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java index e36c285..d8864c9 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java @@ -23,7 +23,7 @@ import org.apache.camel.Produce; */ public class MyProduceBean { - @Produce(uri = "mock:result") + @Produce("mock:result") MySender sender; public void doSomething(String body) { diff --git a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java index 4504c85..b130c89 100644 --- a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java +++ b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.instanceOf; public class TikaDetectTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java index 8deb931..5e78065 100644 --- a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java +++ b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*; public class TikaParseTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java index a18d397..aa90958 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerTest.java @@ -37,7 +37,7 @@ public class DirectMessageProducerTest extends CamelTwitterTestSupport { private static final Logger LOG = LoggerFactory.getLogger(DirectMessageProducerTest.class); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java index 4e06d9c..d9b94c8 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java @@ -32,13 +32,13 @@ import org.junit.Test; */ public class SearchByExchangeDirectTest extends CamelTwitterTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; - @Produce(uri = "direct:header") + @Produce("direct:header") protected ProducerTemplate templateHeader; - @Produce(uri = "direct:double") + @Produce("direct:double") protected ProducerTemplate templateDouble; @Test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java index 6570f25..7d1b001 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java @@ -31,7 +31,7 @@ import twitter4j.TwitterStream; public class SearchEventTest extends CamelTwitterTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; private TwitterStream twitterStream; diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java index 403fc38..8139e2e 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyTest.java @@ -37,7 +37,7 @@ public class UserProducerInOnlyTest extends CamelTwitterTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UserProducerInOnlyTest.class); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java index 2bfc71a..507f927 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutTest.java @@ -38,7 +38,7 @@ public class UserProducerInOutTest extends CamelTwitterTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UserProducerInOutTest.class); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchByExchangeDirectTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchByExchangeDirectTest.java index 7d89732..54d97af 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchByExchangeDirectTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchByExchangeDirectTest.java @@ -32,13 +32,13 @@ import org.junit.Test; @Deprecated public class SearchByExchangeDirectTest extends CamelTwitterTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; - @Produce(uri = "direct:header") + @Produce("direct:header") protected ProducerTemplate templateHeader; - @Produce(uri = "direct:double") + @Produce("direct:double") protected ProducerTemplate templateDouble; @Test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java index a058fb0..dc2ec48 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java @@ -33,7 +33,7 @@ import twitter4j.TwitterStream; @Deprecated public class SearchEventTest extends CamelTwitterTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; private TwitterStream twitterStream; diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOnlyTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOnlyTest.java index 54454d2..fdf555f 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOnlyTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOnlyTest.java @@ -38,7 +38,7 @@ import static org.hamcrest.core.Is.is; public class UserProducerInOnlyTest extends CamelTwitterTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UserProducerInOnlyTest.class); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOutTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOutTest.java index 812fa74..667551c 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOutTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/UserProducerInOutTest.java @@ -39,7 +39,7 @@ import static org.hamcrest.core.Is.is; public class UserProducerInOutTest extends CamelTwitterTestSupport { private static final Logger LOG = LoggerFactory.getLogger(UserProducerInOutTest.class); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Test diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java index a84c878..37a82e5 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java @@ -41,7 +41,7 @@ public class UndertowHttpsSpringTest { @Produce private ProducerTemplate template; - @EndpointInject(uri = "mock:input") + @EndpointInject("mock:input") private MockEndpoint mockEndpoint; @BeforeClass diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java index a53e5ac..ffd10a1 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java @@ -37,7 +37,7 @@ public class UndertowWsProducerRouteRestartTest extends BaseUndertowTest { private static final String ROUTE_ID = UndertowWsProducerRouteRestartTest.class.getSimpleName(); - @Produce(uri = "direct:shop") + @Produce("direct:shop") private ProducerTemplate producer; @Test diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java index 454af3f..7fa9a54 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java @@ -36,7 +36,7 @@ import org.junit.Test; public class UndertowWsProducerRouteTest extends BaseUndertowTest { - @Produce(uri = "direct:shop") + @Produce("direct:shop") private ProducerTemplate producer; @Test diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java index 9b457f4..0d0c5c8 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalSpringTest.java @@ -34,7 +34,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * Spring DSL. */ public final class UniVocityCsvDataFormatMarshalSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java index 8644a16..2405bb6 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatMarshalTest.java @@ -34,7 +34,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * This class tests the marshalling of {@link org.apache.camel.dataformat.univocity.UniVocityCsvDataFormat}. */ public final class UniVocityCsvDataFormatMarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java index c1750b0..56893e3 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalSpringTest.java @@ -36,7 +36,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * Spring DSL. */ public final class UniVocityCsvDataFormatUnmarshalSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java index 1973ed4..e78bf26 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityCsvDataFormatUnmarshalTest.java @@ -38,7 +38,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * Spring DSL. */ public final class UniVocityCsvDataFormatUnmarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalSpringTest.java index 7893950..1dabc02 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalSpringTest.java @@ -33,7 +33,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * the Spring DSL. */ public final class UniVocityFixedWidthDataFormatMarshalSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalTest.java index 35884b0..b3f0181 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatMarshalTest.java @@ -34,7 +34,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * This class tests the marshalling of {@link org.apache.camel.dataformat.univocity.UniVocityFixedWidthDataFormat}. */ public final class UniVocityFixedWidthDataFormatMarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalSpringTest.java index e650c23..df440ed 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalSpringTest.java @@ -36,7 +36,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * using the Spring DSL. */ public final class UniVocityFixedWidthDataFormatUnmarshalSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalTest.java index 07690e8..3daa64d 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityFixedWidthDataFormatUnmarshalTest.java @@ -37,7 +37,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * This class tests the unmarshalling of {@link org.apache.camel.dataformat.univocity.UniVocityFixedWidthDataFormat}. */ public final class UniVocityFixedWidthDataFormatUnmarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java index 2a9d431..31806a2 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalSpringTest.java @@ -33,7 +33,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * Spring DSL. */ public final class UniVocityTsvDataFormatMarshalSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java index 778fbc6..d2ef75e 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatMarshalTest.java @@ -34,7 +34,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * This class tests the marshalling of {@link org.apache.camel.dataformat.univocity.UniVocityTsvDataFormat}. */ public final class UniVocityTsvDataFormatMarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java index 7a0048e..5c35294 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalSpringTest.java @@ -36,7 +36,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * Spring DSL. */ public final class UniVocityTsvDataFormatUnmarshalSpringTest extends CamelSpringTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java index 1c7e514..784727f 100644 --- a/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java +++ b/components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/UniVocityTsvDataFormatUnmarshalTest.java @@ -37,7 +37,7 @@ import static org.apache.camel.dataformat.univocity.UniVocityTestHelper.join; * This class tests the unmarshalling of {@link org.apache.camel.dataformat.univocity.UniVocityTsvDataFormat}. */ public final class UniVocityTsvDataFormatUnmarshalTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint result; /** diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java index 7e76cca..9a73237 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java @@ -29,10 +29,10 @@ import org.junit.Test; public class VelocitySupplementalContextTest extends CamelTestSupport { - @Produce(uri = "direct:input") + @Produce("direct:input") protected ProducerTemplate inputEndpoint; - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") protected MockEndpoint outputEndpoint; @Test diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java index 5647325..bed53b8 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class VelocityValuesInPropertiesTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private MockEndpoint mock; @Test diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java index ac4be97..6080dd0 100755 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java @@ -32,10 +32,10 @@ import rx.Subscription; public class Web3jMockTestSupport extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResult; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint mockError; @Mock diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java index 3049f88..7ac6bd9 100644 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jProducerTest.java @@ -92,7 +92,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean; public class Web3jProducerTest extends Web3jMockTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Mock diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java index 4ba3b5f..3f8965d 100644 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jQuorumProducerTest.java @@ -44,7 +44,7 @@ public class Web3jQuorumProducerTest extends Web3jMockTestSupport { @Mock protected Quorum mockQuorum; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Mock diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java index 147e37e..c9ce794 100644 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jIntegrationTestSupport.java @@ -25,10 +25,10 @@ import org.apache.camel.test.junit4.CamelTestSupport; public class Web3jIntegrationTestSupport extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mockResult; - @EndpointInject(uri = "mock:error") + @EndpointInject("mock:error") protected MockEndpoint mockError; public Web3jIntegrationTestSupport() { diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java index 679b803..00d819f 100644 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java @@ -122,7 +122,7 @@ import static org.apache.camel.component.web3j.Web3jConstants.WEB3_SHA3; @Ignore("Requires a locally running Ganache instance") public class Web3jProducerGanacheTest extends Web3jIntegrationTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Test diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java index 6d73582..11c12d9 100644 --- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java +++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerMainnetTest.java @@ -33,7 +33,7 @@ import static org.apache.camel.component.web3j.Web3jConstants.WEB3_SHA3; @Ignore("Requires a local node or registration at Infura") public class Web3jProducerMainnetTest extends Web3jIntegrationTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; protected String getUrl() { diff --git a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java index f8e38ec..81976ba 100644 --- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java +++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java @@ -51,7 +51,7 @@ public class JSR356ProducerTest extends CamelTestSupport { @Rule public final TestName testName = new TestName(); - @Produce(uri = "direct:ensureServerModeSendsProperly") + @Produce("direct:ensureServerModeSendsProperly") private ProducerTemplate serverProducer; @Ignore diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java index 2fae966..5fac1ed 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java @@ -42,7 +42,7 @@ public class WebsocketProducerRouteExampleTest extends CamelTestSupport { private static CountDownLatch latch; protected int port; - @Produce(uri = "direct:shop") + @Produce("direct:shop") private ProducerTemplate producer; @Override diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java index 6810af3..1e3c727 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java @@ -41,7 +41,7 @@ public class WebsocketProducerRouteRestartTest extends CamelTestSupport { private static CountDownLatch latch; protected int port; - @Produce(uri = "direct:shop") + @Produce("direct:shop") private ProducerTemplate producer; @Override diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java index e895040..b5f4d13 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java @@ -33,7 +33,7 @@ import org.junit.Test; */ public class MarshalListTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") MockEndpoint mock; @Test diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java index c76500d..e70cfd4 100644 --- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java +++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java @@ -47,10 +47,10 @@ public class MasterEndpointTest extends AbstractJUnit4SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") protected MockEndpoint resultEndpoint; - @Produce(uri = "seda:bar") + @Produce("seda:bar") protected ProducerTemplate template; // Yeah this sucks.. why does the spring context not get shutdown diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest.java index 5662db9..9091bd9 100644 --- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest.java +++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest.java @@ -38,7 +38,7 @@ public class MasterQuartz2EndpointTest extends AbstractJUnit4SpringContextTests @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:results") + @EndpointInject("mock:results") protected MockEndpoint resultEndpoint; // Yeah this sucks.. why does the spring context not get shutdown diff --git a/docs/components/modules/ROOT/pages/cdi.adoc b/docs/components/modules/ROOT/pages/cdi.adoc index 0b85d64..21771b2 100644 --- a/docs/components/modules/ROOT/pages/cdi.adoc +++ b/docs/components/modules/ROOT/pages/cdi.adoc @@ -440,7 +440,7 @@ FluentProducerTemplate producer; |Endpoint injection (default Camel context) a| [source,java] ---- -@EndpointInject(uri = "direct:inbound") +@EndpointInject("direct:inbound") Endpoint endpoint; ---- @@ -455,7 +455,7 @@ Endpoint endpoint; |Endpoint injection (Camel context by name) a| [source,java] ---- -@EndpointInject(uri = "direct:inbound", +@EndpointInject(value = "direct:inbound", context = "foo") Endpoint contextEndpoint; ---- diff --git a/docs/components/modules/ROOT/pages/disruptor-component.adoc b/docs/components/modules/ROOT/pages/disruptor-component.adoc index bdaad16..8e1d0ab 100644 --- a/docs/components/modules/ROOT/pages/disruptor-component.adoc +++ b/docs/components/modules/ROOT/pages/disruptor-component.adoc @@ -342,7 +342,7 @@ but notice how we can use @Consume to consume from the Disruptor. ------------------------------------------- public class FooEventConsumer { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") private ProducerTemplate destination; @Consume(ref = "foo") diff --git a/docs/components/modules/ROOT/pages/ehcache-component.adoc b/docs/components/modules/ROOT/pages/ehcache-component.adoc index 02ebb16..189af6d 100644 --- a/docs/components/modules/ROOT/pages/ehcache-component.adoc +++ b/docs/components/modules/ROOT/pages/ehcache-component.adoc @@ -218,7 +218,7 @@ public class EhcacheAggregationRepositoryRoutesTest extends CamelTestSupport { private static final int SUM = IntStream.of(VALUES).reduce(0, (a, b) -> a + b); private static final String CORRELATOR = "CORRELATOR"; - @EndpointInject(uri = ENDPOINT_MOCK) + @EndpointInject(ENDPOINT_MOCK) private MockEndpoint mock; @Produce(uri = ENDPOINT_DIRECT) diff --git a/docs/components/modules/ROOT/pages/spring-boot.adoc b/docs/components/modules/ROOT/pages/spring-boot.adoc index 316219d..2136383 100644 --- a/docs/components/modules/ROOT/pages/spring-boot.adoc +++ b/docs/components/modules/ROOT/pages/spring-boot.adoc @@ -629,7 +629,7 @@ public class MyApplicationTest { @Autowired private ProducerTemplate template; - @EndpointInject(uri = "mock:direct:end") + @EndpointInject("mock:direct:end") MockEndpoint mock; @Test diff --git a/docs/components/modules/ROOT/pages/test-spring.adoc b/docs/components/modules/ROOT/pages/test-spring.adoc index 20cf9e9..06ee76c 100644 --- a/docs/components/modules/ROOT/pages/test-spring.adoc +++ b/docs/components/modules/ROOT/pages/test-spring.adoc @@ -115,7 +115,7 @@ Here is a simple unit test using JUnit 3.x support from Spring Test using http:/ @ContextConfiguration public class FilterTest extends SpringRunWithTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce(uri = "direct:start") @@ -191,7 +191,7 @@ You can completely avoid using an XML configuration file by using http://camel.a @ContextConfiguration(classes = {FilterTest.ContextConfig.class}, loader = CamelSpringDelegatingTestContextLoader.class) public class FilterTest extends AbstractJUnit4SpringContextTests { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce(uri = "direct:start") @@ -250,7 +250,7 @@ public class MyCamelTest { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; @Test @@ -279,7 +279,7 @@ public class MyCamelTest { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; @Test @@ -360,13 +360,13 @@ public class CamelSpringJUnit4ClassRunnerPlainTest { protected MockEndpoint mockB; - @EndpointInject(uri = "mock:c", context = "camelContext2") + @EndpointInject(value = "mock:c", context = "camelContext2") protected MockEndpoint mockC; @Produce(uri = "direct:start2", context = "camelContext2") protected ProducerTemplate start2; - @EndpointInject(uri = "mock:log:org.apache.camel.test.junit4.spring", context = "camelContext2") + @EndpointInject(value = "mock:log:org.apache.camel.test.junit4.spring", context = "camelContext2") protected MockEndpoint mockLog; @Test @@ -391,7 +391,7 @@ public class MyCamelTest extends AbstractJUnit38SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; public void testMocksAreValid() throws Exception { @@ -416,7 +416,7 @@ public class MyCamelTest extends AbstractJUnit38SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; public void testMocksAreValid() throws Exception { @@ -442,7 +442,7 @@ To send or receive messages you should use the http://camel.apache.org/bean-inte [source,java] ---- public class Foo { - @EndpointInject(uri = "activemq:foo.bar") + @EndpointInject("activemq:foo.bar") ProducerTemplate producer; public void doSomething() { diff --git a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc index 2a0e177..2faede8 100644 --- a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc +++ b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc @@ -156,7 +156,7 @@ public class MyCamelTest {     @Autowired     protected CamelContext camelContext; -    @EndpointInject(uri = "mock:foo") +    @EndpointInject("mock:foo")     protected MockEndpoint foo; @@ -193,7 +193,7 @@ public class MyCamelTest {     @Autowired     protected CamelContext camelContext; -    @EndpointInject(uri = "mock:foo") +    @EndpointInject("mock:foo")     protected MockEndpoint foo; @@ -297,13 +297,13 @@ public class CamelSpringJUnit4ClassRunnerPlainTest { protected MockEndpoint mockB; - @EndpointInject(uri = "mock:c", context = "camelContext2") + @EndpointInject(value = "mock:c", context = "camelContext2") protected MockEndpoint mockC; @Produce(uri = "direct:start2", context = "camelContext2") protected ProducerTemplate start2; - @EndpointInject(uri = "mock:log:org.apache.camel.test.junit4.spring", context = "camelContext2") + @EndpointInject(value = "mock:log:org.apache.camel.test.junit4.spring", context = "camelContext2") protected MockEndpoint mockLog; @Test @@ -334,7 +334,7 @@ public class MyCamelTest extends AbstractJUnit38SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; public void testMocksAreValid() throws Exception { @@ -363,7 +363,7 @@ public class MyCamelTest extends AbstractJUnit38SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:foo") + @EndpointInject("mock:foo") protected MockEndpoint foo; public void testMocksAreValid() throws Exception { diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java b/examples/camel-example-fhir-auth-tx-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java index ddc00c1..44e6005 100644 --- a/examples/camel-example-fhir-auth-tx-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java +++ b/examples/camel-example-fhir-auth-tx-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java @@ -37,7 +37,7 @@ import org.springframework.boot.test.context.SpringBootTest; @MockEndpointsAndSkip("fhir*") public class MyCamelApplicationTest { - @EndpointInject(uri = "mock:fhir:transaction/withResources") + @EndpointInject("mock:fhir:transaction/withResources") private MockEndpoint mock; @Before diff --git a/examples/camel-example-fhir-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java b/examples/camel-example-fhir-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java index 479bc01..2d1618a 100644 --- a/examples/camel-example-fhir-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java +++ b/examples/camel-example-fhir-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java @@ -37,7 +37,7 @@ import org.springframework.boot.test.context.SpringBootTest; @MockEndpointsAndSkip("fhir*") public class MyCamelApplicationTest { - @EndpointInject(uri = "mock:fhir:create/resource") + @EndpointInject("mock:fhir:create/resource") private MockEndpoint mock; @Before diff --git a/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java b/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java index a385063..4d1e221 100644 --- a/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java +++ b/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java @@ -43,7 +43,7 @@ public class FooApplicationTest { @Autowired private CamelContext camelContext; - @EndpointInject(uri = "mock:log:foo") + @EndpointInject("mock:log:foo") private MockEndpoint mock; @Test diff --git a/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java b/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java index 8698e33..584be2e 100644 --- a/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java +++ b/examples/camel-example-transformer-demo/src/test/java/org/apache/camel/example/transformer/OrderRouteSpringTest.java @@ -42,16 +42,16 @@ import static org.junit.Assert.assertEquals; @ContextConfiguration(value = "/META-INF/spring/camel-context.xml", loader = CamelSpringDelegatingTestContextLoader.class) @MockEndpointsAndSkip("direct:csv") public class OrderRouteSpringTest { - @Produce(uri = "direct:java") + @Produce("direct:java") protected ProducerTemplate javaProducer; - @Produce(uri = "direct:xml") + @Produce("direct:xml") protected ProducerTemplate xmlProducer; - @Produce(uri = "direct:json") + @Produce("direct:json") protected ProducerTemplate jsonProducer; - @EndpointInject(uri = "mock:direct:csv") + @EndpointInject("mock:direct:csv") private MockEndpoint mockCsv; @Before diff --git a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java index a925afe..8fd007e 100644 --- a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java +++ b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class BlueprintResolveComponentFromCamelContextTest extends CamelBlueprintTestSupport { - @EndpointInject(uri = "mock://result") + @EndpointInject("mock://result") MockEndpoint result; @Override diff --git a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java index 8276b51..dd9f784 100644 --- a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java +++ b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextA.java @@ -38,7 +38,7 @@ public class RoutesContextA extends RouteBuilder { @Uri(value = "seda:A.a") Endpoint a; - @EndpointInject(uri = "mock:A.b", context = "contextA") + @EndpointInject(value = "mock:A.b", context = "contextA") MockEndpoint b; @Inject diff --git a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java index 9849a36..8a7d62f 100644 --- a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java +++ b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextB.java @@ -38,7 +38,7 @@ public class RoutesContextB extends RouteBuilder { @Uri(value = "seda:B.a") Endpoint a; - @EndpointInject(uri = "mock:B.b", context = "contextB") + @EndpointInject(value = "mock:B.b", context = "contextB") MockEndpoint b; @Inject diff --git a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java index 212cc1b..bb81b8d 100644 --- a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java +++ b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextC.java @@ -38,7 +38,7 @@ public class RoutesContextC extends RouteBuilder { @Uri("seda:C.a") Endpoint a; - @EndpointInject(uri = "mock:C.b", context = "contextC") + @EndpointInject(value = "mock:C.b", context = "contextC") MockEndpoint b; @Inject diff --git a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java index 1f1a3b6..9faf8f9 100644 --- a/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java +++ b/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/RoutesContextD.java @@ -38,7 +38,7 @@ public class RoutesContextD extends RouteBuilder { @Uri("seda:D.a") Endpoint a; - @EndpointInject(uri = "mock:D.b", context = "contextD") + @EndpointInject(value = "mock:D.b", context = "contextD") MockEndpoint b; @Inject diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java index d04645a..8568b7e 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java @@ -58,9 +58,9 @@ public class SpringFileAntPathMatcherRemoteFileFilterTest extends AbstractJUnit4 protected String expectedBody = "Godday World"; @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "ref:myFTPEndpoint") + @EndpointInject("ref:myFTPEndpoint") protected Endpoint inputFTP; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; protected boolean canRunOnThisPlatform() { diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java index b095ff5..8d60a67 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java @@ -54,10 +54,10 @@ public class SpringFtpEndpointTest extends AbstractJUnit4SpringContextTests { @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "ref:myFTPEndpoint") + @EndpointInject("ref:myFTPEndpoint") protected Endpoint inputFTP; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java index 75aab4b..8b6e306 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java @@ -56,7 +56,7 @@ public class CamelGreeterTest extends AbstractJUnit4SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:resultEndpoint") + @EndpointInject("mock:resultEndpoint") protected MockEndpoint resultEndpoint; @BeforeClass diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java index 115bd22..520c851 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java @@ -41,10 +41,10 @@ public class CxfToJmsInOutTest extends AbstractJUnit4SpringContextTests { @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "mock:cxf.input") + @EndpointInject("mock:cxf.input") protected MockEndpoint inputEndpoint; - @EndpointInject(uri = "mock:jms.output") + @EndpointInject("mock:jms.output") protected MockEndpoint outputEndpoint; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java index 3897825..b2afbdf 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java @@ -33,13 +33,13 @@ public class MulticastCxfTest extends CamelSpringTestSupport { System.setProperty("MulticastCxfTest.port", Integer.toString(port)); } - @EndpointInject(uri = "mock:reply") + @EndpointInject("mock:reply") protected MockEndpoint replyEndpoint; - @EndpointInject(uri = "mock:reply2") + @EndpointInject("mock:reply2") protected MockEndpoint reply2Endpoint; - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") protected MockEndpoint outputEndpoint; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java index 9ae1081..f0823cf 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java @@ -39,13 +39,13 @@ public class RecipientListCxf2Test extends CamelSpringTestSupport { System.setProperty("RecipientListCxf2Test.port2", Integer.toString(port2)); } - @EndpointInject(uri = "mock:reply") + @EndpointInject("mock:reply") protected MockEndpoint replyEndpoint; - @EndpointInject(uri = "mock:reply2") + @EndpointInject("mock:reply2") protected MockEndpoint reply2Endpoint; - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") protected MockEndpoint outputEndpoint; @Override diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java index bd31033..6a0209f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java @@ -39,13 +39,13 @@ public class RecipientListCxfTest extends CamelSpringTestSupport { System.setProperty("RecipientListCxfTest.port2", Integer.toString(port2)); } - @EndpointInject(uri = "mock:reply") + @EndpointInject("mock:reply") protected MockEndpoint replyEndpoint; - @EndpointInject(uri = "mock:reply2") + @EndpointInject("mock:reply2") protected MockEndpoint reply2Endpoint; - @EndpointInject(uri = "mock:output") + @EndpointInject("mock:output") protected MockEndpoint outputEndpoint; @Override diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java index 0004526..1c183dc 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java @@ -43,10 +43,10 @@ public class Http4EndpointTest extends AbstractJUnit4SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mock; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java index 2d72371..a004d1e 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java @@ -44,10 +44,10 @@ public class Http4MaxConnectionPerHostTest extends @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mock; @BeforeClass diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java index 2c0fef7..461cf0f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java @@ -33,10 +33,10 @@ public class HttpEndpointTest extends AbstractJUnit4SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mock; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java index cdcb62f..cdfa62a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java @@ -33,10 +33,10 @@ public class HttpMaxConnectionPerHostTest extends AbstractJUnit4SpringContextTes @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mock; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java index 422e94f..aece46a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/InterceptEndpointTest.java @@ -31,10 +31,10 @@ public class InterceptEndpointTest extends AbstractJUnit4SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") protected ProducerTemplate producer; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint mock; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IntercepFromAndStrategyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IntercepFromAndStrategyTest.java index fc76e4e..f013a2e 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IntercepFromAndStrategyTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IntercepFromAndStrategyTest.java @@ -27,13 +27,13 @@ import org.junit.Test; public class IntercepFromAndStrategyTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; - @EndpointInject(uri = "mock:intercepted") + @EndpointInject("mock:intercepted") protected MockEndpoint interceptedEndpoint; - @Produce(uri = "direct:start") + @Produce("direct:start") protected ProducerTemplate template; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java index 4793f4d..60781ae 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java @@ -45,10 +45,10 @@ public class JettyFileMulticastTest extends AbstractJUnit4SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:resultEndpoint") + @EndpointInject("mock:resultEndpoint") protected MockEndpoint resultEndpoint; - @EndpointInject(uri = "mock:fileEndpoint") + @EndpointInject("mock:fileEndpoint") protected MockEndpoint fileEndpoint; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java index ff3ad35..92a0a66 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java @@ -45,7 +45,7 @@ public class JettyJmsTest extends AbstractJUnit4SpringContextTests { @Autowired protected CamelContext camelContext; - @EndpointInject(uri = "mock:resultEndpoint") + @EndpointInject("mock:resultEndpoint") protected MockEndpoint resultEndpoint; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java index 0bb6213..678b86b 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java @@ -30,7 +30,7 @@ public class FileToJmsTest extends AbstractJUnit4SpringContextTests { @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java index 409f452..f8b4ef8 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java @@ -31,16 +31,16 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration public class JmsConsumerShutdownTest extends AbstractJUnit4SpringContextTests { - @Produce(uri = "activemq:start") + @Produce("activemq:start") protected ProducerTemplate activemq; - @Produce(uri = "seda:start") + @Produce("seda:start") protected ProducerTemplate seda; - @EndpointInject(uri = "mock:end") + @EndpointInject("mock:end") protected MockEndpoint end; - @EndpointInject(uri = "mock:exception") + @EndpointInject("mock:exception") protected MockEndpoint exception; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java index 582097a..ed51600 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPollingConsumerTest.java @@ -33,16 +33,16 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration public class JmsPollingConsumerTest extends AbstractJUnit4SpringContextTests { - @Produce(uri = "activemq:startConsumer") + @Produce("activemq:startConsumer") protected ProducerTemplate startConsumer; - @Produce(uri = "direct:startConsumer") + @Produce("direct:startConsumer") protected ProducerTemplate startDirectConsumer; - @Produce(uri = "activemq:queue") + @Produce("activemq:queue") protected ProducerTemplate queue; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; /** diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java index 19e312c..961521f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/mail/SpringMailEndpointTest.java @@ -36,7 +36,7 @@ public class SpringMailEndpointTest extends AbstractJUnit4SpringContextTests { @Autowired protected ProducerTemplate template; - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint result; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/EchoProduceTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/EchoProduceTest.java index 56f2bb0..d87e32a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/EchoProduceTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/proxy/EchoProduceTest.java @@ -26,7 +26,7 @@ import org.junit.Test; */ public class EchoProduceTest extends CamelTestSupport { - @Produce(uri = "direct:start") + @Produce("direct:start") private Echo echo; @Test diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java index 0878b5e..32dd082 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/Jms2RequiresNewTest.java @@ -45,16 +45,16 @@ public class Jms2RequiresNewTest extends AbstractJUnit4SpringContextTests { @Autowired private CamelContext camelContext; - @EndpointInject(uri = "mock:result1") + @EndpointInject("mock:result1") private MockEndpoint result1; - @EndpointInject(uri = "mock:result2") + @EndpointInject("mock:result2") private MockEndpoint result2; - @EndpointInject(uri = "mock:dlq") + @EndpointInject("mock:dlq") private MockEndpoint dlq; - @EndpointInject(uri = "direct:start") + @EndpointInject("direct:start") private ProducerTemplate start; @Before diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java index 1e5520b..4fd255a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java @@ -40,7 +40,7 @@ public class JmsToHttpRoute extends SpringRouteBuilder { @Resource(name = "PROPAGATION_REQUIRED") protected SpringTransactionPolicy required; - @EndpointInject(uri = "ref:data") + @EndpointInject("ref:data") protected Endpoint data; protected String nok = "nok"; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java index 2bfe2bc..1934a0b 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java @@ -35,13 +35,13 @@ import static org.junit.Assert.assertEquals; public class JmsToHttpTXTest extends AbstractJUnit4SpringContextTests { // use uri to refer to our mock - @EndpointInject(uri = "mock:rollback") + @EndpointInject("mock:rollback") MockEndpoint mock; // use the spring id to refer to the endpoint we should send data to // notice using this id we can setup the actual endpoint in spring XML // and we can even use spring ${ } property in the spring XML - @EndpointInject(uri = "ref:data") + @EndpointInject("ref:data") private ProducerTemplate template; // the ok response to expect diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java index 2b90474..13bf903 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java @@ -43,10 +43,10 @@ public class JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTes @Autowired private ProducerTemplate template; - @EndpointInject(uri = "ref:data") + @EndpointInject("ref:data") private Endpoint data; - @EndpointInject(uri = "mock:rollback") + @EndpointInject("mock:rollback") private MockEndpoint rollback; // the ok response to expect diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java index d96d148..fb4a53a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java @@ -44,10 +44,10 @@ public class JmsToHttpTXWithOnExceptionTest extends AbstractJUnit4SpringContextT @Autowired private ProducerTemplate template; - @EndpointInject(uri = "ref:data") + @EndpointInject("ref:data") private Endpoint data; - @EndpointInject(uri = "mock:rollback") + @EndpointInject("mock:rollback") private MockEndpoint rollback; // the ok response to expect diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java index d326eb4..8b705dc 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java @@ -36,13 +36,13 @@ import static org.junit.Assert.assertEquals; public class JmsToHttpTXWithRollbackTest extends AbstractJUnit4SpringContextTests { // use uri to refer to our mock - @EndpointInject(uri = "mock:rollback") + @EndpointInject("mock:rollback") MockEndpoint mock; // use the spring id to refer to the endpoint we should send data to // notice using this id we can setup the actual endpoint in spring XML // and we can even use spring ${ } property in the spring XML - @EndpointInject(uri = "ref:data") + @EndpointInject("ref:data") private ProducerTemplate template; // the ok response to expect