You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ap...@apache.org on 2026/05/07 10:02:58 UTC
(camel) 01/01: Revert "Enforce import style: auto-shorten FQCNs via OpenRewrite in CI (#22935)"
This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch revert-22935-enforce-fqcn-imports
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4838027338f289123150695607506db254b14b5b
Author: Aurélien Pupier <ap...@ibm.com>
AuthorDate: Thu May 7 12:02:45 2026 +0200
Revert "Enforce import style: auto-shorten FQCNs via OpenRewrite in CI (#22935)"
This reverts commit f5156af8d76486d5c8d10883a5e413422b6680bf.
---
.github/workflows/main-build.yml | 2 -
.github/workflows/pr-build-main.yml | 2 +-
AGENTS.md | 10 -
.../org/apache/camel/maven/RouteCoverageMojo.java | 2 +-
.../component/activemq/ActiveMQConfiguration.java | 4 +-
.../component/activemq6/ActiveMQConfiguration.java | 4 +-
.../camel/component/docling/DoclingProducer.java | 5 +-
.../docling/DoclingCustomArgsValidationTest.java | 32 +-
.../docling/DoclingSecureTempFileTest.java | 3 +-
.../docling/integration/BatchProcessingIT.java | 5 +-
.../integration/DoclingServeProducerIT.java | 3 +-
.../docling/integration/MetadataExtractionIT.java | 2 +-
.../langchain4j/agent/api/AgentConfiguration.java | 3 +-
.../agent/api/AgentConfigurationTest.java | 11 +-
.../guardrails/PromptInjectionGuardrailTest.java | 4 +-
.../LangChain4jAgentAutoConversionTest.java | 3 +-
...angChain4jEmbeddingsComponentNeo4jTargetIT.java | 2 +-
.../LangChain4jEmbeddingStoreProducer.java | 2 +-
.../tokenizer/LangChain4JCharacterTokenizer.java | 3 +-
.../tokenizer/LangChain4JLineTokenizer.java | 3 +-
.../tokenizer/LangChain4JParagraphTokenizer.java | 3 +-
.../tokenizer/LangChain4JSentenceTokenizer.java | 3 +-
.../tokenizer/LangChain4JWordTokenizer.java | 3 +-
.../camel/component/neo4j/Neo4jProducer.java | 5 +-
.../camel/component/openai/OpenAIEndpoint.java | 3 +-
.../camel/component/openai/OpenAIProducer.java | 6 +-
.../component/openai/OpenAIProducerMockTest.java | 4 +-
.../openai/OpenAISslConfigurationTest.java | 9 +-
.../openai/OpenAISslContextParametersTest.java | 3 +-
.../component/as2/api/util/AS2HeaderUtils.java | 3 +-
.../camel/component/as2/api/util/MicUtils.java | 3 +-
.../camel/component/as2/api/AS2MessageTest.java | 16 +-
.../as2/api/AS2UnencryptedMessageTest.java | 9 +-
.../camel/component/as2/AS2ClientManagerIT.java | 3 +-
.../component/as2/AS2ServerManagerITBase.java | 2 +-
.../component/as2/AS2ServerWildcardPatternIT.java | 6 +-
.../java/org/apache/camel/avro/generated/Key.java | 47 +-
.../camel/avro/generated/KeyValueProtocol.java | 27 +-
.../org/apache/camel/avro/generated/Value.java | 49 +-
.../component/avro/spi/JettyHttpServerFactory.java | 3 +-
.../camel/dataformat/avro/SpecificDataNoCache.java | 5 +-
.../camel/dataformat/avro/example/DateRecord.java | 113 +-
.../camel/dataformat/avro/example/Value.java | 51 +-
.../aws2/bedrock/runtime/BedrockConfiguration.java | 7 +-
.../aws2/bedrock/runtime/BedrockProducer.java | 70 +-
.../runtime/stream/ConverseStreamHandler.java | 7 +-
.../runtime/integration/BedrockGuardrailsIT.java | 77 +-
.../runtime/integration/BedrockProducerIT.java | 31 +-
.../component/aws2/kinesis/Kinesis2Consumer.java | 3 +-
.../camel/component/aws2/s3/AWS2S3Producer.java | 8 +-
.../camel/component/aws2/ses/Ses2Producer.java | 6 +-
.../azure/eventgrid/EventGridConfiguration.java | 7 +-
.../component/file/azure/FilesOperations.java | 5 +-
.../azure/servicebus/ServiceBusConfiguration.java | 4 +-
.../storage/blob/operations/BlobOperations.java | 3 +-
.../storage/blob/integration/BlobOperationsIT.java | 5 +-
.../apache/camel/component/bean/BeanComponent.java | 3 +-
.../apache/camel/component/bean/MethodInfo.java | 15 +-
.../camel/component/beanclass/ClassComponent.java | 3 +-
.../dataformat/bindy/BindyFixedLengthFactory.java | 6 +-
.../dataformat/bindy/csv/BindyCsvDataFormat.java | 2 +-
.../bindy/format/factories/DateFormatFactory.java | 2 +-
.../bindy/kvp/BindyKeyValuePairDataFormat.java | 2 +-
.../classtype/BindyCsvClassTypeAsStringTest.java | 4 +-
.../csv/BindyCarQuoteAndCommaDelimiterTest.java | 2 +-
.../BindyComplexCsvGenerateHeaderMarshallTest.java | 2 +-
.../bindy/csv/BindyComplexCsvMarshallTest.java | 2 +-
.../BindyComplexCsvUnmarshallEmptyStreamTest.java | 3 +-
.../bindy/csv/BindyComplexCsvUnmarshallTest.java | 3 +-
...mplexCsvUnmarshallUnwrapSingleInstanceTest.java | 3 +-
.../bindy/csv/BindyCsvBigFileUnmarshallTest.java | 3 +-
.../csv/BindyInlinedQuotesCsvUnmarshallTest.java | 2 +-
.../bindy/csv/BindyPipeDelimiterTest.java | 4 +-
.../bindy/csv/BindyPojoSimpleCsvMarshallTest.java | 2 +-
.../BindySimpleCsvBooleanFalseMarshallTest.java | 2 +-
.../csv/BindySimpleCsvBooleanTrueMarshallTest.java | 2 +-
.../csv/BindySimpleCsvBooleanUnmarshallTest.java | 2 +-
.../BindySimpleCsvGenerateHeaderMarshallTest.java | 2 +-
...indySimpleCsvMandatoryFieldsUnmarshallTest.java | 3 +-
.../bindy/csv/BindySimpleCsvMarshallDslTest.java | 2 +-
...BindySimpleCsvMarshallPositionModifiedTest.java | 2 +-
.../bindy/csv/BindySimpleCsvMarshallTest.java | 2 +-
.../csv/BindySimpleCsvMarshallTrimClipTest.java | 2 +-
.../bindy/csv/BindySimpleCsvNullMarshallTest.java | 2 +-
.../csv/BindySimpleCsvOneToManyMarshallTest.java | 2 +-
...ndySimpleCsvRemoveWhitespaceUnmarshallTest.java | 3 +-
.../BindySimpleCsvSkipFirstLineUnmarshallTest.java | 3 +-
.../BindySimpleCsvUnmarshallBadIntegerTest.java | 3 +-
...ndySimpleCsvUnmarshallPositionModifiedTest.java | 3 +-
.../bindy/csv/BindySimpleCsvUnmarshallTest.java | 2 +-
...BindySingleQuoteStartWordCsvUnmarshallTest.java | 2 +-
.../csv/BindySingleQuotesCsvUnmarshallTest.java | 3 +-
...esWithDoubleQuotesInFieldCsvUnmarshallTest.java | 2 +-
.../bindy/csv/BindyTabSeparatorTest.java | 2 +-
.../BindyMarshalUnmarshalWithDefaultValueTest.java | 4 +-
.../bindy/csv2/BindyMarshalUnmarshalssueTest.java | 4 +-
.../bindy/csv2/BindyMarshalWithQuoteTest.java | 2 +-
.../bindy/csv2/BindyUnmarshalCommaIssue2Test.java | 2 +-
.../bindy/csv2/BindyUnmarshalCommaIssueTest.java | 2 +-
.../BindyComplexKeyValuePairStandaloneTest.java | 8 +-
...ComplexOneToManyKeyValuePairUnMarshallTest.java | 2 +-
.../BindySimpleKeyValuePairMarshallDslTest.java | 2 +-
.../fix/BindySimpleKeyValuePairMarshallTest.java | 2 +-
.../BindySimpleKeyValuePairNullMarshallTest.java | 2 +-
.../BindySimpleKeyValuePairSortedMarshallTest.java | 2 +-
.../BindySimpleKeyValuePairTabMarshallTest.java | 2 +-
...eKeyValuePairWithoutSectionMarshallDslTest.java | 2 +-
.../component/box/BoxCollaborationsManagerIT.java | 13 +-
.../camel/component/box/BoxCommentsManagerIT.java | 11 +-
.../camel/component/box/BoxEventLogsManagerIT.java | 3 +-
.../camel/component/box/BoxFilesManagerIT.java | 40 +-
.../camel/component/box/BoxFoldersManagerIT.java | 19 +-
.../camel/component/box/BoxGroupsManagerIT.java | 16 +-
.../camel/component/box/BoxSearchManagerIT.java | 3 +-
.../camel/component/box/BoxTasksManagerIT.java | 14 +-
.../camel/component/box/BoxUsersManagerIT.java | 20 +-
.../braintree/PaymentMethodNonceGatewayIT.java | 6 +-
.../camel/component/braintree/ReportGatewayIT.java | 3 +-
.../braintree/SettlementBatchSummaryGatewayIT.java | 5 +-
.../component/braintree/SubscriptionGatewayIT.java | 19 +-
.../component/braintree/TransactionGatewayIT.java | 15 +-
.../camel/component/browse/BrowseComponent.java | 3 +-
.../camel/component/camunda/CamundaComponent.java | 6 +-
.../java/org/apache/camel/coap/CoAPEndpoint.java | 3 +-
.../camel/component/cometd/CometdProducer.java | 3 +-
.../CometdProducerConsumerAuthenticatedTest.java | 2 +-
.../component/controlbus/ControlBusComponent.java | 3 +-
.../camel/component/cxf/jaxrs/CxfConverter.java | 9 +-
.../camel/component/cxf/jaxrs/CxfRsBinding.java | 10 +-
.../component/cxf/jaxrs/DefaultCxfRsBinding.java | 2 +-
.../camel/component/cxf/jaxws/CxfEndpoint.java | 4 +-
.../camel/component/cxf/jaxws/CxfProducer.java | 3 +-
.../component/cxf/jaxws/DefaultCxfBinding.java | 6 +-
.../cxf/jaxws/DefaultPayloadProviderSEI.java | 3 +-
.../cxf/jaxws/CxfProducerProtocalHeaderTest.java | 3 +-
.../component/cxf/jaxws/CxfProducerRouterTest.java | 12 +-
.../camel/component/cxf/jaxws/CxfProducerTest.java | 5 +-
.../component/cxf/jaxws/DefaultCxfBindingTest.java | 39 +-
.../cxf/jaxws/EchoServiceSessionImpl.java | 3 +-
.../cxf/multipart/MultiPartInvokeImpl.java | 11 +-
.../cxf/soap/headers/HeaderTesterImpl.java | 10 +-
.../headers/HeaderTesterWithInsertionImpl.java | 3 +-
.../apache/camel/non_wrapper/PersonProcessor.java | 5 +-
.../org/apache/camel/wsdl_first/PersonImpl12.java | 3 +-
.../apache/camel/wsdl_first/PersonProcessor.java | 5 +-
.../cxf/spring/jaxws/CxfSpringEndpoint.java | 6 +-
.../component/cxf/AbstractCxfWsdlFirstTest.java | 3 +-
.../component/cxf/CxfDispatchMessageTest.java | 5 +-
.../component/cxf/CxfDispatchPayloadTest.java | 5 +-
.../cxf/CxfPayloadProviderRouterTest.java | 4 +-
.../cxf/CxfPayloadWsdlWithoutSEITest.java | 3 +-
.../component/cxf/EchoServiceSessionImpl.java | 3 +-
.../org/apache/camel/component/cxf/HelloImpl.java | 3 +-
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 3 +-
.../camel/component/cxf/mtom/HelloImpl12.java | 7 +-
.../camel/component/cxf/mtom/MtomTestHelper.java | 3 +-
.../component/cxf/multipart/CXFMultiPartTest.java | 5 +-
.../cxf/multipart/MultiPartInvokeImpl.java | 11 +-
.../soap/headers/CxfMessageHeadersRelayTest.java | 12 +-
.../cxf/soap/headers/HeaderTesterImpl.java | 10 +-
.../headers/HeaderTesterWithInsertionImpl.java | 3 +-
.../cxf/spring/CxfEndpointBeansRouterTest.java | 3 +-
.../cxf/wssecurity/server/GreeterImpl.java | 10 +-
.../apache/camel/non_wrapper/PersonProcessor.java | 5 +-
.../org/apache/camel/wsdl_first/PersonImpl12.java | 3 +-
.../apache/camel/wsdl_first/PersonProcessor.java | 5 +-
.../cxf/common/header/CxfHeaderHelperTest.java | 13 +-
.../cxf/common/message/CxfMessageHelperTest.java | 5 +-
.../message/DefaultCxfMessageMapperTest.java | 2 +-
.../component/cxf/transport/CamelConduitTest.java | 3 +-
.../cxf/transport/JaxWSCamelTestSupport.java | 6 +-
.../component/cxf/transport/CamelDestination.java | 4 +-
.../component/cxf/transport/CamelOutputStream.java | 11 +-
.../cxf/transport/message/CxfMessageHelper.java | 6 +-
.../transport/message/DefaultCxfMessageMapper.java | 18 +-
.../cxf/common/header/CxfHeaderHelperTest.java | 13 +-
.../cxf/common/message/CxfMessageHelperTest.java | 5 +-
.../message/DefaultCxfMessageMapperTest.java | 2 +-
.../cxf/transport/JaxWSCamelTestSupport.java | 6 +-
.../camel/component/dataset/DataSetComponent.java | 3 +-
.../component/dataset/DataSetTestComponent.java | 3 +-
.../org/apache/camel/language/datasonnet/CML.java | 9 +-
.../language/datasonnet/DatasonnetExpression.java | 4 +-
.../component/debezium/DebeziumConsumerTest.java | 3 +-
.../camel/component/dhis2/Dhis2Component.java | 3 +-
.../camel/component/dhis2/Dhis2DeleteIT.java | 3 +-
.../apache/camel/component/dhis2/Dhis2GetIT.java | 3 +-
.../apache/camel/component/dhis2/Dhis2PostIT.java | 3 +-
.../apache/camel/component/dhis2/Dhis2PutIT.java | 3 +-
.../apache/camel/diagram/RouteDiagramRenderer.java | 5 +-
.../docker/it/FakeDockerCmdExecFactory.java | 6 +-
.../component/camelevent/CamelEventComponent.java | 3 +-
.../camel/component/fhir/FhirCapabilitiesIT.java | 5 +-
.../camel/component/fhir/FhirOperationIT.java | 6 +-
.../camel/component/file/GenericFileEndpoint.java | 5 +-
.../component/flink/DataStreamConfigurationIT.java | 7 +-
.../component/flink/DataStreamEdgeCasesIT.java | 4 +-
.../component/flink/DataStreamProducerTest.java | 3 +-
.../file/remote/CamelFTPParserFactory.java | 3 +-
.../RemoteFileProducerPreWriteCheckTest.java | 3 +-
.../github/producer/PullRequestFilesProducer.java | 4 +-
.../component/google/calendar/CalendarAclIT.java | 3 +-
.../google/calendar/CalendarCalendarListIT.java | 4 +-
.../google/calendar/CalendarColorsIT.java | 3 +-
.../google/calendar/CalendarEventsIT.java | 7 +-
.../google/calendar/CalendarFreebusyIT.java | 5 +-
.../google/calendar/CalendarSettingsIT.java | 6 +-
.../drive/InteractiveGoogleDriveClientFactory.java | 3 +-
.../camel/component/google/drive/DriveAboutIT.java | 3 +-
.../component/google/drive/DriveChangesIT.java | 7 +-
.../component/google/drive/DriveCommentsIT.java | 9 +-
.../camel/component/google/drive/DriveFilesIT.java | 3 +-
.../component/google/drive/DrivePermissionsIT.java | 2 +-
.../component/google/drive/DriveRepliesIT.java | 10 +-
.../component/google/drive/DriveRevisionsIT.java | 3 +-
.../component/google/drive/FileConverterIT.java | 2 +-
.../component/google/drive/FilesConsumerIT.java | 2 +-
.../drive/GoogleDriveFilesConverterTest.java | 5 +-
.../mail/stream/GoogleMailStreamConsumer.java | 4 +-
.../camel/component/google/mail/GmailUsersIT.java | 3 +-
.../component/google/mail/GmailUsersLabelsIT.java | 7 +-
.../google/mail/GmailUsersMessagesIT.java | 5 +-
.../component/google/mail/GmailUsersThreadsIT.java | 6 +-
.../storage/localstorage/FakeStorageRpc.java | 3 +-
.../google/vertexai/GoogleVertexAIProducer.java | 4 +-
.../apache/camel/groovy/json/NodeToJsonHelper.java | 8 +-
.../HazelcastReliableTopicConsumerTest.java | 3 +-
.../hazelcast/HazelcastTopicConsumerTest.java | 3 +-
.../camel/component/hl7/Hl7TerserLanguage.java | 3 +-
.../http/base/cookie/ExchangeCookieHandler.java | 2 +-
.../camel/http/common/DefaultHttpBinding.java | 3 +-
.../camel/http/common/HttpCommonEndpoint.java | 3 +-
.../http/common/cookie/CookieHandlerTest.java | 3 +-
.../http/HttpProducerSelectMethodTest.java | 3 +-
.../component/huaweicloud/dms/DMSComponent.java | 3 +-
.../huaweicloud/frs/FaceRecognitionComponent.java | 3 +-
.../org/apache/camel/FunctionGraphComponent.java | 3 +-
.../component/huaweicloud/iam/IAMComponent.java | 3 +-
.../image/ImageRecognitionComponent.java | 3 +-
.../component/huaweicloud/obs/OBSComponent.java | 3 +-
.../smn/SimpleNotificationComponent.java | 3 +-
.../camel/component/ibm/cos/IBMCOSConsumer.java | 10 +-
.../ibm/cos/integration/IBMCOSConsumerIT.java | 9 +-
.../integration/IBMCOSConsumerMoveAfterReadIT.java | 9 +-
.../watson/discovery/WatsonDiscoveryProducer.java | 3 +-
.../ibm/watson/stt/WatsonSpeechToTextProducer.java | 5 +-
.../stt/integration/WatsonSpeechToTextIT.java | 3 +-
.../camel/component/ical/ICalDataFormatTest.java | 2 +-
.../camel/component/iggy/IggyFetchRecords.java | 5 +-
.../component/iggy/client/IggyClientFactory.java | 10 +-
.../component/iggy/IggyConfigurationTest.java | 5 +-
.../component/influxdb2/InfluxDb2Component.java | 3 +-
.../camel/component/ironmq/IronMQConsumer.java | 2 +-
.../converter/JacksonConversionsPojoTest.java | 5 +-
.../camel/converter/jaxb/address/package-info.java | 7 +-
.../camel/converter/jaxb/message/package-info.java | 4 +-
.../camel/converter/jaxb/person/package-info.java | 7 +-
.../component/jetty12/JettyHttpComponent12.java | 12 +-
.../rest/RestJettyNoContentRestConfigTest.java | 8 +-
.../jetty/rest/RestJettyNoContentTest.java | 8 +-
.../oauth/OAuthAsynchronousHttpClientFactory.java | 3 +-
.../component/jms/FromTextToBytesMessageTest.java | 16 +-
.../apache/camel/component/jms/JmsBindingTest.java | 2 +-
.../component/jms/JmsObjectMessageEnabledTest.java | 4 +-
.../jpa/JpaRouteSkipLockedEntityTest.java | 2 +-
.../apache/camel/component/scp/ScpComponent.java | 3 +-
.../camel/component/scp/ScpCertUserAuthIT.java | 6 +-
.../component/jsonpatch/JsonPatchComponent.java | 3 +-
.../java/org/apache/camel/jsonpath/JsonStream.java | 9 +-
...ansactionErrorHandlerGracePeriodShutdownIT.java | 6 +-
.../component/kafka/DefaultKafkaClientFactory.java | 6 +-
.../camel/component/kafka/KafkaFetchRecords.java | 3 +-
.../camel/component/kafka/KafkaProducer.java | 12 +-
.../batching/KafkaRecordBatchingProcessor.java | 5 +-
.../camel/component/kafka/KafkaProducerTest.java | 5 +-
...eakOnFirstErrorOffUsingKafkaManualCommitIT.java | 5 +-
.../KafkaBreakOnFirstErrorReleaseResourcesIT.java | 5 +-
.../KafkaBreakOnFirstErrorReplayOldMessagesIT.java | 5 +-
.../KafkaBreakOnFirstErrorSeekIssueIT.java | 5 +-
...rstErrorWithBatchUsingAsyncCommitManagerIT.java | 5 +-
...irstErrorWithBatchUsingKafkaManualCommitIT.java | 5 +-
...rrorWithBatchUsingKafkaManualCommitRetryIT.java | 5 +-
...irstErrorWithBatchUsingSyncCommitManagerIT.java | 5 +-
.../KafkaConsumerAsyncManualCommitIT.java | 5 +-
.../kafka/integration/KafkaConsumerAuthIT.java | 5 +-
.../integration/KafkaConsumerAuthInvalidIT.java | 5 +-
.../KafkaConsumerAuthInvalidWithReconnectIT.java | 5 +-
.../integration/KafkaConsumerAuthManualTest.java | 5 +-
.../integration/KafkaConsumerBatchSizeIT.java | 5 +-
.../KafkaConsumerCustomSubscribeAdapterIT.java | 5 +-
.../kafka/integration/KafkaConsumerFullIT.java | 5 +-
.../integration/KafkaConsumerGroupProtocolIT.java | 7 +-
.../KafkaConsumerIdempotentTestSupport.java | 5 +-
.../KafkaConsumerLastRecordHeaderIT.java | 5 +-
.../integration/KafkaConsumerSaslAuthTypeIT.java | 5 +-
.../kafka/integration/KafkaConsumerStopIT.java | 5 +-
.../integration/KafkaConsumerTopicIsPatternIT.java | 5 +-
.../kafka/integration/KafkaProducerFullIT.java | 33 +-
.../integration/KafkaProducerSaslAuthTypeIT.java | 3 +-
.../kafka/integration/KafkaTransactionIT.java | 17 +-
.../integration/KafkaWithDBTransactionIT.java | 19 +-
.../batching/BatchingProcessingITSupport.java | 5 +-
.../commit/BaseManualCommitTestSupport.java | 5 +-
.../health/KafkaConsumerHealthCheckIT.java | 2 +-
.../health/KafkaHealthCheckTestSupport.java | 5 +-
.../KafkaPausableConsumerCircuitBreakerIT.java | 5 +-
.../integration/pause/KafkaPausableConsumerIT.java | 5 +-
.../camel/component/kamelet/KameletProcessor.java | 3 +-
.../camel/component/keycloak/KeycloakConsumer.java | 3 +-
.../keycloak/security/KeycloakSecurityHelper.java | 7 +-
.../security/KeycloakSecurityProcessor.java | 3 +-
.../security/KeycloakTokenIntrospector.java | 6 +-
.../component/keycloak/KeycloakConsumerIT.java | 12 +-
.../component/keycloak/KeycloakTestInfraIT.java | 7 +-
.../security/KeycloakSecurityHelperTest.java | 25 +-
.../keycloak/security/KeycloakSecurityIT.java | 39 +-
.../security/KeycloakSecurityTestInfraIT.java | 10 +-
.../security/KeycloakTokenIntrospectorTest.java | 7 +-
.../ConfigMapBinaryPropertiesFunction.java | 4 +-
.../properties/ConfigMapPropertiesFunction.java | 4 +-
.../properties/SecretBinaryPropertiesFunction.java | 4 +-
.../properties/SecretPropertiesFunction.java | 4 +-
.../component/language/LanguageComponent.java | 3 +-
.../core/integ5/ServerAnnotationProcessor.java | 5 +-
.../core/integ5/ServerAnnotationProcessor.java | 5 +-
.../apache/camel/component/log/LogComponent.java | 3 +-
.../camel/component/mail/MailAuthenticator.java | 3 +-
.../apache/camel/component/mail/MailBinding.java | 2 +-
.../component/mapstruct/MapstructComponent.java | 3 +-
.../observability/CamelOpenTelemetryExtension.java | 3 +-
...rObservabilityTracerPropagationTestSupport.java | 3 +-
.../faulttolerance/FaultToleranceProcessor.java | 3 +-
.../camel/component/milo/KeyStoreLoader.java | 3 +-
.../remote/mina/MinaSftpCertificateProvider.java | 13 +-
.../file/remote/mina/MinaSftpOperations.java | 5 +-
.../remote/mina/MinaSftpServerKeyVerifier.java | 3 +-
.../camel/component/mllp/internal/Hl7Util.java | 3 +-
.../apache/camel/component/mock/MockComponent.java | 3 +-
.../component/mongodb/SslAwareMongoClient.java | 3 +-
.../idempotent/MongoDbIdempotentRepository.java | 3 +-
.../apache/camel/language/mvel/MvelExpression.java | 7 +-
.../apache/camel/language/mvel/MvelLanguage.java | 5 +-
.../netty/http/SecurityConstraintMapping.java | 5 +-
.../netty/http/NettyHttpSSLHandshakeErrorTest.java | 6 +-
.../org/apache/camel/oauth/vertx/VertxOAuth.java | 8 +-
.../apache/camel/test/oauth/SSLCertTrustTest.java | 3 +-
.../observation/MicrometerObservationTracer.java | 6 +-
.../dataformat/ocsf/OcsfEventExampleTest.java | 8 +-
.../apache/camel/openapi/RestModelConverters.java | 9 +-
.../RestOpenApiReaderFileResponseModelTest.java | 4 +-
.../openstack/nova/producer/FlavorsProducer.java | 2 +-
.../openstack/glance/GlanceProducerTest.java | 2 +-
.../openstack/nova/FlavorProducerTest.java | 2 +-
.../openstack/nova/ServerProducerTest.java | 2 +-
.../opentelemetry/OpenTelemetrySpanAdapter.java | 9 +-
.../CamelOpenTelemetryExtension.java | 3 +-
.../opentelemetry2/mock/MockHttpComponent.java | 7 +-
.../opentelemetry2/mock/MockHttpEndpoint.java | 14 +-
.../opentelemetry2/mock/MockHttpProducer.java | 10 +-
.../opentelemetry2/mock/MockHttpSpanDecorator.java | 4 +-
.../opentelemetry2/mock/MockKafkaComponent.java | 7 +-
.../opentelemetry2/mock/MockKafkaEndpoint.java | 14 +-
.../opentelemetry2/mock/MockKafkaProducer.java | 10 +-
.../mock/MockKafkaSpanDecorator.java | 4 +-
.../apache/camel/dataformat/parquet/avro/Pojo.java | 6 +-
.../camel/component/plc4x/Plc4XConsumerTest.java | 3 +-
.../component/pqc/crypto/hybrid/HybridKEM.java | 13 +-
.../AwsSecretsManagerKeyLifecycleManager.java | 37 +-
.../lifecycle/FileBasedKeyLifecycleManager.java | 37 +-
.../HashicorpVaultKeyLifecycleManager.java | 37 +-
.../camel/component/pqc/lifecycle/KeyMetadata.java | 3 +-
.../pqc/AwsSecretsManagerKeyLifecycleIT.java | 3 +-
.../pqc/HashicorpVaultKeyLifecycleIT.java | 3 +-
.../component/pqc/PQCEndToEndIntegrationTest.java | 6 +-
.../camel/component/pqc/PQCKeyLifecycleTest.java | 3 +-
.../pqc/PQCSignatureWithKeyStoreTest.java | 2 +-
.../component/pqc/PQCStatefulKeyTrackingTest.java | 9 +-
.../camel/component/printer/PrinterPrintTest.java | 2 +-
.../camel/routepolicy/quartz/MyRoutePolicy.java | 3 +-
.../apache/camel/component/ref/RefComponent.java | 3 +-
.../resilience4j/ResilienceProcessor.java | 3 +-
.../rest/openapi/RestOpenApiEndpoint.java | 7 +-
.../rest/openapi/WireMockJettyServerFactory.java | 3 +-
.../camel/component/rest/RestApiComponent.java | 3 +-
.../apache/camel/component/rest/RestComponent.java | 3 +-
.../apache/camel/component/saga/SagaComponent.java | 3 +-
.../component/salesforce/StreamingApiConsumer.java | 10 +-
.../salesforce/api/dto/bulk/package-info.java | 7 +-
.../salesforce/internal/SalesforceSession.java | 4 +-
.../internal/client/DefaultBulkApiClient.java | 3 +-
.../com/sforce/eventbus/CamelEventMessage__e.java | 67 +-
.../salesforce/StreamingApiConsumerTest.java | 9 +-
.../salesforce/dto/generated/Account.java | 20 +-
.../component/salesforce/dto/generated/Asset.java | 21 +-
.../salesforce/dto/generated/Contact.java | 39 +-
.../salesforce/dto/generated/ContentVersion.java | 44 +-
.../org/apache/camel/builder/saxon/XPathTest.java | 2 +-
.../component/scheduler/SchedulerComponent.java | 3 +-
.../schematron/processor/ClassPathURIResolver.java | 4 +-
.../processor/SchematronProcessorFactory.java | 3 +-
.../schematron/processor/TemplatesFactory.java | 3 +-
.../processor/SchematronProcessorTest.java | 3 +-
.../rest/RestServletNoContentRestConfigTest.java | 8 +-
.../servlet/rest/RestServletNoContentTest.java | 8 +-
.../apache/camel/component/sjms/SjmsHelper.java | 10 +-
.../consumer/SimpleMessageListenerContainer.java | 6 +-
.../producer/SjmsObjectMessageEnabledTest.java | 4 +-
.../apache/camel/component/smb/SmbOperations.java | 3 +-
.../camel/component/smb/AbstractSmbRenameIT.java | 3 +-
.../apache/camel/component/smpp/SmppSmCommand.java | 3 +-
.../camel/dataformat/soap/SoapDataFormat.java | 5 +-
.../soap/name/ServiceInterfaceStrategyTest.java | 3 +-
.../soap/name/testpackage/package-info.java | 5 +-
.../solr/integration/SolrInsertAndDeleteTest.java | 3 +-
.../component/splunkhec/SplunkHECProducerTest.java | 3 +-
.../springai/chat/SpringAiChatProducer.java | 2 +-
.../springai/chat/SpringAiChatComponentTest.java | 4 +-
.../chat/SpringAiChatToolsIntegrationIT.java | 3 +-
.../springai/chat/SpringAiChatWrappedFileIT.java | 6 +-
.../springai/image/SpringAiImageOllamaIT.java | 3 +-
.../springai/tools/SpringAiToolsEndpoint.java | 12 +-
.../vectorstore/SpringAiVectorStoreProducer.java | 4 +-
.../SpringAiVectorStoreComponentTest.java | 13 +-
.../net/javacrumbs/calc/model/package-info.java | 7 +-
.../component/spring/ws/jaxb/package-info.java | 7 +-
.../org/apache/camel/spring/xml/package-info.java | 7 +-
.../spring/interceptor/AnnotatedConsumeImpl.java | 3 +-
.../processor/SpringCustomExpressionTest.java | 3 +-
.../scan/DefaultPackageScanClassResolverTest.java | 14 +-
.../camel/spring/scan/PackageScanFiltersTest.java | 8 +-
.../scan/PatternBasedPackageScanFilterTest.java | 2 +-
.../apache/camel/spring/scan/a/ScanTargetOne.java | 4 +-
.../camel/component/stax/StaxStreamXMLReader.java | 2 +-
.../tahu/handlers/TahuHostApplicationManualIT.java | 3 +-
.../org/apache/camel/telemetrydev/DevTrace.java | 3 +-
.../org/apache/camel/telemetry/mock/MockTrace.java | 3 +-
.../test/junit5/params/ParameterizedExtension.java | 10 +-
.../test/junit6/params/ParameterizedExtension.java | 10 +-
.../component/thrift/generated/Calculator.java | 2337 ++++++++++----------
.../thrift/generated/InvalidOperation.java | 185 +-
.../component/thrift/generated/Operation.java | 11 +-
.../camel/component/thrift/generated/Work.java | 226 +-
.../dataformat/thrift/generated/Operation.java | 11 +-
.../camel/dataformat/thrift/generated/Work.java | 226 +-
.../camel/component/timer/TimerComponent.java | 3 +-
.../undertow/UndertowHeaderFilterStrategy.java | 3 +-
.../undertow/spi/ProviderWithServletTest.java | 2 +-
.../undertow/ws/UndertowWssRouteTest.java | 3 +-
.../component/validator/ValidatorComponent.java | 3 +-
.../http/VertxHttpMaximumRedeliveriesTest.java | 3 +-
.../vertx/websocket/VertxWebsocketDevConsole.java | 6 +-
.../camel/component/web3j/Web3jProducer.java | 16 +-
.../xmlsecurity/api/XmlSignatureHelper.java | 3 +-
.../xmlsecurity/processor/SantuarioUtil.java | 3 +-
.../xmlsecurity/XMLSecurityDataFormat.java | 21 +-
.../xmlsecurity/SignatureAlgorithmTest.java | 2 +-
.../xmlsecurity/SignatureDigestMethodTest.java | 2 +-
.../xmlsecurity/EncryptionAlgorithmTest.java | 2 +-
.../camel/dataformat/xmlsecurity/TestHelper.java | 3 +-
.../xmlsecurity/XMLEncryption11Test.java | 2 +-
.../saxon/SaxonXmlSourceHandlerFactoryImpl.java | 25 +-
.../camel/component/zeebe/ZeebeComponent.java | 3 +-
.../zipfile/ZipSplitterUseOriginalMessageTest.java | 2 +-
.../main/java/org/apache/camel/CamelContext.java | 2 +-
.../org/apache/camel/FluentProducerTemplate.java | 3 +-
.../main/java/org/apache/camel/package-info.java | 7 +-
.../apache/camel/spi/CamelBeanPostProcessor.java | 6 +-
.../impl/engine/DefaultCamelBeanPostProcessor.java | 5 +-
.../camel/impl/engine/DefaultConsumerTemplate.java | 2 +-
.../camel/impl/engine/DefaultProducerTemplate.java | 2 +-
.../camel/impl/engine/DurationRoutePolicy.java | 3 +-
.../org/apache/camel/impl/engine/RouteService.java | 3 +-
.../camel/impl/console/ReceiveDevConsole.java | 9 +-
.../camel/language/constant/ConstantLanguage.java | 3 +-
.../camel/language/csimple/CSimpleHelper.java | 5 +-
.../camel/language/header/HeaderLanguage.java | 3 +-
.../org/apache/camel/language/ref/RefLanguage.java | 3 +-
.../camel/language/simple/ast/OtherExpression.java | 8 +-
.../camel/language/tokenizer/TokenizeLanguage.java | 3 +-
.../camel/language/variable/VariableLanguage.java | 3 +-
.../builder/LegacyDefaultErrorHandlerBuilder.java | 3 +-
.../org/apache/camel/builder/RouteBuilder.java | 5 +-
.../camel/model/BasicOutputExpressionNode.java | 5 +-
.../org/apache/camel/model/BeanModelHelper.java | 7 +-
.../apache/camel/model/SetHeadersDefinition.java | 3 +-
.../apache/camel/model/SetVariablesDefinition.java | 3 +-
.../apache/camel/model/TransactedDefinition.java | 5 +-
.../org/apache/camel/model/app/package-info.java | 7 +-
.../apache/camel/model/config/package-info.java | 7 +-
.../camel/model/dataformat/package-info.java | 7 +-
.../DefaultErrorHandlerDefinition.java | 3 +-
.../camel/model/errorhandler/package-info.java | 7 +-
.../apache/camel/model/language/package-info.java | 7 +-
.../camel/model/loadbalancer/package-info.java | 7 +-
.../java/org/apache/camel/model/package-info.java | 7 +-
.../org/apache/camel/model/rest/package-info.java | 7 +-
.../apache/camel/model/tokenizer/package-info.java | 7 +-
.../camel/model/transformer/package-info.java | 7 +-
.../apache/camel/model/validator/package-info.java | 7 +-
.../org/apache/camel/processor/RecipientList.java | 3 +-
.../camel/reifier/AbstractPolicyReifier.java | 3 +-
.../org/apache/camel/reifier/AbstractReifier.java | 2 +-
.../apache/camel/reifier/SetHeadersReifier.java | 5 +-
.../apache/camel/reifier/SetVariablesReifier.java | 5 +-
.../apache/camel/reifier/TransactedReifier.java | 3 +-
.../org/apache/camel/core/xml/package-info.java | 7 +-
.../camel/core/xml/util/jsse/package-info.java | 9 +-
.../camel/builder/ExpressionBuilderTest.java | 2 +-
.../camel/component/browse/BrowseFilterTest.java | 3 +-
.../PropertiesComponentLoadPropertiesTest.java | 3 +-
.../PropertiesComponentReloadPropertiesTest.java | 7 +-
.../PropertiesComponentResolvedValueTest.java | 3 +-
.../xslt/XsltTransformingExceptionTest.java | 6 +-
.../converter/stream/CachedOutputStreamTest.java | 9 +-
.../impl/DefaultComponentAutowiredFalseTest.java | 3 +-
.../camel/impl/DefaultComponentAutowiredTest.java | 9 +-
.../apache/camel/impl/DummyLifecycleStrategy.java | 8 +-
.../java/org/apache/camel/impl/engine/MyBean.java | 4 +-
.../camel/model/SetHeadersDefinitionTest.java | 6 +-
.../camel/model/SetVariablesDefinitionTest.java | 6 +-
.../BeanRecipientListInterfaceAnnotationTest.java | 3 +-
.../camel/processor/BeanRecipientListTest.java | 3 +-
.../processor/DynamicRouterAnnotationTest.java | 3 +-
.../processor/RecipientListBeanOnPrepareTest.java | 3 +-
.../RecipientListBeanSubUnitOfWorkTest.java | 3 +-
.../RecipientListFineGrainedErrorHandlingTest.java | 3 +-
...ntListParallelFineGrainedErrorHandlingTest.java | 3 +-
.../processor/RecipientListReturnValueTest.java | 3 +-
.../camel/processor/SetHeadersProcessorTest.java | 5 +-
.../camel/processor/SetVariablesProcessorTest.java | 5 +-
.../processor/SimpleProcessorTraceableTest.java | 3 +-
.../apache/camel/support/component/TestProxy.java | 13 +-
.../camel/impl/health/ContextHealthCheck.java | 3 +-
.../impl/health/RouteControllerHealthCheck.java | 3 +-
.../impl/health/SecurityPolicyHealthCheck.java | 3 +-
.../camel/main/DefaultConfigurationConfigurer.java | 2 +-
.../main/SecurityConfigurationProperties.java | 3 +-
.../main/MainComponentAutowiredFalseTest.java | 3 +-
.../java/org/apache/camel/main/MainSSLTest.java | 8 +-
.../main/MainSecurityPolicyHealthCheckTest.java | 6 +-
.../DefaultManagementObjectNameStrategy.java | 3 +-
.../management/JmxManagementStrategyFactory.java | 5 +-
.../management/ManagedRouteGroupLastErrorTest.java | 2 +-
.../apache/camel/management/ManagedTimerTest.java | 3 +-
.../org/apache/camel/support/DefaultRegistry.java | 4 +-
.../camel/support/LifecycleStrategySupport.java | 8 +-
.../apache/camel/support/LocalBeanRegistry.java | 2 +-
.../camel/support/PropertyBindingSupport.java | 2 +-
.../camel/support/builder/ExpressionBuilder.java | 6 +-
.../org/apache/camel/support/jndi/JndiContext.java | 7 +-
.../camel/support/scan/PackageScanHelper.java | 3 +-
.../main/java/org/apache/camel/util/IOHelper.java | 3 +-
.../java/org/apache/camel/util/ObjectHelper.java | 8 +-
.../apache/camel/converter/jaxp/XmlConverter.java | 8 +-
.../support/builder/xml/NamespacesHelper.java | 2 +-
.../support/builder/xml/XMLConverterHelper.java | 4 +-
.../apache/camel/util/xml/StreamSourceCache.java | 3 +-
.../apache/camel/yaml/out/XPathNamespacesTest.java | 2 +-
.../dsl/jbang/core/commands/DependencyList.java | 3 +-
.../camel/dsl/jbang/core/commands/Explain.java | 5 +-
.../dsl/jbang/core/commands/ExportBaseCommand.java | 7 +-
.../camel/dsl/jbang/core/commands/Harden.java | 5 +-
.../apache/camel/dsl/jbang/core/commands/Init.java | 3 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
.../camel/dsl/jbang/core/commands/RunHelper.java | 3 +-
.../dsl/jbang/core/commands/SBOMGenerator.java | 7 +-
.../core/commands/action/ActionBaseCommand.java | 3 +-
.../commands/action/CamelRouteDiagramAction.java | 3 +-
.../camel/dsl/jbang/core/common/PathUtils.java | 3 +-
.../camel/dsl/jbang/core/commands/ExportTest.java | 3 +-
.../action/CamelRouteDiagramActionTest.java | 28 +-
.../jbang/core/commands/mcp/TransformTools.java | 3 +-
.../commands/mcp/DependencyCheckToolsTest.java | 4 +-
.../jbang/core/commands/mcp/DiagnoseToolsTest.java | 4 +-
.../core/commands/mcp/TestScaffoldToolsTest.java | 3 +-
.../core/commands/generate/GeneratePlugin.java | 2 +-
.../kubernetes/KubernetesExportKnativeTest.java | 5 +-
.../jbang/core/commands/tui/CamelCatalogTui.java | 3 +-
.../dsl/jbang/core/commands/tui/CamelMonitor.java | 22 +-
.../dsl/jbang/core/commands/tui/TuiPlugin.java | 2 +-
.../DependencyDownloaderPropertiesComponent.java | 3 +-
.../yaml/deserializers/KameletDeserializer.java | 2 +-
.../OutputAwareFromDefinitionDeserializer.java | 3 +-
.../RouteConfigurationDefinitionDeserializer.java | 5 +-
.../deserializers/RouteDefinitionDeserializer.java | 3 +-
.../RouteTemplateDefinitionDeserializer.java | 8 +-
.../TemplatedRouteDefinitionDeserializer.java | 6 +-
parent/pom.xml | 36 -
.../infra/cli/services/CliLocalProcessService.java | 3 +-
.../test/infra/iggy/services/IggyContainer.java | 5 +-
.../infra/kafka/services/ConfluentContainer.java | 4 +-
.../infra/kafka/services/StrimziContainer.java | 4 +-
.../mock/AudioTranscriptionResponseBuilder.java | 10 +-
.../camel/itest/security/GreeterClientTest.java | 6 +-
.../camel/itest/utils/extensions/GreeterImpl.java | 10 +-
.../camel/tooling/maven/MavenDownloaderImpl.java | 6 +-
.../org/apache/camel/tooling/model/JsonMapper.java | 9 +-
.../org/apache/camel/util/json/JsonObject.java | 4 +-
.../java/org/apache/camel/util/json/Yylex.java | 24 +-
.../packaging/PrepareCamelJBangCommandsMojo.java | 2 +-
.../maven/packaging/UpdateSensitizeHelper.java | 5 +-
.../camel/maven/packaging/XRefCheckMojo.java | 2 +-
.../maven/sync/properties/SyncPropertiesMojo.java | 5 +-
603 files changed, 2964 insertions(+), 3932 deletions(-)
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index 8a9d10f6f397..fe24b048a899 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -54,8 +54,6 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
- env:
- MAVEN_EXTRA_ARGS: -Prewrite
run: ./etc/scripts/regen.sh
- name: archive logs
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index 0ff0f194da5f..17e4bf65240a 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -95,7 +95,7 @@ jobs:
- name: maven build
if: ${{ !inputs.skip_full_build }}
env:
- MAVEN_EXTRA_ARGS: ${{ matrix.maven_extra_args || '' }} -Prewrite
+ MAVEN_EXTRA_ARGS: ${{ matrix.maven_extra_args || '' }}
run: ./etc/scripts/regen.sh
- name: Quick dependency build
if: ${{ inputs.skip_full_build }}
diff --git a/AGENTS.md b/AGENTS.md
index 1d71aedf8a6c..2ad5731fc2e8 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -251,16 +251,6 @@ Annotations:
add `security = "insecure:ssl"` / `"insecure:serialization"` / `"insecure:dev"` on `@UriParam`.
See [`proposals/security.adoc`](proposals/security.adoc) for categories and rationale.
-Import Style:
-- Do NOT use fully qualified class names (FQCNs) in Java code. Always add an `import` statement
- and use the simple class name (e.g., write `List` not `java.util.List`).
-- Exception: when two classes share the same simple name (e.g., `java.util.Date` and `java.sql.Date`),
- import the most-used one and qualify the other.
-- This applies to all code: production, test, and test-infra.
-- Generated code (`src/generated/`) is excluded from this rule.
-- The build automatically shortens unnecessary FQCNs via OpenRewrite (`rewrite-maven-plugin`).
- CI will fail if uncommitted FQCN changes are detected after the build.
-
## Adding Components
### Direct child of components/
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index b35fc2fe0b02..46e6161f87be 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -747,7 +747,7 @@ public class RouteCoverageMojo extends AbstractMojo {
private static void createJacocoXmlFile(Document document, File file) throws TransformerException {
String xmlFilePath = file.toString() + "/xmlJacoco.xml";
TransformerFactory factory = TransformerFactory.newInstance();
- factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
Transformer transformer = factory.newTransformer();
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
index eaede66b7b0e..cf10c7f8e48c 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
@@ -168,8 +168,8 @@ public class ActiveMQConfiguration extends JmsConfiguration {
@Override
protected ConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory answer
- = new ActiveMQConnectionFactory();
+ org.apache.activemq.ActiveMQConnectionFactory answer
+ = new org.apache.activemq.ActiveMQConnectionFactory();
answer.setTrustAllPackages(trustAllPackages);
if (getUsername() != null) {
answer.setUserName(getUsername());
diff --git a/components/camel-activemq6/src/main/java/org/apache/camel/component/activemq6/ActiveMQConfiguration.java b/components/camel-activemq6/src/main/java/org/apache/camel/component/activemq6/ActiveMQConfiguration.java
index f683719c3dbc..c37b68c6e582 100644
--- a/components/camel-activemq6/src/main/java/org/apache/camel/component/activemq6/ActiveMQConfiguration.java
+++ b/components/camel-activemq6/src/main/java/org/apache/camel/component/activemq6/ActiveMQConfiguration.java
@@ -168,8 +168,8 @@ public class ActiveMQConfiguration extends JmsConfiguration {
@Override
protected ConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory answer
- = new ActiveMQConnectionFactory();
+ org.apache.activemq.ActiveMQConnectionFactory answer
+ = new org.apache.activemq.ActiveMQConnectionFactory();
answer.setTrustAllPackages(trustAllPackages);
if (getUsername() != null) {
answer.setUserName(getUsername());
diff --git a/components/camel-ai/camel-docling/src/main/java/org/apache/camel/component/docling/DoclingProducer.java b/components/camel-ai/camel-docling/src/main/java/org/apache/camel/component/docling/DoclingProducer.java
index 3e08671390ec..866d742505f0 100644
--- a/components/camel-ai/camel-docling/src/main/java/org/apache/camel/component/docling/DoclingProducer.java
+++ b/components/camel-ai/camel-docling/src/main/java/org/apache/camel/component/docling/DoclingProducer.java
@@ -52,7 +52,6 @@ import java.util.stream.Stream;
import ai.docling.core.DoclingDocument;
import ai.docling.core.DoclingDocument.DocumentOrigin;
import ai.docling.serve.api.DoclingServeApi;
-import ai.docling.serve.api.chunk.request.ChunkDocumentRequest;
import ai.docling.serve.api.chunk.request.HierarchicalChunkDocumentRequest;
import ai.docling.serve.api.chunk.request.HybridChunkDocumentRequest;
import ai.docling.serve.api.chunk.request.options.HierarchicalChunkerOptions;
@@ -619,7 +618,7 @@ public class DoclingProducer extends DefaultProducer {
}
private void addSourceToChunkRequest(
- ChunkDocumentRequest.Builder requestBuilder, String inputSource)
+ ai.docling.serve.api.chunk.request.ChunkDocumentRequest.Builder requestBuilder, String inputSource)
throws IOException {
if (inputSource.startsWith("http://") || inputSource.startsWith("https://")) {
requestBuilder.source(
@@ -732,7 +731,7 @@ public class DoclingProducer extends DefaultProducer {
if (configuration.isIncludeRawMetadata()) {
JsonNode rootNode = objectMapper.readTree(jsonOutput);
@SuppressWarnings("unchecked")
- Map<String, Object> rawMap = objectMapper.convertValue(rootNode, Map.class);
+ Map<String, Object> rawMap = objectMapper.convertValue(rootNode, java.util.Map.class);
metadata.setRawMetadata(rawMap);
}
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingCustomArgsValidationTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingCustomArgsValidationTest.java
index 6855582acb74..d541d5155b71 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingCustomArgsValidationTest.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingCustomArgsValidationTest.java
@@ -18,9 +18,7 @@ package org.apache.camel.component.docling;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
@@ -48,7 +46,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output", "/tmp/other-dir")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output", "/tmp/other-dir")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -63,7 +61,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output=/tmp/other-dir")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output=/tmp/other-dir")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -77,7 +75,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-o", "/tmp/other-dir")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-o", "/tmp/other-dir")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -91,7 +89,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--artifacts-path", "../../etc/passwd")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--artifacts-path", "../../etc/passwd")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -101,13 +99,13 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
@Test
void customArgsWithNullEntryAreRejected() throws Exception {
Path inputFile = createInputFile();
- List<String> argsWithNull = new ArrayList<>();
+ List<String> argsWithNull = new java.util.ArrayList<>();
argsWithNull.add(null);
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, argsWithNull));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, argsWithNull));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -125,7 +123,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "--table-mode", "fast")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "--table-mode", "fast")));
});
// The failure should be from process execution, not from argument validation
@@ -156,7 +154,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "; rm -rf /")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "; rm -rf /")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -170,7 +168,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "| cat /etc/passwd")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "| cat /etc/passwd")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -184,7 +182,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "`whoami`")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "`whoami`")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -198,7 +196,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "$(id)")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "$(id)")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -214,7 +212,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--unknown-flag")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--unknown-flag")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -228,7 +226,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-x")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-x")));
});
assertInstanceOf(IllegalArgumentException.class, ex.getCause());
@@ -243,7 +241,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-vv")));
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-vv")));
});
assertFalse(ex.getCause() instanceof IllegalArgumentException,
@@ -258,7 +256,7 @@ class DoclingCustomArgsValidationTest extends CamelTestSupport {
CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> {
template.requestBodyAndHeaders("direct:cli-convert",
inputFile.toString(),
- Map.of(DoclingHeaders.CUSTOM_ARGUMENTS,
+ java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS,
List.of("--artifacts-path", "/safe/path/subdir/../../etc/passwd")));
});
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingSecureTempFileTest.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingSecureTempFileTest.java
index 6650531c18bd..102a60919cdd 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingSecureTempFileTest.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/DoclingSecureTempFileTest.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -98,7 +97,7 @@ class DoclingSecureTempFileTest extends CamelTestSupport {
// Use a Synchronization to capture directory permissions before cleanup
Exchange exchange = createExchangeWithBody("Text content for permission test");
exchange.getExchangeExtension().addOnCompletion(
- new SynchronizationAdapter() {
+ new org.apache.camel.support.SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
// Check all docling dirs created during this exchange
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/BatchProcessingIT.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/BatchProcessingIT.java
index 9aacf83c2e60..ab4987c5f94d 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/BatchProcessingIT.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/BatchProcessingIT.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.docling.BatchConversionResult;
import org.apache.camel.component.docling.BatchProcessingResults;
@@ -233,11 +232,11 @@ class BatchProcessingIT extends DoclingITestSupport {
getMockEndpoint("mock:individual-result").assertIsSatisfied();
// Verify each exchange contains a BatchConversionResult
- List<Exchange> exchanges = getMockEndpoint("mock:individual-result").getReceivedExchanges();
+ List<org.apache.camel.Exchange> exchanges = getMockEndpoint("mock:individual-result").getReceivedExchanges();
assertEquals(3, exchanges.size());
for (int i = 0; i < exchanges.size(); i++) {
- Exchange exchange = exchanges.get(i);
+ org.apache.camel.Exchange exchange = exchanges.get(i);
BatchConversionResult result = exchange.getIn().getBody(BatchConversionResult.class);
assertNotNull(result, "Exchange " + i + " should contain a BatchConversionResult");
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingServeProducerIT.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingServeProducerIT.java
index 26b5881befd1..4e14a1ee409f 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingServeProducerIT.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/DoclingServeProducerIT.java
@@ -23,7 +23,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.time.Duration;
-import java.util.HashMap;
import java.util.concurrent.atomic.AtomicReference;
import ai.docling.core.DoclingDocument;
@@ -209,7 +208,7 @@ class DoclingServeProducerIT extends DoclingITestSupport {
// Use sync endpoint but override with async header
String result = template.requestBodyAndHeaders("direct:convert-markdown-serve",
testFile.toString(),
- new HashMap<String, Object>() {
+ new java.util.HashMap<String, Object>() {
{
put(DoclingHeaders.INPUT_FILE_PATH, testFile.toString());
put(DoclingHeaders.USE_ASYNC_MODE, true);
diff --git a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/MetadataExtractionIT.java b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/MetadataExtractionIT.java
index 9886e2e63a81..d419182e04f7 100644
--- a/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/MetadataExtractionIT.java
+++ b/components/camel-ai/camel-docling/src/test/java/org/apache/camel/component/docling/integration/MetadataExtractionIT.java
@@ -81,7 +81,7 @@ class MetadataExtractionIT extends DoclingITestSupport {
private Path createTestPdfFile() throws IOException {
try (InputStream is = getClass().getClassLoader().getResourceAsStream("multi_page.pdf")) {
- Path tempFile = Files.createTempFile("docling-test-multi_page", ".pdf");
+ java.nio.file.Path tempFile = Files.createTempFile("docling-test-multi_page", ".pdf");
Files.copy(is, tempFile.toAbsolutePath(), StandardCopyOption.REPLACE_EXISTING);
return tempFile;
}
diff --git a/components/camel-ai/camel-langchain4j-agent-api/src/main/java/org/apache/camel/component/langchain4j/agent/api/AgentConfiguration.java b/components/camel-ai/camel-langchain4j-agent-api/src/main/java/org/apache/camel/component/langchain4j/agent/api/AgentConfiguration.java
index 65ea85617afb..ae38a9488692 100644
--- a/components/camel-ai/camel-langchain4j-agent-api/src/main/java/org/apache/camel/component/langchain4j/agent/api/AgentConfiguration.java
+++ b/components/camel-ai/camel-langchain4j-agent-api/src/main/java/org/apache/camel/component/langchain4j/agent/api/AgentConfiguration.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
import dev.langchain4j.agent.tool.ToolSpecification;
import dev.langchain4j.mcp.client.McpClient;
@@ -272,7 +271,7 @@ public class AgentConfiguration {
.filter(name -> !name.isEmpty())
.map(AgentConfiguration::loadGuardrailClass)
.filter(clazz -> clazz != null)
- .collect(Collectors.toList());
+ .collect(java.util.stream.Collectors.toList());
}
/**
diff --git a/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/AgentConfigurationTest.java b/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/AgentConfigurationTest.java
index 12a682d07ad0..f1eec10a3bea 100644
--- a/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/AgentConfigurationTest.java
+++ b/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/AgentConfigurationTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.langchain4j.agent.api;
-import java.io.Serializable;
import java.util.List;
import org.junit.jupiter.api.Test;
@@ -38,7 +37,7 @@ public class AgentConfigurationTest {
assertEquals(3, result.size());
assertTrue(result.contains(String.class));
assertTrue(result.contains(List.class));
- assertTrue(result.contains(Serializable.class));
+ assertTrue(result.contains(java.io.Serializable.class));
}
@Test
@@ -100,7 +99,7 @@ public class AgentConfigurationTest {
assertEquals(3, result.size());
assertTrue(result.contains(String.class));
assertTrue(result.contains(List.class));
- assertTrue(result.contains(Serializable.class));
+ assertTrue(result.contains(java.io.Serializable.class));
}
@Test
@@ -114,7 +113,7 @@ public class AgentConfigurationTest {
assertEquals(3, result.size());
assertTrue(result.contains(String.class));
assertTrue(result.contains(List.class));
- assertTrue(result.contains(Serializable.class));
+ assertTrue(result.contains(java.io.Serializable.class));
}
@Test
@@ -152,7 +151,7 @@ public class AgentConfigurationTest {
assertEquals(3, result.size());
assertTrue(result.contains(String.class));
assertTrue(result.contains(List.class));
- assertTrue(result.contains(Serializable.class));
+ assertTrue(result.contains(java.io.Serializable.class));
}
@Test
@@ -197,7 +196,7 @@ public class AgentConfigurationTest {
assertEquals(3, result.size());
assertTrue(result.contains(String.class));
assertTrue(result.contains(List.class));
- assertTrue(result.contains(Serializable.class));
+ assertTrue(result.contains(java.io.Serializable.class));
}
// Tests for fluent methods with arrays
diff --git a/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/guardrails/PromptInjectionGuardrailTest.java b/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/guardrails/PromptInjectionGuardrailTest.java
index 63a2a369a4f9..d976b2b9bdbe 100644
--- a/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/guardrails/PromptInjectionGuardrailTest.java
+++ b/components/camel-ai/camel-langchain4j-agent-api/src/test/java/org/apache/camel/component/langchain4j/agent/api/guardrails/PromptInjectionGuardrailTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.langchain4j.agent.api.guardrails;
-import java.util.regex.Pattern;
-
import dev.langchain4j.data.message.UserMessage;
import dev.langchain4j.guardrail.InputGuardrailResult;
import org.junit.jupiter.api.Test;
@@ -173,7 +171,7 @@ class PromptInjectionGuardrailTest {
.clearPatterns()
.addPattern(
PromptInjectionGuardrail.InjectionCategory.JAILBREAK,
- Pattern.compile("(?i)custom\\s+attack"))
+ java.util.regex.Pattern.compile("(?i)custom\\s+attack"))
.strict(true)
.build();
diff --git a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentAutoConversionTest.java b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentAutoConversionTest.java
index e5d7b5bc9ba9..a89be750949e 100644
--- a/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentAutoConversionTest.java
+++ b/components/camel-ai/camel-langchain4j-agent/src/test/java/org/apache/camel/component/langchain4j/agent/integration/LangChain4jAgentAutoConversionTest.java
@@ -22,7 +22,6 @@ import java.nio.file.Files;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
-import org.apache.camel.TypeConversionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.langchain4j.agent.api.Agent;
@@ -144,7 +143,7 @@ public class LangChain4jAgentAutoConversionTest extends CamelTestSupport {
"application/zip");
assertThrows(
- TypeConversionException.class,
+ org.apache.camel.TypeConversionException.class,
() -> context.getTypeConverter()
.convertTo(AiAgentBody.class, exchange, "data".getBytes()));
}
diff --git a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java
index 0f1dc2c6d5dd..27d3c42507dc 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java
+++ b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentNeo4jTargetIT.java
@@ -165,7 +165,7 @@ public class LangChain4jEmbeddingsComponentNeo4jTargetIT extends CamelTestSuppor
.setHeader(Neo4jHeaders.OPERATION).constant(Neo4Operation.CREATE_VECTOR)
.setHeader(Neo4jHeaders.VECTOR_ID).constant("1")
.setHeader(Neo4jHeaders.LABEL).constant("Test")
- .transformDataType(new DataType("neo4j:embeddings"))
+ .transformDataType(new org.apache.camel.spi.DataType("neo4j:embeddings"))
.to(NEO4J_URI);
from("direct:search")
diff --git a/components/camel-ai/camel-langchain4j-embeddingstore/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/LangChain4jEmbeddingStoreProducer.java b/components/camel-ai/camel-langchain4j-embeddingstore/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/LangChain4jEmbeddingStoreProducer.java
index 7a5a61c183cb..e0c796b84782 100644
--- a/components/camel-ai/camel-langchain4j-embeddingstore/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/LangChain4jEmbeddingStoreProducer.java
+++ b/components/camel-ai/camel-langchain4j-embeddingstore/src/main/java/org/apache/camel/component/langchain4j/embeddingstore/LangChain4jEmbeddingStoreProducer.java
@@ -137,7 +137,7 @@ public class LangChain4jEmbeddingStoreProducer extends DefaultProducer {
}
if (in.getHeader(LangChain4jEmbeddingsHeaders.TEXT_SEGMENT) != null) {
- text = in.getHeader(LangChain4jEmbeddingsHeaders.TEXT_SEGMENT, TextSegment.class);
+ text = in.getHeader(LangChain4jEmbeddingsHeaders.TEXT_SEGMENT, dev.langchain4j.data.segment.TextSegment.class);
id = getEndpoint().getConfiguration().getEmbeddingStore().add(embedding, text);
} else {
id = getEndpoint().getConfiguration().getEmbeddingStore().add(embedding);
diff --git a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JCharacterTokenizer.java b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JCharacterTokenizer.java
index b6299623681a..d7ec1238b56b 100644
--- a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JCharacterTokenizer.java
+++ b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JCharacterTokenizer.java
@@ -19,9 +19,8 @@ package org.apache.camel.component.langchain4j.tokenizer;
import org.apache.camel.component.langchain4j.tokenizer.config.LangChain4JConfiguration;
import org.apache.camel.component.langchain4j.tokenizer.util.SplitterTypes;
-import org.apache.camel.spi.annotations.Tokenizer;
-@Tokenizer("langChain4jCharacterTokenizer")
+@org.apache.camel.spi.annotations.Tokenizer("langChain4jCharacterTokenizer")
public class LangChain4JCharacterTokenizer extends AbstractLangChain4JTokenizer<LangChain4JConfiguration> {
@Override
diff --git a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JLineTokenizer.java b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JLineTokenizer.java
index dce9bef4cef7..098ae56c21da 100644
--- a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JLineTokenizer.java
+++ b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JLineTokenizer.java
@@ -19,9 +19,8 @@ package org.apache.camel.component.langchain4j.tokenizer;
import org.apache.camel.component.langchain4j.tokenizer.config.LangChain4JConfiguration;
import org.apache.camel.component.langchain4j.tokenizer.util.SplitterTypes;
-import org.apache.camel.spi.annotations.Tokenizer;
-@Tokenizer("langChain4jLineTokenizer")
+@org.apache.camel.spi.annotations.Tokenizer("langChain4jLineTokenizer")
public class LangChain4JLineTokenizer extends AbstractLangChain4JTokenizer<LangChain4JConfiguration> {
@Override
diff --git a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JParagraphTokenizer.java b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JParagraphTokenizer.java
index 1c94393fad0c..7d0b9f314f44 100644
--- a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JParagraphTokenizer.java
+++ b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JParagraphTokenizer.java
@@ -19,9 +19,8 @@ package org.apache.camel.component.langchain4j.tokenizer;
import org.apache.camel.component.langchain4j.tokenizer.config.LangChain4JConfiguration;
import org.apache.camel.component.langchain4j.tokenizer.util.SplitterTypes;
-import org.apache.camel.spi.annotations.Tokenizer;
-@Tokenizer("langChain4jParagraphTokenizer")
+@org.apache.camel.spi.annotations.Tokenizer("langChain4jParagraphTokenizer")
public class LangChain4JParagraphTokenizer extends AbstractLangChain4JTokenizer<LangChain4JConfiguration> {
@Override
diff --git a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JSentenceTokenizer.java b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JSentenceTokenizer.java
index 8d6cf162dede..e16f58844611 100644
--- a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JSentenceTokenizer.java
+++ b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JSentenceTokenizer.java
@@ -19,9 +19,8 @@ package org.apache.camel.component.langchain4j.tokenizer;
import org.apache.camel.component.langchain4j.tokenizer.config.LangChain4JConfiguration;
import org.apache.camel.component.langchain4j.tokenizer.util.SplitterTypes;
-import org.apache.camel.spi.annotations.Tokenizer;
-@Tokenizer("langChain4jSentenceTokenizer")
+@org.apache.camel.spi.annotations.Tokenizer("langChain4jSentenceTokenizer")
public class LangChain4JSentenceTokenizer extends AbstractLangChain4JTokenizer<LangChain4JConfiguration> {
@Override
diff --git a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JWordTokenizer.java b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JWordTokenizer.java
index f6f517c32631..d6cfa158663b 100644
--- a/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JWordTokenizer.java
+++ b/components/camel-ai/camel-langchain4j-tokenizer/src/main/java/org/apache/camel/component/langchain4j/tokenizer/LangChain4JWordTokenizer.java
@@ -19,9 +19,8 @@ package org.apache.camel.component.langchain4j.tokenizer;
import org.apache.camel.component.langchain4j.tokenizer.config.LangChain4JConfiguration;
import org.apache.camel.component.langchain4j.tokenizer.util.SplitterTypes;
-import org.apache.camel.spi.annotations.Tokenizer;
-@Tokenizer("langChain4jWordTokenizer")
+@org.apache.camel.spi.annotations.Tokenizer("langChain4jWordTokenizer")
public class LangChain4JWordTokenizer extends AbstractLangChain4JTokenizer<LangChain4JConfiguration> {
@Override
diff --git a/components/camel-ai/camel-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jProducer.java b/components/camel-ai/camel-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jProducer.java
index fbcb313eda92..351e750b33f5 100644
--- a/components/camel-ai/camel-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jProducer.java
+++ b/components/camel-ai/camel-neo4j/src/main/java/org/apache/camel/component/neo4j/Neo4jProducer.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.neo4j;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -159,7 +158,7 @@ public class Neo4jProducer extends DefaultProducer {
if (!matchMap.isEmpty()) {
StringBuilder whereClause = new StringBuilder();
- queryParams = new HashMap<>();
+ queryParams = new java.util.HashMap<>();
int paramIndex = 0;
for (Map.Entry<String, Object> entry : matchMap.entrySet()) {
@@ -257,7 +256,7 @@ public class Neo4jProducer extends DefaultProducer {
if (!matchMap.isEmpty()) {
StringBuilder whereClause = new StringBuilder();
- queryParams = new HashMap<>();
+ queryParams = new java.util.HashMap<>();
int paramIndex = 0;
for (Map.Entry<String, Object> entry : matchMap.entrySet()) {
diff --git a/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIEndpoint.java b/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIEndpoint.java
index 7d257f597de5..e5c6da160c70 100644
--- a/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIEndpoint.java
+++ b/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIEndpoint.java
@@ -57,7 +57,6 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.OAuthHelper;
-import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -395,7 +394,7 @@ public class OpenAIEndpoint extends DefaultEndpoint {
private void configureSslFromContextParameters(
OpenAIOkHttpClient.Builder builder,
- SSLContextParameters sslContextParameters)
+ org.apache.camel.support.jsse.SSLContextParameters sslContextParameters)
throws Exception {
SSLContext sslContext = sslContextParameters.createSSLContext(getCamelContext());
diff --git a/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIProducer.java b/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIProducer.java
index 7ee69d7b358d..e87a75f2d197 100644
--- a/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIProducer.java
+++ b/components/camel-ai/camel-openai/src/main/java/org/apache/camel/component/openai/OpenAIProducer.java
@@ -698,15 +698,15 @@ public class OpenAIProducer extends DefaultAsyncProducer {
}
private ResponseFormatJsonSchema.JsonSchema.Schema buildSchemaFromJson(String jsonSchemaString) throws Exception {
- Map<String, Object> root = OBJECT_MAPPER.readValue(jsonSchemaString, Map.class);
+ java.util.Map<String, Object> root = OBJECT_MAPPER.readValue(jsonSchemaString, java.util.Map.class);
if (root == null) {
throw new IllegalArgumentException("JSON schema string parsed to null");
}
- if (!(root instanceof Map)) {
+ if (!(root instanceof java.util.Map)) {
throw new IllegalArgumentException("JSON schema must be a JSON object at the root");
}
ResponseFormatJsonSchema.JsonSchema.Schema.Builder sb = ResponseFormatJsonSchema.JsonSchema.Schema.builder();
- for (Map.Entry<String, Object> e : root.entrySet()) {
+ for (java.util.Map.Entry<String, Object> e : root.entrySet()) {
sb.putAdditionalProperty(e.getKey(), JsonValue.from(e.getValue()));
}
return sb.build();
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java
index a73bbe579e6e..dace6655accc 100644
--- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java
+++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAIProducerMockTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.openai;
-import java.util.Iterator;
-
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.Exchange;
@@ -129,7 +127,7 @@ public class OpenAIProducerMockTest extends CamelTestSupport {
Object body = result.getMessage().getBody();
assertNotNull(body);
- assertTrue(body instanceof Iterator);
+ assertTrue(body instanceof java.util.Iterator);
}
@Test
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslConfigurationTest.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslConfigurationTest.java
index 84ad1ab7c0b9..c84dc91b90fd 100644
--- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslConfigurationTest.java
+++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslConfigurationTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.openai;
-import java.io.FileNotFoundException;
-import java.security.KeyStoreException;
-
import org.apache.camel.CamelContext;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -145,7 +142,7 @@ class OpenAISslConfigurationTest extends CamelTestSupport {
+ "&sslTruststoreLocation=/nonexistent/truststore.jks"
+ "&sslTruststorePassword=" + STORE_PASSWORD));
- assertHasRootCause(exception, FileNotFoundException.class);
+ assertHasRootCause(exception, java.io.FileNotFoundException.class);
}
@Test
@@ -158,7 +155,7 @@ class OpenAISslConfigurationTest extends CamelTestSupport {
+ "&sslKeystoreLocation=/nonexistent/keystore.jks"
+ "&sslKeystorePassword=" + STORE_PASSWORD));
- assertHasRootCause(exception, FileNotFoundException.class);
+ assertHasRootCause(exception, java.io.FileNotFoundException.class);
}
@Test
@@ -172,7 +169,7 @@ class OpenAISslConfigurationTest extends CamelTestSupport {
+ "&sslTruststorePassword=" + STORE_PASSWORD
+ "&sslTruststoreType=INVALID"));
- assertHasRootCause(exception, KeyStoreException.class);
+ assertHasRootCause(exception, java.security.KeyStoreException.class);
}
private static void assertHasRootCause(Throwable throwable, Class<? extends Throwable> expectedCauseType) {
diff --git a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslContextParametersTest.java b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslContextParametersTest.java
index 1504cd7eb5ac..0779966bd441 100644
--- a/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslContextParametersTest.java
+++ b/components/camel-ai/camel-openai/src/test/java/org/apache/camel/component/openai/OpenAISslContextParametersTest.java
@@ -33,7 +33,6 @@ import com.sun.net.httpserver.HttpsConfigurator;
import com.sun.net.httpserver.HttpsServer;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.SSLContextParametersAware;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
@@ -200,7 +199,7 @@ class OpenAISslContextParametersTest extends CamelTestSupport {
@Test
void componentImplementsSslContextParametersAware() {
OpenAIComponent component = (OpenAIComponent) context().getComponent("openai");
- assertTrue(component instanceof SSLContextParametersAware,
+ assertTrue(component instanceof org.apache.camel.SSLContextParametersAware,
"OpenAIComponent should implement SSLContextParametersAware");
}
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
index d65009ccded2..e8db1b11eaf0 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.as2.api.util;
import java.util.ArrayList;
-import java.util.Base64;
import java.util.List;
import org.apache.camel.component.as2.api.AS2Header;
@@ -167,7 +166,7 @@ public final class AS2HeaderUtils {
public static void addAuthorizationHeader(HttpMessage message, String userName, String password, String accessToken) {
if (userName != null && password != null) {
message.addHeader(AS2Header.AUTHORIZATION,
- ("Basic " + Base64.getEncoder().encodeToString((userName + ":" + password).getBytes())));
+ ("Basic " + java.util.Base64.getEncoder().encodeToString((userName + ":" + password).getBytes())));
} else if (accessToken != null) {
message.addHeader(AS2Header.AUTHORIZATION, "Bearer " + accessToken);
}
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/MicUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/MicUtils.java
index 5e11779f6ca4..1852f5d530de 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/MicUtils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/MicUtils.java
@@ -37,7 +37,6 @@ import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
-import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -176,7 +175,7 @@ public final class MicUtils {
= HttpMessageUtils.getEntity(request, ApplicationPkcs7MimeCompressedDataEntity.class);
if (compressedEntity != null) {
MimeEntity inner = compressedEntity
- .getCompressedEntity(new ZlibExpanderProvider());
+ .getCompressedEntity(new org.bouncycastle.cms.jcajce.ZlibExpanderProvider());
if (inner instanceof MultipartSignedEntity signedEntity) {
return signedEntity.getSignedDataEntity();
}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
index 968c3b03b6e8..b1b665cae073 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
@@ -28,7 +28,19 @@ import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
-import org.apache.camel.component.as2.api.entity.*;
+import org.apache.camel.component.as2.api.entity.AS2DispositionModifier;
+import org.apache.camel.component.as2.api.entity.AS2DispositionType;
+import org.apache.camel.component.as2.api.entity.AS2MessageDispositionNotificationEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationEDIFACTEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeCompressedDataEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeEnvelopedDataEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7SignatureEntity;
+import org.apache.camel.component.as2.api.entity.DispositionMode;
+import org.apache.camel.component.as2.api.entity.DispositionNotificationMultipartReportEntity;
+import org.apache.camel.component.as2.api.entity.MimeEntity;
+import org.apache.camel.component.as2.api.entity.MultipartSignedEntity;
+import org.apache.camel.component.as2.api.entity.TextPlainEntity;
import org.apache.camel.component.as2.api.util.AS2Utils;
import org.apache.camel.component.as2.api.util.EntityUtils;
import org.apache.camel.component.as2.api.util.HttpMessageUtils;
@@ -83,7 +95,7 @@ public class AS2MessageTest extends AS2MessageTestBase {
public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
throws HttpException, IOException {
try {
- EntityParser.parseAS2MessageEntity(request);
+ org.apache.camel.component.as2.api.entity.EntityParser.parseAS2MessageEntity(request);
context.setAttribute(AS2ServerManager.SUBJECT, SUBJECT);
context.setAttribute(AS2ServerManager.FROM, AS2_NAME);
LOG.debug("{}", AS2Utils.printMessage(request));
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2UnencryptedMessageTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2UnencryptedMessageTest.java
index 51901d5622a5..5dcaf3192c66 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2UnencryptedMessageTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2UnencryptedMessageTest.java
@@ -20,7 +20,12 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.security.cert.Certificate;
-import org.apache.camel.component.as2.api.entity.*;
+import org.apache.camel.component.as2.api.entity.ApplicationEDIFACTEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeCompressedDataEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7SignatureEntity;
+import org.apache.camel.component.as2.api.entity.DispositionNotificationMultipartReportEntity;
+import org.apache.camel.component.as2.api.entity.MimeEntity;
+import org.apache.camel.component.as2.api.entity.MultipartSignedEntity;
import org.apache.camel.component.as2.api.util.HttpMessageUtils;
import org.apache.camel.component.as2.api.util.SigningUtils;
import org.apache.hc.core5.http.ClassicHttpRequest;
@@ -65,7 +70,7 @@ public class AS2UnencryptedMessageTest extends AS2MessageTestBase {
public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
throws HttpException, IOException {
try {
- EntityParser.parseAS2MessageEntity(request);
+ org.apache.camel.component.as2.api.entity.EntityParser.parseAS2MessageEntity(request);
context.setAttribute(AS2ServerManager.SUBJECT, SUBJECT);
context.setAttribute(AS2ServerManager.FROM, AS2_NAME);
ediEntity = HttpMessageUtils.extractEdiPayload(request, new HttpMessageUtils.DecrpytingAndSigningInfo(
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
index c8b63822e92b..2ab7f4809508 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
@@ -30,7 +30,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelException;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.as2.api.AS2AsynchronousMDNManager;
@@ -953,7 +952,7 @@ public class AS2ClientManagerIT extends AbstractAS2ITSupport {
return new RouteBuilder() {
public void configure() {
Processor proc = new Processor() {
- public void process(Exchange exchange) {
+ public void process(org.apache.camel.Exchange exchange) {
HttpMessage message = exchange.getIn(HttpMessage.class);
@SuppressWarnings("unused")
String body = message.getBody(String.class);
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java
index 81e583edf5d9..65a4fa0346a8 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java
@@ -165,7 +165,7 @@ public class AS2ServerManagerITBase extends AbstractAS2ITSupport {
// test route processing exception
Processor failingProcessor = new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(org.apache.camel.Exchange exchange) throws Exception {
throw new Exception(PROCESSOR_EXCEPTION_MSG);
}
};
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerWildcardPatternIT.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerWildcardPatternIT.java
index b3f9a6114d80..811007d5ab82 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerWildcardPatternIT.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerWildcardPatternIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.as2;
-import java.security.cert.Certificate;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.as2.api.*;
@@ -263,13 +261,13 @@ public class AS2ServerWildcardPatternIT extends AS2ServerSecTestBase {
null,
null,
signingAlgorithm,
- structure.isSigned() ? new Certificate[] { signingCert } : null,
+ structure.isSigned() ? new java.security.cert.Certificate[] { signingCert } : null,
structure.isSigned() ? signingKP.getPrivate() : null,
compressionAlgorithm,
DISPOSITION_NOTIFICATION_TO,
SIGNED_RECEIPT_MIC_ALGORITHMS,
encryptionAlgorithm,
- structure.isEncrypted() ? new Certificate[] { signingCert } : null,
+ structure.isEncrypted() ? new java.security.cert.Certificate[] { signingCert } : null,
null,
null,
null,
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
index d857cffa7506..6d47cf8c1804 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Key.java
@@ -21,21 +21,14 @@
*/
package org.apache.camel.avro.generated;
-import org.apache.avro.AvroRuntimeException;
-import org.apache.avro.Schema;
-import org.apache.avro.data.RecordBuilder;
-import org.apache.avro.specific.SpecificRecord;
-import org.apache.avro.specific.SpecificRecordBase;
-import org.apache.avro.specific.SpecificRecordBuilderBase;
-
@SuppressWarnings("all")
-public class Key extends SpecificRecordBase implements SpecificRecord {
- public static final Schema SCHEMA$ = Schema.parse(
+public class Key extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
+ public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse(
"{\"type\":\"record\",\"name\":\"Key\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]}");
@Deprecated
public java.lang.CharSequence key;
- public Schema getSchema() {
+ public org.apache.avro.Schema getSchema() {
return SCHEMA$;
}
@@ -45,7 +38,7 @@ public class Key extends SpecificRecordBase implements SpecificRecord {
case 0:
return key;
default:
- throw new AvroRuntimeException("Bad index");
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -57,7 +50,7 @@ public class Key extends SpecificRecordBase implements SpecificRecord {
key = (java.lang.CharSequence) value$;
break;
default:
- throw new AvroRuntimeException("Bad index");
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -78,41 +71,41 @@ public class Key extends SpecificRecordBase implements SpecificRecord {
}
/** Creates a new Key RecordBuilder */
- public static Key.Builder newBuilder() {
- return new Key.Builder();
+ public static org.apache.camel.avro.generated.Key.Builder newBuilder() {
+ return new org.apache.camel.avro.generated.Key.Builder();
}
/** Creates a new Key RecordBuilder by copying an existing Builder */
- public static Key.Builder newBuilder(Key.Builder other) {
- return new Key.Builder(other);
+ public static org.apache.camel.avro.generated.Key.Builder newBuilder(org.apache.camel.avro.generated.Key.Builder other) {
+ return new org.apache.camel.avro.generated.Key.Builder(other);
}
/** Creates a new Key RecordBuilder by copying an existing Key instance */
- public static Key.Builder newBuilder(Key other) {
- return new Key.Builder(other);
+ public static org.apache.camel.avro.generated.Key.Builder newBuilder(org.apache.camel.avro.generated.Key other) {
+ return new org.apache.camel.avro.generated.Key.Builder(other);
}
/**
* RecordBuilder for Key instances.
*/
- public static class Builder extends SpecificRecordBuilderBase<Key>
- implements RecordBuilder<Key> {
+ public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Key>
+ implements org.apache.avro.data.RecordBuilder<Key> {
private java.lang.CharSequence key;
/** Creates a new Builder */
private Builder() {
- super(Key.SCHEMA$);
+ super(org.apache.camel.avro.generated.Key.SCHEMA$);
}
/** Creates a Builder by copying an existing Builder */
- private Builder(Key.Builder other) {
+ private Builder(org.apache.camel.avro.generated.Key.Builder other) {
super(other);
}
/** Creates a Builder by copying an existing Key instance */
- private Builder(Key other) {
- super(Key.SCHEMA$);
+ private Builder(org.apache.camel.avro.generated.Key other) {
+ super(org.apache.camel.avro.generated.Key.SCHEMA$);
if (isValidValue(fields()[0], other.key)) {
this.key = data().deepCopy(fields()[0].schema(), other.key);
fieldSetFlags()[0] = true;
@@ -125,7 +118,7 @@ public class Key extends SpecificRecordBase implements SpecificRecord {
}
/** Sets the value of the 'key' field */
- public Key.Builder setKey(java.lang.CharSequence value) {
+ public org.apache.camel.avro.generated.Key.Builder setKey(java.lang.CharSequence value) {
validate(fields()[0], value);
this.key = value;
fieldSetFlags()[0] = true;
@@ -138,7 +131,7 @@ public class Key extends SpecificRecordBase implements SpecificRecord {
}
/** Clears the value of the 'key' field */
- public Key.Builder clearKey() {
+ public org.apache.camel.avro.generated.Key.Builder clearKey() {
key = null;
fieldSetFlags()[0] = false;
return this;
@@ -151,7 +144,7 @@ public class Key extends SpecificRecordBase implements SpecificRecord {
record.key = fieldSetFlags()[0] ? this.key : (java.lang.CharSequence) defaultValue(fields()[0]);
return record;
} catch (Exception e) {
- throw new AvroRuntimeException(e);
+ throw new org.apache.avro.AvroRuntimeException(e);
}
}
}
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
index 68afd461512f..b7471ec9e5dc 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
@@ -21,34 +21,29 @@
*/
package org.apache.camel.avro.generated;
-import java.io.IOException;
-
-import org.apache.avro.AvroRemoteException;
-import org.apache.avro.Protocol;
-
@SuppressWarnings("all")
public interface KeyValueProtocol {
- Protocol PROTOCOL = Protocol.parse(
+ org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse(
"{\"protocol\":\"KeyValueProtocol\",\"namespace\":\"org.apache.camel.avro.generated\",\"types\":[{\"type\":\"record\",\"name\":\"Key\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Value\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}],\"messages\":{\"put\":{\"request\":[{\"name\":\"key\",\"type\":\"Key\"},{\"name\":\"value\",\"type\":\"Value\"}],\"response\":\"null\"},\"get\":{\"request\":[{\"name\":\"key\",\"type\":\"Key\"}],\ [...]
- java.lang.Void put(Key key, Value value)
- throws AvroRemoteException;
+ java.lang.Void put(org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value)
+ throws org.apache.avro.AvroRemoteException;
- Value get(Key key)
- throws AvroRemoteException;
+ org.apache.camel.avro.generated.Value get(org.apache.camel.avro.generated.Key key)
+ throws org.apache.avro.AvroRemoteException;
@SuppressWarnings("all")
public interface Callback extends KeyValueProtocol {
- Protocol PROTOCOL = KeyValueProtocol.PROTOCOL;
+ org.apache.avro.Protocol PROTOCOL = org.apache.camel.avro.generated.KeyValueProtocol.PROTOCOL;
void put(
- Key key, Value value,
+ org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value,
org.apache.avro.ipc.Callback<java.lang.Void> callback)
- throws IOException;
+ throws java.io.IOException;
void get(
- Key key,
- org.apache.avro.ipc.Callback<Value> callback)
- throws IOException;
+ org.apache.camel.avro.generated.Key key,
+ org.apache.avro.ipc.Callback<org.apache.camel.avro.generated.Value> callback)
+ throws java.io.IOException;
}
}
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
index 7f7c7a09e199..6f8d90d82436 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/avro/generated/Value.java
@@ -21,21 +21,14 @@
*/
package org.apache.camel.avro.generated;
-import org.apache.avro.AvroRuntimeException;
-import org.apache.avro.Schema;
-import org.apache.avro.data.RecordBuilder;
-import org.apache.avro.specific.SpecificRecord;
-import org.apache.avro.specific.SpecificRecordBase;
-import org.apache.avro.specific.SpecificRecordBuilderBase;
-
@SuppressWarnings("all")
-public class Value extends SpecificRecordBase implements SpecificRecord {
- public static final Schema SCHEMA$ = Schema.parse(
+public class Value extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
+ public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse(
"{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}");
@Deprecated
public java.lang.CharSequence value;
- public Schema getSchema() {
+ public org.apache.avro.Schema getSchema() {
return SCHEMA$;
}
@@ -45,7 +38,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
case 0:
return value;
default:
- throw new AvroRuntimeException("Bad index");
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -57,7 +50,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
value = (java.lang.CharSequence) value$;
break;
default:
- throw new AvroRuntimeException("Bad index");
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -78,42 +71,42 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
}
/** Creates a new Value RecordBuilder */
- public static Value.Builder newBuilder() {
- return new Value.Builder();
+ public static org.apache.camel.avro.generated.Value.Builder newBuilder() {
+ return new org.apache.camel.avro.generated.Value.Builder();
}
/** Creates a new Value RecordBuilder by copying an existing Builder */
- public static Value.Builder newBuilder(
- Value.Builder other) {
- return new Value.Builder(other);
+ public static org.apache.camel.avro.generated.Value.Builder newBuilder(
+ org.apache.camel.avro.generated.Value.Builder other) {
+ return new org.apache.camel.avro.generated.Value.Builder(other);
}
/** Creates a new Value RecordBuilder by copying an existing Value instance */
- public static Value.Builder newBuilder(Value other) {
- return new Value.Builder(other);
+ public static org.apache.camel.avro.generated.Value.Builder newBuilder(org.apache.camel.avro.generated.Value other) {
+ return new org.apache.camel.avro.generated.Value.Builder(other);
}
/**
* RecordBuilder for Value instances.
*/
- public static class Builder extends SpecificRecordBuilderBase<Value>
- implements RecordBuilder<Value> {
+ public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Value>
+ implements org.apache.avro.data.RecordBuilder<Value> {
private java.lang.CharSequence value;
/** Creates a new Builder */
private Builder() {
- super(Value.SCHEMA$);
+ super(org.apache.camel.avro.generated.Value.SCHEMA$);
}
/** Creates a Builder by copying an existing Builder */
- private Builder(Value.Builder other) {
+ private Builder(org.apache.camel.avro.generated.Value.Builder other) {
super(other);
}
/** Creates a Builder by copying an existing Value instance */
- private Builder(Value other) {
- super(Value.SCHEMA$);
+ private Builder(org.apache.camel.avro.generated.Value other) {
+ super(org.apache.camel.avro.generated.Value.SCHEMA$);
if (isValidValue(fields()[0], other.value)) {
this.value = data().deepCopy(fields()[0].schema(), other.value);
fieldSetFlags()[0] = true;
@@ -126,7 +119,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
}
/** Sets the value of the 'value' field */
- public Value.Builder setValue(java.lang.CharSequence value) {
+ public org.apache.camel.avro.generated.Value.Builder setValue(java.lang.CharSequence value) {
validate(fields()[0], value);
this.value = value;
fieldSetFlags()[0] = true;
@@ -139,7 +132,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
}
/** Clears the value of the 'value' field */
- public Value.Builder clearValue() {
+ public org.apache.camel.avro.generated.Value.Builder clearValue() {
value = null;
fieldSetFlags()[0] = false;
return this;
@@ -152,7 +145,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]);
return record;
} catch (Exception e) {
- throw new AvroRuntimeException(e);
+ throw new org.apache.avro.AvroRuntimeException(e);
}
}
}
diff --git a/components/camel-avro-rpc/camel-avro-rpc-jetty/src/main/java/org/apache/camel/component/avro/spi/JettyHttpServerFactory.java b/components/camel-avro-rpc/camel-avro-rpc-jetty/src/main/java/org/apache/camel/component/avro/spi/JettyHttpServerFactory.java
index c74128f9840f..0e428fc559f7 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-jetty/src/main/java/org/apache/camel/component/avro/spi/JettyHttpServerFactory.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-jetty/src/main/java/org/apache/camel/component/avro/spi/JettyHttpServerFactory.java
@@ -21,13 +21,12 @@ import java.io.IOException;
import org.apache.avro.ipc.Server;
import org.apache.avro.ipc.jetty.HttpServer;
import org.apache.avro.ipc.specific.SpecificResponder;
-import org.apache.camel.spi.annotations.JdkService;
/**
* Default implementation of Avro via http, which is based on Jetty http server. For more details see dependency
* org.apache.avro:avro-ipc-jetty.
*/
-@JdkService("avro-rpc-http-server-factory")
+@org.apache.camel.spi.annotations.JdkService("avro-rpc-http-server-factory")
public class JettyHttpServerFactory implements AvroRpcHttpServerFactory {
@Override
public Server create(SpecificResponder responder, int port) throws IOException {
diff --git a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java
index d23101faa6db..30748226353e 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.avro;
-import org.apache.avro.Conversions;
import org.apache.avro.Schema;
import org.apache.avro.data.TimeConversions;
import org.apache.avro.specific.SpecificData;
@@ -44,9 +43,9 @@ public class SpecificDataNoCache extends SpecificData {
addLogicalTypeConversion(new TimeConversions.LocalTimestampMicrosConversion());
addLogicalTypeConversion(new TimeConversions.LocalTimestampNanosConversion());
- addLogicalTypeConversion(new Conversions.UUIDConversion());
+ addLogicalTypeConversion(new org.apache.avro.Conversions.UUIDConversion());
- addLogicalTypeConversion(new Conversions.DecimalConversion());
+ addLogicalTypeConversion(new org.apache.avro.Conversions.DecimalConversion());
}
@Override
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/DateRecord.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/DateRecord.java
index 5d998b9c6957..5aa631103dee 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/DateRecord.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/DateRecord.java
@@ -21,45 +21,26 @@
*/
package org.apache.camel.dataformat.avro.example;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.nio.ByteBuffer;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.util.Objects;
-
-import org.apache.avro.AvroMissingFieldException;
-import org.apache.avro.AvroRuntimeException;
-import org.apache.avro.Schema;
-import org.apache.avro.data.RecordBuilder;
-import org.apache.avro.data.TimeConversions;
-import org.apache.avro.io.DatumReader;
-import org.apache.avro.io.DatumWriter;
import org.apache.avro.message.BinaryMessageDecoder;
import org.apache.avro.message.BinaryMessageEncoder;
import org.apache.avro.message.SchemaStore;
-import org.apache.avro.specific.AvroGenerated;
import org.apache.avro.specific.SpecificData;
-import org.apache.avro.specific.SpecificRecord;
-import org.apache.avro.specific.SpecificRecordBase;
-import org.apache.avro.specific.SpecificRecordBuilderBase;
-@AvroGenerated
-public class DateRecord extends SpecificRecordBase implements SpecificRecord {
+@org.apache.avro.specific.AvroGenerated
+public class DateRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
private static final long serialVersionUID = 8653491882695437570L;
- public static final Schema SCHEMA$ = new Schema.Parser().parse(
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse(
"{\"type\":\"record\",\"name\":\"DateRecord\",\"namespace\":\"org.apache.camel.dataformat.avro.example\",\"fields\":[{\"name\":\"date\",\"type\":[\"null\",{\"type\":\"int\",\"logicalType\":\"date\"}],\"default\":null},{\"name\":\"timestamp\",\"type\":[\"null\",{\"type\":\"long\",\"logicalType\":\"timestamp-millis\"}],\"default\":null}]}");
- public static Schema getClassSchema() {
+ public static org.apache.avro.Schema getClassSchema() {
return SCHEMA$;
}
private static final SpecificData MODEL$ = new SpecificData();
static {
- MODEL$.addLogicalTypeConversion(new TimeConversions.DateConversion());
- MODEL$.addLogicalTypeConversion(new TimeConversions.TimestampMillisConversion());
+ MODEL$.addLogicalTypeConversion(new org.apache.avro.data.TimeConversions.DateConversion());
+ MODEL$.addLogicalTypeConversion(new org.apache.avro.data.TimeConversions.TimestampMillisConversion());
}
private static final BinaryMessageEncoder<DateRecord> ENCODER = new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
@@ -100,7 +81,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
* @return a buffer holding the serialized data for this instance
* @throws java.io.IOException if this instance could not be serialized
*/
- public ByteBuffer toByteBuffer() throws IOException {
+ public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException {
return ENCODER.encode(this);
}
@@ -112,13 +93,13 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
* @throws java.io.IOException if the given bytes could not be deserialized into an instance of this class
*/
public static DateRecord fromByteBuffer(
- ByteBuffer b)
- throws IOException {
+ java.nio.ByteBuffer b)
+ throws java.io.IOException {
return DECODER.decode(b);
}
- private LocalDate date;
- private Instant timestamp;
+ private java.time.LocalDate date;
+ private java.time.Instant timestamp;
/**
* Default constructor. Note that this does not initialize fields to their default values from the schema. If that
@@ -133,7 +114,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
* @param date The new value for date
* @param timestamp The new value for timestamp
*/
- public DateRecord(LocalDate date, Instant timestamp) {
+ public DateRecord(java.time.LocalDate date, java.time.Instant timestamp) {
this.date = date;
this.timestamp = timestamp;
}
@@ -144,7 +125,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
}
@Override
- public Schema getSchema() {
+ public org.apache.avro.Schema getSchema() {
return SCHEMA$;
}
@@ -167,10 +148,10 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
public void put(int field$, Object value$) {
switch (field$) {
case 0:
- date = (LocalDate) value$;
+ date = (java.time.LocalDate) value$;
break;
case 1:
- timestamp = (Instant) value$;
+ timestamp = (java.time.Instant) value$;
break;
default:
throw new IndexOutOfBoundsException("Invalid index: " + field$);
@@ -182,7 +163,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @return The value of the 'date' field.
*/
- public LocalDate getDate() {
+ public java.time.LocalDate getDate() {
return date;
}
@@ -191,7 +172,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @param value the value to set.
*/
- public void setDate(LocalDate value) {
+ public void setDate(java.time.LocalDate value) {
this.date = value;
}
@@ -200,7 +181,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @return The value of the 'timestamp' field.
*/
- public Instant getTimestamp() {
+ public java.time.Instant getTimestamp() {
return timestamp;
}
@@ -209,7 +190,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @param value the value to set.
*/
- public void setTimestamp(Instant value) {
+ public void setTimestamp(java.time.Instant value) {
this.timestamp = value;
}
@@ -246,19 +227,19 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
if (other == null) {
return new Builder();
} else {
- return new DateRecord.Builder(other);
+ return new org.apache.camel.dataformat.avro.example.DateRecord.Builder(other);
}
}
/**
* RecordBuilder for DateRecord instances.
*/
- @AvroGenerated
- public static class Builder extends SpecificRecordBuilderBase<DateRecord>
- implements RecordBuilder<DateRecord> {
+ @org.apache.avro.specific.AvroGenerated
+ public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<DateRecord>
+ implements org.apache.avro.data.RecordBuilder<DateRecord> {
- private LocalDate date;
- private Instant timestamp;
+ private java.time.LocalDate date;
+ private java.time.Instant timestamp;
/** Creates a new Builder */
private Builder() {
@@ -270,7 +251,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @param other The existing Builder to copy.
*/
- private Builder(DateRecord.Builder other) {
+ private Builder(org.apache.camel.dataformat.avro.example.DateRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.date)) {
this.date = data().deepCopy(fields()[0].schema(), other.date);
@@ -287,7 +268,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @param other The existing instance to copy.
*/
- private Builder(DateRecord other) {
+ private Builder(org.apache.camel.dataformat.avro.example.DateRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.date)) {
this.date = data().deepCopy(fields()[0].schema(), other.date);
@@ -304,7 +285,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @return The value.
*/
- public LocalDate getDate() {
+ public java.time.LocalDate getDate() {
return date;
}
@@ -314,7 +295,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
* @param value The value of 'date'.
* @return This builder.
*/
- public DateRecord.Builder setDate(LocalDate value) {
+ public org.apache.camel.dataformat.avro.example.DateRecord.Builder setDate(java.time.LocalDate value) {
validate(fields()[0], value);
this.date = value;
fieldSetFlags()[0] = true;
@@ -335,7 +316,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @return This builder.
*/
- public DateRecord.Builder clearDate() {
+ public org.apache.camel.dataformat.avro.example.DateRecord.Builder clearDate() {
date = null;
fieldSetFlags()[0] = false;
return this;
@@ -346,7 +327,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @return The value.
*/
- public Instant getTimestamp() {
+ public java.time.Instant getTimestamp() {
return timestamp;
}
@@ -356,7 +337,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
* @param value The value of 'timestamp'.
* @return This builder.
*/
- public DateRecord.Builder setTimestamp(Instant value) {
+ public org.apache.camel.dataformat.avro.example.DateRecord.Builder setTimestamp(java.time.Instant value) {
validate(fields()[1], value);
this.timestamp = value;
fieldSetFlags()[1] = true;
@@ -377,7 +358,7 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
*
* @return This builder.
*/
- public DateRecord.Builder clearTimestamp() {
+ public org.apache.camel.dataformat.avro.example.DateRecord.Builder clearTimestamp() {
timestamp = null;
fieldSetFlags()[1] = false;
return this;
@@ -388,34 +369,34 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
public DateRecord build() {
try {
DateRecord record = new DateRecord();
- record.date = fieldSetFlags()[0] ? this.date : (LocalDate) defaultValue(fields()[0]);
- record.timestamp = fieldSetFlags()[1] ? this.timestamp : (Instant) defaultValue(fields()[1]);
+ record.date = fieldSetFlags()[0] ? this.date : (java.time.LocalDate) defaultValue(fields()[0]);
+ record.timestamp = fieldSetFlags()[1] ? this.timestamp : (java.time.Instant) defaultValue(fields()[1]);
return record;
- } catch (AvroMissingFieldException e) {
+ } catch (org.apache.avro.AvroMissingFieldException e) {
throw e;
} catch (java.lang.Exception e) {
- throw new AvroRuntimeException(e);
+ throw new org.apache.avro.AvroRuntimeException(e);
}
}
}
@SuppressWarnings("unchecked")
- private static final DatumWriter<DateRecord> WRITER$
- = (DatumWriter<DateRecord>) MODEL$.createDatumWriter(SCHEMA$);
+ private static final org.apache.avro.io.DatumWriter<DateRecord> WRITER$
+ = (org.apache.avro.io.DatumWriter<DateRecord>) MODEL$.createDatumWriter(SCHEMA$);
@Override
- public void writeExternal(ObjectOutput out)
- throws IOException {
+ public void writeExternal(java.io.ObjectOutput out)
+ throws java.io.IOException {
WRITER$.write(this, SpecificData.getEncoder(out));
}
@SuppressWarnings("unchecked")
- private static final DatumReader<DateRecord> READER$
- = (DatumReader<DateRecord>) MODEL$.createDatumReader(SCHEMA$);
+ private static final org.apache.avro.io.DatumReader<DateRecord> READER$
+ = (org.apache.avro.io.DatumReader<DateRecord>) MODEL$.createDatumReader(SCHEMA$);
@Override
- public void readExternal(ObjectInput in)
- throws IOException {
+ public void readExternal(java.io.ObjectInput in)
+ throws java.io.IOException {
READER$.read(this, SpecificData.getDecoder(in));
}
@@ -436,10 +417,10 @@ public class DateRecord extends SpecificRecordBase implements SpecificRecord {
return false;
}
DateRecord other = (DateRecord) o;
- if (!Objects.equals(this.date, other.date)) {
+ if (!java.util.Objects.equals(this.date, other.date)) {
return false;
}
- if (!Objects.equals(this.timestamp, other.timestamp)) {
+ if (!java.util.Objects.equals(this.timestamp, other.timestamp)) {
return false;
}
return true;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
index cb1746ea3b0d..a285fc2db7f9 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/example/Value.java
@@ -21,21 +21,14 @@
*/
package org.apache.camel.dataformat.avro.example;
-import org.apache.avro.AvroRuntimeException;
-import org.apache.avro.Schema;
-import org.apache.avro.data.RecordBuilder;
-import org.apache.avro.specific.SpecificRecord;
-import org.apache.avro.specific.SpecificRecordBase;
-import org.apache.avro.specific.SpecificRecordBuilderBase;
-
@SuppressWarnings("all")
-public class Value extends SpecificRecordBase implements SpecificRecord {
- public static final Schema SCHEMA$ = Schema.parse(
+public class Value extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
+ public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse(
"{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.dataformat.avro.example\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}");
@Deprecated
public java.lang.CharSequence value;
- public Schema getSchema() {
+ public org.apache.avro.Schema getSchema() {
return SCHEMA$;
}
@@ -45,7 +38,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
case 0:
return value;
default:
- throw new AvroRuntimeException("Bad index");
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -57,7 +50,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
value = (java.lang.CharSequence) value$;
break;
default:
- throw new AvroRuntimeException("Bad index");
+ throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
@@ -78,43 +71,43 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
}
/** Creates a new Value RecordBuilder */
- public static Value.Builder newBuilder() {
- return new Value.Builder();
+ public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder() {
+ return new org.apache.camel.dataformat.avro.example.Value.Builder();
}
/** Creates a new Value RecordBuilder by copying an existing Builder */
- public static Value.Builder newBuilder(
- Value.Builder other) {
- return new Value.Builder(other);
+ public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder(
+ org.apache.camel.dataformat.avro.example.Value.Builder other) {
+ return new org.apache.camel.dataformat.avro.example.Value.Builder(other);
}
/** Creates a new Value RecordBuilder by copying an existing Value instance */
- public static Value.Builder newBuilder(
- Value other) {
- return new Value.Builder(other);
+ public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder(
+ org.apache.camel.dataformat.avro.example.Value other) {
+ return new org.apache.camel.dataformat.avro.example.Value.Builder(other);
}
/**
* RecordBuilder for Value instances.
*/
- public static class Builder extends SpecificRecordBuilderBase<Value>
- implements RecordBuilder<Value> {
+ public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<Value>
+ implements org.apache.avro.data.RecordBuilder<Value> {
private java.lang.CharSequence value;
/** Creates a new Builder */
private Builder() {
- super(Value.SCHEMA$);
+ super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$);
}
/** Creates a Builder by copying an existing Builder */
- private Builder(Value.Builder other) {
+ private Builder(org.apache.camel.dataformat.avro.example.Value.Builder other) {
super(other);
}
/** Creates a Builder by copying an existing Value instance */
- private Builder(Value other) {
- super(Value.SCHEMA$);
+ private Builder(org.apache.camel.dataformat.avro.example.Value other) {
+ super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$);
if (isValidValue(fields()[0], other.value)) {
this.value = data().deepCopy(fields()[0].schema(), other.value);
fieldSetFlags()[0] = true;
@@ -127,7 +120,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
}
/** Sets the value of the 'value' field */
- public Value.Builder setValue(java.lang.CharSequence value) {
+ public org.apache.camel.dataformat.avro.example.Value.Builder setValue(java.lang.CharSequence value) {
validate(fields()[0], value);
this.value = value;
fieldSetFlags()[0] = true;
@@ -140,7 +133,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
}
/** Clears the value of the 'value' field */
- public Value.Builder clearValue() {
+ public org.apache.camel.dataformat.avro.example.Value.Builder clearValue() {
value = null;
fieldSetFlags()[0] = false;
return this;
@@ -153,7 +146,7 @@ public class Value extends SpecificRecordBase implements SpecificRecord {
record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]);
return record;
} catch (Exception e) {
- throw new AvroRuntimeException(e);
+ throw new org.apache.avro.AvroRuntimeException(e);
}
}
}
diff --git a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java
index 976c878e70ee..4ce3e9f0c767 100644
--- a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java
+++ b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockConfiguration.java
@@ -23,7 +23,6 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
import software.amazon.awssdk.core.Protocol;
-import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient;
import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
@UriParams
@@ -37,7 +36,7 @@ public class BedrockConfiguration implements Cloneable, AwsCommonConfiguration {
private BedrockRuntimeClient bedrockRuntimeClient;
@UriParam
@Metadata(label = "advanced", autowired = true)
- private BedrockRuntimeAsyncClient bedrockRuntimeAsyncClient;
+ private software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient bedrockRuntimeAsyncClient;
@UriParam(label = "security", security = "secret")
private String accessKey;
@UriParam(label = "security", security = "secret")
@@ -96,7 +95,7 @@ public class BedrockConfiguration implements Cloneable, AwsCommonConfiguration {
this.bedrockRuntimeClient = bedrockRuntimeClient;
}
- public BedrockRuntimeAsyncClient getBedrockRuntimeAsyncClient() {
+ public software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient getBedrockRuntimeAsyncClient() {
return bedrockRuntimeAsyncClient;
}
@@ -104,7 +103,7 @@ public class BedrockConfiguration implements Cloneable, AwsCommonConfiguration {
* To use an existing configured AWS Bedrock Runtime Async client for streaming operations
*/
public void setBedrockRuntimeAsyncClient(
- BedrockRuntimeAsyncClient bedrockRuntimeAsyncClient) {
+ software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient bedrockRuntimeAsyncClient) {
this.bedrockRuntimeAsyncClient = bedrockRuntimeAsyncClient;
}
diff --git a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
index edc967263986..34596b9d242b 100644
--- a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
+++ b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/BedrockProducer.java
@@ -27,7 +27,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
import org.apache.camel.component.aws2.bedrock.runtime.stream.BedrockStreamHandler;
-import org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
@@ -35,20 +34,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.core.document.Document;
import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
-import software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest;
-import software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailResponse;
import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
import software.amazon.awssdk.services.bedrockruntime.model.ConverseRequest;
import software.amazon.awssdk.services.bedrockruntime.model.ConverseResponse;
import software.amazon.awssdk.services.bedrockruntime.model.ConverseStreamRequest;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentSource;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamConfiguration;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamProcessingMode;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace;
import software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration;
import software.amazon.awssdk.services.bedrockruntime.model.InvokeModelRequest;
import software.amazon.awssdk.services.bedrockruntime.model.InvokeModelResponse;
@@ -584,27 +574,27 @@ public class BedrockProducer extends DefaultProducer {
}
// Optional: Additional model request fields
- Document additionalFields = exchange.getMessage()
+ software.amazon.awssdk.core.document.Document additionalFields = exchange.getMessage()
.getHeader(BedrockConstants.CONVERSE_ADDITIONAL_MODEL_REQUEST_FIELDS,
- Document.class);
+ software.amazon.awssdk.core.document.Document.class);
if (ObjectHelper.isNotEmpty(additionalFields)) {
builder.additionalModelRequestFields(additionalFields);
}
// Optional: Guardrail configuration
- GuardrailConfiguration guardrailConfig
+ software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration guardrailConfig
= exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONFIG,
- GuardrailConfiguration.class);
+ software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration.class);
if (ObjectHelper.isNotEmpty(guardrailConfig)) {
builder.guardrailConfig(guardrailConfig);
} else if (ObjectHelper.isNotEmpty(getConfiguration().getGuardrailIdentifier())) {
// Build from endpoint configuration
- builder.guardrailConfig(GuardrailConfiguration.builder()
+ builder.guardrailConfig(software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration.builder()
.guardrailIdentifier(getConfiguration().getGuardrailIdentifier())
.guardrailVersion(getConfiguration().getGuardrailVersion())
.trace(getConfiguration().isGuardrailTrace()
- ? GuardrailTrace.ENABLED
- : GuardrailTrace.DISABLED)
+ ? software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace.ENABLED
+ : software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace.DISABLED)
.build());
}
@@ -614,7 +604,7 @@ public class BedrockProducer extends DefaultProducer {
try {
ConverseResponse response = bedrockRuntimeClient.converse(request);
- Message message = getMessageForResponse(exchange);
+ org.apache.camel.Message message = getMessageForResponse(exchange);
// Set the output message content as body
if (ObjectHelper.isNotEmpty(response.output()) && ObjectHelper.isNotEmpty(response.output().message())) {
@@ -700,28 +690,28 @@ public class BedrockProducer extends DefaultProducer {
}
// Optional: Additional model request fields
- Document additionalFields = exchange.getMessage()
+ software.amazon.awssdk.core.document.Document additionalFields = exchange.getMessage()
.getHeader(BedrockConstants.CONVERSE_ADDITIONAL_MODEL_REQUEST_FIELDS,
- Document.class);
+ software.amazon.awssdk.core.document.Document.class);
if (ObjectHelper.isNotEmpty(additionalFields)) {
builder.additionalModelRequestFields(additionalFields);
}
// Optional: Guardrail configuration (use GuardrailStreamConfiguration for streaming)
- GuardrailStreamConfiguration guardrailConfig
+ software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamConfiguration guardrailConfig
= exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONFIG,
- GuardrailStreamConfiguration.class);
+ software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamConfiguration.class);
if (ObjectHelper.isNotEmpty(guardrailConfig)) {
builder.guardrailConfig(guardrailConfig);
} else if (ObjectHelper.isNotEmpty(getConfiguration().getGuardrailIdentifier())) {
// Build from endpoint configuration
- builder.guardrailConfig(GuardrailStreamConfiguration
+ builder.guardrailConfig(software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamConfiguration
.builder()
.guardrailIdentifier(getConfiguration().getGuardrailIdentifier())
.guardrailVersion(getConfiguration().getGuardrailVersion())
.streamProcessingMode(getConfiguration().isGuardrailTrace()
- ? GuardrailStreamProcessingMode.ASYNC
- : GuardrailStreamProcessingMode.SYNC)
+ ? software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamProcessingMode.ASYNC
+ : software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamProcessingMode.SYNC)
.build());
}
@@ -743,16 +733,16 @@ public class BedrockProducer extends DefaultProducer {
streamOutputMode = exchange.getIn().getHeader(BedrockConstants.STREAM_OUTPUT_MODE, String.class);
}
- Message message = getMessageForResponse(exchange);
- ConverseStreamHandler.StreamMetadata metadata
- = new ConverseStreamHandler.StreamMetadata();
+ org.apache.camel.Message message = getMessageForResponse(exchange);
+ org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.StreamMetadata metadata
+ = new org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.StreamMetadata();
if ("chunks".equals(streamOutputMode)) {
// Chunks mode - emit each chunk as separate message
List<String> allChunks = new ArrayList<>();
getEndpoint().getBedrockRuntimeAsyncClient().converseStream(
request,
- ConverseStreamHandler.createChunksHandler(
+ org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.createChunksHandler(
metadata,
allChunks,
null))
@@ -767,7 +757,7 @@ public class BedrockProducer extends DefaultProducer {
StringBuilder fullText = new StringBuilder();
getEndpoint().getBedrockRuntimeAsyncClient().converseStream(
request,
- ConverseStreamHandler.createCompleteHandler(
+ org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.createCompleteHandler(
metadata,
fullText))
.join();
@@ -785,8 +775,8 @@ public class BedrockProducer extends DefaultProducer {
}
private void setConverseStreamingMetadata(
- Message message,
- ConverseStreamHandler.StreamMetadata metadata) {
+ org.apache.camel.Message message,
+ org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.StreamMetadata metadata) {
if (ObjectHelper.isNotEmpty(metadata.getStopReason())) {
message.setHeader(BedrockConstants.CONVERSE_STOP_REASON, metadata.getStopReason());
}
@@ -800,11 +790,11 @@ public class BedrockProducer extends DefaultProducer {
}
private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange exchange) throws InvalidPayloadException {
- ApplyGuardrailRequest request;
+ software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest request;
if (getConfiguration().isPojoRequest()) {
Object payload = exchange.getMessage().getMandatoryBody();
- if (payload instanceof ApplyGuardrailRequest guardrailRequest) {
+ if (payload instanceof software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest guardrailRequest) {
request = guardrailRequest;
} else {
throw new IllegalArgumentException(
@@ -812,8 +802,8 @@ public class BedrockProducer extends DefaultProducer {
}
} else {
// Build request from headers and configuration
- ApplyGuardrailRequest.Builder builder
- = ApplyGuardrailRequest.builder();
+ software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest.Builder builder
+ = software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest.builder();
// Guardrail identifier from header or configuration
String guardrailIdentifier = exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONFIG, String.class);
@@ -834,11 +824,11 @@ public class BedrockProducer extends DefaultProducer {
if (ObjectHelper.isEmpty(source)) {
source = "INPUT"; // Default to INPUT
}
- builder.source(GuardrailContentSource.fromValue(source));
+ builder.source(software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentSource.fromValue(source));
// Content blocks from header
@SuppressWarnings("unchecked")
- List<GuardrailContentBlock> content
+ List<software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentBlock> content
= exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONTENT, List.class);
if (ObjectHelper.isNotEmpty(content)) {
builder.content(content);
@@ -851,10 +841,10 @@ public class BedrockProducer extends DefaultProducer {
}
try {
- ApplyGuardrailResponse response
+ software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailResponse response
= bedrockRuntimeClient.applyGuardrail(request);
- Message message = getMessageForResponse(exchange);
+ org.apache.camel.Message message = getMessageForResponse(exchange);
// Set action as body
message.setBody(response.action().toString());
diff --git a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/stream/ConverseStreamHandler.java b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/stream/ConverseStreamHandler.java
index 3b978996dd15..182a17a3977d 100644
--- a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/stream/ConverseStreamHandler.java
+++ b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/stream/ConverseStreamHandler.java
@@ -23,7 +23,6 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.services.bedrockruntime.model.ConverseStreamResponseHandler;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace;
import software.amazon.awssdk.services.bedrockruntime.model.TokenUsage;
/**
@@ -130,7 +129,7 @@ public final class ConverseStreamHandler {
private String stopReason;
private TokenUsage usage;
private int chunkCount;
- private GuardrailTrace guardrailTrace;
+ private software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace guardrailTrace;
public String getFullText() {
return fullText;
@@ -172,11 +171,11 @@ public final class ConverseStreamHandler {
this.chunkCount = chunkCount;
}
- public GuardrailTrace getGuardrailTrace() {
+ public software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace getGuardrailTrace() {
return guardrailTrace;
}
- public void setGuardrailTrace(GuardrailTrace guardrailTrace) {
+ public void setGuardrailTrace(software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace guardrailTrace) {
this.guardrailTrace = guardrailTrace;
}
}
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java
index 77dcadd078ec..0d164fa02b1a 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockGuardrailsIT.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.aws2.bedrock.runtime.integration;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
@@ -32,16 +29,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest;
-import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.ConversationRole;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentSource;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailTextBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace;
-import software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration;
-import software.amazon.awssdk.services.bedrockruntime.model.Message;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -76,18 +63,18 @@ class BedrockGuardrailsIT extends CamelTestSupport {
result.expectedMessageCount(1);
final Exchange exchange = template.send("direct:converse_with_guardrails_endpoint", ex -> {
// Create a message using the Converse API
- List<Message> messages = new ArrayList<>();
- messages.add(Message.builder()
- .role(ConversationRole.USER)
- .content(ContentBlock
+ java.util.List<software.amazon.awssdk.services.bedrockruntime.model.Message> messages = new java.util.ArrayList<>();
+ messages.add(software.amazon.awssdk.services.bedrockruntime.model.Message.builder()
+ .role(software.amazon.awssdk.services.bedrockruntime.model.ConversationRole.USER)
+ .content(software.amazon.awssdk.services.bedrockruntime.model.ContentBlock
.fromText("Tell me about Paris"))
.build());
ex.getMessage().setHeader(BedrockConstants.CONVERSE_MESSAGES, messages);
// Optional: Add inference configuration
- InferenceConfiguration inferenceConfig
- = InferenceConfiguration.builder()
+ software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig
+ = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder()
.maxTokens(200)
.temperature(0.7f)
.build();
@@ -111,10 +98,10 @@ class BedrockGuardrailsIT extends CamelTestSupport {
result.expectedMessageCount(1);
final Exchange exchange = template.send("direct:converse_claude", ex -> {
// Create a message using the Converse API
- List<Message> messages = new ArrayList<>();
- messages.add(Message.builder()
- .role(ConversationRole.USER)
- .content(ContentBlock
+ java.util.List<software.amazon.awssdk.services.bedrockruntime.model.Message> messages = new java.util.ArrayList<>();
+ messages.add(software.amazon.awssdk.services.bedrockruntime.model.Message.builder()
+ .role(software.amazon.awssdk.services.bedrockruntime.model.ConversationRole.USER)
+ .content(software.amazon.awssdk.services.bedrockruntime.model.ContentBlock
.fromText("What is the capital of France?"))
.build());
@@ -122,17 +109,17 @@ class BedrockGuardrailsIT extends CamelTestSupport {
// Configure guardrail via header
String guardrailId = System.getProperty("aws.manual.guardrail.id");
- GuardrailConfiguration guardrailConfig
- = GuardrailConfiguration.builder()
+ software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration guardrailConfig
+ = software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration.builder()
.guardrailIdentifier(guardrailId)
.guardrailVersion("DRAFT")
- .trace(GuardrailTrace.ENABLED)
+ .trace(software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace.ENABLED)
.build();
ex.getMessage().setHeader(BedrockConstants.GUARDRAIL_CONFIG, guardrailConfig);
// Optional: Add inference configuration
- InferenceConfiguration inferenceConfig
- = InferenceConfiguration.builder()
+ software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig
+ = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder()
.maxTokens(100)
.temperature(0.7f)
.build();
@@ -156,10 +143,10 @@ class BedrockGuardrailsIT extends CamelTestSupport {
result.expectedMessageCount(1);
final Exchange exchange = template.send("direct:converse_stream_with_guardrails", ex -> {
// Create a message using the Converse API
- List<Message> messages = new ArrayList<>();
- messages.add(Message.builder()
- .role(ConversationRole.USER)
- .content(ContentBlock
+ java.util.List<software.amazon.awssdk.services.bedrockruntime.model.Message> messages = new java.util.ArrayList<>();
+ messages.add(software.amazon.awssdk.services.bedrockruntime.model.Message.builder()
+ .role(software.amazon.awssdk.services.bedrockruntime.model.ConversationRole.USER)
+ .content(software.amazon.awssdk.services.bedrockruntime.model.ContentBlock
.fromText("Tell me a short story about a robot"))
.build());
@@ -167,8 +154,8 @@ class BedrockGuardrailsIT extends CamelTestSupport {
ex.getMessage().setHeader(BedrockConstants.STREAM_OUTPUT_MODE, "complete");
// Optional: Add inference configuration
- InferenceConfiguration inferenceConfig
- = InferenceConfiguration.builder()
+ software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig
+ = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder()
.maxTokens(300)
.temperature(0.9f)
.build();
@@ -187,10 +174,10 @@ class BedrockGuardrailsIT extends CamelTestSupport {
result.expectedMessageCount(1);
final Exchange exchange = template.send("direct:apply_guardrail", ex -> {
// Create content blocks to check against the guardrail
- List<GuardrailContentBlock> content
- = new ArrayList<>();
- content.add(GuardrailContentBlock.builder()
- .text(GuardrailTextBlock.builder()
+ java.util.List<software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentBlock> content
+ = new java.util.ArrayList<>();
+ content.add(software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentBlock.builder()
+ .text(software.amazon.awssdk.services.bedrockruntime.model.GuardrailTextBlock.builder()
.text("This is a test message to check against the guardrail.")
.build())
.build());
@@ -218,21 +205,21 @@ class BedrockGuardrailsIT extends CamelTestSupport {
result.expectedMessageCount(1);
final Exchange exchange = template.send("direct:apply_guardrail_pojo", ex -> {
// Create content blocks
- List<GuardrailContentBlock> content
- = new ArrayList<>();
- content.add(GuardrailContentBlock.builder()
- .text(GuardrailTextBlock.builder()
+ java.util.List<software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentBlock> content
+ = new java.util.ArrayList<>();
+ content.add(software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentBlock.builder()
+ .text(software.amazon.awssdk.services.bedrockruntime.model.GuardrailTextBlock.builder()
.text("Another test message for guardrail validation.")
.build())
.build());
// Build the full ApplyGuardrailRequest
String guardrailId = System.getProperty("aws.manual.guardrail.id");
- ApplyGuardrailRequest request
- = ApplyGuardrailRequest.builder()
+ software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest request
+ = software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest.builder()
.guardrailIdentifier(guardrailId)
.guardrailVersion("DRAFT")
- .source(GuardrailContentSource.INPUT)
+ .source(software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentSource.INPUT)
.content(content)
.build();
diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
index 9e96e0bbeea9..a6e33f8f4308 100644
--- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
+++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.aws2.bedrock.runtime.integration;
-import java.util.ArrayList;
-import java.util.List;
-
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.*;
import org.apache.camel.EndpointInject;
@@ -34,10 +31,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
-import software.amazon.awssdk.services.bedrockruntime.model.ConversationRole;
-import software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration;
-import software.amazon.awssdk.services.bedrockruntime.model.Message;
// Must be manually tested. Provide your own accessKey and secretKey using -Daws.manual.access.key and -Daws.manual.secret.key
@EnabledIfSystemProperties({
@@ -885,18 +878,18 @@ class BedrockProducerIT extends CamelTestSupport {
result.expectedMessageCount(1);
final Exchange result = template.send("direct:converse_claude", exchange -> {
// Create a message using the Converse API
- List<Message> messages = new ArrayList<>();
- messages.add(Message.builder()
- .role(ConversationRole.USER)
- .content(ContentBlock
+ java.util.List<software.amazon.awssdk.services.bedrockruntime.model.Message> messages = new java.util.ArrayList<>();
+ messages.add(software.amazon.awssdk.services.bedrockruntime.model.Message.builder()
+ .role(software.amazon.awssdk.services.bedrockruntime.model.ConversationRole.USER)
+ .content(software.amazon.awssdk.services.bedrockruntime.model.ContentBlock
.fromText("What is the capital of France?"))
.build());
exchange.getMessage().setHeader(BedrockConstants.CONVERSE_MESSAGES, messages);
// Optional: Add inference configuration
- InferenceConfiguration inferenceConfig
- = InferenceConfiguration.builder()
+ software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig
+ = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder()
.maxTokens(100)
.temperature(0.7f)
.build();
@@ -911,10 +904,10 @@ class BedrockProducerIT extends CamelTestSupport {
result.expectedMessageCount(1);
final Exchange result = template.send("direct:converse_stream_claude", exchange -> {
// Create a message using the Converse API
- List<Message> messages = new ArrayList<>();
- messages.add(Message.builder()
- .role(ConversationRole.USER)
- .content(ContentBlock
+ java.util.List<software.amazon.awssdk.services.bedrockruntime.model.Message> messages = new java.util.ArrayList<>();
+ messages.add(software.amazon.awssdk.services.bedrockruntime.model.Message.builder()
+ .role(software.amazon.awssdk.services.bedrockruntime.model.ConversationRole.USER)
+ .content(software.amazon.awssdk.services.bedrockruntime.model.ContentBlock
.fromText("Tell me a short joke about Java programming"))
.build());
@@ -922,8 +915,8 @@ class BedrockProducerIT extends CamelTestSupport {
exchange.getMessage().setHeader(BedrockConstants.STREAM_OUTPUT_MODE, "complete");
// Optional: Add inference configuration
- InferenceConfiguration inferenceConfig
- = InferenceConfiguration.builder()
+ software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig
+ = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder()
.maxTokens(200)
.temperature(0.9f)
.build();
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
index 6f836492ecef..59dd0817e348 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws2.kinesis;
import java.math.BigDecimal;
import java.time.Instant;
import java.util.ArrayDeque;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -63,7 +62,7 @@ public class Kinesis2Consumer extends ScheduledBatchPollingConsumer implements R
private KinesisConnection connection;
private ResumeStrategy resumeStrategy;
- private final Map<String, String> currentShardIterators = new HashMap<>();
+ private final Map<String, String> currentShardIterators = new java.util.HashMap<>();
private final Set<String> warnLogged = new HashSet<>();
private volatile List<Shard> currentShardList = List.of();
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index 4d65759d900b..45e2a00ccf8f 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -55,8 +55,6 @@ import software.amazon.awssdk.services.s3.model.*;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
-import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
-import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
/**
* A Producer which sends messages to the Amazon Web Service Simple Storage Service
@@ -1053,13 +1051,13 @@ public class AWS2S3Producer extends DefaultProducer {
.key(keyName)
.build();
- PutObjectPresignRequest putObjectPresignRequest
- = PutObjectPresignRequest.builder()
+ software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest putObjectPresignRequest
+ = software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest.builder()
.signatureDuration(Duration.ofMillis(milliSeconds))
.putObjectRequest(putObjectRequest)
.build();
- PresignedPutObjectRequest presignedPutObjectRequest
+ software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest presignedPutObjectRequest
= presigner.presignPutObject(putObjectPresignRequest);
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
index 4b1ef57e797b..cf549df512ae 100644
--- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
+++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
@@ -115,9 +115,9 @@ public class Ses2Producer extends DefaultProducer {
return message.build();
}
- private RawMessage createRawMessage(Exchange exchange) throws Exception {
- RawMessage.Builder message
- = RawMessage.builder();
+ private software.amazon.awssdk.services.ses.model.RawMessage createRawMessage(Exchange exchange) throws Exception {
+ software.amazon.awssdk.services.ses.model.RawMessage.Builder message
+ = software.amazon.awssdk.services.ses.model.RawMessage.builder();
jakarta.mail.Message content = exchange.getIn().getBody(jakarta.mail.Message.class);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
content.writeTo(bos);
diff --git a/components/camel-azure/camel-azure-eventgrid/src/main/java/org/apache/camel/component/azure/eventgrid/EventGridConfiguration.java b/components/camel-azure/camel-azure-eventgrid/src/main/java/org/apache/camel/component/azure/eventgrid/EventGridConfiguration.java
index 680961eaf88f..56eec39b82f9 100644
--- a/components/camel-azure/camel-azure-eventgrid/src/main/java/org/apache/camel/component/azure/eventgrid/EventGridConfiguration.java
+++ b/components/camel-azure/camel-azure-eventgrid/src/main/java/org/apache/camel/component/azure/eventgrid/EventGridConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.azure.eventgrid;
import com.azure.core.credential.AzureKeyCredential;
import com.azure.core.credential.TokenCredential;
-import com.azure.core.models.CloudEvent;
import com.azure.messaging.eventgrid.EventGridPublisherClient;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
@@ -49,7 +48,7 @@ public class EventGridConfiguration implements Cloneable {
@UriParam(label = "producer")
@Metadata(autowired = true)
- private EventGridPublisherClient<CloudEvent> publisherClient;
+ private EventGridPublisherClient<com.azure.core.models.CloudEvent> publisherClient;
/**
* The topic endpoint URL where events will be published.
@@ -109,11 +108,11 @@ public class EventGridConfiguration implements Cloneable {
/**
* The EventGrid publisher client. If provided, it will be used instead of creating a new one.
*/
- public EventGridPublisherClient<CloudEvent> getPublisherClient() {
+ public EventGridPublisherClient<com.azure.core.models.CloudEvent> getPublisherClient() {
return publisherClient;
}
- public void setPublisherClient(EventGridPublisherClient<CloudEvent> publisherClient) {
+ public void setPublisherClient(EventGridPublisherClient<com.azure.core.models.CloudEvent> publisherClient) {
this.publisherClient = publisherClient;
}
diff --git a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java
index d82f4dbd5a1c..ef66688ebfd3 100644
--- a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java
+++ b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java
@@ -52,7 +52,6 @@ import org.apache.camel.component.file.remote.RemoteFile;
import org.apache.camel.component.file.remote.RemoteFileConfiguration;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
import org.slf4j.Logger;
@@ -255,7 +254,7 @@ public class FilesOperations extends NormalizedOperations {
boolean success;
GenericFile<ShareFileItem> target = (GenericFile<ShareFileItem>) exchange
.getProperty(FileComponent.FILE_EXCHANGE_FILE);
- ObjectHelper.notNull(target,
+ org.apache.camel.util.ObjectHelper.notNull(target,
"Exchange should have the " + FileComponent.FILE_EXCHANGE_FILE + " set");
String path = FileUtil.onlyPath(name);
@@ -298,7 +297,7 @@ public class FilesOperations extends NormalizedOperations {
// use relative filename in local work directory
GenericFile<ShareFileItem> target = (GenericFile<ShareFileItem>) exchange
.getProperty(FileComponent.FILE_EXCHANGE_FILE);
- ObjectHelper.notNull(target,
+ org.apache.camel.util.ObjectHelper.notNull(target,
"Exchange should have the " + FileComponent.FILE_EXCHANGE_FILE + " set");
String relativeName = target.getRelativeFilePath();
diff --git a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
index 91bc594bc3b4..3a508139d0cf 100644
--- a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
+++ b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
@@ -396,9 +396,9 @@ public class ServiceBusConfiguration implements Cloneable, HeaderFilterStrategyA
//
// *************************************************
- public ServiceBusConfiguration copy() {
+ public org.apache.camel.component.azure.servicebus.ServiceBusConfiguration copy() {
try {
- return (ServiceBusConfiguration) super.clone();
+ return (org.apache.camel.component.azure.servicebus.ServiceBusConfiguration) super.clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
diff --git a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
index 00c5dff10065..a97358e58959 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.file.Path;
import java.time.Duration;
import java.time.OffsetDateTime;
import java.util.Collections;
@@ -310,7 +309,7 @@ public class BlobOperations {
// Then check body - only return file path if body is File/Path/String (not InputStream)
Object body = exchange.getIn().getBody();
- if (body instanceof Path path) {
+ if (body instanceof java.nio.file.Path path) {
return path.toAbsolutePath().toString();
}
if (body instanceof File file) {
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
index f4f9e42f6109..1812e766075e 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
@@ -26,7 +26,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.nio.file.Path;
import java.security.SecureRandom;
import java.util.HashMap;
@@ -297,7 +296,7 @@ class BlobOperationsIT extends Base {
// Create a test file larger than 256KB to test chunked upload
final Path testFile = testDir.resolve("large_upload_test.txt");
final String content = RandomStringUtils.randomAlphanumeric(512 * 1024); // 512KB of random content
- Files.writeString(testFile, content);
+ java.nio.file.Files.writeString(testFile, content);
final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("large_upload_test.txt");
final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper);
@@ -327,7 +326,7 @@ class BlobOperationsIT extends Base {
// Create a test file
final Path testFile = testDir.resolve("file_path_upload_test.txt");
final String content = "Test content for file-based upload";
- Files.writeString(testFile, content);
+ java.nio.file.Files.writeString(testFile, content);
final BlobClientWrapper blobClientWrapper
= blobContainerClientWrapper.getBlobClientWrapper("file_path_upload_test.txt");
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
index 652663f29f45..ef8e66a403ba 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.camel.BeanScope;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.LRUCache;
import org.apache.camel.support.LRUCacheFactory;
@@ -32,7 +31,7 @@ import org.slf4j.LoggerFactory;
/**
* The bean component is for invoking Java beans from Camel.
*/
-@Component("bean")
+@org.apache.camel.spi.annotations.Component("bean")
public class BeanComponent extends DefaultComponent {
private static final Logger LOG = LoggerFactory.getLogger(BeanComponent.class);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index ba17b054f4da..29c7a46b8e3e 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -35,7 +35,6 @@ import java.util.concurrent.CompletionStage;
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
-import org.apache.camel.DynamicRouter;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
@@ -47,8 +46,6 @@ import org.apache.camel.Message;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Pattern;
import org.apache.camel.Processor;
-import org.apache.camel.RecipientList;
-import org.apache.camel.RoutingSlip;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.StreamCache;
@@ -134,8 +131,8 @@ public class MethodInfo {
pattern = aep;
}
- RoutingSlip routingSlipAnnotation
- = (RoutingSlip) collectedMethodAnnotation.get(RoutingSlip.class);
+ org.apache.camel.RoutingSlip routingSlipAnnotation
+ = (org.apache.camel.RoutingSlip) collectedMethodAnnotation.get(org.apache.camel.RoutingSlip.class);
if (routingSlipAnnotation != null) {
routingSlip = PluginHelper.getAnnotationBasedProcessorFactory(camelContext)
.createRoutingSlip(camelContext, routingSlipAnnotation);
@@ -147,8 +144,8 @@ public class MethodInfo {
}
}
- DynamicRouter dynamicRouterAnnotation
- = (DynamicRouter) collectedMethodAnnotation.get(DynamicRouter.class);
+ org.apache.camel.DynamicRouter dynamicRouterAnnotation
+ = (org.apache.camel.DynamicRouter) collectedMethodAnnotation.get(org.apache.camel.DynamicRouter.class);
if (dynamicRouterAnnotation != null) {
dynamicRouter = PluginHelper.getAnnotationBasedProcessorFactory(camelContext)
.createDynamicRouter(camelContext, dynamicRouterAnnotation);
@@ -160,8 +157,8 @@ public class MethodInfo {
}
}
- RecipientList recipientListAnnotation
- = (RecipientList) collectedMethodAnnotation.get(RecipientList.class);
+ org.apache.camel.RecipientList recipientListAnnotation
+ = (org.apache.camel.RecipientList) collectedMethodAnnotation.get(org.apache.camel.RecipientList.class);
if (recipientListAnnotation != null) {
recipientList = PluginHelper.getAnnotationBasedProcessorFactory(camelContext)
.createRecipientList(camelContext, recipientListAnnotation);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
index dd75171c4da7..dfe41a6cca46 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.bean.ConstantBeanHolder;
import org.apache.camel.component.bean.ConstantTypeBeanHolder;
import org.apache.camel.component.bean.ParameterMappingStrategy;
import org.apache.camel.component.bean.ParameterMappingStrategyHelper;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.util.PropertiesHelper;
/**
@@ -34,7 +33,7 @@ import org.apache.camel.util.PropertiesHelper;
* <p/>
* This component is an extension to the {@link org.apache.camel.component.bean.BeanComponent}.
*/
-@Component("class")
+@org.apache.camel.spi.annotations.Component("class")
public class ClassComponent extends BeanComponent {
private ParameterMappingStrategy parameterMappingStrategy;
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index 3a1934661d8c..6524eebf1941 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -627,17 +627,17 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
}
if (hasHeader && isHeader) {
- throw new IllegalArgumentException(
+ throw new java.lang.IllegalArgumentException(
"Record can not be configured with both 'isHeader=true' and 'hasHeader=true'");
}
if (hasFooter && isFooter) {
- throw new IllegalArgumentException(
+ throw new java.lang.IllegalArgumentException(
"Record can not be configured with both 'isFooter=true' and 'hasFooter=true'");
}
if ((isHeader || isFooter) && (skipHeader || skipFooter)) {
- throw new IllegalArgumentException(
+ throw new java.lang.IllegalArgumentException(
"skipHeader and/or skipFooter can not be configured on a record where 'isHeader=true' or 'isFooter=true'");
}
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
index 1bcc6d95a091..6c38ec2d92a1 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
@@ -188,7 +188,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
// BigIntegerFormatFactory if models list is empty or not
// If this is the case (correspond to an empty stream, ...)
if (models.isEmpty() && !isAllowEmptyStream()) {
- throw new IllegalArgumentException("No records have been defined in the CSV");
+ throw new java.lang.IllegalArgumentException("No records have been defined in the CSV");
} else {
return extractUnmarshalResult(models);
}
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java
index d63e7da90540..c4fe06e19fad 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java
@@ -89,7 +89,7 @@ public class DateFormatFactory extends AbstractFormatFactory {
}
- protected DateFormat getDateFormat() {
+ protected java.text.DateFormat getDateFormat() {
SimpleDateFormat result;
if (locale != null) {
result = new SimpleDateFormat(pattern, locale);
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
index 74e69c723879..25e18bf21cdf 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
@@ -122,7 +122,7 @@ public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat {
// BigIntegerFormatFactory if models list is empty or not
// If this is the case (correspond to an empty stream, ...)
if (models.isEmpty() && !isAllowEmptyStream()) {
- throw new IllegalArgumentException("No records have been defined in the CSV");
+ throw new java.lang.IllegalArgumentException("No records have been defined in the CSV");
} else {
return extractUnmarshalResult(models);
}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
index 2c33a39fbd2b..1da0cb1dca6f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
@@ -111,7 +111,7 @@ public class BindyCsvClassTypeAsStringTest extends CamelTestSupport {
@Override
public void configure() {
BindyDataFormat bindy = new BindyDataFormat()
- .classType(Order.class)
+ .classType(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class)
.locale("en")
.csv();
@@ -120,7 +120,7 @@ public class BindyCsvClassTypeAsStringTest extends CamelTestSupport {
.to("mock:in");
from("direct:out")
- .unmarshal().bindy(BindyType.Csv, Order.class)
+ .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class)
.to("mock:out");
}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
index 968aaf25da61..24cf12b763ac 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
@@ -90,7 +90,7 @@ public class BindyCarQuoteAndCommaDelimiterTest extends CamelTestSupport {
@Override
public void configure() {
- Class<?> type = Car.class;
+ Class<?> type = org.apache.camel.dataformat.bindy.model.car.Car.class;
BindyCsvDataFormat dataFormat = new BindyCsvDataFormat();
dataFormat.setClassType(type);
dataFormat.setLocale("en");
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 5958e5908392..de2505994396 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
@@ -103,7 +103,7 @@ public class BindyComplexCsvGenerateHeaderMarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.complex.generateheader.Order.class);
camelDataFormat.setLocale("en");
from("direct:start").marshal(camelDataFormat).to("mock:result");
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 b5fab2aa8be1..517d019e0aee 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
@@ -99,7 +99,7 @@ public class BindyComplexCsvMarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class);
camelDataFormat.setLocale("en");
from("direct:start").marshal(camelDataFormat).to("mock:result");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java
index cf343768587d..da84433e6595 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallEmptyStreamTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
@@ -34,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@CamelSpringTest
public class BindyComplexCsvUnmarshallEmptyStreamTest {
- private static final Class<?> TYPE = Order.class;
+ private static final Class<?> TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class;
@Produce("direct:start")
protected ProducerTemplate template;
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 b001dd5ff055..e6fd7b7669da 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
@@ -23,7 +23,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
@@ -34,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@CamelSpringTest
public class BindyComplexCsvUnmarshallTest {
- private static final Class<?> TYPE = Order.class;
+ private static final Class<?> TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class;
@Produce("direct:start")
protected ProducerTemplate template;
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 049b378971b7..4c6f5439d677 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
@@ -23,7 +23,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order;
import org.apache.camel.model.dataformat.BindyType;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
@@ -35,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@CamelSpringTest
public class BindyComplexCsvUnmarshallUnwrapSingleInstanceTest {
- private static final Class<?> TYPE = Order.class;
+ private static final Class<?> TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class;
@Produce("direct:start")
protected ProducerTemplate template;
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 ade0df2d92b2..4ee4ce53cdcd 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
@@ -22,7 +22,6 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
@@ -55,7 +54,7 @@ public class BindyCsvBigFileUnmarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
from("file://src/test/data/big?noop=true").unmarshal(camelDataFormat).to("mock:result");
}
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 b17b78c2217c..a16c189d9081 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
@@ -63,7 +63,7 @@ public class BindyInlinedQuotesCsvUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class);
@Override
public void configure() {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
index 09b5862fd097..2b21f853cd32 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
@@ -89,12 +89,12 @@ public class BindyPipeDelimiterTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:unmarshal")
- .unmarshal().bindy(BindyType.Csv, MyData.class)
+ .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class)
.to("log:after.unmarshal")
.to("mock:result");
from("direct:marshal")
- .marshal().bindy(BindyType.Csv, MyData.class)
+ .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class)
.to("log:after.marshal")
.to("mock:result");
}
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 1a59a7d513f9..1cba0214c31f 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
@@ -94,7 +94,7 @@ public class BindyPojoSimpleCsvMarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
camelDataFormat.setLocale("en");
// default should errors go to mock:error
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 86538cc57c6e..c50f2eb3da4c 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
@@ -73,7 +73,7 @@ public class BindySimpleCsvBooleanFalseMarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
- BooleanExample.class);
+ org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class);
camelDataFormat.setLocale("en");
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 85231b9177bc..88639eba2140 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
@@ -73,7 +73,7 @@ public class BindySimpleCsvBooleanTrueMarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
- BooleanExample.class);
+ org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class);
camelDataFormat.setLocale("en");
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 604dad00f9bc..af0f86398dae 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
@@ -113,7 +113,7 @@ public class BindySimpleCsvBooleanUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
- BooleanExample.class);
+ org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class);
@Override
public void configure() {
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 403cb2206895..dc885b30b75e 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
@@ -91,7 +91,7 @@ public class BindySimpleCsvGenerateHeaderMarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassgenerateheader.Order.class);
camelDataFormat.setLocale("en");
from("direct:start").marshal(camelDataFormat).to("mock:result");
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 bec2b93ff77c..156ef63e2401 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
@@ -22,7 +22,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
@@ -183,7 +182,7 @@ public class BindySimpleCsvMandatoryFieldsUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat formatOptional
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
BindyCsvDataFormat formatMandatory
= new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassmandatory.Order.class);
BindyCsvDataFormat formatEmptyStream
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 2c7e02a6ba01..eab03377d15e 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
@@ -95,7 +95,7 @@ public class BindySimpleCsvMarshallDslTest {
@Override
public void configure() {
BindyDataFormat bindy = new BindyDataFormat()
- .classType(Order.class)
+ .classType(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class)
.locale("en")
.csv();
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
index 582f1359c9ae..13ff2439f9cd 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
@@ -80,7 +80,7 @@ public class BindySimpleCsvMarshallPositionModifiedTest extends CommonBindyTest
public void configure() {
BindyCsvDataFormat csvBindyDataFormat = new BindyCsvDataFormat(
- Order.class);
+ org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order.class);
csvBindyDataFormat.setLocale("en");
// default should errors go to mock:error
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 f0addb6681bb..b693b3b5613f 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
@@ -104,7 +104,7 @@ public class BindySimpleCsvMarshallTest {
public void configure() {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
camelDataFormat.setLocale("en");
// default should errors go to mock:error
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 2b52371c924b..fc6095d5f97c 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
@@ -66,7 +66,7 @@ public class BindySimpleCsvMarshallTrimClipTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
- Customer.class);
+ org.apache.camel.dataformat.bindy.model.simple.oneclassandtrimandclip.Customer.class);
from(URI_DIRECT_START).marshal(camelDataFormat).to(URI_MOCK_RESULT);
}
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 04c62421e818..93bbf81e3eb2 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
@@ -87,7 +87,7 @@ public class BindySimpleCsvNullMarshallTest {
@Override
public void configure() {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
camelDataFormat.setLocale("en");
from("direct:start").marshal(camelDataFormat).to("mock:result");
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 9619a3d09ef5..40e7f040110b 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
@@ -111,7 +111,7 @@ public class BindySimpleCsvOneToManyMarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Author.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.onetomany.Author.class);
@Override
public void configure() {
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 c3b91e8b890b..324d84ddc21d 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
@@ -24,7 +24,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.simple.oneclassandremovewhitespace.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
@@ -57,7 +56,7 @@ public class BindySimpleCsvRemoveWhitespaceUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
- Order.class);
+ org.apache.camel.dataformat.bindy.model.simple.oneclassandremovewhitespace.Order.class);
@Override
public void configure() {
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 8620c307da60..1a07d8276898 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
@@ -21,7 +21,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.simple.oneclassandskipfirstline.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
@@ -62,7 +61,7 @@ public class BindySimpleCsvSkipFirstLineUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassandskipfirstline.Order.class);
@Override
public void configure() {
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 de29db54c755..668fd03b4b55 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
@@ -22,7 +22,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.simple.oneclassmath.Math;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -96,7 +95,7 @@ public class BindySimpleCsvUnmarshallBadIntegerTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat orderBindyDataFormat
- = new BindyCsvDataFormat(Math.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassmath.Math.class);
@Override
public void configure() {
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 f20d0842697e..3b7e2ce03592 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
@@ -23,7 +23,6 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.format.FormatException;
-import org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
@@ -90,7 +89,7 @@ public class BindySimpleCsvUnmarshallPositionModifiedTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat orderBindyDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order.class);
@Override
public void configure() {
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 e6966ac8770e..cd8a1312e6cb 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
@@ -153,7 +153,7 @@ public class BindySimpleCsvUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
@Override
public void configure() {
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 19195075af3c..1c11dc35c6a3 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
@@ -63,7 +63,7 @@ public class BindySingleQuoteStartWordCsvUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
@Override
public void configure() {
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 cca82c4a3ca4..5fd0b6a49dae 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
@@ -21,7 +21,6 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order;
import org.apache.camel.test.spring.junit6.CamelSpringTest;
import org.junit.jupiter.api.Test;
import org.springframework.test.annotation.DirtiesContext;
@@ -56,7 +55,7 @@ public class BindySingleQuotesCsvUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class);
@Override
public void configure() {
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 13b784ddba6e..5cfeed1d60be 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
@@ -63,7 +63,7 @@ public class BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyCsvDataFormat camelDataFormat
- = new BindyCsvDataFormat(Order.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class);
@Override
public void configure() {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
index 948a543822ac..c5086b871e92 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
@@ -119,7 +119,7 @@ public class BindyTabSeparatorTest extends CamelTestSupport {
@Override
public void configure() {
BindyCsvDataFormat bindy
- = new BindyCsvDataFormat(PurchaseOrder.class);
+ = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.tab.PurchaseOrder.class);
from("direct:marshal")
.marshal(bindy)
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
index 1fd727d19b51..22f107f60000 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
@@ -63,10 +63,10 @@ public class BindyMarshalUnmarshalWithDefaultValueTest extends CamelTestSupport
@Override
public void configure() {
from("direct:marshal")
- .marshal().bindy(BindyType.Csv, WeatherModel.class)
+ .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)
.to("mock:resultMarshal");
from("direct:unmarshal")
- .unmarshal().bindy(BindyType.Csv, WeatherModel.class)
+ .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)
.to("mock:resultUnmarshal");
}
};
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java
index 4f702debf5a3..f1dde1447263 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java
@@ -56,11 +56,11 @@ public class BindyMarshalUnmarshalssueTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .marshal().bindy(BindyType.Csv, WeatherModel.class)
+ .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)
.to("direct:middle");
from("direct:middle")
- .unmarshal(new BindyCsvDataFormat(WeatherModel.class))
+ .unmarshal(new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.csv2.WeatherModel.class))
.to("mock:result");
}
};
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
index 7efe614d9eeb..e8a0248045be 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
@@ -50,7 +50,7 @@ public class BindyMarshalWithQuoteTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .marshal().bindy(BindyType.Csv, WeatherModel.class)
+ .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)
.to("mock:result");
}
};
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java
index e41ddc846ed0..84679d0f7487 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java
@@ -30,7 +30,7 @@ public class BindyUnmarshalCommaIssue2Test extends BindyUnmarshalCommaIssueTest
@Override
public void configure() {
from("direct:start")
- .unmarshal(new BindyCsvDataFormat(WeatherModel.class))
+ .unmarshal(new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.csv2.WeatherModel.class))
.to("mock:result");
}
};
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
index 3e8c1f4d6c26..971508f35347 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
@@ -109,7 +109,7 @@ public class BindyUnmarshalCommaIssueTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .unmarshal().bindy(BindyType.Csv, WeatherModel.class)
+ .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)
.to("mock:result");
}
};
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
index 65adbe7b9027..4d07f4bce035 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
@@ -51,14 +51,14 @@ public class BindyComplexKeyValuePairStandaloneTest {
// Set factory
BindyKeyValuePairDataFormat dataFormat
- = new BindyKeyValuePairDataFormat(Order.class);
+ = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order.class);
factory = dataFormat.getFactory();
// Set model class
- models.add(Order.class);
- models.add(Header.class);
+ models.add(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order.class);
+ models.add(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Header.class);
// f.models.add(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Security.class);
- models.add(Trailer.class);
+ models.add(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Trailer.class);
// Init model
model.put("org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order", new Order());
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
index eb7784dc5f50..14db89d9e2ad 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
@@ -58,7 +58,7 @@ public class BindyComplexOneToManyKeyValuePairUnMarshallTest extends CommonBindy
public static class ContextConfig extends RouteBuilder {
BindyKeyValuePairDataFormat kvpBindyDataFormat
- = new BindyKeyValuePairDataFormat(Order.class);
+ = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order.class);
@Override
public void configure() {
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 55fb8598a67a..812c1fc2c26a 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
@@ -84,7 +84,7 @@ public class BindySimpleKeyValuePairMarshallDslTest {
@Override
public void configure() {
from("direct:start").marshal()
- .bindy(BindyType.KeyValue, Order.class)
+ .bindy(BindyType.KeyValue, org.apache.camel.dataformat.bindy.model.fix.simple.Order.class)
.to("mock:result");
}
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 488cf900d30e..c8eb80fd36ba 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
@@ -91,7 +91,7 @@ public class BindySimpleKeyValuePairMarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyKeyValuePairDataFormat camelDataFormat
- = new BindyKeyValuePairDataFormat(Order.class);
+ = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.simple.Order.class);
@Override
public void configure() {
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 25670f52fde5..bc50ca1e1c2e 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
@@ -94,7 +94,7 @@ public class BindySimpleKeyValuePairNullMarshallTest {
public static class ContextConfig extends RouteBuilder {
BindyKeyValuePairDataFormat kvpBindyDataFormat
- = new BindyKeyValuePairDataFormat(Order.class);
+ = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.simple.Order.class);
@Override
public void configure() {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
index 4f932c924676..0f023085728f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
@@ -93,7 +93,7 @@ public class BindySimpleKeyValuePairSortedMarshallTest extends CommonBindyTest {
public static class ContextConfig extends RouteBuilder {
BindyKeyValuePairDataFormat kvpBindyDataFormat
- = new BindyKeyValuePairDataFormat(Order.class);
+ = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.sorted.body.Order.class);
@Override
public void configure() {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
index 34c2e4667c64..b68a2bc0f295 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
@@ -85,7 +85,7 @@ public class BindySimpleKeyValuePairTabMarshallTest extends CommonBindyTest {
public static class ContextConfig extends RouteBuilder {
BindyKeyValuePairDataFormat kvpBindyDataFormat
- = new BindyKeyValuePairDataFormat(Order.class);
+ = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.tab.Order.class);
@Override
public void configure() {
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 0044fb77d19b..f9cd8dd87819 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
@@ -96,7 +96,7 @@ public class BindySimpleKeyValuePairWithoutSectionMarshallDslTest {
public static class ContextConfig extends RouteBuilder {
BindyKeyValuePairDataFormat orderBindyDataFormat
- = new BindyKeyValuePairDataFormat(Order.class);
+ = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.withoutsection.Order.class);
@Override
public void configure() {
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIT.java
index 50218e625c15..a99fa186612b 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.box;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -71,7 +70,7 @@ public class BoxCollaborationsManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxCollaboration.Role
headers.put("CamelBox.role", BoxCollaboration.Role.EDITOR);
- final BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATIONBYEMAIL",
+ final com.box.sdk.BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATIONBYEMAIL",
testFolder.getID(), headers);
assertNotNull(result, "addFolderCollaboration result");
@@ -98,7 +97,7 @@ public class BoxCollaborationsManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxCollaboration.Role
headers.put("CamelBox.role", BoxCollaboration.Role.EDITOR);
- final BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATION",
+ final com.box.sdk.BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATION",
testFolder.getID(), headers);
assertNotNull(result, "addFolderCollaboration result");
LOG.debug("addFolderCollaboration: {}", result);
@@ -115,7 +114,7 @@ public class BoxCollaborationsManagerIT extends AbstractBoxITSupport {
@Test
public void testGetCollaborationInfo() {
// using String message body for single parameter "collaborationId"
- final BoxCollaboration.Info result = requestBody("direct://GETCOLLABORATIONINFO",
+ final com.box.sdk.BoxCollaboration.Info result = requestBody("direct://GETCOLLABORATIONINFO",
testCollaboration.getID());
assertNotNull(result, "getCollaborationInfo result");
@@ -126,7 +125,7 @@ public class BoxCollaborationsManagerIT extends AbstractBoxITSupport {
public void testGetFolderCollaborations() {
// using String message body for single parameter "folderId"
@SuppressWarnings("rawtypes")
- final Collection result = requestBody("direct://GETFOLDERCOLLABORATIONS", testFolder.getID());
+ final java.util.Collection result = requestBody("direct://GETFOLDERCOLLABORATIONS", testFolder.getID());
assertNotNull(result, "getFolderCollaborations result");
LOG.debug("getFolderCollaborations: {}", result);
@@ -135,7 +134,7 @@ public class BoxCollaborationsManagerIT extends AbstractBoxITSupport {
@SuppressWarnings("rawtypes")
@Test
public void testGetPendingCollaborations() {
- final Collection result = requestBody("direct://GETPENDINGCOLLABORATIONS", null);
+ final java.util.Collection result = requestBody("direct://GETPENDINGCOLLABORATIONS", null);
assertNotNull(result, "getPendingCollaborations result");
LOG.debug("getPendingCollaborations: {}", result);
@@ -152,7 +151,7 @@ public class BoxCollaborationsManagerIT extends AbstractBoxITSupport {
info.setRole(BoxCollaboration.Role.PREVIEWER);
headers.put("CamelBox.info", info);
- final BoxCollaboration result = requestBodyAndHeaders("direct://UPDATECOLLABORATIONINFO", null,
+ final com.box.sdk.BoxCollaboration result = requestBodyAndHeaders("direct://UPDATECOLLABORATIONINFO", null,
headers);
assertNotNull(result, "updateCollaborationInfo result");
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIT.java
index a48cdee0cd78..0cd81cefc440 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIT.java
@@ -23,7 +23,6 @@ import java.util.Map;
import com.box.sdk.BoxAPIConnection;
import com.box.sdk.BoxComment;
-import com.box.sdk.BoxFile;
import com.box.sdk.BoxFolder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxCommentsManager;
@@ -64,7 +63,7 @@ public class BoxCommentsManagerIT extends AbstractBoxITSupport {
// parameter type is String
headers.put("CamelBox.message", CAMEL_TEST_FILE_COMMENT);
- final BoxFile result = requestBodyAndHeaders("direct://ADDFILECOMMENT", null, headers);
+ final com.box.sdk.BoxFile result = requestBodyAndHeaders("direct://ADDFILECOMMENT", null, headers);
assertNotNull(result, "addFileComment result");
assertNotNull(result.getComments(), "addFileComment comments");
@@ -84,7 +83,7 @@ public class BoxCommentsManagerIT extends AbstractBoxITSupport {
// parameter type is String
headers.put("CamelBox.message", CAMEL_TEST_FILE_CHANGED_COMMENT);
- final BoxComment result = requestBodyAndHeaders("direct://CHANGECOMMENTMESSAGE", null, headers);
+ final com.box.sdk.BoxComment result = requestBodyAndHeaders("direct://CHANGECOMMENTMESSAGE", null, headers);
assertNotNull(result, "changeCommentMessage result");
assertNotNull(result.getInfo().getMessage(), "changeCommentMessage message");
@@ -110,7 +109,7 @@ public class BoxCommentsManagerIT extends AbstractBoxITSupport {
BoxComment.Info commentInfo = testFile.addComment(CAMEL_TEST_FILE_COMMENT);
// using String message body for single parameter "commentId"
- final BoxComment.Info result = requestBody("direct://GETCOMMENTINFO", commentInfo.getID());
+ final com.box.sdk.BoxComment.Info result = requestBody("direct://GETCOMMENTINFO", commentInfo.getID());
assertNotNull(result, "getCommentInfo result");
assertEquals(CAMEL_TEST_FILE_COMMENT, result.getMessage(), "getCommentInfo message");
@@ -123,7 +122,7 @@ public class BoxCommentsManagerIT extends AbstractBoxITSupport {
// using String message body for single parameter "fileId"
@SuppressWarnings("rawtypes")
- final List result = requestBody("direct://GETFILECOMMENTS", testFile.getID());
+ final java.util.List result = requestBody("direct://GETFILECOMMENTS", testFile.getID());
assertNotNull(result, "getFileComments result");
assertEquals(1, result.size(), "getFileComments size");
@@ -141,7 +140,7 @@ public class BoxCommentsManagerIT extends AbstractBoxITSupport {
// parameter type is String
headers.put("CamelBox.message", CAMEL_TEST_FILE_REPLY_COMMENT);
- final BoxComment result = requestBodyAndHeaders("direct://REPLYTOCOMMENT", null, headers);
+ final com.box.sdk.BoxComment result = requestBodyAndHeaders("direct://REPLYTOCOMMENT", null, headers);
assertNotNull(result, "replyToComment result");
assertEquals(CAMEL_TEST_FILE_REPLY_COMMENT, result.getInfo().getMessage(), "replyToComment result");
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIT.java
index 87e52ceb3714..95832545ae85 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventLogsManagerIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.box;
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
@@ -63,7 +62,7 @@ public class BoxEventLogsManagerIT extends AbstractBoxITSupport {
headers.put("CamelBox.types", null);
@SuppressWarnings("rawtypes")
- final List result = requestBodyAndHeaders("direct://GETENTERPRISEEVENTS", null, headers);
+ final java.util.List result = requestBodyAndHeaders("direct://GETENTERPRISEEVENTS", null, headers);
assertNotNull(result, "getEnterpriseEvents result");
LOG.debug("getEnterpriseEvents: {}", result);
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java
index 0d7c1fdd13f1..40bf748a80cc 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIT.java
@@ -18,9 +18,6 @@ package org.apache.camel.component.box;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +25,6 @@ import com.box.sdk.BoxAPIConnection;
import com.box.sdk.BoxAPIException;
import com.box.sdk.BoxFile;
import com.box.sdk.BoxFile.ThumbnailFileType;
-import com.box.sdk.BoxFileVersion;
import com.box.sdk.BoxFolder;
import com.box.sdk.BoxSharedLink;
import com.box.sdk.Metadata;
@@ -70,7 +66,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testCopyFile() {
- BoxFile result = null;
+ com.box.sdk.BoxFile result = null;
try {
final Map<String, Object> headers = new HashMap<>();
@@ -106,7 +102,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is String
headers.put("CamelBox.typeName", null);
- final Metadata result = requestBodyAndHeaders("direct://CREATEFILEMETADATA", null, headers);
+ final com.box.sdk.Metadata result = requestBodyAndHeaders("direct://CREATEFILEMETADATA", null, headers);
assertNotNull(result, "createFileMetadata result");
assertEquals("bar", result.getString("/foo"), "createFileMetadata result");
@@ -125,7 +121,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxSharedLink.Permissions
headers.put("CamelBox.permissions", null);
- final BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFILESHAREDLINK", null, headers);
+ final com.box.sdk.BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFILESHAREDLINK", null, headers);
assertNotNull(result, "createFileSharedLink result");
LOG.debug("createFileSharedLink: {}", result);
@@ -187,7 +183,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.ProgressListener
headers.put("CamelBox.listener", null);
- final OutputStream result = requestBodyAndHeaders("direct://DOWNLOADFILE", null, headers);
+ final java.io.OutputStream result = requestBodyAndHeaders("direct://DOWNLOADFILE", null, headers);
assertNotNull(result, "downloadFile result");
LOG.debug("downloadFile: {}", result);
@@ -207,7 +203,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.ProgressListener
headers.put("CamelBox.listener", null);
- final OutputStream result = requestBodyAndHeaders("direct://DOWNLOADPREVIOUSFILEVERSION", null,
+ final java.io.OutputStream result = requestBodyAndHeaders("direct://DOWNLOADPREVIOUSFILEVERSION", null,
headers);
assertNotNull(result, "downloadPreviousFileVersion result");
@@ -217,7 +213,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testGetDownloadURL() {
// using String message body for single parameter "fileId"
- final URL result = requestBody("direct://GETDOWNLOADURL", testFile.getID());
+ final java.net.URL result = requestBody("direct://GETDOWNLOADURL", testFile.getID());
assertNotNull(result, "getDownloadURL result");
LOG.debug("getDownloadURL: {}", result);
@@ -231,7 +227,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is String[]
headers.put("CamelBox.fields", null);
- final BoxFile.Info result = requestBodyAndHeaders("direct://GETFILEINFO", null, headers);
+ final com.box.sdk.BoxFile.Info result = requestBodyAndHeaders("direct://GETFILEINFO", null, headers);
assertNotNull(result, "getFileInfo result");
LOG.debug("getFileInfo: {}", result);
@@ -247,7 +243,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is String
headers.put("CamelBox.typeName", null);
- final Metadata result = requestBodyAndHeaders("direct://GETFILEMETADATA", null, headers);
+ final com.box.sdk.Metadata result = requestBodyAndHeaders("direct://GETFILEMETADATA", null, headers);
assertNotNull(result, "getFileMetadata result");
LOG.debug("getFileMetadata: {}", result);
@@ -256,7 +252,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testGetFilePreviewLink() {
// using String message body for single parameter "fileId"
- final URL result = requestBody("direct://GETFILEPREVIEWLINK", testFile.getID());
+ final java.net.URL result = requestBody("direct://GETFILEPREVIEWLINK", testFile.getID());
assertNotNull(result, "getFilePreviewLink result");
LOG.debug("getFilePreviewLink: {}", result);
@@ -288,7 +284,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
public void testGetFileVersions() {
// using String message body for single parameter "fileId"
@SuppressWarnings("rawtypes")
- final Collection result = requestBody("direct://GETFILEVERSIONS", testFile.getID());
+ final java.util.Collection result = requestBody("direct://GETFILEVERSIONS", testFile.getID());
assertNotNull(result, "getFileVersions result");
LOG.debug("getFileVersions: {}", result);
@@ -296,7 +292,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testMoveFile() {
- BoxFile result = null;
+ com.box.sdk.BoxFile result = null;
try {
final Map<String, Object> headers = new HashMap<>();
@@ -330,7 +326,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is Integer
headers.put("CamelBox.version", 1);
- final BoxFileVersion result = requestBodyAndHeaders("direct://PROMOTEFILEVERSION", null, headers);
+ final com.box.sdk.BoxFileVersion result = requestBodyAndHeaders("direct://PROMOTEFILEVERSION", null, headers);
assertNotNull(result, "promoteFileVersion result");
LOG.debug("promoteFileVersion: {}", result);
@@ -339,7 +335,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testRenameFile() {
- BoxFile result = null;
+ com.box.sdk.BoxFile result = null;
try {
final Map<String, Object> headers = new HashMap<>();
@@ -371,7 +367,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxFile.Info
headers.put("CamelBox.info", info);
- final BoxFile result = requestBodyAndHeaders("direct://UPDATEFILEINFO", null, headers);
+ final com.box.sdk.BoxFile result = requestBodyAndHeaders("direct://UPDATEFILEINFO", null, headers);
assertNotNull(result, "updateFileInfo result");
assertEquals(CAMEL_TEST_FILE_DESCRIPTION, result.getInfo().getDescription(), "updateFileInfo info");
@@ -392,7 +388,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
//metada has to contain some value, otherwise response result will be error code 400
metadata.add("/foo", "bar");
- final Metadata result = requestBodyAndHeaders("direct://UPDATEFILEMETADATA", null, headers);
+ final com.box.sdk.Metadata result = requestBodyAndHeaders("direct://UPDATEFILEMETADATA", null, headers);
assertNotNull(result, "updateFileMetadata result");
assertNotNull(result.getString("/foo"), "updateFileMetadata property foo");
@@ -402,7 +398,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testUploadFile() {
- BoxFile result = null;
+ com.box.sdk.BoxFile result = null;
try {
final Map<String, Object> headers = new HashMap<>();
@@ -430,7 +426,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testUploadOverwriteFile() {
- BoxFile result = null;
+ com.box.sdk.BoxFile result = null;
try {
final Map<String, Object> headers = new HashMap<String, Object>();
@@ -459,7 +455,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport {
@Test
public void testUploadNewFileVersion() {
- BoxFile result = null;
+ com.box.sdk.BoxFile result = null;
try {
final Map<String, Object> headers = new HashMap<>();
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
index d9afb4c57547..082fbb39091d 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.box;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -102,7 +101,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
@Test
public void testCopyFolder() {
- BoxFolder result = null;
+ com.box.sdk.BoxFolder result = null;
try {
final Map<String, Object> headers = new HashMap<>();
// parameter type is String
@@ -137,7 +136,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxSharedLink.Permissions
headers.put("CamelBox.permissions", new BoxSharedLink.Permissions());
- final BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFOLDERSHAREDLINK", null,
+ final com.box.sdk.BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFOLDERSHAREDLINK", null,
headers);
assertNotNull(result, "createFolderSharedLink result");
@@ -147,7 +146,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
@Test
public void testGetFolder() {
// using String[] message body for single parameter "path"
- final BoxFolder result = requestBody("direct://GETFOLDER", new String[] { CAMEL_TEST_FOLDER });
+ final com.box.sdk.BoxFolder result = requestBody("direct://GETFOLDER", new String[] { CAMEL_TEST_FOLDER });
assertNotNull(result, "getFolder result");
assertEquals(testFolder.getID(), result.getID(), "getFolder folder id");
@@ -162,7 +161,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
// parameter type is String[]
headers.put("CamelBox.fields", new String[] { "name" });
- final BoxFolder.Info result = requestBodyAndHeaders("direct://GETFOLDERINFO", null, headers);
+ final com.box.sdk.BoxFolder.Info result = requestBodyAndHeaders("direct://GETFOLDERINFO", null, headers);
assertNotNull(result, "getFolderInfo result");
assertNotNull(result.getName(), "getFolderInfo result.getName()");
@@ -183,7 +182,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
headers.put("CamelBox.fields", null);
@SuppressWarnings("rawtypes")
- final Collection result = requestBodyAndHeaders("direct://GETFOLDERITEMS", null, headers);
+ final java.util.Collection result = requestBodyAndHeaders("direct://GETFOLDERITEMS", null, headers);
assertNotNull(result, "getFolderItems result");
LOG.debug("getFolderItems: {}", result);
@@ -191,7 +190,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
@Test
public void testGetRootFolder() {
- final BoxFolder result = requestBody("direct://GETROOTFOLDER", null);
+ final com.box.sdk.BoxFolder result = requestBody("direct://GETROOTFOLDER", null);
assertNotNull(result, "getRootFolder result");
LOG.debug("getRootFolder: {}", result);
@@ -207,7 +206,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
// parameter type is String
headers.put("CamelBox.newName", CAMEL_TEST_MOVE_FOLDER);
- final BoxFolder result = requestBodyAndHeaders("direct://MOVEFOLDER", null, headers);
+ final com.box.sdk.BoxFolder result = requestBodyAndHeaders("direct://MOVEFOLDER", null, headers);
assertNotNull(result, "moveFolder result");
assertEquals(CAMEL_TEST_MOVE_FOLDER, result.getInfo().getName(), "moveFolder folder name");
@@ -222,7 +221,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
// parameter type is String
headers.put("CamelBox.newFolderName", CAMEL_TEST_RENAME_FOLDER);
- final BoxFolder result = requestBodyAndHeaders("direct://RENAMEFOLDER", null, headers);
+ final com.box.sdk.BoxFolder result = requestBodyAndHeaders("direct://RENAMEFOLDER", null, headers);
assertNotNull(result, "renameFolder result");
assertEquals(CAMEL_TEST_RENAME_FOLDER, result.getInfo().getName(), "moveFolder folder name");
@@ -240,7 +239,7 @@ public class BoxFoldersManagerIT extends AbstractBoxITSupport {
testFolderInfo.setDescription(CAMEL_TEST_FOLDER_DESCRIPTION);
headers.put("CamelBox.info", testFolderInfo);
- final BoxFolder result = requestBodyAndHeaders("direct://UPDATEFOLDERINFO", null, headers);
+ final com.box.sdk.BoxFolder result = requestBodyAndHeaders("direct://UPDATEFOLDERINFO", null, headers);
assertNotNull(result, "updateInfo result");
assertEquals(CAMEL_TEST_FOLDER_DESCRIPTION, result.getInfo().getDescription(), "update folder info description");
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java
index 3c4b972f2a4f..a4d5d36f75a8 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxGroupsManagerIT.java
@@ -66,7 +66,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxGroupMembership.Role
headers.put("CamelBox.role", null);
- final BoxGroupMembership result = requestBodyAndHeaders("direct://ADDGROUPMEMBERSHIP", null,
+ final com.box.sdk.BoxGroupMembership result = requestBodyAndHeaders("direct://ADDGROUPMEMBERSHIP", null,
headers);
assertNotNull(result, "addGroupMembership result");
@@ -75,7 +75,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
@Test
public void testCreateGroup() {
- BoxGroup result = null;
+ com.box.sdk.BoxGroup result = null;
try {
// using String message body for single parameter "name"
@@ -120,7 +120,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
@Test
public void testGetAllGroups() {
@SuppressWarnings("rawtypes")
- final Collection result = requestBody("direct://GETALLGROUPS", null);
+ final java.util.Collection result = requestBody("direct://GETALLGROUPS", null);
assertNotNull(result, "getAllGroups result");
LOG.debug("getAllGroups: {}", result);
@@ -129,7 +129,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
@Test
public void testGetGroupInfo() {
// using String message body for single parameter "groupId"
- final BoxGroup.Info result = requestBody("direct://GETGROUPINFO", testGroup.getID());
+ final com.box.sdk.BoxGroup.Info result = requestBody("direct://GETGROUPINFO", testGroup.getID());
assertNotNull(result, "getGroupInfo result");
LOG.debug("getGroupInfo: {}", result);
@@ -146,7 +146,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
headers.put("CamelBox.groupId", testGroup.getID());
// parameter type is com.box.sdk.BoxGroup.Info
headers.put("CamelBox.groupInfo", info);
- final BoxGroup result = requestBodyAndHeaders("direct://UPDATEGROUPINFO", null, headers);
+ final com.box.sdk.BoxGroup result = requestBodyAndHeaders("direct://UPDATEGROUPINFO", null, headers);
assertNotNull(result, "updateGroupInfo result");
LOG.debug("updateGroupInfo: {}", result);
} finally {
@@ -161,7 +161,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
BoxGroupMembership.Info info = testGroup.addMembership(testUser, BoxGroupMembership.GroupRole.MEMBER);
// using String message body for single parameter "groupMembershipId"
- final BoxGroupMembership.Info result = requestBody("direct://GETGROUPMEMBERSHIPINFO", info.getID());
+ final com.box.sdk.BoxGroupMembership.Info result = requestBody("direct://GETGROUPMEMBERSHIPINFO", info.getID());
assertNotNull(result, "getGroupMembershipInfo result");
LOG.debug("getGroupMembershipInfo: {}", result);
@@ -171,7 +171,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
public void testGetGroupMemberships() {
// using String message body for single parameter "groupId"
@SuppressWarnings("rawtypes")
- final Collection result = requestBody("direct://GETGROUPMEMBERSHIPS", testGroup.getID());
+ final java.util.Collection result = requestBody("direct://GETGROUPMEMBERSHIPS", testGroup.getID());
assertNotNull(result, "getGroupMemberships result");
LOG.debug("getGroupMemberships: {}", result);
@@ -188,7 +188,7 @@ public class BoxGroupsManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxGroupMembership.Info
headers.put("CamelBox.info", info);
- final BoxGroupMembership result = requestBodyAndHeaders("direct://UPDATEGROUPMEMBERSHIPINFO", null,
+ final com.box.sdk.BoxGroupMembership result = requestBodyAndHeaders("direct://UPDATEGROUPMEMBERSHIPINFO", null,
headers);
assertNotNull(result, "updateGroupMembershipInfo result");
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIT.java
index 1d2af04c9e19..01c04aff4b6f 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxSearchManagerIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.box;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -59,7 +58,7 @@ public class BoxSearchManagerIT extends AbstractBoxITSupport {
headers.put("CamelBox.query", "*");
@SuppressWarnings("rawtypes")
- final Collection result = requestBodyAndHeaders("direct://SEARCHFOLDER", null, headers);
+ final java.util.Collection result = requestBodyAndHeaders("direct://SEARCHFOLDER", null, headers);
assertNotNull(result, "searchFolder result");
LOG.debug("searchFolder: {}", result);
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java
index abf87df6a406..5e3a5bc151b9 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIT.java
@@ -64,7 +64,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
//needs https://community.box.com/t5/custom/page/page-id/BoxViewTicketDetail?ticket_id=1895413 to be solved
@Test
public void testAddAssignmentToTask() {
- BoxTask result = null;
+ com.box.sdk.BoxTask result = null;
final Map<String, Object> headers = new HashMap<>();
// parameter type is String
@@ -80,7 +80,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
@Test
public void testAddFileTask() {
- BoxTask result = null;
+ com.box.sdk.BoxTask result = null;
try {
final Map<String, Object> headers = new HashMap<>();
@@ -134,7 +134,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
public void testGetFileTasks() {
// using String message body for single parameter "fileId"
@SuppressWarnings("rawtypes")
- final List result = requestBody("direct://GETFILETASKS", testFile.getID());
+ final java.util.List result = requestBody("direct://GETFILETASKS", testFile.getID());
assertNotNull(result, "getFileTasks result");
LOG.debug("getFileTasks: {}", result);
@@ -144,7 +144,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
@Test
public void testGetTaskAssignmentInfo() {
BoxTaskAssignment.Info info = testTask.addAssignment(getCurrentUser());
- BoxTaskAssignment.Info result = null;
+ com.box.sdk.BoxTaskAssignment.Info result = null;
try {
// using String message body for single parameter "taskAssignmentId"
@@ -178,7 +178,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
requestBodyAndHeaders("direct://ADDASSIGNMENTTOTASK", null, headers);
@SuppressWarnings("rawtypes")
- final List result = requestBody("direct://GETTASKASSIGNMENTS", testTask.getID());
+ final java.util.List result = requestBody("direct://GETTASKASSIGNMENTS", testTask.getID());
assertNotNull(result, "getTaskAssignments result");
LOG.debug("getTaskAssignments: {}", result);
@@ -187,7 +187,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
@Test
public void testGetTaskInfo() {
// using String message body for single parameter "taskId"
- final BoxTask.Info result = requestBody("direct://GETTASKINFO", testTask.getID());
+ final com.box.sdk.BoxTask.Info result = requestBody("direct://GETTASKINFO", testTask.getID());
assertNotNull(result, "getTaskInfo result");
LOG.debug("getTaskInfo: {}", result);
@@ -204,7 +204,7 @@ public class BoxTasksManagerIT extends AbstractBoxITSupport {
// parameter type is com.box.sdk.BoxTask.Info
headers.put("CamelBox.info", info);
- final BoxTask result = requestBodyAndHeaders("direct://UPDATETASKINFO", null, headers);
+ final com.box.sdk.BoxTask result = requestBodyAndHeaders("direct://UPDATETASKINFO", null, headers);
assertNotNull(result, "updateTaskInfo result");
LOG.debug("updateTaskInfo: {}", result);
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java
index 4f6e8c95e78b..fc47ef7cda7b 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIT.java
@@ -18,12 +18,10 @@ package org.apache.camel.component.box;
import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import com.box.sdk.BoxAPIConnection;
import com.box.sdk.BoxAPIException;
-import com.box.sdk.BoxFolder;
import com.box.sdk.BoxUser;
import com.box.sdk.CreateUserParams;
import com.box.sdk.EmailAlias;
@@ -69,7 +67,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
@Disabled
@Test
public void testAddUserEmailAlias() {
- EmailAlias result = null;
+ com.box.sdk.EmailAlias result = null;
try {
final Map<String, Object> headers = new HashMap<>();
// parameter type is String
@@ -94,7 +92,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
//This test makes sense only with JWT authentication. With standard (OAuth) it will always fail.
assumeTrue(jwtAuthentication, "Test has to be executed with standard authentication.");
- BoxUser result = null;
+ com.box.sdk.BoxUser result = null;
try {
CreateUserParams params = new CreateUserParams();
@@ -133,7 +131,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
assertNotNull(enterpriseUser1Login,
"Email for enterprise user has to be defined in test-options.properties for this test to succeed.");
- BoxUser result = null;
+ com.box.sdk.BoxUser result = null;
try {
CreateUserParams params = new CreateUserParams();
@@ -215,7 +213,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
headers.put("CamelBox.fields", null);
@SuppressWarnings("rawtypes")
- final List result = requestBodyAndHeaders("direct://GETALLENTERPRISEOREXTERNALUSERS", null, headers);
+ final java.util.List result = requestBodyAndHeaders("direct://GETALLENTERPRISEOREXTERNALUSERS", null, headers);
assertNotNull(result, "getAllEnterpriseOrExternalUsers result");
LOG.debug("getAllEnterpriseOrExternalUsers: {}", result);
@@ -223,7 +221,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
@Test
public void testGetCurrentUser() {
- final BoxUser result = requestBody("direct://GETCURRENTUSER", testUser.getID());
+ final com.box.sdk.BoxUser result = requestBody("direct://GETCURRENTUSER", testUser.getID());
assertNotNull(result, "getCurrentUser result");
LOG.debug("getCurrentUser: {}", result);
@@ -233,7 +231,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
public void testGetUserEmailAlias() {
// using String message body for single parameter "userId"
@SuppressWarnings("rawtypes")
- final Collection result = requestBody("direct://GETUSEREMAILALIAS", testUser.getID());
+ final java.util.Collection result = requestBody("direct://GETUSEREMAILALIAS", testUser.getID());
assertNotNull(result, "getUserEmailAlias result");
LOG.debug("getUserEmailAlias: {}", result);
@@ -242,7 +240,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
@Test
public void testGetUserInfo() {
// using String message body for single parameter "userId"
- final BoxUser.Info result = requestBody("direct://GETUSERINFO", testUser.getID());
+ final com.box.sdk.BoxUser.Info result = requestBody("direct://GETUSERINFO", testUser.getID());
assertNotNull(result, "getUserInfo result");
LOG.debug("getUserInfo: {}", result);
@@ -262,7 +260,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
headers.put("CamelBox.userId", testUser.getID());
// parameter type is com.box.sdk.BoxUser.Info
headers.put("CamelBox.info", info);
- final BoxUser result = requestBodyAndHeaders("direct://UPDATEUSERINFO", null, headers);
+ final com.box.sdk.BoxUser result = requestBodyAndHeaders("direct://UPDATEUSERINFO", null, headers);
assertNotNull(result, "updateUserInfo result");
LOG.debug("updateUserInfo: {}", result);
} finally {
@@ -304,7 +302,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport {
headers.put("CamelBox.userId", user1.getID());
headers.put("CamelBox.sourceUserId", user2.getID());
- final BoxFolder.Info result = requestBodyAndHeaders("direct://MOVEFOLDERTOUSER", null, headers);
+ final com.box.sdk.BoxFolder.Info result = requestBodyAndHeaders("direct://MOVEFOLDERTOUSER", null, headers);
assertNotNull(result, "moveFolderToUser result");
} finally {
if (user1 != null) {
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIT.java
index 2d43bb906beb..51c9f7f0ce73 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodNonceGatewayIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.braintree;
-import com.braintreegateway.PaymentMethodNonce;
-import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.PaymentMethodNonceGatewayApiMethod;
@@ -41,7 +39,7 @@ public class PaymentMethodNonceGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testCreate() {
// using String message body for single parameter "paymentMethodToken"
- final Result result = requestBody("direct://CREATE", null);
+ final com.braintreegateway.Result result = requestBody("direct://CREATE", null);
assertNotNull(result, "create result");
LOG.debug("create: {}", result);
@@ -52,7 +50,7 @@ public class PaymentMethodNonceGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testFind() {
// using String message body for single parameter "paymentMethodNonce"
- final PaymentMethodNonce result = requestBody("direct://FIND", null);
+ final com.braintreegateway.PaymentMethodNonce result = requestBody("direct://FIND", null);
assertNotNull(result, "find result");
LOG.debug("find: {}", result);
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ReportGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ReportGatewayIT.java
index 9a9721964545..8f416993dbe5 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ReportGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ReportGatewayIT.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.braintree;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import com.braintreegateway.Result;
import com.braintreegateway.TransactionLevelFeeReport;
import com.braintreegateway.TransactionLevelFeeReportRequest;
import org.apache.camel.builder.RouteBuilder;
@@ -62,7 +61,7 @@ public class ReportGatewayIT extends AbstractBraintreeTestSupport {
.date(reportDate)
.merchantAccountId(merchantAccountId);
- final Result<TransactionLevelFeeReport> result = requestBody(
+ final com.braintreegateway.Result<TransactionLevelFeeReport> result = requestBody(
"direct://TRANSACTIONLEVELFEES",
request);
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIT.java
index 2d3af1113067..8f85f9709161 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIT.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.braintree;
import java.util.HashMap;
import java.util.Map;
-import com.braintreegateway.Result;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.SettlementBatchSummaryGatewayApiMethod;
@@ -43,7 +42,7 @@ public class SettlementBatchSummaryGatewayIT extends AbstractBraintreeTestSuppor
@Test
public void testGenerate() {
// using java.util.Calendar message body for single parameter "settlementDate"
- final Result result = requestBody("direct://GENERATE", null);
+ final com.braintreegateway.Result result = requestBody("direct://GENERATE", null);
assertNotNull(result, "generate result");
LOG.debug("generate: {}", result);
@@ -59,7 +58,7 @@ public class SettlementBatchSummaryGatewayIT extends AbstractBraintreeTestSuppor
// parameter type is String
headers.put("CamelBraintree.groupByCustomField", null);
- final Result result = requestBodyAndHeaders("direct://GENERATE_1", null, headers);
+ final com.braintreegateway.Result result = requestBodyAndHeaders("direct://GENERATE_1", null, headers);
assertNotNull(result, "generate result");
LOG.debug("generate: {}", result);
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIT.java
index 4d2f1ccffe2a..b2fa998fc6c0 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SubscriptionGatewayIT.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.braintree;
import java.util.HashMap;
import java.util.Map;
-import com.braintreegateway.ResourceCollection;
-import com.braintreegateway.Result;
-import com.braintreegateway.Subscription;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.SubscriptionGatewayApiMethod;
@@ -45,7 +42,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testCancel() {
// using String message body for single parameter "id"
- final Result result = requestBody("direct://CANCEL", null);
+ final com.braintreegateway.Result result = requestBody("direct://CANCEL", null);
assertNotNull(result, "cancel result");
LOG.debug("cancel: {}", result);
@@ -56,7 +53,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testCreate() {
// using com.braintreegateway.SubscriptionRequest message body for single parameter "request"
- final Result result = requestBody("direct://CREATE", null);
+ final com.braintreegateway.Result result = requestBody("direct://CREATE", null);
assertNotNull(result, "create result");
LOG.debug("create: {}", result);
@@ -72,7 +69,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
// parameter type is String
headers.put("CamelBraintree.id", null);
- final Result result = requestBodyAndHeaders("direct://DELETE", null, headers);
+ final com.braintreegateway.Result result = requestBodyAndHeaders("direct://DELETE", null, headers);
assertNotNull(result, "delete result");
LOG.debug("delete: {}", result);
@@ -83,7 +80,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testFind() {
// using String message body for single parameter "id"
- final Subscription result = requestBody("direct://FIND", null);
+ final com.braintreegateway.Subscription result = requestBody("direct://FIND", null);
assertNotNull(result, "find result");
LOG.debug("find: {}", result);
@@ -94,7 +91,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testRetryCharge() {
// using String message body for single parameter "subscriptionId"
- final Result result = requestBody("direct://RETRYCHARGE", null);
+ final com.braintreegateway.Result result = requestBody("direct://RETRYCHARGE", null);
assertNotNull(result, "retryCharge result");
LOG.debug("retryCharge: {}", result);
@@ -110,7 +107,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
// parameter type is java.math.BigDecimal
headers.put("CamelBraintree.amount", null);
- final Result result = requestBodyAndHeaders("direct://RETRYCHARGE_1", null, headers);
+ final com.braintreegateway.Result result = requestBodyAndHeaders("direct://RETRYCHARGE_1", null, headers);
assertNotNull(result, "retryCharge result");
LOG.debug("retryCharge: {}", result);
@@ -121,7 +118,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testSearch() {
// using com.braintreegateway.SubscriptionSearchRequest message body for single parameter "searchRequest"
- final ResourceCollection result = requestBody("direct://SEARCH", null);
+ final com.braintreegateway.ResourceCollection result = requestBody("direct://SEARCH", null);
assertNotNull(result, "search result");
LOG.debug("search: {}", result);
@@ -137,7 +134,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport {
// parameter type is com.braintreegateway.SubscriptionRequest
headers.put("CamelBraintree.request", null);
- final Result result = requestBodyAndHeaders("direct://UPDATE", null, headers);
+ final com.braintreegateway.Result result = requestBodyAndHeaders("direct://UPDATE", null, headers);
assertNotNull(result, "update result");
LOG.debug("update: {}", result);
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIT.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIT.java
index b0e222e16b2a..701c7caceed8 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIT.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIT.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import com.braintreegateway.BraintreeGateway;
-import com.braintreegateway.ResourceCollection;
import com.braintreegateway.Result;
import com.braintreegateway.Transaction;
import com.braintreegateway.TransactionCloneRequest;
@@ -391,7 +390,7 @@ public class TransactionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testCancelRelease() {
// using String message body for single parameter "id"
- final Result result = requestBody("direct://CANCELRELEASE", null);
+ final com.braintreegateway.Result result = requestBody("direct://CANCELRELEASE", null);
assertNotNull(result, "cancelRelease result");
LOG.debug("cancelRelease: {}", result);
@@ -402,7 +401,7 @@ public class TransactionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testCredit() {
// using com.braintreegateway.TransactionRequest message body for single parameter "request"
- final Result result = requestBody("direct://CREDIT", null);
+ final com.braintreegateway.Result result = requestBody("direct://CREDIT", null);
assertNotNull(result, "credit result");
LOG.debug("credit: {}", result);
@@ -413,7 +412,7 @@ public class TransactionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testHoldInEscrow() {
// using String message body for single parameter "id"
- final Result result = requestBody("direct://HOLDINESCROW", null);
+ final com.braintreegateway.Result result = requestBody("direct://HOLDINESCROW", null);
assertNotNull(result, "holdInEscrow result");
LOG.debug("holdInEscrow: {}", result);
@@ -424,7 +423,7 @@ public class TransactionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testReleaseFromEscrow() {
// using String message body for single parameter "id"
- final Result result = requestBody("direct://RELEASEFROMESCROW", null);
+ final com.braintreegateway.Result result = requestBody("direct://RELEASEFROMESCROW", null);
assertNotNull(result, "releaseFromEscrow result");
LOG.debug("releaseFromEscrow: {}", result);
@@ -435,7 +434,7 @@ public class TransactionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testSearch() {
// using com.braintreegateway.TransactionSearchRequest message body for single parameter "query"
- final ResourceCollection result = requestBody("direct://SEARCH", null);
+ final com.braintreegateway.ResourceCollection result = requestBody("direct://SEARCH", null);
assertNotNull(result, "search result");
LOG.debug("search: {}", result);
@@ -451,7 +450,7 @@ public class TransactionGatewayIT extends AbstractBraintreeTestSupport {
// parameter type is java.math.BigDecimal
headers.put("CamelBraintree.amount", null);
- final Result result = requestBodyAndHeaders("direct://SUBMITFORPARTIALSETTLEMENT", null, headers);
+ final com.braintreegateway.Result result = requestBodyAndHeaders("direct://SUBMITFORPARTIALSETTLEMENT", null, headers);
assertNotNull(result, "submitForPartialSettlement result");
LOG.debug("submitForPartialSettlement: {}", result);
@@ -462,7 +461,7 @@ public class TransactionGatewayIT extends AbstractBraintreeTestSupport {
@Test
public void testVoidTransaction() {
// using String message body for single parameter "id"
- final Result result = requestBody("direct://VOIDTRANSACTION", null);
+ final com.braintreegateway.Result result = requestBody("direct://VOIDTRANSACTION", null);
assertNotNull(result, "voidTransaction result");
LOG.debug("voidTransaction: {}", result);
diff --git a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index 1ef8d344c8b2..c2489d9cae84 100644
--- a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -20,10 +20,9 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("browse")
+@org.apache.camel.spi.annotations.Component("browse")
public class BrowseComponent extends DefaultComponent {
@Metadata(label = "advanced",
diff --git a/components/camel-camunda/src/main/java/org/apache/camel/component/camunda/CamundaComponent.java b/components/camel-camunda/src/main/java/org/apache/camel/component/camunda/CamundaComponent.java
index 0bae6d0544cf..c48779163df6 100644
--- a/components/camel-camunda/src/main/java/org/apache/camel/component/camunda/CamundaComponent.java
+++ b/components/camel-camunda/src/main/java/org/apache/camel/component/camunda/CamundaComponent.java
@@ -21,15 +21,13 @@ import java.util.Map;
import io.camunda.client.CamundaClient;
import io.camunda.client.CamundaClientBuilder;
-import io.camunda.client.impl.oauth.OAuthCredentialsProviderBuilder;
import org.apache.camel.Endpoint;
import org.apache.camel.component.camunda.internal.CamundaService;
import org.apache.camel.component.camunda.internal.OperationName;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("camunda")
+@org.apache.camel.spi.annotations.Component("camunda")
public class CamundaComponent extends DefaultComponent {
@Metadata(label = "security", description = "Camunda SaaS cluster ID. When set, the client connects via the cloud builder.")
@@ -169,7 +167,7 @@ public class CamundaComponent extends DefaultComponent {
if (clientId != null && oAuthAPI != null) {
builder.credentialsProvider(
- new OAuthCredentialsProviderBuilder()
+ new io.camunda.client.impl.oauth.OAuthCredentialsProviderBuilder()
.authorizationServerUrl(oAuthAPI)
.audience(grpcAddress)
.clientId(clientId)
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
index ae5d8697682b..c5977783f753 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.coap;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.URI;
-import java.net.URISyntaxException;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.PrivateKey;
@@ -122,7 +121,7 @@ public class CoAPEndpoint extends DefaultEndpoint implements EndpointServiceLoca
super(uri, component);
try {
this.uri = new URI(uri);
- } catch (URISyntaxException use) {
+ } catch (java.net.URISyntaxException use) {
this.uri = null;
}
this.component = component;
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
index 8bfe6bcd84e4..b9750bf502b5 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.cometd;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
-import org.cometd.bayeux.Promise;
import org.cometd.bayeux.server.BayeuxServer;
import org.cometd.bayeux.server.ServerChannel;
import org.cometd.bayeux.server.ServerMessage;
@@ -109,7 +108,7 @@ public class CometdProducer extends DefaultProducer implements CometdProducerCon
logDelivery(exchange, channel);
ServerMessage.Mutable mutable = binding.createCometdMessage(channel, serverSession,
exchange.getIn());
- channel.publish(serverSession, mutable, new Promise<>() {
+ channel.publish(serverSession, mutable, new org.cometd.bayeux.Promise<>() {
});
}
} finally {
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java
index d21a6286d9d8..a652ca09534c 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java
@@ -96,7 +96,7 @@ public class CometdProducerConsumerAuthenticatedTest extends CamelTestSupport {
BayeuxClient client = new BayeuxClient(url, new JettyHttpClientTransport(null, httpClient));
client.addExtension(new ClientSession.Extension() {
@Override
- public boolean sendMeta(ClientSession session, Message.Mutable message) {
+ public boolean sendMeta(ClientSession session, org.cometd.bayeux.Message.Mutable message) {
if (Channel.META_HANDSHAKE.equals(message.getChannel())) {
Map<String, Object> authentication = new HashMap<>();
authentication.put("user", user);
diff --git a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java
index 592cd4f3ca36..d9f840f41a9b 100644
--- a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java
+++ b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusComponent.java
@@ -20,14 +20,13 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
/**
* The <a href="http://camel.apache.org/controlbus.html">Control Bus component</a> allows sending messages to a
* control-bus endpoint to control the lifecycle of routes.
*/
-@Component("controlbus")
+@org.apache.camel.spi.annotations.Component("controlbus")
public class ControlBusComponent extends DefaultComponent {
private ExecutorService executorService;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
index 59fb8078fc02..9be2aa4e556f 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
@@ -25,8 +25,6 @@ import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import jakarta.xml.soap.SOAPException;
import jakarta.xml.soap.SOAPMessage;
@@ -41,7 +39,6 @@ import org.apache.camel.component.cxf.common.DataFormat;
import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.support.ExchangeHelper;
-import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
import static org.apache.camel.TypeConverter.MISS_VALUE;
@@ -148,13 +145,13 @@ public final class CxfConverter {
// Preserve response metadata headers (e.g. Content-Type) before the Response object
// is consumed by the conversion. Without this, headers set via Response.type() or
// Response.header() are lost when the body becomes a StreamCache (CAMEL-23249).
- MediaType mediaType = response.getMediaType();
+ jakarta.ws.rs.core.MediaType mediaType = response.getMediaType();
if (mediaType != null) {
exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, mediaType.toString());
}
// Save other response headers (e.g. custom headers) into the PROTOCOL_HEADERS map
// so they are propagated to the CXF outMessage by populateViaResponse.
- MultivaluedMap<String, Object> metadata = response.getMetadata();
+ jakarta.ws.rs.core.MultivaluedMap<String, Object> metadata = response.getMetadata();
if (metadata != null && !metadata.isEmpty()) {
Map<String, Object> protocolHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (String headerName : metadata.keySet()) {
@@ -167,7 +164,7 @@ public final class CxfConverter {
}
}
if (!protocolHeaders.isEmpty()) {
- exchange.getMessage().setHeader(Message.PROTOCOL_HEADERS, protocolHeaders);
+ exchange.getMessage().setHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS, protocolHeaders);
}
}
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
index 1cda124a423e..d273aecee994 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
@@ -23,8 +23,6 @@ import jakarta.ws.rs.client.AsyncInvoker;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.MultivaluedMap;
-import org.apache.camel.Message;
-import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.message.Exchange;
/**
@@ -70,7 +68,7 @@ public interface CxfRsBinding {
* @throws Exception can be thrown if error in the binding process
*/
Object bindCamelMessageBodyToRequestBody(
- Message camelMessage,
+ org.apache.camel.Message camelMessage,
org.apache.camel.Exchange camelExchange)
throws Exception;
@@ -123,7 +121,7 @@ public interface CxfRsBinding {
* @return the {@link Entity} to use
*/
Entity<Object> bindCamelMessageToRequestEntity(
- Object body, Message camelMessage, org.apache.camel.Exchange camelExchange)
+ Object body, org.apache.camel.Message camelMessage, org.apache.camel.Exchange camelExchange)
throws Exception;
/**
@@ -138,7 +136,7 @@ public interface CxfRsBinding {
* @return the {@link Entity} to use
*/
Entity<Object> bindCamelMessageToRequestEntity(
- Object body, Message camelMessage, org.apache.camel.Exchange camelExchange,
- WebClient webClient)
+ Object body, org.apache.camel.Message camelMessage, org.apache.camel.Exchange camelExchange,
+ org.apache.cxf.jaxrs.client.WebClient webClient)
throws Exception;
}
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index d7fb394f3933..b62e53dc854a 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -79,7 +79,7 @@ public class DefaultCxfRsBinding implements CxfRsBinding, HeaderFilterStrategyAw
throw camelExchange.getException();
}
- Message response;
+ org.apache.camel.Message response;
if (camelExchange.getPattern().isOutCapable()) {
response = camelExchange.getMessage();
} else {
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
index faa19fabf403..95cf047fbd10 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
@@ -677,7 +677,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
if (getWsdlURL() == null && getServiceClass() == null) {
// no WSDL and serviceClass specified, set our default serviceClass
- setServiceClass(DefaultSEI.class.getName());
+ setServiceClass(org.apache.camel.component.cxf.jaxws.DefaultSEI.class.getName());
setDefaultOperationNamespace(CxfConstants.DISPATCH_NAMESPACE);
setDefaultOperationName(CxfConstants.DISPATCH_DEFAULT_OPERATION_NAMESPACE);
if (getDataFormat().equals(DataFormat.PAYLOAD)) {
@@ -729,7 +729,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
if (getWsdlURL() == null && getServiceClass() == null) {
// no WSDL and serviceClass specified, set our default serviceClass
if (getDataFormat().equals(DataFormat.PAYLOAD)) {
- setServiceClass(DefaultPayloadProviderSEI.class.getName());
+ setServiceClass(org.apache.camel.component.cxf.jaxws.DefaultPayloadProviderSEI.class.getName());
}
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
index 8b5ee6fab7f5..25993f922586 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
@@ -32,7 +32,6 @@ import javax.xml.namespace.QName;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.cxf.common.CxfPayload;
import org.apache.camel.component.cxf.common.DataFormat;
@@ -348,7 +347,7 @@ public class CxfProducer extends DefaultAsyncProducer {
* Get the parameters for the web service operation
*/
private Object[] getParams(CxfEndpoint endpoint, Exchange exchange)
- throws InvalidPayloadException {
+ throws org.apache.camel.InvalidPayloadException {
Object[] params = null;
if (endpoint.getDataFormat() == DataFormat.POJO) {
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
index 591f7974c6c1..97c5285db002 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
@@ -238,7 +238,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
private void addAttachmentFileCloseUoW(Exchange camelExchange, org.apache.cxf.message.Exchange cxfExchange) {
camelExchange.getExchangeExtension().addOnCompletion(new SynchronizationAdapter() {
@Override
- public void onDone(Exchange exchange) {
+ public void onDone(org.apache.camel.Exchange exchange) {
Collection<Attachment> atts = cxfExchange.getInMessage().getAttachments();
if (atts != null) {
for (Attachment att : atts) {
@@ -1268,7 +1268,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
@Override
public void copyJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, Map<String, Object> context) {
if (cxfExchange.getOutMessage() != null) {
- Message outMessage = cxfExchange.getOutMessage();
+ org.apache.cxf.message.Message outMessage = cxfExchange.getOutMessage();
for (Map.Entry<String, Object> entry : context.entrySet()) {
if (outMessage.get(entry.getKey()) == null) {
outMessage.put(entry.getKey(), entry.getValue());
@@ -1279,7 +1279,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
@Override
public void extractJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, Map<String, Object> context) {
- Message inMessage = cxfExchange.getInMessage();
+ org.apache.cxf.message.Message inMessage = cxfExchange.getInMessage();
for (Map.Entry<String, Object> entry : inMessage.entrySet()) {
if (entry.getKey().startsWith("jakarta.xml.ws")) {
context.put(entry.getKey(), entry.getValue());
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
index 62c5cefa35cb..8ea87ca711ad 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
@@ -18,14 +18,13 @@
package org.apache.camel.component.cxf.jaxws;
import jakarta.xml.ws.Provider;
-import jakarta.xml.ws.Service;
import jakarta.xml.ws.ServiceMode;
import jakarta.xml.ws.WebServiceProvider;
import javax.xml.transform.Source;
@WebServiceProvider(targetNamespace = "http://camel.apache.org/cxf/jaxws/provider")
-@ServiceMode(value = Service.Mode.PAYLOAD)
+@ServiceMode(value = jakarta.xml.ws.Service.Mode.PAYLOAD)
public interface DefaultPayloadProviderSEI extends Provider<Source> {
@Override
Source invoke(Source request);
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java
index aeb1d7d7bded..28ea95472c9f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.message.CxfConstants;
@@ -83,7 +82,7 @@ public class CxfProducerProtocalHeaderTest extends CamelTestSupport {
Exchange exchange = sendSimpleMessage("cxf://http://localhost:" + port.getPort()
+ "/CxfProducerProtocalHeaderTest/user"
+ "?serviceClass=org.apache.camel.component.cxf.jaxws.HelloService");
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
String result = out.getBody(String.class);
assertEquals("echo " + "Hello World!", result, "reply body on Camel");
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
index c5d043cff220..373475b2aa32 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerRouterTest.java
@@ -16,14 +16,12 @@
*/
package org.apache.camel.component.cxf.jaxws;
-import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.component.cxf.common.message.CxfConstants;
@@ -81,7 +79,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
from("direct:start")
.doTry()
.to("cxf://http://localhost:10000/false?serviceClass=org.apache.camel.component.cxf.jaxws.HelloService")
- .doCatch(ConnectException.class)
+ .doCatch(java.net.ConnectException.class)
.to("mock:error");
}
};
@@ -125,7 +123,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
Exchange exchange = template.send("direct:EndpointA", senderExchange);
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
// The response message's body is an MessageContentsList which first element is the return value of the operation,
// If there are some holder parameters, the holder parameter will be filled in the reset of List.
// The result will be extract from the MessageContentsList with the String class type
@@ -145,7 +143,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
senderExchange.getIn().setBody(REQUEST_MESSAGE);
Exchange exchange = template.send("direct:EndpointB", senderExchange);
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
String response = out.getBody(String.class);
assertTrue(response.indexOf("echo " + TEST_MESSAGE) > 0, "It should has the echo message");
assertTrue(response.indexOf("echoResponse") > 0, "It should has the echoResponse tag");
@@ -158,7 +156,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
senderExchange.getIn().setBody(REQUEST_MESSAGE);
Exchange exchange = template.send("direct:EndpointB", senderExchange);
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
final List<String> pseudoHeaders
= out.getHeaders().keySet().stream().filter(key -> key.startsWith(":")).toList();
assertTrue(pseudoHeaders.isEmpty(), "Pseudo-headers such as :status should be filtered out; found: " + pseudoHeaders);
@@ -172,7 +170,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
senderExchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo");
Exchange exchange = template.send("direct:EndpointC", senderExchange);
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
String response = out.getBody(String.class);
assertTrue(response.indexOf("echo " + TEST_MESSAGE) > 0, "It should has the echo message");
assertTrue(response.indexOf("echoResponse") > 0, "It should has the echoResponse tag");
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
index ef493a672e02..5e8c694169bb 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
@@ -27,7 +27,6 @@ import org.w3c.dom.Document;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.common.CXFTestSupport;
@@ -120,7 +119,7 @@ public class CxfProducerTest {
public void testInvokingSimpleServerWithParams() throws Exception {
Exchange exchange = sendSimpleMessage();
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
String result = out.getBody(String.class);
LOG.info("Received output text: {}", result);
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
@@ -159,7 +158,7 @@ public class CxfProducerTest {
public void testInvokingJaxWsServerWithParams() throws Exception {
Exchange exchange = sendJaxWsMessage();
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
String result = out.getBody(String.class);
LOG.info("Received output text: {}", result);
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
index 44c07033cfbb..0b9eadc744c3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
@@ -54,7 +54,6 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Attachment;
-import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.junit.jupiter.api.BeforeEach;
@@ -165,7 +164,7 @@ public class DefaultCxfBindingTest {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
Map<String, Object> requestContext = new HashMap<>();
@@ -204,7 +203,7 @@ public class DefaultCxfBindingTest {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
Map<String, Object> requestContext = new HashMap<>();
String expectedSoapActionHeader = "urn:hello:world";
@@ -221,7 +220,7 @@ public class DefaultCxfBindingTest {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
Map<String, Object> requestContext = new HashMap<>();
exchange.getIn().setHeader(CxfConstants.OPERATION_NAMESPACE, "http://test123");
@@ -238,15 +237,15 @@ public class DefaultCxfBindingTest {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
Map<String, Object> responseContext = new HashMap<>();
- responseContext.put(Message.RESPONSE_CODE, Integer.valueOf(200));
+ responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200));
Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("content-type", Arrays.asList("text/xml;charset=UTF-8"));
headers.put("Content-Length", Arrays.asList("241"));
- responseContext.put(Message.PROTOCOL_HEADERS, headers);
- Message cxfMessage = new MessageImpl();
+ responseContext.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
cxfExchange.setInMessage(cxfMessage);
Set<Attachment> attachments = new HashSet<>();
@@ -273,13 +272,13 @@ public class DefaultCxfBindingTest {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
Map<String, Object> responseContext = new HashMap<>();
- responseContext.put(Message.RESPONSE_CODE, Integer.valueOf(200));
+ responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200));
Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
- responseContext.put(Message.PROTOCOL_HEADERS, headers);
- Message cxfMessage = new MessageImpl();
+ responseContext.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
cxfExchange.setInMessage(cxfMessage);
cxfBinding.populateExchangeFromCxfResponse(exchange, cxfExchange, responseContext);
@@ -297,7 +296,7 @@ public class DefaultCxfBindingTest {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context, ExchangePattern.InOut);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
exchange.getMessage().setHeader("soapAction", "urn:hello:world");
@@ -308,7 +307,7 @@ public class DefaultCxfBindingTest {
Endpoint endpoint = mock(Endpoint.class);
Binding binding = mock(Binding.class);
when(endpoint.getBinding()).thenReturn(binding);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
when(binding.createMessage()).thenReturn(cxfMessage);
cxfExchange.put(Endpoint.class, endpoint);
@@ -341,16 +340,16 @@ public class DefaultCxfBindingTest {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("content-type", Arrays.asList("text/xml;charset=UTF-8"));
headers.put("Content-Length", Arrays.asList("241"));
headers.put("soapAction", Arrays.asList("\"urn:hello:world\""));
headers.put("myfruitheader", Arrays.asList("peach"));
headers.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
- cxfMessage.put(Message.PROTOCOL_HEADERS, headers);
+ cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
Set<Attachment> attachments = new HashSet<>();
AttachmentImpl attachment = new AttachmentImpl("att-1", new DataHandler(new FileDataSource("pom.xml")));
@@ -384,13 +383,13 @@ public class DefaultCxfBindingTest {
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
Exchange exchange = new DefaultExchange(context);
exchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE);
- org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl();
+ org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("myfruitheader", Arrays.asList("peach"));
headers.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
- cxfMessage.put(Message.PROTOCOL_HEADERS, headers);
+ cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
cxfExchange.setInMessage(cxfMessage);
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
index 86f5fb0fdfbf..f649a7b059c9 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.cxf.jaxws;
import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import jakarta.xml.ws.WebServiceContext;
import jakarta.xml.ws.WebServiceException;
@@ -32,7 +31,7 @@ public class EchoServiceSessionImpl implements EchoService {
public String echo(String text) {
// Find the HttpSession
MessageContext mc = context.getMessageContext();
- HttpSession session = ((HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+ HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
if (session == null) {
throw new WebServiceException("No HTTP Session found");
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
index 3359361173b3..3c0e3313d2e8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.cxf.multipart;
-import jakarta.jws.WebService;
import jakarta.xml.ws.Holder;
import org.apache.camel.cxf.multipart.MultiPartInvoke;
@@ -24,11 +23,11 @@ import org.apache.camel.cxf.multipart.types.InE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@WebService(
- serviceName = "MultiPartInvokeService",
- portName = "MultiPartInvokePort",
- targetNamespace = "http://adapter.ti.tongtech.com/ws",
- endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke")
+@jakarta.jws.WebService(
+ serviceName = "MultiPartInvokeService",
+ portName = "MultiPartInvokePort",
+ targetNamespace = "http://adapter.ti.tongtech.com/ws",
+ endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke")
public class MultiPartInvokeImpl implements MultiPartInvoke {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index 27e47d53229d..2ee035148d6b 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
import java.util.List;
import jakarta.annotation.Resource;
-import jakarta.jws.WebService;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
@@ -35,14 +34,13 @@ import org.w3c.dom.Node;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxb.JAXBDataBinding;
-import org.apache.cxf.outofband.header.ObjectFactory;
import org.apache.cxf.outofband.header.OutofBandHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@WebService(serviceName = "HeaderService",
- targetNamespace = "http://apache.org/camel/cxf/soap/headers",
- endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
+@jakarta.jws.WebService(serviceName = "HeaderService",
+ targetNamespace = "http://apache.org/camel/cxf/soap/headers",
+ endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
public class HeaderTesterImpl implements HeaderTester {
private static final Logger LOG = LoggerFactory.getLogger(HeaderTesterImpl.class);
@@ -202,7 +200,7 @@ public class HeaderTesterImpl implements HeaderTester {
Header hdr1 = (Header) hdr;
try {
JAXBElement<?> job
- = (JAXBElement<?>) JAXBContext.newInstance(ObjectFactory.class)
+ = (JAXBElement<?>) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
.createUnmarshaller()
.unmarshal((Node) hdr1.getObject());
OutofBandHeader ob = (OutofBandHeader) job.getValue();
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
index b0650004a626..7857a278182e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
@@ -27,7 +27,6 @@ import org.w3c.dom.Node;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.outofband.header.ObjectFactory;
import org.apache.cxf.outofband.header.OutofBandHeader;
public class HeaderTesterWithInsertionImpl extends HeaderTesterImpl {
@@ -67,7 +66,7 @@ public class HeaderTesterWithInsertionImpl extends HeaderTesterImpl {
Header hdr1 = (Header) hdr;
try {
JAXBElement<?> job
- = (JAXBElement<?>) JAXBContext.newInstance(ObjectFactory.class)
+ = (JAXBElement<?>) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
.createUnmarshaller()
.unmarshal((Node) hdr1.getObject());
OutofBandHeader ob = (OutofBandHeader) job.getValue();
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
index 14c8d79f2f57..723ce6afbe32 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.non_wrapper.types.GetPerson;
import org.apache.camel.non_wrapper.types.GetPersonResponse;
-import org.apache.camel.non_wrapper.types.UnknownPersonFault;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,8 +45,8 @@ public class PersonProcessor implements Processor {
if (personId == null || personId.isEmpty()) {
LOG.info("person id 123, so throwing exception");
// Try to throw out the soap fault message
- UnknownPersonFault personFault
- = new UnknownPersonFault();
+ org.apache.camel.non_wrapper.types.UnknownPersonFault personFault
+ = new org.apache.camel.non_wrapper.types.UnknownPersonFault();
personFault.setPersonId("");
org.apache.camel.non_wrapper.UnknownPersonFault fault
= new org.apache.camel.non_wrapper.UnknownPersonFault("Get the null value of person name", personFault);
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
index a00b8c0d6172..cc4727cd6b38 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
@@ -17,14 +17,13 @@
package org.apache.camel.wsdl_first;
import jakarta.jws.WebService;
-import jakarta.xml.ws.BindingType;
@WebService(serviceName = "PersonService12",
targetNamespace = "http://camel.apache.org/wsdl-first",
endpointInterface = "org.apache.camel.wsdl_first.Person",
wsdlLocation = "classpath:/person.wsdl")
-@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
+@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
public class PersonImpl12 extends PersonImpl {
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 9f3e5069ea7c..a08b350f5c88 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -20,7 +20,6 @@ import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.wsdl_first.types.UnknownPersonFault;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.slf4j.Logger;
@@ -49,8 +48,8 @@ public class PersonProcessor implements Processor {
if (personId.value == null || personId.value.length() == 0) {
LOG.info("person id 123, so throwing exception");
// Try to throw out the soap fault message
- UnknownPersonFault personFault
- = new UnknownPersonFault();
+ org.apache.camel.wsdl_first.types.UnknownPersonFault personFault
+ = new org.apache.camel.wsdl_first.types.UnknownPersonFault();
personFault.setPersonId("");
org.apache.camel.wsdl_first.UnknownPersonFault fault
= new org.apache.camel.wsdl_first.UnknownPersonFault("Get the null value of person name", personFault);
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
index c6b20c8cce5a..ff1fa6ab125c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
@@ -25,8 +25,6 @@ import org.apache.camel.component.cxf.common.DataFormat;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.jaxws.CxfComponent;
import org.apache.camel.component.cxf.jaxws.CxfEndpoint;
-import org.apache.camel.component.cxf.jaxws.DefaultPayloadProviderSEI;
-import org.apache.camel.component.cxf.jaxws.DefaultSEI;
import org.apache.camel.component.cxf.jaxws.WSDLServiceFactoryBean;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.ShutdownStrategy;
@@ -88,7 +86,7 @@ public class CxfSpringEndpoint extends CxfEndpoint implements ApplicationContext
if (getWsdlURL() == null && cls == null) {
// no WSDL and serviceClass specified, set our default serviceClass
- setServiceClass(DefaultSEI.class.getName());
+ setServiceClass(org.apache.camel.component.cxf.jaxws.DefaultSEI.class.getName());
setDefaultOperationNamespace(CxfConstants.DISPATCH_NAMESPACE);
setDefaultOperationName(CxfConstants.DISPATCH_DEFAULT_OPERATION_NAMESPACE);
if (getDataFormat().equals(DataFormat.PAYLOAD)) {
@@ -146,7 +144,7 @@ public class CxfSpringEndpoint extends CxfEndpoint implements ApplicationContext
if (getWsdlURL() == null && cls == null) {
// no WSDL and serviceClass specified, set our default serviceClass
if (getDataFormat().equals(DataFormat.PAYLOAD)) {
- setServiceClass(DefaultPayloadProviderSEI.class.getName());
+ setServiceClass(org.apache.camel.component.cxf.jaxws.DefaultPayloadProviderSEI.class.getName());
}
cls = getServiceClass();
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
index 4eee382056c9..e640e77eb629 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
@@ -27,7 +27,6 @@ import jakarta.xml.ws.WebServiceException;
import javax.xml.namespace.QName;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.component.cxf.common.message.CxfConstants;
@@ -106,7 +105,7 @@ public abstract class AbstractCxfWsdlFirstTest extends CamelSpringTestSupport {
public void testInvokingServiceWithCamelProducer() throws Exception {
Exchange exchange = sendJaxWsMessageWithHolders("hello");
assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
List<Object> result = out.getBody(List.class);
assertEquals(4, result.size(), "The result list should not be empty");
Holder<String> name = (Holder<String>) result.get(3);
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchMessageTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchMessageTest.java
index aa429198b778..32786d1d8fb7 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchMessageTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchMessageTest.java
@@ -23,7 +23,6 @@ import java.nio.charset.StandardCharsets;
import org.w3c.dom.Document;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.junit.jupiter.api.Test;
@@ -51,7 +50,7 @@ public class CxfDispatchMessageTest extends CxfDispatchTestSupport {
Exchange exchange = sendJaxWsDispatchMessage(name, false);
assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
- Message response = exchange.getMessage();
+ org.apache.camel.Message response = exchange.getMessage();
assertNotNull(response, "The response message must not be null");
String value = decodeResponseFromMessage(response.getBody(InputStream.class), exchange);
@@ -64,7 +63,7 @@ public class CxfDispatchMessageTest extends CxfDispatchTestSupport {
Exchange exchange = sendJaxWsDispatchMessage(name, true);
assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
- Message response = exchange.getOut();
+ org.apache.camel.Message response = exchange.getOut();
assertNotNull(response, "The response message must not be null");
assertNull(response.getBody(), "The response body must be null");
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchPayloadTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchPayloadTest.java
index 7c5ad431727f..5df5c4ee105a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchPayloadTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchPayloadTest.java
@@ -24,7 +24,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.common.CxfPayload;
import org.apache.camel.component.cxf.common.message.CxfConstants;
@@ -55,7 +54,7 @@ public class CxfDispatchPayloadTest extends CxfDispatchTestSupport {
Exchange exchange = sendJaxWsDispatchPayload(name, false);
assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
- Message response = exchange.getMessage();
+ org.apache.camel.Message response = exchange.getMessage();
assertNotNull(response, "The response must not be null");
String value = decodeResponseFromPayload((CxfPayload<?>) response.getBody(CxfPayload.class), exchange);
@@ -68,7 +67,7 @@ public class CxfDispatchPayloadTest extends CxfDispatchTestSupport {
Exchange exchange = sendJaxWsDispatchPayload(name, true);
assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
- Message response = exchange.getOut();
+ org.apache.camel.Message response = exchange.getOut();
assertNotNull(response, "The response must not be null");
assertNull(response.getBody(), "The response must be null");
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
index 82f7352d83d6..7b8ada2c688a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
@@ -22,8 +22,6 @@ import jakarta.xml.ws.Service;
import javax.xml.namespace.QName;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -100,7 +98,7 @@ public class CxfPayloadProviderRouterTest extends AbstractCXFGreeterRouterTest {
+ getClass().getSimpleName()
+ "/CamelContext/RouterPort");
Greeter greeter = service.getPort(routerPortName, Greeter.class);
- Client client = ClientProxy.getClient(greeter);
+ org.apache.cxf.endpoint.Client client = org.apache.cxf.frontend.ClientProxy.getClient(greeter);
VerifyInboundInterceptor icp = new VerifyInboundInterceptor();
client.getInInterceptors().add(icp);
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
index 2013f3056f1a..a679bc5f58b9 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.cxf;
import jakarta.xml.ws.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.wsdl_first.PersonImpl;
@@ -51,7 +50,7 @@ public class CxfPayloadWsdlWithoutSEITest extends AbstractCxfWsdlFirstTest {
public void testInvokingServiceWithCamelProducer() {
Exchange exchange = sendJaxWsMessage("hello");
assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully");
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
String result = out.getBody(String.class);
assertStringContains(result, "Bonjour");
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
index 4e23d32f9e09..df1709984b15 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.cxf;
import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import jakarta.xml.ws.WebServiceContext;
import jakarta.xml.ws.WebServiceException;
@@ -32,7 +31,7 @@ public class EchoServiceSessionImpl implements EchoService {
public String echo(String text) {
// Find the HttpSession
MessageContext mc = context.getMessageContext();
- HttpSession session = ((HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+ HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
if (session == null) {
throw new WebServiceException("No HTTP Session found");
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
index 2026c9f6a48a..62dfe583214b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
@@ -20,11 +20,10 @@ import java.awt.Image;
import jakarta.xml.ws.BindingType;
import jakarta.xml.ws.Holder;
-import jakarta.xml.ws.soap.SOAPBinding;
import org.apache.camel.cxf.mtom_feature.Hello;
-@BindingType(value = SOAPBinding.SOAP11HTTP_MTOM_BINDING)
+@BindingType(value = jakarta.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING)
public class HelloImpl implements Hello {
public void detail(Holder<byte[]> photo, Holder<Image> image) {
// echo through Holder
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
index a4b9508bf36b..7b374eedac13 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.cxf.mtom;
import java.awt.image.BufferedImage;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
@@ -159,7 +158,7 @@ public class CxfMtomProducerPayloadModeTest {
// CXF encoding the XOP reference since 3.0.1
private String decodingReference(String reference) throws UnsupportedEncodingException {
- return URLDecoder.decode(reference, StandardCharsets.UTF_8);
+ return java.net.URLDecoder.decode(reference, StandardCharsets.UTF_8);
}
protected boolean isMtomEnabled() {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
index 18001b23a525..9ecefda31c3f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
@@ -18,20 +18,17 @@ package org.apache.camel.component.cxf.mtom;
import jakarta.jws.WebService;
import jakarta.xml.bind.annotation.XmlSeeAlso;
-import jakarta.xml.ws.BindingType;
-import jakarta.xml.ws.soap.SOAPBinding;
import org.apache.camel.cxf.mtom_feature.Hello;
-import org.apache.camel.cxf.mtom_feature.types.ObjectFactory;
/**
* Hello Test Impl class for SOAP 1.2
*/
@WebService(serviceName = "HelloService12")
-@XmlSeeAlso({ ObjectFactory.class })
+@XmlSeeAlso({ org.apache.camel.cxf.mtom_feature.types.ObjectFactory.class })
-@BindingType(value = SOAPBinding.SOAP12HTTP_MTOM_BINDING)
+@jakarta.xml.ws.BindingType(value = jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING)
public class HelloImpl12 extends HelloImpl implements Hello {
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java
index e133f8ed7155..2d6c00e1e697 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.cxf.mtom;
import java.io.IOException;
-import org.apache.commons.logging.Log;
import org.apache.cxf.helpers.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,7 +81,7 @@ public final class MtomTestHelper {
// utility class
}
- static boolean isAwtHeadless(Log log, Logger logger) {
+ static boolean isAwtHeadless(org.apache.commons.logging.Log log, org.slf4j.Logger logger) {
assertFalse(log == null && logger == null, "Both loggers are not allowed to be null!");
boolean headless = Boolean.getBoolean("java.awt.headless");
if (headless) {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
index 772d52a1ebb5..1da02466d05b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.cxf.multipart;
import jakarta.xml.ws.Endpoint;
-import jakarta.xml.ws.Holder;
import jakarta.xml.ws.Service;
import javax.xml.namespace.QName;
@@ -85,8 +84,8 @@ public class CXFMultiPartTest extends CamelSpringTestSupport {
e0.setV(in0);
e1.setV(in1);
- Holder<InE> h = new Holder<>();
- Holder<InE> h1 = new Holder<>();
+ jakarta.xml.ws.Holder<InE> h = new jakarta.xml.ws.Holder<>();
+ jakarta.xml.ws.Holder<InE> h1 = new jakarta.xml.ws.Holder<>();
multiPartClient.foo(e0, e1, h, h1);
return h.value.getV() + " " + h1.value.getV();
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
index 3359361173b3..3c0e3313d2e8 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.cxf.multipart;
-import jakarta.jws.WebService;
import jakarta.xml.ws.Holder;
import org.apache.camel.cxf.multipart.MultiPartInvoke;
@@ -24,11 +23,11 @@ import org.apache.camel.cxf.multipart.types.InE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@WebService(
- serviceName = "MultiPartInvokeService",
- portName = "MultiPartInvokePort",
- targetNamespace = "http://adapter.ti.tongtech.com/ws",
- endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke")
+@jakarta.jws.WebService(
+ serviceName = "MultiPartInvokeService",
+ portName = "MultiPartInvokePort",
+ targetNamespace = "http://adapter.ti.tongtech.com/ws",
+ endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke")
public class MultiPartInvokeImpl implements MultiPartInvoke {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
index cc0f07a9e036..76ee4abd6b0c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.common.CXFTestSupport;
@@ -57,7 +56,6 @@ import org.apache.cxf.headers.Header.Direction;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.message.MessageContentsList;
-import org.apache.cxf.outofband.header.ObjectFactory;
import org.apache.cxf.outofband.header.OutofBandHeader;
import org.apache.cxf.staxutils.StaxUtils;
import org.junit.jupiter.api.AfterEach;
@@ -517,7 +515,7 @@ public class CxfMessageHeadersRelayTest {
Exchange exchange = template.send(producerUri, senderExchange);
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
MessageContentsList result = (MessageContentsList) out.getBody();
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
@@ -540,7 +538,7 @@ public class CxfMessageHeadersRelayTest {
Exchange exchange = template.send(producerUri, senderExchange);
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
MessageContentsList result = (MessageContentsList) out.getBody();
assertTrue(result.get(0) != null && ((Me) result.get(0)).getFirstName().equals("pass"),
"Expected the out of band header to propagate but it didn't");
@@ -568,7 +566,7 @@ public class CxfMessageHeadersRelayTest {
Exchange exchange = template.send(producerUri, senderExchange);
- Message out = exchange.getMessage();
+ org.apache.camel.Message out = exchange.getMessage();
MessageContentsList result = (MessageContentsList) out.getBody();
assertTrue(result.get(0) != null && ((Me) result.get(0)).getFirstName().equals("pass"),
"Expected the out of band header to propagate but it didn't");
@@ -616,7 +614,7 @@ public class CxfMessageHeadersRelayTest {
if (hdr1.getObject() instanceof Node) {
try {
JAXBElement<?> job = (JAXBElement<?>) JAXBContext
- .newInstance(ObjectFactory.class)
+ .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
.createUnmarshaller().unmarshal((Node) hdr1.getObject());
hdrToTest = (OutofBandHeader) job.getValue();
} catch (JAXBException ex) {
@@ -673,7 +671,7 @@ public class CxfMessageHeadersRelayTest {
if (hdr1.getObject() instanceof Node) {
try {
JAXBElement<?> job = (JAXBElement<?>) JAXBContext
- .newInstance(ObjectFactory.class)
+ .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
.createUnmarshaller().unmarshal((Node) hdr1.getObject());
hdrToTest.add((OutofBandHeader) job.getValue());
} catch (JAXBException ex) {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index 27e47d53229d..2ee035148d6b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
import java.util.List;
import jakarta.annotation.Resource;
-import jakarta.jws.WebService;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
@@ -35,14 +34,13 @@ import org.w3c.dom.Node;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxb.JAXBDataBinding;
-import org.apache.cxf.outofband.header.ObjectFactory;
import org.apache.cxf.outofband.header.OutofBandHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@WebService(serviceName = "HeaderService",
- targetNamespace = "http://apache.org/camel/cxf/soap/headers",
- endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
+@jakarta.jws.WebService(serviceName = "HeaderService",
+ targetNamespace = "http://apache.org/camel/cxf/soap/headers",
+ endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
public class HeaderTesterImpl implements HeaderTester {
private static final Logger LOG = LoggerFactory.getLogger(HeaderTesterImpl.class);
@@ -202,7 +200,7 @@ public class HeaderTesterImpl implements HeaderTester {
Header hdr1 = (Header) hdr;
try {
JAXBElement<?> job
- = (JAXBElement<?>) JAXBContext.newInstance(ObjectFactory.class)
+ = (JAXBElement<?>) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
.createUnmarshaller()
.unmarshal((Node) hdr1.getObject());
OutofBandHeader ob = (OutofBandHeader) job.getValue();
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
index b0650004a626..7857a278182e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
@@ -27,7 +27,6 @@ import org.w3c.dom.Node;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.outofband.header.ObjectFactory;
import org.apache.cxf.outofband.header.OutofBandHeader;
public class HeaderTesterWithInsertionImpl extends HeaderTesterImpl {
@@ -67,7 +66,7 @@ public class HeaderTesterWithInsertionImpl extends HeaderTesterImpl {
Header hdr1 = (Header) hdr;
try {
JAXBElement<?> job
- = (JAXBElement<?>) JAXBContext.newInstance(ObjectFactory.class)
+ = (JAXBElement<?>) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
.createUnmarshaller()
.unmarshal((Node) hdr1.getObject());
OutofBandHeader ob = (OutofBandHeader) job.getValue();
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
index 312834694f4e..a85ab36f7b44 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.jaxws.CxfEndpoint;
import org.apache.camel.util.URISupport;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.transport.http.HTTPException;
import org.junit.jupiter.api.Test;
@@ -88,7 +87,7 @@ public class CxfEndpointBeansRouterTest extends AbstractSpringBeanTestSupport {
});
Exception ex = reply.getException();
- assertTrue(ex instanceof Fault
+ assertTrue(ex instanceof org.apache.cxf.interceptor.Fault
|| ex instanceof HTTPException, "Should get the fault here");
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
index e204b5ae6951..8e9a29db94f1 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
@@ -18,14 +18,12 @@ package org.apache.camel.component.cxf.wssecurity.server;
import java.util.logging.Logger;
-import jakarta.jws.WebService;
-
import org.apache.camel.hello_world_soap_http.Greeter;
-@WebService(serviceName = "GreeterService",
- portName = "GreeterPort",
- endpointInterface = "org.apache.camel.hello_world_soap_http.Greeter",
- targetNamespace = "http://camel.apache.org/hello_world_soap_http")
+@jakarta.jws.WebService(serviceName = "GreeterService",
+ portName = "GreeterPort",
+ endpointInterface = "org.apache.camel.hello_world_soap_http.Greeter",
+ targetNamespace = "http://camel.apache.org/hello_world_soap_http")
public class GreeterImpl implements Greeter {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
index 297693ea24cb..0baee7db6c36 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
@@ -20,7 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.non_wrapper.types.GetPerson;
import org.apache.camel.non_wrapper.types.GetPersonResponse;
-import org.apache.camel.non_wrapper.types.UnknownPersonFault;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,8 +45,8 @@ public class PersonProcessor implements Processor {
if (personId == null || personId.length() == 0) {
LOG.info("person id 123, so throwing exception");
// Try to throw out the soap fault message
- UnknownPersonFault personFault
- = new UnknownPersonFault();
+ org.apache.camel.non_wrapper.types.UnknownPersonFault personFault
+ = new org.apache.camel.non_wrapper.types.UnknownPersonFault();
personFault.setPersonId("");
org.apache.camel.non_wrapper.UnknownPersonFault fault
= new org.apache.camel.non_wrapper.UnknownPersonFault("Get the null value of person name", personFault);
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
index a00b8c0d6172..cc4727cd6b38 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
@@ -17,14 +17,13 @@
package org.apache.camel.wsdl_first;
import jakarta.jws.WebService;
-import jakarta.xml.ws.BindingType;
@WebService(serviceName = "PersonService12",
targetNamespace = "http://camel.apache.org/wsdl-first",
endpointInterface = "org.apache.camel.wsdl_first.Person",
wsdlLocation = "classpath:/person.wsdl")
-@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
+@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
public class PersonImpl12 extends PersonImpl {
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 9f3e5069ea7c..a08b350f5c88 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -20,7 +20,6 @@ import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.wsdl_first.types.UnknownPersonFault;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.slf4j.Logger;
@@ -49,8 +48,8 @@ public class PersonProcessor implements Processor {
if (personId.value == null || personId.value.length() == 0) {
LOG.info("person id 123, so throwing exception");
// Try to throw out the soap fault message
- UnknownPersonFault personFault
- = new UnknownPersonFault();
+ org.apache.camel.wsdl_first.types.UnknownPersonFault personFault
+ = new org.apache.camel.wsdl_first.types.UnknownPersonFault();
personFault.setPersonId("");
org.apache.camel.wsdl_first.UnknownPersonFault fault
= new org.apache.camel.wsdl_first.UnknownPersonFault("Get the null value of person name", personFault);
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
index 8c1c00b7345b..90060f1f4fe6 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -65,7 +64,7 @@ public class CxfHeaderHelperTest {
Map<String, Object> responseContext = Collections.singletonMap("response", "true");
exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
exchange.getIn().setHeader(Client.RESPONSE_CONTEXT, responseContext);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
CxfHeaderHelper.propagateCamelToCxf(new DefaultHeaderFilterStrategy(),
exchange.getIn().getHeaders(), cxfMessage, exchange);
@@ -79,7 +78,7 @@ public class CxfHeaderHelperTest {
// check the protocol headers
Map<String, List<String>> cxfHeaders
- = CastUtils.cast((Map<?, ?>) cxfMessage.get(Message.PROTOCOL_HEADERS));
+ = CastUtils.cast((Map<?, ?>) cxfMessage.get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
assertNotNull(cxfHeaders);
assertEquals(7, cxfHeaders.size());
@@ -104,7 +103,7 @@ public class CxfHeaderHelperTest {
@Test
public void testPropagateCxfToCamel() {
Exchange exchange = new DefaultExchange(context);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
Map<String, List<String>> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
cxfHeaders.put("Content-Length", Arrays.asList("241"));
cxfHeaders.put("soapAction", Arrays.asList("urn:hello:world"));
@@ -117,7 +116,7 @@ public class CxfHeaderHelperTest {
cxfHeaders.put(Message.HTTP_REQUEST_METHOD, Arrays.asList("GET"));
cxfHeaders.put(Message.PATH_INFO, Arrays.asList("/base/hello/cxf"));
cxfHeaders.put(Message.BASE_PATH, Arrays.asList("/base"));
- cxfMessage.put(Message.PROTOCOL_HEADERS, cxfHeaders);
+ cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders);
cxfMessage.put(Message.RESPONSE_CODE, "200");
Map<String, Object> requestContext = Collections.singletonMap("request", "true");
@@ -155,11 +154,11 @@ public class CxfHeaderHelperTest {
Exchange exchange = new DefaultExchange(context);
exchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
Map<String, List<String>> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
cxfHeaders.put("myfruitheader", Arrays.asList("peach"));
cxfHeaders.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
- cxfMessage.put(Message.PROTOCOL_HEADERS, cxfHeaders);
+ cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders);
CxfHeaderHelper.propagateCxfToCamel(new DefaultHeaderFilterStrategy(),
cxfMessage, exchange.getIn(), exchange);
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
index 2b1a4fd66d91..b9398af35595 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
-import org.apache.camel.Exchange;
import org.apache.camel.component.cxf.transport.header.CxfHeaderFilterStrategy;
import org.apache.camel.component.cxf.transport.message.CxfMessageHelper;
import org.apache.camel.impl.DefaultCamelContext;
@@ -52,10 +51,10 @@ public class CxfMessageHelperTest {
@Test
public void testGetCxfInMessage() throws Exception {
HeaderFilterStrategy headerFilterStrategy = new CxfHeaderFilterStrategy();
- Exchange exchange = new DefaultExchange(context);
+ org.apache.camel.Exchange exchange = new DefaultExchange(context);
// String
exchange.getIn().setBody("hello world");
- Message message = CxfMessageHelper.getCxfInMessage(
+ org.apache.cxf.message.Message message = CxfMessageHelper.getCxfInMessage(
headerFilterStrategy, exchange, false);
// test message
InputStream is = message.getContent(InputStream.class);
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
index 29461be5c2c8..7b2f4821ee2e 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
@@ -78,7 +78,7 @@ public class DefaultCxfMessageMapperTest {
private Exchange setupCamelExchange(String requestURI, String requestPath, HttpServletRequest request) {
org.apache.camel.Message camelMessage = mock(org.apache.camel.Message.class);
- HttpMessage camelHttpMessage = mock(HttpMessage.class);
+ org.apache.camel.http.common.HttpMessage camelHttpMessage = mock(org.apache.camel.http.common.HttpMessage.class);
Exchange camelExchange = mock(Exchange.class);
when(camelExchange.getProperty(CamelTransportConstants.CXF_EXCHANGE,
org.apache.cxf.message.Exchange.class)).thenReturn(new ExchangeImpl());
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
index 9d410c6bed44..b38fb57ffa0e 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
@@ -23,7 +23,6 @@ import java.io.OutputStream;
import javax.xml.namespace.QName;
import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -49,7 +48,7 @@ public class CamelConduitTest extends CamelTransportTestSupport {
public void configure() {
from("direct:Producer").to("mock:EndpointA").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(org.apache.camel.Exchange exchange) throws Exception {
if (exchange.getPattern().isOutCapable()) {
Object result = exchange.getIn().getBody();
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
index 277bde86cbf1..f72e2c66c60e 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
@@ -34,8 +34,6 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.transport.common.gzip.GZIPInInterceptor;
-import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
import org.junit.jupiter.api.BeforeEach;
public class JaxWSCamelTestSupport extends CamelTestSupport {
@@ -149,8 +147,8 @@ public class JaxWSCamelTestSupport extends CamelTestSupport {
public Endpoint publishSampleWSWithGzipEnabled(String camelEndpoint) {
EndpointImpl endpoint = (EndpointImpl) Endpoint.publish("camel://" + camelEndpoint, new SampleWSImpl());
- endpoint.getInInterceptors().add(new GZIPInInterceptor());
- endpoint.getOutInterceptors().add(new GZIPOutInterceptor(0));
+ endpoint.getInInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPInInterceptor());
+ endpoint.getOutInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPOutInterceptor(0));
return endpoint;
}
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
index 57ff0ed3a6b9..e3418ec1fb9d 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
@@ -151,10 +151,10 @@ public class CamelDestination extends AbstractDestination implements Configurabl
this.camelContext = camelContext;
}
- protected void incoming(Exchange camelExchange) {
+ protected void incoming(org.apache.camel.Exchange camelExchange) {
LOG.debug("server received request: {}", camelExchange);
DefaultCxfMessageMapper beanBinding = new DefaultCxfMessageMapper();
- Message inMessage
+ org.apache.cxf.message.Message inMessage
= beanBinding.createCxfMessageFromCamelExchange(camelExchange, headerFilterStrategy);
inMessage.put(CamelTransportConstants.CAMEL_EXCHANGE, camelExchange);
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
index fb6c9434e448..7ef6612ce1b5 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
@@ -21,7 +21,6 @@ import java.io.OutputStream;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
-import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Producer;
@@ -87,7 +86,7 @@ class CamelOutputStream extends CachedOutputStream {
pattern = ExchangePattern.InOut;
}
LOG.debug("send the message to endpoint {}", this.targetCamelEndpointUri);
- final Exchange exchange = this.producer.getEndpoint().createExchange(pattern);
+ final org.apache.camel.Exchange exchange = this.producer.getEndpoint().createExchange(pattern);
exchange.setProperty(ExchangePropertyKey.TO_ENDPOINT, this.targetCamelEndpointUri);
CachedOutputStream outputStream = (CachedOutputStream) outMessage.getContent(OutputStream.class);
@@ -107,7 +106,7 @@ class CamelOutputStream extends CachedOutputStream {
}
- protected void syncInvoke(Exchange exchange) throws IOException {
+ protected void syncInvoke(org.apache.camel.Exchange exchange) throws IOException {
try {
this.producer.process(exchange);
} catch (Exception ex) {
@@ -125,7 +124,7 @@ class CamelOutputStream extends CachedOutputStream {
}
- protected void asyncInvokeFromWorkQueue(final Exchange exchange) throws IOException {
+ protected void asyncInvokeFromWorkQueue(final org.apache.camel.Exchange exchange) throws IOException {
Runnable runnable = () -> {
try {
syncInvoke(exchange);
@@ -169,8 +168,8 @@ class CamelOutputStream extends CachedOutputStream {
}
}
- private void handleResponseInternal(Exchange exchange) {
- Message inMessage = null;
+ private void handleResponseInternal(org.apache.camel.Exchange exchange) {
+ org.apache.cxf.message.Message inMessage = null;
inMessage = CxfMessageHelper.getCxfInMessage(this.headerFilterStrategy, exchange, true);
this.observer.onMessage(inMessage);
}
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java
index 31e3d35c1a8c..d0cfa2c5802c 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/CxfMessageHelper.java
@@ -18,13 +18,11 @@ package org.apache.camel.component.cxf.transport.message;
import java.io.InputStream;
-import org.apache.camel.Exchange;
import org.apache.camel.component.cxf.common.header.CxfHeaderHelper;
import org.apache.camel.component.cxf.transport.CamelTransportConstants;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.message.ExchangeImpl;
-import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
public final class CxfMessageHelper {
@@ -33,9 +31,9 @@ public final class CxfMessageHelper {
//Helper class
}
- public static Message getCxfInMessage(
+ public static org.apache.cxf.message.Message getCxfInMessage(
HeaderFilterStrategy headerFilterStrategy,
- Exchange exchange,
+ org.apache.camel.Exchange exchange,
boolean isClient) {
MessageImpl answer = new MessageImpl();
org.apache.cxf.message.Exchange cxfExchange = exchange
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
index bdbd28262338..6395a90a9e03 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
@@ -41,7 +41,7 @@ public class DefaultCxfMessageMapper implements CxfMessageMapper {
Exchange camelExchange,
HeaderFilterStrategy headerFilterStrategy) {
- Message answer = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, camelExchange, false);
+ org.apache.cxf.message.Message answer = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, camelExchange, false);
org.apache.camel.Message camelMessage = camelExchange.getIn();
String requestContentType = getRequestContentType(camelMessage);
@@ -58,14 +58,14 @@ public class DefaultCxfMessageMapper implements CxfMessageMapper {
String verb = getVerb(camelMessage);
String queryString = getQueryString(camelMessage);
- answer.put(Message.REQUEST_URI, requestURI);
- answer.put(Message.BASE_PATH, basePath);
- answer.put(Message.HTTP_REQUEST_METHOD, verb);
- answer.put(Message.PATH_INFO, path);
- answer.put(Message.CONTENT_TYPE, requestContentType);
- answer.put(Message.ACCEPT_CONTENT_TYPE, acceptContentTypes);
- answer.put(Message.ENCODING, enc);
- answer.put(Message.QUERY_STRING, queryString);
+ answer.put(org.apache.cxf.message.Message.REQUEST_URI, requestURI);
+ answer.put(org.apache.cxf.message.Message.BASE_PATH, basePath);
+ answer.put(org.apache.cxf.message.Message.HTTP_REQUEST_METHOD, verb);
+ answer.put(org.apache.cxf.message.Message.PATH_INFO, path);
+ answer.put(org.apache.cxf.message.Message.CONTENT_TYPE, requestContentType);
+ answer.put(org.apache.cxf.message.Message.ACCEPT_CONTENT_TYPE, acceptContentTypes);
+ answer.put(org.apache.cxf.message.Message.ENCODING, enc);
+ answer.put(org.apache.cxf.message.Message.QUERY_STRING, queryString);
HttpMessage hm = camelExchange.getIn(HttpMessage.class);
if (hm != null) {
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
index 8c1c00b7345b..90060f1f4fe6 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -65,7 +64,7 @@ public class CxfHeaderHelperTest {
Map<String, Object> responseContext = Collections.singletonMap("response", "true");
exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
exchange.getIn().setHeader(Client.RESPONSE_CONTEXT, responseContext);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
CxfHeaderHelper.propagateCamelToCxf(new DefaultHeaderFilterStrategy(),
exchange.getIn().getHeaders(), cxfMessage, exchange);
@@ -79,7 +78,7 @@ public class CxfHeaderHelperTest {
// check the protocol headers
Map<String, List<String>> cxfHeaders
- = CastUtils.cast((Map<?, ?>) cxfMessage.get(Message.PROTOCOL_HEADERS));
+ = CastUtils.cast((Map<?, ?>) cxfMessage.get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
assertNotNull(cxfHeaders);
assertEquals(7, cxfHeaders.size());
@@ -104,7 +103,7 @@ public class CxfHeaderHelperTest {
@Test
public void testPropagateCxfToCamel() {
Exchange exchange = new DefaultExchange(context);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
Map<String, List<String>> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
cxfHeaders.put("Content-Length", Arrays.asList("241"));
cxfHeaders.put("soapAction", Arrays.asList("urn:hello:world"));
@@ -117,7 +116,7 @@ public class CxfHeaderHelperTest {
cxfHeaders.put(Message.HTTP_REQUEST_METHOD, Arrays.asList("GET"));
cxfHeaders.put(Message.PATH_INFO, Arrays.asList("/base/hello/cxf"));
cxfHeaders.put(Message.BASE_PATH, Arrays.asList("/base"));
- cxfMessage.put(Message.PROTOCOL_HEADERS, cxfHeaders);
+ cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders);
cxfMessage.put(Message.RESPONSE_CODE, "200");
Map<String, Object> requestContext = Collections.singletonMap("request", "true");
@@ -155,11 +154,11 @@ public class CxfHeaderHelperTest {
Exchange exchange = new DefaultExchange(context);
exchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE);
- Message cxfMessage = new MessageImpl();
+ org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
Map<String, List<String>> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
cxfHeaders.put("myfruitheader", Arrays.asList("peach"));
cxfHeaders.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
- cxfMessage.put(Message.PROTOCOL_HEADERS, cxfHeaders);
+ cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders);
CxfHeaderHelper.propagateCxfToCamel(new DefaultHeaderFilterStrategy(),
cxfMessage, exchange.getIn(), exchange);
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
index 2b1a4fd66d91..b9398af35595 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
-import org.apache.camel.Exchange;
import org.apache.camel.component.cxf.transport.header.CxfHeaderFilterStrategy;
import org.apache.camel.component.cxf.transport.message.CxfMessageHelper;
import org.apache.camel.impl.DefaultCamelContext;
@@ -52,10 +51,10 @@ public class CxfMessageHelperTest {
@Test
public void testGetCxfInMessage() throws Exception {
HeaderFilterStrategy headerFilterStrategy = new CxfHeaderFilterStrategy();
- Exchange exchange = new DefaultExchange(context);
+ org.apache.camel.Exchange exchange = new DefaultExchange(context);
// String
exchange.getIn().setBody("hello world");
- Message message = CxfMessageHelper.getCxfInMessage(
+ org.apache.cxf.message.Message message = CxfMessageHelper.getCxfInMessage(
headerFilterStrategy, exchange, false);
// test message
InputStream is = message.getContent(InputStream.class);
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
index 29461be5c2c8..7b2f4821ee2e 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
@@ -78,7 +78,7 @@ public class DefaultCxfMessageMapperTest {
private Exchange setupCamelExchange(String requestURI, String requestPath, HttpServletRequest request) {
org.apache.camel.Message camelMessage = mock(org.apache.camel.Message.class);
- HttpMessage camelHttpMessage = mock(HttpMessage.class);
+ org.apache.camel.http.common.HttpMessage camelHttpMessage = mock(org.apache.camel.http.common.HttpMessage.class);
Exchange camelExchange = mock(Exchange.class);
when(camelExchange.getProperty(CamelTransportConstants.CXF_EXCHANGE,
org.apache.cxf.message.Exchange.class)).thenReturn(new ExchangeImpl());
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
index 277bde86cbf1..f72e2c66c60e 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
@@ -34,8 +34,6 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.transport.common.gzip.GZIPInInterceptor;
-import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
import org.junit.jupiter.api.BeforeEach;
public class JaxWSCamelTestSupport extends CamelTestSupport {
@@ -149,8 +147,8 @@ public class JaxWSCamelTestSupport extends CamelTestSupport {
public Endpoint publishSampleWSWithGzipEnabled(String camelEndpoint) {
EndpointImpl endpoint = (EndpointImpl) Endpoint.publish("camel://" + camelEndpoint, new SampleWSImpl());
- endpoint.getInInterceptors().add(new GZIPInInterceptor());
- endpoint.getOutInterceptors().add(new GZIPOutInterceptor(0));
+ endpoint.getInInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPInInterceptor());
+ endpoint.getOutInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPOutInterceptor(0));
return endpoint;
}
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
index 34440e7c231b..0914ff83a041 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
@@ -20,13 +20,12 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.component.mock.MockComponent;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.CamelContextHelper;
/**
* Component for <a href="http://camel.apache.org/dataset.html">DataSet</a>.
*/
-@Component("dataset")
+@org.apache.camel.spi.annotations.Component("dataset")
public class DataSetComponent extends MockComponent {
public DataSetComponent() {
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java
index 61ca9ab200c8..44064483b2a0 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.component.mock.MockComponent;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.util.URISupport;
@@ -31,7 +30,7 @@ import org.apache.camel.util.URISupport;
* Component for testing by polling test messages from another endpoint on startup as the expected message bodies to
* receive during testing.
*/
-@Component("dataset-test")
+@org.apache.camel.spi.annotations.Component("dataset-test")
public class DataSetTestComponent extends MockComponent {
public DataSetTestComponent() {
diff --git a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java
index 3d82d5986919..0586a49dfc97 100644
--- a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java
+++ b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java
@@ -17,14 +17,11 @@
package org.apache.camel.language.datasonnet;
import java.math.BigDecimal;
-import java.time.DateTimeException;
import java.time.Instant;
-import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.time.temporal.TemporalAccessor;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -285,13 +282,13 @@ public final class CML extends Library {
throw new IllegalArgumentException("Expected String format, got: " + format.prettyName());
}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(fmtStr.value()).withZone(ZoneId.of("UTC"));
- TemporalAccessor parsed = formatter.parse(valStr.value());
+ java.time.temporal.TemporalAccessor parsed = formatter.parse(valStr.value());
Instant instant;
try {
instant = Instant.from(parsed);
- } catch (DateTimeException e) {
+ } catch (java.time.DateTimeException e) {
// If the format has no time component, default to start of day
- LocalDate date = LocalDate.from(parsed);
+ java.time.LocalDate date = java.time.LocalDate.from(parsed);
instant = date.atStartOfDay(ZoneId.of("UTC")).toInstant();
}
return new Val.Num(instant.toEpochMilli());
diff --git a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
index c98c28e55892..3ead8d5574b9 100644
--- a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
+++ b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
@@ -141,7 +141,7 @@ public class DatasonnetExpression extends ExpressionAdapter implements Expressio
.withLibrary(CML.getInstance())
.withDefaultOutput(MediaTypes.APPLICATION_JAVA);
- Set<Library> additionalLibraries = exchange.getContext().getRegistry().findByType(Library.class);
+ Set<Library> additionalLibraries = exchange.getContext().getRegistry().findByType(com.datasonnet.spi.Library.class);
for (Library lib : additionalLibraries) {
builder = builder.withLibrary(lib);
}
@@ -214,7 +214,7 @@ public class DatasonnetExpression extends ExpressionAdapter implements Expressio
.withLibrary(CML.getInstance())
.withDefaultOutput(MediaTypes.APPLICATION_JAVA);
- Set<Library> additionalLibraries = context.getRegistry().findByType(Library.class);
+ Set<Library> additionalLibraries = context.getRegistry().findByType(com.datasonnet.spi.Library.class);
for (Library lib : additionalLibraries) {
builder = builder.withLibrary(lib);
}
diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java
index e648941b47f9..6f37eb4aa304 100644
--- a/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java
+++ b/components/camel-debezium/camel-debezium-common/camel-debezium-common-component/src/test/java/org/apache/camel/component/debezium/DebeziumConsumerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.debezium;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
@@ -191,7 +190,7 @@ public class DebeziumConsumerTest extends CamelTestSupport {
for (int i = 0; i != numberOfLines; ++i) {
lines[i] = generateLine(linesAdded + i + 1);
}
- Files.write(inputFile.toPath(), Collect.arrayListOf(lines), StandardCharsets.UTF_8,
+ java.nio.file.Files.write(inputFile.toPath(), Collect.arrayListOf(lines), StandardCharsets.UTF_8,
StandardOpenOption.APPEND);
linesAdded += numberOfLines;
}
diff --git a/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Component.java b/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Component.java
index 626680304991..6894a30ff896 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Component.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Component.java
@@ -22,14 +22,13 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.dhis2.internal.Dhis2ApiCollection;
import org.apache.camel.component.dhis2.internal.Dhis2ApiName;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.component.AbstractApiComponent;
import org.hisp.dhis.integration.sdk.Dhis2ClientBuilder;
import org.hisp.dhis.integration.sdk.api.Dhis2Client;
import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-@Component("dhis2")
+@org.apache.camel.spi.annotations.Component("dhis2")
public class Dhis2Component extends AbstractApiComponent<Dhis2ApiName, Dhis2Configuration, Dhis2ApiCollection> {
@Metadata(label = "advanced")
Dhis2Configuration configuration;
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2DeleteIT.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2DeleteIT.java
index a006f2265816..78d4fe4708a0 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2DeleteIT.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2DeleteIT.java
@@ -19,7 +19,6 @@
*/
package org.apache.camel.component.dhis2;
-import java.io.InputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -60,7 +59,7 @@ public class Dhis2DeleteIT extends AbstractDhis2TestSupport {
// parameter type is java.util.Map
headers.put("CamelDhis2.queryParams", new HashMap<>());
- final InputStream result = requestBodyAndHeaders("direct://RESOURCE", null, headers);
+ final java.io.InputStream result = requestBodyAndHeaders("direct://RESOURCE", null, headers);
RemoteDhis2ClientException remoteDhis2ClientException = assertThrows(RemoteDhis2ClientException.class,
() -> Environment.DHIS2_CLIENT.get("organisationUnits/{id}", orgUnitId).transfer()
.returnAs(OrganisationUnit.class));
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java
index c3ad80b0cc77..0fd96b6df779 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2GetIT.java
@@ -19,7 +19,6 @@
*/
package org.apache.camel.component.dhis2;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -68,7 +67,7 @@ public class Dhis2GetIT extends AbstractDhis2TestSupport {
headers.put("CamelDhis2.filter", null);
headers.put("CamelDhis2.queryParams", null);
- final InputStream result = requestBodyAndHeaders("direct://RESOURCE", null, headers);
+ final java.io.InputStream result = requestBodyAndHeaders("direct://RESOURCE", null, headers);
assertNotNull(result, "resource result");
LOG.debug("Result: {}", result);
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PostIT.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PostIT.java
index c8e0eaba67c3..78c8b1aeb9e6 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PostIT.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PostIT.java
@@ -19,7 +19,6 @@
*/
package org.apache.camel.component.dhis2;
-import java.io.InputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -59,7 +58,7 @@ public class Dhis2PostIT extends AbstractDhis2TestSupport {
// parameter type is java.util.Map
headers.put("CamelDhis2.queryParams", new HashMap<>());
- final InputStream result = requestBodyAndHeaders(endpointUri,
+ final java.io.InputStream result = requestBodyAndHeaders(endpointUri,
new OrganisationUnit().withName("Foo").withShortName("Foo").withOpeningDate(new Date()),
headers);
diff --git a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PutIT.java b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PutIT.java
index 49b396a25446..dc68fc012de2 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PutIT.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/test/java/org/apache/camel/component/dhis2/Dhis2PutIT.java
@@ -19,7 +19,6 @@
*/
package org.apache.camel.component.dhis2;
-import java.io.InputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -62,7 +61,7 @@ public class Dhis2PutIT extends AbstractDhis2TestSupport {
headers.put("CamelDhis2.queryParams", new HashMap<>());
String name = RandomStringUtils.randomAlphabetic(8);
- final InputStream result = requestBodyAndHeaders(endpointUri,
+ final java.io.InputStream result = requestBodyAndHeaders(endpointUri,
new OrganisationUnit().withName(name).withShortName(name).withOpeningDate(new Date()), headers);
OrganisationUnit organisationUnit
= Environment.DHIS2_CLIENT.get("organisationUnits/{id}", Environment.ORG_UNIT_ID_UNDER_TEST)
diff --git a/components/camel-diagram/src/main/java/org/apache/camel/diagram/RouteDiagramRenderer.java b/components/camel-diagram/src/main/java/org/apache/camel/diagram/RouteDiagramRenderer.java
index 8c108afc8ab8..d3ea6e4ada84 100644
--- a/components/camel-diagram/src/main/java/org/apache/camel/diagram/RouteDiagramRenderer.java
+++ b/components/camel-diagram/src/main/java/org/apache/camel/diagram/RouteDiagramRenderer.java
@@ -33,7 +33,6 @@ import org.apache.camel.diagram.RouteDiagramLayoutEngine.LayoutNode;
import org.apache.camel.diagram.RouteDiagramLayoutEngine.LayoutRoute;
import org.apache.camel.diagram.RouteDiagramLayoutEngine.RouteInfo;
import org.apache.camel.diagram.RouteDiagramLayoutEngine.TreeNode;
-import org.jline.utils.Colors;
import static org.apache.camel.diagram.RouteDiagramLayoutEngine.PADDING;
import static org.apache.camel.diagram.RouteDiagramLayoutEngine.SCALE;
@@ -144,9 +143,9 @@ public class RouteDiagramRenderer {
return null;
}
}
- Integer idx = Colors.rgbColor(value);
+ Integer idx = org.jline.utils.Colors.rgbColor(value);
if (idx != null) {
- return new Color(Colors.rgbColor(idx.intValue()));
+ return new Color(org.jline.utils.Colors.rgbColor(idx.intValue()));
}
return null;
}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
index db3007ffb5aa..320ae8ad7fc6 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
@@ -37,8 +37,6 @@ import com.github.dockerjava.api.command.DockerCmdExecFactory;
import com.github.dockerjava.api.command.EventsCmd;
import com.github.dockerjava.api.command.ExecCreateCmd;
import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.ExportContainerCmd;
-import com.github.dockerjava.api.command.ImageHistoryCmd;
import com.github.dockerjava.api.command.InfoCmd;
import com.github.dockerjava.api.command.InitializeSwarmCmd;
import com.github.dockerjava.api.command.InspectConfigCmd;
@@ -518,12 +516,12 @@ public class FakeDockerCmdExecFactory implements DockerCmdExecFactory {
}
@Override
- public ImageHistoryCmd.Exec createImageHistoryCmdExec() {
+ public com.github.dockerjava.api.command.ImageHistoryCmd.Exec createImageHistoryCmdExec() {
return null;
}
@Override
- public ExportContainerCmd.Exec createExportContainerCmdExec() {
+ public com.github.dockerjava.api.command.ExportContainerCmd.Exec createExportContainerCmdExec() {
return null;
}
}
diff --git a/components/camel-event/src/main/java/org/apache/camel/component/camelevent/CamelEventComponent.java b/components/camel-event/src/main/java/org/apache/camel/component/camelevent/CamelEventComponent.java
index 8a6789a9203a..58ef674ba659 100644
--- a/components/camel-event/src/main/java/org/apache/camel/component/camelevent/CamelEventComponent.java
+++ b/components/camel-event/src/main/java/org/apache/camel/component/camelevent/CamelEventComponent.java
@@ -19,13 +19,12 @@ package org.apache.camel.component.camelevent;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
/**
* The Event component allows subscribing to Camel internal events such as route events and exchange events.
*/
-@Component("event")
+@org.apache.camel.spi.annotations.Component("event")
public class CamelEventComponent extends DefaultComponent {
public CamelEventComponent() {
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
index d8ace3b69120..1a62abb223fd 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.fhir.api.ExtraParameters;
import org.apache.camel.component.fhir.internal.FhirApiCollection;
import org.apache.camel.component.fhir.internal.FhirCapabilitiesApiMethod;
-import org.hl7.fhir.instance.model.api.IBaseConformance;
import org.hl7.fhir.r4.model.CapabilityStatement;
import org.hl7.fhir.r4.model.Enumerations;
import org.junit.jupiter.api.Test;
@@ -45,7 +44,7 @@ public class FhirCapabilitiesIT extends AbstractFhirTestSupport {
@Test
public void testOfType() {
- IBaseConformance result = requestBody("direct://OF_TYPE", CapabilityStatement.class);
+ org.hl7.fhir.instance.model.api.IBaseConformance result = requestBody("direct://OF_TYPE", CapabilityStatement.class);
LOG.debug("ofType: {}", result);
assertNotNull(result, "ofType result");
@@ -57,7 +56,7 @@ public class FhirCapabilitiesIT extends AbstractFhirTestSupport {
Map<String, Object> headers = new HashMap<>();
headers.put(ExtraParameters.ENCODE_JSON.getHeaderName(), Boolean.TRUE);
- IBaseConformance result
+ org.hl7.fhir.instance.model.api.IBaseConformance result
= requestBodyAndHeaders("direct://OF_TYPE", CapabilityStatement.class, headers);
LOG.debug("ofType: {}", result);
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
index 97b993f11d57..8c154ff4664f 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
@@ -22,8 +22,6 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.fhir.internal.FhirApiCollection;
import org.apache.camel.component.fhir.internal.FhirOperationApiMethod;
-import org.hl7.fhir.instance.model.api.IBaseBundle;
-import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.IdType;
import org.hl7.fhir.r4.model.Parameters;
@@ -135,7 +133,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
// parameter type is java.util.Map
headers.put("CamelFhir.extraParameters", null);
- final IBaseResource result = requestBodyAndHeaders("direct://ON_TYPE", null, headers);
+ final org.hl7.fhir.instance.model.api.IBaseResource result = requestBodyAndHeaders("direct://ON_TYPE", null, headers);
assertNotNull(result, "onType result");
LOG.debug("onType: {}", result);
@@ -156,7 +154,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
// parameter type is java.util.Map
headers.put("CamelFhir.extraParameters", null);
- final IBaseBundle result
+ final org.hl7.fhir.instance.model.api.IBaseBundle result
= requestBodyAndHeaders("direct://PROCESS_MESSAGE", null, headers);
assertNotNull(result, "processMessage result");
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index dff4fb31e4cd..12af129e2aba 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -46,7 +46,6 @@ import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1648,7 +1647,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
// need to normalize paths to ensure we can match using startsWith
endpointPath = FileUtil.normalizePath(endpointPath);
String copyOfName = FileUtil.normalizePath(name);
- if (ObjectHelper.isNotEmpty(endpointPath) && copyOfName.startsWith(endpointPath)) {
+ if (org.apache.camel.util.ObjectHelper.isNotEmpty(endpointPath) && copyOfName.startsWith(endpointPath)) {
name = name.substring(endpointPath.length());
}
@@ -1801,7 +1800,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
}
String answer = pattern;
- if (ObjectHelper.isNotEmpty(path) && ObjectHelper.isNotEmpty(pattern)) {
+ if (org.apache.camel.util.ObjectHelper.isNotEmpty(path) && org.apache.camel.util.ObjectHelper.isNotEmpty(pattern)) {
// done file must always be in same directory as the real file name
answer = path + getFileSeparator() + pattern;
}
diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java
index 8aa2377dfa34..f326684c1036 100644
--- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java
+++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamConfigurationIT.java
@@ -22,7 +22,6 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.flink.api.common.RuntimeExecutionMode;
-import org.apache.flink.configuration.ExecutionOptions;
import org.apache.flink.streaming.api.CheckpointingMode;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.datastream.DataStreamSource;
@@ -94,7 +93,7 @@ public class DataStreamConfigurationIT extends CamelTestSupport {
// Verify BATCH mode was set
RuntimeExecutionMode mode = env.getConfiguration()
- .get(ExecutionOptions.RUNTIME_MODE);
+ .get(org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE);
Assertions.assertThat(mode).isEqualTo(RuntimeExecutionMode.BATCH);
}
@@ -119,7 +118,7 @@ public class DataStreamConfigurationIT extends CamelTestSupport {
// Verify STREAMING mode was set
RuntimeExecutionMode mode = env.getConfiguration()
- .get(ExecutionOptions.RUNTIME_MODE);
+ .get(org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE);
Assertions.assertThat(mode).isEqualTo(RuntimeExecutionMode.STREAMING);
}
@@ -205,7 +204,7 @@ public class DataStreamConfigurationIT extends CamelTestSupport {
// Verify execution mode
RuntimeExecutionMode mode = env.getConfiguration()
- .get(ExecutionOptions.RUNTIME_MODE);
+ .get(org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE);
Assertions.assertThat(mode).isEqualTo(RuntimeExecutionMode.STREAMING);
// Verify parallelism
diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java
index 43f0b856ae53..d7ddfefe30bc 100644
--- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java
+++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamEdgeCasesIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.flink;
-import java.util.Collections;
-
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
@@ -115,7 +113,7 @@ public class DataStreamEdgeCasesIT extends CamelTestSupport {
public void testEmptyListPayload() {
template.sendBodyAndHeader(
"direct:withDataStream",
- Collections.emptyList(),
+ java.util.Collections.emptyList(),
FlinkConstants.FLINK_DATASTREAM_CALLBACK_HEADER,
new VoidDataStreamCallback() {
@Override
diff --git a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java
index 57fbbed36d85..dc992a28e2cc 100644
--- a/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java
+++ b/components/camel-flink/src/test/java/org/apache/camel/component/flink/DataStreamProducerTest.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.flink.api.common.RuntimeExecutionMode;
-import org.apache.flink.configuration.ExecutionOptions;
import org.apache.flink.streaming.api.CheckpointingMode;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.datastream.DataStreamSource;
@@ -85,7 +84,7 @@ public class DataStreamProducerTest extends CamelTestSupport {
env.setRuntimeMode(RuntimeExecutionMode.BATCH);
Assertions.assertThat(env.getConfiguration().get(
- ExecutionOptions.RUNTIME_MODE))
+ org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE))
.isEqualTo(RuntimeExecutionMode.BATCH);
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/CamelFTPParserFactory.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/CamelFTPParserFactory.java
index a530c28729e6..c80d448627a4 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/CamelFTPParserFactory.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/CamelFTPParserFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.file.remote;
-import java.util.Locale;
import java.util.regex.Pattern;
import org.apache.camel.spi.ClassResolver;
@@ -96,7 +95,7 @@ public class CamelFTPParserFactory extends DefaultFTPFileEntryParserFactory {
}
}
if (parser == null) {
- final String ukey = key.toUpperCase(Locale.ENGLISH);
+ final String ukey = key.toUpperCase(java.util.Locale.ENGLISH);
if (ukey.indexOf(FTPClientConfig.SYST_UNIX_TRIM_LEADING) >= 0) {
parser = new UnixFTPEntryParser(config, true);
// must check this after SYST_UNIX_TRIM_LEADING as it is a substring of it
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProducerPreWriteCheckTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProducerPreWriteCheckTest.java
index 726e0980311f..9462a8c73c2b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProducerPreWriteCheckTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProducerPreWriteCheckTest.java
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.ArgumentMatchers.any;
@@ -67,7 +66,7 @@ class RemoteFileProducerPreWriteCheckTest {
producer.preWriteCheck(exchange);
// Reset the mock to clear the interaction count
verify(operations, times(1)).connect(configuration, exchange);
- Mockito.clearInvocations(operations);
+ org.mockito.Mockito.clearInvocations(operations);
}
/**
diff --git a/components/camel-github/src/main/java/org/apache/camel/component/github/producer/PullRequestFilesProducer.java b/components/camel-github/src/main/java/org/apache/camel/component/github/producer/PullRequestFilesProducer.java
index beb91baa5b16..50131e3eae2c 100644
--- a/components/camel-github/src/main/java/org/apache/camel/component/github/producer/PullRequestFilesProducer.java
+++ b/components/camel-github/src/main/java/org/apache/camel/component/github/producer/PullRequestFilesProducer.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.github.producer;
-import java.util.List;
-
import org.apache.camel.Exchange;
import org.apache.camel.component.github.GitHubConstants;
import org.apache.camel.component.github.GitHubEndpoint;
@@ -55,7 +53,7 @@ public class PullRequestFilesProducer extends AbstractGitHubProducer {
public void process(Exchange exchange) throws Exception {
Integer pullRequestNumber = exchange.getIn().getHeader(GitHubConstants.GITHUB_PULLREQUEST, Integer.class);
- List<CommitFile> response = pullRequestService.getFiles(getRepository(), pullRequestNumber);
+ java.util.List<CommitFile> response = pullRequestService.getFiles(getRepository(), pullRequestNumber);
// copy the header of in message to the out message
exchange.getOut().copyFrom(exchange.getIn());
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarAclIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarAclIT.java
index 381a5f741798..8c2665a885e5 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarAclIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarAclIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.google.calendar;
-import com.google.api.services.calendar.model.Acl;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.calendar.internal.CalendarAclApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
@@ -41,7 +40,7 @@ public class CalendarAclIT extends AbstractGoogleCalendarTestSupport {
@Test
public void testList() {
// using String message body for single parameter "calendarId"
- final Acl result = requestBody("direct://LIST", getCalendar().getId());
+ final com.google.api.services.calendar.model.Acl result = requestBody("direct://LIST", getCalendar().getId());
// should have at least one rule (reader, owner, etc.) for the calendar
// or we wouldn't be able to view it!
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIT.java
index ea6a15270c32..1a366908d7cc 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.google.calendar;
-import java.util.List;
-
import com.google.api.services.calendar.model.Calendar;
import com.google.api.services.calendar.model.CalendarList;
import com.google.api.services.calendar.model.CalendarListEntry;
@@ -52,7 +50,7 @@ public class CalendarCalendarListIT extends AbstractGoogleCalendarTestSupport {
protected boolean isCalendarInList(Calendar calendar) {
CalendarList calendarList = requestBody("direct://LIST", null);
- List<CalendarListEntry> items = calendarList.getItems();
+ java.util.List<CalendarListEntry> items = calendarList.getItems();
boolean found = false;
for (CalendarListEntry calendarListEntry : items) {
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarColorsIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarColorsIT.java
index 5709b0bea90a..c4d97e31898f 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarColorsIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarColorsIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.google.calendar;
-import com.google.api.services.calendar.model.Colors;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.calendar.internal.CalendarColorsApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
@@ -40,7 +39,7 @@ public class CalendarColorsIT extends AbstractGoogleCalendarTestSupport {
@Test
public void testGet() {
- Colors result = requestBody("direct://GET", null);
+ com.google.api.services.calendar.model.Colors result = requestBody("direct://GET", null);
assertNotNull(result, "get result");
LOG.debug("get: {}", result);
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarEventsIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarEventsIT.java
index ae2a5018edd2..de83294ffb84 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarEventsIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarEventsIT.java
@@ -26,7 +26,6 @@ import com.google.api.client.util.DateTime;
import com.google.api.services.calendar.model.Event;
import com.google.api.services.calendar.model.EventAttendee;
import com.google.api.services.calendar.model.EventDateTime;
-import com.google.api.services.calendar.model.Events;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.calendar.internal.CalendarEventsApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
@@ -73,7 +72,7 @@ public class CalendarEventsIT extends AbstractGoogleCalendarTestSupport {
// parameter type is com.google.api.services.calendar.model.Event
headers.put("CamelGoogleCalendar.content", event);
- final Event result = requestBodyAndHeaders("direct://INSERT", null, headers);
+ final com.google.api.services.calendar.model.Event result = requestBodyAndHeaders("direct://INSERT", null, headers);
assertEquals("Feed the Camel", result.getSummary());
LOG.debug("insert: {}", result);
@@ -87,11 +86,11 @@ public class CalendarEventsIT extends AbstractGoogleCalendarTestSupport {
headers.put("CamelGoogleCalendar.calendarId", getCalendar().getId());
// parameter type is String
headers.put("CamelGoogleCalendar.text", "Feed the Camel");
- Event result = requestBodyAndHeaders("direct://QUICKADD", null, headers);
+ com.google.api.services.calendar.model.Event result = requestBodyAndHeaders("direct://QUICKADD", null, headers);
assertNotNull(result, "quickAdd result");
// Check if it is in the list of events for this calendar
- Events events = requestBody("direct://LIST", getCalendar().getId());
+ com.google.api.services.calendar.model.Events events = requestBody("direct://LIST", getCalendar().getId());
Event item = events.getItems().get(0);
String eventId = item.getId();
assertEquals("Feed the Camel", item.getSummary());
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarFreebusyIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarFreebusyIT.java
index 8cf9c34e6898..2080c4edc710 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarFreebusyIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarFreebusyIT.java
@@ -22,7 +22,6 @@ import java.util.List;
import com.google.api.client.util.DateTime;
import com.google.api.services.calendar.model.FreeBusyRequest;
import com.google.api.services.calendar.model.FreeBusyRequestItem;
-import com.google.api.services.calendar.model.FreeBusyResponse;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.calendar.internal.CalendarFreebusyApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
@@ -48,7 +47,7 @@ public class CalendarFreebusyIT extends AbstractGoogleCalendarTestSupport {
public void testQuery() {
// using com.google.api.services.calendar.model.FreeBusyRequest message
// body for single parameter "content"
- FreeBusyRequest request = new FreeBusyRequest();
+ com.google.api.services.calendar.model.FreeBusyRequest request = new FreeBusyRequest();
List<FreeBusyRequestItem> items = new ArrayList<>();
items.add(new FreeBusyRequestItem().setId(getCalendar().getId()));
request.setItems(items);
@@ -56,7 +55,7 @@ public class CalendarFreebusyIT extends AbstractGoogleCalendarTestSupport {
request.setTimeMin(DateTime.parseRfc3339("2014-11-10T20:45:30-00:00"));
request.setTimeMax(DateTime.parseRfc3339("2014-11-10T21:45:30-00:00"));
- final FreeBusyResponse result = requestBody("direct://QUERY", request);
+ final com.google.api.services.calendar.model.FreeBusyResponse result = requestBody("direct://QUERY", request);
assertNotNull(result, "query result");
LOG.debug("query: {}", result);
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarSettingsIT.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarSettingsIT.java
index 2b18c456e9ec..90b8fbf245d8 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarSettingsIT.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarSettingsIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.google.calendar;
-import com.google.api.services.calendar.model.Setting;
-import com.google.api.services.calendar.model.Settings;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.calendar.internal.CalendarSettingsApiMethod;
import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
@@ -42,7 +40,7 @@ public class CalendarSettingsIT extends AbstractGoogleCalendarTestSupport {
@Test
public void testGet() {
// using String message body for single parameter "setting"
- final Setting result = requestBody("direct://GET", "timezone");
+ final com.google.api.services.calendar.model.Setting result = requestBody("direct://GET", "timezone");
assertNotNull(result, "get result");
LOG.debug("get: {}", result);
@@ -50,7 +48,7 @@ public class CalendarSettingsIT extends AbstractGoogleCalendarTestSupport {
@Test
public void testList() {
- final Settings result = requestBody("direct://LIST", null);
+ final com.google.api.services.calendar.model.Settings result = requestBody("direct://LIST", null);
assertNotNull(result, "list result");
LOG.debug("list: {}", result);
diff --git a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java
index 080ff11e4fc0..5de2a7ac76d5 100644
--- a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java
+++ b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/InteractiveGoogleDriveClientFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.google.drive;
-import java.io.File;
import java.util.Collection;
import com.google.api.client.auth.oauth2.Credential;
@@ -33,7 +32,7 @@ import org.slf4j.LoggerFactory;
public class InteractiveGoogleDriveClientFactory implements GoogleDriveClientFactory {
private static final Logger LOG = LoggerFactory.getLogger(InteractiveGoogleDriveClientFactory.class);
- private static final File DATA_STORE_DIR = new File(".google_drive");
+ private static final java.io.File DATA_STORE_DIR = new java.io.File(".google_drive");
private NetHttpTransport transport;
private JacksonFactory jsonFactory;
private FileDataStoreFactory dataStoreFactory;
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIT.java
index 06af26b23334..255c0fbb85bc 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveAboutIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.google.drive;
-import com.google.api.services.drive.model.About;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.drive.internal.DriveAboutApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
@@ -40,7 +39,7 @@ public class DriveAboutIT extends AbstractGoogleDriveTestSupport {
@Test
public void testGet() {
- final About result = requestBody("direct://GET", null);
+ final com.google.api.services.drive.model.About result = requestBody("direct://GET", null);
assertNotNull(result, "get result");
LOG.debug("get: {}", result);
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIT.java
index 44b33254c47f..b819bd0e347a 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveChangesIT.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.google.drive;
import java.util.List;
import com.google.api.services.drive.model.Change;
-import com.google.api.services.drive.model.ChangeList;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.drive.internal.DriveChangesApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
@@ -44,7 +43,7 @@ public class DriveChangesIT extends AbstractGoogleDriveTestSupport {
@Test
public void testGet() {
- final ChangeList list = requestBody("direct://LIST", null);
+ final com.google.api.services.drive.model.ChangeList list = requestBody("direct://LIST", null);
List<Change> items = list.getChanges();
assumeFalse(items.isEmpty());
@@ -52,7 +51,7 @@ public class DriveChangesIT extends AbstractGoogleDriveTestSupport {
String id = change.getDriveId();
// using String message body for single parameter "changeId"
- final Change result = requestBody("direct://GET", id);
+ final com.google.api.services.drive.model.Change result = requestBody("direct://GET", id);
assertNotNull(result, "get result");
LOG.debug("get: {}", result);
@@ -60,7 +59,7 @@ public class DriveChangesIT extends AbstractGoogleDriveTestSupport {
@Test
public void testList() {
- final ChangeList result = requestBody("direct://LIST", null);
+ final com.google.api.services.drive.model.ChangeList result = requestBody("direct://LIST", null);
assertNotNull(result, "list result");
LOG.debug("list: {}", result);
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIT.java
index e4261ec5e104..06b8c67cb024 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveCommentsIT.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import com.google.api.services.drive.model.Comment;
-import com.google.api.services.drive.model.CommentList;
import com.google.api.services.drive.model.File;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.drive.internal.DriveCommentsApiMethod;
@@ -56,7 +55,7 @@ public class DriveCommentsIT extends AbstractGoogleDriveTestSupport {
// parameter type is String
headers.put("CamelGoogleDrive.fileId", fileId);
// parameter type is com.google.api.services.drive.model.Comment
- Comment comment = new Comment();
+ com.google.api.services.drive.model.Comment comment = new com.google.api.services.drive.model.Comment();
comment.setContent("Camel rocks!");
headers.put("CamelGoogleDrive.content", comment);
@@ -64,7 +63,7 @@ public class DriveCommentsIT extends AbstractGoogleDriveTestSupport {
// 3. get a list of comments on the file
// using String message body for single parameter "fileId"
- CommentList result1 = requestBody("direct://LIST", fileId);
+ com.google.api.services.drive.model.CommentList result1 = requestBody("direct://LIST", fileId);
assertNotNull(result1.get("items"));
LOG.debug("list: {}", result1);
@@ -78,7 +77,7 @@ public class DriveCommentsIT extends AbstractGoogleDriveTestSupport {
// parameter type is String
headers.put("CamelGoogleDrive.commentId", comment2.getId());
- final Comment result3 = requestBodyAndHeaders("direct://GET", null, headers);
+ final com.google.api.services.drive.model.Comment result3 = requestBodyAndHeaders("direct://GET", null, headers);
assertNotNull(result3, "get result");
@@ -101,7 +100,7 @@ public class DriveCommentsIT extends AbstractGoogleDriveTestSupport {
headers.put("CamelGoogleDrive.commentId", comment2.getId());
try {
- final Comment result4 = requestBodyAndHeaders("direct://GET", null, headers);
+ final com.google.api.services.drive.model.Comment result4 = requestBodyAndHeaders("direct://GET", null, headers);
fail("Should have thrown an exception.");
} catch (Exception e) {
// Likely safe to ignore in this context
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java
index b8945bcf653a..cb1e221d1328 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveFilesIT.java
@@ -23,7 +23,6 @@ import java.util.Map;
import com.google.api.client.http.FileContent;
import com.google.api.client.util.DateTime;
-import com.google.api.services.drive.Drive;
import com.google.api.services.drive.model.File;
import com.google.api.services.drive.model.FileList;
import org.apache.camel.builder.RouteBuilder;
@@ -261,7 +260,7 @@ public class DriveFilesIT extends AbstractGoogleDriveTestSupport {
// parameter type is com.google.api.services.drive.model.Channel
headers.put("CamelGoogleDrive.contentChannel", null);
- final Drive.Files.Watch result = requestBodyAndHeaders("direct://WATCH", null, headers);
+ final com.google.api.services.drive.Drive.Files.Watch result = requestBodyAndHeaders("direct://WATCH", null, headers);
assertNotNull(result, "watch result");
LOG.debug("watch: {}", result);
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIT.java
index a05d6a5381f5..59ff033cab4f 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DrivePermissionsIT.java
@@ -43,7 +43,7 @@ public class DrivePermissionsIT extends AbstractGoogleDriveTestSupport {
String fileId = testFile.getId();
// using String message body for single parameter "fileId"
- final PermissionList result = requestBody("direct://LIST", fileId);
+ final com.google.api.services.drive.model.PermissionList result = requestBody("direct://LIST", fileId);
assertNotNull(result, "list result");
LOG.debug("list: {}", result);
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIT.java
index 2a3fc7fc9961..fc1a4085baae 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRepliesIT.java
@@ -20,9 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import com.google.api.services.drive.model.Comment;
-import com.google.api.services.drive.model.CommentList;
import com.google.api.services.drive.model.File;
-import com.google.api.services.drive.model.Reply;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.drive.internal.DriveFilesApiMethod;
import org.apache.camel.component.google.drive.internal.DriveRepliesApiMethod;
@@ -56,7 +54,7 @@ public class DriveRepliesIT extends AbstractGoogleDriveTestSupport {
// parameter type is String
headers.put("CamelGoogleDrive.fileId", fileId);
// parameter type is com.google.api.services.drive.model.Comment
- Comment comment = new Comment();
+ com.google.api.services.drive.model.Comment comment = new com.google.api.services.drive.model.Comment();
comment.setContent("Camel rocks!");
headers.put("CamelGoogleDrive.content", comment);
@@ -64,7 +62,7 @@ public class DriveRepliesIT extends AbstractGoogleDriveTestSupport {
// 3. get a list of comments on the file
// using String message body for single parameter "fileId"
- CommentList result1 = requestBody("direct://LIST_COMMENTS", fileId);
+ com.google.api.services.drive.model.CommentList result1 = requestBody("direct://LIST_COMMENTS", fileId);
assertNotNull(result1.get("items"));
LOG.debug("list: {}", result1);
@@ -79,7 +77,7 @@ public class DriveRepliesIT extends AbstractGoogleDriveTestSupport {
// parameter type is String
headers.put("CamelGoogleDrive.commentId", commentId);
// parameter type is com.google.api.services.drive.model.CommentReply
- Reply reply = new Reply();
+ com.google.api.services.drive.model.Reply reply = new com.google.api.services.drive.model.Reply();
reply.setContent("I know :-)");
headers.put("CamelGoogleDrive.content", reply);
@@ -93,7 +91,7 @@ public class DriveRepliesIT extends AbstractGoogleDriveTestSupport {
// parameter type is String
headers.put("CamelGoogleDrive.commentId", commentId);
- final Reply result
+ final com.google.api.services.drive.model.Reply result
= requestBodyAndHeaders("direct://LIST", null, headers);
assertNotNull(result, "list result");
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIT.java
index 4d4db78f535b..12d59ca4577c 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/DriveRevisionsIT.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.google.drive;
import com.google.api.services.drive.model.File;
-import com.google.api.services.drive.model.RevisionList;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.drive.internal.DriveRevisionsApiMethod;
import org.apache.camel.component.google.drive.internal.GoogleDriveApiCollection;
@@ -45,7 +44,7 @@ public class DriveRevisionsIT extends AbstractGoogleDriveTestSupport {
String fileId = testFile.getId();
// using String message body for single parameter "fileId"
- final RevisionList result = requestBody("direct://LIST", fileId);
+ final com.google.api.services.drive.model.RevisionList result = requestBody("direct://LIST", fileId);
assertNotNull(result, "list result");
LOG.debug("list: {}", result);
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java
index 53a828c690ae..ec99adc322bd 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FileConverterIT.java
@@ -56,7 +56,7 @@ public class FileConverterIT extends AbstractGoogleDriveTestSupport {
MockEndpoint.assertIsSatisfied(context);
- File file = mock.getReceivedExchanges().get(0).getIn().getBody(File.class);
+ File file = mock.getReceivedExchanges().get(0).getIn().getBody(com.google.api.services.drive.model.File.class);
assertEquals("Hello!", context.getTypeConverter().convertTo(String.class, mock.getReceivedExchanges().get(0), file));
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIT.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIT.java
index 4660002ba1a4..18780c97862f 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIT.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/FilesConsumerIT.java
@@ -51,7 +51,7 @@ public class FilesConsumerIT extends AbstractGoogleDriveTestSupport {
MockEndpoint.assertIsSatisfied(context);
FileList fileList
- = mock.getReceivedExchanges().get(0).getIn().getBody(FileList.class);
+ = mock.getReceivedExchanges().get(0).getIn().getBody(com.google.api.services.drive.model.FileList.class);
assertTrue(fileInList(fileId, fileList));
}
diff --git a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java
index 123d0945be41..ac713edbe0f3 100644
--- a/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java
+++ b/components/camel-google/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/GoogleDriveFilesConverterTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.google.drive;
-import com.google.api.services.drive.model.File;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
@@ -44,7 +43,7 @@ public class GoogleDriveFilesConverterTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
Message result = mock.getExchanges().get(0).getIn();
- assertTrue(result.getBody() instanceof File,
+ assertTrue(result.getBody() instanceof com.google.api.services.drive.model.File,
"We should get google file instance here");
}
@@ -54,7 +53,7 @@ public class GoogleDriveFilesConverterTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
- from("file://target/file-test?initialDelay=2000").convertBodyTo(File.class)
+ from("file://target/file-test?initialDelay=2000").convertBodyTo(com.google.api.services.drive.model.File.class)
.to("mock:result");
}
};
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
index 5269c8d34f1d..1b40dfec21a1 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
@@ -72,7 +72,7 @@ public class GoogleMailStreamConsumer extends ScheduledBatchPollingConsumer {
@Override
protected int poll() throws Exception {
- Gmail.Users.Messages.List request = getClient().users().messages().list("me");
+ com.google.api.services.gmail.Gmail.Users.Messages.List request = getClient().users().messages().list("me");
if (ObjectHelper.isNotEmpty(getConfiguration().getQuery())) {
request.setQ(getConfiguration().getQuery());
}
@@ -180,7 +180,7 @@ public class GoogleMailStreamConsumer extends ScheduledBatchPollingConsumer {
}
}
- public Exchange createExchange(ExchangePattern pattern, Message mail) {
+ public Exchange createExchange(ExchangePattern pattern, com.google.api.services.gmail.model.Message mail) {
Exchange exchange = createExchange(true);
exchange.setPattern(pattern);
org.apache.camel.Message message = exchange.getIn();
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIT.java
index be93f6dd5573..707ff195ee0d 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.google.mail;
-import com.google.api.services.gmail.model.Profile;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.mail.internal.GmailUsersApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
@@ -41,7 +40,7 @@ public class GmailUsersIT extends AbstractGoogleMailTestSupport {
@Test
public void testGetProfile() {
// using String message body for single parameter "userId"
- final Profile result = requestBody("direct://GETPROFILE", CURRENT_USERID);
+ final com.google.api.services.gmail.model.Profile result = requestBody("direct://GETPROFILE", CURRENT_USERID);
assertNotNull(result, "getProfile result");
assertNotNull(result.getEmailAddress(), "Should be email address associated with current account");
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIT.java
index e527fbe0fe20..801a47bceaa5 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersLabelsIT.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import com.google.api.services.gmail.model.Label;
-import com.google.api.services.gmail.model.ListLabelsResponse;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.mail.internal.GmailUsersLabelsApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
@@ -47,7 +46,7 @@ public class GmailUsersLabelsIT extends AbstractGoogleMailTestSupport {
@Test
public void testLabels() {
// using String message body for single parameter "userId"
- ListLabelsResponse labels = requestBody("direct://LIST", CURRENT_USERID);
+ com.google.api.services.gmail.model.ListLabelsResponse labels = requestBody("direct://LIST", CURRENT_USERID);
String labelId = null;
if (getTestLabel(labels) == null) {
@@ -59,7 +58,7 @@ public class GmailUsersLabelsIT extends AbstractGoogleMailTestSupport {
// parameter type is com.google.api.services.gmail.model.Label
headers.put("CamelGoogleMail.content", label);
- Label result = requestBodyAndHeaders("direct://CREATE", null, headers);
+ com.google.api.services.gmail.model.Label result = requestBodyAndHeaders("direct://CREATE", null, headers);
assertNotNull(result, "create result");
labelId = result.getId();
@@ -84,7 +83,7 @@ public class GmailUsersLabelsIT extends AbstractGoogleMailTestSupport {
assertNull(getTestLabel(labels));
}
- private Label getTestLabel(ListLabelsResponse labels) {
+ private Label getTestLabel(com.google.api.services.gmail.model.ListLabelsResponse labels) {
for (Label label : labels.getLabels()) {
if (CAMEL_TEST_LABEL.equals(label.getName())) {
return label;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
index b14e9d41d2eb..3d95e2327e4e 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
@@ -29,7 +29,6 @@ import jakarta.mail.internet.MimeMessage;
import com.google.api.services.gmail.model.ListMessagesResponse;
import com.google.api.services.gmail.model.Message;
-import com.google.api.services.gmail.model.Profile;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.mail.internal.GmailUsersMessagesApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
@@ -67,7 +66,7 @@ public class GmailUsersMessagesIT extends AbstractGoogleMailTestSupport {
// parameter type is com.google.api.services.gmail.model.Message
headers.put("CamelGoogleMail.content", testEmail);
- Message result = requestBodyAndHeaders("direct://SEND", null, headers);
+ com.google.api.services.gmail.model.Message result = requestBodyAndHeaders("direct://SEND", null, headers);
assertNotNull(result, "send result");
String testEmailId = result.getId();
@@ -137,7 +136,7 @@ public class GmailUsersMessagesIT extends AbstractGoogleMailTestSupport {
}
private Message createTestEmail() throws MessagingException, IOException {
- Profile profile
+ com.google.api.services.gmail.model.Profile profile
= requestBody("google-mail://users/getProfile?inBody=userId", CURRENT_USERID);
Properties props = new Properties();
Session session = Session.getDefaultInstance(props, null);
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
index 573e59abcef1..5992bc57a862 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
@@ -26,9 +26,7 @@ import jakarta.mail.MessagingException;
import jakarta.mail.Session;
import jakarta.mail.internet.MimeMessage;
-import com.google.api.services.gmail.model.ListThreadsResponse;
import com.google.api.services.gmail.model.Message;
-import com.google.api.services.gmail.model.Profile;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.google.mail.internal.GmailUsersThreadsApiMethod;
import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection;
@@ -53,7 +51,7 @@ public class GmailUsersThreadsIT extends AbstractGoogleMailTestSupport {
= GoogleMailApiCollection.getCollection().getApiName(GmailUsersThreadsApiMethod.class).getName();
private Message createThreadedTestEmail(String previousThreadId) throws MessagingException, IOException {
- Profile profile
+ com.google.api.services.gmail.model.Profile profile
= requestBody("google-mail://users/getProfile?inBody=userId", CURRENT_USERID);
Properties props = new Properties();
Session session = Session.getDefaultInstance(props, null);
@@ -93,7 +91,7 @@ public class GmailUsersThreadsIT extends AbstractGoogleMailTestSupport {
headers.put("CamelGoogleMail.q", "subject:\"Hello from camel-google-mail\"");
// using String message body for single parameter "userId"
- ListThreadsResponse result
+ com.google.api.services.gmail.model.ListThreadsResponse result
= requestBodyAndHeaders("direct://LIST", CURRENT_USERID, headers);
assertNotNull(result, "list result");
diff --git a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/localstorage/FakeStorageRpc.java b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/localstorage/FakeStorageRpc.java
index c11b76c75e30..9c2f320a9aa5 100644
--- a/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/localstorage/FakeStorageRpc.java
+++ b/components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/localstorage/FakeStorageRpc.java
@@ -57,7 +57,6 @@ import com.google.cloud.storage.Storage;
import com.google.cloud.storage.StorageException;
import com.google.cloud.storage.spi.v1.StorageRpc;
import com.google.cloud.storage.testing.StorageRpcTestBase;
-import com.google.common.io.ByteStreams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -146,7 +145,7 @@ class FakeStorageRpc extends StorageRpcTestBase {
object.setUpdated(now());
metadata.put(key, object);
try {
- contents.put(key, ByteStreams.toByteArray(content));
+ contents.put(key, com.google.common.io.ByteStreams.toByteArray(content));
} catch (IOException e) {
throw new StorageException(e);
}
diff --git a/components/camel-google/camel-google-vertexai/src/main/java/org/apache/camel/component/google/vertexai/GoogleVertexAIProducer.java b/components/camel-google/camel-google-vertexai/src/main/java/org/apache/camel/component/google/vertexai/GoogleVertexAIProducer.java
index 25fabca07a4d..14e2aa1c878d 100644
--- a/components/camel-google/camel-google-vertexai/src/main/java/org/apache/camel/component/google/vertexai/GoogleVertexAIProducer.java
+++ b/components/camel-google/camel-google-vertexai/src/main/java/org/apache/camel/component/google/vertexai/GoogleVertexAIProducer.java
@@ -573,8 +573,8 @@ public class GoogleVertexAIProducer extends DefaultProducer {
try {
Map<String, Object> response = OBJECT_MAPPER.readValue(responseJson, Map.class);
Object content = response.get("content");
- if (content instanceof List) {
- List<Map<String, Object>> contentList = (List<Map<String, Object>>) content;
+ if (content instanceof java.util.List) {
+ java.util.List<Map<String, Object>> contentList = (java.util.List<Map<String, Object>>) content;
StringBuilder sb = new StringBuilder();
for (Map<String, Object> block : contentList) {
if ("text".equals(block.get("type"))) {
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/json/NodeToJsonHelper.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/json/NodeToJsonHelper.java
index 9c7c3efac8ce..b88353b78a9b 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/json/NodeToJsonHelper.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/json/NodeToJsonHelper.java
@@ -16,9 +16,7 @@
*/
package org.apache.camel.groovy.json;
-import java.util.LinkedHashMap;
import java.util.List;
-import java.util.stream.Collectors;
import groovy.util.Node;
import groovy.util.NodeList;
@@ -57,10 +55,10 @@ class NodeToJsonHelper {
}
// Group children by name
children.stream()
- .collect(Collectors.groupingBy(
+ .collect(java.util.stream.Collectors.groupingBy(
Node::name,
- LinkedHashMap::new,
- Collectors.toList()))
+ java.util.LinkedHashMap::new,
+ java.util.stream.Collectors.toList()))
.forEach((name, nodes) -> {
if (nodes.size() == 1) {
Node child = nodes.get(0);
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
index 5ae677564c9f..6bf4fe9ddf3b 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.hazelcast;
-import java.util.Date;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -66,7 +65,7 @@ public class HazelcastReliableTopicConsumerTest extends HazelcastCamelTestSuppor
out.expectedMessageCount(1);
verify(reliableTopic).addMessageListener(argument.capture());
- final Message<String> msg = new Message<>("foo", "foo", new Date().getTime(), null);
+ final Message<String> msg = new Message<>("foo", "foo", new java.util.Date().getTime(), null);
argument.getValue().onMessage(msg);
MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
index 902eeedcd27b..00ca0b8ebc29 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.hazelcast;
-import java.util.Date;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -66,7 +65,7 @@ public class HazelcastTopicConsumerTest extends HazelcastCamelTestSupport {
out.expectedMessageCount(1);
verify(topic).addMessageListener(argument.capture());
- final Message<String> msg = new Message<>("foo", "foo", new Date().getTime(), null);
+ final Message<String> msg = new Message<>("foo", "foo", new java.util.Date().getTime(), null);
argument.getValue().onMessage(msg);
MockEndpoint.assertIsSatisfied(context, 2000, TimeUnit.MILLISECONDS);
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/Hl7TerserLanguage.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/Hl7TerserLanguage.java
index 2a2d20803ad0..a4170bbd65cd 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/Hl7TerserLanguage.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/Hl7TerserLanguage.java
@@ -23,13 +23,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.annotations.Language;
import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.support.SingleInputTypedLanguageSupport;
import org.apache.camel.support.builder.ExpressionBuilder;
import org.apache.camel.util.ObjectHelper;
-@Language("hl7terser")
+@org.apache.camel.spi.annotations.Language("hl7terser")
public class Hl7TerserLanguage extends SingleInputTypedLanguageSupport {
public static Expression terser(final String expression) {
diff --git a/components/camel-http-base/src/main/java/org/apache/camel/http/base/cookie/ExchangeCookieHandler.java b/components/camel-http-base/src/main/java/org/apache/camel/http/base/cookie/ExchangeCookieHandler.java
index 5fa8f43e0d05..0816913b6f7d 100644
--- a/components/camel-http-base/src/main/java/org/apache/camel/http/base/cookie/ExchangeCookieHandler.java
+++ b/components/camel-http-base/src/main/java/org/apache/camel/http/base/cookie/ExchangeCookieHandler.java
@@ -32,7 +32,7 @@ public class ExchangeCookieHandler extends BaseCookieHandler {
@Override
protected CookieManager getCookieManager(Exchange exchange) {
Object handlerObj = exchange.getProperty(Exchange.COOKIE_HANDLER);
- if (handlerObj instanceof CookieManager manager) {
+ if (handlerObj instanceof java.net.CookieManager manager) {
return manager;
} else {
CookieManager handler = new CookieManager();
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 8210112d1c7e..770d2cee17a8 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -50,7 +50,6 @@ import org.apache.camel.StreamCache;
import org.apache.camel.attachment.AttachmentMessage;
import org.apache.camel.attachment.CamelFileDataSource;
import org.apache.camel.converter.stream.CachedOutputStream;
-import org.apache.camel.http.base.HttpHeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.GZIPHelper;
@@ -92,7 +91,7 @@ public class DefaultHttpBinding implements HttpBinding {
private boolean mapHttpMessageBody = true;
private boolean mapHttpMessageHeaders = true;
private boolean mapHttpMessageFormUrlEncodedBody = true;
- private HeaderFilterStrategy headerFilterStrategy = new HttpHeaderFilterStrategy();
+ private HeaderFilterStrategy headerFilterStrategy = new org.apache.camel.http.base.HttpHeaderFilterStrategy();
private String fileNameExtWhitelist;
public DefaultHttpBinding() {
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 84856171b86b..e00fd648b182 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -18,7 +18,6 @@ package org.apache.camel.http.common;
import java.net.URI;
-import org.apache.camel.http.base.HttpHeaderFilterStrategy;
import org.apache.camel.http.base.cookie.CookieHandler;
import org.apache.camel.spi.EndpointServiceLocation;
import org.apache.camel.spi.HeaderFilterStrategy;
@@ -41,7 +40,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint
URI httpUri;
@UriParam(label = "common,advanced",
description = "To use a custom HeaderFilterStrategy to filter header to and from Camel message.")
- HeaderFilterStrategy headerFilterStrategy = new HttpHeaderFilterStrategy();
+ HeaderFilterStrategy headerFilterStrategy = new org.apache.camel.http.base.HttpHeaderFilterStrategy();
@UriParam(label = "common,advanced",
description = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.")
HttpBinding httpBinding;
diff --git a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
index b071ea546385..73db39b91429 100644
--- a/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
+++ b/components/camel-http-common/src/test/java/org/apache/camel/http/common/cookie/CookieHandlerTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.http.base.cookie.CookieHandler;
import org.apache.camel.http.base.cookie.ExchangeCookieHandler;
import org.apache.camel.http.base.cookie.InstanceCookieHandler;
-import org.apache.camel.support.DefaultExchange;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
@@ -69,7 +68,7 @@ public class CookieHandlerTest extends CamelTestSupport {
@BeforeEach
public void setupTest() throws Exception {
- exchange = new DefaultExchange(context);
+ exchange = new org.apache.camel.support.DefaultExchange(context);
}
@ParameterizedTest
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
index 2be6654faa84..911ffde2ba5b 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.component.http.handler.BasicValidationHandler;
-import org.apache.camel.http.common.HttpMethods;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.junit.jupiter.api.Test;
@@ -122,7 +121,7 @@ public class HttpProducerSelectMethodTest extends BaseHttpTest {
exchange = producer.createExchange();
exchange.getIn().setBody("");
- exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.GET);
+ exchange.getIn().setHeader(Exchange.HTTP_METHOD, org.apache.camel.http.common.HttpMethods.GET);
assertDoesNotThrow(() -> runProducer(producer));
}
diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DMSComponent.java b/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DMSComponent.java
index ef7df0f95cf5..f8bcd301a65d 100644
--- a/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DMSComponent.java
+++ b/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DMSComponent.java
@@ -19,10 +19,9 @@ package org.apache.camel.component.huaweicloud.dms;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("hwcloud-dms")
+@org.apache.camel.spi.annotations.Component("hwcloud-dms")
public class DMSComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
diff --git a/components/camel-huawei/camel-huaweicloud-frs/src/main/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionComponent.java b/components/camel-huawei/camel-huaweicloud-frs/src/main/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionComponent.java
index cff64bf29061..ce464c5d00a8 100644
--- a/components/camel-huawei/camel-huaweicloud-frs/src/main/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionComponent.java
+++ b/components/camel-huawei/camel-huaweicloud-frs/src/main/java/org/apache/camel/component/huaweicloud/frs/FaceRecognitionComponent.java
@@ -19,10 +19,9 @@ package org.apache.camel.component.huaweicloud.frs;
import java.util.*;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("hwcloud-frs")
+@org.apache.camel.spi.annotations.Component("hwcloud-frs")
public class FaceRecognitionComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
diff --git a/components/camel-huawei/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphComponent.java b/components/camel-huawei/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphComponent.java
index 605ba33f2ffa..dc5bdbef28a7 100644
--- a/components/camel-huawei/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphComponent.java
+++ b/components/camel-huawei/camel-huaweicloud-functiongraph/src/main/java/org/apache/camel/FunctionGraphComponent.java
@@ -18,10 +18,9 @@ package org.apache.camel;
import java.util.Map;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("hwcloud-functiongraph")
+@org.apache.camel.spi.annotations.Component("hwcloud-functiongraph")
public class FunctionGraphComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
diff --git a/components/camel-huawei/camel-huaweicloud-iam/src/main/java/org/apache/camel/component/huaweicloud/iam/IAMComponent.java b/components/camel-huawei/camel-huaweicloud-iam/src/main/java/org/apache/camel/component/huaweicloud/iam/IAMComponent.java
index 648c2b689773..24b3077433be 100644
--- a/components/camel-huawei/camel-huaweicloud-iam/src/main/java/org/apache/camel/component/huaweicloud/iam/IAMComponent.java
+++ b/components/camel-huawei/camel-huaweicloud-iam/src/main/java/org/apache/camel/component/huaweicloud/iam/IAMComponent.java
@@ -19,10 +19,9 @@ package org.apache.camel.component.huaweicloud.iam;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("hwcloud-iam")
+@org.apache.camel.spi.annotations.Component("hwcloud-iam")
public class IAMComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
diff --git a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java
index c081472043e0..40159c3bbd2a 100644
--- a/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java
+++ b/components/camel-huawei/camel-huaweicloud-imagerecognition/src/main/java/org/apache/camel/component/huaweicloud/image/ImageRecognitionComponent.java
@@ -19,10 +19,9 @@ package org.apache.camel.component.huaweicloud.image;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("hwcloud-imagerecognition")
+@org.apache.camel.spi.annotations.Component("hwcloud-imagerecognition")
public class ImageRecognitionComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
diff --git a/components/camel-huawei/camel-huaweicloud-obs/src/main/java/org/apache/camel/component/huaweicloud/obs/OBSComponent.java b/components/camel-huawei/camel-huaweicloud-obs/src/main/java/org/apache/camel/component/huaweicloud/obs/OBSComponent.java
index f25d47c1bc83..2b623de36f41 100644
--- a/components/camel-huawei/camel-huaweicloud-obs/src/main/java/org/apache/camel/component/huaweicloud/obs/OBSComponent.java
+++ b/components/camel-huawei/camel-huaweicloud-obs/src/main/java/org/apache/camel/component/huaweicloud/obs/OBSComponent.java
@@ -19,10 +19,9 @@ package org.apache.camel.component.huaweicloud.obs;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.HealthCheckComponent;
-@Component("hwcloud-obs")
+@org.apache.camel.spi.annotations.Component("hwcloud-obs")
public class OBSComponent extends HealthCheckComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
diff --git a/components/camel-huawei/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationComponent.java b/components/camel-huawei/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationComponent.java
index fc0f4943651c..812f554c587c 100644
--- a/components/camel-huawei/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationComponent.java
+++ b/components/camel-huawei/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationComponent.java
@@ -19,10 +19,9 @@ package org.apache.camel.component.huaweicloud.smn;
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("hwcloud-smn")
+@org.apache.camel.spi.annotations.Component("hwcloud-smn")
public class SimpleNotificationComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
diff --git a/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java
index 233723ac43f7..6af6fa043b7e 100644
--- a/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java
+++ b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java
@@ -28,9 +28,7 @@ import com.ibm.cloud.objectstorage.services.s3.model.ListObjectsV2Request;
import com.ibm.cloud.objectstorage.services.s3.model.ListObjectsV2Result;
import com.ibm.cloud.objectstorage.services.s3.model.S3Object;
import com.ibm.cloud.objectstorage.services.s3.model.S3ObjectSummary;
-import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.spi.Synchronization;
@@ -125,15 +123,15 @@ public class IBMCOSConsumer extends ScheduledBatchPollingConsumer {
// only loop if we are started (allowed to run)
final Exchange exchange = ObjectHelper.cast(Exchange.class, exchanges.poll());
// add current index and total as properties
- exchange.setProperty(ExchangePropertyKey.BATCH_INDEX, index);
- exchange.setProperty(ExchangePropertyKey.BATCH_SIZE, total);
- exchange.setProperty(ExchangePropertyKey.BATCH_COMPLETE, index == total - 1);
+ exchange.setProperty(org.apache.camel.ExchangePropertyKey.BATCH_INDEX, index);
+ exchange.setProperty(org.apache.camel.ExchangePropertyKey.BATCH_SIZE, total);
+ exchange.setProperty(org.apache.camel.ExchangePropertyKey.BATCH_COMPLETE, index == total - 1);
// update pending number of exchanges
pendingExchanges = total - index - 1;
// use default consumer callback
- AsyncCallback cb = defaultConsumerCallback(exchange, true);
+ org.apache.camel.AsyncCallback cb = defaultConsumerCallback(exchange, true);
getAsyncProcessor().process(exchange, cb);
}
diff --git a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java
index 1c26f3914fb6..bbbfdd5a3ff4 100644
--- a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java
+++ b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java
@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.concurrent.TimeUnit;
-import com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -65,8 +64,8 @@ public class IBMCOSConsumerIT extends IBMCOSTestSupport {
// Upload an object
byte[] contentBytes = testContent.getBytes();
- ObjectMetadata metadata
- = new ObjectMetadata();
+ com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata metadata
+ = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata();
metadata.setContentLength(contentBytes.length);
cosClient.putObject(bucketName, testKey, new ByteArrayInputStream(contentBytes), metadata);
@@ -103,8 +102,8 @@ public class IBMCOSConsumerIT extends IBMCOSTestSupport {
final String key = "multi-test-" + i + ".txt";
final String content = "Content " + i;
byte[] bytes = content.getBytes();
- ObjectMetadata meta
- = new ObjectMetadata();
+ com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata meta
+ = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata();
meta.setContentLength(bytes.length);
cosClient.putObject(bucketName, key, new ByteArrayInputStream(bytes), meta);
}
diff --git a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java
index 273586a5383e..839ee29a8c1d 100644
--- a/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java
+++ b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.ibm.cos.integration;
import java.io.ByteArrayInputStream;
import java.util.concurrent.TimeUnit;
-import com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -100,8 +99,8 @@ public class IBMCOSConsumerMoveAfterReadIT extends IBMCOSTestSupport {
// Upload an object
byte[] contentBytes = testContent.getBytes();
- ObjectMetadata metadata
- = new ObjectMetadata();
+ com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata metadata
+ = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata();
metadata.setContentLength(contentBytes.length);
cosClient.putObject(bucketName, testKey, new ByteArrayInputStream(contentBytes), metadata);
@@ -137,8 +136,8 @@ public class IBMCOSConsumerMoveAfterReadIT extends IBMCOSTestSupport {
// Upload an object
byte[] contentBytes = testContent.getBytes();
- ObjectMetadata metadata
- = new ObjectMetadata();
+ com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata metadata
+ = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata();
metadata.setContentLength(contentBytes.length);
cosClient.putObject(bucketName, testKey, new ByteArrayInputStream(contentBytes), metadata);
diff --git a/components/camel-ibm/camel-ibm-watson-discovery/src/main/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryProducer.java b/components/camel-ibm/camel-ibm-watson-discovery/src/main/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryProducer.java
index c1088ffec5f9..4b459cc0b4f9 100644
--- a/components/camel-ibm/camel-ibm-watson-discovery/src/main/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryProducer.java
+++ b/components/camel-ibm/camel-ibm-watson-discovery/src/main/java/org/apache/camel/component/ibm/watson/discovery/WatsonDiscoveryProducer.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.ibm.watson.discovery;
import java.io.InputStream;
-import java.util.Collections;
import com.ibm.watson.discovery.v2.Discovery;
import com.ibm.watson.discovery.v2.model.*;
@@ -121,7 +120,7 @@ public class WatsonDiscoveryProducer extends DefaultProducer {
collectionId = getEndpoint().getConfiguration().getCollectionId();
}
if (collectionId != null) {
- builder.collectionIds(Collections.singletonList(collectionId));
+ builder.collectionIds(java.util.Collections.singletonList(collectionId));
}
QueryResponse result = discovery.query(builder.build()).execute().getResult();
diff --git a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/main/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextProducer.java b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/main/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextProducer.java
index c732fecfbe7f..e401268cff0b 100644
--- a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/main/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextProducer.java
+++ b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/main/java/org/apache/camel/component/ibm/watson/stt/WatsonSpeechToTextProducer.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.util.List;
import com.ibm.watson.speech_to_text.v1.SpeechToText;
-import com.ibm.watson.speech_to_text.v1.model.GetLanguageModelOptions;
import com.ibm.watson.speech_to_text.v1.model.GetModelOptions;
import com.ibm.watson.speech_to_text.v1.model.LanguageModel;
import com.ibm.watson.speech_to_text.v1.model.LanguageModels;
@@ -239,8 +238,8 @@ public class WatsonSpeechToTextProducer extends DefaultProducer {
LOG.trace("Getting custom language model: {}", modelId);
- GetLanguageModelOptions options
- = new GetLanguageModelOptions.Builder()
+ com.ibm.watson.speech_to_text.v1.model.GetLanguageModelOptions options
+ = new com.ibm.watson.speech_to_text.v1.model.GetLanguageModelOptions.Builder()
.customizationId(modelId)
.build();
diff --git a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextIT.java b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextIT.java
index bcf6d1e3fd57..709d0ba5e7ab 100644
--- a/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextIT.java
+++ b/components/camel-ibm/camel-ibm-watson-speech-to-text/src/test/java/org/apache/camel/component/ibm/watson/stt/integration/WatsonSpeechToTextIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.ibm.watson.stt.integration;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -203,7 +202,7 @@ public class WatsonSpeechToTextIT extends WatsonSpeechToTextTestSupport {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
baos.write(audioData);
AudioInputStream audioInputStream
- = new AudioInputStream(new ByteArrayInputStream(audioData), format, numSamples);
+ = new AudioInputStream(new java.io.ByteArrayInputStream(audioData), format, numSamples);
// Write to WAV file
AudioSystem.write(audioInputStream, AudioFileFormat.Type.WAVE, outputFile);
diff --git a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
index c4498055f6d6..29c59de6c66c 100644
--- a/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
+++ b/components/camel-ical/src/test/java/org/apache/camel/component/ical/ICalDataFormatTest.java
@@ -136,7 +136,7 @@ public class ICalDataFormatTest extends CamelTestSupport {
meeting.add(dev2);
// Create a calendar
- Calendar icsCalendar = new Calendar();
+ net.fortuna.ical4j.model.Calendar icsCalendar = new net.fortuna.ical4j.model.Calendar();
icsCalendar.add(ImmutableVersion.VERSION_2_0);
icsCalendar.add(new ProdId("-//Events Calendar//iCal4j 1.0//EN"));
icsCalendar.add(ImmutableCalScale.GREGORIAN);
diff --git a/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/IggyFetchRecords.java b/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/IggyFetchRecords.java
index b342e868eee5..4253fdcea54c 100644
--- a/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/IggyFetchRecords.java
+++ b/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/IggyFetchRecords.java
@@ -33,7 +33,6 @@ import org.apache.iggy.consumergroup.Consumer;
import org.apache.iggy.identifier.ConsumerId;
import org.apache.iggy.identifier.StreamId;
import org.apache.iggy.identifier.TopicId;
-import org.apache.iggy.message.Message;
import org.apache.iggy.message.PolledMessages;
import org.apache.iggy.message.PollingStrategy;
import org.slf4j.Logger;
@@ -134,7 +133,7 @@ public class IggyFetchRecords implements Runnable {
polledMessages.partitionId(),
configuration.isAutoCommit() ? polledMessages.currentOffset() : offset);
- for (Message message : polledMessages.messages()) {
+ for (org.apache.iggy.message.Message message : polledMessages.messages()) {
Exchange exchange = createExchange(message);
try {
iggyConsumer.getProcessor().process(exchange);
@@ -158,7 +157,7 @@ public class IggyFetchRecords implements Runnable {
}
}
- private Exchange createExchange(Message message) {
+ private Exchange createExchange(org.apache.iggy.message.Message message) {
Exchange exchange = iggyConsumer.createExchange(true);
exchange.getIn().setBody(new String(message.payload())); // TODO is it ok?
diff --git a/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/client/IggyClientFactory.java b/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/client/IggyClientFactory.java
index bcda20421537..9a65969e12dd 100644
--- a/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/client/IggyClientFactory.java
+++ b/components/camel-iggy/src/main/java/org/apache/camel/component/iggy/client/IggyClientFactory.java
@@ -16,17 +16,13 @@
*/
package org.apache.camel.component.iggy.client;
-import java.util.function.Consumer;
-
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.commons.pool2.BasePooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.DefaultPooledObject;
import org.apache.iggy.client.blocking.IggyBaseClient;
import org.apache.iggy.client.blocking.http.IggyHttpClient;
-import org.apache.iggy.client.blocking.http.IggyHttpClientBuilder;
import org.apache.iggy.client.blocking.tcp.IggyTcpClient;
-import org.apache.iggy.client.blocking.tcp.IggyTcpClientBuilder;
public class IggyClientFactory extends BasePooledObjectFactory<IggyBaseClient> {
@@ -70,7 +66,7 @@ public class IggyClientFactory extends BasePooledObjectFactory<IggyBaseClient> {
}
private void configureTls(
- IggyTcpClientBuilder builder) {
+ org.apache.iggy.client.blocking.tcp.IggyTcpClientBuilder builder) {
if (sslContextParameters != null) {
builder.enableTls();
applyTlsCertificateIfPresent(builder::tlsCertificate);
@@ -83,7 +79,7 @@ public class IggyClientFactory extends BasePooledObjectFactory<IggyBaseClient> {
}
private void configureTls(
- IggyHttpClientBuilder builder) {
+ org.apache.iggy.client.blocking.http.IggyHttpClientBuilder builder) {
if (sslContextParameters != null) {
builder.enableTls();
applyTlsCertificateIfPresent(builder::tlsCertificate);
@@ -95,7 +91,7 @@ public class IggyClientFactory extends BasePooledObjectFactory<IggyBaseClient> {
}
}
- private void applyTlsCertificateIfPresent(Consumer<String> certificateSetter) {
+ private void applyTlsCertificateIfPresent(java.util.function.Consumer<String> certificateSetter) {
if (tlsCertificatePath != null) {
certificateSetter.accept(tlsCertificatePath);
}
diff --git a/components/camel-iggy/src/test/java/org/apache/camel/component/iggy/IggyConfigurationTest.java b/components/camel-iggy/src/test/java/org/apache/camel/component/iggy/IggyConfigurationTest.java
index c6436d59a3c4..fc4afb9f3a8f 100644
--- a/components/camel-iggy/src/test/java/org/apache/camel/component/iggy/IggyConfigurationTest.java
+++ b/components/camel-iggy/src/test/java/org/apache/camel/component/iggy/IggyConfigurationTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.iggy;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.junit.jupiter.api.Test;
@@ -62,7 +61,7 @@ public class IggyConfigurationTest {
@Test
public void testTlsEndpointUri() throws Exception {
- DefaultCamelContext context = new DefaultCamelContext();
+ org.apache.camel.impl.DefaultCamelContext context = new org.apache.camel.impl.DefaultCamelContext();
context.start();
try {
IggyEndpoint endpoint = context.getEndpoint(
@@ -103,7 +102,7 @@ public class IggyConfigurationTest {
@Test
public void testSslContextParametersEndpointUri() throws Exception {
- DefaultCamelContext context = new DefaultCamelContext();
+ org.apache.camel.impl.DefaultCamelContext context = new org.apache.camel.impl.DefaultCamelContext();
context.start();
try {
SSLContextParameters sslContextParameters = new SSLContextParameters();
diff --git a/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Component.java b/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Component.java
index c0a6943fac7b..0b042d2b5f93 100644
--- a/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Component.java
+++ b/components/camel-influxdb2/src/main/java/org/apache/camel/component/influxdb2/InfluxDb2Component.java
@@ -21,11 +21,10 @@ import java.util.Map;
import com.influxdb.client.InfluxDBClient;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultComponent;
-@Component("influxdb2")
+@org.apache.camel.spi.annotations.Component("influxdb2")
public class InfluxDb2Component extends DefaultComponent {
@Metadata(autowired = true)
diff --git a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
index 73a72fa29875..a91fbb99ee79 100644
--- a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
+++ b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
@@ -188,7 +188,7 @@ public class IronMQConsumer extends ScheduledBatchPollingConsumer {
return (IronMQEndpoint) super.getEndpoint();
}
- private Exchange createExchange(Message msg) {
+ private Exchange createExchange(io.iron.ironmq.Message msg) {
Exchange exchange = createExchange(true);
exchange.setPattern(getEndpoint().getExchangePattern());
org.apache.camel.Message message = exchange.getIn();
diff --git a/components/camel-jackson3/src/test/java/org/apache/camel/component/jackson3/converter/JacksonConversionsPojoTest.java b/components/camel-jackson3/src/test/java/org/apache/camel/component/jackson3/converter/JacksonConversionsPojoTest.java
index ae61cb36a874..d0a282744159 100644
--- a/components/camel-jackson3/src/test/java/org/apache/camel/component/jackson3/converter/JacksonConversionsPojoTest.java
+++ b/components/camel-jackson3/src/test/java/org/apache/camel/component/jackson3/converter/JacksonConversionsPojoTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jackson3.converter;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jackson3.JacksonConstants;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.json.JSONException;
import org.junit.jupiter.api.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import org.skyscreamer.jsonassert.JSONCompareMode;
@@ -29,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class JacksonConversionsPojoTest extends CamelTestSupport {
@Test
- public void shouldConvertPojoToString() throws JSONException {
+ public void shouldConvertPojoToString() throws org.json.JSONException {
context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true");
context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true");
@@ -44,7 +43,7 @@ public class JacksonConversionsPojoTest extends CamelTestSupport {
}
@Test
- public void shouldConvertJAXBPojoToString() throws JSONException {
+ public void shouldConvertJAXBPojoToString() throws org.json.JSONException {
context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true");
context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true");
context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_MODULE_CLASS_NAMES,
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
index 448e75c2cc38..3be45fcecf7e 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
@@ -14,9 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@XmlSchema(namespace = "address.jaxb.converter.camel.apache.org",
- elementFormDefault = XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "address.jaxb.converter.camel.apache.org",
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.camel.converter.jaxb.address;
-
-import jakarta.xml.bind.annotation.XmlNsForm;
-import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
index f579066c63ab..970ab8072c51 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
@@ -14,7 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@XmlSchema(namespace = "message.jaxb.converter.camel.apache.org")
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "message.jaxb.converter.camel.apache.org")
package org.apache.camel.converter.jaxb.message;
-
-import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
index 91c98c28ee5f..5bc53c6504cf 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
@@ -14,9 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@XmlSchema(namespace = "person.jaxb.converter.camel.apache.org",
- elementFormDefault = XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "person.jaxb.converter.camel.apache.org",
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.camel.converter.jaxb.person;
-
-import jakarta.xml.bind.annotation.XmlNsForm;
-import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java
index 9f9f069e338b..66853dd3ca46 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java
@@ -31,10 +31,8 @@ import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.PropertyBindingSupport;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.ForwardedRequestCustomizer;
-import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.RequestLog;
-import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
@@ -62,7 +60,7 @@ public class JettyHttpComponent12 extends JettyHttpComponent {
try {
String host = endpoint.getHttpUri().getHost();
int port = endpoint.getPort();
- HttpConfiguration httpConfig = new HttpConfiguration();
+ org.eclipse.jetty.server.HttpConfiguration httpConfig = new org.eclipse.jetty.server.HttpConfiguration();
httpConfig.setSendServerVersion(endpoint.isSendServerVersion());
httpConfig.setSendDateHeader(endpoint.isSendDateHeader());
if (endpoint.getIdleTimeout() != -1) {
@@ -87,14 +85,14 @@ public class JettyHttpComponent12 extends JettyHttpComponent {
if (requestLog != null) {
server.setRequestLog(requestLog);
}
- HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfig);
+ HttpConnectionFactory httpFactory = new org.eclipse.jetty.server.HttpConnectionFactory(httpConfig);
ArrayList<ConnectionFactory> connectionFactories = new ArrayList<>();
- ServerConnector result = new ServerConnector(server);
+ ServerConnector result = new org.eclipse.jetty.server.ServerConnector(server);
if (sslcf != null) {
httpConfig.addCustomizer(secureRequestCustomizer != null
- ? secureRequestCustomizer : new SecureRequestCustomizer());
- SslConnectionFactory scf = new SslConnectionFactory(
+ ? secureRequestCustomizer : new org.eclipse.jetty.server.SecureRequestCustomizer());
+ SslConnectionFactory scf = new org.eclipse.jetty.server.SslConnectionFactory(
sslcf,
httpFactory.getProtocol());
connectionFactories.add(scf);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentRestConfigTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentRestConfigTest.java
index ce738b6b5d71..bad2a6b73535 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentRestConfigTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentRestConfigTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jetty.rest;
-import java.util.ArrayList;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -159,9 +157,9 @@ public class RestJettyNoContentRestConfigTest extends BaseJettyTest {
.get("/country").to("direct:v4country")
.get("/address").to("direct:v3address").produces("application/xml").type(Address.class);
- from("direct:v1country").transform().constant(new ArrayList<CountryPojo>());
- from("direct:v2country").transform().constant(new ArrayList<CountryPojo>());
- from("direct:v3country").transform().constant(new ArrayList<CountryPojo>());
+ from("direct:v1country").transform().constant(new java.util.ArrayList<CountryPojo>());
+ from("direct:v2country").transform().constant(new java.util.ArrayList<CountryPojo>());
+ from("direct:v3country").transform().constant(new java.util.ArrayList<CountryPojo>());
CountryPojo country = new CountryPojo();
country.setIso("EN");
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentTest.java
index 22d8d3dd151d..30acebbfc74a 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyNoContentTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jetty.rest;
-import java.util.ArrayList;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -159,9 +157,9 @@ public class RestJettyNoContentTest extends BaseJettyTest {
.get("/country").to("direct:v4country")
.get("/address").to("direct:v3address").produces("application/xml").type(Address.class);
- from("direct:v1country").transform().constant(new ArrayList<CountryPojo>());
- from("direct:v2country").transform().constant(new ArrayList<CountryPojo>());
- from("direct:v3country").transform().constant(new ArrayList<CountryPojo>());
+ from("direct:v1country").transform().constant(new java.util.ArrayList<CountryPojo>());
+ from("direct:v2country").transform().constant(new java.util.ArrayList<CountryPojo>());
+ from("direct:v3country").transform().constant(new java.util.ArrayList<CountryPojo>());
CountryPojo country = new CountryPojo();
country.setIso("EN");
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
index e894def965cf..20efcc90e875 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
@@ -33,7 +33,6 @@ import com.atlassian.jira.rest.client.internal.async.DisposableHttpClient;
import com.atlassian.sal.api.ApplicationProperties;
import com.atlassian.sal.api.UrlMode;
import com.atlassian.sal.api.executor.ThreadLocalContextManager;
-import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -179,7 +178,7 @@ public class OAuthAsynchronousHttpClientFactory {
static String getVersion(String groupId, String artifactId) {
final Properties props = new Properties();
String pomProps = String.format("/META-INF/maven/%s/%s/pom.properties", groupId, artifactId);
- try (InputStream resourceAsStream = ObjectHelper.loadResourceAsStream(pomProps,
+ try (InputStream resourceAsStream = org.apache.camel.util.ObjectHelper.loadResourceAsStream(pomProps,
OAuthAsynchronousHttpClientFactory.class.getClassLoader())) {
props.load(resourceAsStream);
return props.getProperty("version", UNKNOWN_VERSION);
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
index 16a7922cc94f..5e12468eb957 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.camel.component.jms;
-import jakarta.jms.BytesMessage;
-import jakarta.jms.Message;
-import jakarta.jms.TextMessage;
-
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
@@ -56,9 +52,9 @@ public class FromTextToBytesMessageTest extends AbstractJMSTest {
MockEndpoint.assertIsSatisfied(context);
- Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
+ jakarta.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
assertNotNull(msg);
- assertIsInstanceOf(BytesMessage.class, msg);
+ assertIsInstanceOf(jakarta.jms.BytesMessage.class, msg);
}
@Test
@@ -70,9 +66,9 @@ public class FromTextToBytesMessageTest extends AbstractJMSTest {
MockEndpoint.assertIsSatisfied(context);
- Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
+ jakarta.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
assertNotNull(msg);
- assertIsInstanceOf(BytesMessage.class, msg);
+ assertIsInstanceOf(jakarta.jms.BytesMessage.class, msg);
}
@Test
@@ -84,9 +80,9 @@ public class FromTextToBytesMessageTest extends AbstractJMSTest {
MockEndpoint.assertIsSatisfied(context);
- Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
+ jakarta.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
assertNotNull(msg);
- assertIsInstanceOf(TextMessage.class, msg);
+ assertIsInstanceOf(jakarta.jms.TextMessage.class, msg);
}
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
index 48e7ca9f26f7..f62b942533df 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
@@ -177,7 +177,7 @@ public class JmsBindingTest {
public void testObjectMessageReceivingAllowedWhenEnabled() throws JMSException {
when(mockJmsConfiguration.isObjectMessageEnabled()).thenReturn(true);
ObjectMessage message = mock(ObjectMessage.class);
- when(message.getObject()).thenReturn(new HashMap<>());
+ when(message.getObject()).thenReturn(new java.util.HashMap<>());
// when enabled, extraction proceeds (returns the deserialized payload)
assertDoesNotThrow(() -> jmsBindingUnderTest.extractBodyFromJms(null, message));
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsObjectMessageEnabledTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsObjectMessageEnabledTest.java
index e43d97494000..3cb1a4a3ad8a 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsObjectMessageEnabledTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsObjectMessageEnabledTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jms;
-import java.io.Serializable;
-
import jakarta.jms.ConnectionFactory;
import jakarta.jms.ObjectMessage;
@@ -122,7 +120,7 @@ public class JmsObjectMessageEnabledTest extends AbstractJMSTest {
return cause;
}
- public static class MyOrder implements Serializable {
+ public static class MyOrder implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private final String item;
private final int quantity;
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
index 35cf303fdb25..d077f8d464c1 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
@@ -116,7 +116,7 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
public void setLockTimeout(int timeout) throws SQLException {
entityManager.getTransaction().begin();
- Connection connection = entityManager.unwrap(Connection.class);
+ Connection connection = entityManager.unwrap(java.sql.Connection.class);
connection.createStatement()
.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.locks.waitTimeout', '" + timeout + "')");
entityManager.getTransaction().commit();
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpComponent.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpComponent.java
index 028478b9d37e..898c588c6bd9 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpComponent.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpComponent.java
@@ -20,7 +20,6 @@ import java.net.URI;
import java.util.Map;
import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.Logger;
import org.apache.camel.CamelContext;
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.remote.RemoteFileComponent;
@@ -76,7 +75,7 @@ public class ScpComponent extends RemoteFileComponent<ScpFile> {
protected void initJsch() {
JSch.setConfig("StrictHostKeyChecking", "yes");
- JSch.setLogger(new Logger() {
+ JSch.setLogger(new com.jcraft.jsch.Logger() {
@Override
public boolean isEnabled(int level) {
return level == FATAL || level == ERROR ? ScpComponent.this.log.isErrorEnabled()
diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpCertUserAuthIT.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpCertUserAuthIT.java
index ee75487bdc9e..33b74f15502c 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpCertUserAuthIT.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpCertUserAuthIT.java
@@ -22,7 +22,6 @@ import java.nio.file.Paths;
import java.security.PublicKey;
import java.util.List;
-import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -34,7 +33,6 @@ import org.apache.sshd.common.config.keys.OpenSshCertificate;
import org.apache.sshd.common.config.keys.PublicKeyEntry;
import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.common.signature.Signature;
-import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +78,7 @@ public class ScpCertUserAuthIT extends ScpServerTestSupport {
/**
* Creates a PublickeyAuthenticator that only accepts OpenSSH certificates signed by the User CA.
*/
- private static PublickeyAuthenticator createCaAwareAuthenticator() {
+ private static org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator createCaAwareAuthenticator() {
final PublicKey trustedCaKey;
try {
String caLine = Files.readString(Paths.get("src/test/resources/cert_user_ca.pub")).trim();
@@ -155,7 +153,7 @@ public class ScpCertUserAuthIT extends ScpServerTestSupport {
// Positive test: certBytes parameter (bean reference)
// ========================================================================
- @BindToRegistry("userCertBytes")
+ @org.apache.camel.BindToRegistry("userCertBytes")
public byte[] certBytes() throws IOException {
return Files.readAllBytes(Paths.get("src/test/resources/cert_user_key-cert.pub"));
}
diff --git a/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchComponent.java b/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchComponent.java
index 71b8a4821cc3..835beb804d95 100644
--- a/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchComponent.java
+++ b/components/camel-json-patch/src/main/java/org/apache/camel/component/jsonpatch/JsonPatchComponent.java
@@ -20,10 +20,9 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-@Component("json-patch")
+@org.apache.camel.spi.annotations.Component("json-patch")
public class JsonPatchComponent extends DefaultComponent {
@Metadata(defaultValue = "true", description = "Sets whether to use resource content cache or not")
diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonStream.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonStream.java
index 5deeff2da5b3..7b05810a99fd 100644
--- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonStream.java
+++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonStream.java
@@ -17,7 +17,6 @@
package org.apache.camel.jsonpath;
import java.io.CharConversionException;
-import java.io.EOFException;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -192,7 +191,7 @@ public class JsonStream extends FilterInputStream {
}
try {
return in.read();
- } catch (EOFException ex) {
+ } catch (java.io.EOFException ex) {
return -1;
}
}
@@ -217,7 +216,7 @@ public class JsonStream extends FilterInputStream {
} else {
return minimum + additionalRead;
}
- } catch (EOFException ex) {
+ } catch (java.io.EOFException ex) {
return minimum;
}
} else {
@@ -244,14 +243,14 @@ public class JsonStream extends FilterInputStream {
} else {
return minimum + additionalRead;
}
- } catch (EOFException ex) {
+ } catch (java.io.EOFException ex) {
return minimum;
}
} else {
try {
return in.read(b, off, len);
- } catch (EOFException ex) {
+ } catch (java.io.EOFException ex) {
return -1;
}
}
diff --git a/components/camel-jta/src/test/java/org/apache/camel/jta/TransactionErrorHandlerGracePeriodShutdownIT.java b/components/camel-jta/src/test/java/org/apache/camel/jta/TransactionErrorHandlerGracePeriodShutdownIT.java
index bc33769b69bf..64ad1bc97e70 100644
--- a/components/camel-jta/src/test/java/org/apache/camel/jta/TransactionErrorHandlerGracePeriodShutdownIT.java
+++ b/components/camel-jta/src/test/java/org/apache/camel/jta/TransactionErrorHandlerGracePeriodShutdownIT.java
@@ -27,9 +27,7 @@ import java.util.concurrent.TimeUnit;
import jakarta.transaction.Status;
import jakarta.transaction.TransactionManager;
-import jakarta.transaction.TransactionSynchronizationRegistry;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple;
import io.agroal.api.AgroalDataSource;
import io.agroal.api.configuration.supplier.AgroalDataSourceConfigurationSupplier;
import io.agroal.api.security.NamePrincipal;
@@ -78,8 +76,8 @@ public class TransactionErrorHandlerGracePeriodShutdownIT {
public void setUp() throws Exception {
// Narayana transaction manager and synchronization registry
tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
- TransactionSynchronizationRegistry tsr
- = new TransactionSynchronizationRegistryImple();
+ jakarta.transaction.TransactionSynchronizationRegistry tsr
+ = new com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple();
String jdbcUrl = postgres.jdbcUrl();
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaClientFactory.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaClientFactory.java
index a876b8c6f7af..8b06f5bdfba2 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaClientFactory.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaClientFactory.java
@@ -20,20 +20,18 @@ import java.util.Properties;
import org.apache.camel.util.ObjectHelper;
import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.Producer;
public class DefaultKafkaClientFactory implements KafkaClientFactory {
@Override
public Producer getProducer(Properties kafkaProps) {
- return new KafkaProducer(kafkaProps);
+ return new org.apache.kafka.clients.producer.KafkaProducer(kafkaProps);
}
@Override
public Consumer getConsumer(Properties kafkaProps) {
- return new KafkaConsumer(kafkaProps);
+ return new org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps);
}
@Override
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index cdba2047acec..4302fef27b6b 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -51,7 +51,6 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ReflectionHelper;
import org.apache.camel.util.TimeUtils;
import org.apache.kafka.clients.CommonClientConfigs;
-import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.OffsetAndMetadata;
@@ -83,7 +82,7 @@ public class KafkaFetchRecords implements Runnable {
// like from the health check thread. They are usually only read on those contexts.
private final KafkaConsumer kafkaConsumer;
- private Consumer consumer;
+ private org.apache.kafka.clients.consumer.Consumer consumer;
private volatile String clientId;
private final String topicName;
private final Pattern topicPattern;
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index bfa56a42b898..99b6c8568656 100755
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -49,11 +49,9 @@ import org.apache.camel.util.ReflectionHelper;
import org.apache.camel.util.URISupport;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.NetworkClient;
-import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.kafka.clients.producer.internals.Sender;
import org.apache.kafka.common.header.Header;
import org.apache.kafka.common.header.internals.RecordHeader;
import org.slf4j.Logger;
@@ -66,7 +64,7 @@ public class KafkaProducer extends DefaultAsyncProducer implements RouteIdAware
private static final Logger LOG = LoggerFactory.getLogger(KafkaProducer.class);
@SuppressWarnings("rawtypes")
- private Producer kafkaProducer;
+ private org.apache.kafka.clients.producer.Producer kafkaProducer;
private KafkaProducerHealthCheck producerHealthCheck;
private WritableHealthCheckRepository healthCheckRepository;
private String clientId;
@@ -116,8 +114,8 @@ public class KafkaProducer extends DefaultAsyncProducer implements RouteIdAware
// connections
org.apache.kafka.clients.producer.KafkaProducer kp
= (org.apache.kafka.clients.producer.KafkaProducer) kafkaProducer;
- Sender sender
- = (Sender) ReflectionHelper
+ org.apache.kafka.clients.producer.internals.Sender sender
+ = (org.apache.kafka.clients.producer.internals.Sender) ReflectionHelper
.getField(kp.getClass().getDeclaredField("sender"), kp);
NetworkClient nc
= (NetworkClient) ReflectionHelper.getField(sender.getClass().getDeclaredField("client"), sender);
@@ -135,7 +133,7 @@ public class KafkaProducer extends DefaultAsyncProducer implements RouteIdAware
}
@SuppressWarnings("rawtypes")
- public Producer getKafkaProducer() {
+ public org.apache.kafka.clients.producer.Producer getKafkaProducer() {
return kafkaProducer;
}
@@ -143,7 +141,7 @@ public class KafkaProducer extends DefaultAsyncProducer implements RouteIdAware
* To use a custom {@link org.apache.kafka.clients.producer.KafkaProducer} instance.
*/
@SuppressWarnings("rawtypes")
- public void setKafkaProducer(Producer kafkaProducer) {
+ public void setKafkaProducer(org.apache.kafka.clients.producer.Producer kafkaProducer) {
this.kafkaProducer = kafkaProducer;
}
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java
index 85d35635d464..fba111f5306c 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.kafka.consumer.support.batching;
-import java.util.List;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
@@ -214,7 +213,7 @@ final class KafkaRecordBatchingProcessor extends KafkaRecordProcessor {
* The flow to execute when using auto-commit
*/
private ProcessingResult autoCommitResultProcessing(
- KafkaConsumer camelKafkaConsumer, Exchange exchange, List<Exchange> exchanges) {
+ KafkaConsumer camelKafkaConsumer, Exchange exchange, java.util.List<Exchange> exchanges) {
ExceptionHandler exceptionHandler = camelKafkaConsumer.getExceptionHandler();
CommitSynchronization commitSynchronization = new CommitSynchronization(exceptionHandler, exchanges.size());
exchange.getExchangeExtension().addOnCompletion(commitSynchronization);
@@ -250,7 +249,7 @@ final class KafkaRecordBatchingProcessor extends KafkaRecordProcessor {
* The flow to execute when the integrations perform manual commit on their own
*/
private ProcessingResult manualCommitResultProcessing(
- KafkaConsumer camelKafkaConsumer, Exchange exchange, List<Exchange> exchanges) {
+ KafkaConsumer camelKafkaConsumer, Exchange exchange, java.util.List<Exchange> exchanges) {
try {
processor.process(exchange);
} catch (Exception e) {
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
index 3a455bfa81a8..e7f81be5bb2c 100755
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
@@ -42,7 +42,6 @@ import org.apache.camel.processor.aggregate.GroupedMessageAggregationStrategy;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultMessage;
import org.apache.kafka.clients.producer.Callback;
-import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.RecordMetadata;
@@ -136,7 +135,7 @@ public class KafkaProducerTest {
public void processSendsMessageWithException() {
endpoint.getConfiguration().setTopic("sometopic");
// set up the exception here
- Producer kp = producer.getKafkaProducer();
+ org.apache.kafka.clients.producer.Producer kp = producer.getKafkaProducer();
Mockito.when(kp.send(any(ProducerRecord.class))).thenThrow(new ApiException());
Mockito.when(exchange.getIn()).thenReturn(in);
Mockito.when(exchange.getMessage()).thenReturn(in);
@@ -170,7 +169,7 @@ public class KafkaProducerTest {
Mockito.when(exchange.getMessage()).thenReturn(in);
// set up the exception here
- Producer kp = producer.getKafkaProducer();
+ org.apache.kafka.clients.producer.Producer kp = producer.getKafkaProducer();
Mockito.when(kp.send(any(ProducerRecord.class), any(Callback.class))).thenThrow(new ApiException());
in.setHeader(KafkaConstants.PARTITION_KEY, 4);
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
index 28d5d63ba6f4..d77bf3b5f858 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
@@ -28,7 +28,6 @@ import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -60,12 +59,12 @@ class KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT extends BaseKafkaTestSup
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
index 57fdd9e7f05a..1424e03cec99 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
@@ -29,7 +29,6 @@ import org.apache.camel.component.kafka.integration.common.KafkaAdminUtil;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.*;
@@ -64,7 +63,7 @@ class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport {
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeAll
public static void setupTopic() {
@@ -82,7 +81,7 @@ class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport {
// setup the producer
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java
index 78c1ab6ba63b..d70f8c482cda 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java
@@ -32,7 +32,6 @@ import org.apache.camel.component.kafka.integration.common.KafkaAdminUtil;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -71,7 +70,7 @@ class KafkaBreakOnFirstErrorReplayOldMessagesIT extends BaseKafkaTestSupport {
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeAll
public static void setupTopic() {
@@ -89,7 +88,7 @@ class KafkaBreakOnFirstErrorReplayOldMessagesIT extends BaseKafkaTestSupport {
// setup the producer
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
index 82d1709d09f3..aa4b5a0106c1 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
@@ -31,7 +31,6 @@ import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.kafka.clients.admin.CreateTopicsResult;
import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.Uuid;
import org.awaitility.Awaitility;
@@ -76,7 +75,7 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport {
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeAll
public static void setupTopic() {
@@ -90,7 +89,7 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport {
// setup the producer
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
// create the topic w/ more than 1 partitions - moved here from BeforeAll
final NewTopic mytopic = new NewTopic(TOPIC, PARTITION_COUNT, (short) 1);
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java
index 4f1af548ce67..9d917bd10254 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java
@@ -29,7 +29,6 @@ import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.kafka.clients.admin.DeleteTopicsResult;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.Uuid;
import org.awaitility.Awaitility;
@@ -66,12 +65,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseKafka
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java
index db0aee9867c0..2f95c6f45aa2 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java
@@ -28,7 +28,6 @@ import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -60,12 +59,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT extends BaseKafkaT
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java
index e7464891096e..f240a7ede0c3 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java
@@ -28,7 +28,6 @@ import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -66,12 +65,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT extends BaseK
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
index 31cf7a07063d..37d795ec4cd4 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
@@ -28,7 +28,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -62,12 +61,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT extends BaseKafkaT
@EndpointInject("mock:result")
private MockEndpoint to;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
index 32b34155aaa3..d76bf88567d6 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
@@ -31,7 +31,6 @@ import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.component.kafka.consumer.KafkaManualCommitFactory;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -58,14 +57,14 @@ public class KafkaConsumerAsyncManualCommitIT extends BaseKafkaTestSupport {
private final CamelContext context = contextExtension.getContext();
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
private volatile int failCount;
@BeforeEach
public void before() {
Properties props = KafkaTestUtil.getDefaultProperties(service);
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
}
@AfterEach
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java
index 48722d4a94ed..ed6f99d5b895 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java
@@ -33,7 +33,6 @@ import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.test.infra.core.annotations.RouteFixture;
import org.apache.camel.test.infra.kafka.services.ContainerLocalAuthKafkaService;
import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.header.internals.RecordHeader;
@@ -80,7 +79,7 @@ public class KafkaConsumerAuthIT {
private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerAuthIT.class);
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
@@ -92,7 +91,7 @@ public class KafkaConsumerAuthIT {
props.put(SaslConfigs.SASL_MECHANISM, "PLAIN");
try {
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
} catch (Exception e) {
fail(e.getMessage());
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
index d4b0888c4770..0a541b645dc8 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
@@ -35,7 +35,6 @@ import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.ConsumerGroupDescription;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.common.config.SaslConfigs;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -80,7 +79,7 @@ public class KafkaConsumerAuthInvalidIT {
@RegisterExtension
private static final CamelContextExtension contextExtension = new DefaultCamelContextExtension();
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
@@ -91,7 +90,7 @@ public class KafkaConsumerAuthInvalidIT {
props.put(SaslConfigs.SASL_MECHANISM, "PLAIN");
try {
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
} catch (Exception e) {
fail(e.getMessage());
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
index 1ac344c7a42f..ddf16c2a4d2c 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
@@ -31,7 +31,6 @@ import org.apache.camel.test.infra.core.annotations.RouteFixture;
import org.apache.camel.test.infra.kafka.services.ContainerLocalAuthKafkaService;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.ConsumerGroupDescription;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.common.config.SaslConfigs;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -70,7 +69,7 @@ public class KafkaConsumerAuthInvalidWithReconnectIT {
@RegisterExtension
private static final CamelContextExtension contextExtension = new DefaultCamelContextExtension();
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
static {
service = new ContainerLocalAuthKafkaService(
@@ -97,7 +96,7 @@ public class KafkaConsumerAuthInvalidWithReconnectIT {
props.put(SaslConfigs.SASL_MECHANISM, "PLAIN");
try {
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
} catch (Exception e) {
fail(e.getMessage());
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
index 4f422149ac45..26d2545d318b 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.test.infra.core.CamelContextExtension;
import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.test.infra.core.annotations.RouteFixture;
import org.apache.camel.test.infra.kafka.services.ContainerLocalAuthKafkaService;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.common.config.SaslConfigs;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -65,7 +64,7 @@ public class KafkaConsumerAuthManualTest {
@RegisterExtension
private static final CamelContextExtension contextExtension = new DefaultCamelContextExtension();
private static volatile int receivedMessages;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
protected Properties getDefaultProperties() {
Properties properties = KafkaTestUtil.getDefaultProperties(BOOTSTRAP_SERVERS);
@@ -83,7 +82,7 @@ public class KafkaConsumerAuthManualTest {
Properties props = getDefaultProperties();
try {
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java
index 50d10643314f..1d632a4f2d9d 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBatchSizeIT.java
@@ -23,7 +23,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -33,12 +32,12 @@ public class KafkaConsumerBatchSizeIT extends BaseKafkaTestSupport {
public static final String TOPIC = "test-batch";
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
}
@AfterEach
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerCustomSubscribeAdapterIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerCustomSubscribeAdapterIT.java
index dbb295adc175..421a92b590ab 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerCustomSubscribeAdapterIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerCustomSubscribeAdapterIT.java
@@ -28,7 +28,6 @@ import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -40,7 +39,7 @@ public class KafkaConsumerCustomSubscribeAdapterIT extends BaseKafkaTestSupport
public static final String TOPIC = "test-subscribe-adapter";
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
private static class TestSubscribeAdapter extends DefaultSubscribeAdapter {
private volatile boolean subscribeCalled = false;
@@ -65,7 +64,7 @@ public class KafkaConsumerCustomSubscribeAdapterIT extends BaseKafkaTestSupport
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
}
@AfterEach
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
index 26a50f7782b6..0957733834ce 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
@@ -35,7 +35,6 @@ import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderDeserializer;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.core.annotations.RouteFixture;
import org.apache.kafka.clients.admin.DeleteTopicsResult;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.Uuid;
import org.apache.kafka.common.header.internals.RecordHeader;
@@ -68,14 +67,14 @@ public class KafkaConsumerFullIT extends BaseKafkaTestSupport {
+ "valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
+ "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor";
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BindToRegistry("myHeaderDeserializer")
private final MyKafkaHeaderDeserializer bean = new MyKafkaHeaderDeserializer();
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerGroupProtocolIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerGroupProtocolIT.java
index 7f1e506198be..7838be0c2678 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerGroupProtocolIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerGroupProtocolIT.java
@@ -31,7 +31,6 @@ import org.apache.camel.test.infra.core.annotations.RouteFixture;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.FeatureMetadata;
import org.apache.kafka.clients.admin.FinalizedVersionRange;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.Uuid;
import org.apache.kafka.common.header.internals.RecordHeader;
@@ -69,7 +68,7 @@ public class KafkaConsumerGroupProtocolIT extends BaseKafkaTestSupport {
+ "&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor"
+ "&groupProtocol=consumer";
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeAll
static void checkConsumerProtocolSupport() {
@@ -89,7 +88,7 @@ public class KafkaConsumerGroupProtocolIT extends BaseKafkaTestSupport {
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
@@ -143,7 +142,7 @@ public class KafkaConsumerGroupProtocolIT extends BaseKafkaTestSupport {
assertEquals(5, MockConsumerInterceptor.recordsCaptured.stream()
.flatMap(i -> StreamSupport.stream(i.records(TOPIC).spliterator(), false)).count());
- Map<String, Object> headers = to.getExchanges().get(0).getIn().getHeaders();
+ java.util.Map<String, Object> headers = to.getExchanges().get(0).getIn().getHeaders();
assertFalse(headers.containsKey(skippedHeaderKey), "Should not receive skipped header");
assertTrue(headers.containsKey(propagatedHeaderKey), "Should receive propagated header");
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentTestSupport.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentTestSupport.java
index c0a3b5bb62c0..cf8ba5c33256 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentTestSupport.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentTestSupport.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.header.internals.RecordHeader;
@@ -35,8 +34,8 @@ public abstract class KafkaConsumerIdempotentTestSupport extends BaseKafkaTestSu
protected void doSend(int size, String topic) {
Properties props = getDefaultProperties();
- try (KafkaProducer<String, String> producer
- = new KafkaProducer<>(props)) {
+ try (org.apache.kafka.clients.producer.KafkaProducer<String, String> producer
+ = new org.apache.kafka.clients.producer.KafkaProducer<>(props)) {
for (int k = 0; k < size; k++) {
String msg = "message-" + k;
ProducerRecord<String, String> data = new ProducerRecord<>(topic, String.valueOf(k), msg);
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java
index 1e320a0b8678..b8457b357d3a 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerLastRecordHeaderIT.java
@@ -25,7 +25,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -40,12 +39,12 @@ public class KafkaConsumerLastRecordHeaderIT extends BaseKafkaTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerLastRecordHeaderIT.class);
private static final String TOPIC = "last-record";
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
}
@AfterEach
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerSaslAuthTypeIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerSaslAuthTypeIT.java
index 25fb53e04846..cca7f78ef426 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerSaslAuthTypeIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerSaslAuthTypeIT.java
@@ -33,7 +33,6 @@ import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.test.infra.core.annotations.RouteFixture;
import org.apache.camel.test.infra.kafka.services.ContainerLocalAuthKafkaService;
import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.header.internals.RecordHeader;
@@ -84,7 +83,7 @@ public class KafkaConsumerSaslAuthTypeIT {
private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerSaslAuthTypeIT.class);
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
@@ -97,7 +96,7 @@ public class KafkaConsumerSaslAuthTypeIT {
props.put(SaslConfigs.SASL_MECHANISM, "PLAIN");
try {
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
} catch (Exception e) {
fail(e.getMessage());
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerStopIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerStopIT.java
index e94e57d84f11..64ff99a07287 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerStopIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerStopIT.java
@@ -28,7 +28,6 @@ import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.kafka.clients.consumer.internals.ClassicKafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -53,12 +52,12 @@ public class KafkaConsumerStopIT extends BaseKafkaTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerStopIT.class);
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java
index 6b0e6928dbb0..3117ce03aed5 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -38,12 +37,12 @@ public class KafkaConsumerTopicIsPatternIT extends BaseKafkaTestSupport {
public static final String TOPIC = "vess123d";
public static final String TOPIC_PATTERN = "v.*d";
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void before() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java
index a15aae684c1a..80aa8c1e952e 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java
@@ -39,7 +39,6 @@ import org.apache.camel.component.kafka.MockProducerInterceptor;
import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderSerializer;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultHeaderFilterStrategy;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -112,16 +111,16 @@ public class KafkaProducerFullIT extends BaseKafkaTestSupport {
private static KafkaConsumer<String, String> createStringKafkaConsumer(final String groupId) {
Properties stringsProps = new Properties();
- stringsProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
- stringsProps.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
- stringsProps.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
- stringsProps.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
- stringsProps.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
- stringsProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG, groupId);
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringDeserializer");
- stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringDeserializer");
- stringsProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
return new KafkaConsumer<>(stringsProps);
}
@@ -129,16 +128,16 @@ public class KafkaProducerFullIT extends BaseKafkaTestSupport {
private static KafkaConsumer<byte[], byte[]> createByteKafkaConsumer(final String groupId) {
Properties stringsProps = new Properties();
- stringsProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
- stringsProps.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
- stringsProps.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
- stringsProps.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
- stringsProps.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
- stringsProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG, groupId);
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.ByteArrayDeserializer");
- stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.ByteArrayDeserializer");
- stringsProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
return new KafkaConsumer<>(stringsProps);
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerSaslAuthTypeIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerSaslAuthTypeIT.java
index d8d6fec75840..293475756f42 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerSaslAuthTypeIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerSaslAuthTypeIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.kafka.integration;
import java.time.Duration;
import java.util.Collections;
-import java.util.Map;
import java.util.Properties;
import org.apache.camel.CamelContext;
@@ -193,7 +192,7 @@ public class KafkaProducerSaslAuthTypeIT {
// Send a message with custom headers
producerTemplate.sendBodyAndHeaders("direct:start", "message-with-headers",
- Map.of(
+ java.util.Map.of(
KafkaConstants.KEY, "header-test-key",
"CustomHeader", "custom-value"));
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaTransactionIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaTransactionIT.java
index 01ab645173bd..9eb885290059 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaTransactionIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaTransactionIT.java
@@ -32,7 +32,6 @@ import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.kafka.integration.common.TestProducerUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.producer.RecordMetadata;
@@ -176,16 +175,16 @@ public class KafkaTransactionIT extends BaseKafkaTestSupport {
private static KafkaConsumer<String, String> createStringKafkaConsumer(final String groupId) {
Properties stringsProps = new Properties();
- stringsProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
- stringsProps.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
- stringsProps.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
- stringsProps.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
- stringsProps.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
- stringsProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG, groupId);
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringDeserializer");
- stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringDeserializer");
- stringsProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
return new KafkaConsumer<>(stringsProps);
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaWithDBTransactionIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaWithDBTransactionIT.java
index bbac51e590c0..bcb39ae3921e 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaWithDBTransactionIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaWithDBTransactionIT.java
@@ -27,7 +27,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.core.annotations.ContextFixture;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -307,17 +306,17 @@ public class KafkaWithDBTransactionIT extends BaseKafkaTestSupport {
private static KafkaConsumer<String, String> createStringKafkaConsumer(final String groupId) {
Properties stringsProps = new Properties();
- stringsProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
- stringsProps.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
- stringsProps.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
- stringsProps.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
- stringsProps.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
- stringsProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, getBootstrapServers());
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG, groupId);
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, "30000");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringDeserializer");
- stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.StringDeserializer");
- stringsProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
- stringsProps.put(ConsumerConfig.ISOLATION_LEVEL_CONFIG, "read_committed");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+ stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.ISOLATION_LEVEL_CONFIG, "read_committed");
return new KafkaConsumer<>(stringsProps);
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/batching/BatchingProcessingITSupport.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/batching/BatchingProcessingITSupport.java
index a01be7b94b15..a040dcab2c06 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/batching/BatchingProcessingITSupport.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/batching/BatchingProcessingITSupport.java
@@ -27,7 +27,6 @@ import org.apache.camel.Message;
import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.integration.BaseKafkaTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
@@ -47,12 +46,12 @@ abstract class BatchingProcessingITSupport extends BaseKafkaTestSupport {
@EndpointInject("mock:resultBar")
protected MockEndpoint toBar;
- protected KafkaProducer<String, String> producer;
+ protected org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void createClient() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
}
public void cleanupKafka(String topic) {
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/BaseManualCommitTestSupport.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/BaseManualCommitTestSupport.java
index 1935fa7567ef..a0613af5908a 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/BaseManualCommitTestSupport.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/BaseManualCommitTestSupport.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.integration.BaseKafkaTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.StateRepository;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
import org.hamcrest.Matchers;
@@ -41,12 +40,12 @@ abstract class BaseManualCommitTestSupport extends BaseKafkaTestSupport {
@EndpointInject("mock:resultBar")
protected MockEndpoint toBar;
- protected KafkaProducer<String, String> producer;
+ protected org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@BeforeEach
public void createClient() {
Properties props = getDefaultProperties();
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
}
public void cleanupKafka(String topic) {
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerHealthCheckIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerHealthCheckIT.java
index 6d46f6b25223..239296614f7d 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerHealthCheckIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerHealthCheckIT.java
@@ -131,7 +131,7 @@ public class KafkaConsumerHealthCheckIT extends KafkaHealthCheckTestSupport {
to.expectedHeaderReceived(PROPAGATED_CUSTOM_HEADER, PROPAGATED_HEADER_VALUE);
Properties props = KafkaTestUtil.getDefaultProperties(service);
- try (KafkaProducer<String, String> producer = new KafkaProducer<>(props)) {
+ try (KafkaProducer<String, String> producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props)) {
for (int k = 0; k < 5; k++) {
String msg = "message-" + k;
ProducerRecord<String, String> data = new ProducerRecord<>(TOPIC, "1", msg);
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java
index cfcfa874baa0..ab8a2c2b5262 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java
@@ -35,7 +35,6 @@ import org.apache.camel.test.infra.core.api.ConfigurableContext;
import org.apache.camel.test.infra.core.api.ConfigurableRoute;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -53,7 +52,7 @@ abstract class KafkaHealthCheckTestSupport implements ConfigurableRoute, Configu
@Order(2)
@RegisterExtension
protected static CamelContextExtension contextExtension = new DefaultCamelContextExtension();
- protected KafkaProducer<String, String> producer;
+ protected org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
@EndpointInject("mock:result")
protected MockEndpoint to;
protected boolean serviceShutdown = false;
@@ -77,7 +76,7 @@ abstract class KafkaHealthCheckTestSupport implements ConfigurableRoute, Configu
public void before() {
if (!serviceShutdown) {
Properties props = KafkaTestUtil.getDefaultProperties(service);
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java
index fb2719a3fce6..6683200ece16 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java
@@ -33,7 +33,6 @@ import org.apache.camel.component.kafka.consumer.errorhandler.KafkaConsumerListe
import org.apache.camel.component.kafka.integration.BaseKafkaTestSupport;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.header.internals.RecordHeader;
import org.junit.jupiter.api.AfterEach;
@@ -60,7 +59,7 @@ public class KafkaPausableConsumerCircuitBreakerIT extends BaseKafkaTestSupport
private static final int SIMULATED_FAILURES = 5;
private static final LongAdder count = new LongAdder();
private static ScheduledExecutorService executorService;
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
/*
* This is used by pausable to determine whether to pause. If returning true, processing continues. If
@@ -94,7 +93,7 @@ public class KafkaPausableConsumerCircuitBreakerIT extends BaseKafkaTestSupport
@BeforeEach
public void before() {
Properties props = KafkaTestUtil.getDefaultProperties(service);
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java
index 4879e44aed9d..4cd40f3d07ca 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java
@@ -33,7 +33,6 @@ import org.apache.camel.component.kafka.consumer.support.ProcessingResult;
import org.apache.camel.component.kafka.integration.BaseKafkaTestSupport;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.header.internals.RecordHeader;
import org.junit.jupiter.api.AfterEach;
@@ -58,7 +57,7 @@ public class KafkaPausableConsumerIT extends BaseKafkaTestSupport {
private static final int RETRY_COUNT = 10;
private static final LongAdder count = new LongAdder();
private static final TestListener testConsumerListener = new TestListener();
- private KafkaProducer<String, String> producer;
+ private org.apache.kafka.clients.producer.KafkaProducer<String, String> producer;
private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
@@ -82,7 +81,7 @@ public class KafkaPausableConsumerIT extends BaseKafkaTestSupport {
@BeforeEach
public void before() {
Properties props = KafkaTestUtil.getDefaultProperties(service);
- producer = new KafkaProducer<>(props);
+ producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props);
MockConsumerInterceptor.recordsCaptured.clear();
executorService.scheduleAtFixedRate(this::increment, 5, 1, TimeUnit.SECONDS);
diff --git a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletProcessor.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletProcessor.java
index 4d41da39bb0b..80ba9352f270 100644
--- a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletProcessor.java
+++ b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletProcessor.java
@@ -26,7 +26,6 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
-import org.apache.camel.Traceable;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.processor.BaseProcessorSupport;
@@ -40,7 +39,7 @@ import org.apache.camel.support.service.ServiceHelper;
*/
@ManagedResource(description = "Managed Kamelet Processor")
public class KameletProcessor extends BaseProcessorSupport
- implements CamelContextAware, Navigate<Processor>, Traceable, IdAware, RouteIdAware {
+ implements CamelContextAware, Navigate<Processor>, org.apache.camel.Traceable, IdAware, RouteIdAware {
private final String name;
private final AsyncProcessor processor;
diff --git a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakConsumer.java b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakConsumer.java
index f380ae01b936..37ddc1c052b5 100644
--- a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakConsumer.java
+++ b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/KeycloakConsumer.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.keycloak;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -288,7 +287,7 @@ public class KeycloakConsumer extends ScheduledBatchPollingConsumer {
if (value == null || value.trim().isEmpty()) {
return null;
}
- List<String> result = new ArrayList<>();
+ List<String> result = new java.util.ArrayList<>();
for (String item : value.split(",")) {
String trimmed = item.trim();
if (!trimmed.isEmpty()) {
diff --git a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java
index c3ec59574f04..30967fbeed7c 100644
--- a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java
+++ b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelper.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.keycloak.security;
import java.io.IOException;
import java.security.PublicKey;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
@@ -154,7 +153,7 @@ public final class KeycloakSecurityHelper {
// Extract permissions from custom claims (primary approach for simple setups)
Object permissionsClaim = token.getOtherClaims().get("permissions");
- if (permissionsClaim instanceof Collection<?> permissionsCollection) {
+ if (permissionsClaim instanceof java.util.Collection<?> permissionsCollection) {
for (Object perm : permissionsCollection) {
if (perm instanceof String s) {
permissions.add(s);
@@ -166,7 +165,7 @@ public final class KeycloakSecurityHelper {
Object scopesClaim = token.getOtherClaims().get("scope");
if (scopesClaim instanceof String scopesString) {
if (!scopesString.isEmpty()) {
- permissions.addAll(Arrays.asList(scopesString.split(" ")));
+ permissions.addAll(java.util.Arrays.asList(scopesString.split(" ")));
}
}
@@ -255,7 +254,7 @@ public final class KeycloakSecurityHelper {
// Also check for scope-based permissions
String scope = introspectionResult.getScope();
if (scope != null && !scope.isEmpty()) {
- permissions.addAll(Arrays.asList(scope.split(" ")));
+ permissions.addAll(java.util.Arrays.asList(scope.split(" ")));
}
return permissions;
diff --git a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityProcessor.java b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityProcessor.java
index 3b7ad2cf566f..08910a810c3f 100644
--- a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityProcessor.java
+++ b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakSecurityProcessor.java
@@ -29,7 +29,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.processor.DelegateProcessor;
import org.apache.camel.util.ObjectHelper;
-import org.keycloak.TokenVerifier;
import org.keycloak.common.VerificationException;
import org.keycloak.representations.AccessToken;
import org.slf4j.Logger;
@@ -162,7 +161,7 @@ public class KeycloakSecurityProcessor extends DelegateProcessor {
try {
// Parse token to extract subject (without full validation - just for binding check)
// Full verification happens later in validateRoles/validatePermissions
- AccessToken accessToken = TokenVerifier.create(headerToken, AccessToken.class).getToken();
+ AccessToken accessToken = org.keycloak.TokenVerifier.create(headerToken, AccessToken.class).getToken();
String currentSubject = accessToken.getSubject();
if (!storedSubject.equals(currentSubject)) {
diff --git a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospector.java b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospector.java
index 4ca6239e0328..61f6f1d62b4b 100644
--- a/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospector.java
+++ b/components/camel-keycloak/src/main/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospector.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.keycloak.security;
import java.io.IOException;
import java.util.Base64;
-import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,7 +31,6 @@ import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.ParseException;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.slf4j.Logger;
@@ -147,7 +145,7 @@ public class KeycloakTokenIntrospector {
// Set request body with token
NameValuePair tokenParam = new BasicNameValuePair("token", token);
- request.setEntity(new UrlEncodedFormEntity(List.of(tokenParam)));
+ request.setEntity(new UrlEncodedFormEntity(java.util.List.of(tokenParam)));
// Execute request
try {
@@ -185,7 +183,7 @@ public class KeycloakTokenIntrospector {
Map<String, Object> responseMap = OBJECT_MAPPER.readValue(responseBody, Map.class);
return new IntrospectionResult(responseMap);
- } catch (ParseException e) {
+ } catch (org.apache.hc.core5.http.ParseException e) {
throw new IOException("Failed to parse HTTP response", e);
}
}
diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java
index a3ab0ce1ae55..0bb0977e51c4 100644
--- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java
+++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakConsumerIT.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.keycloak;
-import java.util.Arrays;
-import java.util.HashMap;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -34,10 +32,8 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.keycloak.admin.client.Keycloak;
import org.keycloak.representations.idm.AdminEventRepresentation;
import org.keycloak.representations.idm.EventRepresentation;
-import org.keycloak.representations.idm.RealmRepresentation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -131,8 +127,8 @@ public class KeycloakConsumerIT extends CamelTestSupport {
// Enable events and admin events on the realm
log.info("Enabling events and admin events for realm: {}", TEST_REALM_NAME);
- Keycloak keycloakClient = keycloakService.getKeycloakAdminClient();
- RealmRepresentation realmRep
+ org.keycloak.admin.client.Keycloak keycloakClient = keycloakService.getKeycloakAdminClient();
+ org.keycloak.representations.idm.RealmRepresentation realmRep
= keycloakClient.realm(TEST_REALM_NAME).toRepresentation();
// Enable admin events
@@ -141,7 +137,7 @@ public class KeycloakConsumerIT extends CamelTestSupport {
// Enable regular events
realmRep.setEventsEnabled(true);
- realmRep.setEventsListeners(Arrays.asList("jboss-logging"));
+ realmRep.setEventsListeners(java.util.Arrays.asList("jboss-logging"));
keycloakClient.realm(TEST_REALM_NAME).update(realmRep);
log.info("Events and admin events enabled successfully");
@@ -167,7 +163,7 @@ public class KeycloakConsumerIT extends CamelTestSupport {
log.info("Creating user: {} in realm: {}", TEST_USER_NAME, TEST_REALM_NAME);
template.sendBodyAndHeaders("direct:createUser", null,
- new HashMap<>() {
+ new java.util.HashMap<>() {
{
put(KeycloakConstants.REALM_NAME, TEST_REALM_NAME);
put(KeycloakConstants.USERNAME, TEST_USER_NAME);
diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/KeycloakTestInfraIT.java
index 2af6bc84d3cc..cd7dacb39a2d 100644
... 14511 lines suppressed ...