From 4838027338f289123150695607506db254b14b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Thu, 7 May 2026 12:02:45 +0200 Subject: [PATCH] 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 - .../apache/camel/maven/RouteCoverageMojo.java | 2 +- .../activemq/ActiveMQConfiguration.java | 4 +- .../activemq6/ActiveMQConfiguration.java | 4 +- .../component/docling/DoclingProducer.java | 5 +- .../DoclingCustomArgsValidationTest.java | 32 +- .../docling/DoclingSecureTempFileTest.java | 3 +- .../integration/BatchProcessingIT.java | 5 +- .../integration/DoclingServeProducerIT.java | 3 +- .../integration/MetadataExtractionIT.java | 2 +- .../agent/api/AgentConfiguration.java | 3 +- .../agent/api/AgentConfigurationTest.java | 11 +- .../PromptInjectionGuardrailTest.java | 4 +- .../LangChain4jAgentAutoConversionTest.java | 3 +- ...ain4jEmbeddingsComponentNeo4jTargetIT.java | 2 +- .../LangChain4jEmbeddingStoreProducer.java | 2 +- .../LangChain4JCharacterTokenizer.java | 3 +- .../tokenizer/LangChain4JLineTokenizer.java | 3 +- .../LangChain4JParagraphTokenizer.java | 3 +- .../LangChain4JSentenceTokenizer.java | 3 +- .../tokenizer/LangChain4JWordTokenizer.java | 3 +- .../camel/component/neo4j/Neo4jProducer.java | 5 +- .../component/openai/OpenAIEndpoint.java | 3 +- .../component/openai/OpenAIProducer.java | 6 +- .../openai/OpenAIProducerMockTest.java | 4 +- .../openai/OpenAISslConfigurationTest.java | 9 +- .../OpenAISslContextParametersTest.java | 3 +- .../as2/api/util/AS2HeaderUtils.java | 3 +- .../component/as2/api/util/MicUtils.java | 3 +- .../component/as2/api/AS2MessageTest.java | 16 +- .../as2/api/AS2UnencryptedMessageTest.java | 9 +- .../component/as2/AS2ClientManagerIT.java | 3 +- .../component/as2/AS2ServerManagerITBase.java | 2 +- .../as2/AS2ServerWildcardPatternIT.java | 6 +- .../org/apache/camel/avro/generated/Key.java | 47 +- .../avro/generated/KeyValueProtocol.java | 27 +- .../apache/camel/avro/generated/Value.java | 49 +- .../avro/spi/JettyHttpServerFactory.java | 3 +- .../dataformat/avro/SpecificDataNoCache.java | 5 +- .../dataformat/avro/example/DateRecord.java | 113 +- .../camel/dataformat/avro/example/Value.java | 51 +- .../bedrock/runtime/BedrockConfiguration.java | 7 +- .../aws2/bedrock/runtime/BedrockProducer.java | 70 +- .../runtime/stream/ConverseStreamHandler.java | 7 +- .../integration/BedrockGuardrailsIT.java | 77 +- .../integration/BedrockProducerIT.java | 31 +- .../aws2/kinesis/Kinesis2Consumer.java | 3 +- .../component/aws2/s3/AWS2S3Producer.java | 8 +- .../component/aws2/ses/Ses2Producer.java | 6 +- .../eventgrid/EventGridConfiguration.java | 7 +- .../component/file/azure/FilesOperations.java | 5 +- .../servicebus/ServiceBusConfiguration.java | 4 +- .../blob/operations/BlobOperations.java | 3 +- .../blob/integration/BlobOperationsIT.java | 5 +- .../camel/component/bean/BeanComponent.java | 3 +- .../camel/component/bean/MethodInfo.java | 15 +- .../component/beanclass/ClassComponent.java | 3 +- .../bindy/BindyFixedLengthFactory.java | 6 +- .../bindy/csv/BindyCsvDataFormat.java | 2 +- .../format/factories/DateFormatFactory.java | 2 +- .../kvp/BindyKeyValuePairDataFormat.java | 2 +- .../BindyCsvClassTypeAsStringTest.java | 4 +- .../BindyCarQuoteAndCommaDelimiterTest.java | 2 +- ...yComplexCsvGenerateHeaderMarshallTest.java | 2 +- .../csv/BindyComplexCsvMarshallTest.java | 2 +- ...dyComplexCsvUnmarshallEmptyStreamTest.java | 3 +- .../csv/BindyComplexCsvUnmarshallTest.java | 3 +- ...CsvUnmarshallUnwrapSingleInstanceTest.java | 3 +- .../csv/BindyCsvBigFileUnmarshallTest.java | 3 +- .../BindyInlinedQuotesCsvUnmarshallTest.java | 2 +- .../bindy/csv/BindyPipeDelimiterTest.java | 4 +- .../csv/BindyPojoSimpleCsvMarshallTest.java | 2 +- ...indySimpleCsvBooleanFalseMarshallTest.java | 2 +- ...BindySimpleCsvBooleanTrueMarshallTest.java | 2 +- .../BindySimpleCsvBooleanUnmarshallTest.java | 2 +- ...dySimpleCsvGenerateHeaderMarshallTest.java | 2 +- ...impleCsvMandatoryFieldsUnmarshallTest.java | 3 +- .../csv/BindySimpleCsvMarshallDslTest.java | 2 +- ...SimpleCsvMarshallPositionModifiedTest.java | 2 +- .../bindy/csv/BindySimpleCsvMarshallTest.java | 2 +- .../BindySimpleCsvMarshallTrimClipTest.java | 2 +- .../csv/BindySimpleCsvNullMarshallTest.java | 2 +- .../BindySimpleCsvOneToManyMarshallTest.java | 2 +- ...mpleCsvRemoveWhitespaceUnmarshallTest.java | 3 +- ...ySimpleCsvSkipFirstLineUnmarshallTest.java | 3 +- ...indySimpleCsvUnmarshallBadIntegerTest.java | 3 +- ...mpleCsvUnmarshallPositionModifiedTest.java | 3 +- .../csv/BindySimpleCsvUnmarshallTest.java | 2 +- ...SingleQuoteStartWordCsvUnmarshallTest.java | 2 +- .../BindySingleQuotesCsvUnmarshallTest.java | 3 +- ...hDoubleQuotesInFieldCsvUnmarshallTest.java | 2 +- .../bindy/csv/BindyTabSeparatorTest.java | 2 +- ...yMarshalUnmarshalWithDefaultValueTest.java | 4 +- .../csv2/BindyMarshalUnmarshalssueTest.java | 4 +- .../bindy/csv2/BindyMarshalWithQuoteTest.java | 2 +- .../csv2/BindyUnmarshalCommaIssue2Test.java | 2 +- .../csv2/BindyUnmarshalCommaIssueTest.java | 2 +- ...indyComplexKeyValuePairStandaloneTest.java | 8 +- ...exOneToManyKeyValuePairUnMarshallTest.java | 2 +- ...indySimpleKeyValuePairMarshallDslTest.java | 2 +- .../BindySimpleKeyValuePairMarshallTest.java | 2 +- ...ndySimpleKeyValuePairNullMarshallTest.java | 2 +- ...ySimpleKeyValuePairSortedMarshallTest.java | 2 +- ...indySimpleKeyValuePairTabMarshallTest.java | 2 +- ...aluePairWithoutSectionMarshallDslTest.java | 2 +- .../box/BoxCollaborationsManagerIT.java | 13 +- .../component/box/BoxCommentsManagerIT.java | 11 +- .../component/box/BoxEventLogsManagerIT.java | 3 +- .../component/box/BoxFilesManagerIT.java | 40 +- .../component/box/BoxFoldersManagerIT.java | 19 +- .../component/box/BoxGroupsManagerIT.java | 16 +- .../component/box/BoxSearchManagerIT.java | 3 +- .../component/box/BoxTasksManagerIT.java | 14 +- .../component/box/BoxUsersManagerIT.java | 20 +- .../PaymentMethodNonceGatewayIT.java | 6 +- .../component/braintree/ReportGatewayIT.java | 3 +- .../SettlementBatchSummaryGatewayIT.java | 5 +- .../braintree/SubscriptionGatewayIT.java | 19 +- .../braintree/TransactionGatewayIT.java | 15 +- .../component/browse/BrowseComponent.java | 3 +- .../component/camunda/CamundaComponent.java | 6 +- .../org/apache/camel/coap/CoAPEndpoint.java | 3 +- .../component/cometd/CometdProducer.java | 3 +- ...metdProducerConsumerAuthenticatedTest.java | 2 +- .../controlbus/ControlBusComponent.java | 3 +- .../component/cxf/jaxrs/CxfConverter.java | 9 +- .../component/cxf/jaxrs/CxfRsBinding.java | 10 +- .../cxf/jaxrs/DefaultCxfRsBinding.java | 2 +- .../component/cxf/jaxws/CxfEndpoint.java | 4 +- .../component/cxf/jaxws/CxfProducer.java | 3 +- .../cxf/jaxws/DefaultCxfBinding.java | 6 +- .../cxf/jaxws/DefaultPayloadProviderSEI.java | 3 +- .../jaxws/CxfProducerProtocalHeaderTest.java | 3 +- .../cxf/jaxws/CxfProducerRouterTest.java | 12 +- .../component/cxf/jaxws/CxfProducerTest.java | 5 +- .../cxf/jaxws/DefaultCxfBindingTest.java | 39 +- .../cxf/jaxws/EchoServiceSessionImpl.java | 3 +- .../cxf/multipart/MultiPartInvokeImpl.java | 11 +- .../cxf/soap/headers/HeaderTesterImpl.java | 10 +- .../HeaderTesterWithInsertionImpl.java | 3 +- .../camel/non_wrapper/PersonProcessor.java | 5 +- .../apache/camel/wsdl_first/PersonImpl12.java | 3 +- .../camel/wsdl_first/PersonProcessor.java | 5 +- .../cxf/spring/jaxws/CxfSpringEndpoint.java | 6 +- .../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 +- .../apache/camel/component/cxf/HelloImpl.java | 3 +- .../mtom/CxfMtomProducerPayloadModeTest.java | 3 +- .../camel/component/cxf/mtom/HelloImpl12.java | 7 +- .../component/cxf/mtom/MtomTestHelper.java | 3 +- .../cxf/multipart/CXFMultiPartTest.java | 5 +- .../cxf/multipart/MultiPartInvokeImpl.java | 11 +- .../headers/CxfMessageHeadersRelayTest.java | 12 +- .../cxf/soap/headers/HeaderTesterImpl.java | 10 +- .../HeaderTesterWithInsertionImpl.java | 3 +- .../spring/CxfEndpointBeansRouterTest.java | 3 +- .../cxf/wssecurity/server/GreeterImpl.java | 10 +- .../camel/non_wrapper/PersonProcessor.java | 5 +- .../apache/camel/wsdl_first/PersonImpl12.java | 3 +- .../camel/wsdl_first/PersonProcessor.java | 5 +- .../common/header/CxfHeaderHelperTest.java | 13 +- .../common/message/CxfMessageHelperTest.java | 5 +- .../message/DefaultCxfMessageMapperTest.java | 2 +- .../cxf/transport/CamelConduitTest.java | 3 +- .../cxf/transport/JaxWSCamelTestSupport.java | 6 +- .../cxf/transport/CamelDestination.java | 4 +- .../cxf/transport/CamelOutputStream.java | 11 +- .../transport/message/CxfMessageHelper.java | 6 +- .../message/DefaultCxfMessageMapper.java | 18 +- .../common/header/CxfHeaderHelperTest.java | 13 +- .../common/message/CxfMessageHelperTest.java | 5 +- .../message/DefaultCxfMessageMapperTest.java | 2 +- .../cxf/transport/JaxWSCamelTestSupport.java | 6 +- .../component/dataset/DataSetComponent.java | 3 +- .../dataset/DataSetTestComponent.java | 3 +- .../apache/camel/language/datasonnet/CML.java | 9 +- .../datasonnet/DatasonnetExpression.java | 4 +- .../debezium/DebeziumConsumerTest.java | 3 +- .../camel/component/dhis2/Dhis2Component.java | 3 +- .../camel/component/dhis2/Dhis2DeleteIT.java | 3 +- .../camel/component/dhis2/Dhis2GetIT.java | 3 +- .../camel/component/dhis2/Dhis2PostIT.java | 3 +- .../camel/component/dhis2/Dhis2PutIT.java | 3 +- .../camel/diagram/RouteDiagramRenderer.java | 5 +- .../docker/it/FakeDockerCmdExecFactory.java | 6 +- .../camelevent/CamelEventComponent.java | 3 +- .../component/fhir/FhirCapabilitiesIT.java | 5 +- .../camel/component/fhir/FhirOperationIT.java | 6 +- .../component/file/GenericFileEndpoint.java | 5 +- .../flink/DataStreamConfigurationIT.java | 7 +- .../flink/DataStreamEdgeCasesIT.java | 4 +- .../flink/DataStreamProducerTest.java | 3 +- .../file/remote/CamelFTPParserFactory.java | 3 +- .../RemoteFileProducerPreWriteCheckTest.java | 3 +- .../producer/PullRequestFilesProducer.java | 4 +- .../google/calendar/CalendarAclIT.java | 3 +- .../calendar/CalendarCalendarListIT.java | 4 +- .../google/calendar/CalendarColorsIT.java | 3 +- .../google/calendar/CalendarEventsIT.java | 7 +- .../google/calendar/CalendarFreebusyIT.java | 5 +- .../google/calendar/CalendarSettingsIT.java | 6 +- .../InteractiveGoogleDriveClientFactory.java | 3 +- .../component/google/drive/DriveAboutIT.java | 3 +- .../google/drive/DriveChangesIT.java | 7 +- .../google/drive/DriveCommentsIT.java | 9 +- .../component/google/drive/DriveFilesIT.java | 3 +- .../google/drive/DrivePermissionsIT.java | 2 +- .../google/drive/DriveRepliesIT.java | 10 +- .../google/drive/DriveRevisionsIT.java | 3 +- .../google/drive/FileConverterIT.java | 2 +- .../google/drive/FilesConsumerIT.java | 2 +- .../drive/GoogleDriveFilesConverterTest.java | 5 +- .../mail/stream/GoogleMailStreamConsumer.java | 4 +- .../component/google/mail/GmailUsersIT.java | 3 +- .../google/mail/GmailUsersLabelsIT.java | 7 +- .../google/mail/GmailUsersMessagesIT.java | 5 +- .../google/mail/GmailUsersThreadsIT.java | 6 +- .../storage/localstorage/FakeStorageRpc.java | 3 +- .../vertexai/GoogleVertexAIProducer.java | 4 +- .../camel/groovy/json/NodeToJsonHelper.java | 8 +- .../HazelcastReliableTopicConsumerTest.java | 3 +- .../hazelcast/HazelcastTopicConsumerTest.java | 3 +- .../component/hl7/Hl7TerserLanguage.java | 3 +- .../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 +- .../huaweicloud/dms/DMSComponent.java | 3 +- .../frs/FaceRecognitionComponent.java | 3 +- .../apache/camel/FunctionGraphComponent.java | 3 +- .../huaweicloud/iam/IAMComponent.java | 3 +- .../image/ImageRecognitionComponent.java | 3 +- .../huaweicloud/obs/OBSComponent.java | 3 +- .../smn/SimpleNotificationComponent.java | 3 +- .../component/ibm/cos/IBMCOSConsumer.java | 10 +- .../ibm/cos/integration/IBMCOSConsumerIT.java | 9 +- .../IBMCOSConsumerMoveAfterReadIT.java | 9 +- .../discovery/WatsonDiscoveryProducer.java | 3 +- .../stt/WatsonSpeechToTextProducer.java | 5 +- .../stt/integration/WatsonSpeechToTextIT.java | 3 +- .../component/ical/ICalDataFormatTest.java | 2 +- .../component/iggy/IggyFetchRecords.java | 5 +- .../iggy/client/IggyClientFactory.java | 10 +- .../component/iggy/IggyConfigurationTest.java | 5 +- .../influxdb2/InfluxDb2Component.java | 3 +- .../component/ironmq/IronMQConsumer.java | 2 +- .../converter/JacksonConversionsPojoTest.java | 5 +- .../converter/jaxb/address/package-info.java | 7 +- .../converter/jaxb/message/package-info.java | 4 +- .../converter/jaxb/person/package-info.java | 7 +- .../jetty12/JettyHttpComponent12.java | 12 +- .../RestJettyNoContentRestConfigTest.java | 8 +- .../jetty/rest/RestJettyNoContentTest.java | 8 +- .../OAuthAsynchronousHttpClientFactory.java | 3 +- .../jms/FromTextToBytesMessageTest.java | 16 +- .../camel/component/jms/JmsBindingTest.java | 2 +- .../jms/JmsObjectMessageEnabledTest.java | 4 +- .../jpa/JpaRouteSkipLockedEntityTest.java | 2 +- .../camel/component/scp/ScpComponent.java | 3 +- .../component/scp/ScpCertUserAuthIT.java | 6 +- .../jsonpatch/JsonPatchComponent.java | 3 +- .../org/apache/camel/jsonpath/JsonStream.java | 9 +- ...tionErrorHandlerGracePeriodShutdownIT.java | 6 +- .../kafka/DefaultKafkaClientFactory.java | 6 +- .../component/kafka/KafkaFetchRecords.java | 3 +- .../camel/component/kafka/KafkaProducer.java | 12 +- .../KafkaRecordBatchingProcessor.java | 5 +- .../component/kafka/KafkaProducerTest.java | 5 +- ...FirstErrorOffUsingKafkaManualCommitIT.java | 5 +- ...kaBreakOnFirstErrorReleaseResourcesIT.java | 5 +- ...aBreakOnFirstErrorReplayOldMessagesIT.java | 5 +- .../KafkaBreakOnFirstErrorSeekIssueIT.java | 5 +- ...rorWithBatchUsingAsyncCommitManagerIT.java | 5 +- ...rrorWithBatchUsingKafkaManualCommitIT.java | 5 +- ...ithBatchUsingKafkaManualCommitRetryIT.java | 5 +- ...rrorWithBatchUsingSyncCommitManagerIT.java | 5 +- .../KafkaConsumerAsyncManualCommitIT.java | 5 +- .../integration/KafkaConsumerAuthIT.java | 5 +- .../KafkaConsumerAuthInvalidIT.java | 5 +- ...fkaConsumerAuthInvalidWithReconnectIT.java | 5 +- .../KafkaConsumerAuthManualTest.java | 5 +- .../integration/KafkaConsumerBatchSizeIT.java | 5 +- ...KafkaConsumerCustomSubscribeAdapterIT.java | 5 +- .../integration/KafkaConsumerFullIT.java | 5 +- .../KafkaConsumerGroupProtocolIT.java | 7 +- .../KafkaConsumerIdempotentTestSupport.java | 5 +- .../KafkaConsumerLastRecordHeaderIT.java | 5 +- .../KafkaConsumerSaslAuthTypeIT.java | 5 +- .../integration/KafkaConsumerStopIT.java | 5 +- .../KafkaConsumerTopicIsPatternIT.java | 5 +- .../integration/KafkaProducerFullIT.java | 33 +- .../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 +- .../pause/KafkaPausableConsumerIT.java | 5 +- .../component/kamelet/KameletProcessor.java | 3 +- .../component/keycloak/KeycloakConsumer.java | 3 +- .../security/KeycloakSecurityHelper.java | 7 +- .../security/KeycloakSecurityProcessor.java | 3 +- .../security/KeycloakTokenIntrospector.java | 6 +- .../keycloak/KeycloakConsumerIT.java | 12 +- .../keycloak/KeycloakTestInfraIT.java | 7 +- .../security/KeycloakSecurityHelperTest.java | 25 +- .../keycloak/security/KeycloakSecurityIT.java | 39 +- .../security/KeycloakSecurityTestInfraIT.java | 10 +- .../KeycloakTokenIntrospectorTest.java | 7 +- .../ConfigMapBinaryPropertiesFunction.java | 4 +- .../ConfigMapPropertiesFunction.java | 4 +- .../SecretBinaryPropertiesFunction.java | 4 +- .../properties/SecretPropertiesFunction.java | 4 +- .../component/language/LanguageComponent.java | 3 +- .../integ5/ServerAnnotationProcessor.java | 5 +- .../integ5/ServerAnnotationProcessor.java | 5 +- .../camel/component/log/LogComponent.java | 3 +- .../component/mail/MailAuthenticator.java | 3 +- .../camel/component/mail/MailBinding.java | 2 +- .../mapstruct/MapstructComponent.java | 3 +- .../CamelOpenTelemetryExtension.java | 3 +- ...rvabilityTracerPropagationTestSupport.java | 3 +- .../FaultToleranceProcessor.java | 3 +- .../camel/component/milo/KeyStoreLoader.java | 3 +- .../mina/MinaSftpCertificateProvider.java | 13 +- .../file/remote/mina/MinaSftpOperations.java | 5 +- .../mina/MinaSftpServerKeyVerifier.java | 3 +- .../component/mllp/internal/Hl7Util.java | 3 +- .../camel/component/mock/MockComponent.java | 3 +- .../mongodb/SslAwareMongoClient.java | 3 +- .../MongoDbIdempotentRepository.java | 3 +- .../camel/language/mvel/MvelExpression.java | 7 +- .../camel/language/mvel/MvelLanguage.java | 5 +- .../netty/http/SecurityConstraintMapping.java | 5 +- .../http/NettyHttpSSLHandshakeErrorTest.java | 6 +- .../apache/camel/oauth/vertx/VertxOAuth.java | 8 +- .../camel/test/oauth/SSLCertTrustTest.java | 3 +- .../MicrometerObservationTracer.java | 6 +- .../dataformat/ocsf/OcsfEventExampleTest.java | 8 +- .../camel/openapi/RestModelConverters.java | 9 +- ...estOpenApiReaderFileResponseModelTest.java | 4 +- .../nova/producer/FlavorsProducer.java | 2 +- .../openstack/glance/GlanceProducerTest.java | 2 +- .../openstack/nova/FlavorProducerTest.java | 2 +- .../openstack/nova/ServerProducerTest.java | 2 +- .../OpenTelemetrySpanAdapter.java | 9 +- .../CamelOpenTelemetryExtension.java | 3 +- .../mock/MockHttpComponent.java | 7 +- .../opentelemetry2/mock/MockHttpEndpoint.java | 14 +- .../opentelemetry2/mock/MockHttpProducer.java | 10 +- .../mock/MockHttpSpanDecorator.java | 4 +- .../mock/MockKafkaComponent.java | 7 +- .../mock/MockKafkaEndpoint.java | 14 +- .../mock/MockKafkaProducer.java | 10 +- .../mock/MockKafkaSpanDecorator.java | 4 +- .../camel/dataformat/parquet/avro/Pojo.java | 6 +- .../component/plc4x/Plc4XConsumerTest.java | 3 +- .../pqc/crypto/hybrid/HybridKEM.java | 13 +- .../AwsSecretsManagerKeyLifecycleManager.java | 37 +- .../FileBasedKeyLifecycleManager.java | 37 +- .../HashicorpVaultKeyLifecycleManager.java | 37 +- .../component/pqc/lifecycle/KeyMetadata.java | 3 +- .../pqc/AwsSecretsManagerKeyLifecycleIT.java | 3 +- .../pqc/HashicorpVaultKeyLifecycleIT.java | 3 +- .../pqc/PQCEndToEndIntegrationTest.java | 6 +- .../component/pqc/PQCKeyLifecycleTest.java | 3 +- .../pqc/PQCSignatureWithKeyStoreTest.java | 2 +- .../pqc/PQCStatefulKeyTrackingTest.java | 9 +- .../component/printer/PrinterPrintTest.java | 2 +- .../routepolicy/quartz/MyRoutePolicy.java | 3 +- .../camel/component/ref/RefComponent.java | 3 +- .../resilience4j/ResilienceProcessor.java | 3 +- .../rest/openapi/RestOpenApiEndpoint.java | 7 +- .../openapi/WireMockJettyServerFactory.java | 3 +- .../component/rest/RestApiComponent.java | 3 +- .../camel/component/rest/RestComponent.java | 3 +- .../camel/component/saga/SagaComponent.java | 3 +- .../salesforce/StreamingApiConsumer.java | 10 +- .../salesforce/api/dto/bulk/package-info.java | 7 +- .../internal/SalesforceSession.java | 4 +- .../internal/client/DefaultBulkApiClient.java | 3 +- .../sforce/eventbus/CamelEventMessage__e.java | 67 +- .../salesforce/StreamingApiConsumerTest.java | 9 +- .../salesforce/dto/generated/Account.java | 20 +- .../salesforce/dto/generated/Asset.java | 21 +- .../salesforce/dto/generated/Contact.java | 39 +- .../dto/generated/ContentVersion.java | 44 +- .../apache/camel/builder/saxon/XPathTest.java | 2 +- .../scheduler/SchedulerComponent.java | 3 +- .../processor/ClassPathURIResolver.java | 4 +- .../processor/SchematronProcessorFactory.java | 3 +- .../processor/TemplatesFactory.java | 3 +- .../processor/SchematronProcessorTest.java | 3 +- .../RestServletNoContentRestConfigTest.java | 8 +- .../rest/RestServletNoContentTest.java | 8 +- .../camel/component/sjms/SjmsHelper.java | 10 +- .../SimpleMessageListenerContainer.java | 6 +- .../SjmsObjectMessageEnabledTest.java | 4 +- .../camel/component/smb/SmbOperations.java | 3 +- .../component/smb/AbstractSmbRenameIT.java | 3 +- .../camel/component/smpp/SmppSmCommand.java | 3 +- .../camel/dataformat/soap/SoapDataFormat.java | 5 +- .../name/ServiceInterfaceStrategyTest.java | 3 +- .../soap/name/testpackage/package-info.java | 5 +- .../integration/SolrInsertAndDeleteTest.java | 3 +- .../splunkhec/SplunkHECProducerTest.java | 3 +- .../springai/chat/SpringAiChatProducer.java | 2 +- .../chat/SpringAiChatComponentTest.java | 4 +- .../chat/SpringAiChatToolsIntegrationIT.java | 3 +- .../chat/SpringAiChatWrappedFileIT.java | 6 +- .../springai/image/SpringAiImageOllamaIT.java | 3 +- .../springai/tools/SpringAiToolsEndpoint.java | 12 +- .../SpringAiVectorStoreProducer.java | 4 +- .../SpringAiVectorStoreComponentTest.java | 13 +- .../javacrumbs/calc/model/package-info.java | 7 +- .../spring/ws/jaxb/package-info.java | 7 +- .../apache/camel/spring/xml/package-info.java | 7 +- .../interceptor/AnnotatedConsumeImpl.java | 3 +- .../processor/SpringCustomExpressionTest.java | 3 +- .../DefaultPackageScanClassResolverTest.java | 14 +- .../spring/scan/PackageScanFiltersTest.java | 8 +- .../PatternBasedPackageScanFilterTest.java | 2 +- .../camel/spring/scan/a/ScanTargetOne.java | 4 +- .../component/stax/StaxStreamXMLReader.java | 2 +- .../handlers/TahuHostApplicationManualIT.java | 3 +- .../apache/camel/telemetrydev/DevTrace.java | 3 +- .../camel/telemetry/mock/MockTrace.java | 3 +- .../junit5/params/ParameterizedExtension.java | 10 +- .../junit6/params/ParameterizedExtension.java | 10 +- .../thrift/generated/Calculator.java | 2337 ++++++++--------- .../thrift/generated/InvalidOperation.java | 185 +- .../component/thrift/generated/Operation.java | 11 +- .../component/thrift/generated/Work.java | 226 +- .../thrift/generated/Operation.java | 11 +- .../dataformat/thrift/generated/Work.java | 226 +- .../camel/component/timer/TimerComponent.java | 3 +- .../UndertowHeaderFilterStrategy.java | 3 +- .../undertow/spi/ProviderWithServletTest.java | 2 +- .../undertow/ws/UndertowWssRouteTest.java | 3 +- .../validator/ValidatorComponent.java | 3 +- .../VertxHttpMaximumRedeliveriesTest.java | 3 +- .../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 +- .../SignatureDigestMethodTest.java | 2 +- .../xmlsecurity/EncryptionAlgorithmTest.java | 2 +- .../dataformat/xmlsecurity/TestHelper.java | 3 +- .../xmlsecurity/XMLEncryption11Test.java | 2 +- .../SaxonXmlSourceHandlerFactoryImpl.java | 25 +- .../camel/component/zeebe/ZeebeComponent.java | 3 +- .../ZipSplitterUseOriginalMessageTest.java | 2 +- .../java/org/apache/camel/CamelContext.java | 2 +- .../apache/camel/FluentProducerTemplate.java | 3 +- .../java/org/apache/camel/package-info.java | 7 +- .../camel/spi/CamelBeanPostProcessor.java | 6 +- .../engine/DefaultCamelBeanPostProcessor.java | 5 +- .../impl/engine/DefaultConsumerTemplate.java | 2 +- .../impl/engine/DefaultProducerTemplate.java | 2 +- .../impl/engine/DurationRoutePolicy.java | 3 +- .../camel/impl/engine/RouteService.java | 3 +- .../camel/impl/console/ReceiveDevConsole.java | 9 +- .../language/constant/ConstantLanguage.java | 3 +- .../camel/language/csimple/CSimpleHelper.java | 5 +- .../camel/language/header/HeaderLanguage.java | 3 +- .../camel/language/ref/RefLanguage.java | 3 +- .../language/simple/ast/OtherExpression.java | 8 +- .../language/tokenizer/TokenizeLanguage.java | 3 +- .../language/variable/VariableLanguage.java | 3 +- .../LegacyDefaultErrorHandlerBuilder.java | 3 +- .../apache/camel/builder/RouteBuilder.java | 5 +- .../model/BasicOutputExpressionNode.java | 5 +- .../apache/camel/model/BeanModelHelper.java | 7 +- .../camel/model/SetHeadersDefinition.java | 3 +- .../camel/model/SetVariablesDefinition.java | 3 +- .../camel/model/TransactedDefinition.java | 5 +- .../apache/camel/model/app/package-info.java | 7 +- .../camel/model/config/package-info.java | 7 +- .../camel/model/dataformat/package-info.java | 7 +- .../DefaultErrorHandlerDefinition.java | 3 +- .../model/errorhandler/package-info.java | 7 +- .../camel/model/language/package-info.java | 7 +- .../model/loadbalancer/package-info.java | 7 +- .../org/apache/camel/model/package-info.java | 7 +- .../apache/camel/model/rest/package-info.java | 7 +- .../camel/model/tokenizer/package-info.java | 7 +- .../camel/model/transformer/package-info.java | 7 +- .../camel/model/validator/package-info.java | 7 +- .../apache/camel/processor/RecipientList.java | 3 +- .../camel/reifier/AbstractPolicyReifier.java | 3 +- .../apache/camel/reifier/AbstractReifier.java | 2 +- .../camel/reifier/SetHeadersReifier.java | 5 +- .../camel/reifier/SetVariablesReifier.java | 5 +- .../camel/reifier/TransactedReifier.java | 3 +- .../apache/camel/core/xml/package-info.java | 7 +- .../core/xml/util/jsse/package-info.java | 9 +- .../camel/builder/ExpressionBuilderTest.java | 2 +- .../component/browse/BrowseFilterTest.java | 3 +- ...PropertiesComponentLoadPropertiesTest.java | 3 +- ...opertiesComponentReloadPropertiesTest.java | 7 +- .../PropertiesComponentResolvedValueTest.java | 3 +- .../xslt/XsltTransformingExceptionTest.java | 6 +- .../stream/CachedOutputStreamTest.java | 9 +- .../DefaultComponentAutowiredFalseTest.java | 3 +- .../impl/DefaultComponentAutowiredTest.java | 9 +- .../camel/impl/DummyLifecycleStrategy.java | 8 +- .../org/apache/camel/impl/engine/MyBean.java | 4 +- .../camel/model/SetHeadersDefinitionTest.java | 6 +- .../model/SetVariablesDefinitionTest.java | 6 +- ...nRecipientListInterfaceAnnotationTest.java | 3 +- .../processor/BeanRecipientListTest.java | 3 +- .../DynamicRouterAnnotationTest.java | 3 +- .../RecipientListBeanOnPrepareTest.java | 3 +- .../RecipientListBeanSubUnitOfWorkTest.java | 3 +- ...pientListFineGrainedErrorHandlingTest.java | 3 +- ...tParallelFineGrainedErrorHandlingTest.java | 3 +- .../RecipientListReturnValueTest.java | 3 +- .../processor/SetHeadersProcessorTest.java | 5 +- .../processor/SetVariablesProcessorTest.java | 5 +- .../SimpleProcessorTraceableTest.java | 3 +- .../camel/support/component/TestProxy.java | 13 +- .../camel/impl/health/ContextHealthCheck.java | 3 +- .../health/RouteControllerHealthCheck.java | 3 +- .../health/SecurityPolicyHealthCheck.java | 3 +- .../main/DefaultConfigurationConfigurer.java | 2 +- .../main/SecurityConfigurationProperties.java | 3 +- .../main/MainComponentAutowiredFalseTest.java | 3 +- .../org/apache/camel/main/MainSSLTest.java | 8 +- .../MainSecurityPolicyHealthCheckTest.java | 6 +- .../DefaultManagementObjectNameStrategy.java | 3 +- .../JmxManagementStrategyFactory.java | 5 +- .../ManagedRouteGroupLastErrorTest.java | 2 +- .../camel/management/ManagedTimerTest.java | 3 +- .../apache/camel/support/DefaultRegistry.java | 4 +- .../support/LifecycleStrategySupport.java | 8 +- .../camel/support/LocalBeanRegistry.java | 2 +- .../camel/support/PropertyBindingSupport.java | 2 +- .../support/builder/ExpressionBuilder.java | 6 +- .../camel/support/jndi/JndiContext.java | 7 +- .../camel/support/scan/PackageScanHelper.java | 3 +- .../java/org/apache/camel/util/IOHelper.java | 3 +- .../org/apache/camel/util/ObjectHelper.java | 8 +- .../camel/converter/jaxp/XmlConverter.java | 8 +- .../support/builder/xml/NamespacesHelper.java | 2 +- .../builder/xml/XMLConverterHelper.java | 4 +- .../camel/util/xml/StreamSourceCache.java | 3 +- .../camel/yaml/out/XPathNamespacesTest.java | 2 +- .../jbang/core/commands/DependencyList.java | 3 +- .../dsl/jbang/core/commands/Explain.java | 5 +- .../core/commands/ExportBaseCommand.java | 7 +- .../camel/dsl/jbang/core/commands/Harden.java | 5 +- .../camel/dsl/jbang/core/commands/Init.java | 3 +- .../camel/dsl/jbang/core/commands/Run.java | 2 +- .../dsl/jbang/core/commands/RunHelper.java | 3 +- .../jbang/core/commands/SBOMGenerator.java | 7 +- .../commands/action/ActionBaseCommand.java | 3 +- .../action/CamelRouteDiagramAction.java | 3 +- .../dsl/jbang/core/common/PathUtils.java | 3 +- .../dsl/jbang/core/commands/ExportTest.java | 3 +- .../action/CamelRouteDiagramActionTest.java | 28 +- .../core/commands/mcp/TransformTools.java | 3 +- .../mcp/DependencyCheckToolsTest.java | 4 +- .../core/commands/mcp/DiagnoseToolsTest.java | 4 +- .../commands/mcp/TestScaffoldToolsTest.java | 3 +- .../commands/generate/GeneratePlugin.java | 2 +- .../KubernetesExportKnativeTest.java | 5 +- .../core/commands/tui/CamelCatalogTui.java | 3 +- .../jbang/core/commands/tui/CamelMonitor.java | 22 +- .../jbang/core/commands/tui/TuiPlugin.java | 2 +- ...pendencyDownloaderPropertiesComponent.java | 3 +- .../deserializers/KameletDeserializer.java | 2 +- ...OutputAwareFromDefinitionDeserializer.java | 3 +- ...teConfigurationDefinitionDeserializer.java | 5 +- .../RouteDefinitionDeserializer.java | 3 +- .../RouteTemplateDefinitionDeserializer.java | 8 +- .../TemplatedRouteDefinitionDeserializer.java | 6 +- parent/pom.xml | 36 - .../cli/services/CliLocalProcessService.java | 3 +- .../infra/iggy/services/IggyContainer.java | 5 +- .../kafka/services/ConfluentContainer.java | 4 +- .../kafka/services/StrimziContainer.java | 4 +- .../AudioTranscriptionResponseBuilder.java | 10 +- .../itest/security/GreeterClientTest.java | 6 +- .../itest/utils/extensions/GreeterImpl.java | 10 +- .../tooling/maven/MavenDownloaderImpl.java | 6 +- .../camel/tooling/model/JsonMapper.java | 9 +- .../apache/camel/util/json/JsonObject.java | 4 +- .../org/apache/camel/util/json/Yylex.java | 24 +- .../PrepareCamelJBangCommandsMojo.java | 2 +- .../packaging/UpdateSensitizeHelper.java | 5 +- .../camel/maven/packaging/XRefCheckMojo.java | 2 +- .../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 8a9d10f6f3972..fe24b048a899a 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 0ff0f194da5f5..17e4bf65240ae 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 1d71aedf8a6c5..2ad5731fc2e8b 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 b35fc2fe0b02d..46e6161f87be9 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 @@ private static Document createDocument() throws ParserConfigurationException { 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 eaede66b7b0e1..cf10c7f8e48c4 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 void setConnectionFactory(ConnectionFactory connectionFactory) { @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 f683719c3dbc7..c37b68c6e5821 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 void setConnectionFactory(ConnectionFactory connectionFactory) { @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 3e08671390ec9..866d742505f0a 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 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 @@ private void processChunkHierarchical(Exchange exchange) throws Exception { } 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 @@ private DocumentMetadata parseMetadataFromJson(String jsonOutput, String inputPa if (configuration.isIncludeRawMetadata()) { JsonNode rootNode = objectMapper.readTree(jsonOutput); @SuppressWarnings("unchecked") - Map rawMap = objectMapper.convertValue(rootNode, Map.class); + Map 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 6855582acb74b..d541d5155b710 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 @@ 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 @@ void customArgsWithOutputFlagAreRejected() throws Exception { 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 @@ void customArgsWithOutputEqualsFormAreRejected() throws Exception { 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 @@ void customArgsWithShortOutputFlagAreRejected() throws Exception { 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 @@ void customArgsWithPathTraversalAreRejected() throws Exception { 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 @@ void customArgsWithPathTraversalAreRejected() throws Exception { @Test void customArgsWithNullEntryAreRejected() throws Exception { Path inputFile = createInputFile(); - List argsWithNull = new ArrayList<>(); + List 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 @@ void safeCustomArgsPassValidation() throws Exception { 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 @@ void customArgsWithSemicolonAreRejected() throws Exception { 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 @@ void customArgsWithPipeAreRejected() throws Exception { 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 @@ void customArgsWithBacktickAreRejected() throws Exception { 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 @@ void customArgsWithCommandSubstitutionAreRejected() throws Exception { 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 @@ void customArgsWithUnknownFlagAreRejected() throws Exception { 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 @@ void customArgsWithUnknownShortFlagAreRejected() throws Exception { 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 @@ void customArgsWithVerbosityLevelsAreAccepted() throws Exception { 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 @@ void customArgsWithNormalizedPathTraversalAreRejected() throws Exception { 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 6650531c18bda..102a60919cdd8 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 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 @@ public void configure() { // 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 9aacf83c2e607..ab4987c5f94da 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.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 @@ public void testBatchSplitWithSplitter() throws Exception { getMockEndpoint("mock:individual-result").assertIsSatisfied(); // Verify each exchange contains a BatchConversionResult - List exchanges = getMockEndpoint("mock:individual-result").getReceivedExchanges(); + List 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 26b5881befd13..4e14a1ee409fd 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.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 @@ void testAsyncConversionWithHeaderOverride() throws Exception { // Use sync endpoint but override with async header String result = template.requestBodyAndHeaders("direct:convert-markdown-serve", testFile.toString(), - new HashMap() { + new java.util.HashMap() { { 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 9886e2e63a818..d419182e04f77 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 @@ void testMetadataExtractionFromPdf() throws Exception { 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 65ea85617afb2..ae38a94886924 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.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 static List> parseGuardrailClasses(String[] guardrailClassNames) .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 12a682d07ad03..f1eec10a3beaa 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 void testParseGuardrailClasses_WithValidClasses() { 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 void testParseGuardrailClasses_WithExtraWhitespace() { 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 void testParseGuardrailClasses_WithEmptyClassNames() { 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 void testParseGuardrailClasses_WithValidClassesArray() { 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 void testParseGuardrailClasses_WithArrayContainingEmptyStrings() { 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 63a2a369a4f98..d976b2b9bdbe4 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 @@ void testBuilderCustomPattern() { .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 e5d7b5bc9ba92..a89be750949e6 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 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 @@ void shouldFailForUnsupportedMimeType() { "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 0f1dc2c6d5dd9..27d3c42507dce 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 void configure() { .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 7a5a61c183cbd..e0c796b84782a 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 @@ private void add(Exchange exchange) throws Exception { } 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 b6299623681a3..d7ec1238b56b7 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 @@ 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 { @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 dce9bef4cef78..098ae56c21da1 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 @@ 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 { @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 1c94393fad0ce..7d0b9f314f442 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 @@ 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 { @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 8d6cf162dede0..e16f58844611f 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 @@ 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 { @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 f6f517c326318..d6cfa158663b2 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 @@ 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 { @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 fbcb313eda928..351e750b33f5a 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 @@ private void retrieveNodes(Exchange exchange) throws NoSuchHeaderException { if (!matchMap.isEmpty()) { StringBuilder whereClause = new StringBuilder(); - queryParams = new HashMap<>(); + queryParams = new java.util.HashMap<>(); int paramIndex = 0; for (Map.Entry entry : matchMap.entrySet()) { @@ -257,7 +256,7 @@ private void deleteNode(Exchange exchange) throws NoSuchHeaderException { if (!matchMap.isEmpty()) { StringBuilder whereClause = new StringBuilder(); - queryParams = new HashMap<>(); + queryParams = new java.util.HashMap<>(); int paramIndex = 0; for (Map.Entry 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 7d257f597de5d..e5c6da160c70b 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.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 @@ private void configureSsl(OpenAIOkHttpClient.Builder builder) throws Exception { 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 7ee69d7b358de..e87a75f2d1973 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 @@ private void updateConversationHistory( } private ResponseFormatJsonSchema.JsonSchema.Schema buildSchemaFromJson(String jsonSchemaString) throws Exception { - Map root = OBJECT_MAPPER.readValue(jsonSchemaString, Map.class); + java.util.Map 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 e : root.entrySet()) { + for (java.util.Map.Entry 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 a73bbe579e6e1..dace6655acccd 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 @@ void streamingChatReturnsIteratorOfChunks() { 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 84ad1ab7c0b95..c84dc91b90fdc 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 @@ void createClientWithInvalidTruststoreLocationFails() { + "&sslTruststoreLocation=/nonexistent/truststore.jks" + "&sslTruststorePassword=" + STORE_PASSWORD)); - assertHasRootCause(exception, FileNotFoundException.class); + assertHasRootCause(exception, java.io.FileNotFoundException.class); } @Test @@ -158,7 +155,7 @@ void createClientWithInvalidKeystoreLocationFails() { + "&sslKeystoreLocation=/nonexistent/keystore.jks" + "&sslKeystorePassword=" + STORE_PASSWORD)); - assertHasRootCause(exception, FileNotFoundException.class); + assertHasRootCause(exception, java.io.FileNotFoundException.class); } @Test @@ -172,7 +169,7 @@ void createClientWithInvalidTruststoreTypeFails() { + "&sslTruststorePassword=" + STORE_PASSWORD + "&sslTruststoreType=INVALID")); - assertHasRootCause(exception, KeyStoreException.class); + assertHasRootCause(exception, java.security.KeyStoreException.class); } private static void assertHasRootCause(Throwable throwable, Class 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 1504cd7eb5ac5..0779966bd4419 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.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 @@ void chatOverTlsWithSslContextParameters() { @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 d65009ccded23..e8db1b11eaf09 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 static String getParameterValue(Header[] headers, String headerName, Stri 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 5e11779f6ca4e..1852f5d530de6 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.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 @@ private static HttpEntity findSignedDataEntity( = 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 968c3b03b6e8d..b1b665cae0739 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.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 static void setUpOnce() throws Exception { 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 51901d5622a5f..5dcaf3192c66a 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.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 static void setUpOnce() throws Exception { 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 c8b63822e92b4..2ab7f4809508b 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.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 @@ protected RouteBuilder createRouteBuilder() { 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 81e583edf5d9f..65a4fa0346a85 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 void configure() { // 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 b3f9a6114d802..811007d5ab82d 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 @@ protected HttpCoreContext sendToPath(String requestUri, AS2MessageStructure stru 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 d857cffa75063..6d47cf8c1804c 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 java.lang.Object get(int field$) { case 0: return key; default: - throw new AvroRuntimeException("Bad index"); + throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -57,7 +50,7 @@ public void put(int field$, java.lang.Object value$) { 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 void setKey(java.lang.CharSequence value) { } /** 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 - implements RecordBuilder { + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { 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 java.lang.CharSequence getKey() { } /** 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 boolean hasKey() { } /** 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 Key build() { 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 68afd461512f9..b7471ec9e5dc3 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\"}],\"response\":\"Value\"}}}"); - 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 callback) - throws IOException; + throws java.io.IOException; void get( - Key key, - org.apache.avro.ipc.Callback callback) - throws IOException; + org.apache.camel.avro.generated.Key key, + org.apache.avro.ipc.Callback 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 7f7c7a09e199e..6f8d90d824360 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 java.lang.Object get(int field$) { case 0: return value; default: - throw new AvroRuntimeException("Bad index"); + throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -57,7 +50,7 @@ public void put(int field$, java.lang.Object value$) { 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 void setValue(java.lang.CharSequence value) { } /** 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 - implements RecordBuilder { + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { 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 java.lang.CharSequence getValue() { } /** 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 boolean hasValue() { } /** 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 Value build() { 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 c74128f9840fb..0e428fc559f79 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 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 d23101faa6db3..30748226353ea 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 @@ private void addLogicalTypeConversions() { 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 5d998b9c69579..5aa631103deee 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 ENCODER = new BinaryMessageEncoder<>(MODEL$, SCHEMA$); @@ -100,7 +81,7 @@ public static BinaryMessageDecoder createDecoder(SchemaStore resolve * @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 ByteBuffer toByteBuffer() throws IOException { * @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 DateRecord() { * @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 SpecificData getSpecificData() { } @Override - public Schema getSchema() { + public org.apache.avro.Schema getSchema() { return SCHEMA$; } @@ -167,10 +148,10 @@ public Object get(int field$) { 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 void put(int field$, Object value$) { * * @return The value of the 'date' field. */ - public LocalDate getDate() { + public java.time.LocalDate getDate() { return date; } @@ -191,7 +172,7 @@ public LocalDate getDate() { * * @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 void setDate(LocalDate value) { * * @return The value of the 'timestamp' field. */ - public Instant getTimestamp() { + public java.time.Instant getTimestamp() { return timestamp; } @@ -209,7 +190,7 @@ public Instant getTimestamp() { * * @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 static Builder newBuilder(DateRecord other) { 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 - implements RecordBuilder { + @org.apache.avro.specific.AvroGenerated + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { - 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 @@ private Builder() { * * @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 @@ private Builder(DateRecord.Builder other) { * * @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 @@ private Builder(DateRecord other) { * * @return The value. */ - public LocalDate getDate() { + public java.time.LocalDate getDate() { return date; } @@ -314,7 +295,7 @@ public LocalDate getDate() { * @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 boolean hasDate() { * * @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 DateRecord.Builder clearDate() { * * @return The value. */ - public Instant getTimestamp() { + public java.time.Instant getTimestamp() { return timestamp; } @@ -356,7 +337,7 @@ public Instant getTimestamp() { * @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 boolean hasTimestamp() { * * @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 DateRecord.Builder clearTimestamp() { 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 WRITER$ - = (DatumWriter) MODEL$.createDatumWriter(SCHEMA$); + private static final org.apache.avro.io.DatumWriter WRITER$ + = (org.apache.avro.io.DatumWriter) 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 READER$ - = (DatumReader) MODEL$.createDatumReader(SCHEMA$); + private static final org.apache.avro.io.DatumReader READER$ + = (org.apache.avro.io.DatumReader) 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 boolean equals(Object o) { 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 cb1746ea3b0df..a285fc2db7f9a 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 java.lang.Object get(int field$) { case 0: return value; default: - throw new AvroRuntimeException("Bad index"); + throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -57,7 +50,7 @@ public void put(int field$, java.lang.Object value$) { 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 void setValue(java.lang.CharSequence value) { } /** 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 - implements RecordBuilder { + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { 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 java.lang.CharSequence getValue() { } /** 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 boolean hasValue() { } /** 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 Value build() { 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 976c878e70ee1..4ce3e9f0c767d 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.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 void setBedrockRuntimeClient(BedrockRuntimeClient bedrockRuntimeClient) { this.bedrockRuntimeClient = bedrockRuntimeClient; } - public BedrockRuntimeAsyncClient getBedrockRuntimeAsyncClient() { + public software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient getBedrockRuntimeAsyncClient() { return bedrockRuntimeAsyncClient; } @@ -104,7 +103,7 @@ public BedrockRuntimeAsyncClient getBedrockRuntimeAsyncClient() { * 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 edc9672639868..34596b9d242b1 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.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.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 @@ private void converse(BedrockRuntimeClient bedrockRuntimeClient, Exchange exchan } // 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 @@ private void converse(BedrockRuntimeClient bedrockRuntimeClient, Exchange exchan 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 @@ private void converseStream(Exchange exchange) throws InvalidPayloadException { } // 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 @@ private void processConverseStreamingRequest(ConverseStreamRequest request, Exch 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 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 @@ private void processConverseStreamingRequest(ConverseStreamRequest request, Exch 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 @@ private void processConverseStreamingRequest(ConverseStreamRequest request, Exch } 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 @@ private void setConverseStreamingMetadata( } 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 @@ private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange } } 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 @@ private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange 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 content + List content = exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONTENT, List.class); if (ObjectHelper.isNotEmpty(content)) { builder.content(content); @@ -851,10 +841,10 @@ private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange } 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 3b978996dd156..182a17a3977db 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.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 static class StreamMetadata { 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 void setChunkCount(int chunkCount) { 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 77dcadd078ece..0d164fa02b1a9 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.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 @@ public void testConverseWithGuardrailsViaEndpointConfig() throws InterruptedExce result.expectedMessageCount(1); final Exchange exchange = template.send("direct:converse_with_guardrails_endpoint", ex -> { // Create a message using the Converse API - List messages = new ArrayList<>(); - messages.add(Message.builder() - .role(ConversationRole.USER) - .content(ContentBlock + java.util.List 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 @@ public void testConverseWithGuardrailsViaHeader() throws InterruptedException { result.expectedMessageCount(1); final Exchange exchange = template.send("direct:converse_claude", ex -> { // Create a message using the Converse API - List messages = new ArrayList<>(); - messages.add(Message.builder() - .role(ConversationRole.USER) - .content(ContentBlock + java.util.List 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 @@ public void testConverseWithGuardrailsViaHeader() throws InterruptedException { // 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 @@ public void testConverseStreamWithGuardrails() throws InterruptedException { result.expectedMessageCount(1); final Exchange exchange = template.send("direct:converse_stream_with_guardrails", ex -> { // Create a message using the Converse API - List messages = new ArrayList<>(); - messages.add(Message.builder() - .role(ConversationRole.USER) - .content(ContentBlock + java.util.List 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 @@ public void testConverseStreamWithGuardrails() throws InterruptedException { 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 @@ public void testApplyGuardrail() throws InterruptedException { result.expectedMessageCount(1); final Exchange exchange = template.send("direct:apply_guardrail", ex -> { // Create content blocks to check against the guardrail - List content - = new ArrayList<>(); - content.add(GuardrailContentBlock.builder() - .text(GuardrailTextBlock.builder() + java.util.List 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 @@ public void testApplyGuardrailWithPOJO() throws InterruptedException { result.expectedMessageCount(1); final Exchange exchange = template.send("direct:apply_guardrail_pojo", ex -> { // Create content blocks - List content - = new ArrayList<>(); - content.add(GuardrailContentBlock.builder() - .text(GuardrailTextBlock.builder() + java.util.List 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 9e96e0bbeea95..a6e33f8f4308a 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.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 @@ public void testConverseWithClaudeModel() throws InterruptedException { result.expectedMessageCount(1); final Exchange result = template.send("direct:converse_claude", exchange -> { // Create a message using the Converse API - List messages = new ArrayList<>(); - messages.add(Message.builder() - .role(ConversationRole.USER) - .content(ContentBlock + java.util.List 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 @@ public void testConverseStreamWithClaudeModel() throws InterruptedException { result.expectedMessageCount(1); final Exchange result = template.send("direct:converse_stream_claude", exchange -> { // Create a message using the Converse API - List messages = new ArrayList<>(); - messages.add(Message.builder() - .role(ConversationRole.USER) - .content(ContentBlock + java.util.List 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 @@ public void testConverseStreamWithClaudeModel() throws InterruptedException { 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 6f836492ecef8..59dd0817e3485 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 @@ 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 currentShardIterators = new HashMap<>(); + private final Map currentShardIterators = new java.util.HashMap<>(); private final Set warnLogged = new HashSet<>(); private volatile List 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 4d65759d900b8..45e2a00ccf8f3 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.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 @@ private void createUploadLink(Exchange exchange) { .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 4b1ef57e797bb..cf549df512ae8 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 @@ private software.amazon.awssdk.services.ses.model.Message createMessage(Exchange 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 680961eaf88f6..56eec39b82f97 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 @@ 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 publisherClient; + private EventGridPublisherClient publisherClient; /** * The topic endpoint URL where events will be published. @@ -109,11 +108,11 @@ public void setCredentialType(CredentialType credentialType) { /** * The EventGrid publisher client. If provided, it will be used instead of creating a new one. */ - public EventGridPublisherClient getPublisherClient() { + public EventGridPublisherClient getPublisherClient() { return publisherClient; } - public void setPublisherClient(EventGridPublisherClient publisherClient) { + public void setPublisherClient(EventGridPublisherClient 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 d82f4dbd5a1c8..ef66688ebfd39 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.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 @@ private boolean retrieveFileToBody(String name, Exchange exchange) throws Generi boolean success; GenericFile target = (GenericFile) 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 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc // use relative filename in local work directory GenericFile target = (GenericFile) 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 91bc594bc3b47..3a508139d0cfb 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 void setCredentialType(CredentialType credentialType) { // // ************************************************* - 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 00c5dff10065f..a97358e58959f 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.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 @@ private String determineFilePath(final Exchange exchange) { // 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 f4f9e42f6109b..1812e766075ef 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.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 @@ void testuploadBlockBlobChunkedWithStream(@TempDir Path testDir) throws Exceptio // 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 @@ void testuploadBlockBlobChunkedWithFilePath(@TempDir Path testDir) throws Except // 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 652663f29f459..ef8e66a403bac 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 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 @@ /** * 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 ba17b054f4da2..29c7a46b8e3ee 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 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.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 MethodInfo(CamelContext camelContext, Class type, Method method, List< 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 MethodInfo(CamelContext camelContext, Class type, Method method, List< } } - 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 MethodInfo(CamelContext camelContext, Class type, Method method, List< } } - 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 dd75171c4da7b..dfe41a6cca46f 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.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 @@ *

* 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 3a1934661d8c9..6524eebf19411 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 @@ private void initFixedLengthRecordParameters() { } 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 1bcc6d95a091a..6c38ec2d92a19 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 Object unmarshal(Exchange exchange, InputStream inputStream) throws Excep // 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 d63e7da90540b..c4fe06e19fad7 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 Date parse(String string) throws Exception { } - 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 74e69c723879c..25e18bf21cdfd 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 Object unmarshal(Exchange exchange, InputStream inputStream) throws Excep // 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 2c33a39fbd2b3..1da0cb1dca6ff 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 @@ protected RouteBuilder createRouteBuilder() { @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 void configure() { .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 968aaf25da61b..24cf12b763acc 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 @@ protected RouteBuilder createRouteBuilder() { @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 5958e5908392c..de2505994396c 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 static class ContextConfig extends RouteBuilder { @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 b5fab2aa8be17..517d019e0aeea 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 static class ContextConfig extends RouteBuilder { @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 cf343768587d0..da84433e6595b 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.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 @@ @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 b001dd5ff0552..e6fd7b7669dac 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.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 @@ @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 049b378971b72..4c6f5439d6777 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.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 @@ @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 ade0df2d92b21..4ee4ce53cdcd7 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.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 static class ContextConfig extends RouteBuilder { @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 b17b78c2217c7..a16c189d90817 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 void testUnMarshallMessage() throws Exception { 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 09b5862fd0978..2b21f853cd323 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 @@ protected RouteBuilder createRouteBuilder() { @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 1a59a7d513f97..1cba0214c31f1 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 static class ContextConfig extends RouteBuilder { @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 86538cc57c6e3..c50f2eb3da4c3 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 static class ContextConfig extends RouteBuilder { @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 85231b9177bcf..88639eba21404 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 static class ContextConfig extends RouteBuilder { @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 604dad00f9bc2..af0f86398dae9 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 void testUnMarshallMessageWithBooleanMissingFields() throws Exception { 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 403cb2206895b..dc885b30b75ec 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 static class ContextConfig extends RouteBuilder { @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 bec2b93ff77c2..156ef63e24017 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.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 void testMissingMandatoryFields() throws Exception { 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 2c7e02a6ba010..eab03377d15e4 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 static class ContextConfig extends RouteBuilder { @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 582f1359c9ae3..13ff2439f9cdd 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 static class ContextConfig extends RouteBuilder { 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 f0addb6681bba..b693b3b5613f5 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 static class ContextConfig extends RouteBuilder { 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 2b52371c924b0..fc6095d5f97c1 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 static class ContextConfig extends RouteBuilder { @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 04c62421e818f..93bbf81e3eb21 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 static class ContextConfig extends RouteBuilder { @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 9619a3d09ef53..40e7f040110bc 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 List> generateModel() { 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 c3b91e8b890b2..324d84ddc21dd 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.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 void testUnMarshallMessage() throws Exception { 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 8620c307da600..1a07d82768984 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.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 void testUnMarshallMessage() throws Exception { 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 de29db54c7552..668fd03b4b55f 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.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 @@ record = "1000000000000000000000000000000000000,25.10"; 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 f20d0842697e3..3b7e2ce03592e 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.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 @@ record = "1,25,Albert,Cartier,ISIN,BE12345678,SELL,Share,1500,EUR,08-01-2009-01\ 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 e6966ac8770e9..cd8a1312e6cbf 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 void testUnMarshallMessageWithMissingFields() throws Exception { 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 19195075af3c5..1c11dc35c6a3d 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 void testUnMarshallMessage() throws Exception { 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 cca82c4a3ca47..5fd0b6a49daeb 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.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 void testUnMarshallMessage() throws Exception { 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 13b784ddba6ea..5cfeed1d60bec 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 void testUnMarshallMessage() throws Exception { 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 948a543822ac6..c5086b871e92f 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 @@ protected RouteBuilder createRouteBuilder() { @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 1fd727d19b518..22f107f600007 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 @@ protected RouteBuilder createRouteBuilder() { @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 4f702debf5a3a..f1dde14472630 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 @@ protected RouteBuilder createRouteBuilder() { @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 7efe614d9eeb2..e8a0248045be4 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 @@ protected RouteBuilder createRouteBuilder() { @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 e41ddc846ed0a..84679d0f7487b 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 @@ protected RouteBuilder createRouteBuilder() { @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 3e8c1f4d6c269..971508f35347a 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 @@ protected RouteBuilder createRouteBuilder() { @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 65adbe7b90276..4d07f4bce0351 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 void init() throws Exception { // 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 eb7784dc5f500..14db89d9e2ade 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 void testUnMarshallMessage() throws Exception { 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 55fb8598a67ab..812c1fc2c26ad 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 static class ContextConfig extends RouteBuilder { @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 488cf900d30e3..c8eb80fd36ba0 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 List> generateModel() { 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 25670f52fde5f..bc50ca1e1c2e9 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 List> generateModel() { 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 4f932c9246761..0f023085728f9 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 List> generateModel() { 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 34c2e4667c648..b68a2bc0f295f 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 List> generateModel() { 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 0044fb77d19be..f9cd8dd878192 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 List> generateModel() { 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 50218e625c15f..a99fa186612bb 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 void testAddFolderCollaborationByEmail() { // 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 void testAddFolderCollaboration() { // 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 void testAddFolderCollaboration() { @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 void testGetCollaborationInfo() { 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 void testGetFolderCollaborations() { @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 void testUpdateCollaborationInfo() { 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 a48cdee0cd783..0cd81cefc440a 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 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 void testAddFileComment() { // 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 void testChangeCommentMessage() { // 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 void testGetCommentInfo() { 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 void testGetFileComments() { // 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 void testReplyToComment() { // 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 87e52ceb37140..95832545ae858 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 @@ 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 void testGetEnterpriseEvents() { 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 0d7c1fdd13f17..40bf748a80cce 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 @@ 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.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 headers = new HashMap<>(); @@ -106,7 +102,7 @@ public void testCreateFileMetadata() { // 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 void testCreateFileSharedLink() { // 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 void testDownloadFile() { // 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 void testDownloadPreviousFileVersion() { // 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 void testDownloadPreviousFileVersion() { @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 void testGetFileInfo() { // 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 void testGetFileMetadata() { // 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 void testGetFileMetadata() { @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 void testGetFileThumbnail() { 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 void testGetFileVersions() { @Test public void testMoveFile() { - BoxFile result = null; + com.box.sdk.BoxFile result = null; try { final Map headers = new HashMap<>(); @@ -330,7 +326,7 @@ public void testPromoteFileVersion() { // 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 void testPromoteFileVersion() { @Test public void testRenameFile() { - BoxFile result = null; + com.box.sdk.BoxFile result = null; try { final Map headers = new HashMap<>(); @@ -371,7 +367,7 @@ public void testUpdateFileInfo() { // 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 void testUpdateFileMetadata() { //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 void testUpdateFileMetadata() { @Test public void testUploadFile() { - BoxFile result = null; + com.box.sdk.BoxFile result = null; try { final Map headers = new HashMap<>(); @@ -430,7 +426,7 @@ public void testUploadFile() { @Test public void testUploadOverwriteFile() { - BoxFile result = null; + com.box.sdk.BoxFile result = null; try { final Map headers = new HashMap(); @@ -459,7 +455,7 @@ public void testUploadOverwriteFile() { @Test public void testUploadNewFileVersion() { - BoxFile result = null; + com.box.sdk.BoxFile result = null; try { final Map 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 d9afb4c575473..082fbb39091d8 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 void testDeleteFolder() { @Test public void testCopyFolder() { - BoxFolder result = null; + com.box.sdk.BoxFolder result = null; try { final Map headers = new HashMap<>(); // parameter type is String @@ -137,7 +136,7 @@ public void testCreateSharedLink() { // 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 void testCreateSharedLink() { @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 void testGetFolderInfo() { // 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 void testGetFolderItems() { 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 void testGetFolderItems() { @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 void testMoveFolder() { // 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 void testRenameFolder() { // 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 void testUpdateInfo() { 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 3c4b972f2a4fa..a4d5d36f75a81 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 void testAddGroupMembership() { // 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 void testAddGroupMembership() { @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 void testDeleteGroupMembership() { @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 void testGetAllGroups() { @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 void testUpdateGroupInfo() { 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 void testGetGroupMembershipInfo() { 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 void testGetGroupMembershipInfo() { 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 void testUpdateGroupMembershipInfo() { // 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 1d2af04c9e196..01c04aff4b6f0 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 void testSearchFolder() { 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 abf87df6a406f..5e3a5bc151b9a 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 headers = new HashMap<>(); // parameter type is String @@ -80,7 +80,7 @@ public void testAddAssignmentToTask() { @Test public void testAddFileTask() { - BoxTask result = null; + com.box.sdk.BoxTask result = null; try { final Map headers = new HashMap<>(); @@ -134,7 +134,7 @@ public void testDeleteTaskAssignment() { 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 void testGetFileTasks() { @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 void testGetTaskAssignments() { 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 void testGetTaskAssignments() { @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 void testUpdateTaskInfo() { // 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 4f6e8c95e78be..fc47ef7cda7bc 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 @@ 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 headers = new HashMap<>(); // parameter type is String @@ -94,7 +92,7 @@ public void testCreateAppUser() { //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 void testCreateEnterpriseUser() { 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 void testGetAllEnterpriseOrExternalUsers() { 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 void testGetAllEnterpriseOrExternalUsers() { @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 void testGetCurrentUser() { 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 void testGetUserEmailAlias() { @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 void testUpdateUserInfo() { 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 void testmMoveFolderToUser() { 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 2d43bb906beb8..51c9f7f0ce735 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 void testCreate() { @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 9a97219645457..8f416993dbe50 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 @@ 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 void testTransactionLevelFees() throws Exception { .date(reportDate) .merchantAccountId(merchantAccountId); - final Result result = requestBody( + final com.braintreegateway.Result 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 2d3af1113067e..8f85f9709161b 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 @@ 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 void testGenerateWithCustomFields() { // 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 4d2f1ccffe2a9..b2fa998fc6c0a 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 @@ 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 void testCancel() { @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 void testDelete() { // 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 void testDelete() { @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 void testFind() { @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 void testRetryChargeWithAmount() { // 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 void testRetryChargeWithAmount() { @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 void testUpdate() { // 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 b0e222e16b2a9..701c7caceed85 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.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 void testRefundWithRequest() { @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 void testCancelRelease() { @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 void testCredit() { @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 void testHoldInEscrow() { @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 void testReleaseFromEscrow() { @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 void testSubmitForPartialSettlement() { // 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 void testSubmitForPartialSettlement() { @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 1ef8d344c8b2a..c2489d9cae84b 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 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 0bae6d0544cf7..c48779163df63 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 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 @@ private CamundaClient buildClient() { 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 ae5d8697682b3..c5977783f7533 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 @@ 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 CoAPEndpoint(String uri, CoAPComponent component) { 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 8bfe6bcd84e4e..b9750bf502b5b 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 @@ 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 void process(final Exchange exchange) { 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 d21a6286d9d80..a652ca09534c2 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 @@ private BayeuxClient createRemoteClient(HttpClient httpClient, String user, Stri 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 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 592cd4f3ca36c..d9f840f41a9bd 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.concurrent.ExecutorService; import org.apache.camel.Endpoint; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; /** * The Control Bus component 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 59fb8078fc02b..9be2aa4e556f9 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.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.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 static StreamCache toStreamCache(Response response, Exchange exchange) { // 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 metadata = response.getMetadata(); + jakarta.ws.rs.core.MultivaluedMap metadata = response.getMetadata(); if (metadata != null && !metadata.isEmpty()) { Map protocolHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); for (String headerName : metadata.keySet()) { @@ -167,7 +164,7 @@ public static StreamCache toStreamCache(Response response, Exchange exchange) { } } 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 1cda124a423ea..d273aecee9946 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.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 @@ Object populateCxfRsResponseFromExchange( * @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 @@ Map bindResponseHeadersToCamelHeaders( * @return the {@link Entity} to use */ Entity 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 @@ Entity bindCamelMessageToRequestEntity( * @return the {@link Entity} to use */ Entity 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 d7fb394f39335..b62e53dc854a7 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 Object populateCxfRsResponseFromExchange( 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 faa19fabf4030..95cf047fbd109 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 Client createClient() throws Exception { 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 @@ protected ServerFactoryBean createServerFactoryBean() throws Exception { 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 8b5ee6fab7f5c..25993f922586b 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 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 @@ private static int tryGetExpectMessagePartsSize(Object[] parameters, BindingOper * 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 591f7974c6c17..97c5285db002c 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 void populateExchangeFromCxfResponse( 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 atts = cxfExchange.getInMessage().getAttachments(); if (atts != null) { for (Attachment att : atts) { @@ -1268,7 +1268,7 @@ private static Element getFirstElement(Node node) { @Override public void copyJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, Map context) { if (cxfExchange.getOutMessage() != null) { - Message outMessage = cxfExchange.getOutMessage(); + org.apache.cxf.message.Message outMessage = cxfExchange.getOutMessage(); for (Map.Entry entry : context.entrySet()) { if (outMessage.get(entry.getKey()) == null) { outMessage.put(entry.getKey(), entry.getValue()); @@ -1279,7 +1279,7 @@ public void copyJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, Map context) { - Message inMessage = cxfExchange.getInMessage(); + org.apache.cxf.message.Message inMessage = cxfExchange.getInMessage(); for (Map.Entry 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 62c5cefa35cb7..8ea87ca711ad6 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 { @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 aeb1d7d7bdedd..28ea95472c9f2 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.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 void testSendMessage() { 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 c5d043cff2209..373475b2aa324 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 void configure() { 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 void testInvokingSimpleServerWithParams() throws Exception { 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 void testInvokingSimpleServerWithMessageDataFormat() throws Exception { 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 void testIgnorePseudoHeaders() throws Exception { 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 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 void testInvokingSimpleServerWithPayLoadDataFormat() throws Exception { 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 ef493a672e02f..5e8c694169bbd 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.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 void tearDown() throws Exception { 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 responseContext = CastUtils.cast((Map) out.getHeader(Client.RESPONSE_CONTEXT)); @@ -159,7 +158,7 @@ public void testInvokingAWrongServer() throws Exception { 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 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 44c07033cfbbc..0b9eadc744c32 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.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 void testPopulateCxfRequestFromExchange() { 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 requestContext = new HashMap<>(); @@ -204,7 +203,7 @@ public void testPopulateCxfSoapHeaderRequestFromExchange() { 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 requestContext = new HashMap<>(); String expectedSoapActionHeader = "urn:hello:world"; @@ -221,7 +220,7 @@ public void testPopulateCxfSoapHeaderRequestFromExchangeWithExplicitOperationNam 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 requestContext = new HashMap<>(); exchange.getIn().setHeader(CxfConstants.OPERATION_NAMESPACE, "http://test123"); @@ -238,15 +237,15 @@ public void testPopupalteExchangeFromCxfResponse() { 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 responseContext = new HashMap<>(); - responseContext.put(Message.RESPONSE_CODE, Integer.valueOf(200)); + responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200)); Map> 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 attachments = new HashSet<>(); @@ -273,13 +272,13 @@ public void testPopupalteExchangeFromCxfResponseOfNullBody() { 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 responseContext = new HashMap<>(); - responseContext.put(Message.RESPONSE_CODE, Integer.valueOf(200)); + responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200)); Map> 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 void testPopupalteCxfResponseFromExchange() { 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 void testPopupalteCxfResponseFromExchange() { 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 void testPopupalteExchangeFromCxfRequest() { 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> 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 attachments = new HashSet<>(); AttachmentImpl attachment = new AttachmentImpl("att-1", new DataHandler(new FileDataSource("pom.xml"))); @@ -384,13 +383,13 @@ public void testPopupalteExchangeFromCxfRequestWithHeaderMerged() { 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> 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 86f5fb0fdfbf5..f649a7b059c92 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 3359361173b39..3c0e3313d2e87 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.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 27e47d53229dd..2ee035148d6b8 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.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.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 @@ protected boolean validateOutOfBandHander() { 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 b0650004a626c..7857a278182e1 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.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 @@ private void verifyHeader(Object hdr, String headerName, String headerValue) { 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 14c8d79f2f57a..723ce6afbe329 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.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 void process(Exchange exchange) throws Exception { 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 a00b8c0d61722..cc4727cd6b387 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 9f3e5069ea7cb..a08b350f5c881 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 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 void process(Exchange exchange) throws Exception { 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 c6b20c8cce5ad..ff1fa6ab125c9 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.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 Client createClient() throws Exception { 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 @@ protected ServerFactoryBean createServerFactoryBean() throws Exception { 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 4eee382056c95..e640e77eb6294 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 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 @@ protected void verifyJaxwsHandlers(JaxwsTestHandler fromHandler, JaxwsTestHandle 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 result = out.getBody(List.class); assertEquals(4, result.size(), "The result list should not be empty"); Holder name = (Holder) 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 aa429198b778b..32786d1d8fb77 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 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 void testDipatchMessage() throws Exception { 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 void testDipatchMessageOneway() throws Exception { 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 7c5ad431727ff..5df5c4ee105a5 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.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 void testDispatchPayload() throws Exception { 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 void testDispatchPayloadOneway() throws Exception { 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 82f7352d83d6a..7b8ada2c688a9 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 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 void testInvokeGreetMeOverProvider() throws Exception { + 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 2013f3056f1ab..a679bc5f58b93 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 @@ 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 @@ protected ClassPathXmlApplicationContext createApplicationContext() { 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 4e23d32f9e091..df1709984b15d 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 2026c9f6a48ad..62dfe583214bd 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 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 photo, Holder 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 a4b9508bf36b7..7b374eedac139 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 @@ 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 void process(Exchange exchange) throws Exception { // 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 18001b23a5257..9ecefda31c3f1 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 @@ 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 e133f8ed71551..2d6c00e1e6974 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 @@ 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 @@ private 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 772d52a1ebb5b..1da02466d05bb 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 @@ private String invokeMultiPartService(String address, String in0, String in1) { e0.setV(in0); e1.setV(in1); - Holder h = new Holder<>(); - Holder h1 = new Holder<>(); + jakarta.xml.ws.Holder h = new jakarta.xml.ws.Holder<>(); + jakarta.xml.ws.Holder 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 3359361173b39..3c0e3313d2e87 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.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 cc0f07a9e036d..76ee4abd6b0c3 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.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.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 @@ protected void doTestInOutOfBandHeaderCamelTemplate(String producerUri) throws E Exchange exchange = template.send(producerUri, senderExchange); - Message out = exchange.getMessage(); + org.apache.camel.Message out = exchange.getMessage(); MessageContentsList result = (MessageContentsList) out.getBody(); Map responseContext = CastUtils.cast((Map) out.getHeader(Client.RESPONSE_CONTEXT)); assertNotNull(responseContext); @@ -540,7 +538,7 @@ protected void doTestOutOutOfBandHeaderCamelTemplate(String producerUri) throws 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 void doTestInOutOutOfBandHeaderCamelTemplate(String producerUri) throws E 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 @@ protected static void validateReturnedOutOfBandHeader(Map respon 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 @@ protected static void validateReturnedOutOfBandHeaderWithInsertion(Map 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 27e47d53229dd..2ee035148d6b8 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.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.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 @@ protected boolean validateOutOfBandHander() { 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 b0650004a626c..7857a278182e1 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.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 @@ private void verifyHeader(Object hdr, String headerName, String headerValue) { 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 312834694f4ee..a85ab36f7b447 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.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 void process(final Exchange exchange) { }); 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 e204b5ae6951d..8e9a29db94f12 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 @@ 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 297693ea24cb8..0baee7db6c362 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.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 void process(Exchange exchange) throws Exception { 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 a00b8c0d61722..cc4727cd6b387 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 9f3e5069ea7cb..a08b350f5c881 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 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 void process(Exchange exchange) throws Exception { 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 8c1c00b7345b7..90060f1f4fe63 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.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 void testPropagateCamelToCxf() { Map 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 void testPropagateCamelToCxf() { // check the protocol headers Map> 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 void testPropagateCamelToCxf() { @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> 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 void testPropagateCxfToCamel() { 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 requestContext = Collections.singletonMap("request", "true"); @@ -155,11 +154,11 @@ public void testPropagateCxfToCamelWithMerged() { 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> 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 2b1a4fd66d918..b9398af355958 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 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 29461be5c2c80..7b2f4821ee2ed 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 void testSecurityContext() { 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 9d410c6bed44c..b38fb57ffa0e7 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 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 @@ protected RouteBuilder createRouteBuilder() { 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 277bde86cbf11..f72e2c66c60eb 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.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 Endpoint publishSampleWS(String camelEndpoint) { 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 57ff0ed3a6b91..e3418ec1fb9d2 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 void setCamelContext(CamelContext camelContext) { 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 fb6c9434e4485..7ef6612ce1b59 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.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 @@ private void commitOutputMessage() throws IOException { 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 @@ private void commitOutputMessage() throws IOException { } - 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 @@ protected void syncInvoke(Exchange exchange) throws IOException { } - 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 @@ protected void asyncInvokeFromWorkQueue(final Exchange exchange) throws IOExcept } } - 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 31e3d35c1a8c3..d0cfa2c5802c6 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 @@ 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 @@ private 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 bdbd28262338a..6395a90a9e030 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 Message createCxfMessageFromCamelExchange( 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 Message createCxfMessageFromCamelExchange( 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 8c1c00b7345b7..90060f1f4fe63 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.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 void testPropagateCamelToCxf() { Map 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 void testPropagateCamelToCxf() { // check the protocol headers Map> 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 void testPropagateCamelToCxf() { @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> 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 void testPropagateCxfToCamel() { 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 requestContext = Collections.singletonMap("request", "true"); @@ -155,11 +154,11 @@ public void testPropagateCxfToCamelWithMerged() { 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> 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 2b1a4fd66d918..b9398af355958 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 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 29461be5c2c80..7b2f4821ee2ed 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 void testSecurityContext() { 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 277bde86cbf11..f72e2c66c60eb 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.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 Endpoint publishSampleWS(String camelEndpoint) { 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 34440e7c231b9..0914ff83a0419 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 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 DataSet. */ -@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 61ca9ab200c82..44064483b2a0b 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 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 @@ * 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 3d82d59869199..0586a49dfc973 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 @@ private Val parseDate(Val value, Val format) { 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 c98c28e558929..3ead8d5574b92 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 @@ private Document doEvaluate(Exchange exchange) { .withLibrary(CML.getInstance()) .withDefaultOutput(MediaTypes.APPLICATION_JAVA); - Set additionalLibraries = exchange.getContext().getRegistry().findByType(Library.class); + Set additionalLibraries = exchange.getContext().getRegistry().findByType(com.datasonnet.spi.Library.class); for (Library lib : additionalLibraries) { builder = builder.withLibrary(lib); } @@ -214,7 +214,7 @@ public void init(CamelContext context) { .withLibrary(CML.getInstance()) .withDefaultOutput(MediaTypes.APPLICATION_JAVA); - Set additionalLibraries = context.getRegistry().findByType(Library.class); + Set 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 e648941b47f9b..6f37eb4aa304f 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 @@ 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 @@ private void appendLinesToSource(int numberOfLines) throws IOException { 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 6266803049910..6894a30ff8960 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.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 { @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 a006f2265816c..78d4fe4708a02 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 void testResource() { // 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 c3ad80b0cc77d..0fd96b6df7791 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 void testResource() { 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 c8e0eaba67c34..78c8b1aeb9e6f 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 @@ private void postResource(String endpointUri) { // 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 49b396a25446e..dc68fc012de2a 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 @@ private void putResource(String endpointUri) { 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 8c108afc8ab81..d3ea6e4ada84a 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.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 @@ private static Color parseColor(String value) { 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 db3007ffb5aa4..320ae8ad7fc67 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.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 ResizeExecCmd.Exec createResizeExecCmdExec() { } @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 8a6789a9203ab..58ef674ba659e 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 @@ 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 d8ace3b691208..1a62abb223fd6 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.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 void testEncodeJSON() { Map 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 97b993f11d57c..8c154ff4664fc 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 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 void testOnType() { // 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 void testProcessMessage() { // 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 dff4fb31e4cdb..12af129e2aba9 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.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 void configureMessage(GenericFile file, Message message) { // 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 @@ protected String createDoneFileName(String fileName) { } 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 8aa2377dfa34d..f326684c1036a 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.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 void doOnDataStream(DataStream ds, Object... payloads) throws Exception { // 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 void doOnDataStream(DataStream ds, Object... payloads) throws Exception { // 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 void doOnDataStream(DataStream ds, Object... payloads) throws Exception { // 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 43f0b856ae53a..d7ddfefe30bc7 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 void doOnDataStream(DataStream ds, Object... payloads) throws Exception { 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 57fbbed36d857..dc992a28e2cc9 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 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 void shouldConfigureExecutionMode() { 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 a530c28729e6e..c80d448627a4d 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 @@ private FTPFileEntryParser createFileEntryParser(String key, FTPClientConfig con } } 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 726e0980311fd..9462a8c73c2b1 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.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 @@ private void simulateLoggedIn() throws Exception { 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 beb91baa5b16e..50131e3eae2c7 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 PullRequestFilesProducer(GitHubEndpoint endpoint) throws Exception { public void process(Exchange exchange) throws Exception { Integer pullRequestNumber = exchange.getIn().getHeader(GitHubConstants.GITHUB_PULLREQUEST, Integer.class); - List response = pullRequestService.getFiles(getRepository(), pullRequestNumber); + java.util.List 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 381a5f741798b..8c2665a885e55 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 ea6a15270c325..1a366908d7cc4 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 void testCalendarList() { protected boolean isCalendarInList(Calendar calendar) { CalendarList calendarList = requestBody("direct://LIST", null); - List items = calendarList.getItems(); + java.util.List 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 5709b0bea90ad..c4d97e31898f0 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 ae2a5018edd2d..de83294ffb842 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.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 void testInsert() { // 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 void testManipulatingAnEvent() { 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 8cf9c34e6898b..2080c4edc7107 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 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 items = new ArrayList<>(); items.add(new FreeBusyRequestItem().setId(getCalendar().getId())); request.setItems(items); @@ -56,7 +55,7 @@ public void testQuery() { 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 2b18c456e9ec1..90b8fbf245d8e 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 void testGet() { @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 080ff11e4fc0f..5de2a7ac76d5f 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 @@ 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 06af26b233340..255c0fbb85bca 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 44b33254c47fa..b819bd0e347ac 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 @@ 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 items = list.getChanges(); assumeFalse(items.isEmpty()); @@ -52,7 +51,7 @@ public void testGet() { 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 void testGet() { @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 e4261ec5e1045..06b8c67cb0240 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.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 void testComment() { // 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 void testComment() { // 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 void testComment() { // 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 void testComment() { 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 b8945bcf653a5..cb1e221d13287 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 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 void testWatch() { // 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 a05d6a5381f5a..59ff033cab4f4 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 void testList() { 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 2a3fc7fc99616..fc1a4085baae8 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.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 void testReplyToComment() { // 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 void testReplyToComment() { // 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 void testReplyToComment() { // 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 void testReplyToComment() { // 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 4d4db78f535bb..12d59ca4577c4 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 void testList() { 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 53a828c690aec..ec99adc322bdd 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 void testFileConverter() throws Exception { 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 4660002ba1a44..18780c97862f3 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 void testListConsumer() throws Exception { 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 123d0945be41a..ac713edbe0f39 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 void converterTest() throws Exception { 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 @@ protected RouteBuilder createRouteBuilder() { 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 5269c8d34f1dc..1b40dfec21a11 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 GoogleMailStreamEndpoint getEndpoint() { @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 @@ protected void processRollback(Exchange exchange, String unreadLabelId) { } } - 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 be93f6dd55737..707ff195ee0db 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 e527fbe0fe202..801a47bceaa51 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.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 void testLabels() { // 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 void testLabels() { 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 b14e9d41d2ebf..3d95e2327e4ed 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 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 void testMessages() throws Exception { // 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 @@ private boolean idInList(String testEmailId, ListMessagesResponse listOfMessages } 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 573e59abcef18..5992bc57a8624 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.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 void testList() throws Exception { 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 c11b76c75e307..9c2f320a9aa57 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.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 @@ public StorageObject create(StorageObject object, InputStream content, Map response = OBJECT_MAPPER.readValue(responseJson, Map.class); Object content = response.get("content"); - if (content instanceof List) { - List> contentList = (List>) content; + if (content instanceof java.util.List) { + java.util.List> contentList = (java.util.List>) content; StringBuilder sb = new StringBuilder(); for (Map 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 9c7c3efac8ce8..b88353b78a9bf 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 @@ private static JsonObject nodeToJsonObject(Node node) { } // 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 5ae677564c9f2..6bf4fe9ddf3b7 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 void receive() throws InterruptedException { out.expectedMessageCount(1); verify(reliableTopic).addMessageListener(argument.capture()); - final Message msg = new Message<>("foo", "foo", new Date().getTime(), null); + final Message 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 902eeedcd27b4..00ca0b8ebc294 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 void receive() throws InterruptedException { out.expectedMessageCount(1); verify(topic).addMessageListener(argument.capture()); - final Message msg = new Message<>("foo", "foo", new Date().getTime(), null); + final Message 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 2a2d20803ad07..a4170bbd65cd3 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.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 5fa8f43e0d05c..0816913b6f7d3 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 8210112d1c7eb..770d2cee17a8b 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.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 84856171b86bb..e00fd648b182a 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 @@ 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 b071ea5463855..73db39b914293 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.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 static Stream data() { @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 2be6654faa848..911ffde2ba5bb 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 @@ 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 void withMethodCommonHttpGetInHeader() throws Exception { 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 ef7df0f95cf53..f8bcd301a65dc 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 @@ 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 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 cff64bf29061a..ce464c5d00a88 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 @@ 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 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 605ba33f2ffa0..dc5bdbef28a7d 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 @@ 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 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 648c2b689773a..24b3077433bea 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 @@ 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 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 c081472043e0b..40159c3bbd2aa 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 @@ 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 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 f25d47c1bc835..2b623de36f41b 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 @@ 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 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 fc0f4943651c8..812f554c587ce 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 @@ 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 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 233723ac43f7b..6af6fa043b7e1 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.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 int processBatch(Queue exchanges) throws Exception { // 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 1c26f3914fb6d..bbbfdd5a3ff47 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.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 void testConsumeObject() throws Exception { // 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 void testConsumeMultipleObjects() throws Exception { 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 273586a5383e8..839ee29a8c1d2 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 @@ 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 void testMoveAfterRead() throws Exception { // 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 void testMoveAfterReadWithPrefix() throws Exception { // 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 c1088ffec5f9c..4b459cc0b4f9d 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 @@ private void query(Exchange exchange) { 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 c732fecfbe7f5..e401268cff0bc 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.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 @@ private void getCustomModel(Exchange exchange) { 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 bcf6d1e3fd57f..709d0ba5e7aba 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 @@ private static void generateTestAudioFile(String filename) throws Exception { 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 c4498055f6d6f..29c59de6c66c9 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 @@ protected Calendar createTestCalendar() { 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 b342e868eee56..4253fdcea54c3 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.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 @@ private void pollMessages() { 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 @@ private PollingStrategy resolvePollingStrategy() { } } - 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 bcda204215371..9a65969e12dd9 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 { @@ -70,7 +66,7 @@ public IggyBaseClient create() throws Exception { } 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 @@ private void configureTls( } 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 @@ private void configureTls( } } - private void applyTlsCertificateIfPresent(Consumer certificateSetter) { + private void applyTlsCertificateIfPresent(java.util.function.Consumer 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 c6436d59a3c48..fc4afb9f3a8fc 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 void testTlsConfigurationCopy() { @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 void testSslContextParametersCopy() { @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 c0a6943fac7b1..0b042d2b5f939 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 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 73a72fa298751..a91fbb99ee797 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 IronMQEndpoint getEndpoint() { 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 ae61cb36a8740..d0a2827441592 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 @@ 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 @@ 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 void shouldConvertPojoToString() throws JSONException { } @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 448e75c2cc387..3be45fcecf7e6 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 f579066c63ab8..970ab8072c51b 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 91c98c28ee5ff..5bc53c6504cf7 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 9f9f069e338b4..66853dd3ca46e 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.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 @@ protected ServerConnector createConnectorJettyInternal( 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 @@ protected ServerConnector createConnectorJettyInternal( if (requestLog != null) { server.setRequestLog(requestLog); } - HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfig); + HttpConnectionFactory httpFactory = new org.eclipse.jetty.server.HttpConnectionFactory(httpConfig); ArrayList 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 ce738b6b5d717..bad2a6b73535f 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 void configure() { .get("/country").to("direct:v4country") .get("/address").to("direct:v3address").produces("application/xml").type(Address.class); - from("direct:v1country").transform().constant(new ArrayList()); - from("direct:v2country").transform().constant(new ArrayList()); - from("direct:v3country").transform().constant(new ArrayList()); + from("direct:v1country").transform().constant(new java.util.ArrayList()); + from("direct:v2country").transform().constant(new java.util.ArrayList()); + from("direct:v3country").transform().constant(new java.util.ArrayList()); 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 22d8d3dd151d1..30acebbfc74a4 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 void configure() { .get("/country").to("direct:v4country") .get("/address").to("direct:v3address").produces("application/xml").type(Address.class); - from("direct:v1country").transform().constant(new ArrayList()); - from("direct:v2country").transform().constant(new ArrayList()); - from("direct:v3country").transform().constant(new ArrayList()); + from("direct:v1country").transform().constant(new java.util.ArrayList()); + from("direct:v2country").transform().constant(new java.util.ArrayList()); + from("direct:v3country").transform().constant(new java.util.ArrayList()); 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 e894def965cf9..20efcc90e8756 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.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 @@ private static final class MavenUtils { 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 16a7922cc94f4..5e12468eb957a 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 void testTextToBytes() throws Exception { 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 void testTextToBytesHeader() throws Exception { 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 void testTextToText() throws Exception { 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 48e7ca9f26f75..f62b942533df1 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 void testObjectMessageDisabledByDefault() { 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 e43d974940003..3cb1a4a3ad8ad 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 @@ private static Throwable rootCause(Throwable t) { 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 35cf303fdb252..d077f8d464c14 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 void setupTimeout() throws SQLException { 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 028478b9d37e6..898c588c6bd99 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.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 void setVerboseLogging(boolean verboseLogging) { 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 ee75487bdc9e0..33b74f15502cb 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.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.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 ScpCertUserAuthIT() { /** * 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 void testCertificateAuthWithCertUri() throws Exception { // 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 71b8a4821cc32..835beb804d95d 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 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 5deeff2da5b3d..7b05810a99fdf 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 int read() throws IOException { } try { return in.read(); - } catch (EOFException ex) { + } catch (java.io.EOFException ex) { return -1; } } @@ -217,7 +216,7 @@ public int read(byte[] b) throws IOException { } else { return minimum + additionalRead; } - } catch (EOFException ex) { + } catch (java.io.EOFException ex) { return minimum; } } else { @@ -244,14 +243,14 @@ public int read(byte[] b, int off, int len) throws IOException { } 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 bc33769b69bf6..64ad1bc97e70a 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 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 a876b8c6f7af6..8b06f5bdfba22 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 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 cdba2047acec2..4302fef27b6b2 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.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 @@ private enum State { // 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 bfa56a42b898a..99b6c8568656f 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.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 boolean isReady() { // 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 boolean isReady() { } @SuppressWarnings("rawtypes") - public Producer getKafkaProducer() { + public org.apache.kafka.clients.producer.Producer getKafkaProducer() { return kafkaProducer; } @@ -143,7 +141,7 @@ public Producer getKafkaProducer() { * 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 85d35635d4640..fba111f5306c1 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 @@ private ProcessingResult processBatch(KafkaConsumer camelKafkaConsumer) { * The flow to execute when using auto-commit */ private ProcessingResult autoCommitResultProcessing( - KafkaConsumer camelKafkaConsumer, Exchange exchange, List exchanges) { + KafkaConsumer camelKafkaConsumer, Exchange exchange, java.util.List exchanges) { ExceptionHandler exceptionHandler = camelKafkaConsumer.getExceptionHandler(); CommitSynchronization commitSynchronization = new CommitSynchronization(exceptionHandler, exchanges.size()); exchange.getExchangeExtension().addOnCompletion(commitSynchronization); @@ -250,7 +249,7 @@ private ProcessingResult autoCommitResultProcessing( * The flow to execute when the integrations perform manual commit on their own */ private ProcessingResult manualCommitResultProcessing( - KafkaConsumer camelKafkaConsumer, Exchange exchange, List exchanges) { + KafkaConsumer camelKafkaConsumer, Exchange exchange, java.util.List 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 3a455bfa81a8b..e7f81be5bb2c8 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.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 void processSendsMessage() throws Exception { 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 void processAsyncSendsMessageWithException() { 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 28d5d63ba6f45..d77bf3b5f8580 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 57fdd9e7f05a9..1424e03cec99f 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; @BeforeAll public static void setupTopic() { @@ -82,7 +81,7 @@ public void init() { // 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 78c1ab6ba63be..d70f8c482cda7 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; @BeforeAll public static void setupTopic() { @@ -89,7 +88,7 @@ public void init() { // 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 82d1709d09f36..aa4b5a0106c1d 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; @BeforeAll public static void setupTopic() { @@ -90,7 +89,7 @@ public void init() { // 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 4f1af548ce675..9d917bd102548 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 db0aee9867c02..2f95c6f45aa2d 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 e7464891096eb..f240a7ede0c33 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 31cf7a07063d3..37d795ec4cd4c 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 32b34155aaa39..d76bf88567d6c 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 48722d4a94edb..ed6f99d5b8959 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; @BeforeEach public void before() { @@ -92,7 +91,7 @@ public void before() { 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 d4b0888c4770f..0a541b645dc8f 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; @BeforeEach public void before() { @@ -91,7 +90,7 @@ public void before() { 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 1ac344c7a42f5..ddf16c2a4d2c9 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; static { service = new ContainerLocalAuthKafkaService( @@ -97,7 +96,7 @@ public void before() { 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 4f422149ac451..26d2545d318b0 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; protected Properties getDefaultProperties() { Properties properties = KafkaTestUtil.getDefaultProperties(BOOTSTRAP_SERVERS); @@ -83,7 +82,7 @@ public void before() { 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 50d10643314f7..1d632a4f2d9dd 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 dbb295adc1755..421a92b590abc 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; private static class TestSubscribeAdapter extends DefaultSubscribeAdapter { private volatile boolean subscribeCalled = false; @@ -65,7 +64,7 @@ public boolean isSubscribeCalled() { @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 26a50f7782b6e..0957733834ce6 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 7f1e506198be7..7838be0c26785 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; @BeforeAll static void checkConsumerProtocolSupport() { @@ -89,7 +88,7 @@ static void checkConsumerProtocolSupport() { @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 void kafkaMessageIsConsumedWithConsumerProtocol() throws InterruptedExcep assertEquals(5, MockConsumerInterceptor.recordsCaptured.stream() .flatMap(i -> StreamSupport.stream(i.records(TOPIC).spliterator(), false)).count()); - Map headers = to.getExchanges().get(0).getIn().getHeaders(); + java.util.Map 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 c0a3b5bb62c00..cf8ba5c332565 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.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 producer - = new KafkaProducer<>(props)) { + try (org.apache.kafka.clients.producer.KafkaProducer producer + = new org.apache.kafka.clients.producer.KafkaProducer<>(props)) { for (int k = 0; k < size; k++) { String msg = "message-" + k; ProducerRecord 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 1e320a0b8678d..b8457b357d3ac 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 25fb53e04846f..cca7f78ef426f 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; @BeforeEach public void before() { @@ -97,7 +96,7 @@ public void before() { 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 e94e57d84f11e..64ff99a07287a 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 6b0e6928dbb0d..3117ce03aed53 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer 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 a15aae684c1a5..80aa8c1e952e0 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.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 static void after() { private static KafkaConsumer 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 @@ private static KafkaConsumer createStringKafkaConsumer(final Str private static KafkaConsumer 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 d8d6fec758401..293475756f42c 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 @@ 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 void kafkaProducerWithSaslAuthTypeAndHeaders() throws InterruptedExceptio // 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 01ab645173bd6..9eb8852900596 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.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 void execute() { private static KafkaConsumer 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 bbac51e590c0a..bcb39ae3921e8 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.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 @@ private ConsumerRecords getMessagesFromTopic(KafkaConsumer 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 a01be7b94b15b..a040dcab2c06e 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.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 producer; + protected org.apache.kafka.clients.producer.KafkaProducer 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 1935fa7567ef5..a0613af5908a8 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.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 producer; + protected org.apache.kafka.clients.producer.KafkaProducer 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 6d46f6b25223b..239296614f7d2 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 void testIO() throws InterruptedException { to.expectedHeaderReceived(PROPAGATED_CUSTOM_HEADER, PROPAGATED_HEADER_VALUE); Properties props = KafkaTestUtil.getDefaultProperties(service); - try (KafkaProducer producer = new KafkaProducer<>(props)) { + try (KafkaProducer producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props)) { for (int k = 0; k < 5; k++) { String msg = "message-" + k; ProducerRecord 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 cfcfa874baa0d..ab8a2c2b52621 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.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 producer; + protected org.apache.kafka.clients.producer.KafkaProducer producer; @EndpointInject("mock:result") protected MockEndpoint to; protected boolean serviceShutdown = false; @@ -77,7 +76,7 @@ public void after() { 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 fb2719a3fce67..6683200ece163 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; /* * This is used by pausable to determine whether to pause. If returning true, processing continues. If @@ -94,7 +93,7 @@ public static int getCount() { @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 4879e44aed9d7..4cd40f3d07ca5 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.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 producer; + private org.apache.kafka.clients.producer.KafkaProducer producer; private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); @@ -82,7 +81,7 @@ public static int getCount() { @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 4d41da39bb0be..80ba9352f270e 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.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 @@ */ @ManagedResource(description = "Managed Kamelet Processor") public class KameletProcessor extends BaseProcessorSupport - implements CamelContextAware, Navigate, Traceable, IdAware, RouteIdAware { + implements CamelContextAware, Navigate, 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 f380ae01b936e..37ddc1c052b5f 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 @@ private List parseCommaSeparatedList(String value) { if (value == null || value.trim().isEmpty()) { return null; } - List result = new ArrayList<>(); + List 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 c3ec59574f04f..30967fbeed7c9 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 @@ 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 static Set extractPermissions(AccessToken token) { // 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 static Set extractPermissions(AccessToken token) { 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 static Set extractPermissionsFromIntrospection( // 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 3b7ad2cf566f3..08910a810c3f1 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.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 @@ private void validateTokenBinding(Exchange exchange, String headerToken, String 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 4ca6239e0328c..61f6f1d62b4bc 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 @@ 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.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 IntrospectionResult introspect(String token) throws IOException { // 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 @@ private IntrospectionResult parseIntrospectionResponse(ClassicHttpResponse respo Map 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 a3ab0ce1ae55b..0bb0977e51c47 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.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 @@ void testSetup_CreateRealm() throws Exception { // 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 @@ void testSetup_CreateRealm() throws Exception { // 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 @@ void testConsumeAdminEvents_CreateUser() throws Exception { 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 2af6bc84d3cc5..cd7dacb39a2d9 100644 --- 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 @@ -17,7 +17,6 @@ package org.apache.camel.component.keycloak; import java.util.List; -import java.util.Map; import java.util.UUID; import jakarta.ws.rs.core.Response; @@ -645,7 +644,7 @@ void testGetUserAttributes() { } @SuppressWarnings("unchecked") - Map> attributes = result.getIn().getBody(Map.class); + java.util.Map> attributes = result.getIn().getBody(java.util.Map.class); assertNotNull(attributes); // Verify the department attribute exists from the previous test @@ -1139,7 +1138,7 @@ void testEvaluatePermissionWithResourceAndScopes() { } else { // If it succeeds, verify the permissions-only response format @SuppressWarnings("unchecked") - Map body = result.getIn().getBody(Map.class); + java.util.Map body = result.getIn().getBody(java.util.Map.class); if (body != null) { assertTrue(body.containsKey("permissions") || body.containsKey("granted"), "Response should contain permissions or granted field"); @@ -1177,7 +1176,7 @@ void testEvaluatePermissionRPTMode() { } else { // If it succeeds, verify the RPT response format @SuppressWarnings("unchecked") - Map body = result.getIn().getBody(Map.class); + java.util.Map body = result.getIn().getBody(java.util.Map.class); if (body != null) { // RPT mode should return token-related fields log.info("RPT mode result: hasToken={}, tokenType={}, expiresIn={}", diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelperTest.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelperTest.java index 34e6041de9ac5..2cbdc9ae61ba6 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelperTest.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityHelperTest.java @@ -19,9 +19,6 @@ import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.PublicKey; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import java.util.Set; import org.junit.jupiter.api.Test; @@ -43,7 +40,7 @@ void testExtractRoles() { when(token.getRealmAccess()).thenReturn(realmAccess); when(realmAccess.getRoles()).thenReturn(Set.of("realm-admin", "user")); - when(token.getResourceAccess()).thenReturn(Map.of("test-client", clientAccess)); + when(token.getResourceAccess()).thenReturn(java.util.Map.of("test-client", clientAccess)); when(clientAccess.getRoles()).thenReturn(Set.of("client-admin")); Set roles = KeycloakSecurityHelper.extractRoles(token, "test-realm", "test-client"); @@ -185,12 +182,12 @@ void testExtractPermissions() { when(token.getAuthorization()).thenReturn(authorization); // Test permissions extraction from custom claims - Map otherClaims = new HashMap<>(); - otherClaims.put("permissions", Arrays.asList("read:documents", "write:documents", "admin:users")); + java.util.Map otherClaims = new java.util.HashMap<>(); + otherClaims.put("permissions", java.util.Arrays.asList("read:documents", "write:documents", "admin:users")); when(token.getOtherClaims()).thenReturn(otherClaims); - Set permissions = KeycloakSecurityHelper.extractPermissions(token); + java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); assertEquals(3, permissions.size()); assertTrue(permissions.contains("read:documents")); @@ -203,13 +200,13 @@ void testExtractPermissionsFromCustomClaims() { AccessToken token = Mockito.mock(AccessToken.class); // Mock other claims with permissions - Map otherClaims = new HashMap<>(); - otherClaims.put("permissions", Arrays.asList("read:files", "write:files", "delete:files")); + java.util.Map otherClaims = new java.util.HashMap<>(); + otherClaims.put("permissions", java.util.Arrays.asList("read:files", "write:files", "delete:files")); when(token.getOtherClaims()).thenReturn(otherClaims); when(token.getAuthorization()).thenReturn(null); - Set permissions = KeycloakSecurityHelper.extractPermissions(token); + java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); assertEquals(3, permissions.size()); assertTrue(permissions.contains("read:files")); @@ -222,13 +219,13 @@ void testExtractPermissionsFromScopes() { AccessToken token = Mockito.mock(AccessToken.class); // Mock other claims with scope-based permissions - Map otherClaims = new HashMap<>(); + java.util.Map otherClaims = new java.util.HashMap<>(); otherClaims.put("scope", "read write admin"); when(token.getOtherClaims()).thenReturn(otherClaims); when(token.getAuthorization()).thenReturn(null); - Set permissions = KeycloakSecurityHelper.extractPermissions(token); + java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); assertEquals(3, permissions.size()); assertTrue(permissions.contains("read")); @@ -240,9 +237,9 @@ void testExtractPermissionsFromScopes() { void testExtractPermissionsEmpty() { AccessToken token = Mockito.mock(AccessToken.class); when(token.getAuthorization()).thenReturn(null); - when(token.getOtherClaims()).thenReturn(Map.of()); + when(token.getOtherClaims()).thenReturn(java.util.Map.of()); - Set permissions = KeycloakSecurityHelper.extractPermissions(token); + java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); assertTrue(permissions.isEmpty()); } diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java index 0ac3e3296cfc5..ed9d553e9881f 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityIT.java @@ -18,14 +18,10 @@ import java.math.BigInteger; import java.security.KeyFactory; -import java.security.KeyPair; -import java.security.KeyPairGenerator; import java.security.PublicKey; import java.security.spec.RSAPublicKeySpec; -import java.util.Arrays; import java.util.Base64; import java.util.Map; -import java.util.Set; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; @@ -44,7 +40,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import org.keycloak.representations.AccessToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -188,7 +183,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { // Test that parseToken works correctly with public key and issuer verification String expectedIssuer = keycloakUrl + "/realms/" + realm; try { - AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); assertNotNull(token); @@ -196,7 +191,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { assertTrue(KeycloakSecurityHelper.isTokenActive(token)); // Verify roles can be extracted after public key verification - Set roles = KeycloakSecurityHelper.extractRoles(token, realm, clientId); + java.util.Set roles = KeycloakSecurityHelper.extractRoles(token, realm, clientId); assertNotNull(roles); assertFalse(roles.isEmpty()); @@ -250,7 +245,7 @@ void testParseAndVerifyTokenDirectlyWithPublicKey() { // Test parseAndVerifyAccessToken with correct public key and issuer (may fail with signature verification) try { - AccessToken tokenWithKey + org.keycloak.representations.AccessToken tokenWithKey = KeycloakSecurityHelper.parseAndVerifyAccessToken(adminToken, publicKey, expectedIssuer); assertNotNull(tokenWithKey); assertNotNull(tokenWithKey.getSubject()); @@ -372,9 +367,9 @@ void testPermissionsExtractionFromToken() { try { // Parse and verify token, then extract permissions directly - AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); - Set permissions = KeycloakSecurityHelper.extractPermissions(token); + java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); // Log the permissions found for debugging LOG.info("Permissions found in token: {}", permissions); @@ -463,9 +458,9 @@ private PublicKey getPublicKeyFromKeycloak() { */ private PublicKey getWrongPublicKey() { try { - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); + java.security.KeyPairGenerator keyGen = java.security.KeyPairGenerator.getInstance("RSA"); keyGen.initialize(2048); - KeyPair keyPair = keyGen.generateKeyPair(); + java.security.KeyPair keyPair = keyGen.generateKeyPair(); return keyPair.getPublic(); } catch (Exception e) { throw new RuntimeException("Error generating dummy public key", e); @@ -514,7 +509,7 @@ public void configure() throws Exception { keycloakPolicy.setRealm(realm); keycloakPolicy.setClientId(clientId); keycloakPolicy.setClientSecret(clientSecret); - keycloakPolicy.setRequiredRoles(Arrays.asList("admin-role")); // Add role to trigger validation + keycloakPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); // Add role to trigger validation // Configure different policies for different access levels KeycloakSecurityPolicy adminPolicy = new KeycloakSecurityPolicy(); @@ -522,14 +517,14 @@ public void configure() throws Exception { adminPolicy.setRealm(realm); adminPolicy.setClientId(clientId); adminPolicy.setClientSecret(clientSecret); - adminPolicy.setRequiredRoles(Arrays.asList("admin-role")); + adminPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); KeycloakSecurityPolicy userPolicy = new KeycloakSecurityPolicy(); userPolicy.setServerUrl(keycloakUrl); userPolicy.setRealm(realm); userPolicy.setClientId(clientId); userPolicy.setClientSecret(clientSecret); - userPolicy.setRequiredRoles(Arrays.asList("user")); + userPolicy.setRequiredRoles(java.util.Arrays.asList("user")); userPolicy.setAllRolesRequired(true); // Must have exact role // Protected routes @@ -554,7 +549,7 @@ public void configure() throws Exception { publicKeyPolicy.setRealm(realm); publicKeyPolicy.setClientId(clientId); publicKeyPolicy.setClientSecret(clientSecret); - publicKeyPolicy.setRequiredRoles(Arrays.asList("admin-role")); // Add role to trigger validation + publicKeyPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); // Add role to trigger validation try { publicKeyPolicy.setPublicKey(getPublicKeyFromKeycloak()); } catch (Exception e) { @@ -568,7 +563,7 @@ public void configure() throws Exception { wrongPublicKeyPolicy.setClientId(clientId); wrongPublicKeyPolicy.setClientSecret(clientSecret); wrongPublicKeyPolicy.setPublicKey(getWrongPublicKey()); - wrongPublicKeyPolicy.setRequiredRoles(Arrays.asList("admin-role")); // Add role to trigger validation + wrongPublicKeyPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); // Add role to trigger validation from("direct:public-key-protected") .policy(publicKeyPolicy) @@ -586,7 +581,7 @@ public void configure() throws Exception { permissionsPolicy.setRealm(realm); permissionsPolicy.setClientId(clientId); permissionsPolicy.setClientSecret(clientSecret); - permissionsPolicy.setRequiredPermissions(Arrays.asList("read:documents", "write:documents")); + permissionsPolicy.setRequiredPermissions(java.util.Arrays.asList("read:documents", "write:documents")); permissionsPolicy.setAllPermissionsRequired(false); // ANY permission from("direct:permissions-protected") @@ -600,7 +595,7 @@ public void configure() throws Exception { scopePermissionsPolicy.setRealm(realm); scopePermissionsPolicy.setClientId(clientId); scopePermissionsPolicy.setClientSecret(clientSecret); - scopePermissionsPolicy.setRequiredPermissions(Arrays.asList("profile", "email", "openid")); + scopePermissionsPolicy.setRequiredPermissions(java.util.Arrays.asList("profile", "email", "openid")); scopePermissionsPolicy.setAllPermissionsRequired(false); // ANY scope from("direct:scope-permissions-protected") @@ -614,8 +609,8 @@ public void configure() throws Exception { combinedPolicy.setRealm(realm); combinedPolicy.setClientId(clientId); combinedPolicy.setClientSecret(clientSecret); - combinedPolicy.setRequiredRoles(Arrays.asList("admin-role")); - combinedPolicy.setRequiredPermissions(Arrays.asList("read:documents", "admin:system")); + combinedPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); + combinedPolicy.setRequiredPermissions(java.util.Arrays.asList("read:documents", "admin:system")); combinedPolicy.setAllRolesRequired(true); // Must have ALL roles combinedPolicy.setAllPermissionsRequired(true); // Any permission @@ -631,7 +626,7 @@ public void configure() throws Exception { flexiblePermissionsPolicy.setClientId(clientId); flexiblePermissionsPolicy.setClientSecret(clientSecret); flexiblePermissionsPolicy - .setRequiredPermissions(Arrays.asList("profile", "email", "user:basic", "read:public")); + .setRequiredPermissions(java.util.Arrays.asList("profile", "email", "user:basic", "read:public")); flexiblePermissionsPolicy.setAllPermissionsRequired(false); // ANY permission from("direct:flexible-permissions-protected") diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java index 80f727e5ee970..375fa9ab7696f 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakSecurityTestInfraIT.java @@ -24,7 +24,6 @@ import java.util.Base64; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.UUID; import jakarta.ws.rs.client.Client; @@ -55,7 +54,6 @@ import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; @@ -473,7 +471,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { // Test that parseToken works correctly with public key and issuer verification String expectedIssuer = keycloakService.getKeycloakServerUrl() + "/realms/" + TEST_REALM_NAME; try { - AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); assertNotNull(token); @@ -481,7 +479,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { assertTrue(KeycloakSecurityHelper.isTokenActive(token)); // Verify roles can be extracted after public key verification - Set roles = KeycloakSecurityHelper.extractRoles(token, TEST_REALM_NAME, TEST_CLIENT_ID); + java.util.Set roles = KeycloakSecurityHelper.extractRoles(token, TEST_REALM_NAME, TEST_CLIENT_ID); assertNotNull(roles); log.info("Public key and issuer verification test passed for user: {}", ADMIN_USER); @@ -513,14 +511,14 @@ void testTokenParsing() { try { // Parse and verify token with public key and issuer - AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); assertNotNull(token); assertNotNull(token.getSubject()); assertTrue(KeycloakSecurityHelper.isTokenActive(token)); // Extract roles from token - Set roles = KeycloakSecurityHelper.extractRoles(token, TEST_REALM_NAME, TEST_CLIENT_ID); + java.util.Set roles = KeycloakSecurityHelper.extractRoles(token, TEST_REALM_NAME, TEST_CLIENT_ID); assertNotNull(roles); assertTrue(roles.contains(ADMIN_ROLE), "Token should contain admin role"); diff --git a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectorTest.java b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectorTest.java index 49c9b15d82020..8c28a12500e00 100644 --- a/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectorTest.java +++ b/components/camel-keycloak/src/test/java/org/apache/camel/component/keycloak/security/KeycloakTokenIntrospectorTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.keycloak.security; -import java.util.List; import java.util.Map; import java.util.Set; @@ -67,9 +66,9 @@ public void testIntrospectionResultInactive() { public void testExtractRolesFromIntrospection() { Map claims = Map.of( "active", true, - "realm_access", Map.of("roles", List.of("admin", "user")), + "realm_access", Map.of("roles", java.util.List.of("admin", "user")), "resource_access", Map.of( - "test-client", Map.of("roles", List.of("client-admin")))); + "test-client", Map.of("roles", java.util.List.of("client-admin")))); KeycloakTokenIntrospector.IntrospectionResult result = new KeycloakTokenIntrospector.IntrospectionResult(claims); @@ -87,7 +86,7 @@ public void testExtractPermissionsFromIntrospection() { Map claims = Map.of( "active", true, "scope", "read:documents write:documents", - "permissions", List.of("admin:all")); + "permissions", java.util.List.of("admin:all")); KeycloakTokenIntrospector.IntrospectionResult result = new KeycloakTokenIntrospector.IntrospectionResult(claims); diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapBinaryPropertiesFunction.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapBinaryPropertiesFunction.java index ed916db3121db..bcf4ecc977ac7 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapBinaryPropertiesFunction.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapBinaryPropertiesFunction.java @@ -16,12 +16,10 @@ */ package org.apache.camel.component.kubernetes.properties; -import org.apache.camel.spi.annotations.PropertiesFunction; - /** * Resolves binary type configmap keys . */ -@PropertiesFunction("configmap-binary") +@org.apache.camel.spi.annotations.PropertiesFunction("configmap-binary") public class ConfigMapBinaryPropertiesFunction extends BaseConfigMapPropertiesFunction { @Override diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunction.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunction.java index 9893b7cacfdd3..9f0df56423586 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunction.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunction.java @@ -16,12 +16,10 @@ */ package org.apache.camel.component.kubernetes.properties; -import org.apache.camel.spi.annotations.PropertiesFunction; - /** * Resolves String type configmap keys . */ -@PropertiesFunction("configmap") +@org.apache.camel.spi.annotations.PropertiesFunction("configmap") public class ConfigMapPropertiesFunction extends BaseConfigMapPropertiesFunction { @Override diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretBinaryPropertiesFunction.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretBinaryPropertiesFunction.java index 0f37e37547a51..52f0656590854 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretBinaryPropertiesFunction.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretBinaryPropertiesFunction.java @@ -16,12 +16,10 @@ */ package org.apache.camel.component.kubernetes.properties; -import org.apache.camel.spi.annotations.PropertiesFunction; - /** * Resolves binary type secret keys . */ -@PropertiesFunction("secret-binary") +@org.apache.camel.spi.annotations.PropertiesFunction("secret-binary") public class SecretBinaryPropertiesFunction extends BaseSecretPropertiesFunction { @Override diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunction.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunction.java index cf29dbcda1642..1c8e66e6760cc 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunction.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunction.java @@ -16,12 +16,10 @@ */ package org.apache.camel.component.kubernetes.properties; -import org.apache.camel.spi.annotations.PropertiesFunction; - /** * Resolves String type secret keys . */ -@PropertiesFunction("secret") +@org.apache.camel.spi.annotations.PropertiesFunction("secret") public class SecretPropertiesFunction extends BaseSecretPropertiesFunction { @Override diff --git a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java index b63db1d903b76..08cc0c3fe8def 100644 --- a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java +++ b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java @@ -23,7 +23,6 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Language; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; @@ -32,7 +31,7 @@ * The Language component enables sending * {@link org.apache.camel.Exchange}s to a given language in order to have a script executed. */ -@Component("language") +@org.apache.camel.spi.annotations.Component("language") public class LanguageComponent extends DefaultComponent { public static final String RESOURCE = "resource:"; diff --git a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java index 4b987b1af2059..b8050aeb38165 100644 --- a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java +++ b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.test.AvailablePortFinder; import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; import org.apache.directory.api.util.Network; import org.apache.directory.api.util.Strings; @@ -57,7 +56,7 @@ public final class ServerAnnotationProcessor { private static final Logger LOG = LoggerFactory.getLogger(ServerAnnotationProcessor.class); // Keep Port references alive to prevent port reuse (TOCTOU prevention) - private static final List RESERVED_PORTS = new ArrayList<>(); + private static final List RESERVED_PORTS = new ArrayList<>(); private ServerAnnotationProcessor() { } @@ -339,7 +338,7 @@ private static List createTransports(CreateTransport transportBuilder } private static int getFreePort() { - AvailablePortFinder.Port port = AvailablePortFinder.find(); + org.apache.camel.test.AvailablePortFinder.Port port = org.apache.camel.test.AvailablePortFinder.find(); RESERVED_PORTS.add(port); return port.getPort(); } diff --git a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java index 4b987b1af2059..b8050aeb38165 100644 --- a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java +++ b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.test.AvailablePortFinder; import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; import org.apache.directory.api.util.Network; import org.apache.directory.api.util.Strings; @@ -57,7 +56,7 @@ public final class ServerAnnotationProcessor { private static final Logger LOG = LoggerFactory.getLogger(ServerAnnotationProcessor.class); // Keep Port references alive to prevent port reuse (TOCTOU prevention) - private static final List RESERVED_PORTS = new ArrayList<>(); + private static final List RESERVED_PORTS = new ArrayList<>(); private ServerAnnotationProcessor() { } @@ -339,7 +338,7 @@ private static List createTransports(CreateTransport transportBuilder } private static int getFreePort() { - AvailablePortFinder.Port port = AvailablePortFinder.find(); + org.apache.camel.test.AvailablePortFinder.Port port = org.apache.camel.test.AvailablePortFinder.find(); RESERVED_PORTS.add(port); return port.getPort(); } diff --git a/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java b/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java index ceb452537fb85..4f0166e82260f 100644 --- a/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java +++ b/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java @@ -24,7 +24,6 @@ import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.processor.DefaultExchangeFormatter; import org.slf4j.Logger; @@ -36,7 +35,7 @@ * The Log Component is for logging message exchanges via the underlying * logging mechanism. */ -@Component("log") +@org.apache.camel.spi.annotations.Component("log") public class LogComponent extends DefaultComponent { private static final Logger LOG = LoggerFactory.getLogger(LogComponent.class); diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailAuthenticator.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailAuthenticator.java index 28d8a1d2dea6e..41db0771c87d6 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailAuthenticator.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailAuthenticator.java @@ -16,13 +16,12 @@ */ package org.apache.camel.component.mail; -import jakarta.mail.Authenticator; import jakarta.mail.PasswordAuthentication; /** * Mail authenticator that supplies username and password */ -public class MailAuthenticator extends Authenticator { +public class MailAuthenticator extends jakarta.mail.Authenticator { // makes the method public /** Override this method in your implementation. */ diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java index 4b2af3ed0fa02..2a96fca0606a4 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java @@ -910,7 +910,7 @@ protected static boolean hasAlternativeBody(MailConfiguration configuration, Exc protected static String getAlternativeBody(MailConfiguration configuration, Exchange exchange) { String alternativeBodyHeader = configuration.getAlternativeBodyHeader(); - return exchange.getIn().getHeader(alternativeBodyHeader, String.class); + return exchange.getIn().getHeader(alternativeBodyHeader, java.lang.String.class); } /** diff --git a/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/MapstructComponent.java b/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/MapstructComponent.java index b72cb8f2b6b77..ee71a25e3a668 100644 --- a/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/MapstructComponent.java +++ b/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/MapstructComponent.java @@ -21,13 +21,12 @@ import org.apache.camel.CamelContextAware; 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.service.ServiceHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Component("mapstruct") +@org.apache.camel.spi.annotations.Component("mapstruct") public class MapstructComponent extends DefaultComponent { private static final Logger LOG = LoggerFactory.getLogger(MapstructComponent.class); diff --git a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/CamelOpenTelemetryExtension.java b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/CamelOpenTelemetryExtension.java index f212f37127b6d..e6f5d83fdc5c8 100644 --- a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/CamelOpenTelemetryExtension.java +++ b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/CamelOpenTelemetryExtension.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -214,7 +213,7 @@ public String toString() { } } - class SpanComparator implements Comparator { + class SpanComparator implements java.util.Comparator { @Override public int compare(SpanData a, SpanData b) { long nanosA = a.getStartEpochNanos(); diff --git a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java index f5b266408de98..c60d8f99a1207 100644 --- a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java +++ b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerPropagationTestSupport.java @@ -18,7 +18,6 @@ import java.util.List; -import io.micrometer.tracing.Tracer; import io.micrometer.tracing.otel.bridge.OtelBaggageManager; import io.micrometer.tracing.otel.bridge.OtelCurrentTraceContext; import io.micrometer.tracing.otel.bridge.OtelPropagator; @@ -46,7 +45,7 @@ public class MicrometerObservabilityTracerPropagationTestSupport extends Exchang protected CamelOpenTelemetryExtension otelExtension = CamelOpenTelemetryExtension.create(); protected MicrometerObservabilityTracer tst = new MicrometerObservabilityTracer(); - protected Tracer tracer; + protected io.micrometer.tracing.Tracer tracer; io.opentelemetry.api.trace.Tracer otelTracer; @Override diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java index 072165aca2cb6..542185bace2fc 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceProcessor.java @@ -34,7 +34,6 @@ import org.apache.camel.Processor; import org.apache.camel.Route; import org.apache.camel.RuntimeExchangeException; -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; @@ -61,7 +60,7 @@ */ @ManagedResource(description = "Managed FaultTolerance Processor") public class FaultToleranceProcessor extends BaseProcessorSupport - implements CamelContextAware, Navigate, Traceable, IdAware, RouteIdAware { + implements CamelContextAware, Navigate, org.apache.camel.Traceable, IdAware, RouteIdAware { private static final Logger LOG = LoggerFactory.getLogger(FaultToleranceProcessor.class); diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java index fe384ce701dca..ab2ae48eed98c 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/KeyStoreLoader.java @@ -26,7 +26,6 @@ import java.security.KeyStore; import java.security.PrivateKey; import java.security.PublicKey; -import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.NoSuchElementException; @@ -140,7 +139,7 @@ public Result load() throws GeneralSecurityException, IOException { if (privateKey instanceof PrivateKey pk) { // Load the full certificate chain - final Certificate[] chain = keyStore.getCertificateChain(effectiveKeyAlias); + final java.security.cert.Certificate[] chain = keyStore.getCertificateChain(effectiveKeyAlias); if (chain == null || chain.length == 0) { return null; } diff --git a/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpCertificateProvider.java b/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpCertificateProvider.java index ca4bb1385645d..3f942d17dd2ba 100644 --- a/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpCertificateProvider.java +++ b/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpCertificateProvider.java @@ -24,7 +24,6 @@ import java.nio.file.Paths; import java.security.GeneralSecurityException; import java.security.PublicKey; -import java.time.Instant; import org.apache.camel.CamelContext; import org.apache.camel.component.file.GenericFileOperationFailedException; @@ -242,22 +241,22 @@ private static void validateCertificateValidity(OpenSshCertificate certificate, throw new GenericFileOperationFailedException( String.format("Certificate from '%s' is not valid. Valid from %s to %s, current time: %s", resourceName, - validAfter > 0 ? Instant.ofEpochSecond(validAfter) : "epoch", + validAfter > 0 ? java.time.Instant.ofEpochSecond(validAfter) : "epoch", validBefore == OpenSshCertificate.INFINITY ? "forever" - : Instant.ofEpochSecond(validBefore), - Instant.now())); + : java.time.Instant.ofEpochSecond(validBefore), + java.time.Instant.now())); } if (LOG.isTraceEnabled()) { long validAfter = certificate.getValidAfter(); long validBefore = certificate.getValidBefore(); LOG.trace("Certificate validity check passed: validAfter={}, validBefore={}, now={}", - validAfter > 0 ? Instant.ofEpochSecond(validAfter) : "always", + validAfter > 0 ? java.time.Instant.ofEpochSecond(validAfter) : "always", validBefore == OpenSshCertificate.INFINITY ? "forever" - : Instant.ofEpochSecond(validBefore), - Instant.now()); + : java.time.Instant.ofEpochSecond(validBefore), + java.time.Instant.now()); } } } diff --git a/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpOperations.java b/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpOperations.java index 30dc60a9c4b85..a8a97fbea31f1 100644 --- a/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpOperations.java +++ b/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpOperations.java @@ -65,7 +65,6 @@ import org.apache.sshd.common.compression.BuiltinCompressions; import org.apache.sshd.common.config.keys.OpenSshCertificate; import org.apache.sshd.common.kex.BuiltinDHFactories; -import org.apache.sshd.common.kex.KexProposalOption; import org.apache.sshd.common.kex.KeyExchangeFactory; import org.apache.sshd.common.signature.BuiltinSignatures; import org.apache.sshd.common.signature.Signature; @@ -744,10 +743,10 @@ private void logCompressionNegotiationResult(ClientSession session, MinaSftpConf try { // Get the negotiated compression algorithms (client-to-server and server-to-client) String c2sCompression = session.getKexState() != null - ? session.getNegotiatedKexParameter(KexProposalOption.C2SCOMP) + ? session.getNegotiatedKexParameter(org.apache.sshd.common.kex.KexProposalOption.C2SCOMP) : null; String s2cCompression = session.getKexState() != null - ? session.getNegotiatedKexParameter(KexProposalOption.S2CCOMP) + ? session.getNegotiatedKexParameter(org.apache.sshd.common.kex.KexProposalOption.S2CCOMP) : null; boolean compressionNone = "none".equals(c2sCompression) || "none".equals(s2cCompression); diff --git a/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpServerKeyVerifier.java b/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpServerKeyVerifier.java index abac0c983696c..7f214c5b50a79 100644 --- a/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpServerKeyVerifier.java +++ b/components/camel-mina-sftp/src/main/java/org/apache/camel/component/file/remote/mina/MinaSftpServerKeyVerifier.java @@ -29,7 +29,6 @@ import java.time.Instant; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import org.apache.camel.CamelContext; @@ -111,7 +110,7 @@ public boolean verifyServerKey(ClientSession clientSession, SocketAddress remote log.debug("Loaded {} known hosts entries", entries.size()); } catch (IOException | GeneralSecurityException e) { log.warn("Failed to load known hosts entries: {}", e.getMessage()); - cachedEntries = Collections.emptyList(); + cachedEntries = java.util.Collections.emptyList(); } } diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java index d02576554ffc4..4d2c39e8eb026 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java @@ -23,7 +23,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.stream.IntStream; import org.apache.camel.component.mllp.MllpAcknowledgementGenerationException; import org.apache.camel.component.mllp.MllpProtocolConstants; @@ -457,7 +456,7 @@ public static String getCharacterAsPrintFriendlyString(char c) { } private int[] caretPositionsIn(String data) { - return IntStream.range(0, data.length()) + return java.util.stream.IntStream.range(0, data.length()) .filter(i -> data.charAt(i) == '^') .toArray(); } diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockComponent.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockComponent.java index 184d36aad807f..a9fcea7f9259d 100644 --- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockComponent.java +++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockComponent.java @@ -24,7 +24,6 @@ import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.processor.DefaultExchangeFormatter; import org.apache.camel.support.processor.ThroughputLogger; @@ -32,7 +31,7 @@ /** * The Mock Component provides mock endpoints for testing. */ -@Component("mock") +@org.apache.camel.spi.annotations.Component("mock") public class MockComponent extends DefaultComponent { @Metadata(label = "producer", diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/SslAwareMongoClient.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/SslAwareMongoClient.java index 14132b51b06cc..635ab195e07e9 100644 --- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/SslAwareMongoClient.java +++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/SslAwareMongoClient.java @@ -18,7 +18,6 @@ import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.List; @@ -82,7 +81,7 @@ public MongoClient get() { throw new RuntimeException("Error instantiating trust all SSL context.", e); } try { - sc.init(null, trustAllCerts, new SecureRandom()); + sc.init(null, trustAllCerts, new java.security.SecureRandom()); } catch (KeyManagementException e) { throw new RuntimeException("Error instantiating trust all SSL context.", e); } diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepository.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepository.java index 3414321942b1d..7056c9b2cc523 100644 --- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepository.java +++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/processor/idempotent/MongoDbIdempotentRepository.java @@ -17,7 +17,6 @@ package org.apache.camel.component.mongodb.processor.idempotent; import com.mongodb.ErrorCategory; -import com.mongodb.MongoWriteException; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.result.DeleteResult; @@ -65,7 +64,7 @@ public boolean add(String key) { Document document = new Document(MONGO_ID, key); try { collection.insertOne(document); - } catch (MongoWriteException ex) { + } catch (com.mongodb.MongoWriteException ex) { if (ex.getError().getCategory() == ErrorCategory.DUPLICATE_KEY) { return false; } diff --git a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java index 753d25ca0a9be..32cd37bf9e044 100644 --- a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java +++ b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java @@ -22,7 +22,6 @@ import org.apache.camel.ExpressionEvaluationException; import org.apache.camel.ExpressionIllegalSyntaxException; import org.apache.camel.support.ExpressionSupport; -import org.mvel2.MVEL; public class MvelExpression extends ExpressionSupport { @@ -35,7 +34,7 @@ public MvelExpression(String expressionString, Class type) { this.type = type; try { - this.compiled = MVEL.compileExpression(expressionString); + this.compiled = org.mvel2.MVEL.compileExpression(expressionString); } catch (Exception e) { throw new ExpressionIllegalSyntaxException(expressionString, e); } @@ -48,7 +47,7 @@ public static MvelExpression mvel(String expression) { @Override public T evaluate(Exchange exchange, Class tClass) { try { - Object value = MVEL.executeExpression(compiled, new RootObject(exchange)); + Object value = org.mvel2.MVEL.executeExpression(compiled, new RootObject(exchange)); return exchange.getContext().getTypeConverter().convertTo(tClass, value); } catch (Exception e) { throw new ExpressionEvaluationException(this, exchange, e); @@ -58,7 +57,7 @@ public T evaluate(Exchange exchange, Class tClass) { @Override public Object evaluate(Exchange exchange) { try { - return MVEL.executeExpression(compiled, new RootObject(exchange)); + return org.mvel2.MVEL.executeExpression(compiled, new RootObject(exchange)); } catch (Exception e) { throw new ExpressionEvaluationException(this, exchange, e); } diff --git a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java index 342a117c91a52..33b6b60a2c95b 100644 --- a/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java +++ b/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java @@ -25,7 +25,6 @@ import org.apache.camel.spi.ScriptingLanguage; import org.apache.camel.spi.annotations.Language; import org.apache.camel.support.TypedLanguageSupport; -import org.mvel2.MVEL; /** * An MVEL {@link org.apache.camel.spi.Language} plugin @@ -51,8 +50,8 @@ private MvelExpression createMvelExpression(String expression, Class type) { public T evaluate(String script, Map bindings, Class resultType) { script = loadResource(script); try { - Serializable compiled = MVEL.compileExpression(script); - Object value = MVEL.executeExpression(compiled, bindings); + Serializable compiled = org.mvel2.MVEL.compileExpression(script); + Object value = org.mvel2.MVEL.executeExpression(compiled, bindings); return getCamelContext().getTypeConverter().convertTo(resultType, value); } catch (Exception e) { throw new ExpressionIllegalSyntaxException(script, e); diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityConstraintMapping.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityConstraintMapping.java index 7f594d014cb52..047df8c78b8d8 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityConstraintMapping.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityConstraintMapping.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.netty.http; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -102,14 +101,14 @@ private boolean excludedUrl(String url) { public void addInclusion(String constraint) { if (inclusions == null) { - inclusions = new LinkedHashMap<>(); + inclusions = new java.util.LinkedHashMap<>(); } inclusions.put(constraint, null); } public void addInclusion(String constraint, String roles) { if (inclusions == null) { - inclusions = new LinkedHashMap<>(); + inclusions = new java.util.LinkedHashMap<>(); } inclusions.put(constraint, roles); } diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java index a5f88a3d4240d..9eb2f11668bab 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.netty.http; -import javax.net.ssl.SSLHandshakeException; - import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -64,8 +62,8 @@ public void configure() { assertTrue(response.isFailed(), "should have failed"); assertNotNull(ex); // Netty may wrap SSLHandshakeException in DecoderException - boolean isSslError = ex instanceof SSLHandshakeException - || (ex.getCause() instanceof SSLHandshakeException); + boolean isSslError = ex instanceof javax.net.ssl.SSLHandshakeException + || (ex.getCause() instanceof javax.net.ssl.SSLHandshakeException); assertTrue(isSslError, "Expected SSLHandshakeException (possibly wrapped) but got: " + ex.getClass().getName()); diff --git a/components/camel-oauth/src/main/java/org/apache/camel/oauth/vertx/VertxOAuth.java b/components/camel-oauth/src/main/java/org/apache/camel/oauth/vertx/VertxOAuth.java index 8d89b55cb02aa..09c27afda954d 100644 --- a/components/camel-oauth/src/main/java/org/apache/camel/oauth/vertx/VertxOAuth.java +++ b/components/camel-oauth/src/main/java/org/apache/camel/oauth/vertx/VertxOAuth.java @@ -30,8 +30,6 @@ import io.vertx.ext.auth.oauth2.Oauth2Credentials; import io.vertx.ext.auth.oauth2.providers.OpenIDConnectAuth; import org.apache.camel.CamelContext; -import org.apache.camel.oauth.AuthCodeCredentials; -import org.apache.camel.oauth.ClientCredentials; import org.apache.camel.oauth.OAuth; import org.apache.camel.oauth.OAuthCodeFlowParams; import org.apache.camel.oauth.OAuthConfig; @@ -106,7 +104,7 @@ public String buildCodeFlowAuthRequestUrl(OAuthCodeFlowParams params) { public UserProfile authenticate(org.apache.camel.oauth.Credentials creds) throws OAuthException { Credentials vtxCreds; - if (creds instanceof UserCredentials uc) { + if (creds instanceof org.apache.camel.oauth.UserCredentials uc) { var userProfile = uc.getUserProfile(); log.info("Authenticate userProfile: {}", userProfile.subject()); @@ -115,7 +113,7 @@ public UserProfile authenticate(org.apache.camel.oauth.Credentials creds) throws .setToken(userProfile.accessToken().orElseThrow()) .addScope(scope); - } else if (creds instanceof AuthCodeCredentials params) { + } else if (creds instanceof org.apache.camel.oauth.AuthCodeCredentials params) { vtxCreds = new Oauth2Credentials() .setFlow(OAuth2FlowType.AUTH_CODE) @@ -127,7 +125,7 @@ public UserProfile authenticate(org.apache.camel.oauth.Credentials creds) throws vtxCreds = new TokenCredentials() .setToken(params.getToken()); - } else if (creds instanceof ClientCredentials params) { + } else if (creds instanceof org.apache.camel.oauth.ClientCredentials params) { vtxCreds = new Oauth2Credentials() .setFlow(OAuth2FlowType.CLIENT) diff --git a/components/camel-oauth/src/test/java/org/apache/camel/test/oauth/SSLCertTrustTest.java b/components/camel-oauth/src/test/java/org/apache/camel/test/oauth/SSLCertTrustTest.java index e5e1e7cc8b877..d2b00ca4768b9 100644 --- a/components/camel-oauth/src/test/java/org/apache/camel/test/oauth/SSLCertTrustTest.java +++ b/components/camel-oauth/src/test/java/org/apache/camel/test/oauth/SSLCertTrustTest.java @@ -27,7 +27,6 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509TrustManager; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; @@ -58,7 +57,7 @@ void testCheckClusterCertificateTrust() throws Exception { try { for (var tm : tmf.getTrustManagers()) { - var xtm = (X509TrustManager) tm; + var xtm = (javax.net.ssl.X509TrustManager) tm; xtm.checkServerTrusted(new X509Certificate[] { cert }, "RSA"); } } catch (CertificateException ex) { diff --git a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java index 910ccc8c40323..7b7fbf3069a55 100644 --- a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java +++ b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java @@ -67,7 +67,7 @@ public void setObservationRegistry(ObservationRegistry observationRegistry) { } private Observation.Context spanKindToContextOnExtract( - SpanKind kind, SpanDecorator sd, Exchange exchange) { + org.apache.camel.tracing.SpanKind kind, SpanDecorator sd, Exchange exchange) { ExtractAdapter adapter = sd.getExtractAdapter(exchange.getIn().getHeaders(), encoding); switch (kind) { case PRODUCER: @@ -96,7 +96,7 @@ private Observation.Context spanKindToContextOnExtract( } private Observation.Context spanKindToContextOnInject( - SpanKind kind, InjectAdapter adapter, Exchange exchange) { + org.apache.camel.tracing.SpanKind kind, InjectAdapter adapter, Exchange exchange) { switch (kind) { case SPAN_KIND_CLIENT: RequestReplySenderContext senderContext @@ -180,7 +180,7 @@ private static Observation getParentObservation(SpanAdapter parentObservation) { @Override protected SpanAdapter startExchangeBeginSpan( - Exchange exchange, SpanDecorator sd, String operationName, SpanKind kind, + Exchange exchange, SpanDecorator sd, String operationName, org.apache.camel.tracing.SpanKind kind, SpanAdapter parent) { boolean parentPresent = parent != null; Observation.Context context = spanKindToContextOnExtract(kind, sd, exchange); diff --git a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java index 20c31e2da8e14..b971b25235c44 100644 --- a/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java +++ b/components/camel-ocsf/src/test/java/org/apache/camel/dataformat/ocsf/OcsfEventExampleTest.java @@ -19,8 +19,6 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -100,7 +98,7 @@ void testParseCompleteOcsfFinding() throws Exception { // Verify cloud info in additionalProperties (cloud is not a base event field) @SuppressWarnings("unchecked") - Map cloud = (Map) finding.getAdditionalProperties().get("cloud"); + java.util.Map cloud = (java.util.Map) finding.getAdditionalProperties().get("cloud"); assertThat(cloud.get("provider")).isEqualTo("AWS"); assertThat(cloud.get("region")).isEqualTo("us-east-1"); } @@ -163,8 +161,8 @@ void testBuildOcsfFindingProgrammatically() throws Exception { info.setAttacks(Arrays.asList(attack)); // Evidence (using Map since evidences is a list of generic objects in OCSF) - Map evidence = new HashMap<>(); - evidence.put("http_request", Map.of( + java.util.Map evidence = new java.util.HashMap<>(); + evidence.put("http_request", java.util.Map.of( "method", "GET", "url", "/api/users?id=1' UNION SELECT username,password FROM users--", "user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)", diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestModelConverters.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestModelConverters.java index b101405b14149..f6e07fa35bc7a 100644 --- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestModelConverters.java +++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestModelConverters.java @@ -16,9 +16,6 @@ */ package org.apache.camel.openapi; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -62,7 +59,7 @@ public RestModelConverters(boolean openapi31) { } public List> readClass(OpenAPI oasDocument, Class clazz) { - if (clazz.equals(File.class)) { + if (clazz.equals(java.io.File.class)) { // File is a special type in OAS2 / OAS3 (no model) return null; } else { @@ -78,7 +75,7 @@ private List> readClassOpenApi3(Class clazz) { ModelConverters modelConverters = openapi31 ? MODEL31_CONVERTERS : MODEL30_CONVERTERS; Map swaggerModel = modelConverters.readAll(clazz); - List> modelSchemas = new ArrayList<>(); + List> modelSchemas = new java.util.ArrayList<>(); swaggerModel.forEach((key, schema) -> { schema.setName(key); modelSchemas.add(schema); @@ -132,7 +129,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context } if (!type.isContainerType()) { - Map value = new HashMap<>(); + Map value = new java.util.HashMap<>(); value.put("type", "string"); value.put("format", type.getRawClass().getName()); result.addExtension("x-className", value); diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java index 3fab7602f41c0..e7577560b3719 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderFileResponseModelTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.openapi; -import java.io.File; - import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import org.apache.camel.BindToRegistry; @@ -47,7 +45,7 @@ protected RouteBuilder createRouteBuilder() { public void configure() { rest("/hello").consumes("application/json").produces("application/octet-stream").get("/pdf/{name}").description("Saying hi").param().name("name") .type(RestParamType.path).dataType("string").description("Who is it").example("Donald Duck").endParam().responseMessage().code(200) - .message("A document as reply").responseModel(File.class).endResponseMessage().to("log:hi"); + .message("A document as reply").responseModel(java.io.File.class).endResponseMessage().to("log:hi"); } }; } diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java index 7d60b31014c74..479f3235e1677 100644 --- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java +++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java @@ -88,7 +88,7 @@ private void doDelete(Exchange exchange) { checkFailure(response, exchange, "Delete flavor"); } - private Flavor messageToFlavor(Message message) { + private org.openstack4j.model.compute.Flavor messageToFlavor(Message message) { Flavor flavor = message.getBody(Flavor.class); if (flavor == null) { Map headers = message.getHeaders(); diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java index ffb489be56711..f343641b6851d 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java @@ -66,7 +66,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { private ArgumentCaptor imageIdCaptor; @Captor - private ArgumentCaptor imageCaptor; + private ArgumentCaptor imageCaptor; private Image dummyImage; diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java index bf492fd74103b..e19903a3cf481 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java @@ -72,7 +72,7 @@ public void setUp() { when(flavorService.create(any())).thenReturn(testOSFlavor); when(flavorService.get(anyString())).thenReturn(testOSFlavor); - List getAllList = new ArrayList<>(); + List getAllList = new ArrayList<>(); getAllList.add(testOSFlavor); getAllList.add(testOSFlavor); doReturn(getAllList).when(flavorService).list(); diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java index af5719c8f0e15..3ae897a45b987 100644 --- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java +++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java @@ -47,7 +47,7 @@ public class ServerProducerTest extends NovaProducerTestSupport { @Mock(lenient = true) - private Server testOSServer; + private org.openstack4j.model.compute.Server testOSServer; @Mock private ServerService serverService; diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java index b594793dd0f90..b913f80fd67ac 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java @@ -23,7 +23,6 @@ import io.opentelemetry.api.baggage.BaggageBuilder; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import org.apache.camel.tracing.SpanAdapter; @@ -48,18 +47,18 @@ public class OpenTelemetrySpanAdapter implements SpanAdapter { } private Baggage baggage; - private Span span; + private io.opentelemetry.api.trace.Span span; - OpenTelemetrySpanAdapter(Span span) { + OpenTelemetrySpanAdapter(io.opentelemetry.api.trace.Span span) { this.span = span; } - OpenTelemetrySpanAdapter(Span span, Baggage baggage) { + OpenTelemetrySpanAdapter(io.opentelemetry.api.trace.Span span, Baggage baggage) { this.span = span; this.baggage = baggage; } - Span getOpenTelemetrySpan() { + io.opentelemetry.api.trace.Span getOpenTelemetrySpan() { return this.span; } diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/CamelOpenTelemetryExtension.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/CamelOpenTelemetryExtension.java index 5d548203bd00f..2125f1716e2d4 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/CamelOpenTelemetryExtension.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/CamelOpenTelemetryExtension.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -201,7 +200,7 @@ public String toString() { } } - class SpanComparator implements Comparator { + class SpanComparator implements java.util.Comparator { @Override public int compare(SpanData a, SpanData b) { Long nanosA = a.getStartEpochNanos(); diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpComponent.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpComponent.java index e413425581401..9d74ab627166f 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpComponent.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpComponent.java @@ -18,16 +18,13 @@ import java.util.Map; -import org.apache.camel.Endpoint; -import org.apache.camel.support.DefaultComponent; - /** * Mock HTTP component for testing SpanKind. This component is recognized by HttpSpanDecorator based on its class name. */ -public class MockHttpComponent extends DefaultComponent { +public class MockHttpComponent extends org.apache.camel.support.DefaultComponent { @Override - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) + protected org.apache.camel.Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { MockHttpEndpoint endpoint = new MockHttpEndpoint(uri, this); setProperties(endpoint, parameters); diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpEndpoint.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpEndpoint.java index 31f7ef088abe8..ee1d5e061862a 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpEndpoint.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpEndpoint.java @@ -16,28 +16,22 @@ */ package org.apache.camel.opentelemetry2.mock; -import org.apache.camel.Component; -import org.apache.camel.Consumer; -import org.apache.camel.Processor; -import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; - /** * Mock HTTP endpoint for testing SpanKind. */ -class MockHttpEndpoint extends DefaultEndpoint { +class MockHttpEndpoint extends org.apache.camel.support.DefaultEndpoint { - public MockHttpEndpoint(String endpointUri, Component component) { + public MockHttpEndpoint(String endpointUri, org.apache.camel.Component component) { super(endpointUri, component); } @Override - public Producer createProducer() throws Exception { + public org.apache.camel.Producer createProducer() throws Exception { return new MockHttpProducer(this); } @Override - public Consumer createConsumer(Processor processor) throws Exception { + public org.apache.camel.Consumer createConsumer(org.apache.camel.Processor processor) throws Exception { throw new IllegalArgumentException("Not used in MockHttpEndpoint"); } } diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpProducer.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpProducer.java index 0c70511a59d71..11530a4432552 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpProducer.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpProducer.java @@ -16,21 +16,17 @@ */ package org.apache.camel.opentelemetry2.mock; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.support.DefaultProducer; - /** * Mock HTTP producer that just echoes the input. */ -class MockHttpProducer extends DefaultProducer { +class MockHttpProducer extends org.apache.camel.support.DefaultProducer { - public MockHttpProducer(Endpoint endpoint) { + public MockHttpProducer(org.apache.camel.Endpoint endpoint) { super(endpoint); } @Override - public void process(Exchange exchange) throws Exception { + public void process(org.apache.camel.Exchange exchange) throws Exception { // Simple echo - set response body to request body exchange.getMessage().setBody("HTTP Response: " + exchange.getIn().getBody()); } diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpSpanDecorator.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpSpanDecorator.java index b731beaa965ad..e8597fbfca97f 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpSpanDecorator.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockHttpSpanDecorator.java @@ -16,12 +16,10 @@ */ package org.apache.camel.opentelemetry2.mock; -import org.apache.camel.telemetry.decorators.AbstractHttpSpanDecorator; - /** * Span decorator for mock HTTP component used in tests. */ -public class MockHttpSpanDecorator extends AbstractHttpSpanDecorator { +public class MockHttpSpanDecorator extends org.apache.camel.telemetry.decorators.AbstractHttpSpanDecorator { @Override public String getComponent() { diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaComponent.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaComponent.java index 91dfca301e9dd..8ee1a0725ecd6 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaComponent.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaComponent.java @@ -18,16 +18,13 @@ import java.util.Map; -import org.apache.camel.Endpoint; -import org.apache.camel.support.DefaultComponent; - /** * Mock Kafka component for testing SpanKind and inherited properties. */ -public class MockKafkaComponent extends DefaultComponent { +public class MockKafkaComponent extends org.apache.camel.support.DefaultComponent { @Override - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) + protected org.apache.camel.Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { MockKafkaEndpoint endpoint = new MockKafkaEndpoint(uri, this); setProperties(endpoint, parameters); diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaEndpoint.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaEndpoint.java index 39fc5210d1bb4..c9fcd1d58a7e3 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaEndpoint.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaEndpoint.java @@ -16,28 +16,22 @@ */ package org.apache.camel.opentelemetry2.mock; -import org.apache.camel.Component; -import org.apache.camel.Consumer; -import org.apache.camel.Processor; -import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; - /** * Mock Kafka endpoint for testing SpanKind and inherited properties. */ -class MockKafkaEndpoint extends DefaultEndpoint { +class MockKafkaEndpoint extends org.apache.camel.support.DefaultEndpoint { - public MockKafkaEndpoint(String endpointUri, Component component) { + public MockKafkaEndpoint(String endpointUri, org.apache.camel.Component component) { super(endpointUri, component); } @Override - public Producer createProducer() throws Exception { + public org.apache.camel.Producer createProducer() throws Exception { return new MockKafkaProducer(this); } @Override - public Consumer createConsumer(Processor processor) throws Exception { + public org.apache.camel.Consumer createConsumer(org.apache.camel.Processor processor) throws Exception { throw new UnsupportedOperationException("Consumer not implemented for mock Kafka"); } } diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaProducer.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaProducer.java index 16baf5c1baa19..033993a5d226d 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaProducer.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaProducer.java @@ -16,21 +16,17 @@ */ package org.apache.camel.opentelemetry2.mock; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.support.DefaultProducer; - /** * Mock Kafka producer that simulates Kafka headers. */ -class MockKafkaProducer extends DefaultProducer { +class MockKafkaProducer extends org.apache.camel.support.DefaultProducer { - public MockKafkaProducer(Endpoint endpoint) { + public MockKafkaProducer(org.apache.camel.Endpoint endpoint) { super(endpoint); } @Override - public void process(Exchange exchange) throws Exception { + public void process(org.apache.camel.Exchange exchange) throws Exception { // Simulate Kafka response with partition, offset, and key // These headers would normally be set by the real Kafka producer exchange.getMessage().setHeader("kafka.PARTITION", 0); diff --git a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaSpanDecorator.java b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaSpanDecorator.java index ae55632843061..6d0cc534c437f 100644 --- a/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaSpanDecorator.java +++ b/components/camel-opentelemetry2/src/test/java/org/apache/camel/opentelemetry2/mock/MockKafkaSpanDecorator.java @@ -16,13 +16,11 @@ */ package org.apache.camel.opentelemetry2.mock; -import org.apache.camel.telemetry.decorators.KafkaSpanDecorator; - /** * Span decorator for mock Kafka component used in tests. Extends the real KafkaSpanDecorator to inherit all * Kafka-specific behavior (partition, offset, key tags) and adds SpanKind. */ -public class MockKafkaSpanDecorator extends KafkaSpanDecorator { +public class MockKafkaSpanDecorator extends org.apache.camel.telemetry.decorators.KafkaSpanDecorator { @Override public String getComponent() { diff --git a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/Pojo.java b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/Pojo.java index 3bd6d159e22be..c5a3771c250d0 100644 --- a/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/Pojo.java +++ b/components/camel-parquet-avro/src/test/java/org/apache/camel/dataformat/parquet/avro/Pojo.java @@ -16,8 +16,6 @@ */ package org.apache.camel.dataformat.parquet.avro; -import java.util.Objects; - public class Pojo { private long id; private String data; @@ -57,11 +55,11 @@ public boolean equals(Object o) { return false; } Pojo pojo = (Pojo) o; - return id == pojo.id && Objects.equals(data, pojo.data); + return id == pojo.id && java.util.Objects.equals(data, pojo.data); } @Override public int hashCode() { - return Objects.hash(id, data); + return java.util.Objects.hash(id, data); } } diff --git a/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XConsumerTest.java b/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XConsumerTest.java index b1704b8d34399..b44a9a44a1e79 100644 --- a/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XConsumerTest.java +++ b/components/camel-plc4x/src/test/java/org/apache/camel/component/plc4x/Plc4XConsumerTest.java @@ -19,7 +19,6 @@ import java.util.Collections; import java.util.Map; -import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.impl.DefaultCamelContext; import org.apache.plc4x.java.api.exceptions.PlcConnectionException; @@ -76,7 +75,7 @@ void shouldStartTriggeredScraperWhenTriggerPresent() throws Exception { // Avoid real connection doNothing().when(endpoint).setupConnection(); doNothing().when(endpoint).reconnectIfNeeded(); - when(endpoint.createExchange()).thenReturn(mock(Exchange.class)); + when(endpoint.createExchange()).thenReturn(mock(org.apache.camel.Exchange.class)); consumer.doStart(); verify(endpoint, atLeastOnce()).getTrigger(); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/hybrid/HybridKEM.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/hybrid/HybridKEM.java index a637abea3ac58..34af21c1c30b7 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/hybrid/HybridKEM.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/crypto/hybrid/HybridKEM.java @@ -19,7 +19,6 @@ import java.nio.ByteBuffer; import java.security.*; import java.security.spec.ECGenParameterSpec; -import java.security.spec.X509EncodedKeySpec; import javax.crypto.KeyAgreement; import javax.crypto.KeyGenerator; @@ -292,19 +291,19 @@ private static KeyPair generateEphemeralKeyPair(String algorithm) throws Excepti * Reconstructs a public key from encoded bytes. */ private static PublicKey reconstructPublicKey(byte[] encoded, String algorithm) throws Exception { - KeyFactory kf; + java.security.KeyFactory kf; if ("EC".equals(algorithm) || "ECDH".equals(algorithm)) { - kf = KeyFactory.getInstance("EC"); + kf = java.security.KeyFactory.getInstance("EC"); } else if ("X25519".equals(algorithm) || "XDH".equals(algorithm)) { - kf = KeyFactory.getInstance("X25519"); + kf = java.security.KeyFactory.getInstance("X25519"); } else if ("X448".equals(algorithm)) { - kf = KeyFactory.getInstance("X448"); + kf = java.security.KeyFactory.getInstance("X448"); } else { - kf = KeyFactory.getInstance(algorithm); + kf = java.security.KeyFactory.getInstance(algorithm); } - X509EncodedKeySpec keySpec = new X509EncodedKeySpec(encoded); + java.security.spec.X509EncodedKeySpec keySpec = new java.security.spec.X509EncodedKeySpec(encoded); return kf.generatePublic(keySpec); } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/AwsSecretsManagerKeyLifecycleManager.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/AwsSecretsManagerKeyLifecycleManager.java index 6aba8fb4122ae..36da6ffd19f48 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/AwsSecretsManagerKeyLifecycleManager.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/AwsSecretsManagerKeyLifecycleManager.java @@ -37,9 +37,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms; import org.apache.camel.component.pqc.PQCSignatureAlgorithms; -import org.bouncycastle.pqc.crypto.lms.LMOtsParameters; -import org.bouncycastle.pqc.crypto.lms.LMSigParameters; -import org.bouncycastle.pqc.jcajce.spec.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; @@ -572,46 +569,46 @@ private AlgorithmParameterSpec getDefaultParameterSpec(String algorithm) { try { switch (algorithm) { case "DILITHIUM": - return DilithiumParameterSpec.dilithium2; + return org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec.dilithium2; case "MLDSA": case "SLHDSA": // These use default initialization return null; case "FALCON": - return FalconParameterSpec.falcon_512; + return org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec.falcon_512; case "SPHINCSPLUS": - return SPHINCSPlusParameterSpec.sha2_128s; + return org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec.sha2_128s; case "XMSS": - return new XMSSParameterSpec( + return new org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec( 10, - XMSSParameterSpec.SHA256); + org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec.SHA256); case "XMSSMT": - return XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; + return org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; case "LMS": case "HSS": - return new LMSKeyGenParameterSpec( - LMSigParameters.lms_sha256_n32_h10, - LMOtsParameters.sha256_n32_w4); + return new org.bouncycastle.pqc.jcajce.spec.LMSKeyGenParameterSpec( + org.bouncycastle.pqc.crypto.lms.LMSigParameters.lms_sha256_n32_h10, + org.bouncycastle.pqc.crypto.lms.LMOtsParameters.sha256_n32_w4); case "MLKEM": case "KYBER": // These use default initialization return null; case "NTRU": - return NTRUParameterSpec.ntruhps2048509; + return org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec.ntruhps2048509; case "NTRULPRime": - return NTRULPRimeParameterSpec.ntrulpr653; + return org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec.ntrulpr653; case "SNTRUPrime": - return SNTRUPrimeParameterSpec.sntrup761; + return org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec.sntrup761; case "SABER": - return SABERParameterSpec.lightsaberkem128r3; + return org.bouncycastle.pqc.jcajce.spec.SABERParameterSpec.lightsaberkem128r3; case "FRODO": - return FrodoParameterSpec.frodokem640aes; + return org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec.frodokem640aes; case "BIKE": - return BIKEParameterSpec.bike128; + return org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec.bike128; case "HQC": - return HQCParameterSpec.hqc128; + return org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec.hqc128; case "CMCE": - return CMCEParameterSpec.mceliece348864; + return org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec.mceliece348864; default: return null; } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/FileBasedKeyLifecycleManager.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/FileBasedKeyLifecycleManager.java index 46b44bde44150..7e9061b8828e5 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/FileBasedKeyLifecycleManager.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/FileBasedKeyLifecycleManager.java @@ -48,9 +48,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms; import org.apache.camel.component.pqc.PQCSignatureAlgorithms; -import org.bouncycastle.pqc.crypto.lms.LMOtsParameters; -import org.bouncycastle.pqc.crypto.lms.LMSigParameters; -import org.bouncycastle.pqc.jcajce.spec.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -475,46 +472,46 @@ private AlgorithmParameterSpec getDefaultParameterSpec(String algorithm) { try { switch (algorithm) { case "DILITHIUM": - return DilithiumParameterSpec.dilithium2; + return org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec.dilithium2; case "MLDSA": case "SLHDSA": // These use default initialization return null; case "FALCON": - return FalconParameterSpec.falcon_512; + return org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec.falcon_512; case "SPHINCSPLUS": - return SPHINCSPlusParameterSpec.sha2_128s; + return org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec.sha2_128s; case "XMSS": - return new XMSSParameterSpec( + return new org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec( 10, - XMSSParameterSpec.SHA256); + org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec.SHA256); case "XMSSMT": - return XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; + return org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; case "LMS": case "HSS": - return new LMSKeyGenParameterSpec( - LMSigParameters.lms_sha256_n32_h10, - LMOtsParameters.sha256_n32_w4); + return new org.bouncycastle.pqc.jcajce.spec.LMSKeyGenParameterSpec( + org.bouncycastle.pqc.crypto.lms.LMSigParameters.lms_sha256_n32_h10, + org.bouncycastle.pqc.crypto.lms.LMOtsParameters.sha256_n32_w4); case "MLKEM": case "KYBER": // These use default initialization return null; case "NTRU": - return NTRUParameterSpec.ntruhps2048509; + return org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec.ntruhps2048509; case "NTRULPRime": - return NTRULPRimeParameterSpec.ntrulpr653; + return org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec.ntrulpr653; case "SNTRUPrime": - return SNTRUPrimeParameterSpec.sntrup761; + return org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec.sntrup761; case "SABER": - return SABERParameterSpec.lightsaberkem128r3; + return org.bouncycastle.pqc.jcajce.spec.SABERParameterSpec.lightsaberkem128r3; case "FRODO": - return FrodoParameterSpec.frodokem640aes; + return org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec.frodokem640aes; case "BIKE": - return BIKEParameterSpec.bike128; + return org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec.bike128; case "HQC": - return HQCParameterSpec.hqc128; + return org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec.hqc128; case "CMCE": - return CMCEParameterSpec.mceliece348864; + return org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec.mceliece348864; default: return null; } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/HashicorpVaultKeyLifecycleManager.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/HashicorpVaultKeyLifecycleManager.java index 5d80fc1373a4f..aef3741f11ac4 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/HashicorpVaultKeyLifecycleManager.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/HashicorpVaultKeyLifecycleManager.java @@ -37,9 +37,6 @@ import org.apache.camel.component.pqc.PQCKeyEncapsulationAlgorithms; import org.apache.camel.component.pqc.PQCSignatureAlgorithms; -import org.bouncycastle.pqc.crypto.lms.LMOtsParameters; -import org.bouncycastle.pqc.crypto.lms.LMSigParameters; -import org.bouncycastle.pqc.jcajce.spec.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.vault.authentication.TokenAuthentication; @@ -598,46 +595,46 @@ private AlgorithmParameterSpec getDefaultParameterSpec(String algorithm) { try { switch (algorithm) { case "DILITHIUM": - return DilithiumParameterSpec.dilithium2; + return org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec.dilithium2; case "MLDSA": case "SLHDSA": // These use default initialization return null; case "FALCON": - return FalconParameterSpec.falcon_512; + return org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec.falcon_512; case "SPHINCSPLUS": - return SPHINCSPlusParameterSpec.sha2_128s; + return org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec.sha2_128s; case "XMSS": - return new XMSSParameterSpec( + return new org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec( 10, - XMSSParameterSpec.SHA256); + org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec.SHA256); case "XMSSMT": - return XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; + return org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; case "LMS": case "HSS": - return new LMSKeyGenParameterSpec( - LMSigParameters.lms_sha256_n32_h10, - LMOtsParameters.sha256_n32_w4); + return new org.bouncycastle.pqc.jcajce.spec.LMSKeyGenParameterSpec( + org.bouncycastle.pqc.crypto.lms.LMSigParameters.lms_sha256_n32_h10, + org.bouncycastle.pqc.crypto.lms.LMOtsParameters.sha256_n32_w4); case "MLKEM": case "KYBER": // These use default initialization return null; case "NTRU": - return NTRUParameterSpec.ntruhps2048509; + return org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec.ntruhps2048509; case "NTRULPRime": - return NTRULPRimeParameterSpec.ntrulpr653; + return org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec.ntrulpr653; case "SNTRUPrime": - return SNTRUPrimeParameterSpec.sntrup761; + return org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec.sntrup761; case "SABER": - return SABERParameterSpec.lightsaberkem128r3; + return org.bouncycastle.pqc.jcajce.spec.SABERParameterSpec.lightsaberkem128r3; case "FRODO": - return FrodoParameterSpec.frodokem640aes; + return org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec.frodokem640aes; case "BIKE": - return BIKEParameterSpec.bike128; + return org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec.bike128; case "HQC": - return HQCParameterSpec.hqc128; + return org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec.hqc128; case "CMCE": - return CMCEParameterSpec.mceliece348864; + return org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec.mceliece348864; default: return null; } diff --git a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/KeyMetadata.java b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/KeyMetadata.java index 6bac87c69419e..281b4c6b5a55a 100644 --- a/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/KeyMetadata.java +++ b/components/camel-pqc/src/main/java/org/apache/camel/component/pqc/lifecycle/KeyMetadata.java @@ -17,7 +17,6 @@ package org.apache.camel.component.pqc.lifecycle; import java.io.Serializable; -import java.time.Duration; import java.time.Instant; /** @@ -133,7 +132,7 @@ public boolean needsRotation() { } public long getAgeInDays() { - return Duration.between(createdAt, Instant.now()).toDays(); + return java.time.Duration.between(createdAt, Instant.now()).toDays(); } @Override diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java index 4d07bd326aa16..4a30e17b54b1a 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/AwsSecretsManagerKeyLifecycleIT.java @@ -19,7 +19,6 @@ import java.security.KeyPair; import java.security.Security; import java.time.Duration; -import java.time.Instant; import java.util.List; import org.apache.camel.CamelContext; @@ -160,7 +159,7 @@ public void testNeedsRotation() throws Exception { // Simulate old key by setting next rotation time in the past KeyMetadata metadata = keyManager.getKeyMetadata("rotation-check-key"); - metadata.setNextRotationAt(Instant.now().minusSeconds(1)); + metadata.setNextRotationAt(java.time.Instant.now().minusSeconds(1)); keyManager.updateKeyMetadata("rotation-check-key", metadata); // Now it should need rotation diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java index c88f98d1471f5..2aa0b76c93dd5 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/HashicorpVaultKeyLifecycleIT.java @@ -19,7 +19,6 @@ import java.security.KeyPair; import java.security.Security; import java.time.Duration; -import java.time.Instant; import java.util.List; import org.apache.camel.CamelContext; @@ -154,7 +153,7 @@ public void testNeedsRotation() throws Exception { // Simulate old key by setting next rotation time in the past KeyMetadata metadata = keyManager.getKeyMetadata("rotation-check-key"); - metadata.setNextRotationAt(Instant.now().minusSeconds(1)); + metadata.setNextRotationAt(java.time.Instant.now().minusSeconds(1)); keyManager.updateKeyMetadata("rotation-check-key", metadata); // Now it should need rotation diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java index 179a8d29ddefd..f53bff06dbb4b 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCEndToEndIntegrationTest.java @@ -21,8 +21,6 @@ import java.security.Security; import java.security.Signature; -import javax.crypto.KeyGenerator; - import org.apache.camel.BindToRegistry; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; @@ -408,8 +406,8 @@ public Signature getSigner() throws Exception { } @BindToRegistry("KeyGenerator") - public KeyGenerator getKeyGenerator() throws Exception { - return KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRU.getAlgorithm(), + public javax.crypto.KeyGenerator getKeyGenerator() throws Exception { + return javax.crypto.KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRU.getAlgorithm(), PQCKeyEncapsulationAlgorithms.NTRU.getBcProvider()); } } diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleTest.java index 842d887f3c829..cf04f5695fb96 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCKeyLifecycleTest.java @@ -20,7 +20,6 @@ import java.security.KeyPair; import java.security.Security; import java.time.Duration; -import java.util.Arrays; import java.util.List; import org.apache.camel.component.pqc.lifecycle.FileBasedKeyLifecycleManager; @@ -179,7 +178,7 @@ void testKeyRotation() throws Exception { assertEquals(KeyMetadata.KeyStatus.ACTIVE, newMetadata.getStatus()); // Keys should be different - assertFalse(Arrays.equals(oldKeyPair.getPublic().getEncoded(), newKeyPair.getPublic().getEncoded())); + assertFalse(java.util.Arrays.equals(oldKeyPair.getPublic().getEncoded(), newKeyPair.getPublic().getEncoded())); } @Test diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java index f0dfa078ecc65..dcc04e8780165 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCSignatureWithKeyStoreTest.java @@ -131,7 +131,7 @@ public KeyPair setKeyPair() KeyStore keyStore = KeyStore.getInstance("JKS"); char[] password = "changeit".toCharArray(); keyStore.load(null, password); // initialize new keystore - keyStore.setKeyEntry("mykey", kp.getPrivate(), password, new Certificate[] { certificate }); + keyStore.setKeyEntry("mykey", kp.getPrivate(), password, new java.security.cert.Certificate[] { certificate }); // Save keystore to file try (FileOutputStream fos = new FileOutputStream("keystore.jks")) { diff --git a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCStatefulKeyTrackingTest.java b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCStatefulKeyTrackingTest.java index 0cd087ce30e8f..0bd8a1f531861 100644 --- a/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCStatefulKeyTrackingTest.java +++ b/components/camel-pqc/src/test/java/org/apache/camel/component/pqc/PQCStatefulKeyTrackingTest.java @@ -34,7 +34,6 @@ import org.apache.camel.component.pqc.stateful.StatefulKeyState; import org.apache.camel.test.junit6.CamelTestSupport; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec; import org.junit.jupiter.api.Test; @@ -159,8 +158,8 @@ void testKeyExhaustion() throws Exception { } // Now the key should be exhausted - XMSSPrivateKey xmssPriv - = (XMSSPrivateKey) exhaustionKeyPair.getPrivate(); + org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey xmssPriv + = (org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey) exhaustionKeyPair.getPrivate(); assertEquals(0, xmssPriv.getUsagesRemaining(), "Key should be exhausted after 4 signatures with height=2"); } @@ -174,8 +173,8 @@ void testStatefulKeyStateNotExhausted() throws Exception { kpGen.initialize(new XMSSParameterSpec(2, XMSSParameterSpec.SHA256), new SecureRandom()); KeyPair freshKeyPair = kpGen.generateKeyPair(); - XMSSPrivateKey xmssPriv - = (XMSSPrivateKey) freshKeyPair.getPrivate(); + org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey xmssPriv + = (org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey) freshKeyPair.getPrivate(); StatefulKeyState state = new StatefulKeyState( xmssPriv.getAlgorithm(), xmssPriv.getIndex(), xmssPriv.getUsagesRemaining()); diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java index fea5ff5989a48..3928dce00c0b3 100644 --- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java +++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java @@ -375,7 +375,7 @@ public void printToMiddleTray() { PrinterOperations printerOperations = producer.getPrinterOperations(); PrintRequestAttributeSet attributeSet = printerOperations.getPrintRequestAttributeSet(); - Attribute attribute = attributeSet.get(Media.class); + Attribute attribute = attributeSet.get(javax.print.attribute.standard.Media.class); assertNotNull(attribute); assertTrue(attribute instanceof MediaTray); MediaTray mediaTray = (MediaTray) attribute; diff --git a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MyRoutePolicy.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MyRoutePolicy.java index bf23549bc6a60..578c1bd9c83b9 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MyRoutePolicy.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MyRoutePolicy.java @@ -17,12 +17,11 @@ package org.apache.camel.routepolicy.quartz; import org.apache.camel.Route; -import org.apache.camel.support.RoutePolicySupport; /** * */ -public class MyRoutePolicy extends RoutePolicySupport { +public class MyRoutePolicy extends org.apache.camel.support.RoutePolicySupport { private boolean start; private boolean stop; diff --git a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefComponent.java b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefComponent.java index 1519b6c48bec2..3bcf3cbf73ac0 100644 --- a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefComponent.java +++ b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefComponent.java @@ -19,7 +19,6 @@ import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; /** @@ -28,7 +27,7 @@ *

* This component uses the ref: notation instead of the mostly common uri: notation. */ -@Component("ref") +@org.apache.camel.spi.annotations.Component("ref") public class RefComponent extends DefaultComponent { public RefComponent() { diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java index aa2e1c8dead54..6c111e592960c 100644 --- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java +++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessor.java @@ -48,7 +48,6 @@ import org.apache.camel.Processor; import org.apache.camel.Route; import org.apache.camel.RuntimeExchangeException; -import org.apache.camel.Traceable; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; import org.apache.camel.api.management.ManagedResource; @@ -74,7 +73,7 @@ */ @ManagedResource(description = "Managed Resilience Processor") public class ResilienceProcessor extends BaseProcessorSupport - implements CamelContextAware, Navigate, Traceable, IdAware, RouteIdAware { + implements CamelContextAware, Navigate, org.apache.camel.Traceable, IdAware, RouteIdAware { private static final Logger LOG = LoggerFactory.getLogger(ResilienceProcessor.class); diff --git a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java index 49d5395faa8c0..d90cbfa5597c1 100644 --- a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java +++ b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -588,7 +587,7 @@ Map determineEndpointParameters(final OpenAPI openapi, final Ope // what we consume is what the API defined by OpenApi specification // produces List specificationLevelConsumers = new ArrayList<>(); - Set operationLevelConsumers = new HashSet<>(); + Set operationLevelConsumers = new java.util.HashSet<>(); if (operation.getResponses() != null) { for (ApiResponse response : operation.getResponses().values()) { if (response.getContent() != null) { @@ -606,7 +605,7 @@ Map determineEndpointParameters(final OpenAPI openapi, final Ope // what we produce is what the API defined by OpenApi specification consumes List specificationLevelProducers = new ArrayList<>(); - Set operationLevelProducers = new HashSet<>(); + Set operationLevelProducers = new java.util.HashSet<>(); if (operation.getRequestBody() != null && operation.getRequestBody().getContent() != null) { operationLevelProducers.addAll(operation.getRequestBody().getContent().keySet()); } @@ -748,7 +747,7 @@ String determineHost(final OpenAPI openApi, Operation operation) { } private Set getURIs(List servers) { - Set uris = new HashSet<>(); + Set uris = new java.util.HashSet<>(); if (servers != null) { for (Server server : servers) { try { diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/WireMockJettyServerFactory.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/WireMockJettyServerFactory.java index 551ca73653538..182028aeb009a 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/WireMockJettyServerFactory.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/WireMockJettyServerFactory.java @@ -25,7 +25,6 @@ import com.github.tomakehurst.wiremock.jetty.JettyHttpServerFactory; import com.github.tomakehurst.wiremock.jetty11.Jetty11HttpServer; import com.github.tomakehurst.wiremock.jetty11.SslContexts; -import org.eclipse.jetty.http.UriCompliance; import org.eclipse.jetty.io.NetworkTrafficListener; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -63,7 +62,7 @@ protected ServerConnector createHttpsConnector( httpConfig.setSendXPoweredBy(false); httpConfig.setSendServerVersion(false); httpConfig.addCustomizer(new SecureRequestCustomizer(false)); - httpConfig.setUriCompliance(UriCompliance.UNSAFE); + httpConfig.setUriCompliance(org.eclipse.jetty.http.UriCompliance.UNSAFE); HttpConnectionFactory http = new HttpConnectionFactory(httpConfig); diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiComponent.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiComponent.java index a0858de16e535..b8b3279169695 100644 --- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiComponent.java +++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiComponent.java @@ -20,13 +20,12 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; /** * Rest API component. */ -@Component("rest-api") +@org.apache.camel.spi.annotations.Component("rest-api") public class RestApiComponent extends DefaultComponent { @Metadata(label = "consumer") diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java index f91a0f67a8795..75325668d163a 100644 --- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java +++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java @@ -21,7 +21,6 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.*; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.HeaderFilterStrategyComponent; import org.apache.camel.util.FileUtil; @@ -32,7 +31,7 @@ /** * Rest component. */ -@Component("rest") +@org.apache.camel.spi.annotations.Component("rest") @Metadata(label = "verifiers", enums = "parameters,connectivity") public class RestComponent extends HeaderFilterStrategyComponent { diff --git a/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaComponent.java b/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaComponent.java index e81564e3de43b..55f4c0f4f9f8f 100644 --- a/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaComponent.java +++ b/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaComponent.java @@ -20,13 +20,12 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; /** * The saga component for interacting with the saga processing framework. */ -@Component("saga") +@org.apache.camel.spi.annotations.Component("saga") public class SagaComponent extends DefaultComponent { public SagaComponent() { diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/StreamingApiConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/StreamingApiConsumer.java index 27cd8e504f089..d1991f25598a8 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/StreamingApiConsumer.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/StreamingApiConsumer.java @@ -36,8 +36,6 @@ import org.apache.camel.util.ObjectHelper; import org.cometd.bayeux.Message; import org.cometd.bayeux.client.ClientSessionChannel; -import org.cometd.common.HashMapMessage; -import org.cometd.common.JacksonJSONContextClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -195,8 +193,8 @@ void createChangeEventMessage(final Message message, final org.apache.camel.Mess if (rawPayload) { // getJSON is used for raw payload - in.setBody(new JacksonJSONContextClient() - .generate(new HashMapMessage(message))); + in.setBody(new org.cometd.common.JacksonJSONContextClient() + .generate(new org.cometd.common.HashMapMessage(message))); } else { payload.remove("ChangeEventHeader"); in.setBody(payload); @@ -231,8 +229,8 @@ void createPlatformEventMessage(final Message message, final org.apache.camel.Me if (rawPayload) { // getJSON is used for raw payload - in.setBody(new JacksonJSONContextClient() - .generate(new HashMapMessage(message))); + in.setBody(new org.cometd.common.JacksonJSONContextClient() + .generate(new org.cometd.common.HashMapMessage(message))); } else { in.setBody(platformEvent); } diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java index ddc6623c1ea95..cfc5897582e45 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@XmlSchema(namespace = "http://www.force.com/2009/06/asyncapi/dataload", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.force.com/2009/06/asyncapi/dataload", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.component.salesforce.api.dto.bulk; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java index e810917ce0667..c94f686af54f7 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java @@ -37,8 +37,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import javax.security.auth.DestroyFailedException; - import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.CamelContext; import org.apache.camel.component.salesforce.AuthenticationType; @@ -295,7 +293,7 @@ String generateJwtAssertion() { // Clean the private key from memory try { key.destroy(); - } catch (DestroyFailedException ex) { + } catch (javax.security.auth.DestroyFailedException ex) { LOG.debug("Error destroying private key: {}", ex.getMessage()); } } catch (IOException | GeneralSecurityException e) { diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java index 12de19b43b986..5baec200be04c 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java @@ -31,7 +31,6 @@ import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; -import javax.xml.XMLConstants; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Source; @@ -446,7 +445,7 @@ private T unmarshalResponse(InputStream response, Request request, Class SAXParserFactory spf = SAXParserFactory.newInstance(); spf.setNamespaceAware(true); try { - spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); + spf.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); spf.setFeature("http://xml.org/sax/features/external-general-entities", false); spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false); spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/com/sforce/eventbus/CamelEventMessage__e.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/com/sforce/eventbus/CamelEventMessage__e.java index cfc9733a47812..d46cfee49c91d 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/com/sforce/eventbus/CamelEventMessage__e.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/com/sforce/eventbus/CamelEventMessage__e.java @@ -21,35 +21,20 @@ */ package com.sforce.eventbus; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.nio.ByteBuffer; - -import org.apache.avro.AvroMissingFieldException; -import org.apache.avro.AvroRuntimeException; -import org.apache.avro.Schema; -import org.apache.avro.io.DatumReader; -import org.apache.avro.io.DatumWriter; -import org.apache.avro.io.Encoder; -import org.apache.avro.io.ResolvingDecoder; 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.SpecificRecordBase; -import org.apache.avro.specific.SpecificRecordBuilderBase; import org.apache.avro.util.Utf8; -@AvroGenerated -public class CamelEventMessage__e extends SpecificRecordBase { +@org.apache.avro.specific.AvroGenerated +public class CamelEventMessage__e extends org.apache.avro.specific.SpecificRecordBase { private static final long serialVersionUID = 4603183847267960866L; - 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\":\"CamelEventMessage__e\",\"namespace\":\"com.sforce.eventbus\",\"fields\":[{\"name\":\"CreatedDate\",\"type\":\"long\",\"doc\":\"CreatedDate:DateTime\"},{\"name\":\"CreatedById\",\"type\":\"string\",\"doc\":\"CreatedBy:EntityId\"},{\"name\":\"Message__c\",\"type\":[\"null\",\"string\"],\"doc\":\"Data:Text:00NDS00000mES97\",\"default\":null}]}"); - public static Schema getClassSchema() { + public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } @@ -93,7 +78,7 @@ public static BinaryMessageDecoder createDecoder(SchemaSto * @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); } @@ -105,8 +90,8 @@ public ByteBuffer toByteBuffer() throws IOException { * @throws java.io.IOException if the given bytes could not be deserialized into an instance of this class */ public static CamelEventMessage__e fromByteBuffer( - ByteBuffer b) - throws IOException { + java.nio.ByteBuffer b) + throws java.io.IOException { return DECODER.decode(b); } @@ -143,7 +128,7 @@ public SpecificData getSpecificData() { } @Override - public Schema getSchema() { + public org.apache.avro.Schema getSchema() { return SCHEMA$; } @@ -274,8 +259,8 @@ public static Builder newBuilder(CamelEventMessage__e other) { /** * RecordBuilder for CamelEventMessage__e instances. */ - @AvroGenerated - public static class Builder extends SpecificRecordBuilderBase { + @org.apache.avro.specific.AvroGenerated + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase { /** CreatedDate:DateTime */ private long CreatedDate; @@ -464,31 +449,31 @@ public CamelEventMessage__e build() { record.CreatedById = fieldSetFlags()[1] ? this.CreatedById : (CharSequence) defaultValue(fields()[1]); record.Message__c = fieldSetFlags()[2] ? this.Message__c : (CharSequence) defaultValue(fields()[2]); return record; - } catch (AvroMissingFieldException e) { + } catch (org.apache.avro.AvroMissingFieldException e) { throw e; } catch (Exception e) { - throw new AvroRuntimeException(e); + throw new org.apache.avro.AvroRuntimeException(e); } } } @SuppressWarnings("unchecked") - private static final DatumWriter WRITER$ - = (DatumWriter) MODEL$.createDatumWriter(SCHEMA$); + private static final org.apache.avro.io.DatumWriter WRITER$ + = (org.apache.avro.io.DatumWriter) 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 READER$ - = (DatumReader) MODEL$.createDatumReader(SCHEMA$); + private static final org.apache.avro.io.DatumReader READER$ + = (org.apache.avro.io.DatumReader) 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)); } @@ -498,8 +483,8 @@ protected boolean hasCustomCoders() { } @Override - public void customEncode(Encoder out) - throws IOException { + public void customEncode(org.apache.avro.io.Encoder out) + throws java.io.IOException { out.writeLong(this.CreatedDate); out.writeString(this.CreatedById); @@ -515,9 +500,9 @@ public void customEncode(Encoder out) } @Override - public void customDecode(ResolvingDecoder in) - throws IOException { - Schema.Field[] fieldOrder = in.readFieldOrderIfDiff(); + public void customDecode(org.apache.avro.io.ResolvingDecoder in) + throws java.io.IOException { + org.apache.avro.Schema.Field[] fieldOrder = in.readFieldOrderIfDiff(); if (fieldOrder == null) { this.CreatedDate = in.readLong(); @@ -551,7 +536,7 @@ public void customDecode(ResolvingDecoder in) break; default: - throw new IOException("Corrupt ResolvingDecoder."); + throw new java.io.IOException("Corrupt ResolvingDecoder."); } } } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiConsumerTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiConsumerTest.java index 6ed05ad52eb43..758b6402afe4e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiConsumerTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/StreamingApiConsumerTest.java @@ -35,7 +35,6 @@ import org.cometd.bayeux.Message; import org.cometd.bayeux.client.ClientSessionChannel; import org.cometd.common.HashMapMessage; -import org.cometd.common.JacksonJSONContextClient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -277,8 +276,8 @@ public void shouldProcessRawPlatformEvents() throws Exception { try (final StreamingApiConsumer consumer = new StreamingApiConsumer(endpoint, processor, NOT_USED)) { consumer.processMessage(mock(ClientSessionChannel.class), message); - verify(in).setBody(new JacksonJSONContextClient() - .generate(new HashMapMessage(message))); + verify(in).setBody(new org.cometd.common.JacksonJSONContextClient() + .generate(new org.cometd.common.HashMapMessage(message))); verify(in).setHeader("CamelSalesforceCreatedDate", ZonedDateTime.parse("2018-07-06T12:41:04Z")); verify(in).setHeader("CamelSalesforceReplayId", 4L); verify(in).setHeader("CamelSalesforceChannel", "/event/TestEvent__e"); @@ -342,8 +341,8 @@ public void processRawPayloadChangeEventsShouldSetInputMessageAsBody() throws Ex try (final StreamingApiConsumer consumer = new StreamingApiConsumer(endpoint, processor, NOT_USED)) { consumer.processMessage(mock(ClientSessionChannel.class), mockChangeEvent); - verify(in).setBody(new JacksonJSONContextClient() - .generate(new HashMapMessage(mockChangeEvent))); + verify(in).setBody(new org.cometd.common.JacksonJSONContextClient() + .generate(new org.cometd.common.HashMapMessage(mockChangeEvent))); } } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java index bdd3aaf735732..1ac546a6408b9 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Account.java @@ -21,8 +21,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase; -import org.apache.camel.component.salesforce.api.dto.Address; -import org.apache.camel.component.salesforce.api.dto.GeoLocation; import org.apache.camel.component.salesforce.api.dto.SObjectDescription; import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; import org.apache.camel.component.salesforce.api.dto.SObjectField; @@ -165,15 +163,15 @@ public void setBillingLongitude(Double BillingLongitude) { this.BillingLongitude = BillingLongitude; } - private Address BillingAddress; + private org.apache.camel.component.salesforce.api.dto.Address BillingAddress; @JsonProperty("BillingAddress") - public Address getBillingAddress() { + public org.apache.camel.component.salesforce.api.dto.Address getBillingAddress() { return this.BillingAddress; } @JsonProperty("BillingAddress") - public void setBillingAddress(Address BillingAddress) { + public void setBillingAddress(org.apache.camel.component.salesforce.api.dto.Address BillingAddress) { this.BillingAddress = BillingAddress; } @@ -261,15 +259,15 @@ public void setShippingLongitude(Double ShippingLongitude) { this.ShippingLongitude = ShippingLongitude; } - private Address ShippingAddress; + private org.apache.camel.component.salesforce.api.dto.Address ShippingAddress; @JsonProperty("ShippingAddress") - public Address getShippingAddress() { + public org.apache.camel.component.salesforce.api.dto.Address getShippingAddress() { return this.ShippingAddress; } @JsonProperty("ShippingAddress") - public void setShippingAddress(Address ShippingAddress) { + public void setShippingAddress(org.apache.camel.component.salesforce.api.dto.Address ShippingAddress) { this.ShippingAddress = ShippingAddress; } @@ -561,15 +559,15 @@ public void setShipping_Location__Longitude__s(Double Shipping_Location__Longitu this.Shipping_Location__Longitude__s = Shipping_Location__Longitude__s; } - private GeoLocation Shipping_Location__c; + private org.apache.camel.component.salesforce.api.dto.GeoLocation Shipping_Location__c; @JsonProperty("Shipping_Location__c") - public GeoLocation getShipping_Location__c() { + public org.apache.camel.component.salesforce.api.dto.GeoLocation getShipping_Location__c() { return this.Shipping_Location__c; } @JsonProperty("Shipping_Location__c") - public void setShipping_Location__c(GeoLocation Shipping_Location__c) { + public void setShipping_Location__c(org.apache.camel.component.salesforce.api.dto.GeoLocation Shipping_Location__c) { this.Shipping_Location__c = Shipping_Location__c; } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java index f1e8bc59fbe02..02aae843b0f43 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Asset.java @@ -16,9 +16,6 @@ */ package org.apache.camel.component.salesforce.dto.generated; -import java.time.ZonedDateTime; - - import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase; @@ -97,41 +94,41 @@ public void setSerialNumber(String SerialNumber) { } // InstallDate - private ZonedDateTime InstallDate; + private java.time.ZonedDateTime InstallDate; @JsonProperty("InstallDate") - public ZonedDateTime getInstallDate() { + public java.time.ZonedDateTime getInstallDate() { return this.InstallDate; } @JsonProperty("InstallDate") - public void setInstallDate(ZonedDateTime InstallDate) { + public void setInstallDate(java.time.ZonedDateTime InstallDate) { this.InstallDate = InstallDate; } // PurchaseDate - private ZonedDateTime PurchaseDate; + private java.time.ZonedDateTime PurchaseDate; @JsonProperty("PurchaseDate") - public ZonedDateTime getPurchaseDate() { + public java.time.ZonedDateTime getPurchaseDate() { return this.PurchaseDate; } @JsonProperty("PurchaseDate") - public void setPurchaseDate(ZonedDateTime PurchaseDate) { + public void setPurchaseDate(java.time.ZonedDateTime PurchaseDate) { this.PurchaseDate = PurchaseDate; } // UsageEndDate - private ZonedDateTime UsageEndDate; + private java.time.ZonedDateTime UsageEndDate; @JsonProperty("UsageEndDate") - public ZonedDateTime getUsageEndDate() { + public java.time.ZonedDateTime getUsageEndDate() { return this.UsageEndDate; } @JsonProperty("UsageEndDate") - public void setUsageEndDate(ZonedDateTime UsageEndDate) { + public void setUsageEndDate(java.time.ZonedDateTime UsageEndDate) { this.UsageEndDate = UsageEndDate; } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java index f5f772a295116..f4fdf4398cae5 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java @@ -16,14 +16,11 @@ */ package org.apache.camel.component.salesforce.dto.generated; -import java.time.LocalDate; -import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase; -import org.apache.camel.component.salesforce.api.dto.Address; import org.apache.camel.component.salesforce.api.dto.SObjectDescription; import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; import org.apache.camel.component.salesforce.api.dto.SObjectField; @@ -195,15 +192,15 @@ public void setOtherLongitude(Double OtherLongitude) { this.OtherLongitude = OtherLongitude; } - private Address OtherAddress; + private org.apache.camel.component.salesforce.api.dto.Address OtherAddress; @JsonProperty("OtherAddress") - public Address getOtherAddress() { + public org.apache.camel.component.salesforce.api.dto.Address getOtherAddress() { return this.OtherAddress; } @JsonProperty("OtherAddress") - public void setOtherAddress(Address OtherAddress) { + public void setOtherAddress(org.apache.camel.component.salesforce.api.dto.Address OtherAddress) { this.OtherAddress = OtherAddress; } @@ -291,15 +288,15 @@ public void setMailingLongitude(Double MailingLongitude) { this.MailingLongitude = MailingLongitude; } - private Address MailingAddress; + private org.apache.camel.component.salesforce.api.dto.Address MailingAddress; @JsonProperty("MailingAddress") - public Address getMailingAddress() { + public org.apache.camel.component.salesforce.api.dto.Address getMailingAddress() { return this.MailingAddress; } @JsonProperty("MailingAddress") - public void setMailingAddress(Address MailingAddress) { + public void setMailingAddress(org.apache.camel.component.salesforce.api.dto.Address MailingAddress) { this.MailingAddress = MailingAddress; } @@ -447,15 +444,15 @@ public void setAssistantName(String AssistantName) { this.AssistantName = AssistantName; } - private LocalDate Birthdate; + private java.time.LocalDate Birthdate; @JsonProperty("Birthdate") - public LocalDate getBirthdate() { + public java.time.LocalDate getBirthdate() { return this.Birthdate; } @JsonProperty("Birthdate") - public void setBirthdate(LocalDate Birthdate) { + public void setBirthdate(java.time.LocalDate Birthdate) { this.Birthdate = Birthdate; } @@ -471,27 +468,27 @@ public void setDescription(String Description) { this.Description = Description; } - private ZonedDateTime LastCURequestDate; + private java.time.ZonedDateTime LastCURequestDate; @JsonProperty("LastCURequestDate") - public ZonedDateTime getLastCURequestDate() { + public java.time.ZonedDateTime getLastCURequestDate() { return this.LastCURequestDate; } @JsonProperty("LastCURequestDate") - public void setLastCURequestDate(ZonedDateTime LastCURequestDate) { + public void setLastCURequestDate(java.time.ZonedDateTime LastCURequestDate) { this.LastCURequestDate = LastCURequestDate; } - private ZonedDateTime LastCUUpdateDate; + private java.time.ZonedDateTime LastCUUpdateDate; @JsonProperty("LastCUUpdateDate") - public ZonedDateTime getLastCUUpdateDate() { + public java.time.ZonedDateTime getLastCUUpdateDate() { return this.LastCUUpdateDate; } @JsonProperty("LastCUUpdateDate") - public void setLastCUUpdateDate(ZonedDateTime LastCUUpdateDate) { + public void setLastCUUpdateDate(java.time.ZonedDateTime LastCUUpdateDate) { this.LastCUUpdateDate = LastCUUpdateDate; } @@ -507,15 +504,15 @@ public void setEmailBouncedReason(String EmailBouncedReason) { this.EmailBouncedReason = EmailBouncedReason; } - private ZonedDateTime EmailBouncedDate; + private java.time.ZonedDateTime EmailBouncedDate; @JsonProperty("EmailBouncedDate") - public ZonedDateTime getEmailBouncedDate() { + public java.time.ZonedDateTime getEmailBouncedDate() { return this.EmailBouncedDate; } @JsonProperty("EmailBouncedDate") - public void setEmailBouncedDate(ZonedDateTime EmailBouncedDate) { + public void setEmailBouncedDate(java.time.ZonedDateTime EmailBouncedDate) { this.EmailBouncedDate = EmailBouncedDate; } diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java index 9e70e5475c4f1..bd78c320f1a27 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java @@ -20,8 +20,6 @@ package org.apache.camel.component.salesforce.dto.generated; import java.io.InputStream; -import java.time.LocalDate; -import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; @@ -167,27 +165,27 @@ public void setReasonForChange(String ReasonForChange) { this.ReasonForChange = ReasonForChange; } - private String SharingOption; + private java.lang.String SharingOption; @JsonProperty("SharingOption") - public String getSharingOption() { + public java.lang.String getSharingOption() { return this.SharingOption; } @JsonProperty("SharingOption") - public void setSharingOption(String SharingOption) { + public void setSharingOption(java.lang.String SharingOption) { this.SharingOption = SharingOption; } - private String SharingPrivacy; + private java.lang.String SharingPrivacy; @JsonProperty("SharingPrivacy") - public String getSharingPrivacy() { + public java.lang.String getSharingPrivacy() { return this.SharingPrivacy; } @JsonProperty("SharingPrivacy") - public void setSharingPrivacy(String SharingPrivacy) { + public void setSharingPrivacy(java.lang.String SharingPrivacy) { this.SharingPrivacy = SharingPrivacy; } @@ -215,15 +213,15 @@ public void setRatingCount(Integer RatingCount) { this.RatingCount = RatingCount; } - private ZonedDateTime ContentModifiedDate; + private java.time.ZonedDateTime ContentModifiedDate; @JsonProperty("ContentModifiedDate") - public ZonedDateTime getContentModifiedDate() { + public java.time.ZonedDateTime getContentModifiedDate() { return this.ContentModifiedDate; } @JsonProperty("ContentModifiedDate") - public void setContentModifiedDate(ZonedDateTime ContentModifiedDate) { + public void setContentModifiedDate(java.time.ZonedDateTime ContentModifiedDate) { this.ContentModifiedDate = ContentModifiedDate; } @@ -286,15 +284,15 @@ public void setFeaturedContentBoost(Integer FeaturedContentBoost) { this.FeaturedContentBoost = FeaturedContentBoost; } - private LocalDate FeaturedContentDate; + private java.time.LocalDate FeaturedContentDate; @JsonProperty("FeaturedContentDate") - public LocalDate getFeaturedContentDate() { + public java.time.LocalDate getFeaturedContentDate() { return this.FeaturedContentDate; } @JsonProperty("FeaturedContentDate") - public void setFeaturedContentDate(LocalDate FeaturedContentDate) { + public void setFeaturedContentDate(java.time.LocalDate FeaturedContentDate) { this.FeaturedContentDate = FeaturedContentDate; } @@ -355,15 +353,15 @@ public void setFileType(String FileType) { this.FileType = FileType; } - private String PublishStatus; + private java.lang.String PublishStatus; @JsonProperty("PublishStatus") - public String getPublishStatus() { + public java.lang.String getPublishStatus() { return this.PublishStatus; } @JsonProperty("PublishStatus") - public void setPublishStatus(String PublishStatus) { + public void setPublishStatus(java.lang.String PublishStatus) { this.PublishStatus = PublishStatus; } @@ -460,27 +458,27 @@ public AbstractDescribedSObjectBase getFirstPublishLocation() { public void setFirstPublishLocation(AbstractDescribedSObjectBase FirstPublishLocation) { this.FirstPublishLocation = FirstPublishLocation; } - private String Origin; + private java.lang.String Origin; @JsonProperty("Origin") - public String getOrigin() { + public java.lang.String getOrigin() { return this.Origin; } @JsonProperty("Origin") - public void setOrigin(String Origin) { + public void setOrigin(java.lang.String Origin) { this.Origin = Origin; } - private String ContentLocation; + private java.lang.String ContentLocation; @JsonProperty("ContentLocation") - public String getContentLocation() { + public java.lang.String getContentLocation() { return this.ContentLocation; } @JsonProperty("ContentLocation") - public void setContentLocation(String ContentLocation) { + public void setContentLocation(java.lang.String ContentLocation) { this.ContentLocation = ContentLocation; } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java index b794a94269b33..e85fe5231e635 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java @@ -63,7 +63,7 @@ public void testXPathFunctionSubstringUsingSaxon() { public void testXPathFunctionTokenizeUsingSaxonXPathFactory() { // START SNIPPET: e1 // create a Saxon factory - XPathFactory fac = new XPathFactoryImpl(); + XPathFactory fac = new net.sf.saxon.xpath.XPathFactoryImpl(); // create a builder to evaluate the xpath using the saxon factory XPathBuilder builder = XPathBuilder.xpath("tokenize(/foo/bar, '_')[2]").factory(fac); diff --git a/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java b/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java index b68ec4b1155e9..52cdbe76311c5 100644 --- a/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java +++ b/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerComponent.java @@ -24,10 +24,9 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.HealthCheckComponent; -@Component("scheduler") +@org.apache.camel.spi.annotations.Component("scheduler") public class SchedulerComponent extends HealthCheckComponent { private final Map executors = new ConcurrentHashMap<>(); diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java index 417d356bf06dc..8f7d2c1a8f97a 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java @@ -23,8 +23,6 @@ import javax.xml.transform.URIResolver; import javax.xml.transform.stream.StreamSource; -import org.apache.camel.util.ObjectHelper; - /** * Class path resolver for schematron templates */ @@ -44,7 +42,7 @@ public ClassPathURIResolver(final String rulesDir, URIResolver clientUriResolver @Override public Source resolve(String href, String base) throws TransformerException { InputStream stream - = ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href), + = org.apache.camel.util.ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href), getClass().getClassLoader()); if (stream != null) { return new StreamSource(stream); diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java index 4465c2f7467ce..e8861841a15f6 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.schematron.processor; -import javax.xml.XMLConstants; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -59,7 +58,7 @@ public static SchematronProcessor newSchematronEngine(final Templates rules) { */ private static XMLReader getXMLReader() throws ParserConfigurationException, SAXException { final SAXParserFactory fac = SAXParserFactory.newInstance(); - fac.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); + fac.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); fac.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); fac.setFeature("http://xml.org/sax/features/external-general-entities", false); fac.setFeature("http://xml.org/sax/features/external-parameter-entities", false); diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java index b141d9253ab93..4af50b0c4e2dc 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java @@ -30,7 +30,6 @@ import org.apache.camel.component.schematron.constant.Constants; import org.apache.camel.component.schematron.exception.SchematronConfigException; -import org.apache.camel.util.ObjectHelper; /** * Class generating Templates for a given schematron rules @@ -62,7 +61,7 @@ public Templates getTemplates(final InputStream rules, final TransformerFactory for (String template : PIPELINE) { String path = Constants.SCHEMATRON_TEMPLATES_ROOT_DIR .concat("/").concat(template); - InputStream xsl = ObjectHelper.loadResourceAsStream(path); + InputStream xsl = org.apache.camel.util.ObjectHelper.loadResourceAsStream(path); if (xsl == null) { xsl = this.getClass().getClassLoader().getResourceAsStream(path); } diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java index 22d8701cc9d98..45f4bbdb2bada 100644 --- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java +++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java @@ -28,7 +28,6 @@ import net.sf.saxon.TransformerFactoryImpl; import org.apache.camel.component.schematron.constant.Constants; import org.apache.camel.component.schematron.util.Utils; -import org.apache.camel.util.ObjectHelper; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -106,7 +105,7 @@ class ClientUriResolver implements URIResolver { @Override public Source resolve(String href, String base) throws TransformerException { return new StreamSource( - ObjectHelper.loadResourceAsStream("custom-resolver/".concat(href))); + org.apache.camel.util.ObjectHelper.loadResourceAsStream("custom-resolver/".concat(href))); } } } diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentRestConfigTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentRestConfigTest.java index 702810843227a..78723c7147596 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentRestConfigTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentRestConfigTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.servlet.rest; -import java.util.ArrayList; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.servlet.ServletCamelRouterTestSupport; import org.apache.camel.converter.jaxb.JaxbConstants; @@ -125,9 +123,9 @@ public void configure() { .get("/country").to("direct:v4country") .get("/address").to("direct:v3address").produces("application/xml").type(Address.class); - from("direct:v1country").transform().constant(new ArrayList()); - from("direct:v2country").transform().constant(new ArrayList()); - from("direct:v3country").transform().constant(new ArrayList()); + from("direct:v1country").transform().constant(new java.util.ArrayList()); + from("direct:v2country").transform().constant(new java.util.ArrayList()); + from("direct:v3country").transform().constant(new java.util.ArrayList()); CountryPojo country = new CountryPojo(); country.setIso("EN"); diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentTest.java index 2efb75e383371..65ee18339a894 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNoContentTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.servlet.rest; -import java.util.ArrayList; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.servlet.ServletCamelRouterTestSupport; import org.apache.camel.converter.jaxb.JaxbConstants; @@ -124,9 +122,9 @@ public void configure() { .get("/country").to("direct:v4country") .get("/address").to("direct:v3address").produces("application/xml").type(Address.class); - from("direct:v1country").transform().constant(new ArrayList()); - from("direct:v2country").transform().constant(new ArrayList()); - from("direct:v3country").transform().constant(new ArrayList()); + from("direct:v1country").transform().constant(new java.util.ArrayList()); + from("direct:v2country").transform().constant(new java.util.ArrayList()); + from("direct:v3country").transform().constant(new java.util.ArrayList()); CountryPojo country = new CountryPojo(); country.setIso("EN"); diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java index 8d7fcb29fb9f5..f51af48dfd28d 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsHelper.java @@ -17,13 +17,11 @@ package org.apache.camel.component.sjms; import jakarta.jms.Connection; -import jakarta.jms.IllegalStateException; import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.MessageConsumer; import jakarta.jms.MessageProducer; import jakarta.jms.Session; -import jakarta.jms.TransactionInProgressException; public final class SjmsHelper { @@ -78,7 +76,7 @@ public static void closeConsumer(MessageConsumer consumer) { public static void commitIfNecessary(Session session) throws JMSException { try { session.commit(); - } catch (TransactionInProgressException | IllegalStateException ex) { + } catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { // ignore } } @@ -90,7 +88,7 @@ public static void commitIfNeeded(Session session, Message message) throws Excep } else if (message != null && session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) { message.acknowledge(); } - } catch (TransactionInProgressException | IllegalStateException ex) { + } catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { // ignore } } @@ -99,13 +97,13 @@ public static void rollbackIfNeeded(Session session) throws JMSException { if (session.getTransacted()) { try { session.rollback(); - } catch (TransactionInProgressException | IllegalStateException ex) { + } catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { // ignore } } else if (session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) { try { session.recover(); - } catch (IllegalStateException ex) { + } catch (jakarta.jms.IllegalStateException ex) { // ignore } } diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java index 43b1656488e4a..886c530c5b7eb 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java @@ -27,7 +27,6 @@ import jakarta.jms.Connection; import jakarta.jms.ConnectionFactory; import jakarta.jms.ExceptionListener; -import jakarta.jms.IllegalStateException; import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.MessageConsumer; @@ -35,7 +34,6 @@ import jakarta.jms.Session; import org.apache.camel.CamelContext; -import org.apache.camel.component.sjms.MessageListenerContainer; import org.apache.camel.component.sjms.SessionMessageListener; import org.apache.camel.component.sjms.SjmsEndpoint; import org.apache.camel.component.sjms.jms.DestinationCreationStrategy; @@ -50,7 +48,7 @@ import static org.apache.camel.component.sjms.SjmsHelper.*; public class SimpleMessageListenerContainer extends ServiceSupport - implements MessageListenerContainer, ExceptionListener { + implements org.apache.camel.component.sjms.MessageListenerContainer, ExceptionListener { private static final Logger LOG = LoggerFactory.getLogger(SimpleMessageListenerContainer.class); @@ -368,7 +366,7 @@ protected void startConnection() throws Exception { if (this.connection != null) { try { this.connection.start(); - } catch (IllegalStateException e) { + } catch (jakarta.jms.IllegalStateException e) { // ignore as it may already be started } } diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsObjectMessageEnabledTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsObjectMessageEnabledTest.java index 050876a9f6c27..2c26c4eb0dcae 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsObjectMessageEnabledTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/SjmsObjectMessageEnabledTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.sjms.producer; -import java.io.Serializable; - import jakarta.jms.Message; import jakarta.jms.MessageConsumer; import jakarta.jms.MessageProducer; @@ -126,7 +124,7 @@ private static Throwable rootCause(Throwable t) { 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-smb/src/main/java/org/apache/camel/component/smb/SmbOperations.java b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbOperations.java index 69f46d68d08e1..63543feac39f3 100644 --- a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbOperations.java +++ b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbOperations.java @@ -19,7 +19,6 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.EnumSet; @@ -372,7 +371,7 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc try (InputStream is = shareFile.getInputStream()) { // store content as a file in the local work directory in the temp handle - Files.copy(is, temp.toPath(), StandardCopyOption.REPLACE_EXISTING); + java.nio.file.Files.copy(is, temp.toPath(), StandardCopyOption.REPLACE_EXISTING); } exchange.getIn().setHeader(SmbConstants.SMB_UNC_PATH, shareFile.getUncPath()); diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/AbstractSmbRenameIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/AbstractSmbRenameIT.java index 870b969985a77..93b8c613bcbbe 100644 --- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/AbstractSmbRenameIT.java +++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/AbstractSmbRenameIT.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.smb; -import java.net.URI; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -115,7 +114,7 @@ protected GenericFileEndpoint buildFileEndpoint( // Replicate parent logic to build configuration String baseUri = getBaseUri(uri); - SmbConfiguration config = new SmbConfiguration(new URI(baseUri)); + SmbConfiguration config = new SmbConfiguration(new java.net.URI(baseUri)); // Handle backwards compatible path parameter String path = getAndRemoveParameter(parameters, "path", String.class); diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java index 360cd0f7e1524..eef83dc371947 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java @@ -18,7 +18,6 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import java.util.Arrays; import org.apache.camel.Message; import org.jsmpp.bean.Alphabet; @@ -55,7 +54,7 @@ protected byte[][] splitBody(Message message) throws SmppException { case ALLOW: return segments; case TRUNCATE: - return new byte[][] { Arrays.copyOfRange(shortMessage, 0, segments[0].length) }; + return new byte[][] { java.util.Arrays.copyOfRange(shortMessage, 0, segments[0].length) }; case REJECT: // FIXME - JSMPP needs to have an enum of the negative response // codes instead of just using them like this diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java index a3e0eeb0d343e..f48d08e2a8f68 100644 --- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java +++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java @@ -26,7 +26,6 @@ import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.JAXBIntrospector; -import jakarta.xml.ws.Holder; import javax.xml.namespace.QName; @@ -147,8 +146,8 @@ private JAXBElement getElement(Object fromObj, QName name) { // In the case of a parameter, the class of the value of the holder class // is used for the mapping rather than the holder class itself. - if (fromObj instanceof Holder) { - Holder holder = (Holder) fromObj; + if (fromObj instanceof jakarta.xml.ws.Holder) { + jakarta.xml.ws.Holder holder = (jakarta.xml.ws.Holder) fromObj; value = holder.value; if (null == value) { return null; diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java index e5691e7661a0a..d00a1aee6df72 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java @@ -22,7 +22,6 @@ import com.example.customerservice.GetCustomersByName; import com.example.customerservice.GetCustomersByNameResponse; import com.example.customerservice.multipart.MultiPartCustomerService; -import com.example.customerservice.multipart.Product; import com.example.duplicateerror.ExceptionA; import com.example.duplicateerror.ExceptionB; import com.example.duplicateerror.TestService; @@ -116,7 +115,7 @@ public void testMultiPart() { com.example.customerservice.multipart.GetCustomersByName.class); QName custTypeQName = strategy.findQNameForSoapActionOrType("http://multipart.customerservice.example.com/getCustomersByName", - Product.class); + com.example.customerservice.multipart.Product.class); assertEquals("http://multipart.customerservice.example.com/", custNameQName.getNamespaceURI()); assertEquals("getCustomersByName", custNameQName.getLocalPart()); diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/testpackage/package-info.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/testpackage/package-info.java index 6a62e1beb6cee..44c51fcbc3505 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/testpackage/package-info.java +++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/testpackage/package-info.java @@ -14,8 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@XmlSchema(namespace = "baz", elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "baz", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.converter.soap.name.testpackage; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrInsertAndDeleteTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrInsertAndDeleteTest.java index 169ac23adb236..47903af844e6f 100644 --- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrInsertAndDeleteTest.java +++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrInsertAndDeleteTest.java @@ -26,7 +26,6 @@ import java.util.Map; import org.apache.camel.Exchange; -import org.apache.camel.InvalidPayloadException; import org.apache.camel.builder.ExchangeBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -217,7 +216,7 @@ public void indexSingleDocumentOnlyWithId() { public void caughtSolrExceptionIsHandledElegantly() { // empty request Exchange exchange = executeInsertFor(null, Map.of(), false); - assertInstanceOf(InvalidPayloadException.class, exchange.getException()); + assertInstanceOf(org.apache.camel.InvalidPayloadException.class, exchange.getException()); } @Test diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECProducerTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECProducerTest.java index 72f5b3b4f450e..2e73ba8a9f286 100644 --- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECProducerTest.java +++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECProducerTest.java @@ -28,7 +28,6 @@ import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HttpEntity; -import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.io.HttpClientResponseHandler; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -109,7 +108,7 @@ private CloseableHttpClient createMockClient(int statusCode, String reasonPhrase ClassicHttpResponse mockResponse = mock(ClassicHttpResponse.class); when(mockResponse.getCode()).thenReturn(statusCode); when(mockResponse.getReasonPhrase()).thenReturn(reasonPhrase); - when(mockResponse.getVersion()).thenReturn(HttpVersion.HTTP_1_1); + when(mockResponse.getVersion()).thenReturn(org.apache.hc.core5.http.HttpVersion.HTTP_1_1); HttpEntity entity = mock(HttpEntity.class); doAnswer(inv -> { OutputStream os = inv.getArgument(0); diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/main/java/org/apache/camel/component/springai/chat/SpringAiChatProducer.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/main/java/org/apache/camel/component/springai/chat/SpringAiChatProducer.java index f864bce025637..322f1cd427c70 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/main/java/org/apache/camel/component/springai/chat/SpringAiChatProducer.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/main/java/org/apache/camel/component/springai/chat/SpringAiChatProducer.java @@ -716,7 +716,7 @@ private void populateResponseMetadata(ChatResponse response, Exchange exchange) // Full metadata map for advanced users // This includes all metadata fields in a single map - Map metadataMap = new HashMap<>(); + Map metadataMap = new java.util.HashMap<>(); if (responseMetadata.getId() != null) { metadataMap.put("id", responseMetadata.getId()); } diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java index 6d290092d1619..81769a8c3e4ce 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatComponentTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.springai.chat; -import java.util.List; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; @@ -47,7 +45,7 @@ protected void doPreSetup() throws Exception { // Mock response AssistantMessage assistantMessage = new AssistantMessage("Hello! I'm a mock AI assistant."); Generation generation = new Generation(assistantMessage); - ChatResponse chatResponse = new ChatResponse(List.of(generation)); + ChatResponse chatResponse = new ChatResponse(java.util.List.of(generation)); when(mockChatModel.call(any(Prompt.class))).thenReturn(chatResponse); } diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsIntegrationIT.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsIntegrationIT.java index 201eb62fc8f09..b29c6a63b4442 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsIntegrationIT.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatToolsIntegrationIT.java @@ -18,7 +18,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.springai.tools.spec.CamelToolExecutorCache; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @@ -43,7 +42,7 @@ public class SpringAiChatToolsIntegrationIT extends OllamaTestSupport { @Test public void testToolsAreRegistered() throws Exception { // Verify that tools are registered in the cache before testing - var toolCache = CamelToolExecutorCache.getInstance(); + var toolCache = org.apache.camel.component.springai.tools.spec.CamelToolExecutorCache.getInstance(); var tools = toolCache.getTools(); // Give routes time to start and register tools diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatWrappedFileIT.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatWrappedFileIT.java index 636ca36f7d0b6..ad2ca8efad684 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatWrappedFileIT.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-chat/src/test/java/org/apache/camel/component/springai/chat/SpringAiChatWrappedFileIT.java @@ -18,14 +18,12 @@ import java.net.URL; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ai.chat.model.ChatModel; import org.springframework.ai.ollama.OllamaChatModel; import org.springframework.ai.ollama.api.OllamaApi; import org.springframework.ai.ollama.api.OllamaChatOptions; @@ -59,7 +57,7 @@ protected String modelName() { } @Override - protected ChatModel createModel() { + protected org.springframework.ai.chat.model.ChatModel createModel() { OllamaApi ollamaApi = OllamaApi.builder() .baseUrl(OLLAMA.baseUrl()) .build(); @@ -164,7 +162,7 @@ public void configure() throws Exception { .pollEnrich("file:" + testFilesPath + "?fileName=test-image.png&noop=true&idempotent=false") .setHeader(SpringAiChatConstants.USER_MESSAGE, constant("Describe this image.")) // Simulate FILE_CONTENT_TYPE header that would be set by file component with probeContentType=true - .setHeader(Exchange.FILE_CONTENT_TYPE, constant("image/png")) + .setHeader(org.apache.camel.Exchange.FILE_CONTENT_TYPE, constant("image/png")) .to("spring-ai-chat:wrapped-file-ct?chatModel=#chatModel"); } }; diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/test/java/org/apache/camel/component/springai/image/SpringAiImageOllamaIT.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/test/java/org/apache/camel/component/springai/image/SpringAiImageOllamaIT.java index 046f074da3c7f..704f051553071 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/test/java/org/apache/camel/component/springai/image/SpringAiImageOllamaIT.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-image/src/test/java/org/apache/camel/component/springai/image/SpringAiImageOllamaIT.java @@ -20,7 +20,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Base64; -import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; @@ -84,7 +83,7 @@ protected void setupResources() throws Exception { // Add a Jackson converter that supports this media type. MappingJackson2HttpMessageConverter ndjsonConverter = new MappingJackson2HttpMessageConverter(); ndjsonConverter.setSupportedMediaTypes( - List.of(MediaType.APPLICATION_JSON, MediaType.valueOf("application/x-ndjson"))); + java.util.List.of(MediaType.APPLICATION_JSON, MediaType.valueOf("application/x-ndjson"))); RestClient.Builder restClientBuilder = RestClient.builder() .messageConverters(converters -> converters.add(0, ndjsonConverter)); diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/main/java/org/apache/camel/component/springai/tools/SpringAiToolsEndpoint.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/main/java/org/apache/camel/component/springai/tools/SpringAiToolsEndpoint.java index 317f49abf8ce5..21e1209f1544e 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/main/java/org/apache/camel/component/springai/tools/SpringAiToolsEndpoint.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-tools/src/main/java/org/apache/camel/component/springai/tools/SpringAiToolsEndpoint.java @@ -20,14 +20,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.camel.Category; import org.apache.camel.Consumer; -import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.component.springai.tools.spec.CamelToolExecutorCache; @@ -123,11 +121,11 @@ public Consumer createConsumer(Processor processor) throws Exception { configureConsumer(springAiToolsConsumer); // Create a function that executes the Camel route - Function, String> function = args -> { + java.util.function.Function, String> function = args -> { try { - Exchange exchange = createExchange(); + org.apache.camel.Exchange exchange = createExchange(); // Set arguments as headers - for (Map.Entry entry : args.entrySet()) { + for (java.util.Map.Entry entry : args.entrySet()) { exchange.getMessage().setHeader(entry.getKey(), entry.getValue()); } @@ -151,9 +149,9 @@ public Consumer createConsumer(Processor processor) throws Exception { // Build JSON schema from parameters map String inputSchema = buildJsonSchemaFromParameters(parameters); builder.inputSchema(inputSchema); - builder.inputType(Map.class); + builder.inputType(java.util.Map.class); } else { - builder.inputType(Map.class); + builder.inputType(java.util.Map.class); } // Configure tool metadata diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/main/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreProducer.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/main/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreProducer.java index f9eaac6cc477e..e8b777ada8e71 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/main/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreProducer.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/main/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreProducer.java @@ -17,9 +17,7 @@ package org.apache.camel.component.springai.vectorstore; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -146,7 +144,7 @@ private void processAdd(Exchange exchange, VectorStore vectorStore) { * special key that can be used by vector stores that support pre-computed embeddings. */ private Document createDocumentWithEmbedding(String text, float[] embedding) { - Map metadata = new HashMap<>(); + java.util.Map metadata = new java.util.HashMap<>(); // Store the embedding in metadata with a standard key // Note: Most vector stores will ignore this and compute their own embeddings, // but custom implementations can use it diff --git a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java index 19de852251507..b65256079b696 100644 --- a/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java +++ b/components/camel-spring-parent/camel-spring-ai/camel-spring-ai-vector-store/src/test/java/org/apache/camel/component/springai/vectorstore/SpringAiVectorStoreComponentTest.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Message; @@ -279,9 +278,9 @@ public void testSimilaritySearchWithTopKAndThreshold() { @Test public void testDeleteDocuments() { // Add some documents first - Document doc1 = new Document("doc-1", "First document", Map.of()); - Document doc2 = new Document("doc-2", "Second document", Map.of()); - Document doc3 = new Document("doc-3", "Third document", Map.of()); + Document doc1 = new Document("doc-1", "First document", java.util.Map.of()); + Document doc2 = new Document("doc-2", "Second document", java.util.Map.of()); + Document doc3 = new Document("doc-3", "Third document", java.util.Map.of()); vectorStore.add(List.of(doc1, doc2, doc3)); @@ -314,8 +313,8 @@ public void testDeleteDocuments() { @Test public void testDeleteDocumentsWithBodyAsList() { // Add some documents first - Document doc1 = new Document("doc-10", "Document A", Map.of()); - Document doc2 = new Document("doc-20", "Document B", Map.of()); + Document doc1 = new Document("doc-10", "Document A", java.util.Map.of()); + Document doc2 = new Document("doc-20", "Document B", java.util.Map.of()); vectorStore.add(List.of(doc1, doc2)); @@ -332,7 +331,7 @@ public void testDeleteDocumentsWithBodyAsList() { @Test public void testDeleteSingleDocumentWithBodyAsString() { // Add a document - Document doc = new Document("doc-single", "Single document to delete", Map.of()); + Document doc = new Document("doc-single", "Single document to delete", java.util.Map.of()); vectorStore.add(List.of(doc)); // Delete using body as single string ID diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java index 9ea329a63922d..63043affb1232 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java @@ -22,9 +22,6 @@ // Generated on: 2017.02.12 at 12:58:35 AM EET // -@XmlSchema(namespace = "http://javacrumbs.net/calc", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://javacrumbs.net/calc", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package net.javacrumbs.calc.model; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java index c3b57bdb4027d..4b0c0e35b489a 100644 --- a/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java +++ b/components/camel-spring-parent/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@XmlSchema(namespace = "http://www.stockquotes.edu/", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.stockquotes.edu/", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.component.spring.ws.jaxb; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/components/camel-spring-parent/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java b/components/camel-spring-parent/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java index b2c3df9947837..c77d2653fcf38 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java +++ b/components/camel-spring-parent/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.spring.xml; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java index 5d8703729f68c..5a26806044da8 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/AnnotatedConsumeImpl.java @@ -19,10 +19,9 @@ import org.apache.camel.Consume; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -@Transactional(propagation = Propagation.NEVER, readOnly = true) +@Transactional(propagation = org.springframework.transaction.annotation.Propagation.NEVER, readOnly = true) public class AnnotatedConsumeImpl implements AnnotatedConsume { @Produce("mock:book") diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java index d9b305dabde1a..e9c93df89934b 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java @@ -18,7 +18,6 @@ import org.apache.camel.Exchange; import org.apache.camel.spring.SpringTestSupport; -import org.apache.camel.support.ExpressionAdapter; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -40,7 +39,7 @@ protected AbstractXmlApplicationContext createApplicationContext() { return new ClassPathXmlApplicationContext("org/apache/camel/spring/processor/SpringCustomExpressionTest.xml"); } - public static class MyExpression extends ExpressionAdapter { + public static class MyExpression extends org.apache.camel.support.ExpressionAdapter { @Override public Object evaluate(Exchange exchange) { diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java index 788c731398bf5..213eafcc84d5a 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/DefaultPackageScanClassResolverTest.java @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -public class DefaultPackageScanClassResolverTest extends ScanTestSupport { +public class DefaultPackageScanClassResolverTest extends org.apache.camel.spring.scan.ScanTestSupport { private DefaultPackageScanClassResolver resolver; private Set> annotations = new HashSet<>(); @@ -42,16 +42,16 @@ public class DefaultPackageScanClassResolverTest extends ScanTestSupport { public void setUp() throws Exception { super.setUp(); resolver = new DefaultPackageScanClassResolver(); - annotations.add(ScannableOne.class); - annotations.add(ScannableTwo.class); + annotations.add(org.apache.camel.spring.scan.ScannableOne.class); + annotations.add(org.apache.camel.spring.scan.ScannableTwo.class); } @Test public void testFindByAnnotationWithoutExtraFilters() { - Set> scanned = resolver.findAnnotated(ScannableOne.class, scanPackage); + Set> scanned = resolver.findAnnotated(org.apache.camel.spring.scan.ScannableOne.class, scanPackage); validateMatchingSetContains(scanned, ScanTargetOne.class, ScanTargetTwo.class); - scanned = resolver.findAnnotated(ScannableTwo.class, scanPackage); + scanned = resolver.findAnnotated(org.apache.camel.spring.scan.ScannableTwo.class, scanPackage); validateMatchingSetContains(scanned, ScanTargetThree.class); } @@ -72,7 +72,7 @@ public void testFindByAnnotationWithIncludePackageFilter() { filter.addIncludePattern(scanPackage + ".b.*"); resolver.addFilter(filter); - Set> scanned = resolver.findAnnotated(ScannableOne.class, scanPackage); + Set> scanned = resolver.findAnnotated(org.apache.camel.spring.scan.ScannableOne.class, scanPackage); validateMatchingSetContains(scanned, ScanTargetTwo.class); scanned = resolver.findAnnotated(ScannableTwo.class, scanPackage); @@ -98,7 +98,7 @@ public void testFindByAnnotationWithExcludePackageFilter() { Set> scanned = resolver.findAnnotated(ScannableOne.class, scanPackage); validateMatchingSetContains(scanned, ScanTargetOne.class); - scanned = resolver.findAnnotated(ScannableTwo.class, scanPackage); + scanned = resolver.findAnnotated(org.apache.camel.spring.scan.ScannableTwo.class, scanPackage); validateMatchingSetContains(scanned); } diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java index 44c0a9b0515be..6fb8ba61f5c38 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PackageScanFiltersTest.java @@ -64,8 +64,8 @@ public void testAssignableToPackageScanFilter() { @Test public void testAnnotatedWithAnyPackageScanFilter() { Set> annotations = new LinkedHashSet<>(); - annotations.add(ScannableOne.class); - annotations.add(ScannableTwo.class); + annotations.add(org.apache.camel.spring.scan.ScannableOne.class); + annotations.add(org.apache.camel.spring.scan.ScannableTwo.class); AnnotatedWithAnyPackageScanFilter filter = new AnnotatedWithAnyPackageScanFilter(annotations); Class type = ScanTargetOne.class; @@ -80,7 +80,7 @@ public void testAnnotatedWithAnyPackageScanFilter() { @Test public void testAnnotatedWithPackageScanFilter() { AnnotatedWithPackageScanFilter filter - = new AnnotatedWithPackageScanFilter(ScannableOne.class); + = new AnnotatedWithPackageScanFilter(org.apache.camel.spring.scan.ScannableOne.class); validateFilter(filter, ScanTargetOne.class); validateFilter(filter, ScanTargetTwo.class); @@ -91,7 +91,7 @@ public void testAnnotatedWithPackageScanFilter() { @Test public void testCompositePackageScanFilter() { - PackageScanFilter one = new AnnotatedWithPackageScanFilter(ScannableOne.class); + PackageScanFilter one = new AnnotatedWithPackageScanFilter(org.apache.camel.spring.scan.ScannableOne.class); PackageScanFilter two = new AssignableToPackageScanFilter(ScanTargetOne.class); Set filters = CollectionHelper.createSetContaining(one, two); diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java index 9d668e285bdb0..96b86dc3bad09 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/PatternBasedPackageScanFilterTest.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class PatternBasedPackageScanFilterTest extends ScanTestSupport { +public class PatternBasedPackageScanFilterTest extends org.apache.camel.spring.scan.ScanTestSupport { private Set> allClasses; diff --git a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java index 9d874dc19d7b6..94b73d28f8471 100644 --- a/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java +++ b/components/camel-spring-parent/camel-spring-xml/src/test/java/org/apache/camel/spring/scan/a/ScanTargetOne.java @@ -16,9 +16,7 @@ */ package org.apache.camel.spring.scan.a; -import org.apache.camel.spring.scan.ScannableOne; - -@ScannableOne +@org.apache.camel.spring.scan.ScannableOne public class ScanTargetOne { public void someMethod() { diff --git a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java index 74e68a509facd..81938cfad7cb1 100644 --- a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java +++ b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StaxStreamXMLReader.java @@ -270,7 +270,7 @@ private void handleComment() throws SAXException { private void handleDtd() throws SAXException { if (getLexicalHandler() != null) { - Location location = reader.getLocation(); + javax.xml.stream.Location location = reader.getLocation(); getLexicalHandler().startDTD(null, location.getPublicId(), location.getSystemId()); } if (getLexicalHandler() != null) { diff --git a/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/handlers/TahuHostApplicationManualIT.java b/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/handlers/TahuHostApplicationManualIT.java index 4f7a55aacefd7..ca08870b82df1 100644 --- a/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/handlers/TahuHostApplicationManualIT.java +++ b/components/camel-tahu/src/test/java/org/apache/camel/component/tahu/handlers/TahuHostApplicationManualIT.java @@ -28,7 +28,6 @@ import org.apache.camel.component.tahu.TahuConstants; import org.eclipse.tahu.edge.CommandListener; import org.eclipse.tahu.message.model.EdgeNodeDescriptor; -import org.eclipse.tahu.message.model.Message; import org.eclipse.tahu.message.model.MessageType; import org.eclipse.tahu.message.model.Metric; import org.eclipse.tahu.message.model.SparkplugBPayload; @@ -155,7 +154,7 @@ private void initiateTckTest(String testParams) throws Exception { private static final List HANDLED_MESSAGE_TYPES = List.of(MessageType.NBIRTH, MessageType.NDATA, MessageType.NDEATH, MessageType.DBIRTH, MessageType.DDATA, MessageType.DDEATH); - void onMessageConsumer(EdgeNodeDescriptor edgeNodeDescriptor, Message tahuMessage) { + void onMessageConsumer(EdgeNodeDescriptor edgeNodeDescriptor, org.eclipse.tahu.message.model.Message tahuMessage) { try { Topic topic = tahuMessage.getTopic(); SparkplugBPayload payload = tahuMessage.getPayload(); diff --git a/components/camel-telemetry-dev/src/main/java/org/apache/camel/telemetrydev/DevTrace.java b/components/camel-telemetry-dev/src/main/java/org/apache/camel/telemetrydev/DevTrace.java index 0029e12e72716..1b70cda0589b1 100644 --- a/components/camel-telemetry-dev/src/main/java/org/apache/camel/telemetrydev/DevTrace.java +++ b/components/camel-telemetry-dev/src/main/java/org/apache/camel/telemetrydev/DevTrace.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -129,7 +128,7 @@ private DevSpanAdapter getWithParent(String parentSpanId) { } } -class SpanComparator implements Comparator { +class SpanComparator implements java.util.Comparator { @Override public int compare(DevSpanAdapter a, DevSpanAdapter b) { DevSpanAdapter msa = (DevSpanAdapter) a; diff --git a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/mock/MockTrace.java b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/mock/MockTrace.java index 6244157eab182..2fddd744621cd 100644 --- a/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/mock/MockTrace.java +++ b/components/camel-telemetry/src/test/java/org/apache/camel/telemetry/mock/MockTrace.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; import org.apache.camel.telemetry.Span; @@ -46,7 +45,7 @@ public String toString() { } -class SpanComparator implements Comparator { +class SpanComparator implements java.util.Comparator { @Override public int compare(Span a, Span b) { // cast to get timestamp without changing the Span interface diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java index 1c4b2e5db6133..ce27c03d497bc 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/params/ParameterizedExtension.java @@ -49,7 +49,7 @@ public boolean supportsTestTemplate(ExtensionContext context) { } @Override - public Stream provideTestTemplateInvocationContexts( + public java.util.stream.Stream provideTestTemplateInvocationContexts( ExtensionContext extensionContext) { Class testClass = extensionContext.getRequiredTestClass(); try { @@ -70,7 +70,7 @@ public Stream provideTestTemplateInvocationContex } private List getParametersMethods(Class testClass) { - List parameters = Stream.of(testClass.getDeclaredMethods()) + List parameters = java.util.stream.Stream.of(testClass.getDeclaredMethods()) .filter(m -> Modifier.isStatic(m.getModifiers())) .filter(m -> m.getAnnotation(Parameters.class) != null) .collect(Collectors.toList()); @@ -111,18 +111,18 @@ public ParameterizedTemplate(Object[] params) { @Override public String getDisplayName(int invocationIndex) { return "[" + invocationIndex + "] " - + Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); + + java.util.stream.Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); } @Override - public List getAdditionalExtensions() { + public java.util.List getAdditionalExtensions() { return List.of( (TestInstancePostProcessor) this::postProcessTestInstance); } protected void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception { Class clazz = testInstance.getClass(); - List fields = hierarchy(clazz) + java.util.List fields = hierarchy(clazz) .map(Class::getDeclaredFields) .flatMap(Stream::of) .filter(f -> isAnnotated(f, Parameter.class)) diff --git a/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/params/ParameterizedExtension.java b/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/params/ParameterizedExtension.java index dc43881300033..881eaa8f9063f 100644 --- a/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/params/ParameterizedExtension.java +++ b/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/params/ParameterizedExtension.java @@ -49,7 +49,7 @@ public boolean supportsTestTemplate(ExtensionContext context) { } @Override - public Stream provideTestTemplateInvocationContexts( + public java.util.stream.Stream provideTestTemplateInvocationContexts( ExtensionContext extensionContext) { Class testClass = extensionContext.getRequiredTestClass(); try { @@ -70,7 +70,7 @@ public Stream provideTestTemplateInvocationContex } private List getParametersMethods(Class testClass) { - List parameters = Stream.of(testClass.getDeclaredMethods()) + List parameters = java.util.stream.Stream.of(testClass.getDeclaredMethods()) .filter(m -> Modifier.isStatic(m.getModifiers())) .filter(m -> m.getAnnotation(Parameters.class) != null) .collect(Collectors.toList()); @@ -111,18 +111,18 @@ public ParameterizedTemplate(Object[] params) { @Override public String getDisplayName(int invocationIndex) { return "[" + invocationIndex + "] " - + Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); + + java.util.stream.Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); } @Override - public List getAdditionalExtensions() { + public java.util.List getAdditionalExtensions() { return List.of( (TestInstancePostProcessor) this::postProcessTestInstance); } protected void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception { Class clazz = testInstance.getClass(); - List fields = hierarchy(clazz) + java.util.List fields = hierarchy(clazz) .map(Class::getDeclaredFields) .flatMap(Stream::of) .filter(f -> isAnnotated(f, Parameter.class)) diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java index e442a9f7dbba9..a1fc9d7fc9938 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java @@ -22,78 +22,7 @@ */ package org.apache.camel.component.thrift.generated; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.BitSet; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import jakarta.annotation.Generated; - -import org.apache.thrift.AsyncProcessFunction; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.ProcessFunction; -import org.apache.thrift.TApplicationException; -import org.apache.thrift.TBase; -import org.apache.thrift.TBaseAsyncProcessor; -import org.apache.thrift.TBaseHelper; -import org.apache.thrift.TBaseProcessor; -import org.apache.thrift.TException; -import org.apache.thrift.TFieldIdEnum; -import org.apache.thrift.TFieldRequirementType; -import org.apache.thrift.TProcessor; -import org.apache.thrift.TSerializable; -import org.apache.thrift.TServiceClient; -import org.apache.thrift.TServiceClientFactory; -import org.apache.thrift.annotation.Nullable; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.async.TAsyncClient; -import org.apache.thrift.async.TAsyncClientFactory; -import org.apache.thrift.async.TAsyncClientManager; -import org.apache.thrift.async.TAsyncMethodCall; -import org.apache.thrift.meta_data.FieldMetaData; -import org.apache.thrift.meta_data.FieldValueMetaData; -import org.apache.thrift.meta_data.ListMetaData; -import org.apache.thrift.meta_data.MapMetaData; -import org.apache.thrift.meta_data.SetMetaData; -import org.apache.thrift.meta_data.StructMetaData; -import org.apache.thrift.protocol.TCompactProtocol; -import org.apache.thrift.protocol.TField; -import org.apache.thrift.protocol.TList; -import org.apache.thrift.protocol.TMap; -import org.apache.thrift.protocol.TMessage; -import org.apache.thrift.protocol.TMessageType; -import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.protocol.TProtocolFactory; -import org.apache.thrift.protocol.TProtocolUtil; -import org.apache.thrift.protocol.TSet; -import org.apache.thrift.protocol.TStruct; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TType; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.server.AbstractNonblockingServer; -import org.apache.thrift.transport.TIOStreamTransport; -import org.apache.thrift.transport.TMemoryInputTransport; -import org.apache.thrift.transport.TNonblockingTransport; -import org.apache.thrift.transport.TTransportException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public class Calculator { @@ -108,24 +37,24 @@ public interface Iface { * that it may throw. Note that argument lists and exception lists are specified using the exact same syntax as * field lists in struct or exception definitions. */ - public void ping() throws TException; + public void ping() throws org.apache.thrift.TException; - public int add(int num1, int num2) throws TException; + public int add(int num1, int num2) throws org.apache.thrift.TException; - public int calculate(int logid, Work w) throws InvalidOperation, TException; + public int calculate(int logid, Work w) throws InvalidOperation, org.apache.thrift.TException; /** * This method has a oneway modifier. That means the client only makes a request and does not listen for any * response at all. Oneway methods must be void. */ - public void zip() throws TException; + public void zip() throws org.apache.thrift.TException; /** * This method echoed input object as return value. * * @param w */ - public Work echo(Work w) throws TException; + public Work echo(Work w) throws org.apache.thrift.TException; /** * This method contains all possible simple, special, struct and container types as input parameters @@ -144,115 +73,115 @@ public interface Iface { * @param v12 */ public int alltypes( - boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, ByteBuffer v8, Work v9, - List v10, Set v11, - Map v12) - throws TException; + boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, + java.util.List v10, java.util.Set v11, + java.util.Map v12) + throws org.apache.thrift.TException; } public interface AsyncIface { - public void ping(AsyncMethodCallback resultHandler) throws TException; + public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void add(int num1, int num2, AsyncMethodCallback resultHandler) - throws TException; + public void add(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException; - public void calculate(int logid, Work w, AsyncMethodCallback resultHandler) - throws TException; + public void calculate(int logid, Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException; - public void zip(AsyncMethodCallback resultHandler) throws TException; + public void zip(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void echo(Work w, AsyncMethodCallback resultHandler) - throws TException; + public void echo(Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException; public void alltypes( - boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, ByteBuffer v8, Work v9, - List v10, Set v11, - Map v12, - AsyncMethodCallback resultHandler) - throws TException; + boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, + java.util.List v10, java.util.Set v11, + java.util.Map v12, + org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException; } - public static class Client extends TServiceClient implements Iface { - public static class Factory implements TServiceClientFactory { + public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() { } @Override - public Client getClient(TProtocol prot) { + public Client getClient(org.apache.thrift.protocol.TProtocol prot) { return new Client(prot); } @Override - public Client getClient(TProtocol iprot, TProtocol oprot) { + public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { return new Client(iprot, oprot); } } - public Client(TProtocol prot) { + public Client(org.apache.thrift.protocol.TProtocol prot) { super(prot, prot); } - public Client(TProtocol iprot, TProtocol oprot) { + public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { super(iprot, oprot); } @Override - public void ping() throws TException { + public void ping() throws org.apache.thrift.TException { send_ping(); recv_ping(); } - public void send_ping() throws TException { + public void send_ping() throws org.apache.thrift.TException { ping_args args = new ping_args(); sendBase("ping", args); } - public void recv_ping() throws TException { + public void recv_ping() throws org.apache.thrift.TException { ping_result result = new ping_result(); receiveBase(result, "ping"); return; } @Override - public int add(int num1, int num2) throws TException { + public int add(int num1, int num2) throws org.apache.thrift.TException { send_add(num1, num2); return recv_add(); } - public void send_add(int num1, int num2) throws TException { + public void send_add(int num1, int num2) throws org.apache.thrift.TException { add_args args = new add_args(); args.setNum1(num1); args.setNum2(num2); sendBase("add", args); } - public int recv_add() throws TException { + public int recv_add() throws org.apache.thrift.TException { add_result result = new add_result(); receiveBase(result, "add"); if (result.isSetSuccess()) { return result.success; } - throw new TApplicationException( - TApplicationException.MISSING_RESULT, "add failed: unknown result"); + throw new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.MISSING_RESULT, "add failed: unknown result"); } @Override - public int calculate(int logid, Work w) throws InvalidOperation, TException { + public int calculate(int logid, Work w) throws InvalidOperation, org.apache.thrift.TException { send_calculate(logid, w); return recv_calculate(); } - public void send_calculate(int logid, Work w) throws TException { + public void send_calculate(int logid, Work w) throws org.apache.thrift.TException { calculate_args args = new calculate_args(); args.setLogid(logid); args.setW(w); sendBase("calculate", args); } - public int recv_calculate() throws InvalidOperation, TException { + public int recv_calculate() throws InvalidOperation, org.apache.thrift.TException { calculate_result result = new calculate_result(); receiveBase(result, "calculate"); if (result.isSetSuccess()) { @@ -261,57 +190,57 @@ public int recv_calculate() throws InvalidOperation, TException { if (result.ouch != null) { throw result.ouch; } - throw new TApplicationException( - TApplicationException.MISSING_RESULT, "calculate failed: unknown result"); + throw new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.MISSING_RESULT, "calculate failed: unknown result"); } @Override - public void zip() throws TException { + public void zip() throws org.apache.thrift.TException { send_zip(); } - public void send_zip() throws TException { + public void send_zip() throws org.apache.thrift.TException { zip_args args = new zip_args(); sendBaseOneway("zip", args); } @Override - public Work echo(Work w) throws TException { + public Work echo(Work w) throws org.apache.thrift.TException { send_echo(w); return recv_echo(); } - public void send_echo(Work w) throws TException { + public void send_echo(Work w) throws org.apache.thrift.TException { echo_args args = new echo_args(); args.setW(w); sendBase("echo", args); } - public Work recv_echo() throws TException { + public Work recv_echo() throws org.apache.thrift.TException { echo_result result = new echo_result(); receiveBase(result, "echo"); if (result.isSetSuccess()) { return result.success; } - throw new TApplicationException( - TApplicationException.MISSING_RESULT, "echo failed: unknown result"); + throw new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.MISSING_RESULT, "echo failed: unknown result"); } @Override public int alltypes( - boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, ByteBuffer v8, Work v9, - List v10, Set v11, - Map v12) - throws TException { + boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, + java.util.List v10, java.util.Set v11, + java.util.Map v12) + throws org.apache.thrift.TException { send_alltypes(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12); return recv_alltypes(); } public void send_alltypes( - boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, ByteBuffer v8, Work v9, - List v10, Set v11, - Map v12) - throws TException { + boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, + java.util.List v10, java.util.Set v11, + java.util.Map v12) + throws org.apache.thrift.TException { alltypes_args args = new alltypes_args(); args.setV1(v1); args.setV2(v2); @@ -328,105 +257,105 @@ public void send_alltypes( sendBase("alltypes", args); } - public int recv_alltypes() throws TException { + public int recv_alltypes() throws org.apache.thrift.TException { alltypes_result result = new alltypes_result(); receiveBase(result, "alltypes"); if (result.isSetSuccess()) { return result.success; } - throw new TApplicationException( - TApplicationException.MISSING_RESULT, "alltypes failed: unknown result"); + throw new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.MISSING_RESULT, "alltypes failed: unknown result"); } } - public static class AsyncClient extends TAsyncClient implements AsyncIface { - public static class Factory implements TAsyncClientFactory { - private TAsyncClientManager clientManager; - private TProtocolFactory protocolFactory; + public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { + private org.apache.thrift.async.TAsyncClientManager clientManager; + private org.apache.thrift.protocol.TProtocolFactory protocolFactory; - public Factory(TAsyncClientManager clientManager, - TProtocolFactory protocolFactory) { + public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, + org.apache.thrift.protocol.TProtocolFactory protocolFactory) { this.clientManager = clientManager; this.protocolFactory = protocolFactory; } @Override - public AsyncClient getAsyncClient(TNonblockingTransport transport) { + public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) { return new AsyncClient(protocolFactory, clientManager, transport); } } - public AsyncClient(TProtocolFactory protocolFactory, - TAsyncClientManager clientManager, - TNonblockingTransport transport) { + public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, + org.apache.thrift.async.TAsyncClientManager clientManager, + org.apache.thrift.transport.TNonblockingTransport transport) { super(protocolFactory, clientManager, transport); } @Override - public void ping(AsyncMethodCallback resultHandler) throws TException { + public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); ping_call method_call = new ping_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class ping_call extends TAsyncMethodCall { - public ping_call(AsyncMethodCallback resultHandler, - TAsyncClient client, - TProtocolFactory protocolFactory, - TNonblockingTransport transport) throws TException { + public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall { + public ping_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, + org.apache.thrift.async.TAsyncClient client, + org.apache.thrift.protocol.TProtocolFactory protocolFactory, + org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); } @Override - public void write_args(TProtocol prot) throws TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin( - new TMessage("ping", TMessageType.CALL, 0)); + new org.apache.thrift.protocol.TMessage("ping", org.apache.thrift.protocol.TMessageType.CALL, 0)); ping_args args = new ping_args(); args.write(prot); prot.writeMessageEnd(); } @Override - public Void getResult() throws TException { - if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { + public Void getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - TMemoryInputTransport memoryTransport - = new TMemoryInputTransport(getFrameBuffer().array()); - TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport + = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_ping(); return null; } } @Override - public void add(int num1, int num2, AsyncMethodCallback resultHandler) - throws TException { + public void add(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { checkReady(); add_call method_call = new add_call(num1, num2, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class add_call extends TAsyncMethodCall { + public static class add_call extends org.apache.thrift.async.TAsyncMethodCall { private int num1; private int num2; - public add_call(int num1, int num2, AsyncMethodCallback resultHandler, - TAsyncClient client, - TProtocolFactory protocolFactory, - TNonblockingTransport transport) throws TException { + public add_call(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback resultHandler, + org.apache.thrift.async.TAsyncClient client, + org.apache.thrift.protocol.TProtocolFactory protocolFactory, + org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.num1 = num1; this.num2 = num2; } @Override - public void write_args(TProtocol prot) throws TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin( - new TMessage("add", TMessageType.CALL, 0)); + new org.apache.thrift.protocol.TMessage("add", org.apache.thrift.protocol.TMessageType.CALL, 0)); add_args args = new add_args(); args.setNum1(num1); args.setNum2(num2); @@ -435,44 +364,44 @@ public void write_args(TProtocol prot) throws TException { } @Override - public java.lang.Integer getResult() throws TException { - if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { + public java.lang.Integer getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - TMemoryInputTransport memoryTransport - = new TMemoryInputTransport(getFrameBuffer().array()); - TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport + = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_add(); } } @Override - public void calculate(int logid, Work w, AsyncMethodCallback resultHandler) - throws TException { + public void calculate(int logid, Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { checkReady(); calculate_call method_call = new calculate_call(logid, w, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class calculate_call extends TAsyncMethodCall { + public static class calculate_call extends org.apache.thrift.async.TAsyncMethodCall { private int logid; private Work w; public calculate_call(int logid, Work w, - AsyncMethodCallback resultHandler, - TAsyncClient client, - TProtocolFactory protocolFactory, - TNonblockingTransport transport) throws TException { + org.apache.thrift.async.AsyncMethodCallback resultHandler, + org.apache.thrift.async.TAsyncClient client, + org.apache.thrift.protocol.TProtocolFactory protocolFactory, + org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.logid = logid; this.w = w; } @Override - public void write_args(TProtocol prot) throws TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin( - new TMessage("calculate", TMessageType.CALL, 0)); + new org.apache.thrift.protocol.TMessage("calculate", org.apache.thrift.protocol.TMessageType.CALL, 0)); calculate_args args = new calculate_args(); args.setLogid(logid); args.setW(w); @@ -481,78 +410,78 @@ public void write_args(TProtocol prot) throws TException { } @Override - public java.lang.Integer getResult() throws InvalidOperation, TException { - if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { + public java.lang.Integer getResult() throws InvalidOperation, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - TMemoryInputTransport memoryTransport - = new TMemoryInputTransport(getFrameBuffer().array()); - TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport + = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_calculate(); } } @Override - public void zip(AsyncMethodCallback resultHandler) throws TException { + public void zip(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); zip_call method_call = new zip_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class zip_call extends TAsyncMethodCall { - public zip_call(AsyncMethodCallback resultHandler, - TAsyncClient client, - TProtocolFactory protocolFactory, - TNonblockingTransport transport) throws TException { + public static class zip_call extends org.apache.thrift.async.TAsyncMethodCall { + public zip_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, + org.apache.thrift.async.TAsyncClient client, + org.apache.thrift.protocol.TProtocolFactory protocolFactory, + org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, true); } @Override - public void write_args(TProtocol prot) throws TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin( - new TMessage("zip", TMessageType.ONEWAY, 0)); + new org.apache.thrift.protocol.TMessage("zip", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); zip_args args = new zip_args(); args.write(prot); prot.writeMessageEnd(); } @Override - public Void getResult() throws TException { - if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { + public Void getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - TMemoryInputTransport memoryTransport - = new TMemoryInputTransport(getFrameBuffer().array()); - TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport + = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return null; } } @Override - public void echo(Work w, AsyncMethodCallback resultHandler) - throws TException { + public void echo(Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { checkReady(); echo_call method_call = new echo_call(w, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class echo_call extends TAsyncMethodCall { + public static class echo_call extends org.apache.thrift.async.TAsyncMethodCall { private Work w; - public echo_call(Work w, AsyncMethodCallback resultHandler, - TAsyncClient client, - TProtocolFactory protocolFactory, - TNonblockingTransport transport) throws TException { + public echo_call(Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler, + org.apache.thrift.async.TAsyncClient client, + org.apache.thrift.protocol.TProtocolFactory protocolFactory, + org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.w = w; } @Override - public void write_args(TProtocol prot) throws TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin( - new TMessage("echo", TMessageType.CALL, 0)); + new org.apache.thrift.protocol.TMessage("echo", org.apache.thrift.protocol.TMessageType.CALL, 0)); echo_args args = new echo_args(); args.setW(w); args.write(prot); @@ -560,24 +489,24 @@ public void write_args(TProtocol prot) throws TException { } @Override - public Work getResult() throws TException { - if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { + public Work getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - TMemoryInputTransport memoryTransport - = new TMemoryInputTransport(getFrameBuffer().array()); - TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport + = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_echo(); } } @Override public void alltypes( - boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, ByteBuffer v8, Work v9, - List v10, Set v11, - Map v12, - AsyncMethodCallback resultHandler) - throws TException { + boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, + java.util.List v10, java.util.Set v11, + java.util.Map v12, + org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { checkReady(); alltypes_call method_call = new alltypes_call( v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, resultHandler, this, ___protocolFactory, ___transport); @@ -585,7 +514,7 @@ public void alltypes( ___manager.call(method_call); } - public static class alltypes_call extends TAsyncMethodCall { + public static class alltypes_call extends org.apache.thrift.async.TAsyncMethodCall { private boolean v1; private byte v2; private short v3; @@ -593,19 +522,19 @@ public static class alltypes_call extends TAsyncMethodCall { private long v5; private double v6; private java.lang.String v7; - private ByteBuffer v8; + private java.nio.ByteBuffer v8; private Work v9; - private List v10; - private Set v11; - private Map v12; + private java.util.List v10; + private java.util.Set v11; + private java.util.Map v12; public alltypes_call(boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, - ByteBuffer v8, Work v9, List v10, - Set v11, Map v12, - AsyncMethodCallback resultHandler, - TAsyncClient client, - TProtocolFactory protocolFactory, - TNonblockingTransport transport) throws TException { + java.nio.ByteBuffer v8, Work v9, java.util.List v10, + java.util.Set v11, java.util.Map v12, + org.apache.thrift.async.AsyncMethodCallback resultHandler, + org.apache.thrift.async.TAsyncClient client, + org.apache.thrift.protocol.TProtocolFactory protocolFactory, + org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.v1 = v1; this.v2 = v2; @@ -622,9 +551,9 @@ public alltypes_call(boolean v1, byte v2, short v3, int v4, long v5, double v6, } @Override - public void write_args(TProtocol prot) throws TException { + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin( - new TMessage("alltypes", TMessageType.CALL, 0)); + new org.apache.thrift.protocol.TMessage("alltypes", org.apache.thrift.protocol.TMessageType.CALL, 0)); alltypes_args args = new alltypes_args(); args.setV1(v1); args.setV2(v2); @@ -643,36 +572,36 @@ public void write_args(TProtocol prot) throws TException { } @Override - public java.lang.Integer getResult() throws TException { - if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { + public java.lang.Integer getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - TMemoryInputTransport memoryTransport - = new TMemoryInputTransport(getFrameBuffer().array()); - TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + org.apache.thrift.transport.TMemoryInputTransport memoryTransport + = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_alltypes(); } } } - public static class Processor extends TBaseProcessor - implements TProcessor { - private static final Logger _LOGGER = LoggerFactory.getLogger(Processor.class.getName()); + public static class Processor extends org.apache.thrift.TBaseProcessor + implements org.apache.thrift.TProcessor { + private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { super(iface, getProcessMap( - new HashMap>())); + new java.util.HashMap>())); } protected Processor(I iface, - Map> processMap) { + java.util.Map> processMap) { super(iface, getProcessMap(processMap)); } private static < - I extends Iface> Map> getProcessMap( - Map> processMap) { + I extends Iface> java.util.Map> getProcessMap( + java.util.Map> processMap) { processMap.put("ping", new ping()); processMap.put("add", new add()); processMap.put("calculate", new calculate()); @@ -682,7 +611,7 @@ protected Processor(I iface, return processMap; } - public static class ping extends ProcessFunction { + public static class ping extends org.apache.thrift.ProcessFunction { public ping() { super("ping"); } @@ -708,14 +637,14 @@ public ping_result getEmptyResultInstance() { } @Override - public ping_result getResult(I iface, ping_args args) throws TException { + public ping_result getResult(I iface, ping_args args) throws org.apache.thrift.TException { ping_result result = getEmptyResultInstance(); iface.ping(); return result; } } - public static class add extends ProcessFunction { + public static class add extends org.apache.thrift.ProcessFunction { public add() { super("add"); } @@ -741,7 +670,7 @@ public add_result getEmptyResultInstance() { } @Override - public add_result getResult(I iface, add_args args) throws TException { + public add_result getResult(I iface, add_args args) throws org.apache.thrift.TException { add_result result = getEmptyResultInstance(); result.success = iface.add(args.num1, args.num2); result.setSuccessIsSet(true); @@ -750,7 +679,7 @@ public add_result getResult(I iface, add_args args) throws TException { } public static class calculate - extends ProcessFunction { + extends org.apache.thrift.ProcessFunction { public calculate() { super("calculate"); } @@ -776,7 +705,7 @@ public calculate_result getEmptyResultInstance() { } @Override - public calculate_result getResult(I iface, calculate_args args) throws TException { + public calculate_result getResult(I iface, calculate_args args) throws org.apache.thrift.TException { calculate_result result = getEmptyResultInstance(); try { result.success = iface.calculate(args.logid, args.w); @@ -789,7 +718,7 @@ public calculate_result getResult(I iface, calculate_args args) throws TExceptio } public static class zip - extends ProcessFunction { + extends org.apache.thrift.ProcessFunction { public zip() { super("zip"); } @@ -810,18 +739,18 @@ protected boolean rethrowUnhandledExceptions() { } @Override - public TBase getEmptyResultInstance() { + public org.apache.thrift.TBase getEmptyResultInstance() { return null; } @Override - public TBase getResult(I iface, zip_args args) throws TException { + public org.apache.thrift.TBase getResult(I iface, zip_args args) throws org.apache.thrift.TException { iface.zip(); return null; } } - public static class echo extends ProcessFunction { + public static class echo extends org.apache.thrift.ProcessFunction { public echo() { super("echo"); } @@ -847,7 +776,7 @@ public echo_result getEmptyResultInstance() { } @Override - public echo_result getResult(I iface, echo_args args) throws TException { + public echo_result getResult(I iface, echo_args args) throws org.apache.thrift.TException { echo_result result = getEmptyResultInstance(); result.success = iface.echo(args.w); return result; @@ -855,7 +784,7 @@ public echo_result getResult(I iface, echo_args args) throws TException { } public static class alltypes - extends ProcessFunction { + extends org.apache.thrift.ProcessFunction { public alltypes() { super("alltypes"); } @@ -881,7 +810,7 @@ public alltypes_result getEmptyResultInstance() { } @Override - public alltypes_result getResult(I iface, alltypes_args args) throws TException { + public alltypes_result getResult(I iface, alltypes_args args) throws org.apache.thrift.TException { alltypes_result result = getEmptyResultInstance(); result.success = iface.alltypes(args.v1, args.v2, args.v3, args.v4, args.v5, args.v6, args.v7, args.v8, args.v9, args.v10, args.v11, args.v12); @@ -892,22 +821,22 @@ public alltypes_result getResult(I iface, alltypes_args args) throws TException } - public static class AsyncProcessor extends TBaseAsyncProcessor { - private static final Logger _LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName()); + public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { + private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { super(iface, getProcessMap( - new HashMap>())); + new java.util.HashMap>())); } protected AsyncProcessor(I iface, - Map> processMap) { + java.util.Map> processMap) { super(iface, getProcessMap(processMap)); } private static < - I extends AsyncIface> Map> getProcessMap( - Map> processMap) { + I extends AsyncIface> java.util.Map> getProcessMap( + java.util.Map> processMap) { processMap.put("ping", new ping()); processMap.put("add", new add()); processMap.put("calculate", new calculate()); @@ -918,7 +847,7 @@ protected AsyncProcessor(I iface, } public static class ping - extends AsyncProcessFunction { + extends org.apache.thrift.AsyncProcessFunction { public ping() { super("ping"); } @@ -934,16 +863,16 @@ public ping_args getEmptyArgsInstance() { } @Override - public AsyncMethodCallback getResultHandler( - final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( + final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback() { @Override public void onComplete(Void o) { ping_result result = new ping_result(); try { - fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); - } catch (TTransportException e) { + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY, seqid); + } catch (org.apache.thrift.transport.TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -954,22 +883,22 @@ public void onComplete(Void o) { @Override public void onError(java.lang.Exception e) { - byte msgType = TMessageType.REPLY; - TSerializable msg; + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; ping_result result = new ping_result(); - if (e instanceof TTransportException) { + if (e instanceof org.apache.thrift.transport.TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof TApplicationException) { + } else if (e instanceof org.apache.thrift.TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = (TApplicationException) e; + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = new TApplicationException( - TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -987,14 +916,14 @@ public boolean isOneway() { } @Override - public void start(I iface, ping_args args, AsyncMethodCallback resultHandler) - throws TException { + public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { iface.ping(resultHandler); } } public static class add - extends AsyncProcessFunction { + extends org.apache.thrift.AsyncProcessFunction { public add() { super("add"); } @@ -1010,18 +939,18 @@ public add_args getEmptyArgsInstance() { } @Override - public AsyncMethodCallback getResultHandler( - final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( + final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback() { @Override public void onComplete(java.lang.Integer o) { add_result result = new add_result(); result.success = o; result.setSuccessIsSet(true); try { - fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); - } catch (TTransportException e) { + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY, seqid); + } catch (org.apache.thrift.transport.TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -1032,22 +961,22 @@ public void onComplete(java.lang.Integer o) { @Override public void onError(java.lang.Exception e) { - byte msgType = TMessageType.REPLY; - TSerializable msg; + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; add_result result = new add_result(); - if (e instanceof TTransportException) { + if (e instanceof org.apache.thrift.transport.TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof TApplicationException) { + } else if (e instanceof org.apache.thrift.TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = (TApplicationException) e; + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = new TApplicationException( - TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -1066,14 +995,14 @@ public boolean isOneway() { @Override public void start( - I iface, add_args args, AsyncMethodCallback resultHandler) - throws TException { + I iface, add_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { iface.add(args.num1, args.num2, resultHandler); } } public static class calculate - extends AsyncProcessFunction { + extends org.apache.thrift.AsyncProcessFunction { public calculate() { super("calculate"); } @@ -1089,18 +1018,18 @@ public calculate_args getEmptyArgsInstance() { } @Override - public AsyncMethodCallback getResultHandler( - final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( + final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback() { @Override public void onComplete(java.lang.Integer o) { calculate_result result = new calculate_result(); result.success = o; result.setSuccessIsSet(true); try { - fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); - } catch (TTransportException e) { + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY, seqid); + } catch (org.apache.thrift.transport.TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -1111,26 +1040,26 @@ public void onComplete(java.lang.Integer o) { @Override public void onError(java.lang.Exception e) { - byte msgType = TMessageType.REPLY; - TSerializable msg; + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; calculate_result result = new calculate_result(); if (e instanceof InvalidOperation) { result.ouch = (InvalidOperation) e; result.setOuchIsSet(true); msg = result; - } else if (e instanceof TTransportException) { + } else if (e instanceof org.apache.thrift.transport.TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof TApplicationException) { + } else if (e instanceof org.apache.thrift.TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = (TApplicationException) e; + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = new TApplicationException( - TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -1149,20 +1078,20 @@ public boolean isOneway() { @Override public void start( - I iface, calculate_args args, AsyncMethodCallback resultHandler) - throws TException { + I iface, calculate_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { iface.calculate(args.logid, args.w, resultHandler); } } public static class zip - extends AsyncProcessFunction { + extends org.apache.thrift.AsyncProcessFunction { public zip() { super("zip"); } @Override - public TBase getEmptyResultInstance() { + public org.apache.thrift.TBase getEmptyResultInstance() { return null; } @@ -1172,17 +1101,17 @@ public zip_args getEmptyArgsInstance() { } @Override - public AsyncMethodCallback getResultHandler( - final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( + final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback() { @Override public void onComplete(Void o) { } @Override public void onError(java.lang.Exception e) { - if (e instanceof TTransportException) { + if (e instanceof org.apache.thrift.transport.TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); } else { @@ -1198,14 +1127,14 @@ public boolean isOneway() { } @Override - public void start(I iface, zip_args args, AsyncMethodCallback resultHandler) - throws TException { + public void start(I iface, zip_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { iface.zip(resultHandler); } } public static class echo - extends AsyncProcessFunction { + extends org.apache.thrift.AsyncProcessFunction { public echo() { super("echo"); } @@ -1221,17 +1150,17 @@ public echo_args getEmptyArgsInstance() { } @Override - public AsyncMethodCallback getResultHandler( - final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( + final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback() { @Override public void onComplete(Work o) { echo_result result = new echo_result(); result.success = o; try { - fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); - } catch (TTransportException e) { + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY, seqid); + } catch (org.apache.thrift.transport.TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -1242,22 +1171,22 @@ public void onComplete(Work o) { @Override public void onError(java.lang.Exception e) { - byte msgType = TMessageType.REPLY; - TSerializable msg; + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; echo_result result = new echo_result(); - if (e instanceof TTransportException) { + if (e instanceof org.apache.thrift.transport.TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof TApplicationException) { + } else if (e instanceof org.apache.thrift.TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = (TApplicationException) e; + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = new TApplicationException( - TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -1275,14 +1204,14 @@ public boolean isOneway() { } @Override - public void start(I iface, echo_args args, AsyncMethodCallback resultHandler) - throws TException { + public void start(I iface, echo_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { iface.echo(args.w, resultHandler); } } public static class alltypes - extends AsyncProcessFunction { + extends org.apache.thrift.AsyncProcessFunction { public alltypes() { super("alltypes"); } @@ -1298,18 +1227,18 @@ public alltypes_args getEmptyArgsInstance() { } @Override - public AsyncMethodCallback getResultHandler( - final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler( + final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback() { @Override public void onComplete(java.lang.Integer o) { alltypes_result result = new alltypes_result(); result.success = o; result.setSuccessIsSet(true); try { - fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); - } catch (TTransportException e) { + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY, seqid); + } catch (org.apache.thrift.transport.TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -1320,22 +1249,22 @@ public void onComplete(java.lang.Integer o) { @Override public void onError(java.lang.Exception e) { - byte msgType = TMessageType.REPLY; - TSerializable msg; + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; alltypes_result result = new alltypes_result(); - if (e instanceof TTransportException) { + if (e instanceof org.apache.thrift.transport.TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof TApplicationException) { + } else if (e instanceof org.apache.thrift.TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = (TApplicationException) e; + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = TMessageType.EXCEPTION; - msg = new TApplicationException( - TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException( + org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -1354,8 +1283,8 @@ public boolean isOneway() { @Override public void start( - I iface, alltypes_args args, AsyncMethodCallback resultHandler) - throws TException { + I iface, alltypes_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) + throws org.apache.thrift.TException { iface.alltypes(args.v1, args.v2, args.v3, args.v4, args.v5, args.v6, args.v7, args.v8, args.v9, args.v10, args.v11, args.v12, resultHandler); } @@ -1365,24 +1294,24 @@ public void start( @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class ping_args - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("ping_args"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("ping_args"); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ping_argsStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new ping_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_argsTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -1390,7 +1319,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { default: @@ -1411,7 +1340,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -1435,12 +1364,12 @@ public java.lang.String getFieldName() { } } - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(ping_args.class, metaDataMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_args.class, metaDataMap); } public ping_args() { @@ -1462,12 +1391,12 @@ public void clear() { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -1521,19 +1450,19 @@ public int compareTo(ping_args other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -1546,48 +1475,48 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class ping_argsStandardSchemeFactory implements SchemeFactory { + private static class ping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public ping_argsStandardScheme getScheme() { return new ping_argsStandardScheme(); } } - private static class ping_argsStandardScheme extends StandardScheme { + private static class ping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, ping_args struct) throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, ping_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -1598,8 +1527,8 @@ public void read(TProtocol iprot, ping_args struct) throws TException { } @Override - public void write(TProtocol oprot, ping_args struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, ping_args struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1609,52 +1538,52 @@ public void write(TProtocol oprot, ping_args struct) } - private static class ping_argsTupleSchemeFactory implements SchemeFactory { + private static class ping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public ping_argsTupleScheme getScheme() { return new ping_argsTupleScheme(); } } - private static class ping_argsTupleScheme extends TupleScheme { + private static class ping_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, ping_args struct) throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + public void write(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override - public void read(TProtocol prot, ping_args struct) throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + public void read(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class ping_result - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("ping_result"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("ping_result"); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ping_resultStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new ping_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_resultTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -1662,7 +1591,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { default: @@ -1683,7 +1612,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -1707,12 +1636,12 @@ public java.lang.String getFieldName() { } } - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(ping_result.class, metaDataMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_result.class, metaDataMap); } public ping_result() { @@ -1734,12 +1663,12 @@ public void clear() { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -1793,18 +1722,18 @@ public int compareTo(ping_result other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -1817,49 +1746,49 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class ping_resultStandardSchemeFactory implements SchemeFactory { + private static class ping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public ping_resultStandardScheme getScheme() { return new ping_resultStandardScheme(); } } - private static class ping_resultStandardScheme extends StandardScheme { + private static class ping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, ping_result struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, ping_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -1870,8 +1799,8 @@ public void read(TProtocol iprot, ping_result struct) } @Override - public void write(TProtocol oprot, ping_result struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, ping_result struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1881,63 +1810,63 @@ public void write(TProtocol oprot, ping_result struct) } - private static class ping_resultTupleSchemeFactory implements SchemeFactory { + private static class ping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public ping_resultTupleScheme getScheme() { return new ping_resultTupleScheme(); } } - private static class ping_resultTupleScheme extends TupleScheme { + private static class ping_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, ping_result struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + public void write(org.apache.thrift.protocol.TProtocol prot, ping_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override - public void read(TProtocol prot, ping_result struct) - throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + public void read(org.apache.thrift.protocol.TProtocol prot, ping_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class add_args - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("add_args"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("add_args"); - private static final TField NUM1_FIELD_DESC - = new TField("num1", TType.I32, (short) 1); - private static final TField NUM2_FIELD_DESC - = new TField("num2", TType.I32, (short) 2); + private static final org.apache.thrift.protocol.TField NUM1_FIELD_DESC + = new org.apache.thrift.protocol.TField("num1", org.apache.thrift.protocol.TType.I32, (short) 1); + private static final org.apache.thrift.protocol.TField NUM2_FIELD_DESC + = new org.apache.thrift.protocol.TField("num2", org.apache.thrift.protocol.TType.I32, (short) 2); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_argsStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new add_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_argsTupleSchemeFactory(); public int num1; // required public int num2; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NUM1((short) 1, "num1"), NUM2((short) 2, "num2"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -1945,7 +1874,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // NUM1 @@ -1970,7 +1899,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -1998,20 +1927,20 @@ public java.lang.String getFieldName() { private static final int __NUM1_ISSET_ID = 0; private static final int __NUM2_ISSET_ID = 1; private byte __isset_bitfield = 0; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.NUM1, - new FieldMetaData( - "num1", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "num1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.NUM2, - new FieldMetaData( - "num2", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(add_args.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "num2", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_args.class, metaDataMap); } public add_args() { @@ -2060,16 +1989,16 @@ public add_args setNum1(int num1) { } public void unsetNum1() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); } /** Returns true if field num1 is set (has been assigned a value) and false otherwise */ public boolean isSetNum1() { - return EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); } public void setNum1IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); } public int getNum2() { @@ -2083,20 +2012,20 @@ public add_args setNum2(int num2) { } public void unsetNum2() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); } /** Returns true if field num2 is set (has been assigned a value) and false otherwise */ public boolean isSetNum2() { - return EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); } public void setNum2IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case NUM1: if (value == null) { @@ -2117,7 +2046,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -2205,7 +2134,7 @@ public int compareTo(add_args other) { return lastComparison; } if (isSetNum1()) { - lastComparison = TBaseHelper.compareTo(this.num1, other.num1); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num1, other.num1); if (lastComparison != 0) { return lastComparison; } @@ -2215,7 +2144,7 @@ public int compareTo(add_args other) { return lastComparison; } if (isSetNum2()) { - lastComparison = TBaseHelper.compareTo(this.num2, other.num2); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num2, other.num2); if (lastComparison != 0) { return lastComparison; } @@ -2223,19 +2152,19 @@ public int compareTo(add_args other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -2256,66 +2185,66 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class add_argsStandardSchemeFactory implements SchemeFactory { + private static class add_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public add_argsStandardScheme getScheme() { return new add_argsStandardScheme(); } } - private static class add_argsStandardScheme extends StandardScheme { + private static class add_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, add_args struct) throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, add_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 1: // NUM1 - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // NUM2 - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.num2 = iprot.readI32(); struct.setNum2IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -2326,7 +2255,7 @@ public void read(TProtocol iprot, add_args struct) throws TException { } @Override - public void write(TProtocol oprot, add_args struct) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, add_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -2342,19 +2271,19 @@ public void write(TProtocol oprot, add_args struct) throws TException { } - private static class add_argsTupleSchemeFactory implements SchemeFactory { + private static class add_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public add_argsTupleScheme getScheme() { return new add_argsTupleScheme(); } } - private static class add_argsTupleScheme extends TupleScheme { + private static class add_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, add_args struct) throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, add_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetNum1()) { optionals.set(0); } @@ -2371,9 +2300,9 @@ public void write(TProtocol prot, add_args struct) throws TException { } @Override - public void read(TProtocol prot, add_args struct) throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + public void read(org.apache.thrift.protocol.TProtocol prot, add_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); @@ -2385,37 +2314,37 @@ public void read(TProtocol prot, add_args struct) throws TException { } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class add_result - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("add_result"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("add_result"); - private static final TField SUCCESS_FIELD_DESC - = new TField("success", TType.I32, (short) 0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC + = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short) 0); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new add_resultStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new add_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_resultTupleSchemeFactory(); public int success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short) 0, "success"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -2423,7 +2352,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -2446,7 +2375,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -2473,16 +2402,16 @@ public java.lang.String getFieldName() { // isset id assignments private static final int __SUCCESS_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, - new FieldMetaData( - "success", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(add_result.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_result.class, metaDataMap); } public add_result() { @@ -2525,20 +2454,20 @@ public add_result setSuccess(int success) { } public void unsetSuccess() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); } /** Returns true if field success is set (has been assigned a value) and false otherwise */ public boolean isSetSuccess() { - return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -2551,7 +2480,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -2623,7 +2552,7 @@ public int compareTo(add_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = TBaseHelper.compareTo(this.success, other.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -2631,18 +2560,18 @@ public int compareTo(add_result other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -2658,59 +2587,59 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class add_resultStandardSchemeFactory implements SchemeFactory { + private static class add_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public add_resultStandardScheme getScheme() { return new add_resultStandardScheme(); } } - private static class add_resultStandardScheme extends StandardScheme { + private static class add_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, add_result struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, add_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -2721,8 +2650,8 @@ public void read(TProtocol iprot, add_result struct) } @Override - public void write(TProtocol oprot, add_result struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, add_result struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -2737,20 +2666,20 @@ public void write(TProtocol oprot, add_result struct) } - private static class add_resultTupleSchemeFactory implements SchemeFactory { + private static class add_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public add_resultTupleScheme getScheme() { return new add_resultTupleScheme(); } } - private static class add_resultTupleScheme extends TupleScheme { + private static class add_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, add_result struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, add_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -2761,9 +2690,9 @@ public void write(TProtocol prot, add_result struct) } @Override - public void read(TProtocol prot, add_result struct) throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + public void read(org.apache.thrift.protocol.TProtocol prot, add_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); @@ -2771,42 +2700,42 @@ public void read(TProtocol prot, add_result struct) throws TException { } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class calculate_args - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("calculate_args"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("calculate_args"); - private static final TField LOGID_FIELD_DESC - = new TField("logid", TType.I32, (short) 1); - private static final TField W_FIELD_DESC - = new TField("w", TType.STRUCT, (short) 2); + private static final org.apache.thrift.protocol.TField LOGID_FIELD_DESC + = new org.apache.thrift.protocol.TField("logid", org.apache.thrift.protocol.TType.I32, (short) 1); + private static final org.apache.thrift.protocol.TField W_FIELD_DESC + = new org.apache.thrift.protocol.TField("w", org.apache.thrift.protocol.TType.STRUCT, (short) 2); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new calculate_argsStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new calculate_argsTupleSchemeFactory(); public int logid; // required - public @Nullable Work w; // required + public @org.apache.thrift.annotation.Nullable Work w; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { LOGID((short) 1, "logid"), W((short) 2, "w"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -2814,7 +2743,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // LOGID @@ -2839,7 +2768,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -2866,19 +2795,19 @@ public java.lang.String getFieldName() { // isset id assignments private static final int __LOGID_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.LOGID, - new FieldMetaData( - "logid", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); - tmpMap.put(_Fields.W, new FieldMetaData( - "w", TFieldRequirementType.DEFAULT, - new StructMetaData(TType.STRUCT, Work.class))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(calculate_args.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "logid", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.W, new org.apache.thrift.meta_data.FieldMetaData( + "w", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Work.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(calculate_args.class, metaDataMap); } public calculate_args() { @@ -2927,24 +2856,24 @@ public calculate_args setLogid(int logid) { } public void unsetLogid() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOGID_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOGID_ISSET_ID); } /** Returns true if field logid is set (has been assigned a value) and false otherwise */ public boolean isSetLogid() { - return EncodingUtils.testBit(__isset_bitfield, __LOGID_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOGID_ISSET_ID); } public void setLogidIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOGID_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOGID_ISSET_ID, value); } - @Nullable + @org.apache.thrift.annotation.Nullable public Work getW() { return this.w; } - public calculate_args setW(@Nullable Work w) { + public calculate_args setW(@org.apache.thrift.annotation.Nullable Work w) { this.w = w; return this; } @@ -2965,7 +2894,7 @@ public void setWIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case LOGID: if (value == null) { @@ -2986,7 +2915,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -3076,7 +3005,7 @@ public int compareTo(calculate_args other) { return lastComparison; } if (isSetLogid()) { - lastComparison = TBaseHelper.compareTo(this.logid, other.logid); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.logid, other.logid); if (lastComparison != 0) { return lastComparison; } @@ -3086,7 +3015,7 @@ public int compareTo(calculate_args other) { return lastComparison; } if (isSetW()) { - lastComparison = TBaseHelper.compareTo(this.w, other.w); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.w, other.w); if (lastComparison != 0) { return lastComparison; } @@ -3094,19 +3023,19 @@ public int compareTo(calculate_args other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -3131,7 +3060,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity if (w != null) { @@ -3139,63 +3068,63 @@ public void validate() throws TException { } } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class calculate_argsStandardSchemeFactory implements SchemeFactory { + private static class calculate_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public calculate_argsStandardScheme getScheme() { return new calculate_argsStandardScheme(); } } - private static class calculate_argsStandardScheme extends StandardScheme { + private static class calculate_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, calculate_args struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, calculate_args struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 1: // LOGID - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.logid = iprot.readI32(); struct.setLogidIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // W - if (schemeField.type == TType.STRUCT) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.w = new Work(); struct.w.read(iprot); struct.setWIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -3206,8 +3135,8 @@ public void read(TProtocol iprot, calculate_args struct) } @Override - public void write(TProtocol oprot, calculate_args struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, calculate_args struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -3225,20 +3154,20 @@ public void write(TProtocol oprot, calculate_args struct) } - private static class calculate_argsTupleSchemeFactory implements SchemeFactory { + private static class calculate_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public calculate_argsTupleScheme getScheme() { return new calculate_argsTupleScheme(); } } - private static class calculate_argsTupleScheme extends TupleScheme { + private static class calculate_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, calculate_args struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, calculate_args struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetLogid()) { optionals.set(0); } @@ -3255,10 +3184,10 @@ public void write(TProtocol prot, calculate_args struct) } @Override - public void read(TProtocol prot, calculate_args struct) - throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + public void read(org.apache.thrift.protocol.TProtocol prot, calculate_args struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.logid = iprot.readI32(); struct.setLogidIsSet(true); @@ -3271,42 +3200,42 @@ public void read(TProtocol prot, calculate_args struct) } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class calculate_result - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("calculate_result"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("calculate_result"); - private static final TField SUCCESS_FIELD_DESC - = new TField("success", TType.I32, (short) 0); - private static final TField OUCH_FIELD_DESC - = new TField("ouch", TType.STRUCT, (short) 1); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC + = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short) 0); + private static final org.apache.thrift.protocol.TField OUCH_FIELD_DESC + = new org.apache.thrift.protocol.TField("ouch", org.apache.thrift.protocol.TType.STRUCT, (short) 1); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new calculate_resultStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new calculate_resultTupleSchemeFactory(); public int success; // required - public @Nullable InvalidOperation ouch; // required + public @org.apache.thrift.annotation.Nullable InvalidOperation ouch; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short) 0, "success"), OUCH((short) 1, "ouch"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -3314,7 +3243,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -3339,7 +3268,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -3366,21 +3295,21 @@ public java.lang.String getFieldName() { // isset id assignments private static final int __SUCCESS_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, - new FieldMetaData( - "success", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.OUCH, - new FieldMetaData( - "ouch", TFieldRequirementType.DEFAULT, - new StructMetaData( - TType.STRUCT, InvalidOperation.class))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(calculate_result.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData( + org.apache.thrift.protocol.TType.STRUCT, InvalidOperation.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(calculate_result.class, metaDataMap); } public calculate_result() { @@ -3429,24 +3358,24 @@ public calculate_result setSuccess(int success) { } public void unsetSuccess() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); } /** Returns true if field success is set (has been assigned a value) and false otherwise */ public boolean isSetSuccess() { - return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } - @Nullable + @org.apache.thrift.annotation.Nullable public InvalidOperation getOuch() { return this.ouch; } - public calculate_result setOuch(@Nullable InvalidOperation ouch) { + public calculate_result setOuch(@org.apache.thrift.annotation.Nullable InvalidOperation ouch) { this.ouch = ouch; return this; } @@ -3467,7 +3396,7 @@ public void setOuchIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -3488,7 +3417,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -3578,7 +3507,7 @@ public int compareTo(calculate_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = TBaseHelper.compareTo(this.success, other.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -3588,7 +3517,7 @@ public int compareTo(calculate_result other) { return lastComparison; } if (isSetOuch()) { - lastComparison = TBaseHelper.compareTo(this.ouch, other.ouch); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, other.ouch); if (lastComparison != 0) { return lastComparison; } @@ -3596,18 +3525,18 @@ public int compareTo(calculate_result other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -3632,68 +3561,68 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class calculate_resultStandardSchemeFactory implements SchemeFactory { + private static class calculate_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public calculate_resultStandardScheme getScheme() { return new calculate_resultStandardScheme(); } } - private static class calculate_resultStandardScheme extends StandardScheme { + private static class calculate_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, calculate_result struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, calculate_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 1: // OUCH - if (schemeField.type == TType.STRUCT) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.ouch = new InvalidOperation(); struct.ouch.read(iprot); struct.setOuchIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -3704,8 +3633,8 @@ public void read(TProtocol iprot, calculate_result struct) } @Override - public void write(TProtocol oprot, calculate_result struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, calculate_result struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -3725,20 +3654,20 @@ public void write(TProtocol oprot, calculate_result struct) } - private static class calculate_resultTupleSchemeFactory implements SchemeFactory { + private static class calculate_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public calculate_resultTupleScheme getScheme() { return new calculate_resultTupleScheme(); } } - private static class calculate_resultTupleScheme extends TupleScheme { + private static class calculate_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, calculate_result struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, calculate_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -3755,10 +3684,10 @@ public void write(TProtocol prot, calculate_result struct) } @Override - public void read(TProtocol prot, calculate_result struct) - throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + public void read(org.apache.thrift.protocol.TProtocol prot, calculate_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); @@ -3771,32 +3700,32 @@ public void read(TProtocol prot, calculate_result struct) } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class zip_args - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("zip_args"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("zip_args"); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new zip_argsStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new zip_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new zip_argsTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -3804,7 +3733,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { default: @@ -3825,7 +3754,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -3849,12 +3778,12 @@ public java.lang.String getFieldName() { } } - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(zip_args.class, metaDataMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(zip_args.class, metaDataMap); } public zip_args() { @@ -3876,12 +3805,12 @@ public void clear() { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -3935,19 +3864,19 @@ public int compareTo(zip_args other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -3960,48 +3889,48 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class zip_argsStandardSchemeFactory implements SchemeFactory { + private static class zip_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public zip_argsStandardScheme getScheme() { return new zip_argsStandardScheme(); } } - private static class zip_argsStandardScheme extends StandardScheme { + private static class zip_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, zip_args struct) throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, zip_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -4012,7 +3941,7 @@ public void read(TProtocol iprot, zip_args struct) throws TException { } @Override - public void write(TProtocol oprot, zip_args struct) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, zip_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4022,57 +3951,57 @@ public void write(TProtocol oprot, zip_args struct) throws TException { } - private static class zip_argsTupleSchemeFactory implements SchemeFactory { + private static class zip_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public zip_argsTupleScheme getScheme() { return new zip_argsTupleScheme(); } } - private static class zip_argsTupleScheme extends TupleScheme { + private static class zip_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, zip_args struct) throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + public void write(org.apache.thrift.protocol.TProtocol prot, zip_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override - public void read(TProtocol prot, zip_args struct) throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + public void read(org.apache.thrift.protocol.TProtocol prot, zip_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class echo_args - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("echo_args"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("echo_args"); - private static final TField W_FIELD_DESC - = new TField("w", TType.STRUCT, (short) 1); + private static final org.apache.thrift.protocol.TField W_FIELD_DESC + = new org.apache.thrift.protocol.TField("w", org.apache.thrift.protocol.TType.STRUCT, (short) 1); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new echo_argsStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new echo_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new echo_argsTupleSchemeFactory(); - public @Nullable Work w; // required + public @org.apache.thrift.annotation.Nullable Work w; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { W((short) 1, "w"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4080,7 +4009,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // W @@ -4103,7 +4032,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -4128,15 +4057,15 @@ public java.lang.String getFieldName() { } // isset id assignments - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.W, new FieldMetaData( - "w", TFieldRequirementType.DEFAULT, - new StructMetaData(TType.STRUCT, Work.class))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(echo_args.class, metaDataMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.W, new org.apache.thrift.meta_data.FieldMetaData( + "w", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Work.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(echo_args.class, metaDataMap); } public echo_args() { @@ -4167,12 +4096,12 @@ public void clear() { this.w = null; } - @Nullable + @org.apache.thrift.annotation.Nullable public Work getW() { return this.w; } - public echo_args setW(@Nullable Work w) { + public echo_args setW(@org.apache.thrift.annotation.Nullable Work w) { this.w = w; return this; } @@ -4193,7 +4122,7 @@ public void setWIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case W: if (value == null) { @@ -4206,7 +4135,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -4280,7 +4209,7 @@ public int compareTo(echo_args other) { return lastComparison; } if (isSetW()) { - lastComparison = TBaseHelper.compareTo(this.w, other.w); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.w, other.w); if (lastComparison != 0) { return lastComparison; } @@ -4288,19 +4217,19 @@ public int compareTo(echo_args other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -4320,7 +4249,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity if (w != null) { @@ -4328,52 +4257,52 @@ public void validate() throws TException { } } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class echo_argsStandardSchemeFactory implements SchemeFactory { + private static class echo_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public echo_argsStandardScheme getScheme() { return new echo_argsStandardScheme(); } } - private static class echo_argsStandardScheme extends StandardScheme { + private static class echo_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, echo_args struct) throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, echo_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 1: // W - if (schemeField.type == TType.STRUCT) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.w = new Work(); struct.w.read(iprot); struct.setWIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -4384,8 +4313,8 @@ public void read(TProtocol iprot, echo_args struct) throws TException { } @Override - public void write(TProtocol oprot, echo_args struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, echo_args struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4400,19 +4329,19 @@ public void write(TProtocol oprot, echo_args struct) } - private static class echo_argsTupleSchemeFactory implements SchemeFactory { + private static class echo_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public echo_argsTupleScheme getScheme() { return new echo_argsTupleScheme(); } } - private static class echo_argsTupleScheme extends TupleScheme { + private static class echo_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, echo_args struct) throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, echo_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetW()) { optionals.set(0); } @@ -4423,9 +4352,9 @@ public void write(TProtocol prot, echo_args struct) throws TException { } @Override - public void read(TProtocol prot, echo_args struct) throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + public void read(org.apache.thrift.protocol.TProtocol prot, echo_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.w = new Work(); struct.w.read(iprot); @@ -4434,37 +4363,37 @@ public void read(TProtocol prot, echo_args struct) throws TException { } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class echo_result - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("echo_result"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("echo_result"); - private static final TField SUCCESS_FIELD_DESC - = new TField("success", TType.STRUCT, (short) 0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC + = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short) 0); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new echo_resultStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new echo_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new echo_resultTupleSchemeFactory(); - public @Nullable Work success; // required + public @org.apache.thrift.annotation.Nullable Work success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short) 0, "success"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4472,7 +4401,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -4495,7 +4424,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -4520,15 +4449,15 @@ public java.lang.String getFieldName() { } // isset id assignments - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new FieldMetaData( - "success", TFieldRequirementType.DEFAULT, - new StructMetaData(TType.STRUCT, Work.class))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(echo_result.class, metaDataMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData( + "success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Work.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(echo_result.class, metaDataMap); } public echo_result() { @@ -4559,12 +4488,12 @@ public void clear() { this.success = null; } - @Nullable + @org.apache.thrift.annotation.Nullable public Work getSuccess() { return this.success; } - public echo_result setSuccess(@Nullable Work success) { + public echo_result setSuccess(@org.apache.thrift.annotation.Nullable Work success) { this.success = success; return this; } @@ -4585,7 +4514,7 @@ public void setSuccessIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -4598,7 +4527,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -4672,7 +4601,7 @@ public int compareTo(echo_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = TBaseHelper.compareTo(this.success, other.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -4680,18 +4609,18 @@ public int compareTo(echo_result other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -4711,7 +4640,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity if (success != null) { @@ -4719,53 +4648,53 @@ public void validate() throws TException { } } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class echo_resultStandardSchemeFactory implements SchemeFactory { + private static class echo_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public echo_resultStandardScheme getScheme() { return new echo_resultStandardScheme(); } } - private static class echo_resultStandardScheme extends StandardScheme { + private static class echo_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, echo_result struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, echo_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == TType.STRUCT) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.success = new Work(); struct.success.read(iprot); struct.setSuccessIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -4776,8 +4705,8 @@ public void read(TProtocol iprot, echo_result struct) } @Override - public void write(TProtocol oprot, echo_result struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, echo_result struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4792,20 +4721,20 @@ public void write(TProtocol oprot, echo_result struct) } - private static class echo_resultTupleSchemeFactory implements SchemeFactory { + private static class echo_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public echo_resultTupleScheme getScheme() { return new echo_resultTupleScheme(); } } - private static class echo_resultTupleScheme extends TupleScheme { + private static class echo_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, echo_result struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, echo_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -4816,10 +4745,10 @@ public void write(TProtocol prot, echo_result struct) } @Override - public void read(TProtocol prot, echo_result struct) - throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + public void read(org.apache.thrift.protocol.TProtocol prot, echo_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = new Work(); struct.success.read(iprot); @@ -4828,47 +4757,47 @@ public void read(TProtocol prot, echo_result struct) } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class alltypes_args - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("alltypes_args"); - - private static final TField V1_FIELD_DESC - = new TField("v1", TType.BOOL, (short) 1); - private static final TField V2_FIELD_DESC - = new TField("v2", TType.BYTE, (short) 2); - private static final TField V3_FIELD_DESC - = new TField("v3", TType.I16, (short) 3); - private static final TField V4_FIELD_DESC - = new TField("v4", TType.I32, (short) 4); - private static final TField V5_FIELD_DESC - = new TField("v5", TType.I64, (short) 5); - private static final TField V6_FIELD_DESC - = new TField("v6", TType.DOUBLE, (short) 6); - private static final TField V7_FIELD_DESC - = new TField("v7", TType.STRING, (short) 7); - private static final TField V8_FIELD_DESC - = new TField("v8", TType.STRING, (short) 8); - private static final TField V9_FIELD_DESC - = new TField("v9", TType.STRUCT, (short) 9); - private static final TField V10_FIELD_DESC - = new TField("v10", TType.LIST, (short) 10); - private static final TField V11_FIELD_DESC - = new TField("v11", TType.SET, (short) 11); - private static final TField V12_FIELD_DESC - = new TField("v12", TType.MAP, (short) 12); - - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("alltypes_args"); + + private static final org.apache.thrift.protocol.TField V1_FIELD_DESC + = new org.apache.thrift.protocol.TField("v1", org.apache.thrift.protocol.TType.BOOL, (short) 1); + private static final org.apache.thrift.protocol.TField V2_FIELD_DESC + = new org.apache.thrift.protocol.TField("v2", org.apache.thrift.protocol.TType.BYTE, (short) 2); + private static final org.apache.thrift.protocol.TField V3_FIELD_DESC + = new org.apache.thrift.protocol.TField("v3", org.apache.thrift.protocol.TType.I16, (short) 3); + private static final org.apache.thrift.protocol.TField V4_FIELD_DESC + = new org.apache.thrift.protocol.TField("v4", org.apache.thrift.protocol.TType.I32, (short) 4); + private static final org.apache.thrift.protocol.TField V5_FIELD_DESC + = new org.apache.thrift.protocol.TField("v5", org.apache.thrift.protocol.TType.I64, (short) 5); + private static final org.apache.thrift.protocol.TField V6_FIELD_DESC + = new org.apache.thrift.protocol.TField("v6", org.apache.thrift.protocol.TType.DOUBLE, (short) 6); + private static final org.apache.thrift.protocol.TField V7_FIELD_DESC + = new org.apache.thrift.protocol.TField("v7", org.apache.thrift.protocol.TType.STRING, (short) 7); + private static final org.apache.thrift.protocol.TField V8_FIELD_DESC + = new org.apache.thrift.protocol.TField("v8", org.apache.thrift.protocol.TType.STRING, (short) 8); + private static final org.apache.thrift.protocol.TField V9_FIELD_DESC + = new org.apache.thrift.protocol.TField("v9", org.apache.thrift.protocol.TType.STRUCT, (short) 9); + private static final org.apache.thrift.protocol.TField V10_FIELD_DESC + = new org.apache.thrift.protocol.TField("v10", org.apache.thrift.protocol.TType.LIST, (short) 10); + private static final org.apache.thrift.protocol.TField V11_FIELD_DESC + = new org.apache.thrift.protocol.TField("v11", org.apache.thrift.protocol.TType.SET, (short) 11); + private static final org.apache.thrift.protocol.TField V12_FIELD_DESC + = new org.apache.thrift.protocol.TField("v12", org.apache.thrift.protocol.TType.MAP, (short) 12); + + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new alltypes_argsStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new alltypes_argsTupleSchemeFactory(); public boolean v1; // required @@ -4877,15 +4806,15 @@ public static class alltypes_args public int v4; // required public long v5; // required public double v6; // required - public @Nullable java.lang.String v7; // required - public @Nullable ByteBuffer v8; // required - public @Nullable Work v9; // required - public @Nullable List v10; // required - public @Nullable Set v11; // required - public @Nullable Map v12; // required + public @org.apache.thrift.annotation.Nullable java.lang.String v7; // required + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer v8; // required + public @org.apache.thrift.annotation.Nullable Work v9; // required + public @org.apache.thrift.annotation.Nullable java.util.List v10; // required + public @org.apache.thrift.annotation.Nullable java.util.Set v11; // required + public @org.apache.thrift.annotation.Nullable java.util.Map v12; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { V1((short) 1, "v1"), V2((short) 2, "v2"), V3((short) 3, "v3"), @@ -4899,11 +4828,11 @@ public enum _Fields implements TFieldIdEnum { V11((short) 11, "v11"), V12((short) 12, "v12"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4911,7 +4840,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // V1 @@ -4956,7 +4885,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -4988,65 +4917,65 @@ public java.lang.String getFieldName() { private static final int __V5_ISSET_ID = 4; private static final int __V6_ISSET_ID = 5; private byte __isset_bitfield = 0; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.V1, - new FieldMetaData( - "v1", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.BOOL))); + new org.apache.thrift.meta_data.FieldMetaData( + "v1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.V2, - new FieldMetaData( - "v2", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.BYTE))); + new org.apache.thrift.meta_data.FieldMetaData( + "v2", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE))); tmpMap.put(_Fields.V3, - new FieldMetaData( - "v3", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I16))); + new org.apache.thrift.meta_data.FieldMetaData( + "v3", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16))); tmpMap.put(_Fields.V4, - new FieldMetaData( - "v4", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "v4", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.V5, - new FieldMetaData( - "v5", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I64))); + new org.apache.thrift.meta_data.FieldMetaData( + "v5", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.V6, - new FieldMetaData( - "v6", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.DOUBLE))); + new org.apache.thrift.meta_data.FieldMetaData( + "v6", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); tmpMap.put(_Fields.V7, - new FieldMetaData( - "v7", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING))); + new org.apache.thrift.meta_data.FieldMetaData( + "v7", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.V8, - new FieldMetaData( - "v8", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING, true))); - tmpMap.put(_Fields.V9, new FieldMetaData( - "v9", TFieldRequirementType.DEFAULT, - new StructMetaData(TType.STRUCT, Work.class))); + new org.apache.thrift.meta_data.FieldMetaData( + "v8", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING, true))); + tmpMap.put(_Fields.V9, new org.apache.thrift.meta_data.FieldMetaData( + "v9", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Work.class))); tmpMap.put(_Fields.V10, - new FieldMetaData( - "v10", TFieldRequirementType.DEFAULT, - new ListMetaData( - TType.LIST, - new FieldValueMetaData(TType.I32)))); - tmpMap.put(_Fields.V11, new FieldMetaData( - "v11", TFieldRequirementType.DEFAULT, - new SetMetaData( - TType.SET, - new FieldValueMetaData(TType.STRING)))); + new org.apache.thrift.meta_data.FieldMetaData( + "v10", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData( + org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); + tmpMap.put(_Fields.V11, new org.apache.thrift.meta_data.FieldMetaData( + "v11", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.SetMetaData( + org.apache.thrift.protocol.TType.SET, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); tmpMap.put(_Fields.V12, - new FieldMetaData( - "v12", TFieldRequirementType.DEFAULT, - new MapMetaData( - TType.MAP, - new FieldValueMetaData(TType.STRING), - new FieldValueMetaData(TType.I64)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(alltypes_args.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "v12", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.MapMetaData( + org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(alltypes_args.class, metaDataMap); } public alltypes_args() { @@ -5060,11 +4989,11 @@ public alltypes_args( long v5, double v6, java.lang.String v7, - ByteBuffer v8, + java.nio.ByteBuffer v8, Work v9, - List v10, - Set v11, - Map v12) { + java.util.List v10, + java.util.Set v11, + java.util.Map v12) { this(); this.v1 = v1; setV1IsSet(true); @@ -5079,7 +5008,7 @@ public alltypes_args( this.v6 = v6; setV6IsSet(true); this.v7 = v7; - this.v8 = TBaseHelper.copyBinary(v8); + this.v8 = org.apache.thrift.TBaseHelper.copyBinary(v8); this.v9 = v9; this.v10 = v10; this.v11 = v11; @@ -5101,22 +5030,22 @@ public alltypes_args(alltypes_args other) { this.v7 = other.v7; } if (other.isSetV8()) { - this.v8 = TBaseHelper.copyBinary(other.v8); + this.v8 = org.apache.thrift.TBaseHelper.copyBinary(other.v8); } if (other.isSetV9()) { this.v9 = new Work(other.v9); } if (other.isSetV10()) { - List __this__v10 = new ArrayList(other.v10); + java.util.List __this__v10 = new java.util.ArrayList(other.v10); this.v10 = __this__v10; } if (other.isSetV11()) { - Set __this__v11 = new HashSet(other.v11); + java.util.Set __this__v11 = new java.util.HashSet(other.v11); this.v11 = __this__v11; } if (other.isSetV12()) { - Map __this__v12 - = new HashMap(other.v12); + java.util.Map __this__v12 + = new java.util.HashMap(other.v12); this.v12 = __this__v12; } } @@ -5159,16 +5088,16 @@ public alltypes_args setV1(boolean v1) { } public void unsetV1() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __V1_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V1_ISSET_ID); } /** Returns true if field v1 is set (has been assigned a value) and false otherwise */ public boolean isSetV1() { - return EncodingUtils.testBit(__isset_bitfield, __V1_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V1_ISSET_ID); } public void setV1IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V1_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V1_ISSET_ID, value); } public byte getV2() { @@ -5182,16 +5111,16 @@ public alltypes_args setV2(byte v2) { } public void unsetV2() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __V2_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V2_ISSET_ID); } /** Returns true if field v2 is set (has been assigned a value) and false otherwise */ public boolean isSetV2() { - return EncodingUtils.testBit(__isset_bitfield, __V2_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V2_ISSET_ID); } public void setV2IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V2_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V2_ISSET_ID, value); } public short getV3() { @@ -5205,16 +5134,16 @@ public alltypes_args setV3(short v3) { } public void unsetV3() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __V3_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V3_ISSET_ID); } /** Returns true if field v3 is set (has been assigned a value) and false otherwise */ public boolean isSetV3() { - return EncodingUtils.testBit(__isset_bitfield, __V3_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V3_ISSET_ID); } public void setV3IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V3_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V3_ISSET_ID, value); } public int getV4() { @@ -5228,16 +5157,16 @@ public alltypes_args setV4(int v4) { } public void unsetV4() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __V4_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V4_ISSET_ID); } /** Returns true if field v4 is set (has been assigned a value) and false otherwise */ public boolean isSetV4() { - return EncodingUtils.testBit(__isset_bitfield, __V4_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V4_ISSET_ID); } public void setV4IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V4_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V4_ISSET_ID, value); } public long getV5() { @@ -5251,16 +5180,16 @@ public alltypes_args setV5(long v5) { } public void unsetV5() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __V5_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V5_ISSET_ID); } /** Returns true if field v5 is set (has been assigned a value) and false otherwise */ public boolean isSetV5() { - return EncodingUtils.testBit(__isset_bitfield, __V5_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V5_ISSET_ID); } public void setV5IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V5_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V5_ISSET_ID, value); } public double getV6() { @@ -5274,24 +5203,24 @@ public alltypes_args setV6(double v6) { } public void unsetV6() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __V6_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V6_ISSET_ID); } /** Returns true if field v6 is set (has been assigned a value) and false otherwise */ public boolean isSetV6() { - return EncodingUtils.testBit(__isset_bitfield, __V6_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V6_ISSET_ID); } public void setV6IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V6_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V6_ISSET_ID, value); } - @Nullable + @org.apache.thrift.annotation.Nullable public java.lang.String getV7() { return this.v7; } - public alltypes_args setV7(@Nullable java.lang.String v7) { + public alltypes_args setV7(@org.apache.thrift.annotation.Nullable java.lang.String v7) { this.v7 = v7; return this; } @@ -5312,21 +5241,21 @@ public void setV7IsSet(boolean value) { } public byte[] getV8() { - setV8(TBaseHelper.rightSize(v8)); + setV8(org.apache.thrift.TBaseHelper.rightSize(v8)); return v8 == null ? null : v8.array(); } - public ByteBuffer bufferForV8() { - return TBaseHelper.copyBinary(v8); + public java.nio.ByteBuffer bufferForV8() { + return org.apache.thrift.TBaseHelper.copyBinary(v8); } public alltypes_args setV8(byte[] v8) { - this.v8 = v8 == null ? (ByteBuffer) null : ByteBuffer.wrap(v8.clone()); + this.v8 = v8 == null ? (java.nio.ByteBuffer) null : java.nio.ByteBuffer.wrap(v8.clone()); return this; } - public alltypes_args setV8(@Nullable ByteBuffer v8) { - this.v8 = TBaseHelper.copyBinary(v8); + public alltypes_args setV8(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer v8) { + this.v8 = org.apache.thrift.TBaseHelper.copyBinary(v8); return this; } @@ -5345,12 +5274,12 @@ public void setV8IsSet(boolean value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable public Work getV9() { return this.v9; } - public alltypes_args setV9(@Nullable Work v9) { + public alltypes_args setV9(@org.apache.thrift.annotation.Nullable Work v9) { this.v9 = v9; return this; } @@ -5374,24 +5303,24 @@ public int getV10Size() { return (this.v10 == null) ? 0 : this.v10.size(); } - @Nullable - public Iterator getV10Iterator() { + @org.apache.thrift.annotation.Nullable + public java.util.Iterator getV10Iterator() { return (this.v10 == null) ? null : this.v10.iterator(); } public void addToV10(int elem) { if (this.v10 == null) { - this.v10 = new ArrayList(); + this.v10 = new java.util.ArrayList(); } this.v10.add(elem); } - @Nullable - public List getV10() { + @org.apache.thrift.annotation.Nullable + public java.util.List getV10() { return this.v10; } - public alltypes_args setV10(@Nullable List v10) { + public alltypes_args setV10(@org.apache.thrift.annotation.Nullable java.util.List v10) { this.v10 = v10; return this; } @@ -5415,24 +5344,24 @@ public int getV11Size() { return (this.v11 == null) ? 0 : this.v11.size(); } - @Nullable - public Iterator getV11Iterator() { + @org.apache.thrift.annotation.Nullable + public java.util.Iterator getV11Iterator() { return (this.v11 == null) ? null : this.v11.iterator(); } public void addToV11(java.lang.String elem) { if (this.v11 == null) { - this.v11 = new HashSet(); + this.v11 = new java.util.HashSet(); } this.v11.add(elem); } - @Nullable - public Set getV11() { + @org.apache.thrift.annotation.Nullable + public java.util.Set getV11() { return this.v11; } - public alltypes_args setV11(@Nullable Set v11) { + public alltypes_args setV11(@org.apache.thrift.annotation.Nullable java.util.Set v11) { this.v11 = v11; return this; } @@ -5458,18 +5387,18 @@ public int getV12Size() { public void putToV12(java.lang.String key, long val) { if (this.v12 == null) { - this.v12 = new HashMap(); + this.v12 = new java.util.HashMap(); } this.v12.put(key, val); } - @Nullable - public Map getV12() { + @org.apache.thrift.annotation.Nullable + public java.util.Map getV12() { return this.v12; } public alltypes_args setV12( - @Nullable Map v12) { + @org.apache.thrift.annotation.Nullable java.util.Map v12) { this.v12 = v12; return this; } @@ -5490,7 +5419,7 @@ public void setV12IsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case V1: if (value == null) { @@ -5555,7 +5484,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { if (value instanceof byte[]) { setV8((byte[]) value); } else { - setV8((ByteBuffer) value); + setV8((java.nio.ByteBuffer) value); } } break; @@ -5572,7 +5501,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { if (value == null) { unsetV10(); } else { - setV10((List) value); + setV10((java.util.List) value); } break; @@ -5580,7 +5509,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { if (value == null) { unsetV11(); } else { - setV11((Set) value); + setV11((java.util.Set) value); } break; @@ -5588,14 +5517,14 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { if (value == null) { unsetV12(); } else { - setV12((Map) value); + setV12((java.util.Map) value); } break; } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -5811,9 +5740,9 @@ public int hashCode() { hashCode = hashCode * 8191 + v4; - hashCode = hashCode * 8191 + TBaseHelper.hashCode(v5); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(v5); - hashCode = hashCode * 8191 + TBaseHelper.hashCode(v6); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(v6); hashCode = hashCode * 8191 + ((isSetV7()) ? 131071 : 524287); if (isSetV7()) @@ -5855,7 +5784,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV1()) { - lastComparison = TBaseHelper.compareTo(this.v1, other.v1); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v1, other.v1); if (lastComparison != 0) { return lastComparison; } @@ -5865,7 +5794,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV2()) { - lastComparison = TBaseHelper.compareTo(this.v2, other.v2); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v2, other.v2); if (lastComparison != 0) { return lastComparison; } @@ -5875,7 +5804,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV3()) { - lastComparison = TBaseHelper.compareTo(this.v3, other.v3); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v3, other.v3); if (lastComparison != 0) { return lastComparison; } @@ -5885,7 +5814,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV4()) { - lastComparison = TBaseHelper.compareTo(this.v4, other.v4); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v4, other.v4); if (lastComparison != 0) { return lastComparison; } @@ -5895,7 +5824,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV5()) { - lastComparison = TBaseHelper.compareTo(this.v5, other.v5); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v5, other.v5); if (lastComparison != 0) { return lastComparison; } @@ -5905,7 +5834,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV6()) { - lastComparison = TBaseHelper.compareTo(this.v6, other.v6); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v6, other.v6); if (lastComparison != 0) { return lastComparison; } @@ -5915,7 +5844,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV7()) { - lastComparison = TBaseHelper.compareTo(this.v7, other.v7); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v7, other.v7); if (lastComparison != 0) { return lastComparison; } @@ -5925,7 +5854,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV8()) { - lastComparison = TBaseHelper.compareTo(this.v8, other.v8); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v8, other.v8); if (lastComparison != 0) { return lastComparison; } @@ -5935,7 +5864,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV9()) { - lastComparison = TBaseHelper.compareTo(this.v9, other.v9); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v9, other.v9); if (lastComparison != 0) { return lastComparison; } @@ -5945,7 +5874,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV10()) { - lastComparison = TBaseHelper.compareTo(this.v10, other.v10); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v10, other.v10); if (lastComparison != 0) { return lastComparison; } @@ -5955,7 +5884,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV11()) { - lastComparison = TBaseHelper.compareTo(this.v11, other.v11); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v11, other.v11); if (lastComparison != 0) { return lastComparison; } @@ -5965,7 +5894,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV12()) { - lastComparison = TBaseHelper.compareTo(this.v12, other.v12); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v12, other.v12); if (lastComparison != 0) { return lastComparison; } @@ -5973,19 +5902,19 @@ public int compareTo(alltypes_args other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -6037,7 +5966,7 @@ public java.lang.String toString() { if (this.v8 == null) { sb.append("null"); } else { - TBaseHelper.toString(this.v8, sb); + org.apache.thrift.TBaseHelper.toString(this.v8, sb); } first = false; if (!first) @@ -6080,7 +6009,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity if (v9 != null) { @@ -6088,122 +6017,122 @@ public void validate() throws TException { } } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class alltypes_argsStandardSchemeFactory implements SchemeFactory { + private static class alltypes_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public alltypes_argsStandardScheme getScheme() { return new alltypes_argsStandardScheme(); } } - private static class alltypes_argsStandardScheme extends StandardScheme { + private static class alltypes_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, alltypes_args struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_args struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 1: // V1 - if (schemeField.type == TType.BOOL) { + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.v1 = iprot.readBool(); struct.setV1IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // V2 - if (schemeField.type == TType.BYTE) { + if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) { struct.v2 = iprot.readByte(); struct.setV2IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 3: // V3 - if (schemeField.type == TType.I16) { + if (schemeField.type == org.apache.thrift.protocol.TType.I16) { struct.v3 = iprot.readI16(); struct.setV3IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 4: // V4 - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.v4 = iprot.readI32(); struct.setV4IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 5: // V5 - if (schemeField.type == TType.I64) { + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.v5 = iprot.readI64(); struct.setV5IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 6: // V6 - if (schemeField.type == TType.DOUBLE) { + if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) { struct.v6 = iprot.readDouble(); struct.setV6IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 7: // V7 - if (schemeField.type == TType.STRING) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.v7 = iprot.readString(); struct.setV7IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 8: // V8 - if (schemeField.type == TType.STRING) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.v8 = iprot.readBinary(); struct.setV8IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 9: // V9 - if (schemeField.type == TType.STRUCT) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.v9 = new Work(); struct.v9.read(iprot); struct.setV9IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 10: // V10 - if (schemeField.type == TType.LIST) { + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - TList _list0 = iprot.readListBegin(); - struct.v10 = new ArrayList(_list0.size); + org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); + struct.v10 = new java.util.ArrayList(_list0.size); int _elem1; for (int _i2 = 0; _i2 < _list0.size; ++_i2) { _elem1 = iprot.readI32(); @@ -6213,15 +6142,15 @@ public void read(TProtocol iprot, alltypes_args struct) } struct.setV10IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 11: // V11 - if (schemeField.type == TType.SET) { + if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - TSet _set3 = iprot.readSetBegin(); - struct.v11 = new HashSet(2 * _set3.size); - @Nullable + org.apache.thrift.protocol.TSet _set3 = iprot.readSetBegin(); + struct.v11 = new java.util.HashSet(2 * _set3.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem4; for (int _i5 = 0; _i5 < _set3.size; ++_i5) { _elem4 = iprot.readString(); @@ -6231,15 +6160,15 @@ public void read(TProtocol iprot, alltypes_args struct) } struct.setV11IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 12: // V12 - if (schemeField.type == TType.MAP) { + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - TMap _map6 = iprot.readMapBegin(); - struct.v12 = new HashMap(2 * _map6.size); - @Nullable + org.apache.thrift.protocol.TMap _map6 = iprot.readMapBegin(); + struct.v12 = new java.util.HashMap(2 * _map6.size); + @org.apache.thrift.annotation.Nullable java.lang.String _key7; long _val8; for (int _i9 = 0; _i9 < _map6.size; ++_i9) { @@ -6251,11 +6180,11 @@ public void read(TProtocol iprot, alltypes_args struct) } struct.setV12IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -6266,8 +6195,8 @@ public void read(TProtocol iprot, alltypes_args struct) } @Override - public void write(TProtocol oprot, alltypes_args struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_args struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -6308,7 +6237,7 @@ public void write(TProtocol oprot, alltypes_args struct) oprot.writeFieldBegin(V10_FIELD_DESC); { oprot.writeListBegin( - new TList(TType.I32, struct.v10.size())); + new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.v10.size())); for (int _iter10 : struct.v10) { oprot.writeI32(_iter10); } @@ -6319,8 +6248,8 @@ public void write(TProtocol oprot, alltypes_args struct) if (struct.v11 != null) { oprot.writeFieldBegin(V11_FIELD_DESC); { - oprot.writeSetBegin(new TSet( - TType.STRING, struct.v11.size())); + oprot.writeSetBegin(new org.apache.thrift.protocol.TSet( + org.apache.thrift.protocol.TType.STRING, struct.v11.size())); for (java.lang.String _iter11 : struct.v11) { oprot.writeString(_iter11); } @@ -6331,10 +6260,10 @@ public void write(TProtocol oprot, alltypes_args struct) if (struct.v12 != null) { oprot.writeFieldBegin(V12_FIELD_DESC); { - oprot.writeMapBegin(new TMap( - TType.STRING, TType.I64, + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap( + org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.v12.size())); - for (Map.Entry _iter12 : struct.v12.entrySet()) { + for (java.util.Map.Entry _iter12 : struct.v12.entrySet()) { oprot.writeString(_iter12.getKey()); oprot.writeI64(_iter12.getValue()); } @@ -6348,20 +6277,20 @@ public void write(TProtocol oprot, alltypes_args struct) } - private static class alltypes_argsTupleSchemeFactory implements SchemeFactory { + private static class alltypes_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public alltypes_argsTupleScheme getScheme() { return new alltypes_argsTupleScheme(); } } - private static class alltypes_argsTupleScheme extends TupleScheme { + private static class alltypes_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, alltypes_args struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, alltypes_args struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetV1()) { optionals.set(0); } @@ -6445,7 +6374,7 @@ public void write(TProtocol prot, alltypes_args struct) if (struct.isSetV12()) { { oprot.writeI32(struct.v12.size()); - for (Map.Entry _iter15 : struct.v12.entrySet()) { + for (java.util.Map.Entry _iter15 : struct.v12.entrySet()) { oprot.writeString(_iter15.getKey()); oprot.writeI64(_iter15.getValue()); } @@ -6454,10 +6383,10 @@ public void write(TProtocol prot, alltypes_args struct) } @Override - public void read(TProtocol prot, alltypes_args struct) - throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(12); + public void read(org.apache.thrift.protocol.TProtocol prot, alltypes_args struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.v1 = iprot.readBool(); struct.setV1IsSet(true); @@ -6497,8 +6426,8 @@ public void read(TProtocol prot, alltypes_args struct) } if (incoming.get(9)) { { - TList _list16 = iprot.readListBegin(TType.I32); - struct.v10 = new ArrayList(_list16.size); + org.apache.thrift.protocol.TList _list16 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32); + struct.v10 = new java.util.ArrayList(_list16.size); int _elem17; for (int _i18 = 0; _i18 < _list16.size; ++_i18) { _elem17 = iprot.readI32(); @@ -6509,9 +6438,9 @@ public void read(TProtocol prot, alltypes_args struct) } if (incoming.get(10)) { { - TSet _set19 = iprot.readSetBegin(TType.STRING); - struct.v11 = new HashSet(2 * _set19.size); - @Nullable + org.apache.thrift.protocol.TSet _set19 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING); + struct.v11 = new java.util.HashSet(2 * _set19.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem20; for (int _i21 = 0; _i21 < _set19.size; ++_i21) { _elem20 = iprot.readString(); @@ -6522,10 +6451,10 @@ public void read(TProtocol prot, alltypes_args struct) } if (incoming.get(11)) { { - TMap _map22 = iprot.readMapBegin(TType.STRING, - TType.I64); - struct.v12 = new HashMap(2 * _map22.size); - @Nullable + org.apache.thrift.protocol.TMap _map22 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, + org.apache.thrift.protocol.TType.I64); + struct.v12 = new java.util.HashMap(2 * _map22.size); + @org.apache.thrift.annotation.Nullable java.lang.String _key23; long _val24; for (int _i25 = 0; _i25 < _map22.size; ++_i25) { @@ -6539,38 +6468,38 @@ public void read(TProtocol prot, alltypes_args struct) } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class alltypes_result - implements TBase, Serializable, Cloneable, + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("alltypes_result"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("alltypes_result"); - private static final TField SUCCESS_FIELD_DESC - = new TField("success", TType.I32, (short) 0); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC + = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short) 0); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new alltypes_resultStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new alltypes_resultTupleSchemeFactory(); public int success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short) 0, "success"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -6578,7 +6507,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -6601,7 +6530,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -6628,16 +6557,16 @@ public java.lang.String getFieldName() { // isset id assignments private static final int __SUCCESS_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, - new FieldMetaData( - "success", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(alltypes_result.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(alltypes_result.class, metaDataMap); } public alltypes_result() { @@ -6680,20 +6609,20 @@ public alltypes_result setSuccess(int success) { } public void unsetSuccess() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); } /** Returns true if field success is set (has been assigned a value) and false otherwise */ public boolean isSetSuccess() { - return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -6706,7 +6635,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -6778,7 +6707,7 @@ public int compareTo(alltypes_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = TBaseHelper.compareTo(this.success, other.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -6786,18 +6715,18 @@ public int compareTo(alltypes_result other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -6813,59 +6742,59 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class alltypes_resultStandardSchemeFactory implements SchemeFactory { + private static class alltypes_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public alltypes_resultStandardScheme getScheme() { return new alltypes_resultStandardScheme(); } } - private static class alltypes_resultStandardScheme extends StandardScheme { + private static class alltypes_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, alltypes_result struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -6876,8 +6805,8 @@ public void read(TProtocol iprot, alltypes_result struct) } @Override - public void write(TProtocol oprot, alltypes_result struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_result struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -6892,20 +6821,20 @@ public void write(TProtocol oprot, alltypes_result struct) } - private static class alltypes_resultTupleSchemeFactory implements SchemeFactory { + private static class alltypes_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public alltypes_resultTupleScheme getScheme() { return new alltypes_resultTupleScheme(); } } - private static class alltypes_resultTupleScheme extends TupleScheme { + private static class alltypes_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, alltypes_result struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, alltypes_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -6916,10 +6845,10 @@ public void write(TProtocol prot, alltypes_result struct) } @Override - public void read(TProtocol prot, alltypes_result struct) - throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + public void read(org.apache.thrift.protocol.TProtocol prot, alltypes_result struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); @@ -6927,8 +6856,8 @@ public void read(TProtocol prot, alltypes_result struct) } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java index dab40c102f4e6..a06b9530969fc 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java @@ -22,74 +22,39 @@ */ package org.apache.camel.component.thrift.generated; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.BitSet; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; - -import jakarta.annotation.Generated; - -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TBase; -import org.apache.thrift.TBaseHelper; -import org.apache.thrift.TException; -import org.apache.thrift.TFieldIdEnum; -import org.apache.thrift.TFieldRequirementType; -import org.apache.thrift.annotation.Nullable; -import org.apache.thrift.meta_data.FieldMetaData; -import org.apache.thrift.meta_data.FieldValueMetaData; -import org.apache.thrift.protocol.TCompactProtocol; -import org.apache.thrift.protocol.TField; -import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.protocol.TProtocolUtil; -import org.apache.thrift.protocol.TStruct; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TType; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.transport.TIOStreamTransport; - /** * Structs can also be exceptions, if they are nasty. */ @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) -@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") -public class InvalidOperation extends TException - implements TBase, Serializable, Cloneable, +@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public class InvalidOperation extends org.apache.thrift.TException + implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC - = new TStruct("InvalidOperation"); + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC + = new org.apache.thrift.protocol.TStruct("InvalidOperation"); - private static final TField WHAT_OP_FIELD_DESC - = new TField("whatOp", TType.I32, (short) 1); - private static final TField WHY_FIELD_DESC - = new TField("why", TType.STRING, (short) 2); + private static final org.apache.thrift.protocol.TField WHAT_OP_FIELD_DESC + = new org.apache.thrift.protocol.TField("whatOp", org.apache.thrift.protocol.TType.I32, (short) 1); + private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC + = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short) 2); - private static final SchemeFactory STANDARD_SCHEME_FACTORY + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new InvalidOperationStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new InvalidOperationTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new InvalidOperationTupleSchemeFactory(); public int whatOp; // required - public @Nullable java.lang.String why; // required + public @org.apache.thrift.annotation.Nullable java.lang.String why; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { WHAT_OP((short) 1, "whatOp"), WHY((short) 2, "why"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -97,7 +62,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // WHAT_OP @@ -122,7 +87,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -149,20 +114,20 @@ public java.lang.String getFieldName() { // isset id assignments private static final int __WHATOP_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.WHAT_OP, - new FieldMetaData( - "whatOp", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "whatOp", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.WHY, - new FieldMetaData( - "why", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(InvalidOperation.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "why", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidOperation.class, metaDataMap); } public InvalidOperation() { @@ -211,24 +176,24 @@ public InvalidOperation setWhatOp(int whatOp) { } public void unsetWhatOp() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WHATOP_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WHATOP_ISSET_ID); } /** Returns true if field whatOp is set (has been assigned a value) and false otherwise */ public boolean isSetWhatOp() { - return EncodingUtils.testBit(__isset_bitfield, __WHATOP_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WHATOP_ISSET_ID); } public void setWhatOpIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WHATOP_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WHATOP_ISSET_ID, value); } - @Nullable + @org.apache.thrift.annotation.Nullable public java.lang.String getWhy() { return this.why; } - public InvalidOperation setWhy(@Nullable java.lang.String why) { + public InvalidOperation setWhy(@org.apache.thrift.annotation.Nullable java.lang.String why) { this.why = why; return this; } @@ -249,7 +214,7 @@ public void setWhyIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case WHAT_OP: if (value == null) { @@ -270,7 +235,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -360,7 +325,7 @@ public int compareTo(InvalidOperation other) { return lastComparison; } if (isSetWhatOp()) { - lastComparison = TBaseHelper.compareTo(this.whatOp, other.whatOp); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.whatOp, other.whatOp); if (lastComparison != 0) { return lastComparison; } @@ -370,7 +335,7 @@ public int compareTo(InvalidOperation other) { return lastComparison; } if (isSetWhy()) { - lastComparison = TBaseHelper.compareTo(this.why, other.why); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why); if (lastComparison != 0) { return lastComparison; } @@ -378,19 +343,19 @@ public int compareTo(InvalidOperation other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -415,67 +380,67 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class InvalidOperationStandardSchemeFactory implements SchemeFactory { + private static class InvalidOperationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public InvalidOperationStandardScheme getScheme() { return new InvalidOperationStandardScheme(); } } - private static class InvalidOperationStandardScheme extends StandardScheme { + private static class InvalidOperationStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, InvalidOperation struct) - throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidOperation struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 1: // WHAT_OP - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.whatOp = iprot.readI32(); struct.setWhatOpIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // WHY - if (schemeField.type == TType.STRING) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.why = iprot.readString(); struct.setWhyIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -486,8 +451,8 @@ public void read(TProtocol iprot, InvalidOperation struct) } @Override - public void write(TProtocol oprot, InvalidOperation struct) - throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidOperation struct) + throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -505,20 +470,20 @@ public void write(TProtocol oprot, InvalidOperation struct) } - private static class InvalidOperationTupleSchemeFactory implements SchemeFactory { + private static class InvalidOperationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public InvalidOperationTupleScheme getScheme() { return new InvalidOperationTupleScheme(); } } - private static class InvalidOperationTupleScheme extends TupleScheme { + private static class InvalidOperationTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, InvalidOperation struct) - throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, InvalidOperation struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetWhatOp()) { optionals.set(0); } @@ -535,10 +500,10 @@ public void write(TProtocol prot, InvalidOperation struct) } @Override - public void read(TProtocol prot, InvalidOperation struct) - throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + public void read(org.apache.thrift.protocol.TProtocol prot, InvalidOperation struct) + throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.whatOp = iprot.readI32(); struct.setWhatOpIsSet(true); @@ -550,8 +515,8 @@ public void read(TProtocol prot, InvalidOperation struct) } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java index d4fb124d10c6d..7c722d49b0a0c 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java @@ -22,17 +22,12 @@ */ package org.apache.camel.component.thrift.generated; -import jakarta.annotation.Generated; - -import org.apache.thrift.TEnum; -import org.apache.thrift.annotation.Nullable; - /** * You can define enums, which are just 32 bit integers. Values are optional and start at 1 if not supplied, C style * again. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") -public enum Operation implements TEnum { +@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public enum Operation implements org.apache.thrift.TEnum { ADD(1), SUBTRACT(2), MULTIPLY(3), @@ -57,7 +52,7 @@ public int getValue() { * * @return null if the value is not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static Operation findByValue(int value) { switch (value) { case 1: diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java index cd3ae8c2d664d..453aa979d36d2 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java @@ -22,42 +22,6 @@ */ package org.apache.camel.component.thrift.generated; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.BitSet; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; - -import jakarta.annotation.Generated; - -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TBase; -import org.apache.thrift.TBaseHelper; -import org.apache.thrift.TException; -import org.apache.thrift.TFieldIdEnum; -import org.apache.thrift.TFieldRequirementType; -import org.apache.thrift.annotation.Nullable; -import org.apache.thrift.meta_data.EnumMetaData; -import org.apache.thrift.meta_data.FieldMetaData; -import org.apache.thrift.meta_data.FieldValueMetaData; -import org.apache.thrift.protocol.TCompactProtocol; -import org.apache.thrift.protocol.TField; -import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.protocol.TProtocolUtil; -import org.apache.thrift.protocol.TStruct; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TType; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.transport.TIOStreamTransport; - /** * Structs are the basic complex data structures. They are comprised of fields which each have an integer identifier, a * type, a symbolic name, and an optional default value. @@ -66,21 +30,21 @@ * set. Note that this requires some manual management in some languages. */ @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) -@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") -public class Work implements TBase, Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC = new TStruct("Work"); - - private static final TField NUM1_FIELD_DESC - = new TField("num1", TType.I32, (short) 1); - private static final TField NUM2_FIELD_DESC - = new TField("num2", TType.I32, (short) 2); - private static final TField OP_FIELD_DESC - = new TField("op", TType.I32, (short) 3); - private static final TField COMMENT_FIELD_DESC - = new TField("comment", TType.STRING, (short) 4); - - private static final SchemeFactory STANDARD_SCHEME_FACTORY = new WorkStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new WorkTupleSchemeFactory(); +@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public class Work implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Work"); + + private static final org.apache.thrift.protocol.TField NUM1_FIELD_DESC + = new org.apache.thrift.protocol.TField("num1", org.apache.thrift.protocol.TType.I32, (short) 1); + private static final org.apache.thrift.protocol.TField NUM2_FIELD_DESC + = new org.apache.thrift.protocol.TField("num2", org.apache.thrift.protocol.TType.I32, (short) 2); + private static final org.apache.thrift.protocol.TField OP_FIELD_DESC + = new org.apache.thrift.protocol.TField("op", org.apache.thrift.protocol.TType.I32, (short) 3); + private static final org.apache.thrift.protocol.TField COMMENT_FIELD_DESC + = new org.apache.thrift.protocol.TField("comment", org.apache.thrift.protocol.TType.STRING, (short) 4); + + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkTupleSchemeFactory(); public int num1; // required public int num2; // required @@ -88,11 +52,11 @@ public class Work implements TBase, Serializable, Cloneable, * * @see Operation */ - public @Nullable Operation op; // required - public @Nullable java.lang.String comment; // optional + public @org.apache.thrift.annotation.Nullable Operation op; // required + public @org.apache.thrift.annotation.Nullable java.lang.String comment; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NUM1((short) 1, "num1"), NUM2((short) 2, "num2"), /** @@ -102,11 +66,11 @@ public enum _Fields implements TFieldIdEnum { OP((short) 3, "op"), COMMENT((short) 4, "comment"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -114,7 +78,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // NUM1 @@ -143,7 +107,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -172,28 +136,28 @@ public java.lang.String getFieldName() { private static final int __NUM2_ISSET_ID = 1; private byte __isset_bitfield = 0; private static final _Fields optionals[] = { _Fields.COMMENT }; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.NUM1, - new FieldMetaData( - "num1", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "num1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.NUM2, - new FieldMetaData( - "num2", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "num2", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.OP, - new FieldMetaData( - "op", TFieldRequirementType.DEFAULT, - new EnumMetaData(TType.ENUM, Operation.class))); + new org.apache.thrift.meta_data.FieldMetaData( + "op", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, Operation.class))); tmpMap.put(_Fields.COMMENT, - new FieldMetaData( - "comment", TFieldRequirementType.OPTIONAL, - new FieldValueMetaData(TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(Work.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "comment", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Work.class, metaDataMap); } public Work() { @@ -254,16 +218,16 @@ public Work setNum1(int num1) { } public void unsetNum1() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); } /** Returns true if field num1 is set (has been assigned a value) and false otherwise */ public boolean isSetNum1() { - return EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); } public void setNum1IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); } public int getNum2() { @@ -277,23 +241,23 @@ public Work setNum2(int num2) { } public void unsetNum2() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); } /** Returns true if field num2 is set (has been assigned a value) and false otherwise */ public boolean isSetNum2() { - return EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); } public void setNum2IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); } /** * * @see Operation */ - @Nullable + @org.apache.thrift.annotation.Nullable public Operation getOp() { return this.op; } @@ -302,7 +266,7 @@ public Operation getOp() { * * @see Operation */ - public Work setOp(@Nullable Operation op) { + public Work setOp(@org.apache.thrift.annotation.Nullable Operation op) { this.op = op; return this; } @@ -322,12 +286,12 @@ public void setOpIsSet(boolean value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable public java.lang.String getComment() { return this.comment; } - public Work setComment(@Nullable java.lang.String comment) { + public Work setComment(@org.apache.thrift.annotation.Nullable java.lang.String comment) { this.comment = comment; return this; } @@ -348,7 +312,7 @@ public void setCommentIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case NUM1: if (value == null) { @@ -385,7 +349,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -509,7 +473,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum1()) { - lastComparison = TBaseHelper.compareTo(this.num1, other.num1); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num1, other.num1); if (lastComparison != 0) { return lastComparison; } @@ -519,7 +483,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum2()) { - lastComparison = TBaseHelper.compareTo(this.num2, other.num2); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num2, other.num2); if (lastComparison != 0) { return lastComparison; } @@ -529,7 +493,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetOp()) { - lastComparison = TBaseHelper.compareTo(this.op, other.op); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, other.op); if (lastComparison != 0) { return lastComparison; } @@ -539,7 +503,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetComment()) { - lastComparison = TBaseHelper.compareTo(this.comment, other.comment); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, other.comment); if (lastComparison != 0) { return lastComparison; } @@ -547,19 +511,19 @@ public int compareTo(Work other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -600,82 +564,82 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class WorkStandardSchemeFactory implements SchemeFactory { + private static class WorkStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public WorkStandardScheme getScheme() { return new WorkStandardScheme(); } } - private static class WorkStandardScheme extends StandardScheme { + private static class WorkStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, Work struct) throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, Work struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 1: // NUM1 - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // NUM2 - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.num2 = iprot.readI32(); struct.setNum2IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 3: // OP - if (schemeField.type == TType.I32) { - struct.op = Operation.findByValue(iprot.readI32()); + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.op = org.apache.camel.component.thrift.generated.Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 4: // COMMENT - if (schemeField.type == TType.STRING) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.comment = iprot.readString(); struct.setCommentIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -686,7 +650,7 @@ public void read(TProtocol iprot, Work struct) throws TException { } @Override - public void write(TProtocol oprot, Work struct) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, Work struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -714,19 +678,19 @@ public void write(TProtocol oprot, Work struct) throws TException { } - private static class WorkTupleSchemeFactory implements SchemeFactory { + private static class WorkTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public WorkTupleScheme getScheme() { return new WorkTupleScheme(); } } - private static class WorkTupleScheme extends TupleScheme { + private static class WorkTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, Work struct) throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, Work struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetNum1()) { optionals.set(0); } @@ -755,9 +719,9 @@ public void write(TProtocol prot, Work struct) throws TException { } @Override - public void read(TProtocol prot, Work struct) throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + public void read(org.apache.thrift.protocol.TProtocol prot, Work struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); @@ -767,7 +731,7 @@ public void read(TProtocol prot, Work struct) throws TException { struct.setNum2IsSet(true); } if (incoming.get(2)) { - struct.op = Operation.findByValue(iprot.readI32()); + struct.op = org.apache.camel.component.thrift.generated.Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } if (incoming.get(3)) { @@ -777,8 +741,8 @@ public void read(TProtocol prot, Work struct) throws TException { } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java index d8fba673be71f..aade8b33bd8b3 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java @@ -22,17 +22,12 @@ */ package org.apache.camel.dataformat.thrift.generated; -import jakarta.annotation.Generated; - -import org.apache.thrift.TEnum; -import org.apache.thrift.annotation.Nullable; - /** * You can define enums, which are just 32 bit integers. Values are optional and start at 1 if not supplied, C style * again. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") -public enum Operation implements TEnum { +@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public enum Operation implements org.apache.thrift.TEnum { ADD(1), SUBTRACT(2), MULTIPLY(3), @@ -57,7 +52,7 @@ public int getValue() { * * @return null if the value is not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static Operation findByValue(int value) { switch (value) { case 1: diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java index 807c067935995..68efccc176eca 100644 --- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java +++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java @@ -22,42 +22,6 @@ */ package org.apache.camel.dataformat.thrift.generated; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.BitSet; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; - -import jakarta.annotation.Generated; - -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TBase; -import org.apache.thrift.TBaseHelper; -import org.apache.thrift.TException; -import org.apache.thrift.TFieldIdEnum; -import org.apache.thrift.TFieldRequirementType; -import org.apache.thrift.annotation.Nullable; -import org.apache.thrift.meta_data.EnumMetaData; -import org.apache.thrift.meta_data.FieldMetaData; -import org.apache.thrift.meta_data.FieldValueMetaData; -import org.apache.thrift.protocol.TCompactProtocol; -import org.apache.thrift.protocol.TField; -import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.protocol.TProtocolUtil; -import org.apache.thrift.protocol.TStruct; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TType; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.transport.TIOStreamTransport; - /** * Structs are the basic complex data structures. They are comprised of fields which each have an integer identifier, a * type, a symbolic name, and an optional default value. @@ -66,21 +30,21 @@ * set. Note that this requires some manual management in some languages. */ @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) -@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") -public class Work implements TBase, Serializable, Cloneable, Comparable { - private static final TStruct STRUCT_DESC = new TStruct("Work"); - - private static final TField NUM1_FIELD_DESC - = new TField("num1", TType.I32, (short) 1); - private static final TField NUM2_FIELD_DESC - = new TField("num2", TType.I32, (short) 2); - private static final TField OP_FIELD_DESC - = new TField("op", TType.I32, (short) 3); - private static final TField COMMENT_FIELD_DESC - = new TField("comment", TType.STRING, (short) 4); - - private static final SchemeFactory STANDARD_SCHEME_FACTORY = new WorkStandardSchemeFactory(); - private static final SchemeFactory TUPLE_SCHEME_FACTORY = new WorkTupleSchemeFactory(); +@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public class Work implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Work"); + + private static final org.apache.thrift.protocol.TField NUM1_FIELD_DESC + = new org.apache.thrift.protocol.TField("num1", org.apache.thrift.protocol.TType.I32, (short) 1); + private static final org.apache.thrift.protocol.TField NUM2_FIELD_DESC + = new org.apache.thrift.protocol.TField("num2", org.apache.thrift.protocol.TType.I32, (short) 2); + private static final org.apache.thrift.protocol.TField OP_FIELD_DESC + = new org.apache.thrift.protocol.TField("op", org.apache.thrift.protocol.TType.I32, (short) 3); + private static final org.apache.thrift.protocol.TField COMMENT_FIELD_DESC + = new org.apache.thrift.protocol.TField("comment", org.apache.thrift.protocol.TType.STRING, (short) 4); + + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkTupleSchemeFactory(); public int num1; // required public int num2; // required @@ -88,11 +52,11 @@ public class Work implements TBase, Serializable, Cloneable, * * @see Operation */ - public @Nullable Operation op; // required - public @Nullable java.lang.String comment; // optional + public @org.apache.thrift.annotation.Nullable Operation op; // required + public @org.apache.thrift.annotation.Nullable java.lang.String comment; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NUM1((short) 1, "num1"), NUM2((short) 2, "num2"), /** @@ -102,11 +66,11 @@ public enum _Fields implements TFieldIdEnum { OP((short) 3, "op"), COMMENT((short) 4, "comment"); - private static final Map byName - = new HashMap(); + private static final java.util.Map byName + = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -114,7 +78,7 @@ public enum _Fields implements TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // NUM1 @@ -143,7 +107,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @Nullable + @org.apache.thrift.annotation.Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -172,28 +136,28 @@ public java.lang.String getFieldName() { private static final int __NUM2_ISSET_ID = 1; private byte __isset_bitfield = 0; private static final _Fields optionals[] = { _Fields.COMMENT }; - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap - = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap + = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.NUM1, - new FieldMetaData( - "num1", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "num1", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.NUM2, - new FieldMetaData( - "num2", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I32))); + new org.apache.thrift.meta_data.FieldMetaData( + "num2", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.OP, - new FieldMetaData( - "op", TFieldRequirementType.DEFAULT, - new EnumMetaData(TType.ENUM, Operation.class))); + new org.apache.thrift.meta_data.FieldMetaData( + "op", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, Operation.class))); tmpMap.put(_Fields.COMMENT, - new FieldMetaData( - "comment", TFieldRequirementType.OPTIONAL, - new FieldValueMetaData(TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(Work.class, metaDataMap); + new org.apache.thrift.meta_data.FieldMetaData( + "comment", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Work.class, metaDataMap); } public Work() { @@ -254,16 +218,16 @@ public Work setNum1(int num1) { } public void unsetNum1() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); } /** Returns true if field num1 is set (has been assigned a value) and false otherwise */ public boolean isSetNum1() { - return EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); } public void setNum1IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); } public int getNum2() { @@ -277,23 +241,23 @@ public Work setNum2(int num2) { } public void unsetNum2() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); } /** Returns true if field num2 is set (has been assigned a value) and false otherwise */ public boolean isSetNum2() { - return EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); } public void setNum2IsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); } /** * * @see Operation */ - @Nullable + @org.apache.thrift.annotation.Nullable public Operation getOp() { return this.op; } @@ -302,7 +266,7 @@ public Operation getOp() { * * @see Operation */ - public Work setOp(@Nullable Operation op) { + public Work setOp(@org.apache.thrift.annotation.Nullable Operation op) { this.op = op; return this; } @@ -322,12 +286,12 @@ public void setOpIsSet(boolean value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable public java.lang.String getComment() { return this.comment; } - public Work setComment(@Nullable java.lang.String comment) { + public Work setComment(@org.apache.thrift.annotation.Nullable java.lang.String comment) { this.comment = comment; return this; } @@ -348,7 +312,7 @@ public void setCommentIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case NUM1: if (value == null) { @@ -385,7 +349,7 @@ public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { } } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -509,7 +473,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum1()) { - lastComparison = TBaseHelper.compareTo(this.num1, other.num1); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num1, other.num1); if (lastComparison != 0) { return lastComparison; } @@ -519,7 +483,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum2()) { - lastComparison = TBaseHelper.compareTo(this.num2, other.num2); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num2, other.num2); if (lastComparison != 0) { return lastComparison; } @@ -529,7 +493,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetOp()) { - lastComparison = TBaseHelper.compareTo(this.op, other.op); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, other.op); if (lastComparison != 0) { return lastComparison; } @@ -539,7 +503,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetComment()) { - lastComparison = TBaseHelper.compareTo(this.comment, other.comment); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, other.comment); if (lastComparison != 0) { return lastComparison; } @@ -547,19 +511,19 @@ public int compareTo(Work other) { return 0; } - @Nullable + @org.apache.thrift.annotation.Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(TProtocol iprot) throws TException { + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { scheme(iprot).read(iprot, this); } @Override - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { scheme(oprot).write(oprot, this); } @@ -600,82 +564,82 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } - private void writeObject(ObjectOutputStream out) throws IOException { + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { try { - write(new TCompactProtocol(new TIOStreamTransport(out))); - } catch (TException te) { - throw new IOException(te); + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; - read(new TCompactProtocol(new TIOStreamTransport(in))); - } catch (TException te) { - throw new IOException(te); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); } } - private static class WorkStandardSchemeFactory implements SchemeFactory { + private static class WorkStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public WorkStandardScheme getScheme() { return new WorkStandardScheme(); } } - private static class WorkStandardScheme extends StandardScheme { + private static class WorkStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(TProtocol iprot, Work struct) throws TException { - TField schemeField; + public void read(org.apache.thrift.protocol.TProtocol iprot, Work struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { case 1: // NUM1 - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // NUM2 - if (schemeField.type == TType.I32) { + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.num2 = iprot.readI32(); struct.setNum2IsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 3: // OP - if (schemeField.type == TType.I32) { - struct.op = Operation.findByValue(iprot.readI32()); + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.op = org.apache.camel.dataformat.thrift.generated.Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; case 4: // COMMENT - if (schemeField.type == TType.STRING) { + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.comment = iprot.readString(); struct.setCommentIsSet(true); } else { - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; default: - TProtocolUtil.skip(iprot, schemeField.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -686,7 +650,7 @@ public void read(TProtocol iprot, Work struct) throws TException { } @Override - public void write(TProtocol oprot, Work struct) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, Work struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -714,19 +678,19 @@ public void write(TProtocol oprot, Work struct) throws TException { } - private static class WorkTupleSchemeFactory implements SchemeFactory { + private static class WorkTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override public WorkTupleScheme getScheme() { return new WorkTupleScheme(); } } - private static class WorkTupleScheme extends TupleScheme { + private static class WorkTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(TProtocol prot, Work struct) throws TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + public void write(org.apache.thrift.protocol.TProtocol prot, Work struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetNum1()) { optionals.set(0); } @@ -755,9 +719,9 @@ public void write(TProtocol prot, Work struct) throws TException { } @Override - public void read(TProtocol prot, Work struct) throws TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + public void read(org.apache.thrift.protocol.TProtocol prot, Work struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); @@ -767,7 +731,7 @@ public void read(TProtocol prot, Work struct) throws TException { struct.setNum2IsSet(true); } if (incoming.get(2)) { - struct.op = Operation.findByValue(iprot.readI32()); + struct.op = org.apache.camel.dataformat.thrift.generated.Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } if (incoming.get(3)) { @@ -777,8 +741,8 @@ public void read(TProtocol prot, Work struct) throws TException { } } - private static S scheme(TProtocol proto) { - return (StandardScheme.class.equals(proto.getScheme()) + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } diff --git a/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerComponent.java b/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerComponent.java index 1367cb6fc0f81..24ccf109f650b 100644 --- a/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerComponent.java +++ b/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerComponent.java @@ -27,7 +27,6 @@ import org.apache.camel.Endpoint; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; /** @@ -37,7 +36,7 @@ * Represents the component that manages {@link TimerEndpoint}. It holds the list of {@link TimerConsumer} objects that * are started. */ -@Component("timer") +@org.apache.camel.spi.annotations.Component("timer") public class TimerComponent extends DefaultComponent { private final Map timers = new ConcurrentHashMap<>(); diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHeaderFilterStrategy.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHeaderFilterStrategy.java index 67fb6f2054dd1..23c0d894d7d76 100644 --- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHeaderFilterStrategy.java +++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowHeaderFilterStrategy.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.undertow; -import io.undertow.util.HttpString; import org.apache.camel.Exchange; import org.apache.camel.http.base.HttpHeaderFilterStrategy; @@ -28,7 +27,7 @@ public UndertowHeaderFilterStrategy() { @Override public boolean applyFilterToExternalHeaders(String headerName, Object headerValue, Exchange exchange) { - boolean skip = HttpString.tryFromString(headerName) == null; + boolean skip = io.undertow.util.HttpString.tryFromString(headerName) == null; if (skip) { // skip all not valid headers by undertow rules return true; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java index 59c746ce5bbd2..bd74b5fa2e3c4 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java @@ -47,7 +47,7 @@ void assertServletContext(ServletRequestContext servletRequestContext) { @BeforeAll public static void initProvider() throws Exception { createSecurtyProviderConfigurationFile( - ProviderWithServletTest.MockSecurityProvider.class); + org.apache.camel.component.undertow.spi.ProviderWithServletTest.MockSecurityProvider.class); } @Test diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java index 7a5919d761ee4..9d67829a60e33 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.undertow.ws; import java.net.URL; -import java.security.SecureRandom; import javax.net.ssl.SSLContext; @@ -84,7 +83,7 @@ protected CamelContext createCamelContext() throws Exception { @Test public void testWSHttpCall() throws Exception { SSLContext sc = SSLContext.getInstance("SSL"); - sc.init(null, InsecureTrustManagerFactory.INSTANCE.getTrustManagers(), new SecureRandom()); + sc.init(null, InsecureTrustManagerFactory.INSTANCE.getTrustManagers(), new java.security.SecureRandom()); WebsocketTestClient testClient = new WebsocketTestClient( "wss://localhost:" + getPort() + "/test", diff --git a/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java b/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java index afa66f88af6cd..d5b3e7143ce88 100644 --- a/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java +++ b/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java @@ -20,13 +20,12 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; /** * The Validator Component is for validating XML against a schema */ -@Component("validator") +@org.apache.camel.spi.annotations.Component("validator") public class ValidatorComponent extends DefaultComponent { @Metadata(label = "advanced", diff --git a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java index 9c85708ca7bb2..8b3ab06dc4d0d 100644 --- a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java +++ b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.vertx.http; import org.apache.camel.Exchange; -import org.apache.camel.LoggingLevel; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -47,7 +46,7 @@ protected RoutesBuilder createRouteBuilder() { @Override public void configure() { errorHandler(defaultErrorHandler().maximumRedeliveries(3).redeliveryDelay(0) - .retryAttemptedLogLevel(LoggingLevel.WARN)); + .retryAttemptedLogLevel(org.apache.camel.LoggingLevel.WARN)); from("direct:start") .to(getTestServerUri()); diff --git a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketDevConsole.java b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketDevConsole.java index 45b91d887f11c..1ed2cacb624cf 100644 --- a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketDevConsole.java +++ b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketDevConsole.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.vertx.websocket; -import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -157,13 +155,13 @@ protected Map doCallJson(Map options) { } Map> getConsumersByHost() { - Map> consumersByHost = new LinkedHashMap<>(); + Map> consumersByHost = new java.util.LinkedHashMap<>(); for (Route route : getCamelContext().getRoutes()) { if (route.getConsumer() instanceof VertxWebsocketConsumer consumer) { VertxWebsocketHostKey hostKey = new VertxWebsocketHostKey( consumer.getEndpoint().getConfiguration().getWebsocketURI().getHost(), consumer.getEndpoint().getConfiguration().getWebsocketURI().getPort()); - consumersByHost.computeIfAbsent(hostKey, k -> new ArrayList<>()).add(consumer); + consumersByHost.computeIfAbsent(hostKey, k -> new java.util.ArrayList<>()).add(consumer); } } return consumersByHost; diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java index d4619fe14a372..fd4ab876b3813 100644 --- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java +++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java @@ -30,8 +30,6 @@ import org.web3j.protocol.core.DefaultBlockParameter; import org.web3j.protocol.core.Request; import org.web3j.protocol.core.Response; -import org.web3j.protocol.core.methods.request.ShhFilter; -import org.web3j.protocol.core.methods.request.Transaction; import org.web3j.protocol.core.methods.response.DbGetHex; import org.web3j.protocol.core.methods.response.DbGetString; import org.web3j.protocol.core.methods.response.DbPutHex; @@ -386,8 +384,8 @@ void ethSendTransaction(Message message) throws IOException { BigInteger value = message.getHeader(Web3jConstants.VALUE, configuration::getValue, BigInteger.class); String data = message.getHeader(Web3jConstants.DATA, configuration::getData, String.class); - Transaction transaction - = new Transaction( + org.web3j.protocol.core.methods.request.Transaction transaction + = new org.web3j.protocol.core.methods.request.Transaction( fromAddress, nonce, gasPrice, gasLimit, toAddress, value, data); Request request = web3j.ethSendTransaction(transaction); @@ -424,8 +422,8 @@ void ethCall(Message message) throws IOException { DefaultBlockParameter atBlock = toDefaultBlockParameter(message.getHeader(Web3jConstants.AT_BLOCK, configuration::getAtBlock, String.class)); - Transaction transaction - = new Transaction( + org.web3j.protocol.core.methods.request.Transaction transaction + = new org.web3j.protocol.core.methods.request.Transaction( fromAddress, nonce, gasPrice, gasLimit, toAddress, value, data); Request request = web3j.ethCall(transaction, atBlock); @@ -443,8 +441,8 @@ void ethEstimateGas(Message message) throws IOException { String toAddress = message.getHeader(Web3jConstants.TO_ADDRESS, configuration::getToAddress, String.class); String data = message.getHeader(Web3jConstants.DATA, configuration::getData, String.class); - Transaction transaction - = new Transaction( + org.web3j.protocol.core.methods.request.Transaction transaction + = new org.web3j.protocol.core.methods.request.Transaction( fromAddress, null, null, null, toAddress, null, data); Request request = web3j.ethEstimateGas(transaction); @@ -883,7 +881,7 @@ void shhAddToGroup(Message message) throws IOException { void shhNewFilter(Message message) throws IOException { String data = message.getHeader(Web3jConstants.DATA, configuration::getData, String.class); List topics = message.getHeader(Web3jConstants.TOPICS, configuration::getTopics, List.class); - ShhFilter shhFilter = Web3jEndpoint.buildShhFilter(data, topics); + org.web3j.protocol.core.methods.request.ShhFilter shhFilter = Web3jEndpoint.buildShhFilter(data, topics); Request request = web3j.shhNewFilter(shhFilter); setRequestId(message, request); diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java index 87b698b71a7bc..3ed7127e37bd9 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java @@ -56,7 +56,6 @@ import org.xml.sax.SAXException; import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; /** * Helps to construct the transformations and the canonicalization methods for the XML Signature generator. @@ -339,7 +338,7 @@ protected static InputStream readXslTransform(String path) throws Exception { if (path == null) { throw new IllegalArgumentException("path is null"); } - InputStream is = ObjectHelper.loadResourceAsStream(path); + InputStream is = org.apache.camel.util.ObjectHelper.loadResourceAsStream(path); if (is == null) { is = XmlSignatureHelper.class.getResourceAsStream(path); } diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/SantuarioUtil.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/SantuarioUtil.java index 25ff9d76ec8de..be2d44fb257af 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/SantuarioUtil.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/SantuarioUtil.java @@ -21,7 +21,6 @@ import java.security.Security; import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI; -import org.apache.xml.security.Init; import org.apache.xml.security.utils.XMLUtils; public final class SantuarioUtil { @@ -45,7 +44,7 @@ public static void initializeSantuario() { //ignore } - Init.init(); + org.apache.xml.security.Init.init(); if (!wasSet) { try { diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java index 89b5b739786ba..ab86f047bd4ba 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java @@ -26,7 +26,6 @@ import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.PublicKey; -import java.security.cert.Certificate; import java.security.spec.InvalidKeySpecException; import java.util.Arrays; import java.util.Map; @@ -36,7 +35,6 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.DESedeKeySpec; import javax.crypto.spec.SecretKeySpec; -import javax.security.auth.DestroyFailedException; import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; @@ -56,7 +54,6 @@ import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.util.IOHelper; -import org.apache.xml.security.Init; import org.apache.xml.security.encryption.EncryptedData; import org.apache.xml.security.encryption.EncryptedKey; import org.apache.xml.security.encryption.XMLCipher; @@ -128,7 +125,7 @@ public XMLSecurityDataFormat() { //ignore } - Init.init(); + org.apache.xml.security.Init.init(); if (!wasSet) { try { @@ -345,7 +342,7 @@ private void encryptAsymmetric(Exchange exchange, Document document, OutputStrea // Clean the secret key from memory try { dataEncryptionKey.destroy(); - } catch (DestroyFailedException ex) { + } catch (javax.security.auth.DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } } @@ -375,13 +372,13 @@ private void encryptSymmetric(Exchange exchange, Document document, OutputStream // Clean the secret keys from memory try { dataEncryptionKey.destroy(); - } catch (DestroyFailedException ex) { + } catch (javax.security.auth.DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } try { keyEncryptionKey.destroy(); - } catch (DestroyFailedException ex) { + } catch (javax.security.auth.DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } } @@ -404,7 +401,7 @@ private PrivateKey getPrivateKey(KeyStore keystore, String alias, String passwor */ // TODO Move this to a crypto utility class private Key getPublicKey(KeyStore keystore, String alias, String password) throws Exception { - Certificate cert = keystore.getCertificate(alias); + java.security.cert.Certificate cert = keystore.getCertificate(alias); if (cert != null) { // Get public key return cert.getPublicKey(); @@ -485,7 +482,7 @@ private Object decodeWithSymmetricKey(Exchange exchange, Document encodedDocumen Object ret = null; try { ret = decode(exchange, encodedDocument, keyEncryptionKey, true); - } catch (XMLEncryptionException ex) { + } catch (org.apache.xml.security.encryption.XMLEncryptionException ex) { if (ex.getMessage().equals("encryption.nokey")) { //the message don't have EncryptionKey, try key directly ret = decode(exchange, encodedDocument, keyEncryptionKey, false); @@ -497,7 +494,7 @@ private Object decodeWithSymmetricKey(Exchange exchange, Document encodedDocumen // Clean the secret key from memory try { keyEncryptionKey.destroy(); - } catch (DestroyFailedException ex) { + } catch (javax.security.auth.DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } @@ -520,7 +517,7 @@ private Object decodeWithAsymmetricKey(Exchange exchange, Document encodedDocume Object ret = null; try { ret = decode(exchange, encodedDocument, keyEncryptionKey, true); - } catch (XMLEncryptionException ex) { + } catch (org.apache.xml.security.encryption.XMLEncryptionException ex) { if (ex.getMessage().equals("encryption.nokey")) { //the message don't have EncryptionKey, try key directly ret = decode(exchange, encodedDocument, keyEncryptionKey, false); @@ -532,7 +529,7 @@ private Object decodeWithAsymmetricKey(Exchange exchange, Document encodedDocume // Clean the private key from memory try { keyEncryptionKey.destroy(); - } catch (DestroyFailedException ex) { + } catch (javax.security.auth.DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java index 45de8606b151a..0889b66d1847f 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java @@ -102,7 +102,7 @@ public SignatureAlgorithmTest() throws Exception { Class c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider"); cons = c.getConstructor(new Class[] {}); - Provider provider = (Provider) cons.newInstance(); + Provider provider = (java.security.Provider) cons.newInstance(); Security.insertProviderAt(provider, 2); } } diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java index 622c013c53015..6e68523b89f94 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java @@ -101,7 +101,7 @@ public SignatureDigestMethodTest() throws Exception { Class c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider"); cons = c.getConstructor(new Class[] {}); - Provider provider = (Provider) cons.newInstance(); + Provider provider = (java.security.Provider) cons.newInstance(); Security.insertProviderAt(provider, 2); } } diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java index 159618622bd72..74472e81be671 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java @@ -47,7 +47,7 @@ public EncryptionAlgorithmTest() throws Exception { Class c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider"); cons = c.getConstructor(new Class[] {}); - Provider provider = (Provider) cons.newInstance(); + Provider provider = (java.security.Provider) cons.newInstance(); Security.insertProviderAt(provider, 2); } } diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java index 6f8c53cf5772e..369c8036e0aa7 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/TestHelper.java @@ -34,7 +34,6 @@ import org.apache.camel.StreamCache; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxp.DomConverter; -import org.apache.xml.security.Init; import org.apache.xml.security.encryption.XMLCipher; import org.apache.xml.security.encryption.XMLEncryptionException; import org.slf4j.Logger; @@ -81,7 +80,7 @@ public class TestHelper { static { boolean ok = false; try { - Init.init(); + org.apache.xml.security.Init.init(); XMLCipher.getInstance(XMLCipher.TRIPLEDES_KeyWrap); ok = true; } catch (XMLEncryptionException e) { diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java index 5ab516a556052..e3b57d1a6e424 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLEncryption11Test.java @@ -47,7 +47,7 @@ public XMLEncryption11Test() throws Exception { Class c = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider"); cons = c.getConstructor(new Class[] {}); - Provider provider = (Provider) cons.newInstance(); + Provider provider = (java.security.Provider) cons.newInstance(); Security.insertProviderAt(provider, 2); } } diff --git a/components/camel-xslt-saxon/src/main/java/org/apache/camel/component/xslt/saxon/SaxonXmlSourceHandlerFactoryImpl.java b/components/camel-xslt-saxon/src/main/java/org/apache/camel/component/xslt/saxon/SaxonXmlSourceHandlerFactoryImpl.java index 138cf53aa9157..faadda0129761 100644 --- a/components/camel-xslt-saxon/src/main/java/org/apache/camel/component/xslt/saxon/SaxonXmlSourceHandlerFactoryImpl.java +++ b/components/camel-xslt-saxon/src/main/java/org/apache/camel/component/xslt/saxon/SaxonXmlSourceHandlerFactoryImpl.java @@ -26,13 +26,6 @@ import net.sf.saxon.s9api.DOMDestination; import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.SaxonApiException; -import net.sf.saxon.s9api.XPathCompiler; -import net.sf.saxon.s9api.XPathExecutable; -import net.sf.saxon.s9api.XPathSelector; -import net.sf.saxon.s9api.XdmAtomicValue; -import net.sf.saxon.s9api.XdmItem; -import net.sf.saxon.s9api.XdmNode; -import net.sf.saxon.s9api.XdmValue; import org.apache.camel.Exchange; import org.apache.camel.component.xslt.XmlSourceHandlerFactoryImpl; import org.slf4j.Logger; @@ -52,8 +45,8 @@ public void setUseJsonBody(boolean useJsonBody) { this.useJsonBody = useJsonBody; } - private Processor saxonProcessor; - private XPathExecutable saxonJsonToXmlExecutable; + private net.sf.saxon.s9api.Processor saxonProcessor; + private net.sf.saxon.s9api.XPathExecutable saxonJsonToXmlExecutable; private DocumentBuilder documentBuilder; @Override @@ -91,13 +84,13 @@ protected Source getSource(Exchange exchange, Object body) { private Source convertJsonToXmlSource(String jsonString) { try { - XPathSelector selector = getSaxonJsonToXmlExecutable().load(); - selector.setContextItem(new XdmAtomicValue(jsonString)); - XdmValue result = selector.evaluate(); + net.sf.saxon.s9api.XPathSelector selector = getSaxonJsonToXmlExecutable().load(); + selector.setContextItem(new net.sf.saxon.s9api.XdmAtomicValue(jsonString)); + net.sf.saxon.s9api.XdmValue result = selector.evaluate(); if (!result.isEmpty()) { - XdmItem item = result.itemAt(0); - if (item instanceof XdmNode xdmNode) { + net.sf.saxon.s9api.XdmItem item = result.itemAt(0); + if (item instanceof net.sf.saxon.s9api.XdmNode xdmNode) { // The most efficient way would be: // return xdmNode.getUnderlyingNode(); // In order to make it work however, this pre-process and the main XSLT processing later on @@ -118,10 +111,10 @@ private Source convertJsonToXmlSource(String jsonString) { return null; } - private synchronized XPathExecutable getSaxonJsonToXmlExecutable() throws SaxonApiException { + private synchronized net.sf.saxon.s9api.XPathExecutable getSaxonJsonToXmlExecutable() throws SaxonApiException { if (saxonJsonToXmlExecutable == null) { saxonProcessor = new Processor(false); - XPathCompiler xpathCompiler = saxonProcessor.newXPathCompiler(); + net.sf.saxon.s9api.XPathCompiler xpathCompiler = saxonProcessor.newXPathCompiler(); saxonJsonToXmlExecutable = xpathCompiler.compile("json-to-xml(.)"); LOG.debug("Initialized reusable XPathExecutable for json-to-xml() function"); } diff --git a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeComponent.java b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeComponent.java index 3aea39c0d2686..14e6b041815e8 100644 --- a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeComponent.java +++ b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeComponent.java @@ -23,11 +23,10 @@ import org.apache.camel.component.zeebe.internal.OperationName; import org.apache.camel.component.zeebe.internal.ZeebeService; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; @Deprecated(since = "4.19.0") -@Component("zeebe") +@org.apache.camel.spi.annotations.Component("zeebe") public class ZeebeComponent extends DefaultComponent { @Metadata(defaultValue = "" + ZeebeConstants.DEFAULT_GATEWAY_HOST, label = "security") diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java index ae96a39d801ee..15472f0ba0a82 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java @@ -44,7 +44,7 @@ public void testSplitter() throws InterruptedException { Arrays.deepEquals(list1.toArray(), list2.toArray()); } - private ZipFileDataFormat multiEntryZipFormat() { + private org.apache.camel.model.dataformat.ZipFileDataFormat multiEntryZipFormat() { var zipFormat = new ZipFileDataFormat(); zipFormat.setUsingIterator("true"); return zipFormat; diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java index 46700aa307513..99993d0ae06fe 100644 --- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java +++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java @@ -275,7 +275,7 @@ public interface CamelContext extends CamelContextLifecycle, RuntimeConfiguratio * @param filter the filter * @return the service if found or null if none found */ - Service hasService(Predicate filter); + Service hasService(java.util.function.Predicate filter); /** * Has the given service type already been added to this CamelContext? diff --git a/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java b/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java index cf0197e0897bf..adf0a3b3f389e 100644 --- a/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java +++ b/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java @@ -18,7 +18,6 @@ import java.util.Map; import java.util.concurrent.Future; -import java.util.function.Consumer; import java.util.function.Supplier; import org.apache.camel.util.ObjectHelper; @@ -276,7 +275,7 @@ public interface FluentProducerTemplate extends Service { * * @param templateCustomizer the customizer */ - FluentProducerTemplate withTemplateCustomizer(Consumer templateCustomizer); + FluentProducerTemplate withTemplateCustomizer(java.util.function.Consumer templateCustomizer); /** * Set the exchange to use for send. diff --git a/core/camel-api/src/main/java/org/apache/camel/package-info.java b/core/camel-api/src/main/java/org/apache/camel/package-info.java index 3defafe1460df..7b279bbee92fc 100644 --- a/core/camel-api/src/main/java/org/apache/camel/package-info.java +++ b/core/camel-api/src/main/java/org/apache/camel/package-info.java @@ -17,9 +17,6 @@ /** * The core Camel API. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/CamelBeanPostProcessor.java b/core/camel-api/src/main/java/org/apache/camel/spi/CamelBeanPostProcessor.java index b340a1c64cc23..ce38b989e30c5 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/CamelBeanPostProcessor.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/CamelBeanPostProcessor.java @@ -16,8 +16,6 @@ */ package org.apache.camel.spi; -import java.util.function.Predicate; - import org.apache.camel.BindToRegistry; /** @@ -99,11 +97,11 @@ default void addCamelBeanPostProjectInjector(CamelBeanPostProcessorInjector inje /** * Custom strategy for handling {@link BindToRegistry} beans and whether they are lazy or not. */ - void setLazyBeanStrategy(Predicate strategy); + void setLazyBeanStrategy(java.util.function.Predicate strategy); /** * Custom strategy for handling {@link BindToRegistry} beans and whether they are lazy or not. */ - Predicate getLazyBeanStrategy(); + java.util.function.Predicate getLazyBeanStrategy(); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java index 508ab8c2152e9..521321afa7113 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java @@ -40,7 +40,6 @@ import org.apache.camel.spi.CamelBeanPostProcessorInjector; import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.support.PluginHelper; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ReflectionHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,7 +71,7 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor, Ca protected CamelContext camelContext; protected boolean enabled = true; protected boolean unbindEnabled; - protected Predicate lazyBeanStrategy; + protected java.util.function.Predicate lazyBeanStrategy; public DefaultCamelBeanPostProcessor() { } @@ -484,7 +483,7 @@ public void setterInjection(Method method, Object bean, String beanName, String if (parameterTypes.length != 1) { LOG.warn("Ignoring badly annotated method for injection due to incorrect number of parameters: {}", method); } else { - String propertyName = ObjectHelper.getPropertyName(method); + String propertyName = org.apache.camel.util.ObjectHelper.getPropertyName(method); Object value = getPostProcessorHelper().getInjectionValue(parameterTypes[0], endpointUri, endpointProperty, propertyName, bean, beanName); invokeMethod(method, bean, value); diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java index 2a39e1d5b5507..cebf926661ab8 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java @@ -263,7 +263,7 @@ protected Object extractResultBody(Exchange result) { return answer; } - private ConsumerCache getConsumerCache() { + private org.apache.camel.spi.ConsumerCache getConsumerCache() { if (!isStarted()) { throw new IllegalStateException("ConsumerTemplate has not been started"); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java index 9455fa52f2719..91f4f57f84b7f 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultProducerTemplate.java @@ -747,7 +747,7 @@ protected CompletableFuture asyncSendExchange( return exchangeFuture; } - private ProducerCache getProducerCache() { + private org.apache.camel.spi.ProducerCache getProducerCache() { if (!isStarted()) { throw new IllegalStateException("ProducerTemplate has not been started"); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java index ddc8ac1070116..fe627dc23f80b 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java @@ -28,7 +28,6 @@ import org.apache.camel.Route; import org.apache.camel.spi.Configurer; import org.apache.camel.spi.Metadata; -import org.apache.camel.support.RoutePolicySupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +42,7 @@ + " This can be used to stop the route after it has processed a number of messages, or has been running for N seconds.", annotations = { "interfaceName=org.apache.camel.spi.RoutePolicy" }) @Configurer(metadataOnly = true) -public class DurationRoutePolicy extends RoutePolicySupport implements CamelContextAware { +public class DurationRoutePolicy extends org.apache.camel.support.RoutePolicySupport implements CamelContextAware { private static final Logger LOG = LoggerFactory.getLogger(DurationRoutePolicy.class); diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java index 246034c73e36b..84909fada5a4f 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/RouteService.java @@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.BiConsumer; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; @@ -369,7 +368,7 @@ protected void doResume() { } } - private void routePolicyCallback(BiConsumer callback) { + private void routePolicyCallback(java.util.function.BiConsumer callback) { if (route.getRoutePolicyList() != null) { for (RoutePolicy routePolicy : route.getRoutePolicyList()) { callback.accept(routePolicy, route); diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java index 5115984d7be96..81946c834198c 100644 --- a/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/ReceiveDevConsole.java @@ -35,7 +35,6 @@ import org.apache.camel.Exchange; import org.apache.camel.spi.Configurer; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.annotations.DevConsole; import org.apache.camel.support.ExceptionHelper; import org.apache.camel.support.MessageHelper; @@ -306,8 +305,8 @@ protected static Endpoint findMatchingEndpoint(CamelContext camelContext, String // is the endpoint able to create a consumer target = camelContext.getEndpoint(uri); // is the target able to create a consumer - UriEndpoint ann - = ObjectHelper.getAnnotationDeep(target, UriEndpoint.class); + org.apache.camel.spi.UriEndpoint ann + = ObjectHelper.getAnnotationDeep(target, org.apache.camel.spi.UriEndpoint.class); if (ann != null) { if (ann.producerOnly()) { // skip if the endpoint cannot consume (we need to be able to consume to receive) @@ -331,8 +330,8 @@ protected static Endpoint findMatchingEndpoint(CamelContext camelContext, String } else { target = camelContext.getEndpoint(endpoint); // is the target able to create a consumer - UriEndpoint ann - = ObjectHelper.getAnnotationDeep(target, UriEndpoint.class); + org.apache.camel.spi.UriEndpoint ann + = ObjectHelper.getAnnotationDeep(target, org.apache.camel.spi.UriEndpoint.class); if (ann != null) { if (ann.producerOnly()) { // skip if the endpoint cannot consume (we need to be able to consume to receive) diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java index f15bb94fd69c3..6bb9e3a670efa 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java @@ -20,7 +20,6 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.Predicate; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.spi.annotations.Language; import org.apache.camel.support.ExpressionToPredicateAdapter; import org.apache.camel.support.LanguageSupport; import org.apache.camel.support.builder.ExpressionBuilder; @@ -28,7 +27,7 @@ /** * A language for constant expressions. */ -@Language("constant") +@org.apache.camel.spi.annotations.Language("constant") public class ConstantLanguage extends LanguageSupport { public static Expression constant(Object value) { diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java index 21fc2018c5797..2f3a4c2e44db6 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.StringWriter; import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.security.MessageDigest; @@ -262,10 +261,10 @@ public static String toJsonBody(Exchange exchange, boolean pretty) { if (body instanceof String str) { return str; } - final StringWriter writer = new StringWriter(); + final java.io.StringWriter writer = new java.io.StringWriter(); try { Jsoner.serializeCarelessly(body, writer); - } catch (final IOException caught) { + } catch (final java.io.IOException caught) { /* See StringWriter. */ } String answer = writer.toString(); diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java index 29d2a9207f255..bcc0ceb87da03 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java @@ -18,7 +18,6 @@ import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.spi.annotations.Language; import org.apache.camel.support.ExpressionToPredicateAdapter; import org.apache.camel.support.LanguageSupport; import org.apache.camel.support.builder.ExpressionBuilder; @@ -26,7 +25,7 @@ /** * A language for header expressions. */ -@Language("header") +@org.apache.camel.spi.annotations.Language("header") public class HeaderLanguage extends LanguageSupport { public static Expression header(String headerName) { diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java index da678eccd338e..ce6d6381cfbc8 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java @@ -21,7 +21,6 @@ import org.apache.camel.Expression; import org.apache.camel.Predicate; import org.apache.camel.spi.Registry; -import org.apache.camel.spi.annotations.Language; import org.apache.camel.support.ExpressionAdapter; import org.apache.camel.support.ExpressionToPredicateAdapter; import org.apache.camel.support.PredicateToExpressionAdapter; @@ -31,7 +30,7 @@ /** * A language for referred expressions or predicates. */ -@Language("ref") +@org.apache.camel.spi.annotations.Language("ref") public class RefLanguage extends TypedLanguageSupport { @Override diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/OtherExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/OtherExpression.java index 3a17718406b24..09902ffd6fe01 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/OtherExpression.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/OtherExpression.java @@ -70,8 +70,8 @@ public SimpleNode getRight() { @Override public Expression createExpression(CamelContext camelContext, String expression) { - ObjectHelper.notNull(left, "left node", this); - ObjectHelper.notNull(right, "right node", this); + org.apache.camel.util.ObjectHelper.notNull(left, "left node", this); + org.apache.camel.util.ObjectHelper.notNull(right, "right node", this); // the expression parser does not parse literal text into single/double quote tokens // so we need to manually remove leading quotes from the literal text when using the other operators @@ -118,8 +118,8 @@ public String createCode(CamelContext camelContext, String expression) throws Si } private String doCreateCode(CamelContext camelContext, String expression) throws SimpleParserException { - ObjectHelper.notNull(left, "left node", this); - ObjectHelper.notNull(right, "right node", this); + org.apache.camel.util.ObjectHelper.notNull(left, "left node", this); + org.apache.camel.util.ObjectHelper.notNull(right, "right node", this); // the expression parser does not parse literal text into single/double quote tokens // so we need to manually remove leading quotes from the literal text when using the other operators diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java index 59d16652403c4..e596c186ee9c4 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java @@ -21,7 +21,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Expression; -import org.apache.camel.spi.annotations.Language; import org.apache.camel.support.ExpressionAdapter; import org.apache.camel.support.IteratorConvertTo; import org.apache.camel.support.SingleInputTypedLanguageSupport; @@ -39,7 +38,7 @@ * The default mode supports the headerName and regex options. Where as the pair mode only supports * token and endToken. And the xml mode supports the inheritNamespaceTagName option. */ -@Language("tokenize") +@org.apache.camel.spi.annotations.Language("tokenize") public class TokenizeLanguage extends SingleInputTypedLanguageSupport { @Override diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/variable/VariableLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/variable/VariableLanguage.java index ba6a306d4e1bf..76896ae929ef3 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/variable/VariableLanguage.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/variable/VariableLanguage.java @@ -18,7 +18,6 @@ import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.spi.annotations.Language; import org.apache.camel.support.ExpressionToPredicateAdapter; import org.apache.camel.support.LanguageSupport; import org.apache.camel.support.builder.ExpressionBuilder; @@ -26,7 +25,7 @@ /** * A language for variable expressions. */ -@Language("variable") +@org.apache.camel.spi.annotations.Language("variable") public class VariableLanguage extends LanguageSupport { public static Expression variable(String name) { diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDefaultErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDefaultErrorHandlerBuilder.java index 2b93eef7c385b..e4366e7b7f375 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDefaultErrorHandlerBuilder.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDefaultErrorHandlerBuilder.java @@ -30,7 +30,6 @@ import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.Language; import org.apache.camel.support.ExpressionToPredicateAdapter; -import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** @@ -263,7 +262,7 @@ public LegacyDefaultErrorHandlerBuilder loggingLevel(LoggingLevel level) { * @param log the logger * @return the builder */ - public LegacyDefaultErrorHandlerBuilder log(Logger log) { + public LegacyDefaultErrorHandlerBuilder log(org.slf4j.Logger log) { getLogger().setLog(log); return this; } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java index 7110c7642a6f1..2f74dd05e06ba 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java @@ -60,7 +60,6 @@ import org.apache.camel.spi.ResourceAware; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.SupervisingRouteController; -import org.apache.camel.spi.annotations.Dataformat; import org.apache.camel.support.LifecycleStrategySupport; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; @@ -245,8 +244,8 @@ public void customize(Class type, VoidFunction code) throws Exception } if (obj == null && DataFormat.class.isAssignableFrom(type)) { // it's maybe a dataformat - Dataformat ann - = type.getAnnotation(Dataformat.class); + org.apache.camel.spi.annotations.Dataformat ann + = type.getAnnotation(org.apache.camel.spi.annotations.Dataformat.class); if (ann != null) { String name = ann.value(); obj = (T) getCamelContext().resolveDataFormat(name); diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java index 689150daa8ec4..33dad025217fe 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/BasicOutputExpressionNode.java @@ -26,7 +26,6 @@ import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.builder.ExpressionClause; import org.apache.camel.model.language.ExpressionDefinition; /** @@ -87,8 +86,8 @@ public void setExpression(ExpressionDefinition expression) { if (expression != null && getExpression() != null && !outputs.isEmpty()) { ExpressionDefinition existing = getExpression(); boolean isExpressionClause - = existing.getExpressionValue() instanceof ExpressionClause - || existing.getPredicate() instanceof ExpressionClause; + = existing.getExpressionValue() instanceof org.apache.camel.builder.ExpressionClause + || existing.getPredicate() instanceof org.apache.camel.builder.ExpressionClause; if (!isExpressionClause) { String lang = expression.getLanguage() != null ? expression.getLanguage() : expression.getClass().getSimpleName(); diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/BeanModelHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/BeanModelHelper.java index c11221f1c63f9..a64aa436cb1ff 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/BeanModelHelper.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/BeanModelHelper.java @@ -30,7 +30,6 @@ import org.apache.camel.spi.Language; import org.apache.camel.spi.ScriptingLanguage; import org.apache.camel.support.ExchangeHelper; -import org.apache.camel.support.ObjectHelper; import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.ScriptHelper; import org.apache.camel.util.StringHelper; @@ -195,7 +194,7 @@ public static void bind(BeanFactoryDefinition def, RouteTemplateContext route PropertyBindingSupport.setPropertiesOnTarget(camelContext, local, props); } if (def.getInitMethod() != null) { - ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); + org.apache.camel.support.ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); } if (def.getDestroyMethod() != null) { routeTemplateContext.registerDestroyMethod(def.getName(), def.getDestroyMethod()); @@ -222,7 +221,7 @@ public static void bind(BeanFactoryDefinition def, RouteTemplateContext route } if (def.getInitMethod() != null) { try { - ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); + org.apache.camel.support.ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); } catch (Exception e) { throw RuntimeCamelException.wrapRuntimeException(e); } @@ -284,7 +283,7 @@ public static void bind(BeanFactoryDefinition def, RouteTemplateContext route } } if (def.getInitMethod() != null) { - ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); + org.apache.camel.support.ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); } if (def.getDestroyMethod() != null) { routeTemplateContext.registerDestroyMethod(def.getName(), def.getDestroyMethod()); diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java index 92217392127e7..39a1eb303964f 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeadersDefinition.java @@ -16,7 +16,6 @@ */ package org.apache.camel.model; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -44,7 +43,7 @@ public class SetHeadersDefinition extends ProcessorDefinition headers = new ArrayList<>(); + private List headers = new java.util.ArrayList<>(); public SetHeadersDefinition() { } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/SetVariablesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/SetVariablesDefinition.java index 522b36423c0db..9187de5302c28 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/SetVariablesDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/SetVariablesDefinition.java @@ -16,7 +16,6 @@ */ package org.apache.camel.model; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -42,7 +41,7 @@ public class SetVariablesDefinition extends ProcessorDefinition variables = new ArrayList<>(); + private List variables = new java.util.ArrayList<>(); public SetVariablesDefinition() { } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java index e7fb1e33e5357..02d4b1b9f97a4 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java @@ -28,7 +28,6 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.spi.Policy; import org.apache.camel.spi.TransactedPolicy; -import org.apache.camel.util.ObjectHelper; /** * Enables transaction on the route @@ -84,7 +83,7 @@ public void setOutputs(List> outputs) { @Override public String toString() { String desc = description(); - if (ObjectHelper.isEmpty(desc)) { + if (org.apache.camel.util.ObjectHelper.isEmpty(desc)) { return "Transacted"; } else { return "Transacted[" + desc + "]"; @@ -109,7 +108,7 @@ public String getShortName() { @Override public String getLabel() { String desc = description(); - if (ObjectHelper.isEmpty(desc)) { + if (org.apache.camel.util.ObjectHelper.isEmpty(desc)) { return "transacted"; } else { return "transacted[" + desc + "]"; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/app/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/app/package-info.java index 8ab7197a24384..ef60d6c73d8df 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/app/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/app/package-info.java @@ -20,9 +20,6 @@ * model can be used to group some Camel definitions (routes, templates) without using full Spring application context, * but when Spring's {@code } concept feels appropriate. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.app; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java index 9f0305d75140a..b1dfb0b7bae01 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java @@ -18,9 +18,6 @@ * The JAXB POJOs for various configurations for the XML * Configuration of the routing rules. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.config; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java index 581324bae468c..ba82f51939b32 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java @@ -18,9 +18,6 @@ * The JAXB POJOs for the Data Formats used to marshal and * unmarshal objects to and from streams inside components */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.dataformat; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java index 78934c2a20a28..d8086a96cd76d 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/DefaultErrorHandlerDefinition.java @@ -36,7 +36,6 @@ import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.Metadata; import org.apache.camel.support.ExpressionToPredicateAdapter; -import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** @@ -644,7 +643,7 @@ public DefaultErrorHandlerDefinition loggingLevel(LoggingLevel level) { * @param log the logger * @return the builder */ - public DefaultErrorHandlerDefinition log(Logger log) { + public DefaultErrorHandlerDefinition log(org.slf4j.Logger log) { if (loggerBean == null) { loggerBean = new CamelLogger(LoggerFactory.getLogger(DefaultErrorHandler.class), LoggingLevel.ERROR); } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java index 45df83cb08aef..c95be1ced7932 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java @@ -17,9 +17,6 @@ /** * The JAXB POJOs for the Error Handler. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.errorhandler; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java index b0fa5d9da8999..c5f481224232e 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java @@ -19,9 +19,6 @@ * Predicate plugins for the * XML Configuration. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.language; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java index 8d226ffa2ed7b..a28a95842767b 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java @@ -19,9 +19,6 @@ * The JAXB POJOs for the Load Balancer EIP pattern for the * XML Configuration. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.loadbalancer; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java index 3ee7e6e90cfa9..9adf5ec265ac2 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java @@ -18,9 +18,6 @@ * The JAXB POJOs for the XML Configuration of the routing * rules. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java index ff8e2aa3cffef..8dfb6449b61cf 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java @@ -18,9 +18,6 @@ /** * The JAXB POJOs for the REST DSL */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.rest; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/package-info.java index ca16fee8aeb0e..5a408856b1221 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/tokenizer/package-info.java @@ -19,9 +19,6 @@ * Predicate plugins for the * XML Configuration. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.tokenizer; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java index 205660e580ade..54b13e99842ac 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java @@ -18,9 +18,6 @@ * The JAXB POJOs for the Transformers used to transform message * contents according to declared data types inside components */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.transformer; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java index de052f291347e..fe194b5b94ca9 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java @@ -18,9 +18,6 @@ * The JAXB POJOs for the Transformers used to transform message * contents according to declared data types inside components */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.validator; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientList.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientList.java index d094659d4c859..606c6bbd6edcc 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientList.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientList.java @@ -35,7 +35,6 @@ import org.apache.camel.support.cache.DefaultProducerCache; import org.apache.camel.support.cache.EmptyProducerCache; import org.apache.camel.support.service.ServiceHelper; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,7 +92,7 @@ public RecipientList(CamelContext camelContext, Expression expression) { public RecipientList(CamelContext camelContext, Expression expression, String delimiter) { notNull(camelContext, "camelContext"); - ObjectHelper.notNull(expression, "expression"); + org.apache.camel.util.ObjectHelper.notNull(expression, "expression"); StringHelper.notEmpty(delimiter, "delimiter"); this.camelContext = camelContext; this.expression = expression; diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java index 960d3299e4d62..9bbb45d426710 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractPolicyReifier.java @@ -24,7 +24,6 @@ import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.spi.Policy; import org.apache.camel.spi.TransactedPolicy; -import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +46,7 @@ public Policy resolvePolicy(Policy policy, String ref, Class t return policy; } // explicit ref given so lookup by it - if (ObjectHelper.isNotEmpty(ref)) { + if (org.apache.camel.util.ObjectHelper.isNotEmpty(ref)) { return mandatoryLookup(ref, Policy.class); } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java index 2a6d196213d91..5b474db7da739 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java @@ -39,7 +39,7 @@ public abstract class AbstractReifier implements BeanRepository { - protected final Route route; + protected final org.apache.camel.Route route; protected final CamelContext camelContext; protected AbstractReifier(Route route) { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java index 4cb2000d415b4..1598470eb095f 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeadersReifier.java @@ -16,7 +16,6 @@ */ package org.apache.camel.reifier; -import java.util.ArrayList; import java.util.List; import org.apache.camel.Expression; @@ -39,8 +38,8 @@ public Processor createProcessor() throws Exception { if (definition.getHeaders().isEmpty()) { throw new IllegalArgumentException("There must be at least one header specified"); } - List nameExprs = new ArrayList<>(definition.getHeaders().size()); - List valueExprs = new ArrayList<>(definition.getHeaders().size()); + List nameExprs = new java.util.ArrayList<>(definition.getHeaders().size()); + List valueExprs = new java.util.ArrayList<>(definition.getHeaders().size()); for (SetHeaderDefinition hdrDef : definition.getHeaders()) { valueExprs.add(createExpression(hdrDef.getExpression())); Expression nameExpr; diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetVariablesReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetVariablesReifier.java index 7cec3889264c9..90e7ece6c9169 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetVariablesReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetVariablesReifier.java @@ -16,7 +16,6 @@ */ package org.apache.camel.reifier; -import java.util.ArrayList; import java.util.List; import org.apache.camel.Expression; @@ -39,8 +38,8 @@ public Processor createProcessor() throws Exception { if (definition.getVariables().isEmpty()) { throw new IllegalArgumentException("There must be at least one variable specified"); } - List nameExprs = new ArrayList<>(definition.getVariables().size()); - List valueExprs = new ArrayList<>(definition.getVariables().size()); + List nameExprs = new java.util.ArrayList<>(definition.getVariables().size()); + List valueExprs = new java.util.ArrayList<>(definition.getVariables().size()); for (SetVariableDefinition varDef : definition.getVariables()) { valueExprs.add(createExpression(varDef.getExpression())); Expression nameExpr; diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransactedReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransactedReifier.java index 14800054470e8..d8d7c684f3afa 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransactedReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/TransactedReifier.java @@ -24,7 +24,6 @@ import org.apache.camel.model.TransactedDefinition; import org.apache.camel.processor.WrapProcessor; import org.apache.camel.spi.Policy; -import org.apache.camel.util.ObjectHelper; public class TransactedReifier extends AbstractPolicyReifier { @@ -39,7 +38,7 @@ public TransactedReifier(CamelContext camelContext, ProcessorDefinition defin @Override public Processor createProcessor() throws Exception { Policy policy = resolvePolicy(); - ObjectHelper.notNull(policy, "policy", this); + org.apache.camel.util.ObjectHelper.notNull(policy, "policy", this); // before wrap policy.beforeWrap(route, definition); diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java index db781ae8ef92b..a2305b578cb36 100644 --- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java +++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java @@ -17,9 +17,6 @@ /** * The classes for working with Camel and XML along with the primary factory beans. */ -@XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.core.xml; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java index 095e22d8794e8..55f91d28f0c18 100644 --- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java +++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java @@ -14,10 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@XmlSchema( - namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema( + namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.core.xml.util.jsse; - -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java index ced209a2aa8c9..3adb9290a7046 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java @@ -154,7 +154,7 @@ public void setUp() throws Exception { private static class SortByName implements Comparator { @Override - public int compare(String o1, String o2) { + public int compare(java.lang.String o1, java.lang.String o2) { return o1.compareToIgnoreCase(o2); } } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseFilterTest.java index 069c03e9bf2bf..c7f4378eecd2c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseFilterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseFilterTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.browse; import java.util.Collection; -import java.util.function.Predicate; import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; @@ -67,7 +66,7 @@ public void configure() { }; } - private static class EvenPredicate implements Predicate { + private static class EvenPredicate implements java.util.function.Predicate { @Override public boolean test(Exchange exchange) { diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesTest.java index f3f5b0398f02c..ea786c20d7bd6 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesTest.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; -import org.apache.camel.spi.PropertiesComponent; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -37,7 +36,7 @@ public boolean isUseRouteBuilder() { void testLoadProperties() { context.start(); - PropertiesComponent pc = context.getPropertiesComponent(); + org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); Properties prop = pc.loadProperties(); assertNotNull(prop); diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentReloadPropertiesTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentReloadPropertiesTest.java index 34ea611fb7707..98e16b4b74869 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentReloadPropertiesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentReloadPropertiesTest.java @@ -21,7 +21,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; -import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; @@ -44,7 +43,7 @@ public boolean isUseRouteBuilder() { public void testReloadProperties() throws Exception { context.start(); - PropertiesComponent pc = context.getPropertiesComponent(); + org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); Properties prop = pc.loadProperties(); assertNotNull(prop); @@ -71,7 +70,7 @@ public void testReloadProperties() throws Exception { public void testReloadPropertiesPattern() throws Exception { context.start(); - PropertiesComponent pc = context.getPropertiesComponent(); + org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); Properties prop = pc.loadProperties(); assertNotNull(prop); @@ -99,7 +98,7 @@ public void testReloadPropertiesPattern() throws Exception { public void testReloadNotMatch() { context.start(); - PropertiesComponent pc = context.getPropertiesComponent(); + org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); Properties prop = pc.loadProperties(); assertNotNull(prop); diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentResolvedValueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentResolvedValueTest.java index b2e6fa95c0680..c7768d3341228 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentResolvedValueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentResolvedValueTest.java @@ -19,7 +19,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.spi.PropertiesComponent; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -27,7 +26,7 @@ public class PropertiesComponentResolvedValueTest extends ContextTestSupport { @Test public void testResolved() { - PropertiesComponent pc = context.getPropertiesComponent(); + org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); Assertions.assertTrue(pc.getResolvedValue("unknown").isEmpty()); Assertions.assertTrue(pc.getResolvedValue("greeting").isPresent()); diff --git a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltTransformingExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltTransformingExceptionTest.java index d41c2359206a4..507f101ec8f6e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltTransformingExceptionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltTransformingExceptionTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.xslt; -import javax.xml.transform.TransformerException; - import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; @@ -40,7 +38,7 @@ public void testXsltException() throws Exception { () -> template.sendBody("direct:start", BAD_XML_STRING), "Except a camel Execution exception here"); - boolean b = ex.getCause() instanceof TransformerException; + boolean b = ex.getCause() instanceof javax.xml.transform.TransformerException; assertTrue(b); // we should not get any message from the result endpoint @@ -58,7 +56,7 @@ public void testXsltWithoutException() throws Exception { () -> template.sendBody("direct:start", GOOD_XML_STRING), "Except a camel Execution exception here"); - boolean b = ex.getCause() instanceof TransformerException; + boolean b = ex.getCause() instanceof javax.xml.transform.TransformerException; assertTrue(b); assertMockEndpointsSatisfied(); diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java index 554c524f9be6b..71c0fe689a18d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java @@ -16,7 +16,12 @@ */ package org.apache.camel.converter.stream; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.StringJoiner; @@ -156,7 +161,7 @@ public void testCacheStreamToFileAndCloseStreamEncrypted() throws Exception { assertEquals(1, files.length, "we should have a temp file"); assertTrue(new File(file, files[0]).length() > 10, "The content is written"); - FileInputStream tmpin = new FileInputStream(new File(file, files[0])); + java.io.FileInputStream tmpin = new java.io.FileInputStream(new File(file, files[0])); String temp = toString(tmpin); assertTrue(!temp.isEmpty() && !temp.contains("aaa"), "The content is not encrypted"); tmpin.close(); diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java index 2ec56f830e863..e760fe644ce2d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java @@ -33,7 +33,6 @@ import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.support.component.PropertyConfigurerSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -137,7 +136,7 @@ public void setCookiePolicy(CookiePolicy cookiePolicy) { } } - private static class MyComponentConfigurer extends PropertyConfigurerSupport + private static class MyComponentConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredTest.java index 745b7a672744d..d9224bc8ab409 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredTest.java @@ -28,7 +28,6 @@ import org.apache.camel.spi.PropertyConfigurerGetter; import org.apache.camel.spi.Registry; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.support.component.PropertyConfigurerSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -58,8 +57,8 @@ public void testAutowired() { private static final class MyComponent extends DefaultComponent { - private ContentHandlerFactory contentHandlerFactory; - private CookiePolicy cookiePolicy; + private java.net.ContentHandlerFactory contentHandlerFactory; + private java.net.CookiePolicy cookiePolicy; private MyComponent(CamelContext context) { super(context); @@ -87,7 +86,7 @@ public void setCookiePolicy(CookiePolicy cookiePolicy) { } } - private static class MyComponentConfigurer extends PropertyConfigurerSupport + private static class MyComponentConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { @Override @@ -109,7 +108,7 @@ public boolean configure(CamelContext camelContext, Object target, String name, @Override public Class getOptionType(String name, boolean ignoreCase) { if ("contentHandlerFactory".equals(name)) { - return ContentHandlerFactory.class; + return java.net.ContentHandlerFactory.class; } else { return null; } diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java b/core/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java index ac2c17dd675b6..b2f5e123ad001 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/DummyLifecycleStrategy.java @@ -63,22 +63,22 @@ public void onEndpointRemove(Endpoint endpoint) { } @Override - public void onServiceAdd(CamelContext context, Service service, Route route) { + public void onServiceAdd(CamelContext context, Service service, org.apache.camel.Route route) { events.add("onServiceAdd"); } @Override - public void onServiceRemove(CamelContext context, Service service, Route route) { + public void onServiceRemove(CamelContext context, Service service, org.apache.camel.Route route) { events.add("onServiceRemove"); } @Override - public void onRoutesAdd(Collection routes) { + public void onRoutesAdd(Collection routes) { events.add("onRoutesAdd"); } @Override - public void onRoutesRemove(Collection routes) { + public void onRoutesRemove(Collection routes) { events.add("onRoutesRemove"); } diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/MyBean.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/MyBean.java index f6ee76fde05b4..edfe94db1e2d3 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/MyBean.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/MyBean.java @@ -16,9 +16,7 @@ */ package org.apache.camel.impl.engine; -import org.apache.camel.spi.annotations.Component; - -@Component(value = "MyBean") +@org.apache.camel.spi.annotations.Component(value = "MyBean") public class MyBean { public String addString(String source, String dst) { return source + dst; diff --git a/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java b/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java index 031cad3972dd1..3739c16ff4b2c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/model/SetHeadersDefinitionTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.model; -import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -31,7 +29,7 @@ class SetHeadersDefinitionTest extends TestSupport { @Test void testSetFromMap() { - Map headerMap = new LinkedHashMap<>(3); + Map headerMap = new java.util.LinkedHashMap<>(3); headerMap.put("fromBody", body()); headerMap.put("isCamel", ExpressionNodeHelper.toExpressionDefinition(body().contains("Camel"))); headerMap.put("isHorse", ExpressionNodeHelper.toExpressionDefinition(body().contains("Horse"))); @@ -48,7 +46,7 @@ void testSetFromMapOf() { "isCamel", body().contains("Camel"), "isHorse", body().contains("Horse"))); assertNotNull(setHeadersDef.getHeaders()); assertEquals(3, setHeadersDef.getHeaders().size()); - Set names = new HashSet<>(); + Set names = new java.util.HashSet<>(); for (SetHeaderDefinition setHdrDef : setHeadersDef.getHeaders()) { names.add(setHdrDef.getName()); } diff --git a/core/camel-core/src/test/java/org/apache/camel/model/SetVariablesDefinitionTest.java b/core/camel-core/src/test/java/org/apache/camel/model/SetVariablesDefinitionTest.java index 20c835de80c84..e1fca27ec956f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/model/SetVariablesDefinitionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/model/SetVariablesDefinitionTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.model; -import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -32,7 +30,7 @@ class SetVariablesDefinitionTest extends TestSupport { @Test void testSetFromMap() { - Map map = new LinkedHashMap<>(3); + Map map = new java.util.LinkedHashMap<>(3); map.put("fromBody", body()); map.put("isCamel", ExpressionNodeHelper.toExpressionDefinition(body().contains("Camel"))); map.put("isHorse", ExpressionNodeHelper.toExpressionDefinition(body().contains("Horse"))); @@ -49,7 +47,7 @@ void testSetFromMapOf() { "isCamel", body().contains("Camel"), "isHorse", body().contains("Horse"))); assertNotNull(def.getVariables()); assertEquals(3, def.getVariables().size()); - Set names = new HashSet<>(); + Set names = new java.util.HashSet<>(); for (SetVariableDefinition varDef : def.getVariables()) { names.add(varDef.getName()); } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java index d9928be829df0..7b238ee730445 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java @@ -18,7 +18,6 @@ import java.util.concurrent.atomic.AtomicInteger; -import org.apache.camel.RecipientList; import org.apache.camel.spi.Registry; public class BeanRecipientListInterfaceAnnotationTest extends BeanRecipientListTest { @@ -35,7 +34,7 @@ protected Registry createCamelRegistry() throws Exception { } interface Route { - @RecipientList + @org.apache.camel.RecipientList String[] route(String body); } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java index 36bec8aec17bb..dd0e6fffe07a8 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java @@ -19,7 +19,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.camel.ContextTestSupport; -import org.apache.camel.RecipientList; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.BeforeEach; @@ -86,7 +85,7 @@ public String toString() { return "MyBean:" + id; } - @RecipientList + @org.apache.camel.RecipientList public String[] route(String body) { LOG.debug("Called {} with body: {}", this, body); return new String[] { "mock:a", "mock:b" }; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java index 86449076fa1e3..095a88fc0377a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java @@ -20,7 +20,6 @@ import java.util.List; import org.apache.camel.ContextTestSupport; -import org.apache.camel.DynamicRouter; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; @@ -69,7 +68,7 @@ public void configure() { // START SNIPPET: e2 public static class MyBean { - @DynamicRouter + @org.apache.camel.DynamicRouter public String dynamicRouter(String body) { bodies.add(body); invoked++; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanOnPrepareTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanOnPrepareTest.java index cc57ae7f20149..fa56e96d4e490 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanOnPrepareTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanOnPrepareTest.java @@ -19,7 +19,6 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.RecipientList; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -81,7 +80,7 @@ public void process(Exchange exchange) { }; } - @RecipientList(onPrepare = "myPrepare") + @org.apache.camel.RecipientList(onPrepare = "myPrepare") public static String doSomething() { return "direct:a,direct:b"; } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanSubUnitOfWorkTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanSubUnitOfWorkTest.java index df64d3010c07d..c8388696ce8c1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanSubUnitOfWorkTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListBeanSubUnitOfWorkTest.java @@ -19,7 +19,6 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.RecipientList; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; @@ -84,7 +83,7 @@ public void configure() { public static class WhereToGoBean { - @RecipientList(shareUnitOfWork = true) + @org.apache.camel.RecipientList(shareUnitOfWork = true) public String whereToGo() { return "direct:a,direct:b"; } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java index d14a4b6cad877..35cf3535c4cb7 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListFineGrainedErrorHandlingTest.java @@ -21,7 +21,6 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; -import org.apache.camel.RecipientList; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -186,7 +185,7 @@ public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { public static class MyRecipientBean { - @RecipientList(stopOnException = true) + @org.apache.camel.RecipientList(stopOnException = true) public String sendSomewhere(Exchange exchange) { return "mock:foo,mock:bar,bean:fail,mock:baz"; } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java index a052d114813dd..fbe751d8a1145 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelFineGrainedErrorHandlingTest.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; -import org.apache.camel.RecipientList; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -139,7 +138,7 @@ public boolean isUseRouteBuilder() { public static class MyRecipientBean { - @RecipientList(stopOnException = true, parallelProcessing = true) + @org.apache.camel.RecipientList(stopOnException = true, parallelProcessing = true) public String sendSomewhere(Exchange exchange) { return "mock:foo,mock:bar,bean:fail,mock:baz"; } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java index 0b598d9ff2eeb..8ec97b7c27980 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java @@ -17,7 +17,6 @@ package org.apache.camel.processor; import org.apache.camel.ContextTestSupport; -import org.apache.camel.RecipientList; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; @@ -75,7 +74,7 @@ public void configure() { public static class MyBean { - @RecipientList + @org.apache.camel.RecipientList public String[] route() { return new String[] { "direct:a", "direct:b" }; } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java index b7edde03ab45d..fb92857bc9ede 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.processor; -import java.util.LinkedHashMap; import java.util.Map; import org.apache.camel.ContextTestSupport; @@ -30,7 +29,7 @@ public class SetHeadersProcessorTest extends ContextTestSupport { public static class HeaderBean { - final Map map = new LinkedHashMap<>(); + final Map map = new java.util.LinkedHashMap<>(); public HeaderBean() { } @@ -45,7 +44,7 @@ Map getHeaders(String body) { } } - private final Map headerMap = new LinkedHashMap<>(); + private final Map headerMap = new java.util.LinkedHashMap<>(); protected final String body = ""; protected MockEndpoint expected; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetVariablesProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetVariablesProcessorTest.java index 4c0d5610f947a..c8bba506e8fee 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/SetVariablesProcessorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetVariablesProcessorTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.processor; -import java.util.LinkedHashMap; import java.util.Map; import org.apache.camel.ContextTestSupport; @@ -30,7 +29,7 @@ public class SetVariablesProcessorTest extends ContextTestSupport { public static class VarBean { - final Map map = new LinkedHashMap<>(); + final Map map = new java.util.LinkedHashMap<>(); public VarBean() { } @@ -45,7 +44,7 @@ Map getVariables(String body) { } } - private final Map varMap = new LinkedHashMap<>(); + private final Map varMap = new java.util.LinkedHashMap<>(); protected final String body = ""; protected MockEndpoint expected; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java index 6be2a34d93cfe..c14fded45e14b 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java @@ -19,7 +19,6 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.Traceable; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; @@ -45,7 +44,7 @@ public void configure() { }; } - private static class MyProcessor implements Processor, Traceable { + private static class MyProcessor implements Processor, org.apache.camel.Traceable { @Override public void process(Exchange exchange) { diff --git a/core/camel-core/src/test/java/org/apache/camel/support/component/TestProxy.java b/core/camel-core/src/test/java/org/apache/camel/support/component/TestProxy.java index f0a20449bf673..f5904163b6a75 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/component/TestProxy.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/component/TestProxy.java @@ -16,7 +16,10 @@ */ package org.apache.camel.support.component; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; class TestProxy { @@ -76,16 +79,16 @@ public Map greetAll(Map nameMap) { return result; } - public final T sayHiResource(Set resourceType, String resourceId) { + public final T sayHiResource(java.util.Set resourceType, String resourceId) { return null; } - public final T with(T theDate) { + public final T with(T theDate) { return null; } - public final String withDate( - T theDate, Class dateClass, Class parameter, T parameters) { + public final String withDate( + T theDate, Class dateClass, Class parameter, T parameters) { return null; } diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java index 3cd58d8e91e06..8315d9f4a66e1 100644 --- a/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java +++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java @@ -22,13 +22,12 @@ import org.apache.camel.Ordered; import org.apache.camel.ServiceStatus; import org.apache.camel.health.HealthCheckResultBuilder; -import org.apache.camel.spi.annotations.HealthCheck; /** * {@link org.apache.camel.health.HealthCheck} that checks the status of the {@link CamelContext} whether its started or * not. */ -@HealthCheck("context-check") +@org.apache.camel.spi.annotations.HealthCheck("context-check") public final class ContextHealthCheck extends AbstractHealthCheck { public ContextHealthCheck() { diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteControllerHealthCheck.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteControllerHealthCheck.java index 4aefc0a0a48be..b483188295b0e 100644 --- a/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteControllerHealthCheck.java +++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteControllerHealthCheck.java @@ -26,14 +26,13 @@ import org.apache.camel.health.HealthCheckResultBuilder; import org.apache.camel.spi.RouteController; import org.apache.camel.spi.SupervisingRouteController; -import org.apache.camel.spi.annotations.HealthCheck; import org.apache.camel.util.URISupport; import org.apache.camel.util.backoff.BackOffTimer; /** * Readiness {@link org.apache.camel.health.HealthCheck} for route controller. */ -@HealthCheck("route-controller-check") +@org.apache.camel.spi.annotations.HealthCheck("route-controller-check") public class RouteControllerHealthCheck extends AbstractHealthCheck { public RouteControllerHealthCheck() { diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/SecurityPolicyHealthCheck.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/SecurityPolicyHealthCheck.java index 483f87f189dbe..4c8543b52719b 100644 --- a/core/camel-health/src/main/java/org/apache/camel/impl/health/SecurityPolicyHealthCheck.java +++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/SecurityPolicyHealthCheck.java @@ -21,7 +21,6 @@ import java.util.StringJoiner; import org.apache.camel.health.HealthCheckResultBuilder; -import org.apache.camel.spi.annotations.HealthCheck; import org.apache.camel.util.SecurityViolation; /** @@ -34,7 +33,7 @@ * This is a readiness check only — security violations don't mean the application is dead (liveness), but they indicate * it may not be ready for production traffic. */ -@HealthCheck("security-policy-check") +@org.apache.camel.spi.annotations.HealthCheck("security-policy-check") public final class SecurityPolicyHealthCheck extends AbstractHealthCheck { private static final String RESULT_CLASS = "org.apache.camel.main.SecurityPolicyResult"; diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java index a7b580fe897ad..bbd751cbb94ee 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java @@ -601,7 +601,7 @@ public static void afterConfigure(final CamelContext camelContext) throws Except if (healthCheckRegistry != null) { // Health check repository Set repositories = registry.findByType(HealthCheckRepository.class); - if (ObjectHelper.isNotEmpty(repositories)) { + if (org.apache.camel.util.ObjectHelper.isNotEmpty(repositories)) { for (HealthCheckRepository repository : repositories) { healthCheckRegistry.register(repository); } diff --git a/core/camel-main/src/main/java/org/apache/camel/main/SecurityConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/SecurityConfigurationProperties.java index 917145853f89a..f1b46e6a6efc6 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/SecurityConfigurationProperties.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/SecurityConfigurationProperties.java @@ -18,7 +18,6 @@ import java.util.Collections; import java.util.LinkedHashSet; -import java.util.Locale; import java.util.Set; import org.apache.camel.spi.BootstrapCloseable; @@ -186,7 +185,7 @@ private static String normalizePolicy(String value) { if (value == null) { return null; } - String normalized = value.toLowerCase(Locale.ENGLISH); + String normalized = value.toLowerCase(java.util.Locale.ENGLISH); if (!VALID_POLICIES.contains(normalized)) { throw new IllegalArgumentException( "Invalid security policy value: '" + value + "'. Must be one of: " + VALID_POLICIES); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainComponentAutowiredFalseTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainComponentAutowiredFalseTest.java index abdfea83fcc1c..a5a679a397fc9 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainComponentAutowiredFalseTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainComponentAutowiredFalseTest.java @@ -26,7 +26,6 @@ import org.apache.camel.spi.GeneratedPropertyConfigurer; import org.apache.camel.spi.PropertyConfigurerGetter; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.support.component.PropertyConfigurerSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -116,7 +115,7 @@ public void setHello(String hello) { } } - private static class MyComponentConfigurer extends PropertyConfigurerSupport + private static class MyComponentConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { @Override diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSSLTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSSLTest.java index 9f0de001d989d..b9f18ad2e938e 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSSLTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSSLTest.java @@ -17,8 +17,6 @@ package org.apache.camel.main; import java.security.KeyStore; -import java.security.cert.X509Certificate; -import java.util.Collection; import java.util.List; import javax.net.ssl.SSLContext; @@ -457,12 +455,12 @@ public void testSelfSignedCertificateGenerator() throws Exception { Assertions.assertTrue(ks.containsAlias("camel-self-signed")); assertNotNull(ks.getKey("camel-self-signed", "test-password".toCharArray())); - X509Certificate cert - = (X509Certificate) ks.getCertificate("camel-self-signed"); + java.security.cert.X509Certificate cert + = (java.security.cert.X509Certificate) ks.getCertificate("camel-self-signed"); assertNotNull(cert); // verify the certificate has a SAN extension with localhost - Collection> sans = cert.getSubjectAlternativeNames(); + java.util.Collection> sans = cert.getSubjectAlternativeNames(); assertNotNull(sans); // should have DNS:localhost and IP:127.0.0.1 Assertions.assertTrue(sans.size() >= 2); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSecurityPolicyHealthCheckTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSecurityPolicyHealthCheckTest.java index 521a696bf59b2..ef627f2816bc2 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSecurityPolicyHealthCheckTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSecurityPolicyHealthCheckTest.java @@ -16,13 +16,11 @@ */ package org.apache.camel.main; -import java.util.List; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheck; import org.apache.camel.impl.health.SecurityPolicyHealthCheck; -import org.apache.camel.util.SecurityViolation; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -92,8 +90,8 @@ public void testHealthCheckDownWithFailViolations() { // create result with a fail-level violation SecurityPolicyResult policyResult = new SecurityPolicyResult( - List.of( - new SecurityViolation( + java.util.List.of( + new org.apache.camel.util.SecurityViolation( "insecure:ssl", "camel.ssl.trustAllCertificates", "Insecure SSL", "fail"))); ctx.getCamelContextExtension().addContextPlugin(SecurityPolicyResult.class, policyResult); diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java index a6f8f47fb77d9..9f1ceb1a40833 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectNameStrategy.java @@ -31,7 +31,6 @@ import org.apache.camel.NamedNode; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.Route; import org.apache.camel.Service; import org.apache.camel.StaticService; import org.apache.camel.cluster.CamelClusterService; @@ -378,7 +377,7 @@ public ObjectName getObjectNameForEventNotifier(CamelContext context, EventNotif } @Override - public ObjectName getObjectNameForRoute(Route route) throws MalformedObjectNameException { + public ObjectName getObjectNameForRoute(org.apache.camel.Route route) throws MalformedObjectNameException { StringBuilder buffer = new StringBuilder(); buffer.append(domainName).append(":"); buffer.append(KEY_CONTEXT).append("=").append(getContextId(route.getCamelContext())).append(","); diff --git a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java index e9f8f57a5bacb..c6441361d8f6b 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; -import java.util.function.Consumer; import org.apache.camel.CamelContext; import org.apache.camel.spi.LifecycleStrategy; @@ -55,7 +54,7 @@ public void setupManagement(CamelContext camelContext, ManagementStrategy strate // a bit of ugly code to handover pre registered services that has been add to an eager/provisional JmxManagementLifecycleStrategy // which is now re-placed with a new JmxManagementLifecycleStrategy that is based on the end user configured settings // and therefore will be in use - List> preServices = null; + List> preServices = null; JmxManagementLifecycleStrategy jmx = camelContext.getLifecycleStrategies().stream() .filter(s -> s instanceof JmxManagementLifecycleStrategy) .map(JmxManagementLifecycleStrategy.class::cast) @@ -65,7 +64,7 @@ public void setupManagement(CamelContext camelContext, ManagementStrategy strate } if (preServices != null && !preServices.isEmpty() && lifecycle instanceof JmxManagementLifecycleStrategy existing) { - for (Consumer pre : preServices) { + for (java.util.function.Consumer pre : preServices) { existing.addPreService(pre); } } diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteGroupLastErrorTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteGroupLastErrorTest.java index 4a9f8e5f04065..d84d414ff789d 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteGroupLastErrorTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteGroupLastErrorTest.java @@ -66,7 +66,7 @@ public void testLastError() throws Exception { String group = (String) mbeanServer.getAttribute(on, "RouteGroup"); assertEquals("myGroup", group); - RouteError re = (RouteError) mbeanServer.getAttribute(on, "LastError"); + org.apache.camel.api.management.mbean.RouteError re = (RouteError) mbeanServer.getAttribute(on, "LastError"); Assertions.assertNotNull(re); Assertions.assertInstanceOf(RejectedExecutionException.class, re.getException()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java index 3ff4012392d16..b0887bd08a8b2 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedTimerTest.java @@ -22,7 +22,6 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import org.apache.camel.ServiceStatus; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; @@ -66,7 +65,7 @@ public void testTimer() throws Exception { // Take the time to check the service is started to help avoid // sporadic failure on slower machines. String state = (String) mbeanServer.getAttribute(on, "State"); - assertEquals(ServiceStatus.Started.name(), state, "Should be started"); + assertEquals(org.apache.camel.ServiceStatus.Started.name(), state, "Should be started"); // start and we should be done in at most 3 second mock.expectedMinimumMessageCount(3); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java index 5d6d29d06be36..e691ac749a09b 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultRegistry.java @@ -193,7 +193,7 @@ public void bind(String id, Class type, Object bean, String initMethod, Strin CamelContextAware.trySetCamelContext(bean, camelContext); if (isNotEmpty(initMethod)) { try { - ObjectHelper.invokeMethodSafe(initMethod, bean); + org.apache.camel.support.ObjectHelper.invokeMethodSafe(initMethod, bean); } catch (Exception e) { throw RuntimeCamelException.wrapRuntimeCamelException(e); } @@ -261,7 +261,7 @@ protected void destroyBean(String name, boolean remove) { } if (target != null) { try { - ObjectHelper.invokeMethodSafe(destroyMethod, target); + org.apache.camel.support.ObjectHelper.invokeMethodSafe(destroyMethod, target); } catch (Exception e) { LOG.warn("Error invoking destroy method: {} on bean: {} due to: {}. This exception is ignored.", destroyMethod, target, e.getMessage(), e); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/LifecycleStrategySupport.java b/core/camel-support/src/main/java/org/apache/camel/support/LifecycleStrategySupport.java index 14db96b922eaa..7218c2ba55c1e 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/LifecycleStrategySupport.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/LifecycleStrategySupport.java @@ -208,22 +208,22 @@ public void onEndpointRemove(Endpoint endpoint) { } @Override - public void onServiceAdd(CamelContext context, Service service, Route route) { + public void onServiceAdd(CamelContext context, Service service, org.apache.camel.Route route) { // noop } @Override - public void onServiceRemove(CamelContext context, Service service, Route route) { + public void onServiceRemove(CamelContext context, Service service, org.apache.camel.Route route) { // noop } @Override - public void onRoutesAdd(Collection routes) { + public void onRoutesAdd(Collection routes) { // noop } @Override - public void onRoutesRemove(Collection routes) { + public void onRoutesRemove(Collection routes) { // noop } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/LocalBeanRegistry.java b/core/camel-support/src/main/java/org/apache/camel/support/LocalBeanRegistry.java index e43758f5bfaac..42d364542a5e4 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/LocalBeanRegistry.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/LocalBeanRegistry.java @@ -58,7 +58,7 @@ public void close() throws IOException { Object bean = lookupByName(id); if (bean != null) { try { - ObjectHelper.invokeMethodSafe(method, bean); + org.apache.camel.support.ObjectHelper.invokeMethodSafe(method, bean); } catch (Exception e) { // ignore } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java index 1d7ddf67a898b..6d6f1e4ce3e2a 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java @@ -437,7 +437,7 @@ private static Object attemptCreateNewInstanceViaReflection( Object obj = getObjectForType(camelContext, parameterType); if (obj != null) { - ObjectHelper.invokeMethod(method, newTarget, obj); + org.apache.camel.support.ObjectHelper.invokeMethod(method, newTarget, obj); answer = obj; } } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java index 49d63c3005b32..49c0ed3132b67 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java @@ -16,8 +16,6 @@ */ package org.apache.camel.support.builder; -import java.io.IOException; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; @@ -2812,10 +2810,10 @@ private static String prettyXml(String rawXml) { } private static String serializeCarelessly(Object value) { - final StringWriter writer = new StringWriter(); + final java.io.StringWriter writer = new java.io.StringWriter(); try { Jsoner.serializeCarelessly(value, writer); - } catch (final IOException caught) { + } catch (final java.io.IOException caught) { /* See StringWriter. */ } return writer.toString(); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java index 81ece9086cade..e8c621ecf0fb9 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java @@ -40,7 +40,6 @@ import javax.naming.spi.NamingManager; import org.apache.camel.util.CastUtils; -import org.apache.camel.util.ObjectHelper; /** * A default JNDI context @@ -110,8 +109,8 @@ boolean isFrozen() { * (the names are suitably extended by the segment originally lopped off). */ protected Map internalBind(String name, Object value) throws NamingException { - ObjectHelper.notNullOrEmpty(name, "name"); - ObjectHelper.notNull(frozen, "frozen"); + org.apache.camel.util.ObjectHelper.notNullOrEmpty(name, "name"); + org.apache.camel.util.ObjectHelper.notNull(frozen, "frozen"); Map newBindings = new HashMap<>(); int pos = name.indexOf('/'); @@ -123,7 +122,7 @@ protected Map internalBind(String name, Object value) throws Nam newBindings.put(name, value); } else { String segment = name.substring(0, pos); - ObjectHelper.notNullOrEmpty(segment, "segment"); + org.apache.camel.util.ObjectHelper.notNullOrEmpty(segment, "segment"); Object o = treeBindings.get(segment); if (o == null) { o = newContext(); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanHelper.java index 1a370d5a60756..781de63fad044 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanHelper.java @@ -32,7 +32,6 @@ import org.apache.camel.spi.Injector; import org.apache.camel.spi.PackageScanClassResolver; import org.apache.camel.spi.Registry; -import org.apache.camel.support.ObjectHelper; import org.apache.camel.support.PluginHelper; import static org.apache.camel.util.ObjectHelper.isEmpty; @@ -163,7 +162,7 @@ public static void registerBeans(CamelContext camelContext, Set packages String method = entry.getValue(); // phase-5: now call init method on created beans try { - ObjectHelper.invokeMethodSafe(method, bean); + org.apache.camel.support.ObjectHelper.invokeMethodSafe(method, bean); } catch (Exception e) { throw RuntimeCamelException.wrapRuntimeCamelException(e); } diff --git a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java index bf539d8a83b46..4d4a80ba5b05d 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java @@ -42,7 +42,6 @@ import java.nio.charset.UnsupportedCharsetException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Scanner; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; @@ -493,7 +492,7 @@ public static void closeIterator(Object it) throws IOException { if (it instanceof Closeable closeable) { IOHelper.closeWithException(closeable); } - if (it instanceof Scanner scanner) { + if (it instanceof java.util.Scanner scanner) { IOException ioException = scanner.ioException(); if (ioException != null) { throw ioException; diff --git a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java index 497afb0977446..9316bdf8ae869 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java @@ -303,7 +303,7 @@ public static Optional firstNotNull(Object... values) { * @param supplier the supplier, the supplier to be used to get a value if value is null */ public static T supplyIfEmpty(T value, Supplier supplier) { - ObjectHelper.notNull(supplier, "Supplier"); + org.apache.camel.util.ObjectHelper.notNull(supplier, "Supplier"); if (isNotEmpty(value)) { return value; } @@ -434,7 +434,7 @@ public static Class loadClass(String name, ClassLoader loader) { public static Class loadClass(String name, ClassLoader loader, boolean needToWarn) { // must clean the name so its pure java name, eg removing \n or whatever people can do in the Spring XML name = StringHelper.normalizeClassName(name); - if (ObjectHelper.isEmpty(name)) { + if (org.apache.camel.util.ObjectHelper.isEmpty(name)) { return null; } @@ -1087,7 +1087,7 @@ public static boolean hasAnnotation(Annotation[] annotations, Class type) { * @param type the annotation * @return the annotation, or null if the instance does not have the given annotation */ - public static A getAnnotation(Object instance, Class type) { + public static A getAnnotation(Object instance, Class type) { return instance.getClass().getAnnotation(type); } @@ -1098,7 +1098,7 @@ public static A getAnnotation(Object instance, Class t * @param type the annotation * @return the annotation, or null if the instance does not have the given annotation */ - public static A getAnnotationDeep(Object instance, Class type) { + public static A getAnnotationDeep(Object instance, Class type) { Class clazz = instance.getClass(); while (clazz != Object.class) { A ann = clazz.getAnnotation(type); diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index fdb98e05e0022..63ba11da1b72b 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -1102,10 +1102,10 @@ public TransformerFactory createTransformerFactory() { // Enable the Security feature by default try { - factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); + factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (TransformerConfigurationException e) { LOG.warn("TransformerFactory doesn't support the feature {} with value {}, due to {}.", - XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); + javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); } LOG.debug("Configuring TransformerFactory to not allow access to external DTD/Stylesheet"); try { @@ -1194,10 +1194,10 @@ public SAXParserFactory createSAXParserFactory() { SAXParserFactory sfactory = SAXParserFactory.newInstance(); // Need to setup XMLReader security feature by default try { - sfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); + sfactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (Exception e) { LOG.warn("SAXParser doesn't support the feature {} with value {}, due to {}.", - XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); + javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); } try { sfactory.setFeature("http://xml.org/sax/features/external-general-entities", false); diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java index f9d7fc62a7a7c..1329c00dc5a1e 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/NamespacesHelper.java @@ -37,7 +37,7 @@ public static Namespaces namespaces(Element element) { private static void add(Namespaces namespaces, Element element) { // let's set the parent first in case we overload a prefix here Node parentNode = element.getParentNode(); - if (parentNode instanceof Element) { + if (parentNode instanceof org.w3c.dom.Element) { add(namespaces, (Element) parentNode); } NamedNodeMap attributes = element.getAttributes(); diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java index 97fb40fde2617..a473e537c9165 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java @@ -189,10 +189,10 @@ public TransformerFactory createTransformerFactory() { // Enable the Security feature by default try { - factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); + factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (TransformerConfigurationException e) { LOG.warn("TransformerFactory doesn't support the feature {} with value {}, due to {}.", - XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage(), e); + javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage(), e); } LOG.debug("Configuring TransformerFactory to not allow access to external DTD/Stylesheet"); factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java index d0ac8e872decc..6b7d736417607 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.Reader; import javax.xml.transform.stream.StreamSource; @@ -68,7 +67,7 @@ public StreamSourceCache(StreamCache streamCache) { this.readCache = null; } else if (streamCache instanceof ReaderCache readerCache) { this.readCache = readerCache; - setReader((Reader) streamCache); + setReader((java.io.Reader) streamCache); } else { this.readCache = null; } diff --git a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java index 0fba4ee4d9114..6f71d159b2436 100644 --- a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java +++ b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/XPathNamespacesTest.java @@ -44,7 +44,7 @@ void testNamespace() throws Exception { .hasSize(3); StringWriter sw = new StringWriter(); - new ModelWriter(sw).writeRoutesDefinition(routesDefinition.get()); + new org.apache.camel.yaml.out.ModelWriter(sw).writeRoutesDefinition(routesDefinition.get()); assertThat(sw).hasToString(EXPECTED_YAML); } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java index bcfac837bd932..aa454cccbabb2 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyList.java @@ -22,7 +22,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Properties; @@ -213,7 +212,7 @@ protected Integer export() throws Exception { Path buildDir = Paths.get(EXPORT_DIR); try { Files.walk(buildDir) - .sorted(Comparator.reverseOrder()) + .sorted(java.util.Comparator.reverseOrder()) .forEach(p -> { try { Files.deleteIfExists(p); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java index 319f783da2a58..5854f14979d9c 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Explain.java @@ -20,7 +20,6 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.net.http.HttpTimeoutException; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; @@ -603,7 +602,7 @@ private String sendStreamingRequest(String url, JsonObject body) { printer().println(); return fullResponse.toString(); - } catch (HttpTimeoutException e) { + } catch (java.net.http.HttpTimeoutException e) { printer().printErr("\nRequest timed out after " + timeout + " seconds."); return null; } catch (Exception e) { @@ -633,7 +632,7 @@ private JsonObject sendRequest(String url, JsonObject body, String authKey) { handleErrorStatus(response.statusCode(), response.body()); return null; - } catch (HttpTimeoutException e) { + } catch (java.net.http.HttpTimeoutException e) { printer().printErr("Request timed out after " + timeout + " seconds."); return null; } catch (Exception e) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java index 125be1559e744..a07b0651fea5a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java @@ -16,7 +16,6 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -1256,7 +1255,7 @@ protected static String jkubeMavenPluginVersion(Path settings, Properties props) // This method is kept for backward compatibility with derived classes @Deprecated - protected void safeCopy(File source, File target, boolean override) throws Exception { + protected void safeCopy(java.io.File source, java.io.File target, boolean override) throws Exception { ExportHelper.safeCopy(source.toPath(), target.toPath(), override); } @@ -1298,7 +1297,7 @@ protected void createDeferredSymlinks(Path buildDir, Path exportDir) throws Exce // This method is kept for backward compatibility with derived classes @Deprecated - protected void safeCopy(InputStream source, File target) throws Exception { + protected void safeCopy(InputStream source, java.io.File target) throws Exception { ExportHelper.safeCopy(source, target.toPath()); } @@ -1466,7 +1465,7 @@ protected void copyApplicationPropertiesFiles(Path srcResourcesDir) throws Excep // This method is kept for backward compatibility with derived classes @Deprecated - protected void copyApplicationPropertiesFiles(File srcResourcesDir) throws Exception { + protected void copyApplicationPropertiesFiles(java.io.File srcResourcesDir) throws Exception { copyApplicationPropertiesFiles(srcResourcesDir.toPath()); } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java index e7f5a2fca0e6e..2fcc6fb4b470a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Harden.java @@ -20,7 +20,6 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.net.http.HttpTimeoutException; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; @@ -647,7 +646,7 @@ private String sendStreamingRequest(String requestUrl, JsonObject body) { printer().println(); return fullResponse.toString(); - } catch (HttpTimeoutException e) { + } catch (java.net.http.HttpTimeoutException e) { printer().printErr("\nRequest timed out after " + timeout + " seconds."); return null; } catch (Exception e) { @@ -677,7 +676,7 @@ private JsonObject sendRequest(String requestUrl, JsonObject body, String authKe handleErrorStatus(response.statusCode(), response.body()); return null; - } catch (HttpTimeoutException e) { + } catch (java.net.http.HttpTimeoutException e) { printer().printErr("Request timed out after " + timeout + " seconds."); return null; } catch (Exception e) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java index e3e3f42ca0375..a0f65cf76e467 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java @@ -16,7 +16,6 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -235,7 +234,7 @@ private String computeJavaPackageDeclaration(Path targetPath) throws IOException int index = canonicalPath.indexOf(srcMainJavaPath); if (index != -1) { String packagePath = canonicalPath.substring(index + srcMainJavaPath.length() + 1); - String packageName = packagePath.replace(File.separatorChar, '.'); + String packageName = packagePath.replace(java.io.File.separatorChar, '.'); if (!packageName.isEmpty()) { packageDeclaration = "package " + packageName + ";\n\n"; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index 83383946d44c9..9e21ceedead18 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -2108,7 +2108,7 @@ private void writeSettings(String key, String value) { protected static void removeDir(Path directory) { if (Files.exists(directory)) { try (Stream files = Files.walk(directory)) { - files.sorted(Comparator.reverseOrder()) + files.sorted(java.util.Comparator.reverseOrder()) .forEach(path -> { try { Files.deleteIfExists(path); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java index 4198263a5d77f..b315fafafd626 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/RunHelper.java @@ -16,7 +16,6 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.io.File; import java.io.IOException; import java.io.Reader; import java.lang.reflect.Field; @@ -225,7 +224,7 @@ public static String findMavenProperty(Path pomPath, String placeholder, MavenDe // Keep for backward compatibility @Deprecated - public static String findMavenProperty(File f, String placeholder, MavenDependencyDownloader downloader) { + public static String findMavenProperty(java.io.File f, String placeholder, MavenDependencyDownloader downloader) { return findMavenProperty(f.toPath(), placeholder, downloader); } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java index 20c7f91a4810e..81f85fb3d84a8 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SBOMGenerator.java @@ -22,7 +22,10 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; -import org.apache.camel.dsl.jbang.core.common.*; +import org.apache.camel.dsl.jbang.core.common.CamelJBangConstants; +import org.apache.camel.dsl.jbang.core.common.CommandLineHelper; +import org.apache.camel.dsl.jbang.core.common.RuntimeType; +import org.apache.camel.dsl.jbang.core.common.RuntimeUtil; import org.apache.camel.util.CamelCaseOrderedProperties; import org.apache.camel.util.FileUtil; import picocli.CommandLine; @@ -159,7 +162,7 @@ protected Integer export() throws Exception { } } // cleanup dir after complete - PathUtils.deleteDirectory(buildDir); + org.apache.camel.dsl.jbang.core.common.PathUtils.deleteDirectory(buildDir); } return answer; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java index 60fab48d5ec0c..4eba851ed482d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionBaseCommand.java @@ -21,7 +21,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import java.util.function.Consumer; import java.util.regex.Pattern; import org.apache.camel.dsl.jbang.core.commands.CamelCommand; @@ -158,7 +157,7 @@ static Pattern[] quoteAndCompilePatterns(String[] values) { * @param configureAction a function to configure the action JSON object * @return the output file path */ - protected Path prepareAction(String pid, String action, Consumer configureAction) { + protected Path prepareAction(String pid, String action, java.util.function.Consumer configureAction) { // ensure output file is deleted before executing action Path outputFile = getOutputFile(pid); PathUtils.deleteFile(outputFile); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java index 191551a8a5f2b..15e85d15b10e5 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramAction.java @@ -16,7 +16,6 @@ */ package org.apache.camel.dsl.jbang.core.commands.action; -import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -209,7 +208,7 @@ public Integer doCall() throws Exception { currentY = lr.maxY + RouteDiagramLayoutEngine.V_GAP; } - BufferedImage image; + java.awt.image.BufferedImage image; try { image = renderer.renderDiagram(layoutRoutes, currentY, colors); } catch (IllegalStateException e) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PathUtils.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PathUtils.java index 773978829eea0..1840bd20712ce 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PathUtils.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PathUtils.java @@ -21,7 +21,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import java.util.Comparator; import java.util.stream.Stream; /** @@ -100,7 +99,7 @@ public static boolean deleteDirectory(Path directory) { } try (Stream paths = Files.walk(directory)) { - paths.sorted(Comparator.reverseOrder()) + paths.sorted(java.util.Comparator.reverseOrder()) .forEach(path -> { try { Files.deleteIfExists(path); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java index 82f79c6b9025c..f5d2e31ad1ba9 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java @@ -30,7 +30,6 @@ import org.apache.camel.dsl.jbang.core.common.CamelJBangConstants; import org.apache.camel.dsl.jbang.core.common.HawtioVersion; import org.apache.camel.dsl.jbang.core.common.RuntimeType; -import org.apache.camel.util.FileUtil; import org.apache.camel.util.IOHelper; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; @@ -64,7 +63,7 @@ public void setup() throws IOException { @AfterEach public void end() throws IOException { // force removing, since deleteOnExit is not removing. - FileUtil.removeDir(workingDir); + org.apache.camel.util.FileUtil.removeDir(workingDir); } private static Stream runtimeProvider() { diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramActionTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramActionTest.java index 230b74608f0db..008e9b8f08d51 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramActionTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDiagramActionTest.java @@ -20,8 +20,6 @@ import org.apache.camel.diagram.RouteDiagramLayoutEngine.NodeLabelMode; import org.apache.camel.diagram.RouteDiagramLayoutEngine.RouteInfo; -import org.apache.camel.util.json.JsonArray; -import org.apache.camel.util.json.JsonObject; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,7 +30,7 @@ class CamelRouteDiagramActionTest { @Test void testParseRoutesEmpty() { - JsonObject jo = new JsonObject(); + org.apache.camel.util.json.JsonObject jo = new org.apache.camel.util.json.JsonObject(); CamelRouteDiagramAction action = new CamelRouteDiagramAction(null); List routes = action.parseRoutes(jo); assertTrue(routes.isEmpty()); @@ -40,28 +38,28 @@ void testParseRoutesEmpty() { @Test void testParseRoutesWithData() { - JsonObject line1 = new JsonObject(); + org.apache.camel.util.json.JsonObject line1 = new org.apache.camel.util.json.JsonObject(); line1.put("type", "from"); line1.put("code", "timer:tick"); line1.put("level", 0); - JsonObject line2 = new JsonObject(); + org.apache.camel.util.json.JsonObject line2 = new org.apache.camel.util.json.JsonObject(); line2.put("type", "to"); line2.put("code", "log:a"); line2.put("level", 1); - JsonArray code = new JsonArray(); + org.apache.camel.util.json.JsonArray code = new org.apache.camel.util.json.JsonArray(); code.add(line1); code.add(line2); - JsonObject routeObj = new JsonObject(); + org.apache.camel.util.json.JsonObject routeObj = new org.apache.camel.util.json.JsonObject(); routeObj.put("routeId", "route1"); routeObj.put("code", code); - JsonArray routesArr = new JsonArray(); + org.apache.camel.util.json.JsonArray routesArr = new org.apache.camel.util.json.JsonArray(); routesArr.add(routeObj); - JsonObject jo = new JsonObject(); + org.apache.camel.util.json.JsonObject jo = new org.apache.camel.util.json.JsonObject(); jo.put("routes", routesArr); CamelRouteDiagramAction action = new CamelRouteDiagramAction(null); @@ -76,29 +74,29 @@ void testParseRoutesWithData() { @Test void testParseRoutesWithDescription() { - JsonObject line1 = new JsonObject(); + org.apache.camel.util.json.JsonObject line1 = new org.apache.camel.util.json.JsonObject(); line1.put("type", "from"); line1.put("code", "timer:tick?period=1000"); line1.put("description", "Poll every second"); line1.put("level", 0); - JsonObject line2 = new JsonObject(); + org.apache.camel.util.json.JsonObject line2 = new org.apache.camel.util.json.JsonObject(); line2.put("type", "to"); line2.put("code", "log:a"); line2.put("level", 1); - JsonArray code = new JsonArray(); + org.apache.camel.util.json.JsonArray code = new org.apache.camel.util.json.JsonArray(); code.add(line1); code.add(line2); - JsonObject routeObj = new JsonObject(); + org.apache.camel.util.json.JsonObject routeObj = new org.apache.camel.util.json.JsonObject(); routeObj.put("routeId", "route1"); routeObj.put("code", code); - JsonArray routesArr = new JsonArray(); + org.apache.camel.util.json.JsonArray routesArr = new org.apache.camel.util.json.JsonArray(); routesArr.add(routeObj); - JsonObject jo = new JsonObject(); + org.apache.camel.util.json.JsonObject jo = new org.apache.camel.util.json.JsonObject(); jo.put("routes", routesArr); CamelRouteDiagramAction action = new CamelRouteDiagramAction(null); diff --git a/dsl/camel-jbang/camel-jbang-mcp/src/main/java/org/apache/camel/dsl/jbang/core/commands/mcp/TransformTools.java b/dsl/camel-jbang/camel-jbang-mcp/src/main/java/org/apache/camel/dsl/jbang/core/commands/mcp/TransformTools.java index a51ed3eb5ffc8..9f638f385b2ba 100644 --- a/dsl/camel-jbang/camel-jbang-mcp/src/main/java/org/apache/camel/dsl/jbang/core/commands/mcp/TransformTools.java +++ b/dsl/camel-jbang/camel-jbang-mcp/src/main/java/org/apache/camel/dsl/jbang/core/commands/mcp/TransformTools.java @@ -43,7 +43,6 @@ import org.apache.camel.support.PluginHelper; import org.apache.camel.support.ResourceHelper; import org.apache.camel.xml.in.ModelParser; -import org.apache.camel.yaml.out.ModelWriter; /** * MCP Tools for validating and transforming Camel routes using Quarkus MCP Server. @@ -229,7 +228,7 @@ private String transformXmlToYaml(String xml) throws Exception { } StringWriter sw = new StringWriter(); - new ModelWriter(sw).writeRoutesDefinition(routes); + new org.apache.camel.yaml.out.ModelWriter(sw).writeRoutesDefinition(routes); return sw.toString(); } diff --git a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DependencyCheckToolsTest.java b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DependencyCheckToolsTest.java index 8ff6121fd3be1..9e2546a8ca427 100644 --- a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DependencyCheckToolsTest.java +++ b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DependencyCheckToolsTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.dsl.jbang.core.commands.mcp; -import java.util.Optional; - import io.quarkiverse.mcp.server.ToolCallException; import org.junit.jupiter.api.Test; @@ -31,7 +29,7 @@ class DependencyCheckToolsTest { DependencyCheckToolsTest() { tools = new DependencyCheckTools(); CatalogService catalogService = new CatalogService(); - catalogService.catalogRepos = Optional.empty(); + catalogService.catalogRepos = java.util.Optional.empty(); tools.catalogService = catalogService; tools.dependencyData = new DependencyData(); } diff --git a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DiagnoseToolsTest.java b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DiagnoseToolsTest.java index 581d8ee5d6e8f..12fbf33b84040 100644 --- a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DiagnoseToolsTest.java +++ b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/DiagnoseToolsTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.dsl.jbang.core.commands.mcp; -import java.util.Optional; - import io.quarkiverse.mcp.server.ToolCallException; import org.junit.jupiter.api.Test; @@ -31,7 +29,7 @@ class DiagnoseToolsTest { DiagnoseToolsTest() { tools = new DiagnoseTools(); CatalogService catalogService = new CatalogService(); - catalogService.catalogRepos = Optional.empty(); + catalogService.catalogRepos = java.util.Optional.empty(); tools.catalogService = catalogService; tools.diagnoseData = new DiagnoseData(); } diff --git a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/TestScaffoldToolsTest.java b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/TestScaffoldToolsTest.java index da5d5760779ea..d561ffacf828f 100644 --- a/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/TestScaffoldToolsTest.java +++ b/dsl/camel-jbang/camel-jbang-mcp/src/test/java/org/apache/camel/dsl/jbang/core/commands/mcp/TestScaffoldToolsTest.java @@ -17,7 +17,6 @@ package org.apache.camel.dsl.jbang.core.commands.mcp; import java.util.List; -import java.util.Optional; import io.quarkiverse.mcp.server.ToolCallException; import org.apache.camel.util.json.JsonArray; @@ -40,7 +39,7 @@ class TestScaffoldToolsTest { private static CatalogService createCatalogService() { CatalogService service = new CatalogService(); - service.catalogRepos = Optional.empty(); + service.catalogRepos = java.util.Optional.empty(); return service; } diff --git a/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/GeneratePlugin.java b/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/GeneratePlugin.java index f6f7817d8bc3f..0935dced4c0f5 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/GeneratePlugin.java +++ b/dsl/camel-jbang/camel-jbang-plugin-generate/src/main/java/org/apache/camel/dsl/jbang/core/commands/generate/GeneratePlugin.java @@ -26,7 +26,7 @@ public class GeneratePlugin implements Plugin { @Override public void customize(CommandLine commandLine, CamelJBangMain main) { - var cmd = new CommandLine(new CodeGenerator(main)) + var cmd = new picocli.CommandLine(new CodeGenerator(main)) .addSubcommand("rest", new CommandLine(new CodeRestGenerator(main))) .addSubcommand("schema", new CommandLine(new CodeSchemaGenerator(main))); diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportKnativeTest.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportKnativeTest.java index 867af260e59cd..6cc0172093a6f 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportKnativeTest.java +++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportKnativeTest.java @@ -24,7 +24,6 @@ import io.fabric8.knative.eventing.v1.Trigger; import io.fabric8.knative.messaging.v1.Subscription; -import io.fabric8.knative.serving.v1.Service; import io.fabric8.knative.sources.v1.SinkBinding; import org.apache.camel.RuntimeCamelException; import org.apache.camel.dsl.jbang.core.commands.kubernetes.traits.BaseTrait; @@ -68,8 +67,8 @@ public void shouldAddKnativeServiceSpec(RuntimeType rt) throws Exception { Assertions.assertFalse(hasService(rt)); Assertions.assertTrue(hasKnativeService(rt)); - Service service - = getResource(rt, Service.class) + io.fabric8.knative.serving.v1.Service service + = getResource(rt, io.fabric8.knative.serving.v1.Service.class) .orElseThrow(() -> new RuntimeCamelException("Missing Knative service in Kubernetes manifest")); Map labelsA = service.getMetadata().getLabels(); diff --git a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelCatalogTui.java b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelCatalogTui.java index cbd2e3022b0c6..accb3efd8bdf4 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelCatalogTui.java +++ b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelCatalogTui.java @@ -50,7 +50,6 @@ import org.apache.camel.util.json.JsonObject; import org.apache.camel.util.json.Jsoner; import picocli.CommandLine.Command; -import sun.misc.Signal; @Command(name = "catalog", description = "Interactive TUI catalog browser", @@ -95,7 +94,7 @@ public Integer doCall() throws Exception { loadCatalog(); try (var tui = TuiRunner.create()) { - Signal.handle(new Signal("INT"), sig -> tui.quit()); + sun.misc.Signal.handle(new sun.misc.Signal("INT"), sig -> tui.quit()); tui.run(this::handleEvent, this::render); } return 0; diff --git a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelMonitor.java b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelMonitor.java index 3a5f9b5dde320..913b55f861db5 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelMonitor.java +++ b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/CamelMonitor.java @@ -22,7 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.time.Instant; -import java.time.ZoneId; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -33,8 +32,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.stream.Collectors; import dev.tamboui.layout.Constraint; @@ -76,7 +73,6 @@ import org.apache.camel.util.json.Jsoner; import picocli.CommandLine; import picocli.CommandLine.Command; -import sun.misc.Signal; import static org.apache.camel.dsl.jbang.core.common.CamelCommandHelper.extractState; @@ -177,7 +173,7 @@ public Integer doCall() throws Exception { try (var tui = TuiRunner.create()) { // Intercept Ctrl+C: quit the TUI cleanly instead of letting // the JVM tear down the classloader while we're still running - Signal.handle(new Signal("INT"), sig -> tui.quit()); + sun.misc.Signal.handle(new sun.misc.Signal("INT"), sig -> tui.quit()); tui.run( this::handleEvent, this::render); @@ -1087,18 +1083,18 @@ private void applyLogFilters() { // Regex for Spring Boot / Camel log format: // "2026-03-23T21:24:11.705+01:00 WARN 11283 --- [thread] logger : message" // "2026-03-23 21:24:11.705 WARN 11283 --- [thread] logger : message" - private static final Pattern LOG_PATTERN = Pattern.compile( + private static final java.util.regex.Pattern LOG_PATTERN = java.util.regex.Pattern.compile( "^(\\d{4}-\\d{2}-\\d{2})[T ](\\d{2}:\\d{2}:\\d{2}\\.\\d+)\\S*\\s+" - + "(TRACE|DEBUG|INFO|WARN|ERROR|FATAL)\\s+" - + "\\d+\\s+---\\s+" - + "\\[([^]]*)]\\s+" - + "(\\S+)\\s*:\\s*(.*)$"); + + "(TRACE|DEBUG|INFO|WARN|ERROR|FATAL)\\s+" + + "\\d+\\s+---\\s+" + + "\\[([^]]*)]\\s+" + + "(\\S+)\\s*:\\s*(.*)$"); private static LogEntry parseLogLine(String line) { LogEntry entry = new LogEntry(); entry.raw = line; try { - Matcher m = LOG_PATTERN.matcher(line); + java.util.regex.Matcher m = LOG_PATTERN.matcher(line); if (m.matches()) { entry.time = m.group(2); // HH:mm:ss.SSS... // Truncate time to 12 chars (HH:mm:ss.SSS) @@ -1619,8 +1615,8 @@ private TraceEntry parseTraceEntry(JsonObject json, String pid) { Object tsObj = json.get("timestamp"); if (tsObj instanceof Number n) { long epochMs = n.longValue(); - entry.timestamp = Instant.ofEpochMilli(epochMs) - .atZone(ZoneId.systemDefault()) + entry.timestamp = java.time.Instant.ofEpochMilli(epochMs) + .atZone(java.time.ZoneId.systemDefault()) .toLocalTime().toString(); // Truncate to HH:mm:ss.SSS if (entry.timestamp.length() > 12) { diff --git a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TuiPlugin.java b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TuiPlugin.java index e8eb934667963..ff65d4bc21ef2 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TuiPlugin.java +++ b/dsl/camel-jbang/camel-jbang-plugin-tui/src/main/java/org/apache/camel/dsl/jbang/core/commands/tui/TuiPlugin.java @@ -33,7 +33,7 @@ public void setClassLoader(ClassLoader classLoader) { @Override public void customize(CommandLine commandLine, CamelJBangMain main) { - var cmd = new CommandLine(new TuiCommand(main, classLoader)) + var cmd = new picocli.CommandLine(new TuiCommand(main, classLoader)) .addSubcommand("monitor", new CommandLine(new CamelMonitor(main, classLoader))) .addSubcommand("catalog", new CommandLine(new CamelCatalogTui(main, classLoader))); diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java index 0bd2a87733a18..56dec5ef545ba 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java @@ -31,7 +31,6 @@ import org.apache.camel.tooling.maven.MavenGav; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.OrderedLocationProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -105,7 +104,7 @@ private void downloadLoader(String groupId, String artifactId, String version) { } protected void autoConfigure(String key) { - var config = new OrderedLocationProperties(); + var config = new org.apache.camel.util.OrderedLocationProperties(); config.putAll("camel-main", camelContext.getPropertiesComponent().loadProperties()); // is there any special auto configuration scripts? diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java index 59bf9a8dda12d..6731c8038cb0c 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java @@ -32,7 +32,7 @@ @YamlType( inline = true, - types = KameletDefinition.class, + types = org.apache.camel.model.KameletDefinition.class, order = YamlDeserializerResolver.ORDER_DEFAULT, nodes = "kamelet", properties = { diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java index e587b71ef4a0a..ceda72ff9c27f 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/OutputAwareFromDefinitionDeserializer.java @@ -27,7 +27,6 @@ import org.apache.camel.spi.annotations.YamlProperty; import org.apache.camel.spi.annotations.YamlType; import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.StringHelper; import org.snakeyaml.engine.v2.nodes.MappingNode; import org.snakeyaml.engine.v2.nodes.Node; import org.snakeyaml.engine.v2.nodes.NodeTuple; @@ -80,7 +79,7 @@ protected void setProperties(OutputAwareFromDefinition target, MappingNode node) setDeserializationContext(val, dc); - key = StringHelper.dashToCamelCase(key); + key = org.apache.camel.util.StringHelper.dashToCamelCase(key); switch (key) { case "id": id = asText(val); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java index 45f0dbdab21cc..4d80feba7015f 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteConfigurationDefinitionDeserializer.java @@ -30,7 +30,6 @@ import org.apache.camel.spi.annotations.YamlIn; import org.apache.camel.spi.annotations.YamlProperty; import org.apache.camel.spi.annotations.YamlType; -import org.apache.camel.util.StringHelper; import org.snakeyaml.engine.v2.nodes.MappingNode; import org.snakeyaml.engine.v2.nodes.Node; import org.snakeyaml.engine.v2.nodes.NodeTuple; @@ -38,7 +37,7 @@ @YamlIn @YamlType( inline = false, - types = RouteConfigurationDefinition.class, + types = org.apache.camel.model.RouteConfigurationDefinition.class, order = YamlDeserializerResolver.ORDER_DEFAULT, nodes = { "routeConfiguration" }, properties = { @@ -80,7 +79,7 @@ public Object construct(Node node) { String key = asText(tuple.getKeyNode()); Node val = tuple.getValueNode(); - key = StringHelper.dashToCamelCase(key); + key = org.apache.camel.util.StringHelper.dashToCamelCase(key); switch (key) { case "id": target.setId(asText(val)); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java index ab0f0868fe063..90567986a2819 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java @@ -28,7 +28,6 @@ import org.apache.camel.spi.annotations.YamlIn; import org.apache.camel.spi.annotations.YamlProperty; import org.apache.camel.spi.annotations.YamlType; -import org.apache.camel.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.snakeyaml.engine.v2.nodes.MappingNode; @@ -90,7 +89,7 @@ protected void setProperties(RouteDefinition target, MappingNode node) { setDeserializationContext(val, dc); - key = StringHelper.dashToCamelCase(key); + key = org.apache.camel.util.StringHelper.dashToCamelCase(key); switch (key) { case "id": target.setId(asText(val)); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java index 2322b47349f3e..c2139b4ecf95a 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateDefinitionDeserializer.java @@ -19,7 +19,6 @@ import java.util.List; import org.apache.camel.dsl.yaml.common.YamlDeserializerBase; -import org.apache.camel.dsl.yaml.common.YamlDeserializerResolver; import org.apache.camel.dsl.yaml.common.exception.InvalidRouteException; import org.apache.camel.model.BeanFactoryDefinition; import org.apache.camel.model.RouteDefinition; @@ -28,14 +27,13 @@ import org.apache.camel.spi.annotations.YamlIn; import org.apache.camel.spi.annotations.YamlProperty; import org.apache.camel.spi.annotations.YamlType; -import org.apache.camel.util.StringHelper; import org.snakeyaml.engine.v2.nodes.Node; @YamlIn @YamlType( nodes = { "routeTemplate" }, - types = RouteTemplateDefinition.class, - order = YamlDeserializerResolver.ORDER_LOWEST - 1, + types = org.apache.camel.model.RouteTemplateDefinition.class, + order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { @YamlProperty(name = "id", type = "string", @@ -67,7 +65,7 @@ protected RouteTemplateDefinition newInstance() { protected boolean setProperty( RouteTemplateDefinition target, String propertyKey, String propertyName, Node node) { - propertyKey = StringHelper.dashToCamelCase(propertyKey); + propertyKey = org.apache.camel.util.StringHelper.dashToCamelCase(propertyKey); switch (propertyKey) { case "id": { target.setId(asText(node)); diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java index 93f4f62a4cbcf..162e34c9bc8bb 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteDefinitionDeserializer.java @@ -19,21 +19,19 @@ import java.util.List; import org.apache.camel.dsl.yaml.common.YamlDeserializerBase; -import org.apache.camel.dsl.yaml.common.YamlDeserializerResolver; import org.apache.camel.model.BeanFactoryDefinition; import org.apache.camel.model.TemplatedRouteDefinition; import org.apache.camel.model.TemplatedRouteParameterDefinition; import org.apache.camel.spi.annotations.YamlIn; import org.apache.camel.spi.annotations.YamlProperty; import org.apache.camel.spi.annotations.YamlType; -import org.apache.camel.util.StringHelper; import org.snakeyaml.engine.v2.nodes.Node; @YamlIn @YamlType( nodes = { "templatedRoute" }, types = TemplatedRouteDefinition.class, - order = YamlDeserializerResolver.ORDER_LOWEST - 1, + order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { @YamlProperty(name = "routeId", type = "string"), @@ -64,7 +62,7 @@ protected TemplatedRouteDefinition newInstance() { protected boolean setProperty( TemplatedRouteDefinition target, String propertyKey, String propertyName, Node node) { - propertyKey = StringHelper.dashToCamelCase(propertyKey); + propertyKey = org.apache.camel.util.StringHelper.dashToCamelCase(propertyKey); switch (propertyKey) { case "routeId": { target.setRouteId(asText(node)); diff --git a/parent/pom.xml b/parent/pom.xml index f6821883ad603..1681404441d39 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -165,7 +165,6 @@ 7.2.0 2.11 2.29.0 - 6.38.0 1.2.1 2.3.34 0.17.0 @@ -3891,20 +3890,6 @@ true - - org.openrewrite.maven - rewrite-maven-plugin - ${rewrite-maven-plugin-version} - - true - - org.openrewrite.java.ShortenFullyQualifiedTypeReferences - - - **/src/generated/** - - - net.revelc.code.formatter formatter-maven-plugin @@ -4183,27 +4168,6 @@ - - rewrite - - - - org.openrewrite.maven - rewrite-maven-plugin - - - shorten-fqcn - - runNoFork - - process-classes - - - - - - - dependencycheck diff --git a/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java index bdbf0e66181f0..161548c2726c4 100644 --- a/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java +++ b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java @@ -25,7 +25,6 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.ArrayList; -import java.util.Base64; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -407,7 +406,7 @@ private void installJBang() { ProcessBuilder pb; if (IS_WINDOWS) { String script = "iex \"& { $(iwr -useb https://ps.jbang.dev) } app setup\""; - String encoded = Base64.getEncoder().encodeToString( + String encoded = java.util.Base64.getEncoder().encodeToString( script.getBytes(StandardCharsets.UTF_16LE)); pb = new ProcessBuilder("powershell", "-NoProfile", "-EncodedCommand", encoded); } else { diff --git a/test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyContainer.java b/test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyContainer.java index 57cdc32d8abec..bf641dd711440 100644 --- a/test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyContainer.java +++ b/test-infra/camel-test-infra-iggy/src/main/java/org/apache/camel/test/infra/iggy/services/IggyContainer.java @@ -19,7 +19,6 @@ import java.util.List; -import com.github.dockerjava.api.model.Capability; import com.github.dockerjava.api.model.Ulimit; import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil; import org.apache.camel.test.infra.iggy.common.IggyProperties; @@ -48,8 +47,8 @@ public TestInfraIggyContainer() { // Required capabilities for Iggy container as per docker-compose withCreateContainerCmdModifier(cmd -> { cmd.getHostConfig() - .withCapAdd(Capability.SYS_NICE) - .withSecurityOpts(List.of("seccomp:unconfined")) + .withCapAdd(com.github.dockerjava.api.model.Capability.SYS_NICE) + .withSecurityOpts(java.util.List.of("seccomp:unconfined")) .withUlimits(List.of(new Ulimit("memlock", -1, -1))); }); diff --git a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ConfluentContainer.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ConfluentContainer.java index b2f58ae3213a3..e1b2a981c1133 100644 --- a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ConfluentContainer.java +++ b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ConfluentContainer.java @@ -18,8 +18,6 @@ package org.apache.camel.test.infra.kafka.services; import java.io.IOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.ServerSocket; import java.util.UUID; @@ -109,7 +107,7 @@ private int resolveHostPort() { private static int findFreePort() { try (ServerSocket socket = new ServerSocket()) { socket.setReuseAddress(true); - socket.bind(new InetSocketAddress((InetAddress) null, 0), 1); + socket.bind(new java.net.InetSocketAddress((java.net.InetAddress) null, 0), 1); return socket.getLocalPort(); } catch (IOException e) { throw new RuntimeException("Failed to find a free port", e); diff --git a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java index 9a362ccb6389a..e787f2812fb71 100644 --- a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java +++ b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java @@ -18,8 +18,6 @@ package org.apache.camel.test.infra.kafka.services; import java.io.IOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.ServerSocket; import java.util.UUID; @@ -108,7 +106,7 @@ private int resolveHostPort() { private static int findFreePort() { try (ServerSocket socket = new ServerSocket()) { socket.setReuseAddress(true); - socket.bind(new InetSocketAddress((InetAddress) null, 0), 1); + socket.bind(new java.net.InetSocketAddress((java.net.InetAddress) null, 0), 1); return socket.getLocalPort(); } catch (IOException e) { throw new RuntimeException("Failed to find a free port", e); diff --git a/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/AudioTranscriptionResponseBuilder.java b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/AudioTranscriptionResponseBuilder.java index d57c24ce82b4a..ae675f20b6732 100644 --- a/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/AudioTranscriptionResponseBuilder.java +++ b/test-infra/camel-test-infra-openai-mock/src/main/java/org/apache/camel/test/infra/openai/mock/AudioTranscriptionResponseBuilder.java @@ -16,8 +16,6 @@ */ package org.apache.camel.test.infra.openai.mock; -import java.util.List; - import com.fasterxml.jackson.databind.ObjectMapper; /** @@ -45,15 +43,15 @@ record TranscriptionResponse(String text) { } private String createVerboseResponse(AudioTranscriptionExpectation expectation) throws Exception { - record VerboseTranscriptionResponse(String text, String language, double duration, List segments, - List words) { + record VerboseTranscriptionResponse(String text, String language, double duration, java.util.List segments, + java.util.List words) { } return objectMapper.writeValueAsString(new VerboseTranscriptionResponse( expectation.getTranscriptionText(), expectation.getLanguage(), expectation.getDuration(), - List.of(), - List.of())); + java.util.List.of(), + java.util.List.of())); } } diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java index 9592e1e2bed42..7224dd5fd1650 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java @@ -16,12 +16,10 @@ */ package org.apache.camel.itest.security; -import java.net.URL; import java.util.HashMap; import java.util.Map; import jakarta.xml.ws.BindingProvider; -import jakarta.xml.ws.Service; import jakarta.xml.ws.soap.SOAPFaultException; import javax.xml.namespace.QName; @@ -49,7 +47,7 @@ @EnabledIf(value = "org.apache.camel.itest.security.GreeterClientTest#isPortAvailable", disabledReason = "This test uses a fixed port that may not be available on certain hosts") public class GreeterClientTest { - private static final URL WSDL_LOC; + private static final java.net.URL WSDL_LOC; static { WSDL_LOC = GreeterClientTest.class.getClassLoader().getResource("wsdl/hello_world.wsdl"); } @@ -61,7 +59,7 @@ public class GreeterClientTest { protected CamelContext camelContext; protected String sendMessageWithUsernameToken(String username, String password, String message) throws Exception { - final Service svc = Service.create(WSDL_LOC, SERVICE_QNAME); + final jakarta.xml.ws.Service svc = jakarta.xml.ws.Service.create(WSDL_LOC, SERVICE_QNAME); final Greeter greeter = svc.getPort(PORT_QNAME, Greeter.class); Client client = ClientProxy.getClient(greeter); diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java index 164f6e31880a7..a9f2c167d616a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java @@ -18,16 +18,14 @@ import java.util.logging.Logger; -import jakarta.jws.WebService; - import org.apache.hello_world_soap_http.Greeter; import org.apache.hello_world_soap_http.PingMeFault; import org.apache.hello_world_soap_http.types.FaultDetail; -@WebService(portName = "SoapOverHttp", serviceName = "SOAPService", - targetNamespace = "http://apache.org/hello_world_soap_http", - endpointInterface = "org.apache.hello_world_soap_http.Greeter", - wsdlLocation = "wsdl/hello_world.wsdl") +@jakarta.jws.WebService(portName = "SoapOverHttp", serviceName = "SOAPService", + targetNamespace = "http://apache.org/hello_world_soap_http", + endpointInterface = "org.apache.hello_world_soap_http.Greeter", + wsdlLocation = "wsdl/hello_world.wsdl") public class GreeterImpl implements Greeter { diff --git a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java index adb80c0b62a85..f49523c101b77 100644 --- a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java +++ b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java @@ -44,8 +44,6 @@ import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; -import org.apache.maven.settings.Profile; -import org.apache.maven.settings.Repository; import org.apache.maven.settings.Settings; import org.eclipse.aether.AbstractRepositoryListener; import org.eclipse.aether.ConfigurationProperties; @@ -214,9 +212,9 @@ private void configureRepositoriesForEmbeddedMode() { .collect(Collectors.toSet()); for (String profileId : settings.getActiveProfiles()) { - Profile profile = settings.getProfilesAsMap().get(profileId); + org.apache.maven.settings.Profile profile = settings.getProfilesAsMap().get(profileId); if (profile != null) { - for (Repository repo : profile.getRepositories()) { + for (org.apache.maven.settings.Repository repo : profile.getRepositories()) { try { URL url = URI.create(repo.getUrl()).toURL(); if (repositoryURLs.add(repo.getUrl())) { diff --git a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java index c9ea6043aed80..ed51e9a2f3354 100644 --- a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java +++ b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import java.util.function.Function; import java.util.stream.Collectors; import org.apache.camel.tooling.model.ComponentModel.ComponentOptionModel; @@ -836,11 +835,11 @@ public static JsonObject asJsonObject(JBangModel model) { private static JsonObject asGroupedOptionsJson( List groups, - Function groupName, - Function groupDescription, - Function groupSourceType, + java.util.function.Function groupName, + java.util.function.Function groupDescription, + java.util.function.Function groupSourceType, List options, - Function optionSourceType) { + java.util.function.Function optionSourceType) { JsonObject json = new JsonObject(); JsonArray groupsArr = new JsonArray(); diff --git a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/JsonObject.java b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/JsonObject.java index 47d0a5024da1d..7a0421e1c248d 100644 --- a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/JsonObject.java +++ b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/JsonObject.java @@ -162,7 +162,7 @@ public Object path(final String path) { if (optional) { pos = pos - 1; } - Optional o = doPath(path.substring(0, pos)); + java.util.Optional o = doPath(path.substring(0, pos)); if (o.isPresent()) { answer = o.get(); if (answer instanceof Map map) { @@ -174,7 +174,7 @@ public Object path(final String path) { } } else if (path.contains("[")) { jo = null; - Optional o = doPath(path); + java.util.Optional o = doPath(path); if (o.isPresent()) { answer = o.get(); if (answer instanceof Map map) { diff --git a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java index 60bc62ce6f632..b5fcb55da5c4b 100644 --- a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java +++ b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Yylex.java @@ -16,12 +16,6 @@ */ package org.apache.camel.util.json; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.math.BigDecimal; - /** * This class is a scanner generated by JFlex 1.4.3 on 8/30/16 5:50 PM from the * specification file /home/davinloegering/cliftonlabs/workspace/json-simple/src/main/lex/jsonstrict.lex @@ -139,7 +133,7 @@ class Yylex { = "\2\0\1\11\3\1\1\11\3\1\6\11\2\1\1\11" + "\5\0\10\11\1\0\1\1\1\0\1\1\4\0\2\11" + "\2\0\1\11"; /** the input device */ - private Reader zzReader; + private java.io.Reader zzReader; /** the current state of the DFA */ private int zzState; @@ -196,7 +190,7 @@ class Yylex { * * @param in the java.io.Reader to read input from. */ - Yylex(Reader in) { + Yylex(java.io.Reader in) { this.zzReader = in; } @@ -205,8 +199,8 @@ class Yylex { * * @param in the java.io.Inputstream to read input from. */ - Yylex(InputStream in) { - this(new InputStreamReader(in)); + Yylex(java.io.InputStream in) { + this(new java.io.InputStreamReader(in)); } private static int[] zzUnpackAction() { @@ -299,7 +293,7 @@ private static char[] zzUnpackCMap(String packed) { * @return false, iff there was new input. * @exception java.io.IOException if any I/O-Error occurs */ - private boolean zzRefill() throws IOException { + private boolean zzRefill() throws java.io.IOException { /* first: make room (if you can) */ if (zzStartRead > 0) { @@ -346,7 +340,7 @@ private boolean zzRefill() throws IOException { /** * Closes the input stream. */ - public final void yyclose() throws IOException { + public final void yyclose() throws java.io.IOException { zzAtEOF = true; /* indicate end of file */ zzEndRead = zzStartRead; /* invalidate buffer */ @@ -362,7 +356,7 @@ public final void yyclose() throws IOException { * * @param reader the new input stream */ - public final void yyreset(Reader reader) { + public final void yyreset(java.io.Reader reader) { zzReader = reader; zzAtBOL = true; zzAtEOF = false; @@ -454,7 +448,7 @@ public void yypushback(int number) { * @return the next token * @exception java.io.IOException if any I/O-Error occurs */ - public Yytoken yylex() throws IOException, DeserializationException { + public Yytoken yylex() throws java.io.IOException, DeserializationException { int zzInput; int zzAction; @@ -599,7 +593,7 @@ public Yytoken yylex() throws IOException, DeserializationException { case 35: break; case 2: { - BigDecimal val = new BigDecimal(yytext()); + java.math.BigDecimal val = new java.math.BigDecimal(yytext()); return new Yytoken(Yytoken.Types.DATUM, val); } case 36: diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelJBangCommandsMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelJBangCommandsMojo.java index d2bc454581200..e5614031299a6 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelJBangCommandsMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelJBangCommandsMojo.java @@ -372,7 +372,7 @@ private void parseOptionsFromClassHierarchy(JavaClassSource clazz, List nested : clazz.getNestedTypes()) { + for (org.jboss.forge.roaster.model.source.JavaSource nested : clazz.getNestedTypes()) { if (nested instanceof JavaClassSource nestedClass) { for (FieldSource field : nestedClass.getFields()) { OptionInfo option = parseOption(field); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java index 8d8503791c3ba..9023b28c54b6b 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java @@ -30,7 +30,6 @@ import javax.inject.Inject; -import org.apache.camel.tooling.model.BaseOptionModel; import org.apache.camel.tooling.model.ComponentModel; import org.apache.camel.tooling.model.DataFormatModel; import org.apache.camel.tooling.model.JsonMapper; @@ -297,7 +296,7 @@ private void updateSensitiveJsonSchema(File camelDir, Set secrets) throw } private static void collectSecretOption( - BaseOptionModel o, Set secrets) { + org.apache.camel.tooling.model.BaseOptionModel o, Set secrets) { if (o.isSecret() || SECRET.equals(o.getSecurity())) { String key = o.getName().toLowerCase(Locale.ENGLISH); key = key.replace("-", ""); @@ -306,7 +305,7 @@ private static void collectSecretOption( } private static void collectSecurityOption( - BaseOptionModel o, Map securityOptions) { + org.apache.camel.tooling.model.BaseOptionModel o, Map securityOptions) { String security = o.getSecurity(); if (!Strings.isNullOrEmpty(security) && !SECRET.equals(security)) { // only collect insecure:* categories; secrets are handled by SensitiveUtils diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java index a0becc4767918..fbb12ca2fc33c 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java @@ -40,7 +40,7 @@ @Mojo(name = "xref-check", threadSafe = true) public class XRefCheckMojo extends AbstractMojo { - public static final String PLAYBOOK = "antora-playbook-local-xref-check.yml"; + public static final java.lang.String PLAYBOOK = "antora-playbook-local-xref-check.yml"; /** * The maven project. */ diff --git a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java index 06375a07d6f78..11699c654ba86 100644 --- a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java +++ b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java @@ -35,7 +35,6 @@ import org.apache.camel.util.ObjectHelper; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; -import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -149,14 +148,14 @@ public void execute() throws MojoExecutionException, MojoFailureException { final Model camelParentPomXmlModel; try (Reader r = Files.newBufferedReader(camelParentPomXmlPath, charset)) { - camelParentPomXmlModel = new MavenXpp3Reader().read(r); + camelParentPomXmlModel = new org.apache.maven.model.io.xpp3.MavenXpp3Reader().read(r); } catch (XmlPullParserException | IOException e) { throw new RuntimeException("Could not parse " + camelParentPomXmlPath, e); } final Model camelPomXmlModel; try (Reader r = Files.newBufferedReader(camelPomXmlPath, charset)) { - camelPomXmlModel = new MavenXpp3Reader().read(r); + camelPomXmlModel = new org.apache.maven.model.io.xpp3.MavenXpp3Reader().read(r); } catch (XmlPullParserException | IOException e) { throw new RuntimeException("Could not parse " + camelPomXmlPath, e); }