From fc2a3f66f1b01774e27118e15e6b024af19da1d1 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 5 May 2026 09:23:02 +0200 Subject: [PATCH 1/6] Enforce import style: auto-shorten fully qualified class names via OpenRewrite Add rewrite-maven-plugin with ShortenFullyQualifiedTypeReferences recipe to automatically replace unnecessary FQCNs with simple class names and add the corresponding import statements. Generated code (src/generated/) is excluded from processing. The plugin is gated behind a -Prewrite Maven profile so it only runs in CI regen builds, not during local development. Both PR and main build workflows now pass -Prewrite to regen.sh, and the existing "fail if uncommitted changes" step catches any FQCN fixes that were not committed by the PR author. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/main-build.yml | 2 ++ .github/workflows/pr-build-main.yml | 2 +- AGENTS.md | 10 +++++++++ parent/pom.xml | 35 +++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index fe24b048a899a..8a9d10f6f3972 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -54,6 +54,8 @@ 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 17e4bf65240ae..0ff0f194da5f5 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 || '' }} + MAVEN_EXTRA_ARGS: ${{ matrix.maven_extra_args || '' }} -Prewrite run: ./etc/scripts/regen.sh - name: Quick dependency build if: ${{ inputs.skip_full_build }} diff --git a/AGENTS.md b/AGENTS.md index 2ad5731fc2e8b..1d71aedf8a6c5 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -251,6 +251,16 @@ 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/parent/pom.xml b/parent/pom.xml index ef54e5184aaa2..23ab701136ce4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -168,6 +168,7 @@ 7.2.0 2.11 2.29.0 + 6.38.0 1.2.1 2.3.34 0.17.0 @@ -3906,6 +3907,19 @@ true + + org.openrewrite.maven + rewrite-maven-plugin + ${rewrite-maven-plugin-version} + + + org.openrewrite.java.ShortenFullyQualifiedTypeReferences + + + **/src/generated/** + + + net.revelc.code.formatter formatter-maven-plugin @@ -4184,6 +4198,27 @@ + + rewrite + + + + org.openrewrite.maven + rewrite-maven-plugin + + + shorten-fqcn + + run + + process-sources + + + + + + + dependencycheck From 6ac331aff52abad728d03d16c9b462196c58815a Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 5 May 2026 12:44:16 +0200 Subject: [PATCH 2/6] Fix existing unnecessary FQCNs across the codebase Auto-fix generated by OpenRewrite ShortenFullyQualifiedTypeReferences recipe across 598 files in 187 modules. Replaces inline fully qualified class names with simple names and adds the corresponding import statements where no import clash exists. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../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 | 5 +- .../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 | 7 +- .../org/apache/camel/avro/generated/Key.java | 47 +- .../avro/generated/KeyValueProtocol.java | 28 +- .../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 | 78 +- .../integration/BedrockProducerIT.java | 32 +- .../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 | 3 +- .../cxf/soap/headers/HeaderTesterImpl.java | 6 +- .../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 | 3 +- .../headers/CxfMessageHeadersRelayTest.java | 12 +- .../cxf/soap/headers/HeaderTesterImpl.java | 6 +- .../HeaderTesterWithInsertionImpl.java | 3 +- .../spring/CxfEndpointBeansRouterTest.java | 3 +- .../cxf/wssecurity/server/GreeterImpl.java | 4 +- .../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 | 14 +- .../common/message/CxfMessageHelperTest.java | 5 +- .../message/DefaultCxfMessageMapperTest.java | 2 +- .../cxf/transport/JaxWSCamelTestSupport.java | 7 +- .../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 +- .../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 | 5 +- .../flink/DataStreamProducerTest.java | 3 +- .../file/remote/CamelFTPParserFactory.java | 3 +- .../RemoteFileProducerPreWriteCheckTest.java | 3 +- .../producer/PullRequestFilesProducer.java | 5 +- .../google/calendar/CalendarAclIT.java | 3 +- .../calendar/CalendarCalendarListIT.java | 5 +- .../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 | 7 +- .../google/mail/GmailUsersThreadsIT.java | 12 +- .../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 | 11 +- .../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 | 5 +- .../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 | 5 +- .../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 | 4 +- .../processor/SchematronProcessorTest.java | 3 +- .../RestServletNoContentRestConfigTest.java | 8 +- .../rest/RestServletNoContentTest.java | 8 +- .../camel/component/sjms/SjmsHelper.java | 10 +- .../SimpleMessageListenerContainer.java | 6 +- .../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 | 5 +- .../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 | 10 +- .../component/thrift/generated/Work.java | 226 +- .../thrift/generated/Operation.java | 10 +- .../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 | 7 +- .../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 +- .../commands/action/RouteDiagramRenderer.java | 5 +- .../dsl/jbang/core/common/PathUtils.java | 3 +- .../dsl/jbang/core/commands/ExportTest.java | 3 +- .../action/CamelRouteDiagramActionTest.java | 16 +- .../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 | 14 +- .../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 | 5 +- .../cli/services/CliLocalProcessService.java | 3 +- .../infra/iggy/services/IggyContainer.java | 5 +- .../kafka/services/ConfluentContainer.java | 4 +- .../kafka/services/StrimziContainer.java | 4 +- .../itest/security/GreeterClientTest.java | 6 +- .../itest/utils/extensions/GreeterImpl.java | 3 +- .../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 +- 598 files changed, 3863 insertions(+), 2936 deletions(-) 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 46e6161f87be9..b35fc2fe0b02d 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(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); + factory.setFeature(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 cf10c7f8e48c4..eaede66b7b0e1 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() { - org.apache.activemq.ActiveMQConnectionFactory answer - = new org.apache.activemq.ActiveMQConnectionFactory(); + ActiveMQConnectionFactory answer + = new 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 c37b68c6e5821..f683719c3dbc7 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() { - org.apache.activemq.ActiveMQConnectionFactory answer - = new org.apache.activemq.ActiveMQConnectionFactory(); + ActiveMQConnectionFactory answer + = new 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 866d742505f0a..3e08671390ec9 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,6 +52,7 @@ 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; @@ -618,7 +619,7 @@ private void processChunkHierarchical(Exchange exchange) throws Exception { } private void addSourceToChunkRequest( - ai.docling.serve.api.chunk.request.ChunkDocumentRequest.Builder requestBuilder, String inputSource) + ChunkDocumentRequest.Builder requestBuilder, String inputSource) throws IOException { if (inputSource.startsWith("http://") || inputSource.startsWith("https://")) { requestBuilder.source( @@ -731,7 +732,7 @@ private DocumentMetadata parseMetadataFromJson(String jsonOutput, String inputPa if (configuration.isIncludeRawMetadata()) { JsonNode rootNode = objectMapper.readTree(jsonOutput); @SuppressWarnings("unchecked") - Map rawMap = objectMapper.convertValue(rootNode, java.util.Map.class); + Map rawMap = objectMapper.convertValue(rootNode, 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 d541d5155b710..6855582acb74b 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,7 +18,9 @@ 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; @@ -46,7 +48,7 @@ void customArgsWithOutputFlagAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output", "/tmp/other-dir"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output", "/tmp/other-dir"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -61,7 +63,7 @@ void customArgsWithOutputEqualsFormAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output=/tmp/other-dir"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--output=/tmp/other-dir"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -75,7 +77,7 @@ void customArgsWithShortOutputFlagAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-o", "/tmp/other-dir"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-o", "/tmp/other-dir"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -89,7 +91,7 @@ void customArgsWithPathTraversalAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--artifacts-path", "../../etc/passwd"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--artifacts-path", "../../etc/passwd"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -99,13 +101,13 @@ void customArgsWithPathTraversalAreRejected() throws Exception { @Test void customArgsWithNullEntryAreRejected() throws Exception { Path inputFile = createInputFile(); - List argsWithNull = new java.util.ArrayList<>(); + List argsWithNull = new ArrayList<>(); argsWithNull.add(null); CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, argsWithNull)); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, argsWithNull)); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -123,7 +125,7 @@ void safeCustomArgsPassValidation() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "--table-mode", "fast"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "--table-mode", "fast"))); }); // The failure should be from process execution, not from argument validation @@ -154,7 +156,7 @@ void customArgsWithSemicolonAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "; rm -rf /"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "; rm -rf /"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -168,7 +170,7 @@ void customArgsWithPipeAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "| cat /etc/passwd"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "| cat /etc/passwd"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -182,7 +184,7 @@ void customArgsWithBacktickAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "`whoami`"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "`whoami`"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -196,7 +198,7 @@ void customArgsWithCommandSubstitutionAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "$(id)"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--verbose", "$(id)"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -212,7 +214,7 @@ void customArgsWithUnknownFlagAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--unknown-flag"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("--unknown-flag"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -226,7 +228,7 @@ void customArgsWithUnknownShortFlagAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-x"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-x"))); }); assertInstanceOf(IllegalArgumentException.class, ex.getCause()); @@ -241,7 +243,7 @@ void customArgsWithVerbosityLevelsAreAccepted() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-vv"))); + Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, List.of("-vv"))); }); assertFalse(ex.getCause() instanceof IllegalArgumentException, @@ -256,7 +258,7 @@ void customArgsWithNormalizedPathTraversalAreRejected() throws Exception { CamelExecutionException ex = assertThrows(CamelExecutionException.class, () -> { template.requestBodyAndHeaders("direct:cli-convert", inputFile.toString(), - java.util.Map.of(DoclingHeaders.CUSTOM_ARGUMENTS, + 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 102a60919cdd8..6650531c18bda 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,6 +29,7 @@ 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; @@ -97,7 +98,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 org.apache.camel.support.SynchronizationAdapter() { + new 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 ab4987c5f94da..9aacf83c2e607 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,6 +22,7 @@ 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; @@ -232,11 +233,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++) { - org.apache.camel.Exchange exchange = exchanges.get(i); + 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 4e14a1ee409fd..26b5881befd13 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,6 +23,7 @@ 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; @@ -208,7 +209,7 @@ void testAsyncConversionWithHeaderOverride() throws Exception { // Use sync endpoint but override with async header String result = template.requestBodyAndHeaders("direct:convert-markdown-serve", testFile.toString(), - new java.util.HashMap() { + new 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 d419182e04f77..9886e2e63a818 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")) { - java.nio.file.Path tempFile = Files.createTempFile("docling-test-multi_page", ".pdf"); + 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 ae38a94886924..65ea85617afb2 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,6 +21,7 @@ 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; @@ -271,7 +272,7 @@ public static List> parseGuardrailClasses(String[] guardrailClassNames) .filter(name -> !name.isEmpty()) .map(AgentConfiguration::loadGuardrailClass) .filter(clazz -> clazz != null) - .collect(java.util.stream.Collectors.toList()); + .collect(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 f1eec10a3beaa..12a682d07ad03 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,6 +16,7 @@ */ package org.apache.camel.component.langchain4j.agent.api; +import java.io.Serializable; import java.util.List; import org.junit.jupiter.api.Test; @@ -37,7 +38,7 @@ public void testParseGuardrailClasses_WithValidClasses() { assertEquals(3, result.size()); assertTrue(result.contains(String.class)); assertTrue(result.contains(List.class)); - assertTrue(result.contains(java.io.Serializable.class)); + assertTrue(result.contains(Serializable.class)); } @Test @@ -99,7 +100,7 @@ public void testParseGuardrailClasses_WithExtraWhitespace() { assertEquals(3, result.size()); assertTrue(result.contains(String.class)); assertTrue(result.contains(List.class)); - assertTrue(result.contains(java.io.Serializable.class)); + assertTrue(result.contains(Serializable.class)); } @Test @@ -113,7 +114,7 @@ public void testParseGuardrailClasses_WithEmptyClassNames() { assertEquals(3, result.size()); assertTrue(result.contains(String.class)); assertTrue(result.contains(List.class)); - assertTrue(result.contains(java.io.Serializable.class)); + assertTrue(result.contains(Serializable.class)); } @Test @@ -151,7 +152,7 @@ public void testParseGuardrailClasses_WithValidClassesArray() { assertEquals(3, result.size()); assertTrue(result.contains(String.class)); assertTrue(result.contains(List.class)); - assertTrue(result.contains(java.io.Serializable.class)); + assertTrue(result.contains(Serializable.class)); } @Test @@ -196,7 +197,7 @@ public void testParseGuardrailClasses_WithArrayContainingEmptyStrings() { assertEquals(3, result.size()); assertTrue(result.contains(String.class)); assertTrue(result.contains(List.class)); - assertTrue(result.contains(java.io.Serializable.class)); + assertTrue(result.contains(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 d976b2b9bdbe4..9e80744df0e3f 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,6 +16,9 @@ */ 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; @@ -171,7 +174,7 @@ void testBuilderCustomPattern() { .clearPatterns() .addPattern( PromptInjectionGuardrail.InjectionCategory.JAILBREAK, - java.util.regex.Pattern.compile("(?i)custom\\s+attack")) + 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 a89be750949e6..e5d7b5bc9ba92 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,6 +22,7 @@ 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; @@ -143,7 +144,7 @@ void shouldFailForUnsupportedMimeType() { "application/zip"); assertThrows( - org.apache.camel.TypeConversionException.class, + 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 27d3c42507dce..0f1dc2c6d5dd9 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 org.apache.camel.spi.DataType("neo4j:embeddings")) + .transformDataType(new 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 e0c796b84782a..7a5a61c183cbd 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, dev.langchain4j.data.segment.TextSegment.class); + text = in.getHeader(LangChain4jEmbeddingsHeaders.TEXT_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 d7ec1238b56b7..b6299623681a3 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,8 +19,9 @@ 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; -@org.apache.camel.spi.annotations.Tokenizer("langChain4jCharacterTokenizer") +@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 098ae56c21da1..dce9bef4cef78 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,8 +19,9 @@ 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; -@org.apache.camel.spi.annotations.Tokenizer("langChain4jLineTokenizer") +@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 7d0b9f314f442..1c94393fad0ce 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,8 +19,9 @@ 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; -@org.apache.camel.spi.annotations.Tokenizer("langChain4jParagraphTokenizer") +@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 e16f58844611f..8d6cf162dede0 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,8 +19,9 @@ 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; -@org.apache.camel.spi.annotations.Tokenizer("langChain4jSentenceTokenizer") +@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 d6cfa158663b2..f6f517c326318 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,8 +19,9 @@ 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; -@org.apache.camel.spi.annotations.Tokenizer("langChain4jWordTokenizer") +@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 351e750b33f5a..fbcb313eda928 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,6 +16,7 @@ */ package org.apache.camel.component.neo4j; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -158,7 +159,7 @@ private void retrieveNodes(Exchange exchange) throws NoSuchHeaderException { if (!matchMap.isEmpty()) { StringBuilder whereClause = new StringBuilder(); - queryParams = new java.util.HashMap<>(); + queryParams = new HashMap<>(); int paramIndex = 0; for (Map.Entry entry : matchMap.entrySet()) { @@ -256,7 +257,7 @@ private void deleteNode(Exchange exchange) throws NoSuchHeaderException { if (!matchMap.isEmpty()) { StringBuilder whereClause = new StringBuilder(); - queryParams = new java.util.HashMap<>(); + queryParams = new 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 e9fc9e0d53c9a..eb52f5dde05f3 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,6 +57,7 @@ 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; @@ -392,7 +393,7 @@ private void configureSsl(OpenAIOkHttpClient.Builder builder) throws Exception { private void configureSslFromContextParameters( OpenAIOkHttpClient.Builder builder, - org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) + 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 00abe458cf677..d8faeedb73fe7 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 @@ -694,15 +694,15 @@ private void updateConversationHistory( } private ResponseFormatJsonSchema.JsonSchema.Schema buildSchemaFromJson(String jsonSchemaString) throws Exception { - java.util.Map root = OBJECT_MAPPER.readValue(jsonSchemaString, java.util.Map.class); + Map root = OBJECT_MAPPER.readValue(jsonSchemaString, Map.class); if (root == null) { throw new IllegalArgumentException("JSON schema string parsed to null"); } - if (!(root instanceof java.util.Map)) { + if (!(root instanceof Map)) { throw new IllegalArgumentException("JSON schema must be a JSON object at the root"); } ResponseFormatJsonSchema.JsonSchema.Schema.Builder sb = ResponseFormatJsonSchema.JsonSchema.Schema.builder(); - for (java.util.Map.Entry e : root.entrySet()) { + for (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 671c63b5f0586..6fed7816d5145 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,6 +16,8 @@ */ 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; @@ -103,7 +105,7 @@ void streamingChatReturnsIteratorOfChunks() { Object body = result.getMessage().getBody(); assertNotNull(body); - assertTrue(body instanceof java.util.Iterator); + assertTrue(body instanceof 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 c84dc91b90fdc..84ad1ab7c0b95 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,6 +16,9 @@ */ 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; @@ -142,7 +145,7 @@ void createClientWithInvalidTruststoreLocationFails() { + "&sslTruststoreLocation=/nonexistent/truststore.jks" + "&sslTruststorePassword=" + STORE_PASSWORD)); - assertHasRootCause(exception, java.io.FileNotFoundException.class); + assertHasRootCause(exception, FileNotFoundException.class); } @Test @@ -155,7 +158,7 @@ void createClientWithInvalidKeystoreLocationFails() { + "&sslKeystoreLocation=/nonexistent/keystore.jks" + "&sslKeystorePassword=" + STORE_PASSWORD)); - assertHasRootCause(exception, java.io.FileNotFoundException.class); + assertHasRootCause(exception, FileNotFoundException.class); } @Test @@ -169,7 +172,7 @@ void createClientWithInvalidTruststoreTypeFails() { + "&sslTruststorePassword=" + STORE_PASSWORD + "&sslTruststoreType=INVALID")); - assertHasRootCause(exception, java.security.KeyStoreException.class); + assertHasRootCause(exception, 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 ef0d37722d614..1e94ec40c93f0 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,6 +33,7 @@ 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; @@ -199,7 +200,7 @@ void chatOverTlsWithSslContextParameters() { @Test void componentImplementsSslContextParametersAware() { OpenAIComponent component = (OpenAIComponent) context().getComponent("openai"); - assertTrue(component instanceof org.apache.camel.SSLContextParametersAware, + assertTrue(component instanceof 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 e8db1b11eaf09..d65009ccded23 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,6 +17,7 @@ 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; @@ -166,7 +167,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 " + java.util.Base64.getEncoder().encodeToString((userName + ":" + password).getBytes()))); + ("Basic " + 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 1852f5d530de6..5e11779f6ca4e 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,6 +37,7 @@ 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; @@ -175,7 +176,7 @@ private static HttpEntity findSignedDataEntity( = HttpMessageUtils.getEntity(request, ApplicationPkcs7MimeCompressedDataEntity.class); if (compressedEntity != null) { MimeEntity inner = compressedEntity - .getCompressedEntity(new org.bouncycastle.cms.jcajce.ZlibExpanderProvider()); + .getCompressedEntity(new 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 4d4d80c56f335..00ea980f3c0a7 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,19 +28,7 @@ import java.util.Map; import java.util.stream.Stream; -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.entity.*; 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; @@ -93,7 +81,7 @@ public static void setUpOnce() throws Exception { public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context) throws HttpException, IOException { try { - org.apache.camel.component.as2.api.entity.EntityParser.parseAS2MessageEntity(request); + 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 544d8cea97c5c..cc7d698c42065 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,12 +20,7 @@ import java.nio.charset.StandardCharsets; import java.security.cert.Certificate; -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.entity.*; 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; @@ -68,7 +63,7 @@ public static void setUpOnce() throws Exception { public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context) throws HttpException, IOException { try { - org.apache.camel.component.as2.api.entity.EntityParser.parseAS2MessageEntity(request); + 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 2ab7f4809508b..c8b63822e92b4 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,6 +30,7 @@ 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; @@ -952,7 +953,7 @@ protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { Processor proc = new Processor() { - public void process(org.apache.camel.Exchange exchange) { + public void process(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 624f6f5d0980d..f36c6998a72d6 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 @@ -157,7 +157,7 @@ public void configure() { // test route processing exception Processor failingProcessor = new Processor() { - public void process(org.apache.camel.Exchange exchange) throws Exception { + public void process(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 811007d5ab82d..e74a239cd0467 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,6 +16,9 @@ */ 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.*; @@ -261,13 +264,13 @@ protected HttpCoreContext sendToPath(String requestUri, AS2MessageStructure stru null, null, signingAlgorithm, - structure.isSigned() ? new java.security.cert.Certificate[] { signingCert } : null, + structure.isSigned() ? new Certificate[] { signingCert } : null, structure.isSigned() ? signingKP.getPrivate() : null, compressionAlgorithm, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, encryptionAlgorithm, - structure.isEncrypted() ? new java.security.cert.Certificate[] { signingCert } : null, + structure.isEncrypted() ? new 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 6d47cf8c1804c..d857cffa75063 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,14 +21,21 @@ */ 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 org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse( +public class Key extends SpecificRecordBase implements SpecificRecord { + public static final Schema SCHEMA$ = Schema.parse( "{\"type\":\"record\",\"name\":\"Key\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]}"); @Deprecated public java.lang.CharSequence key; - public org.apache.avro.Schema getSchema() { + public Schema getSchema() { return SCHEMA$; } @@ -38,7 +45,7 @@ public java.lang.Object get(int field$) { case 0: return key; default: - throw new org.apache.avro.AvroRuntimeException("Bad index"); + throw new AvroRuntimeException("Bad index"); } } @@ -50,7 +57,7 @@ public void put(int field$, java.lang.Object value$) { key = (java.lang.CharSequence) value$; break; default: - throw new org.apache.avro.AvroRuntimeException("Bad index"); + throw new AvroRuntimeException("Bad index"); } } @@ -71,41 +78,41 @@ public void setKey(java.lang.CharSequence value) { } /** Creates a new Key RecordBuilder */ - public static org.apache.camel.avro.generated.Key.Builder newBuilder() { - return new org.apache.camel.avro.generated.Key.Builder(); + public static Key.Builder newBuilder() { + return new Key.Builder(); } /** Creates a new Key RecordBuilder by copying an existing Builder */ - 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); + public static Key.Builder newBuilder(Key.Builder other) { + return new Key.Builder(other); } /** Creates a new Key RecordBuilder by copying an existing Key instance */ - 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); + public static Key.Builder newBuilder(Key other) { + return new Key.Builder(other); } /** * RecordBuilder for Key instances. */ - public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase - implements org.apache.avro.data.RecordBuilder { + public static class Builder extends SpecificRecordBuilderBase + implements RecordBuilder { private java.lang.CharSequence key; /** Creates a new Builder */ private Builder() { - super(org.apache.camel.avro.generated.Key.SCHEMA$); + super(Key.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(org.apache.camel.avro.generated.Key.Builder other) { + private Builder(Key.Builder other) { super(other); } /** Creates a Builder by copying an existing Key instance */ - private Builder(org.apache.camel.avro.generated.Key other) { - super(org.apache.camel.avro.generated.Key.SCHEMA$); + private Builder(Key other) { + super(Key.SCHEMA$); if (isValidValue(fields()[0], other.key)) { this.key = data().deepCopy(fields()[0].schema(), other.key); fieldSetFlags()[0] = true; @@ -118,7 +125,7 @@ public java.lang.CharSequence getKey() { } /** Sets the value of the 'key' field */ - public org.apache.camel.avro.generated.Key.Builder setKey(java.lang.CharSequence value) { + public Key.Builder setKey(java.lang.CharSequence value) { validate(fields()[0], value); this.key = value; fieldSetFlags()[0] = true; @@ -131,7 +138,7 @@ public boolean hasKey() { } /** Clears the value of the 'key' field */ - public org.apache.camel.avro.generated.Key.Builder clearKey() { + public Key.Builder clearKey() { key = null; fieldSetFlags()[0] = false; return this; @@ -144,7 +151,7 @@ public Key build() { record.key = fieldSetFlags()[0] ? this.key : (java.lang.CharSequence) defaultValue(fields()[0]); return record; } catch (Exception e) { - throw new org.apache.avro.AvroRuntimeException(e); + throw new 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 b7471ec9e5dc3..772f4f12d60fe 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,29 +21,35 @@ */ 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 { - org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse( + Protocol PROTOCOL = 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(org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value) - throws org.apache.avro.AvroRemoteException; + java.lang.Void put(Key key, Value value) + throws AvroRemoteException; - org.apache.camel.avro.generated.Value get(org.apache.camel.avro.generated.Key key) - throws org.apache.avro.AvroRemoteException; + Value get(Key key) + throws AvroRemoteException; @SuppressWarnings("all") public interface Callback extends KeyValueProtocol { - org.apache.avro.Protocol PROTOCOL = org.apache.camel.avro.generated.KeyValueProtocol.PROTOCOL; + Protocol PROTOCOL = KeyValueProtocol.PROTOCOL; void put( - org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value, + Key key, Value value, org.apache.avro.ipc.Callback callback) - throws java.io.IOException; + throws IOException; void get( - org.apache.camel.avro.generated.Key key, - org.apache.avro.ipc.Callback callback) - throws java.io.IOException; + Key key, + org.apache.avro.ipc.Callback callback) + throws 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 6f8d90d824360..7f7c7a09e199e 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,14 +21,21 @@ */ 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 org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse( +public class Value extends SpecificRecordBase implements SpecificRecord { + public static final Schema SCHEMA$ = Schema.parse( "{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.avro.generated\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}"); @Deprecated public java.lang.CharSequence value; - public org.apache.avro.Schema getSchema() { + public Schema getSchema() { return SCHEMA$; } @@ -38,7 +45,7 @@ public java.lang.Object get(int field$) { case 0: return value; default: - throw new org.apache.avro.AvroRuntimeException("Bad index"); + throw new AvroRuntimeException("Bad index"); } } @@ -50,7 +57,7 @@ public void put(int field$, java.lang.Object value$) { value = (java.lang.CharSequence) value$; break; default: - throw new org.apache.avro.AvroRuntimeException("Bad index"); + throw new AvroRuntimeException("Bad index"); } } @@ -71,42 +78,42 @@ public void setValue(java.lang.CharSequence value) { } /** Creates a new Value RecordBuilder */ - public static org.apache.camel.avro.generated.Value.Builder newBuilder() { - return new org.apache.camel.avro.generated.Value.Builder(); + public static Value.Builder newBuilder() { + return new Value.Builder(); } /** Creates a new Value RecordBuilder by copying an existing Builder */ - 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); + public static Value.Builder newBuilder( + Value.Builder other) { + return new Value.Builder(other); } /** Creates a new Value RecordBuilder by copying an existing Value instance */ - 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); + public static Value.Builder newBuilder(Value other) { + return new Value.Builder(other); } /** * RecordBuilder for Value instances. */ - public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase - implements org.apache.avro.data.RecordBuilder { + public static class Builder extends SpecificRecordBuilderBase + implements RecordBuilder { private java.lang.CharSequence value; /** Creates a new Builder */ private Builder() { - super(org.apache.camel.avro.generated.Value.SCHEMA$); + super(Value.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(org.apache.camel.avro.generated.Value.Builder other) { + private Builder(Value.Builder other) { super(other); } /** Creates a Builder by copying an existing Value instance */ - private Builder(org.apache.camel.avro.generated.Value other) { - super(org.apache.camel.avro.generated.Value.SCHEMA$); + private Builder(Value other) { + super(Value.SCHEMA$); if (isValidValue(fields()[0], other.value)) { this.value = data().deepCopy(fields()[0].schema(), other.value); fieldSetFlags()[0] = true; @@ -119,7 +126,7 @@ public java.lang.CharSequence getValue() { } /** Sets the value of the 'value' field */ - public org.apache.camel.avro.generated.Value.Builder setValue(java.lang.CharSequence value) { + public Value.Builder setValue(java.lang.CharSequence value) { validate(fields()[0], value); this.value = value; fieldSetFlags()[0] = true; @@ -132,7 +139,7 @@ public boolean hasValue() { } /** Clears the value of the 'value' field */ - public org.apache.camel.avro.generated.Value.Builder clearValue() { + public Value.Builder clearValue() { value = null; fieldSetFlags()[0] = false; return this; @@ -145,7 +152,7 @@ public Value build() { record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]); return record; } catch (Exception e) { - throw new org.apache.avro.AvroRuntimeException(e); + throw new 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 0e428fc559f79..55b77e9665598 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 @@ -17,6 +17,7 @@ package org.apache.camel.component.avro.spi; import java.io.IOException; +import org.apache.camel.spi.annotations.JdkService; import org.apache.avro.ipc.Server; import org.apache.avro.ipc.jetty.HttpServer; @@ -26,7 +27,7 @@ * Default implementation of Avro via http, which is based on Jetty http server. For more details see dependency * org.apache.avro:avro-ipc-jetty. */ -@org.apache.camel.spi.annotations.JdkService("avro-rpc-http-server-factory") +@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 30748226353ea..d23101faa6db3 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,6 +16,7 @@ */ 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; @@ -43,9 +44,9 @@ private void addLogicalTypeConversions() { addLogicalTypeConversion(new TimeConversions.LocalTimestampMicrosConversion()); addLogicalTypeConversion(new TimeConversions.LocalTimestampNanosConversion()); - addLogicalTypeConversion(new org.apache.avro.Conversions.UUIDConversion()); + addLogicalTypeConversion(new Conversions.UUIDConversion()); - addLogicalTypeConversion(new org.apache.avro.Conversions.DecimalConversion()); + addLogicalTypeConversion(new 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 5aa631103deee..5d998b9c69579 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,26 +21,45 @@ */ 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; -@org.apache.avro.specific.AvroGenerated -public class DateRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { +@AvroGenerated +public class DateRecord extends SpecificRecordBase implements SpecificRecord { private static final long serialVersionUID = 8653491882695437570L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse( + public static final Schema SCHEMA$ = new 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 org.apache.avro.Schema getClassSchema() { + public static Schema getClassSchema() { return SCHEMA$; } private static final SpecificData MODEL$ = new SpecificData(); static { - MODEL$.addLogicalTypeConversion(new org.apache.avro.data.TimeConversions.DateConversion()); - MODEL$.addLogicalTypeConversion(new org.apache.avro.data.TimeConversions.TimestampMillisConversion()); + MODEL$.addLogicalTypeConversion(new TimeConversions.DateConversion()); + MODEL$.addLogicalTypeConversion(new TimeConversions.TimestampMillisConversion()); } private static final BinaryMessageEncoder ENCODER = new BinaryMessageEncoder<>(MODEL$, SCHEMA$); @@ -81,7 +100,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 java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { + public ByteBuffer toByteBuffer() throws IOException { return ENCODER.encode(this); } @@ -93,13 +112,13 @@ public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { * @throws java.io.IOException if the given bytes could not be deserialized into an instance of this class */ public static DateRecord fromByteBuffer( - java.nio.ByteBuffer b) - throws java.io.IOException { + ByteBuffer b) + throws IOException { return DECODER.decode(b); } - private java.time.LocalDate date; - private java.time.Instant timestamp; + private LocalDate date; + private Instant timestamp; /** * Default constructor. Note that this does not initialize fields to their default values from the schema. If that @@ -114,7 +133,7 @@ public DateRecord() { * @param date The new value for date * @param timestamp The new value for timestamp */ - public DateRecord(java.time.LocalDate date, java.time.Instant timestamp) { + public DateRecord(LocalDate date, Instant timestamp) { this.date = date; this.timestamp = timestamp; } @@ -125,7 +144,7 @@ public SpecificData getSpecificData() { } @Override - public org.apache.avro.Schema getSchema() { + public Schema getSchema() { return SCHEMA$; } @@ -148,10 +167,10 @@ public Object get(int field$) { public void put(int field$, Object value$) { switch (field$) { case 0: - date = (java.time.LocalDate) value$; + date = (LocalDate) value$; break; case 1: - timestamp = (java.time.Instant) value$; + timestamp = (Instant) value$; break; default: throw new IndexOutOfBoundsException("Invalid index: " + field$); @@ -163,7 +182,7 @@ public void put(int field$, Object value$) { * * @return The value of the 'date' field. */ - public java.time.LocalDate getDate() { + public LocalDate getDate() { return date; } @@ -172,7 +191,7 @@ public java.time.LocalDate getDate() { * * @param value the value to set. */ - public void setDate(java.time.LocalDate value) { + public void setDate(LocalDate value) { this.date = value; } @@ -181,7 +200,7 @@ public void setDate(java.time.LocalDate value) { * * @return The value of the 'timestamp' field. */ - public java.time.Instant getTimestamp() { + public Instant getTimestamp() { return timestamp; } @@ -190,7 +209,7 @@ public java.time.Instant getTimestamp() { * * @param value the value to set. */ - public void setTimestamp(java.time.Instant value) { + public void setTimestamp(Instant value) { this.timestamp = value; } @@ -227,19 +246,19 @@ public static Builder newBuilder(DateRecord other) { if (other == null) { return new Builder(); } else { - return new org.apache.camel.dataformat.avro.example.DateRecord.Builder(other); + return new DateRecord.Builder(other); } } /** * RecordBuilder for DateRecord instances. */ - @org.apache.avro.specific.AvroGenerated - public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase - implements org.apache.avro.data.RecordBuilder { + @AvroGenerated + public static class Builder extends SpecificRecordBuilderBase + implements RecordBuilder { - private java.time.LocalDate date; - private java.time.Instant timestamp; + private LocalDate date; + private Instant timestamp; /** Creates a new Builder */ private Builder() { @@ -251,7 +270,7 @@ private Builder() { * * @param other The existing Builder to copy. */ - private Builder(org.apache.camel.dataformat.avro.example.DateRecord.Builder other) { + private Builder(DateRecord.Builder other) { super(other); if (isValidValue(fields()[0], other.date)) { this.date = data().deepCopy(fields()[0].schema(), other.date); @@ -268,7 +287,7 @@ private Builder(org.apache.camel.dataformat.avro.example.DateRecord.Builder othe * * @param other The existing instance to copy. */ - private Builder(org.apache.camel.dataformat.avro.example.DateRecord other) { + private Builder(DateRecord other) { super(SCHEMA$, MODEL$); if (isValidValue(fields()[0], other.date)) { this.date = data().deepCopy(fields()[0].schema(), other.date); @@ -285,7 +304,7 @@ private Builder(org.apache.camel.dataformat.avro.example.DateRecord other) { * * @return The value. */ - public java.time.LocalDate getDate() { + public LocalDate getDate() { return date; } @@ -295,7 +314,7 @@ public java.time.LocalDate getDate() { * @param value The value of 'date'. * @return This builder. */ - public org.apache.camel.dataformat.avro.example.DateRecord.Builder setDate(java.time.LocalDate value) { + public DateRecord.Builder setDate(LocalDate value) { validate(fields()[0], value); this.date = value; fieldSetFlags()[0] = true; @@ -316,7 +335,7 @@ public boolean hasDate() { * * @return This builder. */ - public org.apache.camel.dataformat.avro.example.DateRecord.Builder clearDate() { + public DateRecord.Builder clearDate() { date = null; fieldSetFlags()[0] = false; return this; @@ -327,7 +346,7 @@ public org.apache.camel.dataformat.avro.example.DateRecord.Builder clearDate() { * * @return The value. */ - public java.time.Instant getTimestamp() { + public Instant getTimestamp() { return timestamp; } @@ -337,7 +356,7 @@ public java.time.Instant getTimestamp() { * @param value The value of 'timestamp'. * @return This builder. */ - public org.apache.camel.dataformat.avro.example.DateRecord.Builder setTimestamp(java.time.Instant value) { + public DateRecord.Builder setTimestamp(Instant value) { validate(fields()[1], value); this.timestamp = value; fieldSetFlags()[1] = true; @@ -358,7 +377,7 @@ public boolean hasTimestamp() { * * @return This builder. */ - public org.apache.camel.dataformat.avro.example.DateRecord.Builder clearTimestamp() { + public DateRecord.Builder clearTimestamp() { timestamp = null; fieldSetFlags()[1] = false; return this; @@ -369,34 +388,34 @@ public org.apache.camel.dataformat.avro.example.DateRecord.Builder clearTimestam public DateRecord build() { try { DateRecord record = new DateRecord(); - record.date = fieldSetFlags()[0] ? this.date : (java.time.LocalDate) defaultValue(fields()[0]); - record.timestamp = fieldSetFlags()[1] ? this.timestamp : (java.time.Instant) defaultValue(fields()[1]); + record.date = fieldSetFlags()[0] ? this.date : (LocalDate) defaultValue(fields()[0]); + record.timestamp = fieldSetFlags()[1] ? this.timestamp : (Instant) defaultValue(fields()[1]); return record; - } catch (org.apache.avro.AvroMissingFieldException e) { + } catch (AvroMissingFieldException e) { throw e; } catch (java.lang.Exception e) { - throw new org.apache.avro.AvroRuntimeException(e); + throw new AvroRuntimeException(e); } } } @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumWriter WRITER$ - = (org.apache.avro.io.DatumWriter) MODEL$.createDatumWriter(SCHEMA$); + private static final DatumWriter WRITER$ + = (DatumWriter) MODEL$.createDatumWriter(SCHEMA$); @Override - public void writeExternal(java.io.ObjectOutput out) - throws java.io.IOException { + public void writeExternal(ObjectOutput out) + throws IOException { WRITER$.write(this, SpecificData.getEncoder(out)); } @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumReader READER$ - = (org.apache.avro.io.DatumReader) MODEL$.createDatumReader(SCHEMA$); + private static final DatumReader READER$ + = (DatumReader) MODEL$.createDatumReader(SCHEMA$); @Override - public void readExternal(java.io.ObjectInput in) - throws java.io.IOException { + public void readExternal(ObjectInput in) + throws IOException { READER$.read(this, SpecificData.getDecoder(in)); } @@ -417,10 +436,10 @@ public boolean equals(Object o) { return false; } DateRecord other = (DateRecord) o; - if (!java.util.Objects.equals(this.date, other.date)) { + if (!Objects.equals(this.date, other.date)) { return false; } - if (!java.util.Objects.equals(this.timestamp, other.timestamp)) { + if (!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 a285fc2db7f9a..cb1746ea3b0df 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,14 +21,21 @@ */ 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 org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = org.apache.avro.Schema.parse( +public class Value extends SpecificRecordBase implements SpecificRecord { + public static final Schema SCHEMA$ = 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 org.apache.avro.Schema getSchema() { + public Schema getSchema() { return SCHEMA$; } @@ -38,7 +45,7 @@ public java.lang.Object get(int field$) { case 0: return value; default: - throw new org.apache.avro.AvroRuntimeException("Bad index"); + throw new AvroRuntimeException("Bad index"); } } @@ -50,7 +57,7 @@ public void put(int field$, java.lang.Object value$) { value = (java.lang.CharSequence) value$; break; default: - throw new org.apache.avro.AvroRuntimeException("Bad index"); + throw new AvroRuntimeException("Bad index"); } } @@ -71,43 +78,43 @@ public void setValue(java.lang.CharSequence value) { } /** Creates a new Value RecordBuilder */ - public static org.apache.camel.dataformat.avro.example.Value.Builder newBuilder() { - return new org.apache.camel.dataformat.avro.example.Value.Builder(); + public static Value.Builder newBuilder() { + return new Value.Builder(); } /** Creates a new Value RecordBuilder by copying an existing Builder */ - 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); + public static Value.Builder newBuilder( + Value.Builder other) { + return new Value.Builder(other); } /** Creates a new Value RecordBuilder by copying an existing Value instance */ - 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); + public static Value.Builder newBuilder( + Value other) { + return new Value.Builder(other); } /** * RecordBuilder for Value instances. */ - public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase - implements org.apache.avro.data.RecordBuilder { + public static class Builder extends SpecificRecordBuilderBase + implements RecordBuilder { private java.lang.CharSequence value; /** Creates a new Builder */ private Builder() { - super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$); + super(Value.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(org.apache.camel.dataformat.avro.example.Value.Builder other) { + private Builder(Value.Builder other) { super(other); } /** Creates a Builder by copying an existing Value instance */ - private Builder(org.apache.camel.dataformat.avro.example.Value other) { - super(org.apache.camel.dataformat.avro.example.Value.SCHEMA$); + private Builder(Value other) { + super(Value.SCHEMA$); if (isValidValue(fields()[0], other.value)) { this.value = data().deepCopy(fields()[0].schema(), other.value); fieldSetFlags()[0] = true; @@ -120,7 +127,7 @@ public java.lang.CharSequence getValue() { } /** Sets the value of the 'value' field */ - public org.apache.camel.dataformat.avro.example.Value.Builder setValue(java.lang.CharSequence value) { + public Value.Builder setValue(java.lang.CharSequence value) { validate(fields()[0], value); this.value = value; fieldSetFlags()[0] = true; @@ -133,7 +140,7 @@ public boolean hasValue() { } /** Clears the value of the 'value' field */ - public org.apache.camel.dataformat.avro.example.Value.Builder clearValue() { + public Value.Builder clearValue() { value = null; fieldSetFlags()[0] = false; return this; @@ -146,7 +153,7 @@ public Value build() { record.value = fieldSetFlags()[0] ? this.value : (java.lang.CharSequence) defaultValue(fields()[0]); return record; } catch (Exception e) { - throw new org.apache.avro.AvroRuntimeException(e); + throw new 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 4ce3e9f0c767d..976c878e70ee1 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,6 +23,7 @@ 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 @@ -36,7 +37,7 @@ public class BedrockConfiguration implements Cloneable, AwsCommonConfiguration { private BedrockRuntimeClient bedrockRuntimeClient; @UriParam @Metadata(label = "advanced", autowired = true) - private software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient bedrockRuntimeAsyncClient; + private BedrockRuntimeAsyncClient bedrockRuntimeAsyncClient; @UriParam(label = "security", security = "secret") private String accessKey; @UriParam(label = "security", security = "secret") @@ -95,7 +96,7 @@ public void setBedrockRuntimeClient(BedrockRuntimeClient bedrockRuntimeClient) { this.bedrockRuntimeClient = bedrockRuntimeClient; } - public software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient getBedrockRuntimeAsyncClient() { + public BedrockRuntimeAsyncClient getBedrockRuntimeAsyncClient() { return bedrockRuntimeAsyncClient; } @@ -103,7 +104,7 @@ public software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient * To use an existing configured AWS Bedrock Runtime Async client for streaming operations */ public void setBedrockRuntimeAsyncClient( - software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient bedrockRuntimeAsyncClient) { + 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 34596b9d242b1..edc9672639868 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,6 +27,7 @@ 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; @@ -34,11 +35,20 @@ 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; @@ -574,27 +584,27 @@ private void converse(BedrockRuntimeClient bedrockRuntimeClient, Exchange exchan } // Optional: Additional model request fields - software.amazon.awssdk.core.document.Document additionalFields = exchange.getMessage() + Document additionalFields = exchange.getMessage() .getHeader(BedrockConstants.CONVERSE_ADDITIONAL_MODEL_REQUEST_FIELDS, - software.amazon.awssdk.core.document.Document.class); + Document.class); if (ObjectHelper.isNotEmpty(additionalFields)) { builder.additionalModelRequestFields(additionalFields); } // Optional: Guardrail configuration - software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration guardrailConfig + GuardrailConfiguration guardrailConfig = exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONFIG, - software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration.class); + GuardrailConfiguration.class); if (ObjectHelper.isNotEmpty(guardrailConfig)) { builder.guardrailConfig(guardrailConfig); } else if (ObjectHelper.isNotEmpty(getConfiguration().getGuardrailIdentifier())) { // Build from endpoint configuration - builder.guardrailConfig(software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration.builder() + builder.guardrailConfig(GuardrailConfiguration.builder() .guardrailIdentifier(getConfiguration().getGuardrailIdentifier()) .guardrailVersion(getConfiguration().getGuardrailVersion()) .trace(getConfiguration().isGuardrailTrace() - ? software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace.ENABLED - : software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace.DISABLED) + ? GuardrailTrace.ENABLED + : GuardrailTrace.DISABLED) .build()); } @@ -604,7 +614,7 @@ private void converse(BedrockRuntimeClient bedrockRuntimeClient, Exchange exchan try { ConverseResponse response = bedrockRuntimeClient.converse(request); - org.apache.camel.Message message = getMessageForResponse(exchange); + Message message = getMessageForResponse(exchange); // Set the output message content as body if (ObjectHelper.isNotEmpty(response.output()) && ObjectHelper.isNotEmpty(response.output().message())) { @@ -690,28 +700,28 @@ private void converseStream(Exchange exchange) throws InvalidPayloadException { } // Optional: Additional model request fields - software.amazon.awssdk.core.document.Document additionalFields = exchange.getMessage() + Document additionalFields = exchange.getMessage() .getHeader(BedrockConstants.CONVERSE_ADDITIONAL_MODEL_REQUEST_FIELDS, - software.amazon.awssdk.core.document.Document.class); + Document.class); if (ObjectHelper.isNotEmpty(additionalFields)) { builder.additionalModelRequestFields(additionalFields); } // Optional: Guardrail configuration (use GuardrailStreamConfiguration for streaming) - software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamConfiguration guardrailConfig + GuardrailStreamConfiguration guardrailConfig = exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONFIG, - software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamConfiguration.class); + GuardrailStreamConfiguration.class); if (ObjectHelper.isNotEmpty(guardrailConfig)) { builder.guardrailConfig(guardrailConfig); } else if (ObjectHelper.isNotEmpty(getConfiguration().getGuardrailIdentifier())) { // Build from endpoint configuration - builder.guardrailConfig(software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamConfiguration + builder.guardrailConfig(GuardrailStreamConfiguration .builder() .guardrailIdentifier(getConfiguration().getGuardrailIdentifier()) .guardrailVersion(getConfiguration().getGuardrailVersion()) .streamProcessingMode(getConfiguration().isGuardrailTrace() - ? software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamProcessingMode.ASYNC - : software.amazon.awssdk.services.bedrockruntime.model.GuardrailStreamProcessingMode.SYNC) + ? GuardrailStreamProcessingMode.ASYNC + : GuardrailStreamProcessingMode.SYNC) .build()); } @@ -733,16 +743,16 @@ private void processConverseStreamingRequest(ConverseStreamRequest request, Exch streamOutputMode = exchange.getIn().getHeader(BedrockConstants.STREAM_OUTPUT_MODE, String.class); } - 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(); + Message message = getMessageForResponse(exchange); + ConverseStreamHandler.StreamMetadata metadata + = new ConverseStreamHandler.StreamMetadata(); if ("chunks".equals(streamOutputMode)) { // Chunks mode - emit each chunk as separate message List allChunks = new ArrayList<>(); getEndpoint().getBedrockRuntimeAsyncClient().converseStream( request, - org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.createChunksHandler( + ConverseStreamHandler.createChunksHandler( metadata, allChunks, null)) @@ -757,7 +767,7 @@ private void processConverseStreamingRequest(ConverseStreamRequest request, Exch StringBuilder fullText = new StringBuilder(); getEndpoint().getBedrockRuntimeAsyncClient().converseStream( request, - org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.createCompleteHandler( + ConverseStreamHandler.createCompleteHandler( metadata, fullText)) .join(); @@ -775,8 +785,8 @@ private void processConverseStreamingRequest(ConverseStreamRequest request, Exch } private void setConverseStreamingMetadata( - org.apache.camel.Message message, - org.apache.camel.component.aws2.bedrock.runtime.stream.ConverseStreamHandler.StreamMetadata metadata) { + Message message, + ConverseStreamHandler.StreamMetadata metadata) { if (ObjectHelper.isNotEmpty(metadata.getStopReason())) { message.setHeader(BedrockConstants.CONVERSE_STOP_REASON, metadata.getStopReason()); } @@ -790,11 +800,11 @@ private void setConverseStreamingMetadata( } private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange exchange) throws InvalidPayloadException { - software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest request; + ApplyGuardrailRequest request; if (getConfiguration().isPojoRequest()) { Object payload = exchange.getMessage().getMandatoryBody(); - if (payload instanceof software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest guardrailRequest) { + if (payload instanceof ApplyGuardrailRequest guardrailRequest) { request = guardrailRequest; } else { throw new IllegalArgumentException( @@ -802,8 +812,8 @@ private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange } } else { // Build request from headers and configuration - software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest.Builder builder - = software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest.builder(); + ApplyGuardrailRequest.Builder builder + = ApplyGuardrailRequest.builder(); // Guardrail identifier from header or configuration String guardrailIdentifier = exchange.getMessage().getHeader(BedrockConstants.GUARDRAIL_CONFIG, String.class); @@ -824,11 +834,11 @@ private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange if (ObjectHelper.isEmpty(source)) { source = "INPUT"; // Default to INPUT } - builder.source(software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentSource.fromValue(source)); + builder.source(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); @@ -841,10 +851,10 @@ private void applyGuardrail(BedrockRuntimeClient bedrockRuntimeClient, Exchange } try { - software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailResponse response + ApplyGuardrailResponse response = bedrockRuntimeClient.applyGuardrail(request); - org.apache.camel.Message message = getMessageForResponse(exchange); + 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 182a17a3977db..3b978996dd156 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,6 +23,7 @@ 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; /** @@ -129,7 +130,7 @@ public static class StreamMetadata { private String stopReason; private TokenUsage usage; private int chunkCount; - private software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace guardrailTrace; + private GuardrailTrace guardrailTrace; public String getFullText() { return fullText; @@ -171,11 +172,11 @@ public void setChunkCount(int chunkCount) { this.chunkCount = chunkCount; } - public software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace getGuardrailTrace() { + public GuardrailTrace getGuardrailTrace() { return guardrailTrace; } - public void setGuardrailTrace(software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace guardrailTrace) { + public void setGuardrailTrace(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 0d164fa02b1a9..65f2b9bd834ea 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,6 +16,10 @@ */ 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; @@ -29,6 +33,16 @@ 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; @@ -63,18 +77,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 - 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 + List messages = new ArrayList<>(); + messages.add(Message.builder() + .role(ConversationRole.USER) + .content(ContentBlock .fromText("Tell me about Paris")) .build()); ex.getMessage().setHeader(BedrockConstants.CONVERSE_MESSAGES, messages); // Optional: Add inference configuration - software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig - = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder() + InferenceConfiguration inferenceConfig + = InferenceConfiguration.builder() .maxTokens(200) .temperature(0.7f) .build(); @@ -98,10 +112,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 - 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 + List messages = new ArrayList<>(); + messages.add(Message.builder() + .role(ConversationRole.USER) + .content(ContentBlock .fromText("What is the capital of France?")) .build()); @@ -109,17 +123,17 @@ public void testConverseWithGuardrailsViaHeader() throws InterruptedException { // Configure guardrail via header String guardrailId = System.getProperty("aws.manual.guardrail.id"); - software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration guardrailConfig - = software.amazon.awssdk.services.bedrockruntime.model.GuardrailConfiguration.builder() + GuardrailConfiguration guardrailConfig + = GuardrailConfiguration.builder() .guardrailIdentifier(guardrailId) .guardrailVersion("DRAFT") - .trace(software.amazon.awssdk.services.bedrockruntime.model.GuardrailTrace.ENABLED) + .trace(GuardrailTrace.ENABLED) .build(); ex.getMessage().setHeader(BedrockConstants.GUARDRAIL_CONFIG, guardrailConfig); // Optional: Add inference configuration - software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig - = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder() + InferenceConfiguration inferenceConfig + = InferenceConfiguration.builder() .maxTokens(100) .temperature(0.7f) .build(); @@ -143,10 +157,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 - 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 + List messages = new ArrayList<>(); + messages.add(Message.builder() + .role(ConversationRole.USER) + .content(ContentBlock .fromText("Tell me a short story about a robot")) .build()); @@ -154,8 +168,8 @@ public void testConverseStreamWithGuardrails() throws InterruptedException { ex.getMessage().setHeader(BedrockConstants.STREAM_OUTPUT_MODE, "complete"); // Optional: Add inference configuration - software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig - = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder() + InferenceConfiguration inferenceConfig + = InferenceConfiguration.builder() .maxTokens(300) .temperature(0.9f) .build(); @@ -174,10 +188,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 - 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() + List content + = new ArrayList<>(); + content.add(GuardrailContentBlock.builder() + .text(GuardrailTextBlock.builder() .text("This is a test message to check against the guardrail.") .build()) .build()); @@ -205,21 +219,21 @@ public void testApplyGuardrailWithPOJO() throws InterruptedException { result.expectedMessageCount(1); final Exchange exchange = template.send("direct:apply_guardrail_pojo", ex -> { // Create content blocks - 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() + List content + = new ArrayList<>(); + content.add(GuardrailContentBlock.builder() + .text(GuardrailTextBlock.builder() .text("Another test message for guardrail validation.") .build()) .build()); // Build the full ApplyGuardrailRequest String guardrailId = System.getProperty("aws.manual.guardrail.id"); - software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest request - = software.amazon.awssdk.services.bedrockruntime.model.ApplyGuardrailRequest.builder() + ApplyGuardrailRequest request + = ApplyGuardrailRequest.builder() .guardrailIdentifier(guardrailId) .guardrailVersion("DRAFT") - .source(software.amazon.awssdk.services.bedrockruntime.model.GuardrailContentSource.INPUT) + .source(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 a6e33f8f4308a..6b996ac49f449 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,6 +16,10 @@ */ 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; @@ -31,6 +35,10 @@ 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({ @@ -878,18 +886,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 - 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 + List messages = new ArrayList<>(); + messages.add(Message.builder() + .role(ConversationRole.USER) + .content(ContentBlock .fromText("What is the capital of France?")) .build()); exchange.getMessage().setHeader(BedrockConstants.CONVERSE_MESSAGES, messages); // Optional: Add inference configuration - software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig - = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder() + InferenceConfiguration inferenceConfig + = InferenceConfiguration.builder() .maxTokens(100) .temperature(0.7f) .build(); @@ -904,10 +912,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 - 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 + List messages = new ArrayList<>(); + messages.add(Message.builder() + .role(ConversationRole.USER) + .content(ContentBlock .fromText("Tell me a short joke about Java programming")) .build()); @@ -915,8 +923,8 @@ public void testConverseStreamWithClaudeModel() throws InterruptedException { exchange.getMessage().setHeader(BedrockConstants.STREAM_OUTPUT_MODE, "complete"); // Optional: Add inference configuration - software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration inferenceConfig - = software.amazon.awssdk.services.bedrockruntime.model.InferenceConfiguration.builder() + InferenceConfiguration inferenceConfig + = 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 59dd0817e3485..6f836492ecef8 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,6 +19,7 @@ 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; @@ -62,7 +63,7 @@ public class Kinesis2Consumer extends ScheduledBatchPollingConsumer implements R private KinesisConnection connection; private ResumeStrategy resumeStrategy; - private final Map currentShardIterators = new java.util.HashMap<>(); + private final Map currentShardIterators = new 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 45e2a00ccf8f3..4d65759d900b8 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,6 +55,8 @@ 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 @@ -1051,13 +1053,13 @@ private void createUploadLink(Exchange exchange) { .key(keyName) .build(); - software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest putObjectPresignRequest - = software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest.builder() + PutObjectPresignRequest putObjectPresignRequest + = PutObjectPresignRequest.builder() .signatureDuration(Duration.ofMillis(milliSeconds)) .putObjectRequest(putObjectRequest) .build(); - software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest presignedPutObjectRequest + 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 cf549df512ae8..4b1ef57e797bb 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 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(); + private RawMessage createRawMessage(Exchange exchange) throws Exception { + RawMessage.Builder message + = 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 56eec39b82f97..680961eaf88f6 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,6 +18,7 @@ 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; @@ -48,7 +49,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. @@ -108,11 +109,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 ef66688ebfd39..d82f4dbd5a1c8 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,6 +52,7 @@ 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; @@ -254,7 +255,7 @@ private boolean retrieveFileToBody(String name, Exchange exchange) throws Generi boolean success; GenericFile target = (GenericFile) exchange .getProperty(FileComponent.FILE_EXCHANGE_FILE); - org.apache.camel.util.ObjectHelper.notNull(target, + ObjectHelper.notNull(target, "Exchange should have the " + FileComponent.FILE_EXCHANGE_FILE + " set"); String path = FileUtil.onlyPath(name); @@ -297,7 +298,7 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc // use relative filename in local work directory GenericFile target = (GenericFile) exchange .getProperty(FileComponent.FILE_EXCHANGE_FILE); - org.apache.camel.util.ObjectHelper.notNull(target, + 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 3a508139d0cfb..91bc594bc3b47 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 org.apache.camel.component.azure.servicebus.ServiceBusConfiguration copy() { + public ServiceBusConfiguration copy() { try { - return (org.apache.camel.component.azure.servicebus.ServiceBusConfiguration) super.clone(); + return (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 eb83677748436..9727fd1377e6d 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,6 +20,7 @@ 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; @@ -308,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 java.nio.file.Path path) { + if (body instanceof 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 1812e766075ef..f4f9e42f6109b 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,6 +26,7 @@ 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; @@ -296,7 +297,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 - java.nio.file.Files.writeString(testFile, content); + Files.writeString(testFile, content); final BlobClientWrapper blobClientWrapper = blobContainerClientWrapper.getBlobClientWrapper("large_upload_test.txt"); final BlobOperations operations = new BlobOperations(configuration, blobClientWrapper); @@ -326,7 +327,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"; - java.nio.file.Files.writeString(testFile, content); + 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 ef8e66a403bac..652663f29f459 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,6 +21,7 @@ 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; @@ -31,7 +32,7 @@ /** * The bean component is for invoking Java beans from Camel. */ -@org.apache.camel.spi.annotations.Component("bean") +@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 29c7a46b8e3ee..ba17b054f4da2 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,6 +35,7 @@ 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; @@ -46,6 +47,8 @@ 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; @@ -131,8 +134,8 @@ public MethodInfo(CamelContext camelContext, Class type, Method method, List< pattern = aep; } - org.apache.camel.RoutingSlip routingSlipAnnotation - = (org.apache.camel.RoutingSlip) collectedMethodAnnotation.get(org.apache.camel.RoutingSlip.class); + RoutingSlip routingSlipAnnotation + = (RoutingSlip) collectedMethodAnnotation.get(RoutingSlip.class); if (routingSlipAnnotation != null) { routingSlip = PluginHelper.getAnnotationBasedProcessorFactory(camelContext) .createRoutingSlip(camelContext, routingSlipAnnotation); @@ -144,8 +147,8 @@ public MethodInfo(CamelContext camelContext, Class type, Method method, List< } } - org.apache.camel.DynamicRouter dynamicRouterAnnotation - = (org.apache.camel.DynamicRouter) collectedMethodAnnotation.get(org.apache.camel.DynamicRouter.class); + DynamicRouter dynamicRouterAnnotation + = (DynamicRouter) collectedMethodAnnotation.get(DynamicRouter.class); if (dynamicRouterAnnotation != null) { dynamicRouter = PluginHelper.getAnnotationBasedProcessorFactory(camelContext) .createDynamicRouter(camelContext, dynamicRouterAnnotation); @@ -157,8 +160,8 @@ public MethodInfo(CamelContext camelContext, Class type, Method method, List< } } - org.apache.camel.RecipientList recipientListAnnotation - = (org.apache.camel.RecipientList) collectedMethodAnnotation.get(org.apache.camel.RecipientList.class); + RecipientList recipientListAnnotation + = (RecipientList) collectedMethodAnnotation.get(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 dfe41a6cca46f..dd75171c4da7b 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,6 +25,7 @@ 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; /** @@ -33,7 +34,7 @@ *

* This component is an extension to the {@link org.apache.camel.component.bean.BeanComponent}. */ -@org.apache.camel.spi.annotations.Component("class") +@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 6524eebf19411..3a1934661d8c9 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 java.lang.IllegalArgumentException( + throw new IllegalArgumentException( "Record can not be configured with both 'isHeader=true' and 'hasHeader=true'"); } if (hasFooter && isFooter) { - throw new java.lang.IllegalArgumentException( + throw new IllegalArgumentException( "Record can not be configured with both 'isFooter=true' and 'hasFooter=true'"); } if ((isHeader || isFooter) && (skipHeader || skipFooter)) { - throw new java.lang.IllegalArgumentException( + throw new 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 6c38ec2d92a19..1bcc6d95a091a 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 java.lang.IllegalArgumentException("No records have been defined in the CSV"); + throw new 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 c4fe06e19fad7..d63e7da90540b 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 java.text.DateFormat getDateFormat() { + protected 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 25e18bf21cdfd..74e69c723879c 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 java.lang.IllegalArgumentException("No records have been defined in the CSV"); + throw new 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 1da0cb1dca6ff..2c33a39fbd2b3 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(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class) + .classType(Order.class) .locale("en") .csv(); @@ -120,7 +120,7 @@ public void configure() { .to("mock:in"); from("direct:out") - .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class) + .unmarshal().bindy(BindyType.Csv, 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 24cf12b763acc..968aaf25da61b 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 = org.apache.camel.dataformat.bindy.model.car.Car.class; + Class type = 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 de2505994396c..5958e5908392c 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(org.apache.camel.dataformat.bindy.model.complex.generateheader.Order.class); + = new BindyCsvDataFormat(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 517d019e0aeea..b5fab2aa8be17 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(org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class); + = new BindyCsvDataFormat(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 da84433e6595b..cf343768587d0 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,6 +23,7 @@ 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; @@ -33,7 +34,7 @@ @CamelSpringTest public class BindyComplexCsvUnmarshallEmptyStreamTest { - private static final Class TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class; + private static final Class TYPE = 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 e6fd7b7669dac..b001dd5ff0552 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,6 +23,7 @@ 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; @@ -33,7 +34,7 @@ @CamelSpringTest public class BindyComplexCsvUnmarshallTest { - private static final Class TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class; + private static final Class TYPE = 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 4c6f5439d6777..049b378971b72 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,6 +23,7 @@ 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; @@ -34,7 +35,7 @@ @CamelSpringTest public class BindyComplexCsvUnmarshallUnwrapSingleInstanceTest { - private static final Class TYPE = org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink.Order.class; + private static final Class TYPE = 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 4ee4ce53cdcd7..ade0df2d92b21 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,6 +22,7 @@ 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; @@ -54,7 +55,7 @@ public static class ContextConfig extends RouteBuilder { @Override public void configure() { BindyCsvDataFormat camelDataFormat - = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class); + = new BindyCsvDataFormat(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 a16c189d90817..b17b78c2217c7 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(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class); + = new BindyCsvDataFormat(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 2b21f853cd323..09b5862fd0978 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, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class) + .unmarshal().bindy(BindyType.Csv, MyData.class) .to("log:after.unmarshal") .to("mock:result"); from("direct:marshal") - .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class) + .marshal().bindy(BindyType.Csv, 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 1cba0214c31f1..1a59a7d513f97 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(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class); + = new BindyCsvDataFormat(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 c50f2eb3da4c3..86538cc57c6e3 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( - org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class); + 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 88639eba21404..85231b9177bcf 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( - org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class); + 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 af0f86398dae9..604dad00f9bc2 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( - org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class); + 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 dc885b30b75ec..403cb2206895b 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(org.apache.camel.dataformat.bindy.model.simple.oneclassgenerateheader.Order.class); + = new BindyCsvDataFormat(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 156ef63e24017..bec2b93ff77c2 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,6 +22,7 @@ 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; @@ -182,7 +183,7 @@ public void testMissingMandatoryFields() throws Exception { public static class ContextConfig extends RouteBuilder { BindyCsvDataFormat formatOptional - = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class); + = new BindyCsvDataFormat(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 eab03377d15e4..2c7e02a6ba010 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(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class) + .classType(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 13ff2439f9cdd..582f1359c9ae3 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( - org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order.class); + 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 b693b3b5613f5..f0addb6681bba 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(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class); + = new BindyCsvDataFormat(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 fc6095d5f97c1..2b52371c924b0 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( - org.apache.camel.dataformat.bindy.model.simple.oneclassandtrimandclip.Customer.class); + 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 93bbf81e3eb21..04c62421e818f 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(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class); + = new BindyCsvDataFormat(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 40e7f040110bc..9619a3d09ef53 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(org.apache.camel.dataformat.bindy.model.simple.onetomany.Author.class); + = new BindyCsvDataFormat(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 324d84ddc21dd..c3b91e8b890b2 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,6 +24,7 @@ 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; @@ -56,7 +57,7 @@ public void testUnMarshallMessage() throws Exception { public static class ContextConfig extends RouteBuilder { BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat( - org.apache.camel.dataformat.bindy.model.simple.oneclassandremovewhitespace.Order.class); + 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 1a07d82768984..8620c307da600 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,6 +21,7 @@ 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; @@ -61,7 +62,7 @@ public void testUnMarshallMessage() throws Exception { public static class ContextConfig extends RouteBuilder { BindyCsvDataFormat camelDataFormat - = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassandskipfirstline.Order.class); + = new BindyCsvDataFormat(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 668fd03b4b55f..de29db54c7552 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,6 +22,7 @@ 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; @@ -95,7 +96,7 @@ record = "1000000000000000000000000000000000000,25.10"; public static class ContextConfig extends RouteBuilder { BindyCsvDataFormat orderBindyDataFormat - = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassmath.Math.class); + = new BindyCsvDataFormat(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 3b7e2ce03592e..f20d0842697e3 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,6 +23,7 @@ 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; @@ -89,7 +90,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(org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order.class); + = new BindyCsvDataFormat(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 cd8a1312e6cbf..e6966ac8770e9 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(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class); + = new BindyCsvDataFormat(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 1c11dc35c6a3d..19195075af3c5 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(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class); + = new BindyCsvDataFormat(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 5fd0b6a49daeb..cca82c4a3ca47 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,6 +21,7 @@ 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; @@ -55,7 +56,7 @@ public void testUnMarshallMessage() throws Exception { public static class ContextConfig extends RouteBuilder { BindyCsvDataFormat camelDataFormat - = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class); + = new BindyCsvDataFormat(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 5cfeed1d60bec..13b784ddba6ea 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(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class); + = new BindyCsvDataFormat(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 c5086b871e92f..948a543822ac6 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(org.apache.camel.dataformat.bindy.model.tab.PurchaseOrder.class); + = new BindyCsvDataFormat(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 22f107f600007..1fd727d19b518 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, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class) + .marshal().bindy(BindyType.Csv, WeatherModel.class) .to("mock:resultMarshal"); from("direct:unmarshal") - .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class) + .unmarshal().bindy(BindyType.Csv, 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 f1dde14472630..4f702debf5a3a 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, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class) + .marshal().bindy(BindyType.Csv, WeatherModel.class) .to("direct:middle"); from("direct:middle") - .unmarshal(new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)) + .unmarshal(new BindyCsvDataFormat(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 e8a0248045be4..7efe614d9eeb2 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, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class) + .marshal().bindy(BindyType.Csv, 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 84679d0f7487b..e41ddc846ed0a 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(org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)) + .unmarshal(new BindyCsvDataFormat(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 971508f35347a..3e8c1f4d6c269 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, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class) + .unmarshal().bindy(BindyType.Csv, 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 4d07f4bce0351..65adbe7b90276 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(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order.class); + = new BindyKeyValuePairDataFormat(Order.class); factory = dataFormat.getFactory(); // Set model 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); + models.add(Order.class); + models.add(Header.class); // f.models.add(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Security.class); - models.add(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Trailer.class); + models.add(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 14db89d9e2ade..eb7784dc5f500 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(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order.class); + = new BindyKeyValuePairDataFormat(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 812c1fc2c26ad..55fb8598a67ab 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, org.apache.camel.dataformat.bindy.model.fix.simple.Order.class) + .bindy(BindyType.KeyValue, 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 c8eb80fd36ba0..488cf900d30e3 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(org.apache.camel.dataformat.bindy.model.fix.simple.Order.class); + = new BindyKeyValuePairDataFormat(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 bc50ca1e1c2e9..25670f52fde5f 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(org.apache.camel.dataformat.bindy.model.fix.simple.Order.class); + = new BindyKeyValuePairDataFormat(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 0f023085728f9..4f932c9246761 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(org.apache.camel.dataformat.bindy.model.fix.sorted.body.Order.class); + = new BindyKeyValuePairDataFormat(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 b68a2bc0f295f..34c2e4667c648 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(org.apache.camel.dataformat.bindy.model.fix.tab.Order.class); + = new BindyKeyValuePairDataFormat(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 f9cd8dd878192..0044fb77d19be 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(org.apache.camel.dataformat.bindy.model.fix.withoutsection.Order.class); + = new BindyKeyValuePairDataFormat(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 a99fa186612bb..50218e625c15f 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,6 +16,7 @@ */ package org.apache.camel.component.box; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -70,7 +71,7 @@ public void testAddFolderCollaborationByEmail() { // parameter type is com.box.sdk.BoxCollaboration.Role headers.put("CamelBox.role", BoxCollaboration.Role.EDITOR); - final com.box.sdk.BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATIONBYEMAIL", + final BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATIONBYEMAIL", testFolder.getID(), headers); assertNotNull(result, "addFolderCollaboration result"); @@ -97,7 +98,7 @@ public void testAddFolderCollaboration() { // parameter type is com.box.sdk.BoxCollaboration.Role headers.put("CamelBox.role", BoxCollaboration.Role.EDITOR); - final com.box.sdk.BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATION", + final BoxCollaboration result = requestBodyAndHeaders("direct://ADDFOLDERCOLLABORATION", testFolder.getID(), headers); assertNotNull(result, "addFolderCollaboration result"); LOG.debug("addFolderCollaboration: {}", result); @@ -114,7 +115,7 @@ public void testAddFolderCollaboration() { @Test public void testGetCollaborationInfo() { // using String message body for single parameter "collaborationId" - final com.box.sdk.BoxCollaboration.Info result = requestBody("direct://GETCOLLABORATIONINFO", + final BoxCollaboration.Info result = requestBody("direct://GETCOLLABORATIONINFO", testCollaboration.getID()); assertNotNull(result, "getCollaborationInfo result"); @@ -125,7 +126,7 @@ public void testGetCollaborationInfo() { public void testGetFolderCollaborations() { // using String message body for single parameter "folderId" @SuppressWarnings("rawtypes") - final java.util.Collection result = requestBody("direct://GETFOLDERCOLLABORATIONS", testFolder.getID()); + final Collection result = requestBody("direct://GETFOLDERCOLLABORATIONS", testFolder.getID()); assertNotNull(result, "getFolderCollaborations result"); LOG.debug("getFolderCollaborations: {}", result); @@ -134,7 +135,7 @@ public void testGetFolderCollaborations() { @SuppressWarnings("rawtypes") @Test public void testGetPendingCollaborations() { - final java.util.Collection result = requestBody("direct://GETPENDINGCOLLABORATIONS", null); + final Collection result = requestBody("direct://GETPENDINGCOLLABORATIONS", null); assertNotNull(result, "getPendingCollaborations result"); LOG.debug("getPendingCollaborations: {}", result); @@ -151,7 +152,7 @@ public void testUpdateCollaborationInfo() { info.setRole(BoxCollaboration.Role.PREVIEWER); headers.put("CamelBox.info", info); - final com.box.sdk.BoxCollaboration result = requestBodyAndHeaders("direct://UPDATECOLLABORATIONINFO", null, + final 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 0cd81cefc440a..a48cdee0cd783 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,6 +23,7 @@ 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; @@ -63,7 +64,7 @@ public void testAddFileComment() { // parameter type is String headers.put("CamelBox.message", CAMEL_TEST_FILE_COMMENT); - final com.box.sdk.BoxFile result = requestBodyAndHeaders("direct://ADDFILECOMMENT", null, headers); + final BoxFile result = requestBodyAndHeaders("direct://ADDFILECOMMENT", null, headers); assertNotNull(result, "addFileComment result"); assertNotNull(result.getComments(), "addFileComment comments"); @@ -83,7 +84,7 @@ public void testChangeCommentMessage() { // parameter type is String headers.put("CamelBox.message", CAMEL_TEST_FILE_CHANGED_COMMENT); - final com.box.sdk.BoxComment result = requestBodyAndHeaders("direct://CHANGECOMMENTMESSAGE", null, headers); + final BoxComment result = requestBodyAndHeaders("direct://CHANGECOMMENTMESSAGE", null, headers); assertNotNull(result, "changeCommentMessage result"); assertNotNull(result.getInfo().getMessage(), "changeCommentMessage message"); @@ -109,7 +110,7 @@ public void testGetCommentInfo() { BoxComment.Info commentInfo = testFile.addComment(CAMEL_TEST_FILE_COMMENT); // using String message body for single parameter "commentId" - final com.box.sdk.BoxComment.Info result = requestBody("direct://GETCOMMENTINFO", commentInfo.getID()); + final BoxComment.Info result = requestBody("direct://GETCOMMENTINFO", commentInfo.getID()); assertNotNull(result, "getCommentInfo result"); assertEquals(CAMEL_TEST_FILE_COMMENT, result.getMessage(), "getCommentInfo message"); @@ -122,7 +123,7 @@ public void testGetFileComments() { // using String message body for single parameter "fileId" @SuppressWarnings("rawtypes") - final java.util.List result = requestBody("direct://GETFILECOMMENTS", testFile.getID()); + final List result = requestBody("direct://GETFILECOMMENTS", testFile.getID()); assertNotNull(result, "getFileComments result"); assertEquals(1, result.size(), "getFileComments size"); @@ -140,7 +141,7 @@ public void testReplyToComment() { // parameter type is String headers.put("CamelBox.message", CAMEL_TEST_FILE_REPLY_COMMENT); - final com.box.sdk.BoxComment result = requestBodyAndHeaders("direct://REPLYTOCOMMENT", null, headers); + final 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 95832545ae858..87e52ceb37140 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,6 +18,7 @@ import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.apache.camel.builder.RouteBuilder; @@ -62,7 +63,7 @@ public void testGetEnterpriseEvents() { headers.put("CamelBox.types", null); @SuppressWarnings("rawtypes") - final java.util.List result = requestBodyAndHeaders("direct://GETENTERPRISEEVENTS", null, headers); + final 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 40bf748a80cce..0d7c1fdd13f17 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,6 +18,9 @@ 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; @@ -25,6 +28,7 @@ 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; @@ -66,7 +70,7 @@ public class BoxFilesManagerIT extends AbstractBoxITSupport { @Test public void testCopyFile() { - com.box.sdk.BoxFile result = null; + BoxFile result = null; try { final Map headers = new HashMap<>(); @@ -102,7 +106,7 @@ public void testCreateFileMetadata() { // parameter type is String headers.put("CamelBox.typeName", null); - final com.box.sdk.Metadata result = requestBodyAndHeaders("direct://CREATEFILEMETADATA", null, headers); + final Metadata result = requestBodyAndHeaders("direct://CREATEFILEMETADATA", null, headers); assertNotNull(result, "createFileMetadata result"); assertEquals("bar", result.getString("/foo"), "createFileMetadata result"); @@ -121,7 +125,7 @@ public void testCreateFileSharedLink() { // parameter type is com.box.sdk.BoxSharedLink.Permissions headers.put("CamelBox.permissions", null); - final com.box.sdk.BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFILESHAREDLINK", null, headers); + final BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFILESHAREDLINK", null, headers); assertNotNull(result, "createFileSharedLink result"); LOG.debug("createFileSharedLink: {}", result); @@ -183,7 +187,7 @@ public void testDownloadFile() { // parameter type is com.box.sdk.ProgressListener headers.put("CamelBox.listener", null); - final java.io.OutputStream result = requestBodyAndHeaders("direct://DOWNLOADFILE", null, headers); + final OutputStream result = requestBodyAndHeaders("direct://DOWNLOADFILE", null, headers); assertNotNull(result, "downloadFile result"); LOG.debug("downloadFile: {}", result); @@ -203,7 +207,7 @@ public void testDownloadPreviousFileVersion() { // parameter type is com.box.sdk.ProgressListener headers.put("CamelBox.listener", null); - final java.io.OutputStream result = requestBodyAndHeaders("direct://DOWNLOADPREVIOUSFILEVERSION", null, + final OutputStream result = requestBodyAndHeaders("direct://DOWNLOADPREVIOUSFILEVERSION", null, headers); assertNotNull(result, "downloadPreviousFileVersion result"); @@ -213,7 +217,7 @@ public void testDownloadPreviousFileVersion() { @Test public void testGetDownloadURL() { // using String message body for single parameter "fileId" - final java.net.URL result = requestBody("direct://GETDOWNLOADURL", testFile.getID()); + final URL result = requestBody("direct://GETDOWNLOADURL", testFile.getID()); assertNotNull(result, "getDownloadURL result"); LOG.debug("getDownloadURL: {}", result); @@ -227,7 +231,7 @@ public void testGetFileInfo() { // parameter type is String[] headers.put("CamelBox.fields", null); - final com.box.sdk.BoxFile.Info result = requestBodyAndHeaders("direct://GETFILEINFO", null, headers); + final BoxFile.Info result = requestBodyAndHeaders("direct://GETFILEINFO", null, headers); assertNotNull(result, "getFileInfo result"); LOG.debug("getFileInfo: {}", result); @@ -243,7 +247,7 @@ public void testGetFileMetadata() { // parameter type is String headers.put("CamelBox.typeName", null); - final com.box.sdk.Metadata result = requestBodyAndHeaders("direct://GETFILEMETADATA", null, headers); + final Metadata result = requestBodyAndHeaders("direct://GETFILEMETADATA", null, headers); assertNotNull(result, "getFileMetadata result"); LOG.debug("getFileMetadata: {}", result); @@ -252,7 +256,7 @@ public void testGetFileMetadata() { @Test public void testGetFilePreviewLink() { // using String message body for single parameter "fileId" - final java.net.URL result = requestBody("direct://GETFILEPREVIEWLINK", testFile.getID()); + final URL result = requestBody("direct://GETFILEPREVIEWLINK", testFile.getID()); assertNotNull(result, "getFilePreviewLink result"); LOG.debug("getFilePreviewLink: {}", result); @@ -284,7 +288,7 @@ public void testGetFileThumbnail() { public void testGetFileVersions() { // using String message body for single parameter "fileId" @SuppressWarnings("rawtypes") - final java.util.Collection result = requestBody("direct://GETFILEVERSIONS", testFile.getID()); + final Collection result = requestBody("direct://GETFILEVERSIONS", testFile.getID()); assertNotNull(result, "getFileVersions result"); LOG.debug("getFileVersions: {}", result); @@ -292,7 +296,7 @@ public void testGetFileVersions() { @Test public void testMoveFile() { - com.box.sdk.BoxFile result = null; + BoxFile result = null; try { final Map headers = new HashMap<>(); @@ -326,7 +330,7 @@ public void testPromoteFileVersion() { // parameter type is Integer headers.put("CamelBox.version", 1); - final com.box.sdk.BoxFileVersion result = requestBodyAndHeaders("direct://PROMOTEFILEVERSION", null, headers); + final BoxFileVersion result = requestBodyAndHeaders("direct://PROMOTEFILEVERSION", null, headers); assertNotNull(result, "promoteFileVersion result"); LOG.debug("promoteFileVersion: {}", result); @@ -335,7 +339,7 @@ public void testPromoteFileVersion() { @Test public void testRenameFile() { - com.box.sdk.BoxFile result = null; + BoxFile result = null; try { final Map headers = new HashMap<>(); @@ -367,7 +371,7 @@ public void testUpdateFileInfo() { // parameter type is com.box.sdk.BoxFile.Info headers.put("CamelBox.info", info); - final com.box.sdk.BoxFile result = requestBodyAndHeaders("direct://UPDATEFILEINFO", null, headers); + final BoxFile result = requestBodyAndHeaders("direct://UPDATEFILEINFO", null, headers); assertNotNull(result, "updateFileInfo result"); assertEquals(CAMEL_TEST_FILE_DESCRIPTION, result.getInfo().getDescription(), "updateFileInfo info"); @@ -388,7 +392,7 @@ public void testUpdateFileMetadata() { //metada has to contain some value, otherwise response result will be error code 400 metadata.add("/foo", "bar"); - final com.box.sdk.Metadata result = requestBodyAndHeaders("direct://UPDATEFILEMETADATA", null, headers); + final Metadata result = requestBodyAndHeaders("direct://UPDATEFILEMETADATA", null, headers); assertNotNull(result, "updateFileMetadata result"); assertNotNull(result.getString("/foo"), "updateFileMetadata property foo"); @@ -398,7 +402,7 @@ public void testUpdateFileMetadata() { @Test public void testUploadFile() { - com.box.sdk.BoxFile result = null; + BoxFile result = null; try { final Map headers = new HashMap<>(); @@ -426,7 +430,7 @@ public void testUploadFile() { @Test public void testUploadOverwriteFile() { - com.box.sdk.BoxFile result = null; + BoxFile result = null; try { final Map headers = new HashMap(); @@ -455,7 +459,7 @@ public void testUploadOverwriteFile() { @Test public void testUploadNewFileVersion() { - com.box.sdk.BoxFile result = null; + 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 082fbb39091d8..d9afb4c575473 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,6 +16,7 @@ */ package org.apache.camel.component.box; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -101,7 +102,7 @@ public void testDeleteFolder() { @Test public void testCopyFolder() { - com.box.sdk.BoxFolder result = null; + BoxFolder result = null; try { final Map headers = new HashMap<>(); // parameter type is String @@ -136,7 +137,7 @@ public void testCreateSharedLink() { // parameter type is com.box.sdk.BoxSharedLink.Permissions headers.put("CamelBox.permissions", new BoxSharedLink.Permissions()); - final com.box.sdk.BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFOLDERSHAREDLINK", null, + final BoxSharedLink result = requestBodyAndHeaders("direct://CREATEFOLDERSHAREDLINK", null, headers); assertNotNull(result, "createFolderSharedLink result"); @@ -146,7 +147,7 @@ public void testCreateSharedLink() { @Test public void testGetFolder() { // using String[] message body for single parameter "path" - final com.box.sdk.BoxFolder result = requestBody("direct://GETFOLDER", new String[] { CAMEL_TEST_FOLDER }); + final BoxFolder result = requestBody("direct://GETFOLDER", new String[] { CAMEL_TEST_FOLDER }); assertNotNull(result, "getFolder result"); assertEquals(testFolder.getID(), result.getID(), "getFolder folder id"); @@ -161,7 +162,7 @@ public void testGetFolderInfo() { // parameter type is String[] headers.put("CamelBox.fields", new String[] { "name" }); - final com.box.sdk.BoxFolder.Info result = requestBodyAndHeaders("direct://GETFOLDERINFO", null, headers); + final BoxFolder.Info result = requestBodyAndHeaders("direct://GETFOLDERINFO", null, headers); assertNotNull(result, "getFolderInfo result"); assertNotNull(result.getName(), "getFolderInfo result.getName()"); @@ -182,7 +183,7 @@ public void testGetFolderItems() { headers.put("CamelBox.fields", null); @SuppressWarnings("rawtypes") - final java.util.Collection result = requestBodyAndHeaders("direct://GETFOLDERITEMS", null, headers); + final Collection result = requestBodyAndHeaders("direct://GETFOLDERITEMS", null, headers); assertNotNull(result, "getFolderItems result"); LOG.debug("getFolderItems: {}", result); @@ -190,7 +191,7 @@ public void testGetFolderItems() { @Test public void testGetRootFolder() { - final com.box.sdk.BoxFolder result = requestBody("direct://GETROOTFOLDER", null); + final BoxFolder result = requestBody("direct://GETROOTFOLDER", null); assertNotNull(result, "getRootFolder result"); LOG.debug("getRootFolder: {}", result); @@ -206,7 +207,7 @@ public void testMoveFolder() { // parameter type is String headers.put("CamelBox.newName", CAMEL_TEST_MOVE_FOLDER); - final com.box.sdk.BoxFolder result = requestBodyAndHeaders("direct://MOVEFOLDER", null, headers); + final BoxFolder result = requestBodyAndHeaders("direct://MOVEFOLDER", null, headers); assertNotNull(result, "moveFolder result"); assertEquals(CAMEL_TEST_MOVE_FOLDER, result.getInfo().getName(), "moveFolder folder name"); @@ -221,7 +222,7 @@ public void testRenameFolder() { // parameter type is String headers.put("CamelBox.newFolderName", CAMEL_TEST_RENAME_FOLDER); - final com.box.sdk.BoxFolder result = requestBodyAndHeaders("direct://RENAMEFOLDER", null, headers); + final BoxFolder result = requestBodyAndHeaders("direct://RENAMEFOLDER", null, headers); assertNotNull(result, "renameFolder result"); assertEquals(CAMEL_TEST_RENAME_FOLDER, result.getInfo().getName(), "moveFolder folder name"); @@ -239,7 +240,7 @@ public void testUpdateInfo() { testFolderInfo.setDescription(CAMEL_TEST_FOLDER_DESCRIPTION); headers.put("CamelBox.info", testFolderInfo); - final com.box.sdk.BoxFolder result = requestBodyAndHeaders("direct://UPDATEFOLDERINFO", null, headers); + final 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 a4d5d36f75a81..3c4b972f2a4fa 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 com.box.sdk.BoxGroupMembership result = requestBodyAndHeaders("direct://ADDGROUPMEMBERSHIP", null, + final BoxGroupMembership result = requestBodyAndHeaders("direct://ADDGROUPMEMBERSHIP", null, headers); assertNotNull(result, "addGroupMembership result"); @@ -75,7 +75,7 @@ public void testAddGroupMembership() { @Test public void testCreateGroup() { - com.box.sdk.BoxGroup result = null; + 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 java.util.Collection result = requestBody("direct://GETALLGROUPS", null); + final 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 com.box.sdk.BoxGroup.Info result = requestBody("direct://GETGROUPINFO", testGroup.getID()); + final 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 com.box.sdk.BoxGroup result = requestBodyAndHeaders("direct://UPDATEGROUPINFO", null, headers); + final 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 com.box.sdk.BoxGroupMembership.Info result = requestBody("direct://GETGROUPMEMBERSHIPINFO", info.getID()); + final 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 java.util.Collection result = requestBody("direct://GETGROUPMEMBERSHIPS", testGroup.getID()); + final 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 com.box.sdk.BoxGroupMembership result = requestBodyAndHeaders("direct://UPDATEGROUPMEMBERSHIPINFO", null, + final 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 01c04aff4b6f0..1d2af04c9e196 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,6 +16,7 @@ */ package org.apache.camel.component.box; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -58,7 +59,7 @@ public void testSearchFolder() { headers.put("CamelBox.query", "*"); @SuppressWarnings("rawtypes") - final java.util.Collection result = requestBodyAndHeaders("direct://SEARCHFOLDER", null, headers); + final 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 5e3a5bc151b9a..abf87df6a406f 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() { - com.box.sdk.BoxTask result = null; + BoxTask result = null; final Map headers = new HashMap<>(); // parameter type is String @@ -80,7 +80,7 @@ public void testAddAssignmentToTask() { @Test public void testAddFileTask() { - com.box.sdk.BoxTask result = null; + 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 java.util.List result = requestBody("direct://GETFILETASKS", testFile.getID()); + final 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()); - com.box.sdk.BoxTaskAssignment.Info result = null; + 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 java.util.List result = requestBody("direct://GETTASKASSIGNMENTS", testTask.getID()); + final 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 com.box.sdk.BoxTask.Info result = requestBody("direct://GETTASKINFO", testTask.getID()); + final 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 com.box.sdk.BoxTask result = requestBodyAndHeaders("direct://UPDATETASKINFO", null, headers); + final 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 fc47ef7cda7bc..4f6e8c95e78be 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,10 +18,12 @@ 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; @@ -67,7 +69,7 @@ public class BoxUsersManagerIT extends AbstractBoxITSupport { @Disabled @Test public void testAddUserEmailAlias() { - com.box.sdk.EmailAlias result = null; + EmailAlias result = null; try { final Map headers = new HashMap<>(); // parameter type is String @@ -92,7 +94,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."); - com.box.sdk.BoxUser result = null; + BoxUser result = null; try { CreateUserParams params = new CreateUserParams(); @@ -131,7 +133,7 @@ public void testCreateEnterpriseUser() { assertNotNull(enterpriseUser1Login, "Email for enterprise user has to be defined in test-options.properties for this test to succeed."); - com.box.sdk.BoxUser result = null; + BoxUser result = null; try { CreateUserParams params = new CreateUserParams(); @@ -213,7 +215,7 @@ public void testGetAllEnterpriseOrExternalUsers() { headers.put("CamelBox.fields", null); @SuppressWarnings("rawtypes") - final java.util.List result = requestBodyAndHeaders("direct://GETALLENTERPRISEOREXTERNALUSERS", null, headers); + final List result = requestBodyAndHeaders("direct://GETALLENTERPRISEOREXTERNALUSERS", null, headers); assertNotNull(result, "getAllEnterpriseOrExternalUsers result"); LOG.debug("getAllEnterpriseOrExternalUsers: {}", result); @@ -221,7 +223,7 @@ public void testGetAllEnterpriseOrExternalUsers() { @Test public void testGetCurrentUser() { - final com.box.sdk.BoxUser result = requestBody("direct://GETCURRENTUSER", testUser.getID()); + final BoxUser result = requestBody("direct://GETCURRENTUSER", testUser.getID()); assertNotNull(result, "getCurrentUser result"); LOG.debug("getCurrentUser: {}", result); @@ -231,7 +233,7 @@ public void testGetCurrentUser() { public void testGetUserEmailAlias() { // using String message body for single parameter "userId" @SuppressWarnings("rawtypes") - final java.util.Collection result = requestBody("direct://GETUSEREMAILALIAS", testUser.getID()); + final Collection result = requestBody("direct://GETUSEREMAILALIAS", testUser.getID()); assertNotNull(result, "getUserEmailAlias result"); LOG.debug("getUserEmailAlias: {}", result); @@ -240,7 +242,7 @@ public void testGetUserEmailAlias() { @Test public void testGetUserInfo() { // using String message body for single parameter "userId" - final com.box.sdk.BoxUser.Info result = requestBody("direct://GETUSERINFO", testUser.getID()); + final BoxUser.Info result = requestBody("direct://GETUSERINFO", testUser.getID()); assertNotNull(result, "getUserInfo result"); LOG.debug("getUserInfo: {}", result); @@ -260,7 +262,7 @@ public void testUpdateUserInfo() { headers.put("CamelBox.userId", testUser.getID()); // parameter type is com.box.sdk.BoxUser.Info headers.put("CamelBox.info", info); - final com.box.sdk.BoxUser result = requestBodyAndHeaders("direct://UPDATEUSERINFO", null, headers); + final BoxUser result = requestBodyAndHeaders("direct://UPDATEUSERINFO", null, headers); assertNotNull(result, "updateUserInfo result"); LOG.debug("updateUserInfo: {}", result); } finally { @@ -302,7 +304,7 @@ public void testmMoveFolderToUser() { headers.put("CamelBox.userId", user1.getID()); headers.put("CamelBox.sourceUserId", user2.getID()); - final com.box.sdk.BoxFolder.Info result = requestBodyAndHeaders("direct://MOVEFOLDERTOUSER", null, headers); + final 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 51c9f7f0ce735..2d43bb906beb8 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,6 +16,8 @@ */ 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; @@ -39,7 +41,7 @@ public class PaymentMethodNonceGatewayIT extends AbstractBraintreeTestSupport { @Test public void testCreate() { // using String message body for single parameter "paymentMethodToken" - final com.braintreegateway.Result result = requestBody("direct://CREATE", null); + final Result result = requestBody("direct://CREATE", null); assertNotNull(result, "create result"); LOG.debug("create: {}", result); @@ -50,7 +52,7 @@ public void testCreate() { @Test public void testFind() { // using String message body for single parameter "paymentMethodNonce" - final com.braintreegateway.PaymentMethodNonce result = requestBody("direct://FIND", null); + final 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 8f416993dbe50..9a97219645457 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,6 +19,7 @@ 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; @@ -61,7 +62,7 @@ public void testTransactionLevelFees() throws Exception { .date(reportDate) .merchantAccountId(merchantAccountId); - final com.braintreegateway.Result result = requestBody( + final 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 8f85f9709161b..2d3af1113067e 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,6 +19,7 @@ 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; @@ -42,7 +43,7 @@ public class SettlementBatchSummaryGatewayIT extends AbstractBraintreeTestSuppor @Test public void testGenerate() { // using java.util.Calendar message body for single parameter "settlementDate" - final com.braintreegateway.Result result = requestBody("direct://GENERATE", null); + final Result result = requestBody("direct://GENERATE", null); assertNotNull(result, "generate result"); LOG.debug("generate: {}", result); @@ -58,7 +59,7 @@ public void testGenerateWithCustomFields() { // parameter type is String headers.put("CamelBraintree.groupByCustomField", null); - final com.braintreegateway.Result result = requestBodyAndHeaders("direct://GENERATE_1", null, headers); + final 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 b2fa998fc6c0a..4d2f1ccffe2a9 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,6 +19,9 @@ 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; @@ -42,7 +45,7 @@ public class SubscriptionGatewayIT extends AbstractBraintreeTestSupport { @Test public void testCancel() { // using String message body for single parameter "id" - final com.braintreegateway.Result result = requestBody("direct://CANCEL", null); + final Result result = requestBody("direct://CANCEL", null); assertNotNull(result, "cancel result"); LOG.debug("cancel: {}", result); @@ -53,7 +56,7 @@ public void testCancel() { @Test public void testCreate() { // using com.braintreegateway.SubscriptionRequest message body for single parameter "request" - final com.braintreegateway.Result result = requestBody("direct://CREATE", null); + final Result result = requestBody("direct://CREATE", null); assertNotNull(result, "create result"); LOG.debug("create: {}", result); @@ -69,7 +72,7 @@ public void testDelete() { // parameter type is String headers.put("CamelBraintree.id", null); - final com.braintreegateway.Result result = requestBodyAndHeaders("direct://DELETE", null, headers); + final Result result = requestBodyAndHeaders("direct://DELETE", null, headers); assertNotNull(result, "delete result"); LOG.debug("delete: {}", result); @@ -80,7 +83,7 @@ public void testDelete() { @Test public void testFind() { // using String message body for single parameter "id" - final com.braintreegateway.Subscription result = requestBody("direct://FIND", null); + final Subscription result = requestBody("direct://FIND", null); assertNotNull(result, "find result"); LOG.debug("find: {}", result); @@ -91,7 +94,7 @@ public void testFind() { @Test public void testRetryCharge() { // using String message body for single parameter "subscriptionId" - final com.braintreegateway.Result result = requestBody("direct://RETRYCHARGE", null); + final Result result = requestBody("direct://RETRYCHARGE", null); assertNotNull(result, "retryCharge result"); LOG.debug("retryCharge: {}", result); @@ -107,7 +110,7 @@ public void testRetryChargeWithAmount() { // parameter type is java.math.BigDecimal headers.put("CamelBraintree.amount", null); - final com.braintreegateway.Result result = requestBodyAndHeaders("direct://RETRYCHARGE_1", null, headers); + final Result result = requestBodyAndHeaders("direct://RETRYCHARGE_1", null, headers); assertNotNull(result, "retryCharge result"); LOG.debug("retryCharge: {}", result); @@ -118,7 +121,7 @@ public void testRetryChargeWithAmount() { @Test public void testSearch() { // using com.braintreegateway.SubscriptionSearchRequest message body for single parameter "searchRequest" - final com.braintreegateway.ResourceCollection result = requestBody("direct://SEARCH", null); + final ResourceCollection result = requestBody("direct://SEARCH", null); assertNotNull(result, "search result"); LOG.debug("search: {}", result); @@ -134,7 +137,7 @@ public void testUpdate() { // parameter type is com.braintreegateway.SubscriptionRequest headers.put("CamelBraintree.request", null); - final com.braintreegateway.Result result = requestBodyAndHeaders("direct://UPDATE", null, headers); + final 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 701c7caceed85..b0e222e16b2a9 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,6 +23,7 @@ import java.util.Map; import com.braintreegateway.BraintreeGateway; +import com.braintreegateway.ResourceCollection; import com.braintreegateway.Result; import com.braintreegateway.Transaction; import com.braintreegateway.TransactionCloneRequest; @@ -390,7 +391,7 @@ public void testRefundWithRequest() { @Test public void testCancelRelease() { // using String message body for single parameter "id" - final com.braintreegateway.Result result = requestBody("direct://CANCELRELEASE", null); + final Result result = requestBody("direct://CANCELRELEASE", null); assertNotNull(result, "cancelRelease result"); LOG.debug("cancelRelease: {}", result); @@ -401,7 +402,7 @@ public void testCancelRelease() { @Test public void testCredit() { // using com.braintreegateway.TransactionRequest message body for single parameter "request" - final com.braintreegateway.Result result = requestBody("direct://CREDIT", null); + final Result result = requestBody("direct://CREDIT", null); assertNotNull(result, "credit result"); LOG.debug("credit: {}", result); @@ -412,7 +413,7 @@ public void testCredit() { @Test public void testHoldInEscrow() { // using String message body for single parameter "id" - final com.braintreegateway.Result result = requestBody("direct://HOLDINESCROW", null); + final Result result = requestBody("direct://HOLDINESCROW", null); assertNotNull(result, "holdInEscrow result"); LOG.debug("holdInEscrow: {}", result); @@ -423,7 +424,7 @@ public void testHoldInEscrow() { @Test public void testReleaseFromEscrow() { // using String message body for single parameter "id" - final com.braintreegateway.Result result = requestBody("direct://RELEASEFROMESCROW", null); + final Result result = requestBody("direct://RELEASEFROMESCROW", null); assertNotNull(result, "releaseFromEscrow result"); LOG.debug("releaseFromEscrow: {}", result); @@ -434,7 +435,7 @@ public void testReleaseFromEscrow() { @Test public void testSearch() { // using com.braintreegateway.TransactionSearchRequest message body for single parameter "query" - final com.braintreegateway.ResourceCollection result = requestBody("direct://SEARCH", null); + final ResourceCollection result = requestBody("direct://SEARCH", null); assertNotNull(result, "search result"); LOG.debug("search: {}", result); @@ -450,7 +451,7 @@ public void testSubmitForPartialSettlement() { // parameter type is java.math.BigDecimal headers.put("CamelBraintree.amount", null); - final com.braintreegateway.Result result = requestBodyAndHeaders("direct://SUBMITFORPARTIALSETTLEMENT", null, headers); + final Result result = requestBodyAndHeaders("direct://SUBMITFORPARTIALSETTLEMENT", null, headers); assertNotNull(result, "submitForPartialSettlement result"); LOG.debug("submitForPartialSettlement: {}", result); @@ -461,7 +462,7 @@ public void testSubmitForPartialSettlement() { @Test public void testVoidTransaction() { // using String message body for single parameter "id" - final com.braintreegateway.Result result = requestBody("direct://VOIDTRANSACTION", null); + final 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 c2489d9cae84b..1ef8d344c8b2a 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,9 +20,10 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("browse") +@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 c48779163df63..0bae6d0544cf7 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,13 +21,15 @@ 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; -@org.apache.camel.spi.annotations.Component("camunda") +@Component("camunda") public class CamundaComponent extends DefaultComponent { @Metadata(label = "security", description = "Camunda SaaS cluster ID. When set, the client connects via the cloud builder.") @@ -167,7 +169,7 @@ private CamundaClient buildClient() { if (clientId != null && oAuthAPI != null) { builder.credentialsProvider( - new io.camunda.client.impl.oauth.OAuthCredentialsProviderBuilder() + new 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 c5977783f7533..ae5d8697682b3 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,6 +19,7 @@ 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; @@ -121,7 +122,7 @@ public CoAPEndpoint(String uri, CoAPComponent component) { super(uri, component); try { this.uri = new URI(uri); - } catch (java.net.URISyntaxException use) { + } catch (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 b9750bf502b5b..8bfe6bcd84e4e 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,6 +18,7 @@ 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; @@ -108,7 +109,7 @@ public void process(final Exchange exchange) { logDelivery(exchange, channel); ServerMessage.Mutable mutable = binding.createCometdMessage(channel, serverSession, exchange.getIn()); - channel.publish(serverSession, mutable, new org.cometd.bayeux.Promise<>() { + channel.publish(serverSession, mutable, new 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 a652ca09534c2..d21a6286d9d80 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, org.cometd.bayeux.Message.Mutable message) { + public boolean sendMeta(ClientSession session, 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 d9f840f41a9bd..592cd4f3ca36c 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,13 +20,14 @@ 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. */ -@org.apache.camel.spi.annotations.Component("controlbus") +@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 9be2aa4e556f9..59fb8078fc02b 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,6 +25,8 @@ 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; @@ -39,6 +41,7 @@ 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; @@ -145,13 +148,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). - jakarta.ws.rs.core.MediaType mediaType = response.getMediaType(); + 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. - jakarta.ws.rs.core.MultivaluedMap metadata = response.getMetadata(); + MultivaluedMap metadata = response.getMetadata(); if (metadata != null && !metadata.isEmpty()) { Map protocolHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); for (String headerName : metadata.keySet()) { @@ -164,7 +167,7 @@ public static StreamCache toStreamCache(Response response, Exchange exchange) { } } if (!protocolHeaders.isEmpty()) { - exchange.getMessage().setHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS, protocolHeaders); + exchange.getMessage().setHeader(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 d273aecee9946..1cda124a423ea 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,6 +23,8 @@ 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; /** @@ -68,7 +70,7 @@ Object populateCxfRsResponseFromExchange( * @throws Exception can be thrown if error in the binding process */ Object bindCamelMessageBodyToRequestBody( - org.apache.camel.Message camelMessage, + Message camelMessage, org.apache.camel.Exchange camelExchange) throws Exception; @@ -121,7 +123,7 @@ Map bindResponseHeadersToCamelHeaders( * @return the {@link Entity} to use */ Entity bindCamelMessageToRequestEntity( - Object body, org.apache.camel.Message camelMessage, org.apache.camel.Exchange camelExchange) + Object body, Message camelMessage, org.apache.camel.Exchange camelExchange) throws Exception; /** @@ -136,7 +138,7 @@ Entity bindCamelMessageToRequestEntity( * @return the {@link Entity} to use */ Entity bindCamelMessageToRequestEntity( - Object body, org.apache.camel.Message camelMessage, org.apache.camel.Exchange camelExchange, - org.apache.cxf.jaxrs.client.WebClient webClient) + Object body, Message camelMessage, org.apache.camel.Exchange camelExchange, + 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 b62e53dc854a7..d7fb394f39335 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(); } - org.apache.camel.Message response; + 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 95cf047fbd109..faa19fabf4030 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(org.apache.camel.component.cxf.jaxws.DefaultSEI.class.getName()); + setServiceClass(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(org.apache.camel.component.cxf.jaxws.DefaultPayloadProviderSEI.class.getName()); + setServiceClass(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 25993f922586b..8b5ee6fab7f5c 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,6 +32,7 @@ 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; @@ -347,7 +348,7 @@ private static int tryGetExpectMessagePartsSize(Object[] parameters, BindingOper * Get the parameters for the web service operation */ private Object[] getParams(CxfEndpoint endpoint, Exchange exchange) - throws org.apache.camel.InvalidPayloadException { + throws 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 97c5285db002c..591f7974c6c17 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(org.apache.camel.Exchange exchange) { + public void onDone(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) { - org.apache.cxf.message.Message outMessage = cxfExchange.getOutMessage(); + 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) { - org.apache.cxf.message.Message inMessage = cxfExchange.getInMessage(); + 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 8ea87ca711ad6..62c5cefa35cb7 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,13 +18,14 @@ 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 = jakarta.xml.ws.Service.Mode.PAYLOAD) +@ServiceMode(value = 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 28ea95472c9f2..aeb1d7d7bdedd 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,6 +20,7 @@ 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; @@ -82,7 +83,7 @@ public void testSendMessage() { Exchange exchange = sendSimpleMessage("cxf://http://localhost:" + port.getPort() + "/CxfProducerProtocalHeaderTest/user" + "?serviceClass=org.apache.camel.component.cxf.jaxws.HelloService"); - org.apache.camel.Message out = exchange.getMessage(); + 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 373475b2aa324..c5d043cff2209 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,12 +16,14 @@ */ 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; @@ -79,7 +81,7 @@ public void configure() { from("direct:start") .doTry() .to("cxf://http://localhost:10000/false?serviceClass=org.apache.camel.component.cxf.jaxws.HelloService") - .doCatch(java.net.ConnectException.class) + .doCatch(ConnectException.class) .to("mock:error"); } }; @@ -123,7 +125,7 @@ public void testInvokingSimpleServerWithParams() throws Exception { Exchange exchange = template.send("direct:EndpointA", senderExchange); - org.apache.camel.Message out = exchange.getMessage(); + 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 @@ -143,7 +145,7 @@ public void testInvokingSimpleServerWithMessageDataFormat() throws Exception { senderExchange.getIn().setBody(REQUEST_MESSAGE); Exchange exchange = template.send("direct:EndpointB", senderExchange); - org.apache.camel.Message out = exchange.getMessage(); + 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"); @@ -156,7 +158,7 @@ public void testIgnorePseudoHeaders() throws Exception { senderExchange.getIn().setBody(REQUEST_MESSAGE); Exchange exchange = template.send("direct:EndpointB", senderExchange); - org.apache.camel.Message out = exchange.getMessage(); + 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); @@ -170,7 +172,7 @@ public void testInvokingSimpleServerWithPayLoadDataFormat() throws Exception { senderExchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo"); Exchange exchange = template.send("direct:EndpointC", senderExchange); - org.apache.camel.Message out = exchange.getMessage(); + 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 5e8c694169bbd..ef493a672e02f 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,6 +27,7 @@ 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; @@ -119,7 +120,7 @@ public void tearDown() throws Exception { public void testInvokingSimpleServerWithParams() throws Exception { Exchange exchange = sendSimpleMessage(); - org.apache.camel.Message out = exchange.getMessage(); + 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)); @@ -158,7 +159,7 @@ public void testInvokingAWrongServer() throws Exception { public void testInvokingJaxWsServerWithParams() throws Exception { Exchange exchange = sendJaxWsMessage(); - org.apache.camel.Message out = exchange.getMessage(); + 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 0b9eadc744c32..44c07033cfbbc 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,6 +54,7 @@ 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; @@ -164,7 +165,7 @@ public void testPopulateCxfRequestFromExchange() { DefaultCxfBinding cxfBinding = new DefaultCxfBinding(); cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy()); Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD); Map requestContext = new HashMap<>(); @@ -203,7 +204,7 @@ public void testPopulateCxfSoapHeaderRequestFromExchange() { DefaultCxfBinding cxfBinding = new DefaultCxfBinding(); cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy()); Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); Map requestContext = new HashMap<>(); String expectedSoapActionHeader = "urn:hello:world"; @@ -220,7 +221,7 @@ public void testPopulateCxfSoapHeaderRequestFromExchangeWithExplicitOperationNam DefaultCxfBinding cxfBinding = new DefaultCxfBinding(); cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy()); Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); Map requestContext = new HashMap<>(); exchange.getIn().setHeader(CxfConstants.OPERATION_NAMESPACE, "http://test123"); @@ -237,15 +238,15 @@ public void testPopupalteExchangeFromCxfResponse() { DefaultCxfBinding cxfBinding = new DefaultCxfBinding(); cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy()); Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD); Map responseContext = new HashMap<>(); - responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200)); + responseContext.put(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(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + responseContext.put(Message.PROTOCOL_HEADERS, headers); + Message cxfMessage = new MessageImpl(); cxfExchange.setInMessage(cxfMessage); Set attachments = new HashSet<>(); @@ -272,13 +273,13 @@ public void testPopupalteExchangeFromCxfResponseOfNullBody() { DefaultCxfBinding cxfBinding = new DefaultCxfBinding(); cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy()); Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD); Map responseContext = new HashMap<>(); - responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200)); + responseContext.put(Message.RESPONSE_CODE, Integer.valueOf(200)); Map> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - responseContext.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + responseContext.put(Message.PROTOCOL_HEADERS, headers); + Message cxfMessage = new MessageImpl(); cxfExchange.setInMessage(cxfMessage); cxfBinding.populateExchangeFromCxfResponse(exchange, cxfExchange, responseContext); @@ -296,7 +297,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 org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD); exchange.getMessage().setHeader("soapAction", "urn:hello:world"); @@ -307,7 +308,7 @@ public void testPopupalteCxfResponseFromExchange() { Endpoint endpoint = mock(Endpoint.class); Binding binding = mock(Binding.class); when(endpoint.getBinding()).thenReturn(binding); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); when(binding.createMessage()).thenReturn(cxfMessage); cxfExchange.put(Endpoint.class, endpoint); @@ -340,16 +341,16 @@ public void testPopupalteExchangeFromCxfRequest() { DefaultCxfBinding cxfBinding = new DefaultCxfBinding(); cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy()); Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new 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(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers); + cxfMessage.put(Message.PROTOCOL_HEADERS, headers); Set attachments = new HashSet<>(); AttachmentImpl attachment = new AttachmentImpl("att-1", new DataHandler(new FileDataSource("pom.xml"))); @@ -383,13 +384,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 org.apache.cxf.message.ExchangeImpl(); + org.apache.cxf.message.Exchange cxfExchange = new ExchangeImpl(); exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); Map> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); headers.put("myfruitheader", Arrays.asList("peach")); headers.put("mybrewheader", Arrays.asList("cappuccino", "espresso")); - cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers); + cxfMessage.put(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 f649a7b059c92..86f5fb0fdfbf5 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,6 +17,7 @@ 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; @@ -31,7 +32,7 @@ public class EchoServiceSessionImpl implements EchoService { public String echo(String text) { // Find the HttpSession MessageContext mc = context.getMessageContext(); - HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession(); + HttpSession session = ((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 3c0e3313d2e87..0697c8da059ef 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,6 +16,7 @@ */ package org.apache.camel.component.cxf.multipart; +import jakarta.jws.WebService; import jakarta.xml.ws.Holder; import org.apache.camel.cxf.multipart.MultiPartInvoke; @@ -23,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@jakarta.jws.WebService( +@WebService( serviceName = "MultiPartInvokeService", portName = "MultiPartInvokePort", targetNamespace = "http://adapter.ti.tongtech.com/ws", 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 2ee035148d6b8..006f5a2b14873 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,6 +20,7 @@ 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; @@ -34,11 +35,12 @@ 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; -@jakarta.jws.WebService(serviceName = "HeaderService", +@WebService(serviceName = "HeaderService", targetNamespace = "http://apache.org/camel/cxf/soap/headers", endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") @@ -200,7 +202,7 @@ protected boolean validateOutOfBandHander() { Header hdr1 = (Header) hdr; try { JAXBElement job - = (JAXBElement) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class) + = (JAXBElement) JAXBContext.newInstance(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 7857a278182e1..b0650004a626c 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,6 +27,7 @@ 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 { @@ -66,7 +67,7 @@ private void verifyHeader(Object hdr, String headerName, String headerValue) { Header hdr1 = (Header) hdr; try { JAXBElement job - = (JAXBElement) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class) + = (JAXBElement) JAXBContext.newInstance(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 723ce6afbe329..14c8d79f2f57a 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,6 +20,7 @@ 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; @@ -45,8 +46,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 - org.apache.camel.non_wrapper.types.UnknownPersonFault personFault - = new org.apache.camel.non_wrapper.types.UnknownPersonFault(); + UnknownPersonFault personFault + = new 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 cc4727cd6b387..a00b8c0d61722 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,13 +17,14 @@ 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") -@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") +@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 a08b350f5c881..9f3e5069ea7cb 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,6 +20,7 @@ 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; @@ -48,8 +49,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 - org.apache.camel.wsdl_first.types.UnknownPersonFault personFault - = new org.apache.camel.wsdl_first.types.UnknownPersonFault(); + UnknownPersonFault personFault + = new 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 ff1fa6ab125c9..c6b20c8cce5ad 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,6 +25,8 @@ 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; @@ -86,7 +88,7 @@ public Client createClient() throws Exception { if (getWsdlURL() == null && cls == null) { // no WSDL and serviceClass specified, set our default serviceClass - setServiceClass(org.apache.camel.component.cxf.jaxws.DefaultSEI.class.getName()); + setServiceClass(DefaultSEI.class.getName()); setDefaultOperationNamespace(CxfConstants.DISPATCH_NAMESPACE); setDefaultOperationName(CxfConstants.DISPATCH_DEFAULT_OPERATION_NAMESPACE); if (getDataFormat().equals(DataFormat.PAYLOAD)) { @@ -144,7 +146,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(org.apache.camel.component.cxf.jaxws.DefaultPayloadProviderSEI.class.getName()); + setServiceClass(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 e640e77eb6294..4eee382056c95 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,6 +27,7 @@ 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; @@ -105,7 +106,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"); - org.apache.camel.Message out = exchange.getMessage(); + 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 32786d1d8fb77..aa429198b778b 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,6 +23,7 @@ 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; @@ -50,7 +51,7 @@ public void testDipatchMessage() throws Exception { Exchange exchange = sendJaxWsDispatchMessage(name, false); assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully"); - org.apache.camel.Message response = exchange.getMessage(); + Message response = exchange.getMessage(); assertNotNull(response, "The response message must not be null"); String value = decodeResponseFromMessage(response.getBody(InputStream.class), exchange); @@ -63,7 +64,7 @@ public void testDipatchMessageOneway() throws Exception { Exchange exchange = sendJaxWsDispatchMessage(name, true); assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully"); - org.apache.camel.Message response = exchange.getOut(); + 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 5df5c4ee105a5..7c5ad431727ff 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,6 +24,7 @@ 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; @@ -54,7 +55,7 @@ public void testDispatchPayload() throws Exception { Exchange exchange = sendJaxWsDispatchPayload(name, false); assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully"); - org.apache.camel.Message response = exchange.getMessage(); + Message response = exchange.getMessage(); assertNotNull(response, "The response must not be null"); String value = decodeResponseFromPayload((CxfPayload) response.getBody(CxfPayload.class), exchange); @@ -67,7 +68,7 @@ public void testDispatchPayloadOneway() throws Exception { Exchange exchange = sendJaxWsDispatchPayload(name, true); assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully"); - org.apache.camel.Message response = exchange.getOut(); + 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 7b8ada2c688a9..82f7352d83d6a 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,6 +22,8 @@ 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; @@ -98,7 +100,7 @@ public void testInvokeGreetMeOverProvider() throws Exception { + getClass().getSimpleName() + "/CamelContext/RouterPort"); Greeter greeter = service.getPort(routerPortName, Greeter.class); - org.apache.cxf.endpoint.Client client = org.apache.cxf.frontend.ClientProxy.getClient(greeter); + Client client = 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 a679bc5f58b93..2013f3056f1ab 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,6 +19,7 @@ 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; @@ -50,7 +51,7 @@ protected ClassPathXmlApplicationContext createApplicationContext() { public void testInvokingServiceWithCamelProducer() { Exchange exchange = sendJaxWsMessage("hello"); assertEquals(false, exchange.isFailed(), "The request should be handled sucessfully"); - org.apache.camel.Message out = exchange.getMessage(); + 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 df1709984b15d..4e23d32f9e091 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,6 +17,7 @@ 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; @@ -31,7 +32,7 @@ public class EchoServiceSessionImpl implements EchoService { public String echo(String text) { // Find the HttpSession MessageContext mc = context.getMessageContext(); - HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession(); + HttpSession session = ((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 62dfe583214bd..2026c9f6a48ad 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,10 +20,11 @@ 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 = jakarta.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING) +@BindingType(value = 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 7b374eedac139..a4b9508bf36b7 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,6 +19,7 @@ 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; @@ -158,7 +159,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 java.net.URLDecoder.decode(reference, StandardCharsets.UTF_8); + return 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 9ecefda31c3f1..18001b23a5257 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,17 +18,20 @@ 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({ org.apache.camel.cxf.mtom_feature.types.ObjectFactory.class }) +@XmlSeeAlso({ ObjectFactory.class }) -@jakarta.xml.ws.BindingType(value = jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING) +@BindingType(value = 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 2d6c00e1e6974..e133f8ed71551 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,6 +18,7 @@ import java.io.IOException; +import org.apache.commons.logging.Log; import org.apache.cxf.helpers.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +82,7 @@ private MtomTestHelper() { // utility class } - static boolean isAwtHeadless(org.apache.commons.logging.Log log, org.slf4j.Logger logger) { + static boolean isAwtHeadless(Log log, 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 1da02466d05bb..772d52a1ebb5b 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,6 +17,7 @@ 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; @@ -84,8 +85,8 @@ private String invokeMultiPartService(String address, String in0, String in1) { e0.setV(in0); e1.setV(in1); - jakarta.xml.ws.Holder h = new jakarta.xml.ws.Holder<>(); - jakarta.xml.ws.Holder h1 = new jakarta.xml.ws.Holder<>(); + Holder h = new Holder<>(); + Holder h1 = new 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 3c0e3313d2e87..0697c8da059ef 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,6 +16,7 @@ */ package org.apache.camel.component.cxf.multipart; +import jakarta.jws.WebService; import jakarta.xml.ws.Holder; import org.apache.camel.cxf.multipart.MultiPartInvoke; @@ -23,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@jakarta.jws.WebService( +@WebService( serviceName = "MultiPartInvokeService", portName = "MultiPartInvokePort", targetNamespace = "http://adapter.ti.tongtech.com/ws", 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 76ee4abd6b0c3..cc0f07a9e036d 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,6 +40,7 @@ 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; @@ -56,6 +57,7 @@ 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; @@ -515,7 +517,7 @@ protected void doTestInOutOfBandHeaderCamelTemplate(String producerUri) throws E Exchange exchange = template.send(producerUri, senderExchange); - org.apache.camel.Message out = exchange.getMessage(); + Message out = exchange.getMessage(); MessageContentsList result = (MessageContentsList) out.getBody(); Map responseContext = CastUtils.cast((Map) out.getHeader(Client.RESPONSE_CONTEXT)); assertNotNull(responseContext); @@ -538,7 +540,7 @@ protected void doTestOutOutOfBandHeaderCamelTemplate(String producerUri) throws Exchange exchange = template.send(producerUri, senderExchange); - org.apache.camel.Message out = exchange.getMessage(); + 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"); @@ -566,7 +568,7 @@ public void doTestInOutOutOfBandHeaderCamelTemplate(String producerUri) throws E Exchange exchange = template.send(producerUri, senderExchange); - org.apache.camel.Message out = exchange.getMessage(); + 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"); @@ -614,7 +616,7 @@ protected static void validateReturnedOutOfBandHeader(Map respon if (hdr1.getObject() instanceof Node) { try { JAXBElement job = (JAXBElement) JAXBContext - .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class) + .newInstance(ObjectFactory.class) .createUnmarshaller().unmarshal((Node) hdr1.getObject()); hdrToTest = (OutofBandHeader) job.getValue(); } catch (JAXBException ex) { @@ -671,7 +673,7 @@ protected static void validateReturnedOutOfBandHeaderWithInsertion(Map job = (JAXBElement) JAXBContext - .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class) + .newInstance(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 2ee035148d6b8..006f5a2b14873 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,6 +20,7 @@ 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; @@ -34,11 +35,12 @@ 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; -@jakarta.jws.WebService(serviceName = "HeaderService", +@WebService(serviceName = "HeaderService", targetNamespace = "http://apache.org/camel/cxf/soap/headers", endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") @@ -200,7 +202,7 @@ protected boolean validateOutOfBandHander() { Header hdr1 = (Header) hdr; try { JAXBElement job - = (JAXBElement) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class) + = (JAXBElement) JAXBContext.newInstance(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 7857a278182e1..b0650004a626c 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,6 +27,7 @@ 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 { @@ -66,7 +67,7 @@ private void verifyHeader(Object hdr, String headerName, String headerValue) { Header hdr1 = (Header) hdr; try { JAXBElement job - = (JAXBElement) JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class) + = (JAXBElement) JAXBContext.newInstance(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 a85ab36f7b447..312834694f4ee 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,6 +29,7 @@ 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; @@ -87,7 +88,7 @@ public void process(final Exchange exchange) { }); Exception ex = reply.getException(); - assertTrue(ex instanceof org.apache.cxf.interceptor.Fault + assertTrue(ex instanceof 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 8e9a29db94f12..e9668f2da9175 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 @@ -20,7 +20,9 @@ import org.apache.camel.hello_world_soap_http.Greeter; -@jakarta.jws.WebService(serviceName = "GreeterService", +import jakarta.jws.WebService; + +@WebService(serviceName = "GreeterService", portName = "GreeterPort", endpointInterface = "org.apache.camel.hello_world_soap_http.Greeter", targetNamespace = "http://camel.apache.org/hello_world_soap_http") 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 0baee7db6c362..297693ea24cb8 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,6 +20,7 @@ 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; @@ -45,8 +46,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 - org.apache.camel.non_wrapper.types.UnknownPersonFault personFault - = new org.apache.camel.non_wrapper.types.UnknownPersonFault(); + UnknownPersonFault personFault + = new 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 cc4727cd6b387..a00b8c0d61722 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,13 +17,14 @@ 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") -@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") +@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 a08b350f5c881..9f3e5069ea7cb 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,6 +20,7 @@ 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; @@ -48,8 +49,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 - org.apache.camel.wsdl_first.types.UnknownPersonFault personFault - = new org.apache.camel.wsdl_first.types.UnknownPersonFault(); + UnknownPersonFault personFault + = new 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 90060f1f4fe63..8c1c00b7345b7 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,6 +30,7 @@ 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; @@ -64,7 +65,7 @@ public void testPropagateCamelToCxf() { Map responseContext = Collections.singletonMap("response", "true"); exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext); exchange.getIn().setHeader(Client.RESPONSE_CONTEXT, responseContext); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); CxfHeaderHelper.propagateCamelToCxf(new DefaultHeaderFilterStrategy(), exchange.getIn().getHeaders(), cxfMessage, exchange); @@ -78,7 +79,7 @@ public void testPropagateCamelToCxf() { // check the protocol headers Map> cxfHeaders - = CastUtils.cast((Map) cxfMessage.get(org.apache.cxf.message.Message.PROTOCOL_HEADERS)); + = CastUtils.cast((Map) cxfMessage.get(Message.PROTOCOL_HEADERS)); assertNotNull(cxfHeaders); assertEquals(7, cxfHeaders.size()); @@ -103,7 +104,7 @@ public void testPropagateCamelToCxf() { @Test public void testPropagateCxfToCamel() { Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); Map> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); cxfHeaders.put("Content-Length", Arrays.asList("241")); cxfHeaders.put("soapAction", Arrays.asList("urn:hello:world")); @@ -116,7 +117,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(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders); + cxfMessage.put(Message.PROTOCOL_HEADERS, cxfHeaders); cxfMessage.put(Message.RESPONSE_CODE, "200"); Map requestContext = Collections.singletonMap("request", "true"); @@ -154,11 +155,11 @@ public void testPropagateCxfToCamelWithMerged() { Exchange exchange = new DefaultExchange(context); exchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); Map> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); cxfHeaders.put("myfruitheader", Arrays.asList("peach")); cxfHeaders.put("mybrewheader", Arrays.asList("cappuccino", "espresso")); - cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders); + cxfMessage.put(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 b9398af355958..2b1a4fd66d918 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,6 +27,7 @@ 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; @@ -51,10 +52,10 @@ public class CxfMessageHelperTest { @Test public void testGetCxfInMessage() throws Exception { HeaderFilterStrategy headerFilterStrategy = new CxfHeaderFilterStrategy(); - org.apache.camel.Exchange exchange = new DefaultExchange(context); + Exchange exchange = new DefaultExchange(context); // String exchange.getIn().setBody("hello world"); - org.apache.cxf.message.Message message = CxfMessageHelper.getCxfInMessage( + 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 7b2f4821ee2ed..29461be5c2c80 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); - org.apache.camel.http.common.HttpMessage camelHttpMessage = mock(org.apache.camel.http.common.HttpMessage.class); + HttpMessage camelHttpMessage = mock(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 b38fb57ffa0e7..9d410c6bed44c 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,6 +23,7 @@ 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; @@ -48,7 +49,7 @@ protected RouteBuilder createRouteBuilder() { public void configure() { from("direct:Producer").to("mock:EndpointA").process(new Processor() { - public void process(org.apache.camel.Exchange exchange) throws Exception { + public void process(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 f72e2c66c60eb..277bde86cbf11 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,6 +34,8 @@ 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 { @@ -147,8 +149,8 @@ public Endpoint publishSampleWS(String camelEndpoint) { public Endpoint publishSampleWSWithGzipEnabled(String camelEndpoint) { EndpointImpl endpoint = (EndpointImpl) Endpoint.publish("camel://" + camelEndpoint, new SampleWSImpl()); - endpoint.getInInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPInInterceptor()); - endpoint.getOutInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPOutInterceptor(0)); + endpoint.getInInterceptors().add(new GZIPInInterceptor()); + endpoint.getOutInterceptors().add(new 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 e3418ec1fb9d2..57ff0ed3a6b91 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(org.apache.camel.Exchange camelExchange) { + protected void incoming(Exchange camelExchange) { LOG.debug("server received request: {}", camelExchange); DefaultCxfMessageMapper beanBinding = new DefaultCxfMessageMapper(); - org.apache.cxf.message.Message inMessage + 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 7ef6612ce1b59..fb6c9434e4485 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,6 +21,7 @@ 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; @@ -86,7 +87,7 @@ private void commitOutputMessage() throws IOException { pattern = ExchangePattern.InOut; } LOG.debug("send the message to endpoint {}", this.targetCamelEndpointUri); - final org.apache.camel.Exchange exchange = this.producer.getEndpoint().createExchange(pattern); + final Exchange exchange = this.producer.getEndpoint().createExchange(pattern); exchange.setProperty(ExchangePropertyKey.TO_ENDPOINT, this.targetCamelEndpointUri); CachedOutputStream outputStream = (CachedOutputStream) outMessage.getContent(OutputStream.class); @@ -106,7 +107,7 @@ private void commitOutputMessage() throws IOException { } - protected void syncInvoke(org.apache.camel.Exchange exchange) throws IOException { + protected void syncInvoke(Exchange exchange) throws IOException { try { this.producer.process(exchange); } catch (Exception ex) { @@ -124,7 +125,7 @@ protected void syncInvoke(org.apache.camel.Exchange exchange) throws IOException } - protected void asyncInvokeFromWorkQueue(final org.apache.camel.Exchange exchange) throws IOException { + protected void asyncInvokeFromWorkQueue(final Exchange exchange) throws IOException { Runnable runnable = () -> { try { syncInvoke(exchange); @@ -168,8 +169,8 @@ protected void asyncInvokeFromWorkQueue(final org.apache.camel.Exchange exchange } } - private void handleResponseInternal(org.apache.camel.Exchange exchange) { - org.apache.cxf.message.Message inMessage = null; + private void handleResponseInternal(Exchange exchange) { + 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 d0cfa2c5802c6..31e3d35c1a8c3 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,11 +18,13 @@ 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 { @@ -31,9 +33,9 @@ private CxfMessageHelper() { //Helper class } - public static org.apache.cxf.message.Message getCxfInMessage( + public static Message getCxfInMessage( HeaderFilterStrategy headerFilterStrategy, - org.apache.camel.Exchange exchange, + 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 6395a90a9e030..bdbd28262338a 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) { - org.apache.cxf.message.Message answer = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, camelExchange, false); + 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(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); + 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); 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 90060f1f4fe63..4e69152a225a0 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,6 +30,8 @@ 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; @@ -64,7 +66,7 @@ public void testPropagateCamelToCxf() { Map responseContext = Collections.singletonMap("response", "true"); exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext); exchange.getIn().setHeader(Client.RESPONSE_CONTEXT, responseContext); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); CxfHeaderHelper.propagateCamelToCxf(new DefaultHeaderFilterStrategy(), exchange.getIn().getHeaders(), cxfMessage, exchange); @@ -78,7 +80,7 @@ public void testPropagateCamelToCxf() { // check the protocol headers Map> cxfHeaders - = CastUtils.cast((Map) cxfMessage.get(org.apache.cxf.message.Message.PROTOCOL_HEADERS)); + = CastUtils.cast((Map) cxfMessage.get(Message.PROTOCOL_HEADERS)); assertNotNull(cxfHeaders); assertEquals(7, cxfHeaders.size()); @@ -103,7 +105,7 @@ public void testPropagateCamelToCxf() { @Test public void testPropagateCxfToCamel() { Exchange exchange = new DefaultExchange(context); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); Map> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); cxfHeaders.put("Content-Length", Arrays.asList("241")); cxfHeaders.put("soapAction", Arrays.asList("urn:hello:world")); @@ -116,7 +118,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(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders); + cxfMessage.put(Message.PROTOCOL_HEADERS, cxfHeaders); cxfMessage.put(Message.RESPONSE_CODE, "200"); Map requestContext = Collections.singletonMap("request", "true"); @@ -154,11 +156,11 @@ public void testPropagateCxfToCamelWithMerged() { Exchange exchange = new DefaultExchange(context); exchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE); - org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl(); + Message cxfMessage = new MessageImpl(); Map> cxfHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); cxfHeaders.put("myfruitheader", Arrays.asList("peach")); cxfHeaders.put("mybrewheader", Arrays.asList("cappuccino", "espresso")); - cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, cxfHeaders); + cxfMessage.put(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 b9398af355958..2b1a4fd66d918 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,6 +27,7 @@ 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; @@ -51,10 +52,10 @@ public class CxfMessageHelperTest { @Test public void testGetCxfInMessage() throws Exception { HeaderFilterStrategy headerFilterStrategy = new CxfHeaderFilterStrategy(); - org.apache.camel.Exchange exchange = new DefaultExchange(context); + Exchange exchange = new DefaultExchange(context); // String exchange.getIn().setBody("hello world"); - org.apache.cxf.message.Message message = CxfMessageHelper.getCxfInMessage( + 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 7b2f4821ee2ed..29461be5c2c80 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); - org.apache.camel.http.common.HttpMessage camelHttpMessage = mock(org.apache.camel.http.common.HttpMessage.class); + HttpMessage camelHttpMessage = mock(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 f72e2c66c60eb..b45c6de218203 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,6 +34,9 @@ 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 { @@ -147,8 +150,8 @@ public Endpoint publishSampleWS(String camelEndpoint) { public Endpoint publishSampleWSWithGzipEnabled(String camelEndpoint) { EndpointImpl endpoint = (EndpointImpl) Endpoint.publish("camel://" + camelEndpoint, new SampleWSImpl()); - endpoint.getInInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPInInterceptor()); - endpoint.getOutInterceptors().add(new org.apache.cxf.transport.common.gzip.GZIPOutInterceptor(0)); + endpoint.getInInterceptors().add(new GZIPInInterceptor()); + endpoint.getOutInterceptors().add(new 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 0914ff83a0419..34440e7c231b9 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,12 +20,13 @@ 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. */ -@org.apache.camel.spi.annotations.Component("dataset") +@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 44064483b2a0b..61ca9ab200c82 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,6 +20,7 @@ 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; @@ -30,7 +31,7 @@ * Component for testing by polling test messages from another endpoint on startup as the expected message bodies to * receive during testing. */ -@org.apache.camel.spi.annotations.Component("dataset-test") +@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 0586a49dfc973..3d82d59869199 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,11 +17,14 @@ 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; @@ -282,13 +285,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")); - java.time.temporal.TemporalAccessor parsed = formatter.parse(valStr.value()); + TemporalAccessor parsed = formatter.parse(valStr.value()); Instant instant; try { instant = Instant.from(parsed); - } catch (java.time.DateTimeException e) { + } catch (DateTimeException e) { // If the format has no time component, default to start of day - java.time.LocalDate date = java.time.LocalDate.from(parsed); + LocalDate date = 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 3ead8d5574b92..c98c28e558929 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(com.datasonnet.spi.Library.class); + Set additionalLibraries = exchange.getContext().getRegistry().findByType(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(com.datasonnet.spi.Library.class); + Set additionalLibraries = context.getRegistry().findByType(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 6f37eb4aa304f..e648941b47f9b 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,6 +19,7 @@ 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; @@ -190,7 +191,7 @@ private void appendLinesToSource(int numberOfLines) throws IOException { for (int i = 0; i != numberOfLines; ++i) { lines[i] = generateLine(linesAdded + i + 1); } - java.nio.file.Files.write(inputFile.toPath(), Collect.arrayListOf(lines), StandardCharsets.UTF_8, + 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 6894a30ff8960..6266803049910 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,13 +22,14 @@ 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; -@org.apache.camel.spi.annotations.Component("dhis2") +@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 78d4fe4708a02..a006f2265816c 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,6 +19,7 @@ */ package org.apache.camel.component.dhis2; +import java.io.InputStream; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -59,7 +60,7 @@ public void testResource() { // parameter type is java.util.Map headers.put("CamelDhis2.queryParams", new HashMap<>()); - final java.io.InputStream result = requestBodyAndHeaders("direct://RESOURCE", null, headers); + final 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 0fd96b6df7791..c3ad80b0cc77d 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,6 +19,7 @@ */ package org.apache.camel.component.dhis2; +import java.io.InputStream; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,7 +68,7 @@ public void testResource() { headers.put("CamelDhis2.filter", null); headers.put("CamelDhis2.queryParams", null); - final java.io.InputStream result = requestBodyAndHeaders("direct://RESOURCE", null, headers); + final 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 78c8b1aeb9e6f..c8e0eaba67c34 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,6 +19,7 @@ */ package org.apache.camel.component.dhis2; +import java.io.InputStream; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -58,7 +59,7 @@ private void postResource(String endpointUri) { // parameter type is java.util.Map headers.put("CamelDhis2.queryParams", new HashMap<>()); - final java.io.InputStream result = requestBodyAndHeaders(endpointUri, + final 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 dc68fc012de2a..49b396a25446e 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,6 +19,7 @@ */ package org.apache.camel.component.dhis2; +import java.io.InputStream; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -61,7 +62,7 @@ private void putResource(String endpointUri) { headers.put("CamelDhis2.queryParams", new HashMap<>()); String name = RandomStringUtils.randomAlphabetic(8); - final java.io.InputStream result = requestBodyAndHeaders(endpointUri, + final 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-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 320ae8ad7fc67..db3007ffb5aa4 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,6 +37,8 @@ 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; @@ -516,12 +518,12 @@ public ResizeExecCmd.Exec createResizeExecCmdExec() { } @Override - public com.github.dockerjava.api.command.ImageHistoryCmd.Exec createImageHistoryCmdExec() { + public ImageHistoryCmd.Exec createImageHistoryCmdExec() { return null; } @Override - public com.github.dockerjava.api.command.ExportContainerCmd.Exec createExportContainerCmdExec() { + public 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 58ef674ba659e..8a6789a9203ab 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,12 +19,13 @@ 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. */ -@org.apache.camel.spi.annotations.Component("event") +@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 1a62abb223fd6..d8ace3b691208 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,6 +23,7 @@ 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; @@ -44,7 +45,7 @@ public class FhirCapabilitiesIT extends AbstractFhirTestSupport { @Test public void testOfType() { - org.hl7.fhir.instance.model.api.IBaseConformance result = requestBody("direct://OF_TYPE", CapabilityStatement.class); + IBaseConformance result = requestBody("direct://OF_TYPE", CapabilityStatement.class); LOG.debug("ofType: {}", result); assertNotNull(result, "ofType result"); @@ -56,7 +57,7 @@ public void testEncodeJSON() { Map headers = new HashMap<>(); headers.put(ExtraParameters.ENCODE_JSON.getHeaderName(), Boolean.TRUE); - org.hl7.fhir.instance.model.api.IBaseConformance result + 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 8c154ff4664fc..97b993f11d57c 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,6 +22,8 @@ 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; @@ -133,7 +135,7 @@ public void testOnType() { // parameter type is java.util.Map headers.put("CamelFhir.extraParameters", null); - final org.hl7.fhir.instance.model.api.IBaseResource result = requestBodyAndHeaders("direct://ON_TYPE", null, headers); + final IBaseResource result = requestBodyAndHeaders("direct://ON_TYPE", null, headers); assertNotNull(result, "onType result"); LOG.debug("onType: {}", result); @@ -154,7 +156,7 @@ public void testProcessMessage() { // parameter type is java.util.Map headers.put("CamelFhir.extraParameters", null); - final org.hl7.fhir.instance.model.api.IBaseBundle result + final 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 12af129e2aba9..dff4fb31e4cdb 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,6 +46,7 @@ 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; @@ -1647,7 +1648,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 (org.apache.camel.util.ObjectHelper.isNotEmpty(endpointPath) && copyOfName.startsWith(endpointPath)) { + if (ObjectHelper.isNotEmpty(endpointPath) && copyOfName.startsWith(endpointPath)) { name = name.substring(endpointPath.length()); } @@ -1800,7 +1801,7 @@ protected String createDoneFileName(String fileName) { } String answer = pattern; - if (org.apache.camel.util.ObjectHelper.isNotEmpty(path) && org.apache.camel.util.ObjectHelper.isNotEmpty(pattern)) { + if (ObjectHelper.isNotEmpty(path) && 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 f326684c1036a..8aa2377dfa34d 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,6 +22,7 @@ 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; @@ -93,7 +94,7 @@ public void doOnDataStream(DataStream ds, Object... payloads) throws Exception { // Verify BATCH mode was set RuntimeExecutionMode mode = env.getConfiguration() - .get(org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE); + .get(ExecutionOptions.RUNTIME_MODE); Assertions.assertThat(mode).isEqualTo(RuntimeExecutionMode.BATCH); } @@ -118,7 +119,7 @@ public void doOnDataStream(DataStream ds, Object... payloads) throws Exception { // Verify STREAMING mode was set RuntimeExecutionMode mode = env.getConfiguration() - .get(org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE); + .get(ExecutionOptions.RUNTIME_MODE); Assertions.assertThat(mode).isEqualTo(RuntimeExecutionMode.STREAMING); } @@ -204,7 +205,7 @@ public void doOnDataStream(DataStream ds, Object... payloads) throws Exception { // Verify execution mode RuntimeExecutionMode mode = env.getConfiguration() - .get(org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE); + .get(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 d7ddfefe30bc7..a3db558ac7d3c 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,6 +16,9 @@ */ 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; @@ -113,7 +116,7 @@ public void doOnDataStream(DataStream ds, Object... payloads) throws Exception { public void testEmptyListPayload() { template.sendBodyAndHeader( "direct:withDataStream", - java.util.Collections.emptyList(), + 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 dc992a28e2cc9..57fbbed36d857 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,6 +22,7 @@ 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; @@ -84,7 +85,7 @@ public void shouldConfigureExecutionMode() { env.setRuntimeMode(RuntimeExecutionMode.BATCH); Assertions.assertThat(env.getConfiguration().get( - org.apache.flink.configuration.ExecutionOptions.RUNTIME_MODE)) + 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 c80d448627a4d..a530c28729e6e 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,6 +16,7 @@ */ package org.apache.camel.component.file.remote; +import java.util.Locale; import java.util.regex.Pattern; import org.apache.camel.spi.ClassResolver; @@ -95,7 +96,7 @@ private FTPFileEntryParser createFileEntryParser(String key, FTPClientConfig con } } if (parser == null) { - final String ukey = key.toUpperCase(java.util.Locale.ENGLISH); + final String ukey = key.toUpperCase(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 9462a8c73c2b1..726e0980311fd 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,6 +22,7 @@ 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; @@ -66,7 +67,7 @@ private void simulateLoggedIn() throws Exception { producer.preWriteCheck(exchange); // Reset the mock to clear the interaction count verify(operations, times(1)).connect(configuration, exchange); - org.mockito.Mockito.clearInvocations(operations); + 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 50131e3eae2c7..d7b1390508dc4 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,6 +16,9 @@ */ 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; @@ -53,7 +56,7 @@ public PullRequestFilesProducer(GitHubEndpoint endpoint) throws Exception { public void process(Exchange exchange) throws Exception { Integer pullRequestNumber = exchange.getIn().getHeader(GitHubConstants.GITHUB_PULLREQUEST, Integer.class); - java.util.List response = pullRequestService.getFiles(getRepository(), pullRequestNumber); + 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 8c2665a885e55..381a5f741798b 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,6 +16,7 @@ */ 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; @@ -40,7 +41,7 @@ public class CalendarAclIT extends AbstractGoogleCalendarTestSupport { @Test public void testList() { // using String message body for single parameter "calendarId" - final com.google.api.services.calendar.model.Acl result = requestBody("direct://LIST", getCalendar().getId()); + final 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 1a366908d7cc4..799446cbcbc7d 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,6 +16,9 @@ */ 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; @@ -50,7 +53,7 @@ public void testCalendarList() { protected boolean isCalendarInList(Calendar calendar) { CalendarList calendarList = requestBody("direct://LIST", null); - java.util.List items = calendarList.getItems(); + 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 c4d97e31898f0..5709b0bea90ad 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,6 +16,7 @@ */ 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; @@ -39,7 +40,7 @@ public class CalendarColorsIT extends AbstractGoogleCalendarTestSupport { @Test public void testGet() { - com.google.api.services.calendar.model.Colors result = requestBody("direct://GET", null); + 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 de83294ffb842..ae2a5018edd2d 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,6 +26,7 @@ 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; @@ -72,7 +73,7 @@ public void testInsert() { // parameter type is com.google.api.services.calendar.model.Event headers.put("CamelGoogleCalendar.content", event); - final com.google.api.services.calendar.model.Event result = requestBodyAndHeaders("direct://INSERT", null, headers); + final Event result = requestBodyAndHeaders("direct://INSERT", null, headers); assertEquals("Feed the Camel", result.getSummary()); LOG.debug("insert: {}", result); @@ -86,11 +87,11 @@ public void testManipulatingAnEvent() { headers.put("CamelGoogleCalendar.calendarId", getCalendar().getId()); // parameter type is String headers.put("CamelGoogleCalendar.text", "Feed the Camel"); - com.google.api.services.calendar.model.Event result = requestBodyAndHeaders("direct://QUICKADD", null, headers); + Event result = requestBodyAndHeaders("direct://QUICKADD", null, headers); assertNotNull(result, "quickAdd result"); // Check if it is in the list of events for this calendar - com.google.api.services.calendar.model.Events events = requestBody("direct://LIST", getCalendar().getId()); + 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 2080c4edc7107..8cf9c34e6898b 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,6 +22,7 @@ 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; @@ -47,7 +48,7 @@ public class CalendarFreebusyIT extends AbstractGoogleCalendarTestSupport { public void testQuery() { // using com.google.api.services.calendar.model.FreeBusyRequest message // body for single parameter "content" - com.google.api.services.calendar.model.FreeBusyRequest request = new FreeBusyRequest(); + FreeBusyRequest request = new FreeBusyRequest(); List items = new ArrayList<>(); items.add(new FreeBusyRequestItem().setId(getCalendar().getId())); request.setItems(items); @@ -55,7 +56,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 com.google.api.services.calendar.model.FreeBusyResponse result = requestBody("direct://QUERY", request); + final 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 90b8fbf245d8e..2b18c456e9ec1 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,6 +16,8 @@ */ 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; @@ -40,7 +42,7 @@ public class CalendarSettingsIT extends AbstractGoogleCalendarTestSupport { @Test public void testGet() { // using String message body for single parameter "setting" - final com.google.api.services.calendar.model.Setting result = requestBody("direct://GET", "timezone"); + final Setting result = requestBody("direct://GET", "timezone"); assertNotNull(result, "get result"); LOG.debug("get: {}", result); @@ -48,7 +50,7 @@ public void testGet() { @Test public void testList() { - final com.google.api.services.calendar.model.Settings result = requestBody("direct://LIST", null); + final 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 5de2a7ac76d5f..51dced47e9a28 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,6 +16,7 @@ */ package org.apache.camel.component.google.drive; +import java.io.File; import java.util.Collection; import com.google.api.client.auth.oauth2.Credential; @@ -32,7 +33,7 @@ public class InteractiveGoogleDriveClientFactory implements GoogleDriveClientFactory { private static final Logger LOG = LoggerFactory.getLogger(InteractiveGoogleDriveClientFactory.class); - private static final java.io.File DATA_STORE_DIR = new java.io.File(".google_drive"); + private static final File DATA_STORE_DIR = new 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 255c0fbb85bca..06af26b233340 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,6 +16,7 @@ */ 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; @@ -39,7 +40,7 @@ public class DriveAboutIT extends AbstractGoogleDriveTestSupport { @Test public void testGet() { - final com.google.api.services.drive.model.About result = requestBody("direct://GET", null); + final 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 b819bd0e347ac..44b33254c47fa 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,6 +19,7 @@ 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; @@ -43,7 +44,7 @@ public class DriveChangesIT extends AbstractGoogleDriveTestSupport { @Test public void testGet() { - final com.google.api.services.drive.model.ChangeList list = requestBody("direct://LIST", null); + final ChangeList list = requestBody("direct://LIST", null); List items = list.getChanges(); assumeFalse(items.isEmpty()); @@ -51,7 +52,7 @@ public void testGet() { String id = change.getDriveId(); // using String message body for single parameter "changeId" - final com.google.api.services.drive.model.Change result = requestBody("direct://GET", id); + final Change result = requestBody("direct://GET", id); assertNotNull(result, "get result"); LOG.debug("get: {}", result); @@ -59,7 +60,7 @@ public void testGet() { @Test public void testList() { - final com.google.api.services.drive.model.ChangeList result = requestBody("direct://LIST", null); + final 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 06b8c67cb0240..e4261ec5e1045 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,6 +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 org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.drive.internal.DriveCommentsApiMethod; @@ -55,7 +56,7 @@ public void testComment() { // parameter type is String headers.put("CamelGoogleDrive.fileId", fileId); // parameter type is com.google.api.services.drive.model.Comment - com.google.api.services.drive.model.Comment comment = new com.google.api.services.drive.model.Comment(); + Comment comment = new Comment(); comment.setContent("Camel rocks!"); headers.put("CamelGoogleDrive.content", comment); @@ -63,7 +64,7 @@ public void testComment() { // 3. get a list of comments on the file // using String message body for single parameter "fileId" - com.google.api.services.drive.model.CommentList result1 = requestBody("direct://LIST", fileId); + CommentList result1 = requestBody("direct://LIST", fileId); assertNotNull(result1.get("items")); LOG.debug("list: {}", result1); @@ -77,7 +78,7 @@ public void testComment() { // parameter type is String headers.put("CamelGoogleDrive.commentId", comment2.getId()); - final com.google.api.services.drive.model.Comment result3 = requestBodyAndHeaders("direct://GET", null, headers); + final Comment result3 = requestBodyAndHeaders("direct://GET", null, headers); assertNotNull(result3, "get result"); @@ -100,7 +101,7 @@ public void testComment() { headers.put("CamelGoogleDrive.commentId", comment2.getId()); try { - final com.google.api.services.drive.model.Comment result4 = requestBodyAndHeaders("direct://GET", null, headers); + final 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 cb1e221d13287..b8945bcf653a5 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,6 +23,7 @@ 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; @@ -260,7 +261,7 @@ public void testWatch() { // parameter type is com.google.api.services.drive.model.Channel headers.put("CamelGoogleDrive.contentChannel", null); - final com.google.api.services.drive.Drive.Files.Watch result = requestBodyAndHeaders("direct://WATCH", null, headers); + final 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 59ff033cab4f4..a05d6a5381f5a 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 com.google.api.services.drive.model.PermissionList result = requestBody("direct://LIST", fileId); + final 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 fc1a4085baae8..2a3fc7fc99616 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,7 +20,9 @@ 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; @@ -54,7 +56,7 @@ public void testReplyToComment() { // parameter type is String headers.put("CamelGoogleDrive.fileId", fileId); // parameter type is com.google.api.services.drive.model.Comment - com.google.api.services.drive.model.Comment comment = new com.google.api.services.drive.model.Comment(); + Comment comment = new Comment(); comment.setContent("Camel rocks!"); headers.put("CamelGoogleDrive.content", comment); @@ -62,7 +64,7 @@ public void testReplyToComment() { // 3. get a list of comments on the file // using String message body for single parameter "fileId" - com.google.api.services.drive.model.CommentList result1 = requestBody("direct://LIST_COMMENTS", fileId); + CommentList result1 = requestBody("direct://LIST_COMMENTS", fileId); assertNotNull(result1.get("items")); LOG.debug("list: {}", result1); @@ -77,7 +79,7 @@ public void testReplyToComment() { // parameter type is String headers.put("CamelGoogleDrive.commentId", commentId); // parameter type is com.google.api.services.drive.model.CommentReply - com.google.api.services.drive.model.Reply reply = new com.google.api.services.drive.model.Reply(); + Reply reply = new Reply(); reply.setContent("I know :-)"); headers.put("CamelGoogleDrive.content", reply); @@ -91,7 +93,7 @@ public void testReplyToComment() { // parameter type is String headers.put("CamelGoogleDrive.commentId", commentId); - final com.google.api.services.drive.model.Reply result + final 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 12d59ca4577c4..4d4db78f535bb 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,6 +17,7 @@ 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; @@ -44,7 +45,7 @@ public void testList() { String fileId = testFile.getId(); // using String message body for single parameter "fileId" - final com.google.api.services.drive.model.RevisionList result = requestBody("direct://LIST", fileId); + final 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 ec99adc322bdd..53a828c690aec 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(com.google.api.services.drive.model.File.class); + File file = mock.getReceivedExchanges().get(0).getIn().getBody(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 18780c97862f3..4660002ba1a44 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(com.google.api.services.drive.model.FileList.class); + = mock.getReceivedExchanges().get(0).getIn().getBody(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 ac713edbe0f39..123d0945be41a 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,6 +16,7 @@ */ 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; @@ -43,7 +44,7 @@ public void converterTest() throws Exception { MockEndpoint.assertIsSatisfied(context); Message result = mock.getExchanges().get(0).getIn(); - assertTrue(result.getBody() instanceof com.google.api.services.drive.model.File, + assertTrue(result.getBody() instanceof File, "We should get google file instance here"); } @@ -53,7 +54,7 @@ protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - from("file://target/file-test?initialDelay=2000").convertBodyTo(com.google.api.services.drive.model.File.class) + from("file://target/file-test?initialDelay=2000").convertBodyTo(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 1b40dfec21a11..5269c8d34f1dc 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 { - com.google.api.services.gmail.Gmail.Users.Messages.List request = getClient().users().messages().list("me"); + 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, com.google.api.services.gmail.model.Message mail) { + public Exchange createExchange(ExchangePattern pattern, 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 707ff195ee0db..be93f6dd55737 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,6 +16,7 @@ */ 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; @@ -40,7 +41,7 @@ public class GmailUsersIT extends AbstractGoogleMailTestSupport { @Test public void testGetProfile() { // using String message body for single parameter "userId" - final com.google.api.services.gmail.model.Profile result = requestBody("direct://GETPROFILE", CURRENT_USERID); + final 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 801a47bceaa51..e527fbe0fe202 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,6 +20,7 @@ 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; @@ -46,7 +47,7 @@ public class GmailUsersLabelsIT extends AbstractGoogleMailTestSupport { @Test public void testLabels() { // using String message body for single parameter "userId" - com.google.api.services.gmail.model.ListLabelsResponse labels = requestBody("direct://LIST", CURRENT_USERID); + ListLabelsResponse labels = requestBody("direct://LIST", CURRENT_USERID); String labelId = null; if (getTestLabel(labels) == null) { @@ -58,7 +59,7 @@ public void testLabels() { // parameter type is com.google.api.services.gmail.model.Label headers.put("CamelGoogleMail.content", label); - com.google.api.services.gmail.model.Label result = requestBodyAndHeaders("direct://CREATE", null, headers); + Label result = requestBodyAndHeaders("direct://CREATE", null, headers); assertNotNull(result, "create result"); labelId = result.getId(); @@ -83,7 +84,7 @@ public void testLabels() { assertNull(getTestLabel(labels)); } - private Label getTestLabel(com.google.api.services.gmail.model.ListLabelsResponse labels) { + private Label getTestLabel(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 3d95e2327e4ed..2285d868c564b 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 @@ -28,7 +28,8 @@ import jakarta.mail.internet.MimeMessage; import com.google.api.services.gmail.model.ListMessagesResponse; -import com.google.api.services.gmail.model.Message; +import com.google.api.services.gmail.model.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; @@ -66,7 +67,7 @@ public void testMessages() throws Exception { // parameter type is com.google.api.services.gmail.model.Message headers.put("CamelGoogleMail.content", testEmail); - com.google.api.services.gmail.model.Message result = requestBodyAndHeaders("direct://SEND", null, headers); + Message result = requestBodyAndHeaders("direct://SEND", null, headers); assertNotNull(result, "send result"); String testEmailId = result.getId(); @@ -136,7 +137,7 @@ private boolean idInList(String testEmailId, ListMessagesResponse listOfMessages } private Message createTestEmail() throws MessagingException, IOException { - com.google.api.services.gmail.model.Profile profile + 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 5992bc57a8624..7311018d5f787 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 @@ -24,9 +24,11 @@ import jakarta.mail.MessagingException; import jakarta.mail.Session; -import jakarta.mail.internet.MimeMessage; - -import com.google.api.services.gmail.model.Message; +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; @@ -51,7 +53,7 @@ public class GmailUsersThreadsIT extends AbstractGoogleMailTestSupport { = GoogleMailApiCollection.getCollection().getApiName(GmailUsersThreadsApiMethod.class).getName(); private Message createThreadedTestEmail(String previousThreadId) throws MessagingException, IOException { - com.google.api.services.gmail.model.Profile profile + Profile profile = requestBody("google-mail://users/getProfile?inBody=userId", CURRENT_USERID); Properties props = new Properties(); Session session = Session.getDefaultInstance(props, null); @@ -91,7 +93,7 @@ public void testList() throws Exception { headers.put("CamelGoogleMail.q", "subject:\"Hello from camel-google-mail\""); // using String message body for single parameter "userId" - com.google.api.services.gmail.model.ListThreadsResponse result + 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 9c2f320a9aa57..c11b76c75e307 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,6 +57,7 @@ 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; @@ -145,7 +146,7 @@ public StorageObject create(StorageObject object, InputStream content, Map response = OBJECT_MAPPER.readValue(responseJson, Map.class); Object content = response.get("content"); - if (content instanceof java.util.List) { - java.util.List> contentList = (java.util.List>) content; + if (content instanceof List) { + List> contentList = (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 b88353b78a9bf..9c7c3efac8ce8 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,7 +16,9 @@ */ 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; @@ -55,10 +57,10 @@ private static JsonObject nodeToJsonObject(Node node) { } // Group children by name children.stream() - .collect(java.util.stream.Collectors.groupingBy( + .collect(Collectors.groupingBy( Node::name, - java.util.LinkedHashMap::new, - java.util.stream.Collectors.toList())) + LinkedHashMap::new, + 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 6bf4fe9ddf3b7..5ae677564c9f2 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,6 +16,7 @@ */ package org.apache.camel.component.hazelcast; +import java.util.Date; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -65,7 +66,7 @@ public void receive() throws InterruptedException { out.expectedMessageCount(1); verify(reliableTopic).addMessageListener(argument.capture()); - final Message msg = new Message<>("foo", "foo", new java.util.Date().getTime(), null); + final Message msg = new Message<>("foo", "foo", new 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 00ca0b8ebc294..902eeedcd27b4 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,6 +16,7 @@ */ package org.apache.camel.component.hazelcast; +import java.util.Date; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -65,7 +66,7 @@ public void receive() throws InterruptedException { out.expectedMessageCount(1); verify(topic).addMessageListener(argument.capture()); - final Message msg = new Message<>("foo", "foo", new java.util.Date().getTime(), null); + final Message msg = new Message<>("foo", "foo", new 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 a4170bbd65cd3..2a2d20803ad07 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,12 +23,13 @@ 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; -@org.apache.camel.spi.annotations.Language("hl7terser") +@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 0816913b6f7d3..5fa8f43e0d05c 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 java.net.CookieManager manager) { + if (handlerObj instanceof 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 770d2cee17a8b..8210112d1c7eb 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,6 +50,7 @@ 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; @@ -91,7 +92,7 @@ public class DefaultHttpBinding implements HttpBinding { private boolean mapHttpMessageBody = true; private boolean mapHttpMessageHeaders = true; private boolean mapHttpMessageFormUrlEncodedBody = true; - private HeaderFilterStrategy headerFilterStrategy = new org.apache.camel.http.base.HttpHeaderFilterStrategy(); + private HeaderFilterStrategy headerFilterStrategy = new 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 e00fd648b182a..84856171b86bb 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,6 +18,7 @@ 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; @@ -40,7 +41,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 org.apache.camel.http.base.HttpHeaderFilterStrategy(); + HeaderFilterStrategy headerFilterStrategy = new 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 73db39b914293..b071ea5463855 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,6 +30,7 @@ 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; @@ -68,7 +69,7 @@ public static Stream data() { @BeforeEach public void setupTest() throws Exception { - exchange = new org.apache.camel.support.DefaultExchange(context); + exchange = new 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 911ffde2ba5bb..2be6654faa848 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,6 +18,7 @@ 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; @@ -121,7 +122,7 @@ public void withMethodCommonHttpGetInHeader() throws Exception { exchange = producer.createExchange(); exchange.getIn().setBody(""); - exchange.getIn().setHeader(Exchange.HTTP_METHOD, org.apache.camel.http.common.HttpMethods.GET); + exchange.getIn().setHeader(Exchange.HTTP_METHOD, 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 f8bcd301a65dc..ef7df0f95cf53 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,9 +19,10 @@ import java.util.Map; import org.apache.camel.Endpoint; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-dms") +@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 ce464c5d00a88..cff64bf29061a 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,9 +19,10 @@ import java.util.*; import org.apache.camel.Endpoint; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-frs") +@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 dc5bdbef28a7d..605ba33f2ffa0 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,9 +18,10 @@ import java.util.Map; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-functiongraph") +@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 24b3077433bea..648c2b689773a 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,9 +19,10 @@ import java.util.Map; import org.apache.camel.Endpoint; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-iam") +@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 40159c3bbd2aa..c081472043e0b 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,9 +19,10 @@ import java.util.Map; import org.apache.camel.Endpoint; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-imagerecognition") +@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 2b623de36f41b..f25d47c1bc835 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,9 +19,10 @@ import java.util.Map; import org.apache.camel.Endpoint; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.HealthCheckComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-obs") +@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 812f554c587ce..fc0f4943651c8 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,9 +19,10 @@ import java.util.Map; import org.apache.camel.Endpoint; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("hwcloud-smn") +@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 6af6fa043b7e1..233723ac43f7b 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,7 +28,9 @@ 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; @@ -123,15 +125,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(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); + exchange.setProperty(ExchangePropertyKey.BATCH_INDEX, index); + exchange.setProperty(ExchangePropertyKey.BATCH_SIZE, total); + exchange.setProperty(ExchangePropertyKey.BATCH_COMPLETE, index == total - 1); // update pending number of exchanges pendingExchanges = total - index - 1; // use default consumer callback - org.apache.camel.AsyncCallback cb = defaultConsumerCallback(exchange, true); + 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 bbbfdd5a3ff47..1c26f3914fb6d 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,6 +20,7 @@ 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; @@ -64,8 +65,8 @@ public void testConsumeObject() throws Exception { // Upload an object byte[] contentBytes = testContent.getBytes(); - com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata metadata - = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata(); + ObjectMetadata metadata + = new ObjectMetadata(); metadata.setContentLength(contentBytes.length); cosClient.putObject(bucketName, testKey, new ByteArrayInputStream(contentBytes), metadata); @@ -102,8 +103,8 @@ public void testConsumeMultipleObjects() throws Exception { final String key = "multi-test-" + i + ".txt"; final String content = "Content " + i; byte[] bytes = content.getBytes(); - com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata meta - = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata(); + ObjectMetadata meta + = new 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 839ee29a8c1d2..273586a5383e8 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,6 +19,7 @@ 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; @@ -99,8 +100,8 @@ public void testMoveAfterRead() throws Exception { // Upload an object byte[] contentBytes = testContent.getBytes(); - com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata metadata - = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata(); + ObjectMetadata metadata + = new ObjectMetadata(); metadata.setContentLength(contentBytes.length); cosClient.putObject(bucketName, testKey, new ByteArrayInputStream(contentBytes), metadata); @@ -136,8 +137,8 @@ public void testMoveAfterReadWithPrefix() throws Exception { // Upload an object byte[] contentBytes = testContent.getBytes(); - com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata metadata - = new com.ibm.cloud.objectstorage.services.s3.model.ObjectMetadata(); + ObjectMetadata metadata + = new 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 4b459cc0b4f9d..c1088ffec5f9c 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,6 +17,7 @@ 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.*; @@ -120,7 +121,7 @@ private void query(Exchange exchange) { collectionId = getEndpoint().getConfiguration().getCollectionId(); } if (collectionId != null) { - builder.collectionIds(java.util.Collections.singletonList(collectionId)); + builder.collectionIds(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 e401268cff0bc..c732fecfbe7f5 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,6 +22,7 @@ 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; @@ -238,8 +239,8 @@ private void getCustomModel(Exchange exchange) { LOG.trace("Getting custom language model: {}", modelId); - com.ibm.watson.speech_to_text.v1.model.GetLanguageModelOptions options - = new com.ibm.watson.speech_to_text.v1.model.GetLanguageModelOptions.Builder() + GetLanguageModelOptions options + = new 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 709d0ba5e7aba..bcf6d1e3fd57f 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,6 +16,7 @@ */ 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; @@ -202,7 +203,7 @@ private static void generateTestAudioFile(String filename) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); baos.write(audioData); AudioInputStream audioInputStream - = new AudioInputStream(new java.io.ByteArrayInputStream(audioData), format, numSamples); + = new AudioInputStream(new 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 29c59de6c66c9..c4498055f6d6f 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 - net.fortuna.ical4j.model.Calendar icsCalendar = new net.fortuna.ical4j.model.Calendar(); + Calendar icsCalendar = new 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 4253fdcea54c3..b342e868eee56 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,6 +33,7 @@ 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; @@ -133,7 +134,7 @@ private void pollMessages() { polledMessages.partitionId(), configuration.isAutoCommit() ? polledMessages.currentOffset() : offset); - for (org.apache.iggy.message.Message message : polledMessages.messages()) { + for (Message message : polledMessages.messages()) { Exchange exchange = createExchange(message); try { iggyConsumer.getProcessor().process(exchange); @@ -157,7 +158,7 @@ private PollingStrategy resolvePollingStrategy() { } } - private Exchange createExchange(org.apache.iggy.message.Message message) { + private Exchange createExchange(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 9a65969e12dd9..03ef920ff999a 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,13 +16,18 @@ */ 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 { @@ -66,7 +71,7 @@ public IggyBaseClient create() throws Exception { } private void configureTls( - org.apache.iggy.client.blocking.tcp.IggyTcpClientBuilder builder) { + IggyTcpClientBuilder builder) { if (sslContextParameters != null) { builder.enableTls(); applyTlsCertificateIfPresent(builder::tlsCertificate); @@ -79,7 +84,7 @@ private void configureTls( } private void configureTls( - org.apache.iggy.client.blocking.http.IggyHttpClientBuilder builder) { + IggyHttpClientBuilder builder) { if (sslContextParameters != null) { builder.enableTls(); applyTlsCertificateIfPresent(builder::tlsCertificate); @@ -91,7 +96,7 @@ private void configureTls( } } - private void applyTlsCertificateIfPresent(java.util.function.Consumer certificateSetter) { + private void applyTlsCertificateIfPresent(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 fc4afb9f3a8fc..c6436d59a3c48 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,6 +16,7 @@ */ 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; @@ -61,7 +62,7 @@ public void testTlsConfigurationCopy() { @Test public void testTlsEndpointUri() throws Exception { - org.apache.camel.impl.DefaultCamelContext context = new org.apache.camel.impl.DefaultCamelContext(); + DefaultCamelContext context = new DefaultCamelContext(); context.start(); try { IggyEndpoint endpoint = context.getEndpoint( @@ -102,7 +103,7 @@ public void testSslContextParametersCopy() { @Test public void testSslContextParametersEndpointUri() throws Exception { - org.apache.camel.impl.DefaultCamelContext context = new org.apache.camel.impl.DefaultCamelContext(); + DefaultCamelContext context = new 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 0b042d2b5f939..c0a6943fac7b1 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,10 +21,11 @@ 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; -@org.apache.camel.spi.annotations.Component("influxdb2") +@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 a91fbb99ee797..73a72fa298751 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(io.iron.ironmq.Message msg) { + private Exchange createExchange(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 d0a2827441592..ae61cb36a8740 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,6 +19,7 @@ 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; @@ -28,7 +29,7 @@ public class JacksonConversionsPojoTest extends CamelTestSupport { @Test - public void shouldConvertPojoToString() throws org.json.JSONException { + public void shouldConvertPojoToString() throws JSONException { context.getGlobalOptions().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); context.getGlobalOptions().put(JacksonConstants.TYPE_CONVERTER_TO_POJO, "true"); @@ -43,7 +44,7 @@ public void shouldConvertPojoToString() throws org.json.JSONException { } @Test - public void shouldConvertJAXBPojoToString() throws org.json.JSONException { + public void shouldConvertJAXBPojoToString() throws 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 3be45fcecf7e6..a2408c8696a7e 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,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "address.jaxb.converter.camel.apache.org", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "address.jaxb.converter.camel.apache.org", + elementFormDefault = 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 970ab8072c51b..f579066c63ab8 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,5 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "message.jaxb.converter.camel.apache.org") +@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 5bc53c6504cf7..7903df8860868 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,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "person.jaxb.converter.camel.apache.org", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "person.jaxb.converter.camel.apache.org", + elementFormDefault = 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 66853dd3ca46e..9f9f069e338b4 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,8 +31,10 @@ 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; @@ -60,7 +62,7 @@ protected ServerConnector createConnectorJettyInternal( try { String host = endpoint.getHttpUri().getHost(); int port = endpoint.getPort(); - org.eclipse.jetty.server.HttpConfiguration httpConfig = new org.eclipse.jetty.server.HttpConfiguration(); + HttpConfiguration httpConfig = new HttpConfiguration(); httpConfig.setSendServerVersion(endpoint.isSendServerVersion()); httpConfig.setSendDateHeader(endpoint.isSendDateHeader()); if (endpoint.getIdleTimeout() != -1) { @@ -85,14 +87,14 @@ protected ServerConnector createConnectorJettyInternal( if (requestLog != null) { server.setRequestLog(requestLog); } - HttpConnectionFactory httpFactory = new org.eclipse.jetty.server.HttpConnectionFactory(httpConfig); + HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfig); ArrayList connectionFactories = new ArrayList<>(); - ServerConnector result = new org.eclipse.jetty.server.ServerConnector(server); + ServerConnector result = new ServerConnector(server); if (sslcf != null) { httpConfig.addCustomizer(secureRequestCustomizer != null - ? secureRequestCustomizer : new org.eclipse.jetty.server.SecureRequestCustomizer()); - SslConnectionFactory scf = new org.eclipse.jetty.server.SslConnectionFactory( + ? secureRequestCustomizer : new SecureRequestCustomizer()); + SslConnectionFactory scf = new 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 bad2a6b73535f..ce738b6b5d717 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,6 +16,8 @@ */ 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; @@ -157,9 +159,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 java.util.ArrayList()); - from("direct:v2country").transform().constant(new java.util.ArrayList()); - from("direct:v3country").transform().constant(new java.util.ArrayList()); + from("direct:v1country").transform().constant(new ArrayList()); + from("direct:v2country").transform().constant(new ArrayList()); + from("direct:v3country").transform().constant(new 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 30acebbfc74a4..22d8d3dd151d1 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,6 +16,8 @@ */ 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; @@ -157,9 +159,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 java.util.ArrayList()); - from("direct:v2country").transform().constant(new java.util.ArrayList()); - from("direct:v3country").transform().constant(new java.util.ArrayList()); + from("direct:v1country").transform().constant(new ArrayList()); + from("direct:v2country").transform().constant(new ArrayList()); + from("direct:v3country").transform().constant(new 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 20efcc90e8756..e894def965cf9 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,6 +33,7 @@ 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; @@ -178,7 +179,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 = org.apache.camel.util.ObjectHelper.loadResourceAsStream(pomProps, + try (InputStream resourceAsStream = 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 5e12468eb957a..16a7922cc94f4 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,6 +16,10 @@ */ 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; @@ -52,9 +56,9 @@ public void testTextToBytes() throws Exception { MockEndpoint.assertIsSatisfied(context); - jakarta.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage(); + Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage(); assertNotNull(msg); - assertIsInstanceOf(jakarta.jms.BytesMessage.class, msg); + assertIsInstanceOf(BytesMessage.class, msg); } @Test @@ -66,9 +70,9 @@ public void testTextToBytesHeader() throws Exception { MockEndpoint.assertIsSatisfied(context); - jakarta.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage(); + Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage(); assertNotNull(msg); - assertIsInstanceOf(jakarta.jms.BytesMessage.class, msg); + assertIsInstanceOf(BytesMessage.class, msg); } @Test @@ -80,9 +84,9 @@ public void testTextToText() throws Exception { MockEndpoint.assertIsSatisfied(context); - jakarta.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage(); + Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage(); assertNotNull(msg); - assertIsInstanceOf(jakarta.jms.TextMessage.class, msg); + assertIsInstanceOf(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 f62b942533df1..48e7ca9f26f75 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 java.util.HashMap<>()); + when(message.getObject()).thenReturn(new 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 3cb1a4a3ad8ad..77ea19bc24905 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,6 +16,9 @@ */ package org.apache.camel.component.jms; +import java.io.Serializable; + + import jakarta.jms.ConnectionFactory; import jakarta.jms.ObjectMessage; @@ -120,7 +123,7 @@ private static Throwable rootCause(Throwable t) { return cause; } - public static class MyOrder implements java.io.Serializable { + public static class MyOrder implements 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 d077f8d464c14..35cf303fdb252 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(java.sql.Connection.class); + Connection connection = entityManager.unwrap(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 898c588c6bd99..028478b9d37e6 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,6 +20,7 @@ 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; @@ -75,7 +76,7 @@ public void setVerboseLogging(boolean verboseLogging) { protected void initJsch() { JSch.setConfig("StrictHostKeyChecking", "yes"); - JSch.setLogger(new com.jcraft.jsch.Logger() { + JSch.setLogger(new 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 33b74f15502cb..ee75487bdc9e0 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,6 +22,7 @@ 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; @@ -33,6 +34,7 @@ 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; @@ -78,7 +80,7 @@ public ScpCertUserAuthIT() { /** * Creates a PublickeyAuthenticator that only accepts OpenSSH certificates signed by the User CA. */ - private static org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator createCaAwareAuthenticator() { + private static PublickeyAuthenticator createCaAwareAuthenticator() { final PublicKey trustedCaKey; try { String caLine = Files.readString(Paths.get("src/test/resources/cert_user_ca.pub")).trim(); @@ -153,7 +155,7 @@ public void testCertificateAuthWithCertUri() throws Exception { // Positive test: certBytes parameter (bean reference) // ======================================================================== - @org.apache.camel.BindToRegistry("userCertBytes") + @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 835beb804d95d..71b8a4821cc32 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,9 +20,10 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -@org.apache.camel.spi.annotations.Component("json-patch") +@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 7b05810a99fdf..5deeff2da5b3d 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,6 +17,7 @@ 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; @@ -191,7 +192,7 @@ public int read() throws IOException { } try { return in.read(); - } catch (java.io.EOFException ex) { + } catch (EOFException ex) { return -1; } } @@ -216,7 +217,7 @@ public int read(byte[] b) throws IOException { } else { return minimum + additionalRead; } - } catch (java.io.EOFException ex) { + } catch (EOFException ex) { return minimum; } } else { @@ -243,14 +244,14 @@ public int read(byte[] b, int off, int len) throws IOException { } else { return minimum + additionalRead; } - } catch (java.io.EOFException ex) { + } catch (EOFException ex) { return minimum; } } else { try { return in.read(b, off, len); - } catch (java.io.EOFException ex) { + } catch (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 64ad1bc97e70a..bc33769b69bf6 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,7 +27,9 @@ 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; @@ -76,8 +78,8 @@ public class TransactionErrorHandlerGracePeriodShutdownIT { public void setUp() throws Exception { // Narayana transaction manager and synchronization registry tm = com.arjuna.ats.jta.TransactionManager.transactionManager(); - jakarta.transaction.TransactionSynchronizationRegistry tsr - = new com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple(); + TransactionSynchronizationRegistry tsr + = new 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 8b06f5bdfba22..a876b8c6f7af6 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,18 +20,20 @@ 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 org.apache.kafka.clients.producer.KafkaProducer(kafkaProps); + return new KafkaProducer(kafkaProps); } @Override public Consumer getConsumer(Properties kafkaProps) { - return new org.apache.kafka.clients.consumer.KafkaConsumer(kafkaProps); + return new 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 4302fef27b6b2..cdba2047acec2 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,6 +51,7 @@ 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; @@ -82,7 +83,7 @@ private enum State { // like from the health check thread. They are usually only read on those contexts. private final KafkaConsumer kafkaConsumer; - private org.apache.kafka.clients.consumer.Consumer consumer; + private 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 99b6c8568656f..bfa56a42b898a 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,9 +49,11 @@ 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; @@ -64,7 +66,7 @@ public class KafkaProducer extends DefaultAsyncProducer implements RouteIdAware private static final Logger LOG = LoggerFactory.getLogger(KafkaProducer.class); @SuppressWarnings("rawtypes") - private org.apache.kafka.clients.producer.Producer kafkaProducer; + private Producer kafkaProducer; private KafkaProducerHealthCheck producerHealthCheck; private WritableHealthCheckRepository healthCheckRepository; private String clientId; @@ -114,8 +116,8 @@ public boolean isReady() { // connections org.apache.kafka.clients.producer.KafkaProducer kp = (org.apache.kafka.clients.producer.KafkaProducer) kafkaProducer; - org.apache.kafka.clients.producer.internals.Sender sender - = (org.apache.kafka.clients.producer.internals.Sender) ReflectionHelper + Sender sender + = (Sender) ReflectionHelper .getField(kp.getClass().getDeclaredField("sender"), kp); NetworkClient nc = (NetworkClient) ReflectionHelper.getField(sender.getClass().getDeclaredField("client"), sender); @@ -133,7 +135,7 @@ public boolean isReady() { } @SuppressWarnings("rawtypes") - public org.apache.kafka.clients.producer.Producer getKafkaProducer() { + public Producer getKafkaProducer() { return kafkaProducer; } @@ -141,7 +143,7 @@ public org.apache.kafka.clients.producer.Producer getKafkaProducer() { * To use a custom {@link org.apache.kafka.clients.producer.KafkaProducer} instance. */ @SuppressWarnings("rawtypes") - public void setKafkaProducer(org.apache.kafka.clients.producer.Producer kafkaProducer) { + public void setKafkaProducer(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 fba111f5306c1..85d35635d4640 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,6 +16,7 @@ */ package org.apache.camel.component.kafka.consumer.support.batching; +import java.util.List; import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; @@ -213,7 +214,7 @@ private ProcessingResult processBatch(KafkaConsumer camelKafkaConsumer) { * The flow to execute when using auto-commit */ private ProcessingResult autoCommitResultProcessing( - KafkaConsumer camelKafkaConsumer, Exchange exchange, java.util.List exchanges) { + KafkaConsumer camelKafkaConsumer, Exchange exchange, List exchanges) { ExceptionHandler exceptionHandler = camelKafkaConsumer.getExceptionHandler(); CommitSynchronization commitSynchronization = new CommitSynchronization(exceptionHandler, exchanges.size()); exchange.getExchangeExtension().addOnCompletion(commitSynchronization); @@ -249,7 +250,7 @@ private ProcessingResult autoCommitResultProcessing( * The flow to execute when the integrations perform manual commit on their own */ private ProcessingResult manualCommitResultProcessing( - KafkaConsumer camelKafkaConsumer, Exchange exchange, java.util.List exchanges) { + KafkaConsumer camelKafkaConsumer, Exchange exchange, 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 e7f81be5bb2c8..3a455bfa81a8b 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,6 +42,7 @@ 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; @@ -135,7 +136,7 @@ public void processSendsMessage() throws Exception { public void processSendsMessageWithException() { endpoint.getConfiguration().setTopic("sometopic"); // set up the exception here - org.apache.kafka.clients.producer.Producer kp = producer.getKafkaProducer(); + 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); @@ -169,7 +170,7 @@ public void processAsyncSendsMessageWithException() { Mockito.when(exchange.getMessage()).thenReturn(in); // set up the exception here - org.apache.kafka.clients.producer.Producer kp = producer.getKafkaProducer(); + 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 d77bf3b5f8580..28d5d63ba6f45 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,6 +28,7 @@ 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; @@ -59,12 +60,12 @@ class KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT extends BaseKafkaTestSup @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 1424e03cec99f..57fdd9e7f05a9 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,6 +29,7 @@ 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.*; @@ -63,7 +64,7 @@ class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport { @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeAll public static void setupTopic() { @@ -81,7 +82,7 @@ public void init() { // setup the producer Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 d70f8c482cda7..78c1ab6ba63be 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,6 +32,7 @@ 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; @@ -70,7 +71,7 @@ class KafkaBreakOnFirstErrorReplayOldMessagesIT extends BaseKafkaTestSupport { @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeAll public static void setupTopic() { @@ -88,7 +89,7 @@ public void init() { // setup the producer Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 aa4b5a0106c1d..82d1709d09f36 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,6 +31,7 @@ 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; @@ -75,7 +76,7 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport { @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeAll public static void setupTopic() { @@ -89,7 +90,7 @@ public void init() { // setup the producer Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 9d917bd102548..4f1af548ce675 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,6 +29,7 @@ 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; @@ -65,12 +66,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseKafka @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 2f95c6f45aa2d..db0aee9867c02 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,6 +28,7 @@ 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; @@ -59,12 +60,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT extends BaseKafkaT @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 f240a7ede0c33..e7464891096eb 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,6 +28,7 @@ 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; @@ -65,12 +66,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT extends BaseK @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 37d795ec4cd4c..31cf7a07063d3 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,6 +28,7 @@ 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; @@ -61,12 +62,12 @@ class KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT extends BaseKafkaT @EndpointInject("mock:result") private MockEndpoint to; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 d76bf88567d6c..32b34155aaa39 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,6 +31,7 @@ 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; @@ -57,14 +58,14 @@ public class KafkaConsumerAsyncManualCommitIT extends BaseKafkaTestSupport { private final CamelContext context = contextExtension.getContext(); - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; private volatile int failCount; @BeforeEach public void before() { Properties props = KafkaTestUtil.getDefaultProperties(service); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 ed6f99d5b8959..48722d4a94edb 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,6 +33,7 @@ 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; @@ -79,7 +80,7 @@ public class KafkaConsumerAuthIT { private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerAuthIT.class); - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { @@ -91,7 +92,7 @@ public void before() { props.put(SaslConfigs.SASL_MECHANISM, "PLAIN"); try { - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 0a541b645dc8f..d4b0888c4770f 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,6 +35,7 @@ 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; @@ -79,7 +80,7 @@ public class KafkaConsumerAuthInvalidIT { @RegisterExtension private static final CamelContextExtension contextExtension = new DefaultCamelContextExtension(); - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { @@ -90,7 +91,7 @@ public void before() { props.put(SaslConfigs.SASL_MECHANISM, "PLAIN"); try { - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 ddf16c2a4d2c9..1ac344c7a42f5 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,6 +31,7 @@ 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; @@ -69,7 +70,7 @@ public class KafkaConsumerAuthInvalidWithReconnectIT { @RegisterExtension private static final CamelContextExtension contextExtension = new DefaultCamelContextExtension(); - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; static { service = new ContainerLocalAuthKafkaService( @@ -96,7 +97,7 @@ public void before() { props.put(SaslConfigs.SASL_MECHANISM, "PLAIN"); try { - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 26d2545d318b0..4f422149ac451 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,6 +28,7 @@ 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; @@ -64,7 +65,7 @@ public class KafkaConsumerAuthManualTest { @RegisterExtension private static final CamelContextExtension contextExtension = new DefaultCamelContextExtension(); private static volatile int receivedMessages; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; protected Properties getDefaultProperties() { Properties properties = KafkaTestUtil.getDefaultProperties(BOOTSTRAP_SERVERS); @@ -82,7 +83,7 @@ public void before() { Properties props = getDefaultProperties(); try { - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 1d632a4f2d9dd..50d10643314f7 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,6 +23,7 @@ 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; @@ -32,12 +33,12 @@ public class KafkaConsumerBatchSizeIT extends BaseKafkaTestSupport { public static final String TOPIC = "test-batch"; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 421a92b590abc..dbb295adc1755 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,6 +28,7 @@ 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; @@ -39,7 +40,7 @@ public class KafkaConsumerCustomSubscribeAdapterIT extends BaseKafkaTestSupport public static final String TOPIC = "test-subscribe-adapter"; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; private static class TestSubscribeAdapter extends DefaultSubscribeAdapter { private volatile boolean subscribeCalled = false; @@ -64,7 +65,7 @@ public boolean isSubscribeCalled() { @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 0957733834ce6..26a50f7782b6e 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,6 +35,7 @@ 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; @@ -67,14 +68,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 org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BindToRegistry("myHeaderDeserializer") private final MyKafkaHeaderDeserializer bean = new MyKafkaHeaderDeserializer(); @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 7838be0c26785..7f1e506198be7 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,6 +31,7 @@ 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; @@ -68,7 +69,7 @@ public class KafkaConsumerGroupProtocolIT extends BaseKafkaTestSupport { + "&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor" + "&groupProtocol=consumer"; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeAll static void checkConsumerProtocolSupport() { @@ -88,7 +89,7 @@ static void checkConsumerProtocolSupport() { @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new KafkaProducer<>(props); MockConsumerInterceptor.recordsCaptured.clear(); } @@ -142,7 +143,7 @@ public void kafkaMessageIsConsumedWithConsumerProtocol() throws InterruptedExcep assertEquals(5, MockConsumerInterceptor.recordsCaptured.stream() .flatMap(i -> StreamSupport.stream(i.records(TOPIC).spliterator(), false)).count()); - java.util.Map headers = to.getExchanges().get(0).getIn().getHeaders(); + 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 cf8ba5c332565..c0a3b5bb62c00 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,6 +23,7 @@ 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; @@ -34,8 +35,8 @@ public abstract class KafkaConsumerIdempotentTestSupport extends BaseKafkaTestSu protected void doSend(int size, String topic) { Properties props = getDefaultProperties(); - try (org.apache.kafka.clients.producer.KafkaProducer producer - = new org.apache.kafka.clients.producer.KafkaProducer<>(props)) { + try (KafkaProducer producer + = new 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 b8457b357d3ac..1e320a0b8678d 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,6 +25,7 @@ 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; @@ -39,12 +40,12 @@ public class KafkaConsumerLastRecordHeaderIT extends BaseKafkaTestSupport { private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerLastRecordHeaderIT.class); private static final String TOPIC = "last-record"; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 cca7f78ef426f..25fb53e04846f 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,6 +33,7 @@ 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; @@ -83,7 +84,7 @@ public class KafkaConsumerSaslAuthTypeIT { private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerSaslAuthTypeIT.class); - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { @@ -96,7 +97,7 @@ public void before() { props.put(SaslConfigs.SASL_MECHANISM, "PLAIN"); try { - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 64ff99a07287a..e94e57d84f11e 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,6 +28,7 @@ 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; @@ -52,12 +53,12 @@ public class KafkaConsumerStopIT extends BaseKafkaTestSupport { private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerStopIT.class); - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 3117ce03aed53..6b0e6928dbb0d 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,6 +25,7 @@ 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; @@ -37,12 +38,12 @@ public class KafkaConsumerTopicIsPatternIT extends BaseKafkaTestSupport { public static final String TOPIC = "vess123d"; public static final String TOPIC_PATTERN = "v.*d"; - private org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; @BeforeEach public void before() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 80aa8c1e952e0..a15aae684c1a5 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,6 +39,7 @@ 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; @@ -111,16 +112,16 @@ public static void after() { private static KafkaConsumer createStringKafkaConsumer(final String groupId) { Properties stringsProps = new Properties(); - 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, + 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, "org.apache.kafka.common.serialization.StringDeserializer"); - stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, + stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer"); - stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + stringsProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); return new KafkaConsumer<>(stringsProps); } @@ -128,16 +129,16 @@ private static KafkaConsumer createStringKafkaConsumer(final Str private static KafkaConsumer createByteKafkaConsumer(final String groupId) { Properties stringsProps = new Properties(); - 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, + 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, "org.apache.kafka.common.serialization.ByteArrayDeserializer"); - stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, + stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArrayDeserializer"); - stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + stringsProps.put(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 293475756f42c..d8d6fec758401 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,6 +18,7 @@ import java.time.Duration; import java.util.Collections; +import java.util.Map; import java.util.Properties; import org.apache.camel.CamelContext; @@ -192,7 +193,7 @@ public void kafkaProducerWithSaslAuthTypeAndHeaders() throws InterruptedExceptio // Send a message with custom headers producerTemplate.sendBodyAndHeaders("direct:start", "message-with-headers", - java.util.Map.of( + 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 9eb8852900596..01ab645173bd6 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,6 +32,7 @@ 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; @@ -175,16 +176,16 @@ public void execute() { private static KafkaConsumer createStringKafkaConsumer(final String groupId) { Properties stringsProps = new Properties(); - 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, + 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, "org.apache.kafka.common.serialization.StringDeserializer"); - stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, + stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer"); - stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + stringsProps.put(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 bcb39ae3921e8..bbac51e590c0a 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,6 +27,7 @@ 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; @@ -306,17 +307,17 @@ private ConsumerRecords getMessagesFromTopic(KafkaConsumer createStringKafkaConsumer(final String groupId) { Properties stringsProps = new Properties(); - 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, + 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, "org.apache.kafka.common.serialization.StringDeserializer"); - stringsProps.put(org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, + stringsProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer"); - 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"); + stringsProps.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + stringsProps.put(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 a040dcab2c06e..a01be7b94b15b 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,6 +27,7 @@ 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; @@ -46,12 +47,12 @@ abstract class BatchingProcessingITSupport extends BaseKafkaTestSupport { @EndpointInject("mock:resultBar") protected MockEndpoint toBar; - protected org.apache.kafka.clients.producer.KafkaProducer producer; + protected KafkaProducer producer; @BeforeEach public void createClient() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 a0613af5908a8..1935fa7567ef5 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,6 +25,7 @@ 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; @@ -40,12 +41,12 @@ abstract class BaseManualCommitTestSupport extends BaseKafkaTestSupport { @EndpointInject("mock:resultBar") protected MockEndpoint toBar; - protected org.apache.kafka.clients.producer.KafkaProducer producer; + protected KafkaProducer producer; @BeforeEach public void createClient() { Properties props = getDefaultProperties(); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 239296614f7d2..6d46f6b25223b 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 org.apache.kafka.clients.producer.KafkaProducer<>(props)) { + try (KafkaProducer producer = new 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 ab8a2c2b52621..cfcfa874baa0d 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,6 +35,7 @@ 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; @@ -52,7 +53,7 @@ abstract class KafkaHealthCheckTestSupport implements ConfigurableRoute, Configu @Order(2) @RegisterExtension protected static CamelContextExtension contextExtension = new DefaultCamelContextExtension(); - protected org.apache.kafka.clients.producer.KafkaProducer producer; + protected KafkaProducer producer; @EndpointInject("mock:result") protected MockEndpoint to; protected boolean serviceShutdown = false; @@ -76,7 +77,7 @@ public void after() { public void before() { if (!serviceShutdown) { Properties props = KafkaTestUtil.getDefaultProperties(service); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 6683200ece163..fb2719a3fce67 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,6 +33,7 @@ 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; @@ -59,7 +60,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 org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; /* * This is used by pausable to determine whether to pause. If returning true, processing continues. If @@ -93,7 +94,7 @@ public static int getCount() { @BeforeEach public void before() { Properties props = KafkaTestUtil.getDefaultProperties(service); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 4cd40f3d07ca5..4879e44aed9d7 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,6 +33,7 @@ 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; @@ -57,7 +58,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 org.apache.kafka.clients.producer.KafkaProducer producer; + private KafkaProducer producer; private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); @@ -81,7 +82,7 @@ public static int getCount() { @BeforeEach public void before() { Properties props = KafkaTestUtil.getDefaultProperties(service); - producer = new org.apache.kafka.clients.producer.KafkaProducer<>(props); + producer = new 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 80ba9352f270e..4d41da39bb0be 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,6 +26,7 @@ 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; @@ -39,7 +40,7 @@ */ @ManagedResource(description = "Managed Kamelet Processor") public class KameletProcessor extends BaseProcessorSupport - implements CamelContextAware, Navigate, org.apache.camel.Traceable, IdAware, RouteIdAware { + implements CamelContextAware, Navigate, 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 37ddc1c052b5f..f380ae01b936e 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,6 +16,7 @@ */ package org.apache.camel.component.keycloak; +import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -287,7 +288,7 @@ private List parseCommaSeparatedList(String value) { if (value == null || value.trim().isEmpty()) { return null; } - List result = new java.util.ArrayList<>(); + List result = new 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 30967fbeed7c9..c3ec59574f04f 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,6 +18,7 @@ import java.io.IOException; import java.security.PublicKey; +import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Map; @@ -153,7 +154,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 java.util.Collection permissionsCollection) { + if (permissionsClaim instanceof Collection permissionsCollection) { for (Object perm : permissionsCollection) { if (perm instanceof String s) { permissions.add(s); @@ -165,7 +166,7 @@ public static Set extractPermissions(AccessToken token) { Object scopesClaim = token.getOtherClaims().get("scope"); if (scopesClaim instanceof String scopesString) { if (!scopesString.isEmpty()) { - permissions.addAll(java.util.Arrays.asList(scopesString.split(" "))); + permissions.addAll(Arrays.asList(scopesString.split(" "))); } } @@ -254,7 +255,7 @@ public static Set extractPermissionsFromIntrospection( // Also check for scope-based permissions String scope = introspectionResult.getScope(); if (scope != null && !scope.isEmpty()) { - permissions.addAll(java.util.Arrays.asList(scope.split(" "))); + permissions.addAll(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 08910a810c3f1..3b7ad2cf566f3 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,6 +29,7 @@ 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; @@ -161,7 +162,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 = org.keycloak.TokenVerifier.create(headerToken, AccessToken.class).getToken(); + AccessToken accessToken = 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 61f6f1d62b4bc..4ca6239e0328c 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,6 +18,7 @@ import java.io.IOException; import java.util.Base64; +import java.util.List; import java.util.Map; import com.fasterxml.jackson.databind.ObjectMapper; @@ -31,6 +32,7 @@ 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; @@ -145,7 +147,7 @@ public IntrospectionResult introspect(String token) throws IOException { // Set request body with token NameValuePair tokenParam = new BasicNameValuePair("token", token); - request.setEntity(new UrlEncodedFormEntity(java.util.List.of(tokenParam))); + request.setEntity(new UrlEncodedFormEntity(List.of(tokenParam))); // Execute request try { @@ -183,7 +185,7 @@ private IntrospectionResult parseIntrospectionResponse(ClassicHttpResponse respo Map responseMap = OBJECT_MAPPER.readValue(responseBody, Map.class); return new IntrospectionResult(responseMap); - } catch (org.apache.hc.core5.http.ParseException e) { + } catch (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 0bb0977e51c47..a3ab0ce1ae55b 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,6 +16,8 @@ */ package org.apache.camel.component.keycloak; +import java.util.Arrays; +import java.util.HashMap; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -32,8 +34,10 @@ 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; @@ -127,8 +131,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); - org.keycloak.admin.client.Keycloak keycloakClient = keycloakService.getKeycloakAdminClient(); - org.keycloak.representations.idm.RealmRepresentation realmRep + Keycloak keycloakClient = keycloakService.getKeycloakAdminClient(); + RealmRepresentation realmRep = keycloakClient.realm(TEST_REALM_NAME).toRepresentation(); // Enable admin events @@ -137,7 +141,7 @@ void testSetup_CreateRealm() throws Exception { // Enable regular events realmRep.setEventsEnabled(true); - realmRep.setEventsListeners(java.util.Arrays.asList("jboss-logging")); + realmRep.setEventsListeners(Arrays.asList("jboss-logging")); keycloakClient.realm(TEST_REALM_NAME).update(realmRep); log.info("Events and admin events enabled successfully"); @@ -163,7 +167,7 @@ void testConsumeAdminEvents_CreateUser() throws Exception { log.info("Creating user: {} in realm: {}", TEST_USER_NAME, TEST_REALM_NAME); template.sendBodyAndHeaders("direct:createUser", null, - new java.util.HashMap<>() { + new 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 cd7dacb39a2d9..2af6bc84d3cc5 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,6 +17,7 @@ package org.apache.camel.component.keycloak; import java.util.List; +import java.util.Map; import java.util.UUID; import jakarta.ws.rs.core.Response; @@ -644,7 +645,7 @@ void testGetUserAttributes() { } @SuppressWarnings("unchecked") - java.util.Map> attributes = result.getIn().getBody(java.util.Map.class); + Map> attributes = result.getIn().getBody(Map.class); assertNotNull(attributes); // Verify the department attribute exists from the previous test @@ -1138,7 +1139,7 @@ void testEvaluatePermissionWithResourceAndScopes() { } else { // If it succeeds, verify the permissions-only response format @SuppressWarnings("unchecked") - java.util.Map body = result.getIn().getBody(java.util.Map.class); + Map body = result.getIn().getBody(Map.class); if (body != null) { assertTrue(body.containsKey("permissions") || body.containsKey("granted"), "Response should contain permissions or granted field"); @@ -1176,7 +1177,7 @@ void testEvaluatePermissionRPTMode() { } else { // If it succeeds, verify the RPT response format @SuppressWarnings("unchecked") - java.util.Map body = result.getIn().getBody(java.util.Map.class); + Map body = result.getIn().getBody(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 2cbdc9ae61ba6..34e6041de9ac5 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,6 +19,9 @@ 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; @@ -40,7 +43,7 @@ void testExtractRoles() { when(token.getRealmAccess()).thenReturn(realmAccess); when(realmAccess.getRoles()).thenReturn(Set.of("realm-admin", "user")); - when(token.getResourceAccess()).thenReturn(java.util.Map.of("test-client", clientAccess)); + when(token.getResourceAccess()).thenReturn(Map.of("test-client", clientAccess)); when(clientAccess.getRoles()).thenReturn(Set.of("client-admin")); Set roles = KeycloakSecurityHelper.extractRoles(token, "test-realm", "test-client"); @@ -182,12 +185,12 @@ void testExtractPermissions() { when(token.getAuthorization()).thenReturn(authorization); // Test permissions extraction from custom claims - java.util.Map otherClaims = new java.util.HashMap<>(); - otherClaims.put("permissions", java.util.Arrays.asList("read:documents", "write:documents", "admin:users")); + Map otherClaims = new HashMap<>(); + otherClaims.put("permissions", Arrays.asList("read:documents", "write:documents", "admin:users")); when(token.getOtherClaims()).thenReturn(otherClaims); - java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); + Set permissions = KeycloakSecurityHelper.extractPermissions(token); assertEquals(3, permissions.size()); assertTrue(permissions.contains("read:documents")); @@ -200,13 +203,13 @@ void testExtractPermissionsFromCustomClaims() { AccessToken token = Mockito.mock(AccessToken.class); // Mock other claims with permissions - java.util.Map otherClaims = new java.util.HashMap<>(); - otherClaims.put("permissions", java.util.Arrays.asList("read:files", "write:files", "delete:files")); + Map otherClaims = new HashMap<>(); + otherClaims.put("permissions", Arrays.asList("read:files", "write:files", "delete:files")); when(token.getOtherClaims()).thenReturn(otherClaims); when(token.getAuthorization()).thenReturn(null); - java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); + Set permissions = KeycloakSecurityHelper.extractPermissions(token); assertEquals(3, permissions.size()); assertTrue(permissions.contains("read:files")); @@ -219,13 +222,13 @@ void testExtractPermissionsFromScopes() { AccessToken token = Mockito.mock(AccessToken.class); // Mock other claims with scope-based permissions - java.util.Map otherClaims = new java.util.HashMap<>(); + Map otherClaims = new HashMap<>(); otherClaims.put("scope", "read write admin"); when(token.getOtherClaims()).thenReturn(otherClaims); when(token.getAuthorization()).thenReturn(null); - java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); + Set permissions = KeycloakSecurityHelper.extractPermissions(token); assertEquals(3, permissions.size()); assertTrue(permissions.contains("read")); @@ -237,9 +240,9 @@ void testExtractPermissionsFromScopes() { void testExtractPermissionsEmpty() { AccessToken token = Mockito.mock(AccessToken.class); when(token.getAuthorization()).thenReturn(null); - when(token.getOtherClaims()).thenReturn(java.util.Map.of()); + when(token.getOtherClaims()).thenReturn(Map.of()); - java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); + 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 ed9d553e9881f..0ac3e3296cfc5 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,10 +18,14 @@ 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; @@ -40,6 +44,7 @@ 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; @@ -183,7 +188,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { // Test that parseToken works correctly with public key and issuer verification String expectedIssuer = keycloakUrl + "/realms/" + realm; try { - org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); assertNotNull(token); @@ -191,7 +196,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { assertTrue(KeycloakSecurityHelper.isTokenActive(token)); // Verify roles can be extracted after public key verification - java.util.Set roles = KeycloakSecurityHelper.extractRoles(token, realm, clientId); + Set roles = KeycloakSecurityHelper.extractRoles(token, realm, clientId); assertNotNull(roles); assertFalse(roles.isEmpty()); @@ -245,7 +250,7 @@ void testParseAndVerifyTokenDirectlyWithPublicKey() { // Test parseAndVerifyAccessToken with correct public key and issuer (may fail with signature verification) try { - org.keycloak.representations.AccessToken tokenWithKey + AccessToken tokenWithKey = KeycloakSecurityHelper.parseAndVerifyAccessToken(adminToken, publicKey, expectedIssuer); assertNotNull(tokenWithKey); assertNotNull(tokenWithKey.getSubject()); @@ -367,9 +372,9 @@ void testPermissionsExtractionFromToken() { try { // Parse and verify token, then extract permissions directly - org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); - java.util.Set permissions = KeycloakSecurityHelper.extractPermissions(token); + Set permissions = KeycloakSecurityHelper.extractPermissions(token); // Log the permissions found for debugging LOG.info("Permissions found in token: {}", permissions); @@ -458,9 +463,9 @@ private PublicKey getPublicKeyFromKeycloak() { */ private PublicKey getWrongPublicKey() { try { - java.security.KeyPairGenerator keyGen = java.security.KeyPairGenerator.getInstance("RSA"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); keyGen.initialize(2048); - java.security.KeyPair keyPair = keyGen.generateKeyPair(); + KeyPair keyPair = keyGen.generateKeyPair(); return keyPair.getPublic(); } catch (Exception e) { throw new RuntimeException("Error generating dummy public key", e); @@ -509,7 +514,7 @@ public void configure() throws Exception { keycloakPolicy.setRealm(realm); keycloakPolicy.setClientId(clientId); keycloakPolicy.setClientSecret(clientSecret); - keycloakPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); // Add role to trigger validation + keycloakPolicy.setRequiredRoles(Arrays.asList("admin-role")); // Add role to trigger validation // Configure different policies for different access levels KeycloakSecurityPolicy adminPolicy = new KeycloakSecurityPolicy(); @@ -517,14 +522,14 @@ public void configure() throws Exception { adminPolicy.setRealm(realm); adminPolicy.setClientId(clientId); adminPolicy.setClientSecret(clientSecret); - adminPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); + adminPolicy.setRequiredRoles(Arrays.asList("admin-role")); KeycloakSecurityPolicy userPolicy = new KeycloakSecurityPolicy(); userPolicy.setServerUrl(keycloakUrl); userPolicy.setRealm(realm); userPolicy.setClientId(clientId); userPolicy.setClientSecret(clientSecret); - userPolicy.setRequiredRoles(java.util.Arrays.asList("user")); + userPolicy.setRequiredRoles(Arrays.asList("user")); userPolicy.setAllRolesRequired(true); // Must have exact role // Protected routes @@ -549,7 +554,7 @@ public void configure() throws Exception { publicKeyPolicy.setRealm(realm); publicKeyPolicy.setClientId(clientId); publicKeyPolicy.setClientSecret(clientSecret); - publicKeyPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); // Add role to trigger validation + publicKeyPolicy.setRequiredRoles(Arrays.asList("admin-role")); // Add role to trigger validation try { publicKeyPolicy.setPublicKey(getPublicKeyFromKeycloak()); } catch (Exception e) { @@ -563,7 +568,7 @@ public void configure() throws Exception { wrongPublicKeyPolicy.setClientId(clientId); wrongPublicKeyPolicy.setClientSecret(clientSecret); wrongPublicKeyPolicy.setPublicKey(getWrongPublicKey()); - wrongPublicKeyPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); // Add role to trigger validation + wrongPublicKeyPolicy.setRequiredRoles(Arrays.asList("admin-role")); // Add role to trigger validation from("direct:public-key-protected") .policy(publicKeyPolicy) @@ -581,7 +586,7 @@ public void configure() throws Exception { permissionsPolicy.setRealm(realm); permissionsPolicy.setClientId(clientId); permissionsPolicy.setClientSecret(clientSecret); - permissionsPolicy.setRequiredPermissions(java.util.Arrays.asList("read:documents", "write:documents")); + permissionsPolicy.setRequiredPermissions(Arrays.asList("read:documents", "write:documents")); permissionsPolicy.setAllPermissionsRequired(false); // ANY permission from("direct:permissions-protected") @@ -595,7 +600,7 @@ public void configure() throws Exception { scopePermissionsPolicy.setRealm(realm); scopePermissionsPolicy.setClientId(clientId); scopePermissionsPolicy.setClientSecret(clientSecret); - scopePermissionsPolicy.setRequiredPermissions(java.util.Arrays.asList("profile", "email", "openid")); + scopePermissionsPolicy.setRequiredPermissions(Arrays.asList("profile", "email", "openid")); scopePermissionsPolicy.setAllPermissionsRequired(false); // ANY scope from("direct:scope-permissions-protected") @@ -609,8 +614,8 @@ public void configure() throws Exception { combinedPolicy.setRealm(realm); combinedPolicy.setClientId(clientId); combinedPolicy.setClientSecret(clientSecret); - combinedPolicy.setRequiredRoles(java.util.Arrays.asList("admin-role")); - combinedPolicy.setRequiredPermissions(java.util.Arrays.asList("read:documents", "admin:system")); + combinedPolicy.setRequiredRoles(Arrays.asList("admin-role")); + combinedPolicy.setRequiredPermissions(Arrays.asList("read:documents", "admin:system")); combinedPolicy.setAllRolesRequired(true); // Must have ALL roles combinedPolicy.setAllPermissionsRequired(true); // Any permission @@ -626,7 +631,7 @@ public void configure() throws Exception { flexiblePermissionsPolicy.setClientId(clientId); flexiblePermissionsPolicy.setClientSecret(clientSecret); flexiblePermissionsPolicy - .setRequiredPermissions(java.util.Arrays.asList("profile", "email", "user:basic", "read:public")); + .setRequiredPermissions(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 375fa9ab7696f..80f727e5ee970 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,6 +24,7 @@ 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; @@ -54,6 +55,7 @@ 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; @@ -471,7 +473,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { // Test that parseToken works correctly with public key and issuer verification String expectedIssuer = keycloakService.getKeycloakServerUrl() + "/realms/" + TEST_REALM_NAME; try { - org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); assertNotNull(token); @@ -479,7 +481,7 @@ void testKeycloakSecurityPolicyWithPublicKeyVerification() { assertTrue(KeycloakSecurityHelper.isTokenActive(token)); // Verify roles can be extracted after public key verification - java.util.Set roles = KeycloakSecurityHelper.extractRoles(token, TEST_REALM_NAME, TEST_CLIENT_ID); + 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); @@ -511,14 +513,14 @@ void testTokenParsing() { try { // Parse and verify token with public key and issuer - org.keycloak.representations.AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( + AccessToken token = KeycloakSecurityHelper.parseAndVerifyAccessToken( adminToken, publicKey, expectedIssuer); assertNotNull(token); assertNotNull(token.getSubject()); assertTrue(KeycloakSecurityHelper.isTokenActive(token)); // Extract roles from token - java.util.Set roles = KeycloakSecurityHelper.extractRoles(token, TEST_REALM_NAME, TEST_CLIENT_ID); + 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 8c28a12500e00..49c9b15d82020 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,6 +16,7 @@ */ package org.apache.camel.component.keycloak.security; +import java.util.List; import java.util.Map; import java.util.Set; @@ -66,9 +67,9 @@ public void testIntrospectionResultInactive() { public void testExtractRolesFromIntrospection() { Map claims = Map.of( "active", true, - "realm_access", Map.of("roles", java.util.List.of("admin", "user")), + "realm_access", Map.of("roles", List.of("admin", "user")), "resource_access", Map.of( - "test-client", Map.of("roles", java.util.List.of("client-admin")))); + "test-client", Map.of("roles", List.of("client-admin")))); KeycloakTokenIntrospector.IntrospectionResult result = new KeycloakTokenIntrospector.IntrospectionResult(claims); @@ -86,7 +87,7 @@ public void testExtractPermissionsFromIntrospection() { Map claims = Map.of( "active", true, "scope", "read:documents write:documents", - "permissions", java.util.List.of("admin:all")); + "permissions", 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 bcf4ecc977ac7..ed916db3121db 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,10 +16,12 @@ */ package org.apache.camel.component.kubernetes.properties; +import org.apache.camel.spi.annotations.PropertiesFunction; + /** * Resolves binary type configmap keys . */ -@org.apache.camel.spi.annotations.PropertiesFunction("configmap-binary") +@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 9f0df56423586..9893b7cacfdd3 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,10 +16,12 @@ */ package org.apache.camel.component.kubernetes.properties; +import org.apache.camel.spi.annotations.PropertiesFunction; + /** * Resolves String type configmap keys . */ -@org.apache.camel.spi.annotations.PropertiesFunction("configmap") +@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 52f0656590854..0f37e37547a51 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,10 +16,12 @@ */ package org.apache.camel.component.kubernetes.properties; +import org.apache.camel.spi.annotations.PropertiesFunction; + /** * Resolves binary type secret keys . */ -@org.apache.camel.spi.annotations.PropertiesFunction("secret-binary") +@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 1c8e66e6760cc..cf29dbcda1642 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,10 +16,12 @@ */ package org.apache.camel.component.kubernetes.properties; +import org.apache.camel.spi.annotations.PropertiesFunction; + /** * Resolves String type secret keys . */ -@org.apache.camel.spi.annotations.PropertiesFunction("secret") +@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 08cc0c3fe8def..b63db1d903b76 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,6 +23,7 @@ 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; @@ -31,7 +32,7 @@ * The Language component enables sending * {@link org.apache.camel.Exchange}s to a given language in order to have a script executed. */ -@org.apache.camel.spi.annotations.Component("language") +@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 b8050aeb38165..4b987b1af2059 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,6 +24,7 @@ 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; @@ -56,7 +57,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() { } @@ -338,7 +339,7 @@ private static List createTransports(CreateTransport transportBuilder } private static int getFreePort() { - org.apache.camel.test.AvailablePortFinder.Port port = org.apache.camel.test.AvailablePortFinder.find(); + AvailablePortFinder.Port port = 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 b8050aeb38165..4b987b1af2059 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,6 +24,7 @@ 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; @@ -56,7 +57,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() { } @@ -338,7 +339,7 @@ private static List createTransports(CreateTransport transportBuilder } private static int getFreePort() { - org.apache.camel.test.AvailablePortFinder.Port port = org.apache.camel.test.AvailablePortFinder.find(); + AvailablePortFinder.Port port = 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 4f0166e82260f..ceb452537fb85 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,6 +24,7 @@ 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; @@ -35,7 +36,7 @@ * The Log Component is for logging message exchanges via the underlying * logging mechanism. */ -@org.apache.camel.spi.annotations.Component("log") +@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 41db0771c87d6..28d8a1d2dea6e 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,12 +16,13 @@ */ 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 jakarta.mail.Authenticator { +public class MailAuthenticator extends 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 2a96fca0606a4..4b2af3ed0fa02 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, java.lang.String.class); + return exchange.getIn().getHeader(alternativeBodyHeader, 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 ee71a25e3a668..b72cb8f2b6b77 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,12 +21,13 @@ 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; -@org.apache.camel.spi.annotations.Component("mapstruct") +@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 e6f5d83fdc5c8..f212f37127b6d 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,6 +18,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -213,7 +214,7 @@ public String toString() { } } - class SpanComparator implements java.util.Comparator { + class SpanComparator implements 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 63cdcf72c1d80..8a87f5c57997d 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,6 +18,7 @@ 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; @@ -41,7 +42,7 @@ public class MicrometerObservabilityTracerPropagationTestSupport extends Exchang protected CamelOpenTelemetryExtension otelExtension = CamelOpenTelemetryExtension.create(); protected MicrometerObservabilityTracer tst = new MicrometerObservabilityTracer(); - protected io.micrometer.tracing.Tracer tracer; + protected 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 542185bace2fc..072165aca2cb6 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,6 +34,7 @@ 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; @@ -60,7 +61,7 @@ */ @ManagedResource(description = "Managed FaultTolerance Processor") public class FaultToleranceProcessor extends BaseProcessorSupport - implements CamelContextAware, Navigate, org.apache.camel.Traceable, IdAware, RouteIdAware { + implements CamelContextAware, Navigate, 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 ab2ae48eed98c..fe384ce701dca 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,6 +26,7 @@ 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; @@ -139,7 +140,7 @@ public Result load() throws GeneralSecurityException, IOException { if (privateKey instanceof PrivateKey pk) { // Load the full certificate chain - final java.security.cert.Certificate[] chain = keyStore.getCertificateChain(effectiveKeyAlias); + final 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 3f942d17dd2ba..ca4bb1385645d 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,6 +24,7 @@ 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; @@ -241,22 +242,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 ? java.time.Instant.ofEpochSecond(validAfter) : "epoch", + validAfter > 0 ? Instant.ofEpochSecond(validAfter) : "epoch", validBefore == OpenSshCertificate.INFINITY ? "forever" - : java.time.Instant.ofEpochSecond(validBefore), - java.time.Instant.now())); + : Instant.ofEpochSecond(validBefore), + Instant.now())); } if (LOG.isTraceEnabled()) { long validAfter = certificate.getValidAfter(); long validBefore = certificate.getValidBefore(); LOG.trace("Certificate validity check passed: validAfter={}, validBefore={}, now={}", - validAfter > 0 ? java.time.Instant.ofEpochSecond(validAfter) : "always", + validAfter > 0 ? Instant.ofEpochSecond(validAfter) : "always", validBefore == OpenSshCertificate.INFINITY ? "forever" - : java.time.Instant.ofEpochSecond(validBefore), - java.time.Instant.now()); + : Instant.ofEpochSecond(validBefore), + 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 a8a97fbea31f1..30dc60a9c4b85 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,6 +65,7 @@ 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; @@ -743,10 +744,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(org.apache.sshd.common.kex.KexProposalOption.C2SCOMP) + ? session.getNegotiatedKexParameter(KexProposalOption.C2SCOMP) : null; String s2cCompression = session.getKexState() != null - ? session.getNegotiatedKexParameter(org.apache.sshd.common.kex.KexProposalOption.S2CCOMP) + ? session.getNegotiatedKexParameter(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 7f214c5b50a79..abac0c983696c 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,6 +29,7 @@ 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; @@ -110,7 +111,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 = java.util.Collections.emptyList(); + cachedEntries = 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 4d2c39e8eb026..d02576554ffc4 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,6 +23,7 @@ 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; @@ -456,7 +457,7 @@ public static String getCharacterAsPrintFriendlyString(char c) { } private int[] caretPositionsIn(String data) { - return java.util.stream.IntStream.range(0, data.length()) + return 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 a9fcea7f9259d..184d36aad807f 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,6 +24,7 @@ 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; @@ -31,7 +32,7 @@ /** * The Mock Component provides mock endpoints for testing. */ -@org.apache.camel.spi.annotations.Component("mock") +@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 635ab195e07e9..14132b51b06cc 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,6 +18,7 @@ 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; @@ -81,7 +82,7 @@ public MongoClient get() { throw new RuntimeException("Error instantiating trust all SSL context.", e); } try { - sc.init(null, trustAllCerts, new java.security.SecureRandom()); + sc.init(null, trustAllCerts, new 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 7056c9b2cc523..3414321942b1d 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,6 +17,7 @@ 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; @@ -64,7 +65,7 @@ public boolean add(String key) { Document document = new Document(MONGO_ID, key); try { collection.insertOne(document); - } catch (com.mongodb.MongoWriteException ex) { + } catch (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 32cd37bf9e044..753d25ca0a9be 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,6 +22,7 @@ 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 { @@ -34,7 +35,7 @@ public MvelExpression(String expressionString, Class type) { this.type = type; try { - this.compiled = org.mvel2.MVEL.compileExpression(expressionString); + this.compiled = MVEL.compileExpression(expressionString); } catch (Exception e) { throw new ExpressionIllegalSyntaxException(expressionString, e); } @@ -47,7 +48,7 @@ public static MvelExpression mvel(String expression) { @Override public T evaluate(Exchange exchange, Class tClass) { try { - Object value = org.mvel2.MVEL.executeExpression(compiled, new RootObject(exchange)); + Object value = MVEL.executeExpression(compiled, new RootObject(exchange)); return exchange.getContext().getTypeConverter().convertTo(tClass, value); } catch (Exception e) { throw new ExpressionEvaluationException(this, exchange, e); @@ -57,7 +58,7 @@ public T evaluate(Exchange exchange, Class tClass) { @Override public Object evaluate(Exchange exchange) { try { - return org.mvel2.MVEL.executeExpression(compiled, new RootObject(exchange)); + return 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 33b6b60a2c95b..342a117c91a52 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,6 +25,7 @@ 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 @@ -50,8 +51,8 @@ private MvelExpression createMvelExpression(String expression, Class type) { public T evaluate(String script, Map bindings, Class resultType) { script = loadResource(script); try { - Serializable compiled = org.mvel2.MVEL.compileExpression(script); - Object value = org.mvel2.MVEL.executeExpression(compiled, bindings); + Serializable compiled = MVEL.compileExpression(script); + Object value = 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 047df8c78b8d8..7f594d014cb52 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,6 +16,7 @@ */ package org.apache.camel.component.netty.http; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -101,14 +102,14 @@ private boolean excludedUrl(String url) { public void addInclusion(String constraint) { if (inclusions == null) { - inclusions = new java.util.LinkedHashMap<>(); + inclusions = new LinkedHashMap<>(); } inclusions.put(constraint, null); } public void addInclusion(String constraint, String roles) { if (inclusions == null) { - inclusions = new java.util.LinkedHashMap<>(); + inclusions = new 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 9eb2f11668bab..a5f88a3d4240d 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,6 +16,8 @@ */ 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; @@ -62,8 +64,8 @@ public void configure() { assertTrue(response.isFailed(), "should have failed"); assertNotNull(ex); // Netty may wrap SSLHandshakeException in DecoderException - boolean isSslError = ex instanceof javax.net.ssl.SSLHandshakeException - || (ex.getCause() instanceof javax.net.ssl.SSLHandshakeException); + boolean isSslError = ex instanceof SSLHandshakeException + || (ex.getCause() instanceof 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 09c27afda954d..8d89b55cb02aa 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,6 +30,8 @@ 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; @@ -104,7 +106,7 @@ public String buildCodeFlowAuthRequestUrl(OAuthCodeFlowParams params) { public UserProfile authenticate(org.apache.camel.oauth.Credentials creds) throws OAuthException { Credentials vtxCreds; - if (creds instanceof org.apache.camel.oauth.UserCredentials uc) { + if (creds instanceof UserCredentials uc) { var userProfile = uc.getUserProfile(); log.info("Authenticate userProfile: {}", userProfile.subject()); @@ -113,7 +115,7 @@ public UserProfile authenticate(org.apache.camel.oauth.Credentials creds) throws .setToken(userProfile.accessToken().orElseThrow()) .addScope(scope); - } else if (creds instanceof org.apache.camel.oauth.AuthCodeCredentials params) { + } else if (creds instanceof AuthCodeCredentials params) { vtxCreds = new Oauth2Credentials() .setFlow(OAuth2FlowType.AUTH_CODE) @@ -125,7 +127,7 @@ public UserProfile authenticate(org.apache.camel.oauth.Credentials creds) throws vtxCreds = new TokenCredentials() .setToken(params.getToken()); - } else if (creds instanceof org.apache.camel.oauth.ClientCredentials params) { + } else if (creds instanceof 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 d2b00ca4768b9..e5e1e7cc8b877 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,6 +27,7 @@ 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; @@ -57,7 +58,7 @@ void testCheckClusterCertificateTrust() throws Exception { try { for (var tm : tmf.getTrustManagers()) { - var xtm = (javax.net.ssl.X509TrustManager) tm; + var xtm = (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 7b7fbf3069a55..910ccc8c40323 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( - org.apache.camel.tracing.SpanKind kind, SpanDecorator sd, Exchange exchange) { + 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( - org.apache.camel.tracing.SpanKind kind, InjectAdapter adapter, Exchange exchange) { + 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, org.apache.camel.tracing.SpanKind kind, + Exchange exchange, SpanDecorator sd, String operationName, 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 815ef53f4f1cb..ab0b70d6fbe82 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,6 +19,8 @@ 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; @@ -98,7 +100,7 @@ void testParseCompleteOcsfFinding() throws Exception { // Verify cloud info in additionalProperties (cloud is not a base event field) @SuppressWarnings("unchecked") - java.util.Map cloud = (java.util.Map) finding.getAdditionalProperties().get("cloud"); + Map cloud = (Map) finding.getAdditionalProperties().get("cloud"); assertThat(cloud.get("provider")).isEqualTo("AWS"); assertThat(cloud.get("region")).isEqualTo("us-east-1"); } @@ -161,8 +163,8 @@ void testBuildOcsfFindingProgrammatically() throws Exception { info.setAttacks(Arrays.asList(attack)); // Evidence (using Map since evidences is a list of generic objects in OCSF) - java.util.Map evidence = new java.util.HashMap<>(); - evidence.put("http_request", java.util.Map.of( + Map evidence = new HashMap<>(); + evidence.put("http_request", 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 f6e07fa35bc7a..b101405b14149 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,6 +16,9 @@ */ 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; @@ -59,7 +62,7 @@ public RestModelConverters(boolean openapi31) { } public List> readClass(OpenAPI oasDocument, Class clazz) { - if (clazz.equals(java.io.File.class)) { + if (clazz.equals(File.class)) { // File is a special type in OAS2 / OAS3 (no model) return null; } else { @@ -75,7 +78,7 @@ private List> readClassOpenApi3(Class clazz) { ModelConverters modelConverters = openapi31 ? MODEL31_CONVERTERS : MODEL30_CONVERTERS; Map swaggerModel = modelConverters.readAll(clazz); - List> modelSchemas = new java.util.ArrayList<>(); + List> modelSchemas = new ArrayList<>(); swaggerModel.forEach((key, schema) -> { schema.setName(key); modelSchemas.add(schema); @@ -129,7 +132,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context } if (!type.isContainerType()) { - Map value = new java.util.HashMap<>(); + Map value = new 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 e7577560b3719..9d99e036ad68b 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,6 +16,9 @@ */ 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; @@ -45,7 +48,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(java.io.File.class).endResponseMessage().to("log:hi"); + .message("A document as reply").responseModel(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 479f3235e1677..7d60b31014c74 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 org.openstack4j.model.compute.Flavor messageToFlavor(Message message) { + private 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 f343641b6851d..ffb489be56711 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 e19903a3cf481..bf492fd74103b 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 3ae897a45b987..af5719c8f0e15 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 org.openstack4j.model.compute.Server testOSServer; + private 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 b913f80fd67ac..b594793dd0f90 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,6 +23,7 @@ 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; @@ -47,18 +48,18 @@ public class OpenTelemetrySpanAdapter implements SpanAdapter { } private Baggage baggage; - private io.opentelemetry.api.trace.Span span; + private Span span; - OpenTelemetrySpanAdapter(io.opentelemetry.api.trace.Span span) { + OpenTelemetrySpanAdapter(Span span) { this.span = span; } - OpenTelemetrySpanAdapter(io.opentelemetry.api.trace.Span span, Baggage baggage) { + OpenTelemetrySpanAdapter(Span span, Baggage baggage) { this.span = span; this.baggage = baggage; } - io.opentelemetry.api.trace.Span getOpenTelemetrySpan() { + 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 2125f1716e2d4..5d548203bd00f 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,6 +18,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -200,7 +201,7 @@ public String toString() { } } - class SpanComparator implements java.util.Comparator { + class SpanComparator implements 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 9d74ab627166f..e413425581401 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,13 +18,16 @@ 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 org.apache.camel.support.DefaultComponent { +public class MockHttpComponent extends DefaultComponent { @Override - protected org.apache.camel.Endpoint createEndpoint(String uri, String remaining, Map parameters) + protected 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 ee1d5e061862a..31f7ef088abe8 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,22 +16,28 @@ */ 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 org.apache.camel.support.DefaultEndpoint { +class MockHttpEndpoint extends DefaultEndpoint { - public MockHttpEndpoint(String endpointUri, org.apache.camel.Component component) { + public MockHttpEndpoint(String endpointUri, Component component) { super(endpointUri, component); } @Override - public org.apache.camel.Producer createProducer() throws Exception { + public Producer createProducer() throws Exception { return new MockHttpProducer(this); } @Override - public org.apache.camel.Consumer createConsumer(org.apache.camel.Processor processor) throws Exception { + public Consumer createConsumer(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 11530a4432552..0c70511a59d71 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,17 +16,21 @@ */ 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 org.apache.camel.support.DefaultProducer { +class MockHttpProducer extends DefaultProducer { - public MockHttpProducer(org.apache.camel.Endpoint endpoint) { + public MockHttpProducer(Endpoint endpoint) { super(endpoint); } @Override - public void process(org.apache.camel.Exchange exchange) throws Exception { + public void process(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 e8597fbfca97f..b731beaa965ad 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,10 +16,12 @@ */ 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 org.apache.camel.telemetry.decorators.AbstractHttpSpanDecorator { +public class MockHttpSpanDecorator extends 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 8ee1a0725ecd6..91dfca301e9dd 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,13 +18,16 @@ 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 org.apache.camel.support.DefaultComponent { +public class MockKafkaComponent extends DefaultComponent { @Override - protected org.apache.camel.Endpoint createEndpoint(String uri, String remaining, Map parameters) + protected 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 c9fcd1d58a7e3..39fc5210d1bb4 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,22 +16,28 @@ */ 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 org.apache.camel.support.DefaultEndpoint { +class MockKafkaEndpoint extends DefaultEndpoint { - public MockKafkaEndpoint(String endpointUri, org.apache.camel.Component component) { + public MockKafkaEndpoint(String endpointUri, Component component) { super(endpointUri, component); } @Override - public org.apache.camel.Producer createProducer() throws Exception { + public Producer createProducer() throws Exception { return new MockKafkaProducer(this); } @Override - public org.apache.camel.Consumer createConsumer(org.apache.camel.Processor processor) throws Exception { + public Consumer createConsumer(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 033993a5d226d..16baf5c1baa19 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,17 +16,21 @@ */ 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 org.apache.camel.support.DefaultProducer { +class MockKafkaProducer extends DefaultProducer { - public MockKafkaProducer(org.apache.camel.Endpoint endpoint) { + public MockKafkaProducer(Endpoint endpoint) { super(endpoint); } @Override - public void process(org.apache.camel.Exchange exchange) throws Exception { + public void process(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 6d0cc534c437f..ae55632843061 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,11 +16,13 @@ */ 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 org.apache.camel.telemetry.decorators.KafkaSpanDecorator { +public class MockKafkaSpanDecorator extends 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 c5a3771c250d0..3bd6d159e22be 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,6 +16,8 @@ */ package org.apache.camel.dataformat.parquet.avro; +import java.util.Objects; + public class Pojo { private long id; private String data; @@ -55,11 +57,11 @@ public boolean equals(Object o) { return false; } Pojo pojo = (Pojo) o; - return id == pojo.id && java.util.Objects.equals(data, pojo.data); + return id == pojo.id && Objects.equals(data, pojo.data); } @Override public int hashCode() { - return java.util.Objects.hash(id, data); + return 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 b44a9a44a1e79..b1704b8d34399 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,6 +19,7 @@ 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; @@ -75,7 +76,7 @@ void shouldStartTriggeredScraperWhenTriggerPresent() throws Exception { // Avoid real connection doNothing().when(endpoint).setupConnection(); doNothing().when(endpoint).reconnectIfNeeded(); - when(endpoint.createExchange()).thenReturn(mock(org.apache.camel.Exchange.class)); + when(endpoint.createExchange()).thenReturn(mock(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 34af21c1c30b7..a637abea3ac58 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,6 +19,7 @@ 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; @@ -291,19 +292,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 { - java.security.KeyFactory kf; + KeyFactory kf; if ("EC".equals(algorithm) || "ECDH".equals(algorithm)) { - kf = java.security.KeyFactory.getInstance("EC"); + kf = KeyFactory.getInstance("EC"); } else if ("X25519".equals(algorithm) || "XDH".equals(algorithm)) { - kf = java.security.KeyFactory.getInstance("X25519"); + kf = KeyFactory.getInstance("X25519"); } else if ("X448".equals(algorithm)) { - kf = java.security.KeyFactory.getInstance("X448"); + kf = KeyFactory.getInstance("X448"); } else { - kf = java.security.KeyFactory.getInstance(algorithm); + kf = KeyFactory.getInstance(algorithm); } - java.security.spec.X509EncodedKeySpec keySpec = new java.security.spec.X509EncodedKeySpec(encoded); + X509EncodedKeySpec keySpec = new 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 36da6ffd19f48..6aba8fb4122ae 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,6 +37,9 @@ 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; @@ -569,46 +572,46 @@ private AlgorithmParameterSpec getDefaultParameterSpec(String algorithm) { try { switch (algorithm) { case "DILITHIUM": - return org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec.dilithium2; + return DilithiumParameterSpec.dilithium2; case "MLDSA": case "SLHDSA": // These use default initialization return null; case "FALCON": - return org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec.falcon_512; + return FalconParameterSpec.falcon_512; case "SPHINCSPLUS": - return org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec.sha2_128s; + return SPHINCSPlusParameterSpec.sha2_128s; case "XMSS": - return new org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec( + return new XMSSParameterSpec( 10, - org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec.SHA256); + XMSSParameterSpec.SHA256); case "XMSSMT": - return org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; + return XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; case "LMS": case "HSS": - 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); + return new LMSKeyGenParameterSpec( + LMSigParameters.lms_sha256_n32_h10, + LMOtsParameters.sha256_n32_w4); case "MLKEM": case "KYBER": // These use default initialization return null; case "NTRU": - return org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec.ntruhps2048509; + return NTRUParameterSpec.ntruhps2048509; case "NTRULPRime": - return org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec.ntrulpr653; + return NTRULPRimeParameterSpec.ntrulpr653; case "SNTRUPrime": - return org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec.sntrup761; + return SNTRUPrimeParameterSpec.sntrup761; case "SABER": - return org.bouncycastle.pqc.jcajce.spec.SABERParameterSpec.lightsaberkem128r3; + return SABERParameterSpec.lightsaberkem128r3; case "FRODO": - return org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec.frodokem640aes; + return FrodoParameterSpec.frodokem640aes; case "BIKE": - return org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec.bike128; + return BIKEParameterSpec.bike128; case "HQC": - return org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec.hqc128; + return HQCParameterSpec.hqc128; case "CMCE": - return org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec.mceliece348864; + return 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 7e9061b8828e5..46b44bde44150 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,6 +48,9 @@ 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; @@ -472,46 +475,46 @@ private AlgorithmParameterSpec getDefaultParameterSpec(String algorithm) { try { switch (algorithm) { case "DILITHIUM": - return org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec.dilithium2; + return DilithiumParameterSpec.dilithium2; case "MLDSA": case "SLHDSA": // These use default initialization return null; case "FALCON": - return org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec.falcon_512; + return FalconParameterSpec.falcon_512; case "SPHINCSPLUS": - return org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec.sha2_128s; + return SPHINCSPlusParameterSpec.sha2_128s; case "XMSS": - return new org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec( + return new XMSSParameterSpec( 10, - org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec.SHA256); + XMSSParameterSpec.SHA256); case "XMSSMT": - return org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; + return XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; case "LMS": case "HSS": - 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); + return new LMSKeyGenParameterSpec( + LMSigParameters.lms_sha256_n32_h10, + LMOtsParameters.sha256_n32_w4); case "MLKEM": case "KYBER": // These use default initialization return null; case "NTRU": - return org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec.ntruhps2048509; + return NTRUParameterSpec.ntruhps2048509; case "NTRULPRime": - return org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec.ntrulpr653; + return NTRULPRimeParameterSpec.ntrulpr653; case "SNTRUPrime": - return org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec.sntrup761; + return SNTRUPrimeParameterSpec.sntrup761; case "SABER": - return org.bouncycastle.pqc.jcajce.spec.SABERParameterSpec.lightsaberkem128r3; + return SABERParameterSpec.lightsaberkem128r3; case "FRODO": - return org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec.frodokem640aes; + return FrodoParameterSpec.frodokem640aes; case "BIKE": - return org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec.bike128; + return BIKEParameterSpec.bike128; case "HQC": - return org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec.hqc128; + return HQCParameterSpec.hqc128; case "CMCE": - return org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec.mceliece348864; + return 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 aef3741f11ac4..5d80fc1373a4f 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,6 +37,9 @@ 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; @@ -595,46 +598,46 @@ private AlgorithmParameterSpec getDefaultParameterSpec(String algorithm) { try { switch (algorithm) { case "DILITHIUM": - return org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec.dilithium2; + return DilithiumParameterSpec.dilithium2; case "MLDSA": case "SLHDSA": // These use default initialization return null; case "FALCON": - return org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec.falcon_512; + return FalconParameterSpec.falcon_512; case "SPHINCSPLUS": - return org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec.sha2_128s; + return SPHINCSPlusParameterSpec.sha2_128s; case "XMSS": - return new org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec( + return new XMSSParameterSpec( 10, - org.bouncycastle.pqc.jcajce.spec.XMSSParameterSpec.SHA256); + XMSSParameterSpec.SHA256); case "XMSSMT": - return org.bouncycastle.pqc.jcajce.spec.XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; + return XMSSMTParameterSpec.XMSSMT_SHA2_20d2_256; case "LMS": case "HSS": - 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); + return new LMSKeyGenParameterSpec( + LMSigParameters.lms_sha256_n32_h10, + LMOtsParameters.sha256_n32_w4); case "MLKEM": case "KYBER": // These use default initialization return null; case "NTRU": - return org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec.ntruhps2048509; + return NTRUParameterSpec.ntruhps2048509; case "NTRULPRime": - return org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec.ntrulpr653; + return NTRULPRimeParameterSpec.ntrulpr653; case "SNTRUPrime": - return org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec.sntrup761; + return SNTRUPrimeParameterSpec.sntrup761; case "SABER": - return org.bouncycastle.pqc.jcajce.spec.SABERParameterSpec.lightsaberkem128r3; + return SABERParameterSpec.lightsaberkem128r3; case "FRODO": - return org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec.frodokem640aes; + return FrodoParameterSpec.frodokem640aes; case "BIKE": - return org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec.bike128; + return BIKEParameterSpec.bike128; case "HQC": - return org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec.hqc128; + return HQCParameterSpec.hqc128; case "CMCE": - return org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec.mceliece348864; + return 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 281b4c6b5a55a..6bac87c69419e 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,6 +17,7 @@ package org.apache.camel.component.pqc.lifecycle; import java.io.Serializable; +import java.time.Duration; import java.time.Instant; /** @@ -132,7 +133,7 @@ public boolean needsRotation() { } public long getAgeInDays() { - return java.time.Duration.between(createdAt, Instant.now()).toDays(); + return 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 4a30e17b54b1a..4d07bd326aa16 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,6 +19,7 @@ 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; @@ -159,7 +160,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(java.time.Instant.now().minusSeconds(1)); + metadata.setNextRotationAt(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 2aa0b76c93dd5..c88f98d1471f5 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,6 +19,7 @@ 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; @@ -153,7 +154,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(java.time.Instant.now().minusSeconds(1)); + metadata.setNextRotationAt(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 f53bff06dbb4b..d2b98676970bb 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 @@ -22,6 +22,8 @@ import java.security.Signature; import org.apache.camel.BindToRegistry; + +import javax.crypto.KeyGenerator; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; @@ -406,8 +408,8 @@ public Signature getSigner() throws Exception { } @BindToRegistry("KeyGenerator") - public javax.crypto.KeyGenerator getKeyGenerator() throws Exception { - return javax.crypto.KeyGenerator.getInstance(PQCKeyEncapsulationAlgorithms.NTRU.getAlgorithm(), + public KeyGenerator getKeyGenerator() throws Exception { + return 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 cf04f5695fb96..842d887f3c829 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,6 +20,7 @@ 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; @@ -178,7 +179,7 @@ void testKeyRotation() throws Exception { assertEquals(KeyMetadata.KeyStatus.ACTIVE, newMetadata.getStatus()); // Keys should be different - assertFalse(java.util.Arrays.equals(oldKeyPair.getPublic().getEncoded(), newKeyPair.getPublic().getEncoded())); + assertFalse(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 dcc04e8780165..f0dfa078ecc65 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 java.security.cert.Certificate[] { certificate }); + keyStore.setKeyEntry("mykey", kp.getPrivate(), password, new 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 0bd8a1f531861..0cd087ce30e8f 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,6 +34,7 @@ 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; @@ -158,8 +159,8 @@ void testKeyExhaustion() throws Exception { } // Now the key should be exhausted - org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey xmssPriv - = (org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey) exhaustionKeyPair.getPrivate(); + XMSSPrivateKey xmssPriv + = (XMSSPrivateKey) exhaustionKeyPair.getPrivate(); assertEquals(0, xmssPriv.getUsagesRemaining(), "Key should be exhausted after 4 signatures with height=2"); } @@ -173,8 +174,8 @@ void testStatefulKeyStateNotExhausted() throws Exception { kpGen.initialize(new XMSSParameterSpec(2, XMSSParameterSpec.SHA256), new SecureRandom()); KeyPair freshKeyPair = kpGen.generateKeyPair(); - org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey xmssPriv - = (org.bouncycastle.pqc.jcajce.interfaces.XMSSPrivateKey) freshKeyPair.getPrivate(); + XMSSPrivateKey xmssPriv + = (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 3928dce00c0b3..fea5ff5989a48 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(javax.print.attribute.standard.Media.class); + Attribute attribute = attributeSet.get(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 578c1bd9c83b9..bf23549bc6a60 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,11 +17,12 @@ package org.apache.camel.routepolicy.quartz; import org.apache.camel.Route; +import org.apache.camel.support.RoutePolicySupport; /** * */ -public class MyRoutePolicy extends org.apache.camel.support.RoutePolicySupport { +public class MyRoutePolicy extends 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 3bcf3cbf73ac0..1519b6c48bec2 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,6 +19,7 @@ import java.util.Map; import org.apache.camel.Endpoint; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; /** @@ -27,7 +28,7 @@ *

* This component uses the ref: notation instead of the mostly common uri: notation. */ -@org.apache.camel.spi.annotations.Component("ref") +@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 6c111e592960c..aa2e1c8dead54 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,6 +48,7 @@ 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; @@ -73,7 +74,7 @@ */ @ManagedResource(description = "Managed Resilience Processor") public class ResilienceProcessor extends BaseProcessorSupport - implements CamelContextAware, Navigate, org.apache.camel.Traceable, IdAware, RouteIdAware { + implements CamelContextAware, Navigate, 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 d90cbfa5597c1..49d5395faa8c0 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,6 +22,7 @@ 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; @@ -587,7 +588,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 java.util.HashSet<>(); + Set operationLevelConsumers = new HashSet<>(); if (operation.getResponses() != null) { for (ApiResponse response : operation.getResponses().values()) { if (response.getContent() != null) { @@ -605,7 +606,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 java.util.HashSet<>(); + Set operationLevelProducers = new HashSet<>(); if (operation.getRequestBody() != null && operation.getRequestBody().getContent() != null) { operationLevelProducers.addAll(operation.getRequestBody().getContent().keySet()); } @@ -747,7 +748,7 @@ String determineHost(final OpenAPI openApi, Operation operation) { } private Set getURIs(List servers) { - Set uris = new java.util.HashSet<>(); + Set uris = new 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 182028aeb009a..551ca73653538 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,6 +25,7 @@ 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; @@ -62,7 +63,7 @@ protected ServerConnector createHttpsConnector( httpConfig.setSendXPoweredBy(false); httpConfig.setSendServerVersion(false); httpConfig.addCustomizer(new SecureRequestCustomizer(false)); - httpConfig.setUriCompliance(org.eclipse.jetty.http.UriCompliance.UNSAFE); + httpConfig.setUriCompliance(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 b8b3279169695..a0858de16e535 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,12 +20,13 @@ 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. */ -@org.apache.camel.spi.annotations.Component("rest-api") +@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 75325668d163a..f91a0f67a8795 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,6 +21,7 @@ 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; @@ -31,7 +32,7 @@ /** * Rest component. */ -@org.apache.camel.spi.annotations.Component("rest") +@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 55f4c0f4f9f8f..e81564e3de43b 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,12 +20,13 @@ 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. */ -@org.apache.camel.spi.annotations.Component("saga") +@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 d1991f25598a8..27cd8e504f089 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,6 +36,8 @@ 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; @@ -193,8 +195,8 @@ void createChangeEventMessage(final Message message, final org.apache.camel.Mess if (rawPayload) { // getJSON is used for raw payload - in.setBody(new org.cometd.common.JacksonJSONContextClient() - .generate(new org.cometd.common.HashMapMessage(message))); + in.setBody(new JacksonJSONContextClient() + .generate(new HashMapMessage(message))); } else { payload.remove("ChangeEventHeader"); in.setBody(payload); @@ -229,8 +231,8 @@ void createPlatformEventMessage(final Message message, final org.apache.camel.Me if (rawPayload) { // getJSON is used for raw payload - in.setBody(new org.cometd.common.JacksonJSONContextClient() - .generate(new org.cometd.common.HashMapMessage(message))); + in.setBody(new JacksonJSONContextClient() + .generate(new 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 cfc5897582e45..f150aca9342b9 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,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.force.com/2009/06/asyncapi/dataload", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://www.force.com/2009/06/asyncapi/dataload", + elementFormDefault = 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 c94f686af54f7..d3224d57c5ecf 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 @@ -38,6 +38,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.fasterxml.jackson.databind.ObjectMapper; + +import javax.security.auth.DestroyFailedException; import org.apache.camel.CamelContext; import org.apache.camel.component.salesforce.AuthenticationType; import org.apache.camel.component.salesforce.SalesforceHttpClient; @@ -293,7 +295,7 @@ String generateJwtAssertion() { // Clean the private key from memory try { key.destroy(); - } catch (javax.security.auth.DestroyFailedException ex) { + } catch (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 5baec200be04c..12de19b43b986 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,6 +31,7 @@ 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; @@ -445,7 +446,7 @@ private T unmarshalResponse(InputStream response, Request request, Class SAXParserFactory spf = SAXParserFactory.newInstance(); spf.setNamespaceAware(true); try { - spf.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); + spf.setFeature(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 d46cfee49c91d..cfc9733a47812 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,20 +21,35 @@ */ 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; -@org.apache.avro.specific.AvroGenerated -public class CamelEventMessage__e extends org.apache.avro.specific.SpecificRecordBase { +@AvroGenerated +public class CamelEventMessage__e extends SpecificRecordBase { private static final long serialVersionUID = 4603183847267960866L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse( + public static final Schema SCHEMA$ = new 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 org.apache.avro.Schema getClassSchema() { + public static Schema getClassSchema() { return SCHEMA$; } @@ -78,7 +93,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 java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { + public ByteBuffer toByteBuffer() throws IOException { return ENCODER.encode(this); } @@ -90,8 +105,8 @@ public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { * @throws java.io.IOException if the given bytes could not be deserialized into an instance of this class */ public static CamelEventMessage__e fromByteBuffer( - java.nio.ByteBuffer b) - throws java.io.IOException { + ByteBuffer b) + throws IOException { return DECODER.decode(b); } @@ -128,7 +143,7 @@ public SpecificData getSpecificData() { } @Override - public org.apache.avro.Schema getSchema() { + public Schema getSchema() { return SCHEMA$; } @@ -259,8 +274,8 @@ public static Builder newBuilder(CamelEventMessage__e other) { /** * RecordBuilder for CamelEventMessage__e instances. */ - @org.apache.avro.specific.AvroGenerated - public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase { + @AvroGenerated + public static class Builder extends SpecificRecordBuilderBase { /** CreatedDate:DateTime */ private long CreatedDate; @@ -449,31 +464,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 (org.apache.avro.AvroMissingFieldException e) { + } catch (AvroMissingFieldException e) { throw e; } catch (Exception e) { - throw new org.apache.avro.AvroRuntimeException(e); + throw new AvroRuntimeException(e); } } } @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumWriter WRITER$ - = (org.apache.avro.io.DatumWriter) MODEL$.createDatumWriter(SCHEMA$); + private static final DatumWriter WRITER$ + = (DatumWriter) MODEL$.createDatumWriter(SCHEMA$); @Override - public void writeExternal(java.io.ObjectOutput out) - throws java.io.IOException { + public void writeExternal(ObjectOutput out) + throws IOException { WRITER$.write(this, SpecificData.getEncoder(out)); } @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumReader READER$ - = (org.apache.avro.io.DatumReader) MODEL$.createDatumReader(SCHEMA$); + private static final DatumReader READER$ + = (DatumReader) MODEL$.createDatumReader(SCHEMA$); @Override - public void readExternal(java.io.ObjectInput in) - throws java.io.IOException { + public void readExternal(ObjectInput in) + throws IOException { READER$.read(this, SpecificData.getDecoder(in)); } @@ -483,8 +498,8 @@ protected boolean hasCustomCoders() { } @Override - public void customEncode(org.apache.avro.io.Encoder out) - throws java.io.IOException { + public void customEncode(Encoder out) + throws IOException { out.writeLong(this.CreatedDate); out.writeString(this.CreatedById); @@ -500,9 +515,9 @@ public void customEncode(org.apache.avro.io.Encoder out) } @Override - public void customDecode(org.apache.avro.io.ResolvingDecoder in) - throws java.io.IOException { - org.apache.avro.Schema.Field[] fieldOrder = in.readFieldOrderIfDiff(); + public void customDecode(ResolvingDecoder in) + throws IOException { + Schema.Field[] fieldOrder = in.readFieldOrderIfDiff(); if (fieldOrder == null) { this.CreatedDate = in.readLong(); @@ -536,7 +551,7 @@ public void customDecode(org.apache.avro.io.ResolvingDecoder in) break; default: - throw new java.io.IOException("Corrupt ResolvingDecoder."); + throw new 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 758b6402afe4e..6ed05ad52eb43 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,6 +35,7 @@ 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; @@ -276,8 +277,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 org.cometd.common.JacksonJSONContextClient() - .generate(new org.cometd.common.HashMapMessage(message))); + verify(in).setBody(new JacksonJSONContextClient() + .generate(new 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"); @@ -341,8 +342,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 org.cometd.common.JacksonJSONContextClient() - .generate(new org.cometd.common.HashMapMessage(mockChangeEvent))); + verify(in).setBody(new JacksonJSONContextClient() + .generate(new 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 1ac546a6408b9..bdd3aaf735732 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,6 +21,8 @@ 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; @@ -163,15 +165,15 @@ public void setBillingLongitude(Double BillingLongitude) { this.BillingLongitude = BillingLongitude; } - private org.apache.camel.component.salesforce.api.dto.Address BillingAddress; + private Address BillingAddress; @JsonProperty("BillingAddress") - public org.apache.camel.component.salesforce.api.dto.Address getBillingAddress() { + public Address getBillingAddress() { return this.BillingAddress; } @JsonProperty("BillingAddress") - public void setBillingAddress(org.apache.camel.component.salesforce.api.dto.Address BillingAddress) { + public void setBillingAddress(Address BillingAddress) { this.BillingAddress = BillingAddress; } @@ -259,15 +261,15 @@ public void setShippingLongitude(Double ShippingLongitude) { this.ShippingLongitude = ShippingLongitude; } - private org.apache.camel.component.salesforce.api.dto.Address ShippingAddress; + private Address ShippingAddress; @JsonProperty("ShippingAddress") - public org.apache.camel.component.salesforce.api.dto.Address getShippingAddress() { + public Address getShippingAddress() { return this.ShippingAddress; } @JsonProperty("ShippingAddress") - public void setShippingAddress(org.apache.camel.component.salesforce.api.dto.Address ShippingAddress) { + public void setShippingAddress(Address ShippingAddress) { this.ShippingAddress = ShippingAddress; } @@ -559,15 +561,15 @@ public void setShipping_Location__Longitude__s(Double Shipping_Location__Longitu this.Shipping_Location__Longitude__s = Shipping_Location__Longitude__s; } - private org.apache.camel.component.salesforce.api.dto.GeoLocation Shipping_Location__c; + private GeoLocation Shipping_Location__c; @JsonProperty("Shipping_Location__c") - public org.apache.camel.component.salesforce.api.dto.GeoLocation getShipping_Location__c() { + public GeoLocation getShipping_Location__c() { return this.Shipping_Location__c; } @JsonProperty("Shipping_Location__c") - public void setShipping_Location__c(org.apache.camel.component.salesforce.api.dto.GeoLocation Shipping_Location__c) { + public void setShipping_Location__c(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 02aae843b0f43..f1e8bc59fbe02 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,6 +16,9 @@ */ 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; @@ -94,41 +97,41 @@ public void setSerialNumber(String SerialNumber) { } // InstallDate - private java.time.ZonedDateTime InstallDate; + private ZonedDateTime InstallDate; @JsonProperty("InstallDate") - public java.time.ZonedDateTime getInstallDate() { + public ZonedDateTime getInstallDate() { return this.InstallDate; } @JsonProperty("InstallDate") - public void setInstallDate(java.time.ZonedDateTime InstallDate) { + public void setInstallDate(ZonedDateTime InstallDate) { this.InstallDate = InstallDate; } // PurchaseDate - private java.time.ZonedDateTime PurchaseDate; + private ZonedDateTime PurchaseDate; @JsonProperty("PurchaseDate") - public java.time.ZonedDateTime getPurchaseDate() { + public ZonedDateTime getPurchaseDate() { return this.PurchaseDate; } @JsonProperty("PurchaseDate") - public void setPurchaseDate(java.time.ZonedDateTime PurchaseDate) { + public void setPurchaseDate(ZonedDateTime PurchaseDate) { this.PurchaseDate = PurchaseDate; } // UsageEndDate - private java.time.ZonedDateTime UsageEndDate; + private ZonedDateTime UsageEndDate; @JsonProperty("UsageEndDate") - public java.time.ZonedDateTime getUsageEndDate() { + public ZonedDateTime getUsageEndDate() { return this.UsageEndDate; } @JsonProperty("UsageEndDate") - public void setUsageEndDate(java.time.ZonedDateTime UsageEndDate) { + public void setUsageEndDate(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 f4fdf4398cae5..f5f772a295116 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,11 +16,14 @@ */ 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; @@ -192,15 +195,15 @@ public void setOtherLongitude(Double OtherLongitude) { this.OtherLongitude = OtherLongitude; } - private org.apache.camel.component.salesforce.api.dto.Address OtherAddress; + private Address OtherAddress; @JsonProperty("OtherAddress") - public org.apache.camel.component.salesforce.api.dto.Address getOtherAddress() { + public Address getOtherAddress() { return this.OtherAddress; } @JsonProperty("OtherAddress") - public void setOtherAddress(org.apache.camel.component.salesforce.api.dto.Address OtherAddress) { + public void setOtherAddress(Address OtherAddress) { this.OtherAddress = OtherAddress; } @@ -288,15 +291,15 @@ public void setMailingLongitude(Double MailingLongitude) { this.MailingLongitude = MailingLongitude; } - private org.apache.camel.component.salesforce.api.dto.Address MailingAddress; + private Address MailingAddress; @JsonProperty("MailingAddress") - public org.apache.camel.component.salesforce.api.dto.Address getMailingAddress() { + public Address getMailingAddress() { return this.MailingAddress; } @JsonProperty("MailingAddress") - public void setMailingAddress(org.apache.camel.component.salesforce.api.dto.Address MailingAddress) { + public void setMailingAddress(Address MailingAddress) { this.MailingAddress = MailingAddress; } @@ -444,15 +447,15 @@ public void setAssistantName(String AssistantName) { this.AssistantName = AssistantName; } - private java.time.LocalDate Birthdate; + private LocalDate Birthdate; @JsonProperty("Birthdate") - public java.time.LocalDate getBirthdate() { + public LocalDate getBirthdate() { return this.Birthdate; } @JsonProperty("Birthdate") - public void setBirthdate(java.time.LocalDate Birthdate) { + public void setBirthdate(LocalDate Birthdate) { this.Birthdate = Birthdate; } @@ -468,27 +471,27 @@ public void setDescription(String Description) { this.Description = Description; } - private java.time.ZonedDateTime LastCURequestDate; + private ZonedDateTime LastCURequestDate; @JsonProperty("LastCURequestDate") - public java.time.ZonedDateTime getLastCURequestDate() { + public ZonedDateTime getLastCURequestDate() { return this.LastCURequestDate; } @JsonProperty("LastCURequestDate") - public void setLastCURequestDate(java.time.ZonedDateTime LastCURequestDate) { + public void setLastCURequestDate(ZonedDateTime LastCURequestDate) { this.LastCURequestDate = LastCURequestDate; } - private java.time.ZonedDateTime LastCUUpdateDate; + private ZonedDateTime LastCUUpdateDate; @JsonProperty("LastCUUpdateDate") - public java.time.ZonedDateTime getLastCUUpdateDate() { + public ZonedDateTime getLastCUUpdateDate() { return this.LastCUUpdateDate; } @JsonProperty("LastCUUpdateDate") - public void setLastCUUpdateDate(java.time.ZonedDateTime LastCUUpdateDate) { + public void setLastCUUpdateDate(ZonedDateTime LastCUUpdateDate) { this.LastCUUpdateDate = LastCUUpdateDate; } @@ -504,15 +507,15 @@ public void setEmailBouncedReason(String EmailBouncedReason) { this.EmailBouncedReason = EmailBouncedReason; } - private java.time.ZonedDateTime EmailBouncedDate; + private ZonedDateTime EmailBouncedDate; @JsonProperty("EmailBouncedDate") - public java.time.ZonedDateTime getEmailBouncedDate() { + public ZonedDateTime getEmailBouncedDate() { return this.EmailBouncedDate; } @JsonProperty("EmailBouncedDate") - public void setEmailBouncedDate(java.time.ZonedDateTime EmailBouncedDate) { + public void setEmailBouncedDate(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 bd78c320f1a27..9e70e5475c4f1 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,6 +20,8 @@ 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; @@ -165,27 +167,27 @@ public void setReasonForChange(String ReasonForChange) { this.ReasonForChange = ReasonForChange; } - private java.lang.String SharingOption; + private String SharingOption; @JsonProperty("SharingOption") - public java.lang.String getSharingOption() { + public String getSharingOption() { return this.SharingOption; } @JsonProperty("SharingOption") - public void setSharingOption(java.lang.String SharingOption) { + public void setSharingOption(String SharingOption) { this.SharingOption = SharingOption; } - private java.lang.String SharingPrivacy; + private String SharingPrivacy; @JsonProperty("SharingPrivacy") - public java.lang.String getSharingPrivacy() { + public String getSharingPrivacy() { return this.SharingPrivacy; } @JsonProperty("SharingPrivacy") - public void setSharingPrivacy(java.lang.String SharingPrivacy) { + public void setSharingPrivacy(String SharingPrivacy) { this.SharingPrivacy = SharingPrivacy; } @@ -213,15 +215,15 @@ public void setRatingCount(Integer RatingCount) { this.RatingCount = RatingCount; } - private java.time.ZonedDateTime ContentModifiedDate; + private ZonedDateTime ContentModifiedDate; @JsonProperty("ContentModifiedDate") - public java.time.ZonedDateTime getContentModifiedDate() { + public ZonedDateTime getContentModifiedDate() { return this.ContentModifiedDate; } @JsonProperty("ContentModifiedDate") - public void setContentModifiedDate(java.time.ZonedDateTime ContentModifiedDate) { + public void setContentModifiedDate(ZonedDateTime ContentModifiedDate) { this.ContentModifiedDate = ContentModifiedDate; } @@ -284,15 +286,15 @@ public void setFeaturedContentBoost(Integer FeaturedContentBoost) { this.FeaturedContentBoost = FeaturedContentBoost; } - private java.time.LocalDate FeaturedContentDate; + private LocalDate FeaturedContentDate; @JsonProperty("FeaturedContentDate") - public java.time.LocalDate getFeaturedContentDate() { + public LocalDate getFeaturedContentDate() { return this.FeaturedContentDate; } @JsonProperty("FeaturedContentDate") - public void setFeaturedContentDate(java.time.LocalDate FeaturedContentDate) { + public void setFeaturedContentDate(LocalDate FeaturedContentDate) { this.FeaturedContentDate = FeaturedContentDate; } @@ -353,15 +355,15 @@ public void setFileType(String FileType) { this.FileType = FileType; } - private java.lang.String PublishStatus; + private String PublishStatus; @JsonProperty("PublishStatus") - public java.lang.String getPublishStatus() { + public String getPublishStatus() { return this.PublishStatus; } @JsonProperty("PublishStatus") - public void setPublishStatus(java.lang.String PublishStatus) { + public void setPublishStatus(String PublishStatus) { this.PublishStatus = PublishStatus; } @@ -458,27 +460,27 @@ public AbstractDescribedSObjectBase getFirstPublishLocation() { public void setFirstPublishLocation(AbstractDescribedSObjectBase FirstPublishLocation) { this.FirstPublishLocation = FirstPublishLocation; } - private java.lang.String Origin; + private String Origin; @JsonProperty("Origin") - public java.lang.String getOrigin() { + public String getOrigin() { return this.Origin; } @JsonProperty("Origin") - public void setOrigin(java.lang.String Origin) { + public void setOrigin(String Origin) { this.Origin = Origin; } - private java.lang.String ContentLocation; + private String ContentLocation; @JsonProperty("ContentLocation") - public java.lang.String getContentLocation() { + public String getContentLocation() { return this.ContentLocation; } @JsonProperty("ContentLocation") - public void setContentLocation(java.lang.String ContentLocation) { + public void setContentLocation(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 e85fe5231e635..b794a94269b33 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 net.sf.saxon.xpath.XPathFactoryImpl(); + XPathFactory fac = new 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 52cdbe76311c5..b68ec4b1155e9 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,9 +24,10 @@ import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; +import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.HealthCheckComponent; -@org.apache.camel.spi.annotations.Component("scheduler") +@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 8f7d2c1a8f97a..417d356bf06dc 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,6 +23,8 @@ import javax.xml.transform.URIResolver; import javax.xml.transform.stream.StreamSource; +import org.apache.camel.util.ObjectHelper; + /** * Class path resolver for schematron templates */ @@ -42,7 +44,7 @@ public ClassPathURIResolver(final String rulesDir, URIResolver clientUriResolver @Override public Source resolve(String href, String base) throws TransformerException { InputStream stream - = org.apache.camel.util.ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href), + = 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 e8861841a15f6..4465c2f7467ce 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,6 +16,7 @@ */ 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; @@ -58,7 +59,7 @@ public static SchematronProcessor newSchematronEngine(final Templates rules) { */ private static XMLReader getXMLReader() throws ParserConfigurationException, SAXException { final SAXParserFactory fac = SAXParserFactory.newInstance(); - fac.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); + fac.setFeature(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 4af50b0c4e2dc..29dfe0bf3fc6c 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 @@ -25,7 +25,7 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; - +import org.apache.camel.util.ObjectHelper; import org.w3c.dom.Node; import org.apache.camel.component.schematron.constant.Constants; @@ -61,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 = org.apache.camel.util.ObjectHelper.loadResourceAsStream(path); + InputStream xsl = 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 45f4bbdb2bada..22d8701cc9d98 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,6 +28,7 @@ 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; @@ -105,7 +106,7 @@ class ClientUriResolver implements URIResolver { @Override public Source resolve(String href, String base) throws TransformerException { return new StreamSource( - org.apache.camel.util.ObjectHelper.loadResourceAsStream("custom-resolver/".concat(href))); + 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 78723c7147596..702810843227a 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,6 +16,8 @@ */ 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; @@ -123,9 +125,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 java.util.ArrayList()); - from("direct:v2country").transform().constant(new java.util.ArrayList()); - from("direct:v3country").transform().constant(new java.util.ArrayList()); + from("direct:v1country").transform().constant(new ArrayList()); + from("direct:v2country").transform().constant(new ArrayList()); + from("direct:v3country").transform().constant(new 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 65ee18339a894..2efb75e383371 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,6 +16,8 @@ */ 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; @@ -122,9 +124,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 java.util.ArrayList()); - from("direct:v2country").transform().constant(new java.util.ArrayList()); - from("direct:v3country").transform().constant(new java.util.ArrayList()); + from("direct:v1country").transform().constant(new ArrayList()); + from("direct:v2country").transform().constant(new ArrayList()); + from("direct:v3country").transform().constant(new 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 f51af48dfd28d..8d7fcb29fb9f5 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,11 +17,13 @@ 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 { @@ -76,7 +78,7 @@ public static void closeConsumer(MessageConsumer consumer) { public static void commitIfNecessary(Session session) throws JMSException { try { session.commit(); - } catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { + } catch (TransactionInProgressException | IllegalStateException ex) { // ignore } } @@ -88,7 +90,7 @@ public static void commitIfNeeded(Session session, Message message) throws Excep } else if (message != null && session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) { message.acknowledge(); } - } catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { + } catch (TransactionInProgressException | IllegalStateException ex) { // ignore } } @@ -97,13 +99,13 @@ public static void rollbackIfNeeded(Session session) throws JMSException { if (session.getTransacted()) { try { session.rollback(); - } catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { + } catch (TransactionInProgressException | IllegalStateException ex) { // ignore } } else if (session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE) { try { session.recover(); - } catch (jakarta.jms.IllegalStateException ex) { + } catch (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 886c530c5b7eb..43b1656488e4a 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,6 +27,7 @@ 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; @@ -34,6 +35,7 @@ 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; @@ -48,7 +50,7 @@ import static org.apache.camel.component.sjms.SjmsHelper.*; public class SimpleMessageListenerContainer extends ServiceSupport - implements org.apache.camel.component.sjms.MessageListenerContainer, ExceptionListener { + implements MessageListenerContainer, ExceptionListener { private static final Logger LOG = LoggerFactory.getLogger(SimpleMessageListenerContainer.class); @@ -366,7 +368,7 @@ protected void startConnection() throws Exception { if (this.connection != null) { try { this.connection.start(); - } catch (jakarta.jms.IllegalStateException e) { + } catch (IllegalStateException e) { // ignore as it may already be started } } 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 63543feac39f3..69f46d68d08e1 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,6 +19,7 @@ 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; @@ -371,7 +372,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 - java.nio.file.Files.copy(is, temp.toPath(), StandardCopyOption.REPLACE_EXISTING); + 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 93b8c613bcbbe..870b969985a77 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,6 +16,7 @@ */ package org.apache.camel.component.smb; +import java.net.URI; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -114,7 +115,7 @@ protected GenericFileEndpoint buildFileEndpoint( // Replicate parent logic to build configuration String baseUri = getBaseUri(uri); - SmbConfiguration config = new SmbConfiguration(new java.net.URI(baseUri)); + SmbConfiguration config = new SmbConfiguration(new 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 eef83dc371947..360cd0f7e1524 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,6 +18,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.Arrays; import org.apache.camel.Message; import org.jsmpp.bean.Alphabet; @@ -54,7 +55,7 @@ protected byte[][] splitBody(Message message) throws SmppException { case ALLOW: return segments; case TRUNCATE: - return new byte[][] { java.util.Arrays.copyOfRange(shortMessage, 0, segments[0].length) }; + return new byte[][] { 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 f48d08e2a8f68..a3e0eeb0d343e 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,6 +26,7 @@ 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; @@ -146,8 +147,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 jakarta.xml.ws.Holder) { - jakarta.xml.ws.Holder holder = (jakarta.xml.ws.Holder) fromObj; + if (fromObj instanceof Holder) { + Holder holder = (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 d00a1aee6df72..e5691e7661a0a 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,6 +22,7 @@ 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; @@ -115,7 +116,7 @@ public void testMultiPart() { com.example.customerservice.multipart.GetCustomersByName.class); QName custTypeQName = strategy.findQNameForSoapActionOrType("http://multipart.customerservice.example.com/getCustomersByName", - com.example.customerservice.multipart.Product.class); + 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 44c51fcbc3505..6a62e1beb6cee 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,5 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "baz", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "baz", elementFormDefault = 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 47903af844e6f..169ac23adb236 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,6 +26,7 @@ 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; @@ -216,7 +217,7 @@ public void indexSingleDocumentOnlyWithId() { public void caughtSolrExceptionIsHandledElegantly() { // empty request Exchange exchange = executeInsertFor(null, Map.of(), false); - assertInstanceOf(org.apache.camel.InvalidPayloadException.class, exchange.getException()); + assertInstanceOf(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 2e73ba8a9f286..72f5b3b4f450e 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,6 +28,7 @@ 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; @@ -108,7 +109,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(org.apache.hc.core5.http.HttpVersion.HTTP_1_1); + when(mockResponse.getVersion()).thenReturn(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 322f1cd427c70..f864bce025637 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 java.util.HashMap<>(); + Map metadataMap = new 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 81769a8c3e4ce..5054f31f783e1 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,6 +16,9 @@ */ 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; @@ -45,7 +48,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(java.util.List.of(generation)); + ChatResponse chatResponse = new ChatResponse(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 b29c6a63b4442..201eb62fc8f09 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,6 +18,7 @@ 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; @@ -42,7 +43,7 @@ public class SpringAiChatToolsIntegrationIT extends OllamaTestSupport { @Test public void testToolsAreRegistered() throws Exception { // Verify that tools are registered in the cache before testing - var toolCache = org.apache.camel.component.springai.tools.spec.CamelToolExecutorCache.getInstance(); + var toolCache = 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 ad2ca8efad684..636ca36f7d0b6 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,12 +18,14 @@ 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; @@ -57,7 +59,7 @@ protected String modelName() { } @Override - protected org.springframework.ai.chat.model.ChatModel createModel() { + protected ChatModel createModel() { OllamaApi ollamaApi = OllamaApi.builder() .baseUrl(OLLAMA.baseUrl()) .build(); @@ -162,7 +164,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(org.apache.camel.Exchange.FILE_CONTENT_TYPE, constant("image/png")) + .setHeader(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 704f051553071..046f074da3c7f 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,6 +20,7 @@ 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; @@ -83,7 +84,7 @@ protected void setupResources() throws Exception { // Add a Jackson converter that supports this media type. MappingJackson2HttpMessageConverter ndjsonConverter = new MappingJackson2HttpMessageConverter(); ndjsonConverter.setSupportedMediaTypes( - java.util.List.of(MediaType.APPLICATION_JSON, MediaType.valueOf("application/x-ndjson"))); + 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 21e1209f1544e..317f49abf8ce5 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,12 +20,14 @@ 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; @@ -121,11 +123,11 @@ public Consumer createConsumer(Processor processor) throws Exception { configureConsumer(springAiToolsConsumer); // Create a function that executes the Camel route - java.util.function.Function, String> function = args -> { + Function, String> function = args -> { try { - org.apache.camel.Exchange exchange = createExchange(); + Exchange exchange = createExchange(); // Set arguments as headers - for (java.util.Map.Entry entry : args.entrySet()) { + for (Map.Entry entry : args.entrySet()) { exchange.getMessage().setHeader(entry.getKey(), entry.getValue()); } @@ -149,9 +151,9 @@ public Consumer createConsumer(Processor processor) throws Exception { // Build JSON schema from parameters map String inputSchema = buildJsonSchemaFromParameters(parameters); builder.inputSchema(inputSchema); - builder.inputType(java.util.Map.class); + builder.inputType(Map.class); } else { - builder.inputType(java.util.Map.class); + builder.inputType(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 e8b777ada8e71..f9eaac6cc477e 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,7 +17,9 @@ 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; @@ -144,7 +146,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) { - java.util.Map metadata = new java.util.HashMap<>(); + Map metadata = new 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 b65256079b696..19de852251507 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,6 +18,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Message; @@ -278,9 +279,9 @@ public void testSimilaritySearchWithTopKAndThreshold() { @Test public void testDeleteDocuments() { // Add some documents first - 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()); + 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()); vectorStore.add(List.of(doc1, doc2, doc3)); @@ -313,8 +314,8 @@ public void testDeleteDocuments() { @Test public void testDeleteDocumentsWithBodyAsList() { // Add some documents first - Document doc1 = new Document("doc-10", "Document A", java.util.Map.of()); - Document doc2 = new Document("doc-20", "Document B", java.util.Map.of()); + Document doc1 = new Document("doc-10", "Document A", Map.of()); + Document doc2 = new Document("doc-20", "Document B", Map.of()); vectorStore.add(List.of(doc1, doc2)); @@ -331,7 +332,7 @@ public void testDeleteDocumentsWithBodyAsList() { @Test public void testDeleteSingleDocumentWithBodyAsString() { // Add a document - Document doc = new Document("doc-single", "Single document to delete", java.util.Map.of()); + Document doc = new Document("doc-single", "Single document to delete", 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 63043affb1232..0e766a9ea589a 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,6 +22,9 @@ // Generated on: 2017.02.12 at 12:58:35 AM EET // -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://javacrumbs.net/calc", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://javacrumbs.net/calc", + elementFormDefault = 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 4b0c0e35b489a..2abe89cc84bfa 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,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.stockquotes.edu/", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://www.stockquotes.edu/", + elementFormDefault = 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 c77d2653fcf38..bce06d915dc52 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,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 5a26806044da8..5d8703729f68c 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,9 +19,10 @@ 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 = org.springframework.transaction.annotation.Propagation.NEVER, readOnly = true) +@Transactional(propagation = 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 e9c93df89934b..d9b305dabde1a 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,6 +18,7 @@ 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; @@ -39,7 +40,7 @@ protected AbstractXmlApplicationContext createApplicationContext() { return new ClassPathXmlApplicationContext("org/apache/camel/spring/processor/SpringCustomExpressionTest.xml"); } - public static class MyExpression extends org.apache.camel.support.ExpressionAdapter { + public static class MyExpression extends 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 213eafcc84d5a..788c731398bf5 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 org.apache.camel.spring.scan.ScanTestSupport { +public class DefaultPackageScanClassResolverTest extends ScanTestSupport { private DefaultPackageScanClassResolver resolver; private Set> annotations = new HashSet<>(); @@ -42,16 +42,16 @@ public class DefaultPackageScanClassResolverTest extends org.apache.camel.spring public void setUp() throws Exception { super.setUp(); resolver = new DefaultPackageScanClassResolver(); - annotations.add(org.apache.camel.spring.scan.ScannableOne.class); - annotations.add(org.apache.camel.spring.scan.ScannableTwo.class); + annotations.add(ScannableOne.class); + annotations.add(ScannableTwo.class); } @Test public void testFindByAnnotationWithoutExtraFilters() { - Set> scanned = resolver.findAnnotated(org.apache.camel.spring.scan.ScannableOne.class, scanPackage); + Set> scanned = resolver.findAnnotated(ScannableOne.class, scanPackage); validateMatchingSetContains(scanned, ScanTargetOne.class, ScanTargetTwo.class); - scanned = resolver.findAnnotated(org.apache.camel.spring.scan.ScannableTwo.class, scanPackage); + scanned = resolver.findAnnotated(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(org.apache.camel.spring.scan.ScannableOne.class, scanPackage); + Set> scanned = resolver.findAnnotated(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(org.apache.camel.spring.scan.ScannableTwo.class, scanPackage); + scanned = resolver.findAnnotated(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 6fb8ba61f5c38..44c0a9b0515be 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(org.apache.camel.spring.scan.ScannableOne.class); - annotations.add(org.apache.camel.spring.scan.ScannableTwo.class); + annotations.add(ScannableOne.class); + annotations.add(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(org.apache.camel.spring.scan.ScannableOne.class); + = new AnnotatedWithPackageScanFilter(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(org.apache.camel.spring.scan.ScannableOne.class); + PackageScanFilter one = new AnnotatedWithPackageScanFilter(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 96b86dc3bad09..9d668e285bdb0 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 org.apache.camel.spring.scan.ScanTestSupport { +public class PatternBasedPackageScanFilterTest extends 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 94b73d28f8471..9d874dc19d7b6 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,7 +16,9 @@ */ package org.apache.camel.spring.scan.a; -@org.apache.camel.spring.scan.ScannableOne +import org.apache.camel.spring.scan.ScannableOne; + +@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 81938cfad7cb1..74e68a509facd 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) { - javax.xml.stream.Location location = reader.getLocation(); + 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 ca08870b82df1..4f7a55aacefd7 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,6 +28,7 @@ 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; @@ -154,7 +155,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, org.eclipse.tahu.message.model.Message tahuMessage) { + void onMessageConsumer(EdgeNodeDescriptor edgeNodeDescriptor, 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 1b70cda0589b1..0029e12e72716 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,6 +18,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -128,7 +129,7 @@ private DevSpanAdapter getWithParent(String parentSpanId) { } } -class SpanComparator implements java.util.Comparator { +class SpanComparator implements 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 2fddd744621cd..6244157eab182 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,6 +18,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; import org.apache.camel.telemetry.Span; @@ -45,7 +46,7 @@ public String toString() { } -class SpanComparator implements java.util.Comparator { +class SpanComparator implements 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 ce27c03d497bc..1c4b2e5db6133 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 java.util.stream.Stream provideTestTemplateInvocationContexts( + public Stream provideTestTemplateInvocationContexts( ExtensionContext extensionContext) { Class testClass = extensionContext.getRequiredTestClass(); try { @@ -70,7 +70,7 @@ public java.util.stream.Stream provideTestTemplat } private List getParametersMethods(Class testClass) { - List parameters = java.util.stream.Stream.of(testClass.getDeclaredMethods()) + List parameters = 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 + "] " - + java.util.stream.Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); + + Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); } @Override - public java.util.List getAdditionalExtensions() { + public List getAdditionalExtensions() { return List.of( (TestInstancePostProcessor) this::postProcessTestInstance); } protected void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception { Class clazz = testInstance.getClass(); - java.util.List fields = hierarchy(clazz) + 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 881eaa8f9063f..dc43881300033 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 java.util.stream.Stream provideTestTemplateInvocationContexts( + public Stream provideTestTemplateInvocationContexts( ExtensionContext extensionContext) { Class testClass = extensionContext.getRequiredTestClass(); try { @@ -70,7 +70,7 @@ public java.util.stream.Stream provideTestTemplat } private List getParametersMethods(Class testClass) { - List parameters = java.util.stream.Stream.of(testClass.getDeclaredMethods()) + List parameters = 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 + "] " - + java.util.stream.Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); + + Stream.of(params).map(Object::toString).collect(Collectors.joining(", ")); } @Override - public java.util.List getAdditionalExtensions() { + public List getAdditionalExtensions() { return List.of( (TestInstancePostProcessor) this::postProcessTestInstance); } protected void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception { Class clazz = testInstance.getClass(); - java.util.List fields = hierarchy(clazz) + 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 a1fc9d7fc9938..0b6aac569a1fe 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,7 +22,78 @@ */ package org.apache.camel.component.thrift.generated; -@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +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") @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public class Calculator { @@ -37,24 +108,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 org.apache.thrift.TException; + public void ping() throws TException; - public int add(int num1, int num2) throws org.apache.thrift.TException; + public int add(int num1, int num2) throws TException; - public int calculate(int logid, Work w) throws InvalidOperation, org.apache.thrift.TException; + public int calculate(int logid, Work w) throws InvalidOperation, 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 org.apache.thrift.TException; + public void zip() throws TException; /** * This method echoed input object as return value. * * @param w */ - public Work echo(Work w) throws org.apache.thrift.TException; + public Work echo(Work w) throws TException; /** * This method contains all possible simple, special, struct and container types as input parameters @@ -73,115 +144,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, java.nio.ByteBuffer v8, Work v9, - java.util.List v10, java.util.Set v11, - java.util.Map v12) - throws org.apache.thrift.TException; + 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; } public interface AsyncIface { - public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void ping(AsyncMethodCallback resultHandler) throws TException; - public void add(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException; + public void add(int num1, int num2, AsyncMethodCallback resultHandler) + throws TException; - public void calculate(int logid, Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException; + public void calculate(int logid, Work w, AsyncMethodCallback resultHandler) + throws TException; - public void zip(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void zip(AsyncMethodCallback resultHandler) throws TException; - public void echo(Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException; + public void echo(Work w, AsyncMethodCallback resultHandler) + throws TException; public void alltypes( - 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; + 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; } - public static class Client extends org.apache.thrift.TServiceClient implements Iface { - public static class Factory implements org.apache.thrift.TServiceClientFactory { + public static class Client extends TServiceClient implements Iface { + public static class Factory implements TServiceClientFactory { public Factory() { } @Override - public Client getClient(org.apache.thrift.protocol.TProtocol prot) { + public Client getClient(TProtocol prot) { return new Client(prot); } @Override - public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { + public Client getClient(TProtocol iprot, TProtocol oprot) { return new Client(iprot, oprot); } } - public Client(org.apache.thrift.protocol.TProtocol prot) { + public Client(TProtocol prot) { super(prot, prot); } - public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { + public Client(TProtocol iprot, TProtocol oprot) { super(iprot, oprot); } @Override - public void ping() throws org.apache.thrift.TException { + public void ping() throws TException { send_ping(); recv_ping(); } - public void send_ping() throws org.apache.thrift.TException { + public void send_ping() throws TException { ping_args args = new ping_args(); sendBase("ping", args); } - public void recv_ping() throws org.apache.thrift.TException { + public void recv_ping() throws TException { ping_result result = new ping_result(); receiveBase(result, "ping"); return; } @Override - public int add(int num1, int num2) throws org.apache.thrift.TException { + public int add(int num1, int num2) throws TException { send_add(num1, num2); return recv_add(); } - public void send_add(int num1, int num2) throws org.apache.thrift.TException { + public void send_add(int num1, int num2) throws TException { add_args args = new add_args(); args.setNum1(num1); args.setNum2(num2); sendBase("add", args); } - public int recv_add() throws org.apache.thrift.TException { + public int recv_add() throws TException { add_result result = new add_result(); receiveBase(result, "add"); if (result.isSetSuccess()) { return result.success; } - throw new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.MISSING_RESULT, "add failed: unknown result"); + throw new TApplicationException( + TApplicationException.MISSING_RESULT, "add failed: unknown result"); } @Override - public int calculate(int logid, Work w) throws InvalidOperation, org.apache.thrift.TException { + public int calculate(int logid, Work w) throws InvalidOperation, TException { send_calculate(logid, w); return recv_calculate(); } - public void send_calculate(int logid, Work w) throws org.apache.thrift.TException { + public void send_calculate(int logid, Work w) throws TException { calculate_args args = new calculate_args(); args.setLogid(logid); args.setW(w); sendBase("calculate", args); } - public int recv_calculate() throws InvalidOperation, org.apache.thrift.TException { + public int recv_calculate() throws InvalidOperation, TException { calculate_result result = new calculate_result(); receiveBase(result, "calculate"); if (result.isSetSuccess()) { @@ -190,57 +261,57 @@ public int recv_calculate() throws InvalidOperation, org.apache.thrift.TExceptio if (result.ouch != null) { throw result.ouch; } - throw new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.MISSING_RESULT, "calculate failed: unknown result"); + throw new TApplicationException( + TApplicationException.MISSING_RESULT, "calculate failed: unknown result"); } @Override - public void zip() throws org.apache.thrift.TException { + public void zip() throws TException { send_zip(); } - public void send_zip() throws org.apache.thrift.TException { + public void send_zip() throws TException { zip_args args = new zip_args(); sendBaseOneway("zip", args); } @Override - public Work echo(Work w) throws org.apache.thrift.TException { + public Work echo(Work w) throws TException { send_echo(w); return recv_echo(); } - public void send_echo(Work w) throws org.apache.thrift.TException { + public void send_echo(Work w) throws TException { echo_args args = new echo_args(); args.setW(w); sendBase("echo", args); } - public Work recv_echo() throws org.apache.thrift.TException { + public Work recv_echo() throws TException { echo_result result = new echo_result(); receiveBase(result, "echo"); if (result.isSetSuccess()) { return result.success; } - throw new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.MISSING_RESULT, "echo failed: unknown result"); + throw new TApplicationException( + 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, java.nio.ByteBuffer v8, Work v9, - java.util.List v10, java.util.Set v11, - java.util.Map v12) - throws org.apache.thrift.TException { + 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 { 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, java.nio.ByteBuffer v8, Work v9, - java.util.List v10, java.util.Set v11, - java.util.Map v12) - throws org.apache.thrift.TException { + 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 { alltypes_args args = new alltypes_args(); args.setV1(v1); args.setV2(v2); @@ -257,105 +328,105 @@ public void send_alltypes( sendBase("alltypes", args); } - public int recv_alltypes() throws org.apache.thrift.TException { + public int recv_alltypes() throws TException { alltypes_result result = new alltypes_result(); receiveBase(result, "alltypes"); if (result.isSetSuccess()) { return result.success; } - throw new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.MISSING_RESULT, "alltypes failed: unknown result"); + throw new TApplicationException( + TApplicationException.MISSING_RESULT, "alltypes failed: unknown result"); } } - 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 static class AsyncClient extends TAsyncClient implements AsyncIface { + public static class Factory implements TAsyncClientFactory { + private TAsyncClientManager clientManager; + private TProtocolFactory protocolFactory; - public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, - org.apache.thrift.protocol.TProtocolFactory protocolFactory) { + public Factory(TAsyncClientManager clientManager, + TProtocolFactory protocolFactory) { this.clientManager = clientManager; this.protocolFactory = protocolFactory; } @Override - public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) { + public AsyncClient getAsyncClient(TNonblockingTransport transport) { return new AsyncClient(protocolFactory, clientManager, transport); } } - public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, - org.apache.thrift.async.TAsyncClientManager clientManager, - org.apache.thrift.transport.TNonblockingTransport transport) { + public AsyncClient(TProtocolFactory protocolFactory, + TAsyncClientManager clientManager, + TNonblockingTransport transport) { super(protocolFactory, clientManager, transport); } @Override - public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void ping(AsyncMethodCallback resultHandler) throws 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 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 { + public static class ping_call extends TAsyncMethodCall { + public ping_call(AsyncMethodCallback resultHandler, + TAsyncClient client, + TProtocolFactory protocolFactory, + TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); } @Override - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(TProtocol prot) throws TException { prot.writeMessageBegin( - new org.apache.thrift.protocol.TMessage("ping", org.apache.thrift.protocol.TMessageType.CALL, 0)); + new TMessage("ping", TMessageType.CALL, 0)); ping_args args = new ping_args(); args.write(prot); prot.writeMessageEnd(); } @Override - public Void getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public Void getResult() throws TException { + if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport - = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport + = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_ping(); return null; } } @Override - public void add(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + public void add(int num1, int num2, AsyncMethodCallback resultHandler) + throws 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 org.apache.thrift.async.TAsyncMethodCall { + public static class add_call extends TAsyncMethodCall { private int num1; private int num2; - 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 { + public add_call(int num1, int num2, AsyncMethodCallback resultHandler, + TAsyncClient client, + TProtocolFactory protocolFactory, + TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.num1 = num1; this.num2 = num2; } @Override - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(TProtocol prot) throws TException { prot.writeMessageBegin( - new org.apache.thrift.protocol.TMessage("add", org.apache.thrift.protocol.TMessageType.CALL, 0)); + new TMessage("add", TMessageType.CALL, 0)); add_args args = new add_args(); args.setNum1(num1); args.setNum2(num2); @@ -364,44 +435,44 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa } @Override - public java.lang.Integer getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public java.lang.Integer getResult() throws TException { + if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport - = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport + = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_add(); } } @Override - public void calculate(int logid, Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + public void calculate(int logid, Work w, AsyncMethodCallback resultHandler) + throws 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 org.apache.thrift.async.TAsyncMethodCall { + public static class calculate_call extends TAsyncMethodCall { private int logid; private Work w; public calculate_call(int logid, 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 { + AsyncMethodCallback resultHandler, + TAsyncClient client, + TProtocolFactory protocolFactory, + TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.logid = logid; this.w = w; } @Override - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(TProtocol prot) throws TException { prot.writeMessageBegin( - new org.apache.thrift.protocol.TMessage("calculate", org.apache.thrift.protocol.TMessageType.CALL, 0)); + new TMessage("calculate", TMessageType.CALL, 0)); calculate_args args = new calculate_args(); args.setLogid(logid); args.setW(w); @@ -410,78 +481,78 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa } @Override - public java.lang.Integer getResult() throws InvalidOperation, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public java.lang.Integer getResult() throws InvalidOperation, TException { + if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport - = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport + = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_calculate(); } } @Override - public void zip(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void zip(AsyncMethodCallback resultHandler) throws 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 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 { + public static class zip_call extends TAsyncMethodCall { + public zip_call(AsyncMethodCallback resultHandler, + TAsyncClient client, + TProtocolFactory protocolFactory, + TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, true); } @Override - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(TProtocol prot) throws TException { prot.writeMessageBegin( - new org.apache.thrift.protocol.TMessage("zip", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); + new TMessage("zip", TMessageType.ONEWAY, 0)); zip_args args = new zip_args(); args.write(prot); prot.writeMessageEnd(); } @Override - public Void getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public Void getResult() throws TException { + if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport - = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport + = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return null; } } @Override - public void echo(Work w, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + public void echo(Work w, AsyncMethodCallback resultHandler) + throws 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 org.apache.thrift.async.TAsyncMethodCall { + public static class echo_call extends TAsyncMethodCall { private Work w; - 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 { + public echo_call(Work w, AsyncMethodCallback resultHandler, + TAsyncClient client, + TProtocolFactory protocolFactory, + TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.w = w; } @Override - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(TProtocol prot) throws TException { prot.writeMessageBegin( - new org.apache.thrift.protocol.TMessage("echo", org.apache.thrift.protocol.TMessageType.CALL, 0)); + new TMessage("echo", TMessageType.CALL, 0)); echo_args args = new echo_args(); args.setW(w); args.write(prot); @@ -489,24 +560,24 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa } @Override - public Work getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public Work getResult() throws TException { + if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport - = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport + = new TMemoryInputTransport(getFrameBuffer().array()); + 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, 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 { + 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 { checkReady(); alltypes_call method_call = new alltypes_call( v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, resultHandler, this, ___protocolFactory, ___transport); @@ -514,7 +585,7 @@ public void alltypes( ___manager.call(method_call); } - public static class alltypes_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class alltypes_call extends TAsyncMethodCall { private boolean v1; private byte v2; private short v3; @@ -522,19 +593,19 @@ public static class alltypes_call extends org.apache.thrift.async.TAsyncMethodCa private long v5; private double v6; private java.lang.String v7; - private java.nio.ByteBuffer v8; + private ByteBuffer v8; private Work v9; - private java.util.List v10; - private java.util.Set v11; - private java.util.Map v12; + private List v10; + private Set v11; + private Map v12; public alltypes_call(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, - org.apache.thrift.async.TAsyncClient client, - org.apache.thrift.protocol.TProtocolFactory protocolFactory, - org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + ByteBuffer v8, Work v9, List v10, + Set v11, Map v12, + AsyncMethodCallback resultHandler, + TAsyncClient client, + TProtocolFactory protocolFactory, + TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.v1 = v1; this.v2 = v2; @@ -551,9 +622,9 @@ public alltypes_call(boolean v1, byte v2, short v3, int v4, long v5, double v6, } @Override - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + public void write_args(TProtocol prot) throws TException { prot.writeMessageBegin( - new org.apache.thrift.protocol.TMessage("alltypes", org.apache.thrift.protocol.TMessageType.CALL, 0)); + new TMessage("alltypes", TMessageType.CALL, 0)); alltypes_args args = new alltypes_args(); args.setV1(v1); args.setV2(v2); @@ -572,36 +643,36 @@ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apa } @Override - public java.lang.Integer getResult() throws org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public java.lang.Integer getResult() throws TException { + if (getState() != TAsyncMethodCall.State.RESPONSE_READ) { throw new java.lang.IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport - = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport + = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_alltypes(); } } } - 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 static class Processor extends TBaseProcessor + implements TProcessor { + private static final Logger _LOGGER = LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { super(iface, getProcessMap( - new java.util.HashMap>())); + new HashMap>())); } protected Processor(I iface, - java.util.Map> processMap) { + Map> processMap) { super(iface, getProcessMap(processMap)); } private static < - I extends Iface> java.util.Map> getProcessMap( - java.util.Map> processMap) { + I extends Iface> Map> getProcessMap( + Map> processMap) { processMap.put("ping", new ping()); processMap.put("add", new add()); processMap.put("calculate", new calculate()); @@ -611,7 +682,7 @@ protected Processor(I iface, return processMap; } - public static class ping extends org.apache.thrift.ProcessFunction { + public static class ping extends ProcessFunction { public ping() { super("ping"); } @@ -637,14 +708,14 @@ public ping_result getEmptyResultInstance() { } @Override - public ping_result getResult(I iface, ping_args args) throws org.apache.thrift.TException { + public ping_result getResult(I iface, ping_args args) throws TException { ping_result result = getEmptyResultInstance(); iface.ping(); return result; } } - public static class add extends org.apache.thrift.ProcessFunction { + public static class add extends ProcessFunction { public add() { super("add"); } @@ -670,7 +741,7 @@ public add_result getEmptyResultInstance() { } @Override - public add_result getResult(I iface, add_args args) throws org.apache.thrift.TException { + public add_result getResult(I iface, add_args args) throws TException { add_result result = getEmptyResultInstance(); result.success = iface.add(args.num1, args.num2); result.setSuccessIsSet(true); @@ -679,7 +750,7 @@ public add_result getResult(I iface, add_args args) throws org.apache.thrift.TEx } public static class calculate - extends org.apache.thrift.ProcessFunction { + extends ProcessFunction { public calculate() { super("calculate"); } @@ -705,7 +776,7 @@ public calculate_result getEmptyResultInstance() { } @Override - public calculate_result getResult(I iface, calculate_args args) throws org.apache.thrift.TException { + public calculate_result getResult(I iface, calculate_args args) throws TException { calculate_result result = getEmptyResultInstance(); try { result.success = iface.calculate(args.logid, args.w); @@ -718,7 +789,7 @@ public calculate_result getResult(I iface, calculate_args args) throws org.apach } public static class zip - extends org.apache.thrift.ProcessFunction { + extends ProcessFunction { public zip() { super("zip"); } @@ -739,18 +810,18 @@ protected boolean rethrowUnhandledExceptions() { } @Override - public org.apache.thrift.TBase getEmptyResultInstance() { + public TBase getEmptyResultInstance() { return null; } @Override - public org.apache.thrift.TBase getResult(I iface, zip_args args) throws org.apache.thrift.TException { + public TBase getResult(I iface, zip_args args) throws TException { iface.zip(); return null; } } - public static class echo extends org.apache.thrift.ProcessFunction { + public static class echo extends ProcessFunction { public echo() { super("echo"); } @@ -776,7 +847,7 @@ public echo_result getEmptyResultInstance() { } @Override - public echo_result getResult(I iface, echo_args args) throws org.apache.thrift.TException { + public echo_result getResult(I iface, echo_args args) throws TException { echo_result result = getEmptyResultInstance(); result.success = iface.echo(args.w); return result; @@ -784,7 +855,7 @@ public echo_result getResult(I iface, echo_args args) throws org.apache.thrift.T } public static class alltypes - extends org.apache.thrift.ProcessFunction { + extends ProcessFunction { public alltypes() { super("alltypes"); } @@ -810,7 +881,7 @@ public alltypes_result getEmptyResultInstance() { } @Override - public alltypes_result getResult(I iface, alltypes_args args) throws org.apache.thrift.TException { + public alltypes_result getResult(I iface, alltypes_args args) throws 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); @@ -821,22 +892,22 @@ public alltypes_result getResult(I iface, alltypes_args args) throws org.apache. } - public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { - private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); + public static class AsyncProcessor extends TBaseAsyncProcessor { + private static final Logger _LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { super(iface, getProcessMap( - new java.util.HashMap>())); + new HashMap>())); } protected AsyncProcessor(I iface, - java.util.Map> processMap) { + Map> processMap) { super(iface, getProcessMap(processMap)); } private static < - I extends AsyncIface> java.util.Map> getProcessMap( - java.util.Map> processMap) { + I extends AsyncIface> Map> getProcessMap( + Map> processMap) { processMap.put("ping", new ping()); processMap.put("add", new add()); processMap.put("calculate", new calculate()); @@ -847,7 +918,7 @@ protected AsyncProcessor(I iface, } public static class ping - extends org.apache.thrift.AsyncProcessFunction { + extends AsyncProcessFunction { public ping() { super("ping"); } @@ -863,16 +934,16 @@ public ping_args getEmptyArgsInstance() { } @Override - 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() { + public AsyncMethodCallback getResultHandler( + final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { @Override public void onComplete(Void o) { ping_result result = new ping_result(); try { - fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY, seqid); - } catch (org.apache.thrift.transport.TTransportException e) { + fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); + } catch (TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -883,22 +954,22 @@ public void onComplete(Void o) { @Override public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; + byte msgType = TMessageType.REPLY; + TSerializable msg; ping_result result = new ping_result(); - if (e instanceof org.apache.thrift.transport.TTransportException) { + if (e instanceof TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof org.apache.thrift.TApplicationException) { + } else if (e instanceof TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException) e; + msgType = TMessageType.EXCEPTION; + msg = (TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = TMessageType.EXCEPTION; + msg = new TApplicationException( + TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -916,14 +987,14 @@ public boolean isOneway() { } @Override - public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + public void start(I iface, ping_args args, AsyncMethodCallback resultHandler) + throws TException { iface.ping(resultHandler); } } public static class add - extends org.apache.thrift.AsyncProcessFunction { + extends AsyncProcessFunction { public add() { super("add"); } @@ -939,18 +1010,18 @@ public add_args getEmptyArgsInstance() { } @Override - 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() { + public AsyncMethodCallback getResultHandler( + final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final AsyncProcessFunction fcall = this; + return new 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, org.apache.thrift.protocol.TMessageType.REPLY, seqid); - } catch (org.apache.thrift.transport.TTransportException e) { + fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); + } catch (TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -961,22 +1032,22 @@ public void onComplete(java.lang.Integer o) { @Override public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; + byte msgType = TMessageType.REPLY; + TSerializable msg; add_result result = new add_result(); - if (e instanceof org.apache.thrift.transport.TTransportException) { + if (e instanceof TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof org.apache.thrift.TApplicationException) { + } else if (e instanceof TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException) e; + msgType = TMessageType.EXCEPTION; + msg = (TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = TMessageType.EXCEPTION; + msg = new TApplicationException( + TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -995,14 +1066,14 @@ public boolean isOneway() { @Override public void start( - I iface, add_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + I iface, add_args args, AsyncMethodCallback resultHandler) + throws TException { iface.add(args.num1, args.num2, resultHandler); } } public static class calculate - extends org.apache.thrift.AsyncProcessFunction { + extends AsyncProcessFunction { public calculate() { super("calculate"); } @@ -1018,18 +1089,18 @@ public calculate_args getEmptyArgsInstance() { } @Override - 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() { + public AsyncMethodCallback getResultHandler( + final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final AsyncProcessFunction fcall = this; + return new 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, org.apache.thrift.protocol.TMessageType.REPLY, seqid); - } catch (org.apache.thrift.transport.TTransportException e) { + fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); + } catch (TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -1040,26 +1111,26 @@ public void onComplete(java.lang.Integer o) { @Override public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; + byte msgType = TMessageType.REPLY; + 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 org.apache.thrift.transport.TTransportException) { + } else if (e instanceof TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof org.apache.thrift.TApplicationException) { + } else if (e instanceof TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException) e; + msgType = TMessageType.EXCEPTION; + msg = (TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = TMessageType.EXCEPTION; + msg = new TApplicationException( + TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -1078,20 +1149,20 @@ public boolean isOneway() { @Override public void start( - I iface, calculate_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + I iface, calculate_args args, AsyncMethodCallback resultHandler) + throws TException { iface.calculate(args.logid, args.w, resultHandler); } } public static class zip - extends org.apache.thrift.AsyncProcessFunction { + extends AsyncProcessFunction { public zip() { super("zip"); } @Override - public org.apache.thrift.TBase getEmptyResultInstance() { + public TBase getEmptyResultInstance() { return null; } @@ -1101,17 +1172,17 @@ public zip_args getEmptyArgsInstance() { } @Override - 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() { + public AsyncMethodCallback getResultHandler( + final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { @Override public void onComplete(Void o) { } @Override public void onError(java.lang.Exception e) { - if (e instanceof org.apache.thrift.transport.TTransportException) { + if (e instanceof TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); } else { @@ -1127,14 +1198,14 @@ public boolean isOneway() { } @Override - public void start(I iface, zip_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + public void start(I iface, zip_args args, AsyncMethodCallback resultHandler) + throws TException { iface.zip(resultHandler); } } public static class echo - extends org.apache.thrift.AsyncProcessFunction { + extends AsyncProcessFunction { public echo() { super("echo"); } @@ -1150,17 +1221,17 @@ public echo_args getEmptyArgsInstance() { } @Override - 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() { + public AsyncMethodCallback getResultHandler( + final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { @Override public void onComplete(Work o) { echo_result result = new echo_result(); result.success = o; try { - fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY, seqid); - } catch (org.apache.thrift.transport.TTransportException e) { + fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); + } catch (TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -1171,22 +1242,22 @@ public void onComplete(Work o) { @Override public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; + byte msgType = TMessageType.REPLY; + TSerializable msg; echo_result result = new echo_result(); - if (e instanceof org.apache.thrift.transport.TTransportException) { + if (e instanceof TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof org.apache.thrift.TApplicationException) { + } else if (e instanceof TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException) e; + msgType = TMessageType.EXCEPTION; + msg = (TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = TMessageType.EXCEPTION; + msg = new TApplicationException( + TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -1204,14 +1275,14 @@ public boolean isOneway() { } @Override - public void start(I iface, echo_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + public void start(I iface, echo_args args, AsyncMethodCallback resultHandler) + throws TException { iface.echo(args.w, resultHandler); } } public static class alltypes - extends org.apache.thrift.AsyncProcessFunction { + extends AsyncProcessFunction { public alltypes() { super("alltypes"); } @@ -1227,18 +1298,18 @@ public alltypes_args getEmptyArgsInstance() { } @Override - 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() { + public AsyncMethodCallback getResultHandler( + final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final AsyncProcessFunction fcall = this; + return new 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, org.apache.thrift.protocol.TMessageType.REPLY, seqid); - } catch (org.apache.thrift.transport.TTransportException e) { + fcall.sendResponse(fb, result, TMessageType.REPLY, seqid); + } catch (TTransportException e) { _LOGGER.error("TTransportException writing to internal frame buffer", e); fb.close(); } catch (java.lang.Exception e) { @@ -1249,22 +1320,22 @@ public void onComplete(java.lang.Integer o) { @Override public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; + byte msgType = TMessageType.REPLY; + TSerializable msg; alltypes_result result = new alltypes_result(); - if (e instanceof org.apache.thrift.transport.TTransportException) { + if (e instanceof TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); return; - } else if (e instanceof org.apache.thrift.TApplicationException) { + } else if (e instanceof TApplicationException) { _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException) e; + msgType = TMessageType.EXCEPTION; + msg = (TApplicationException) e; } else { _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException( - org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + msgType = TMessageType.EXCEPTION; + msg = new TApplicationException( + TApplicationException.INTERNAL_ERROR, e.getMessage()); } try { fcall.sendResponse(fb, msg, msgType, seqid); @@ -1283,8 +1354,8 @@ public boolean isOneway() { @Override public void start( - I iface, alltypes_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) - throws org.apache.thrift.TException { + I iface, alltypes_args args, AsyncMethodCallback resultHandler) + throws 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); } @@ -1294,24 +1365,24 @@ public void start( @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class ping_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("ping_args"); + private static final TStruct STRUCT_DESC + = new TStruct("ping_args"); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new ping_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_argsTupleSchemeFactory(); + private static final 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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { ; - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -1319,7 +1390,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { default: @@ -1340,7 +1411,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -1364,12 +1435,12 @@ public java.lang.String getFieldName() { } } - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - 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); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(ping_args.class, metaDataMap); } public ping_args() { @@ -1391,12 +1462,12 @@ public void clear() { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -1450,19 +1521,19 @@ public int compareTo(ping_args other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -1475,48 +1546,48 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { try { - 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); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class ping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class ping_argsStandardSchemeFactory implements SchemeFactory { @Override public ping_argsStandardScheme getScheme() { return new ping_argsStandardScheme(); } } - private static class ping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class ping_argsStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, ping_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, ping_args struct) throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -1527,8 +1598,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ping_args struct) t } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, ping_args struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, ping_args struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1538,52 +1609,52 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ping_args struct) } - private static class ping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class ping_argsTupleSchemeFactory implements SchemeFactory { @Override public ping_argsTupleScheme getScheme() { return new ping_argsTupleScheme(); } } - private static class ping_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class ping_argsTupleScheme extends TupleScheme { @Override - 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; + public void write(TProtocol prot, ping_args struct) throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - 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; + public void read(TProtocol prot, ping_args struct) throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class ping_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("ping_result"); + private static final TStruct STRUCT_DESC + = new TStruct("ping_result"); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new ping_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_resultTupleSchemeFactory(); + private static final 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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { ; - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -1591,7 +1662,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { default: @@ -1612,7 +1683,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -1636,12 +1707,12 @@ public java.lang.String getFieldName() { } } - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - 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); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(ping_result.class, metaDataMap); } public ping_result() { @@ -1663,12 +1734,12 @@ public void clear() { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -1722,18 +1793,18 @@ public int compareTo(ping_result other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -1746,49 +1817,49 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { try { - 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); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class ping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class ping_resultStandardSchemeFactory implements SchemeFactory { @Override public ping_resultStandardScheme getScheme() { return new ping_resultStandardScheme(); } } - private static class ping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class ping_resultStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, ping_result struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, ping_result struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -1799,8 +1870,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, ping_result struct) } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, ping_result struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, ping_result struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -1810,63 +1881,63 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, ping_result struct } - private static class ping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class ping_resultTupleSchemeFactory implements SchemeFactory { @Override public ping_resultTupleScheme getScheme() { return new ping_resultTupleScheme(); } } - private static class ping_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class ping_resultTupleScheme extends TupleScheme { @Override - 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; + public void write(TProtocol prot, ping_result struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - 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; + public void read(TProtocol prot, ping_result struct) + throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class add_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("add_args"); + private static final TStruct STRUCT_DESC + = new TStruct("add_args"); - 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 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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new add_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_argsTupleSchemeFactory(); + private static final 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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { NUM1((short) 1, "num1"), NUM2((short) 2, "num2"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -1874,7 +1945,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // NUM1 @@ -1899,7 +1970,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -1927,20 +1998,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); tmpMap.put(_Fields.NUM1, - 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))); + new FieldMetaData( + "num1", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.NUM2, - 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); + new FieldMetaData( + "num2", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(add_args.class, metaDataMap); } public add_args() { @@ -1989,16 +2060,16 @@ public add_args setNum1(int num1) { } public void unsetNum1() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); } public void setNum1IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); } public int getNum2() { @@ -2012,20 +2083,20 @@ public add_args setNum2(int num2) { } public void unsetNum2() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); } public void setNum2IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case NUM1: if (value == null) { @@ -2046,7 +2117,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -2134,7 +2205,7 @@ public int compareTo(add_args other) { return lastComparison; } if (isSetNum1()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num1, other.num1); + lastComparison = TBaseHelper.compareTo(this.num1, other.num1); if (lastComparison != 0) { return lastComparison; } @@ -2144,7 +2215,7 @@ public int compareTo(add_args other) { return lastComparison; } if (isSetNum2()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num2, other.num2); + lastComparison = TBaseHelper.compareTo(this.num2, other.num2); if (lastComparison != 0) { return lastComparison; } @@ -2152,19 +2223,19 @@ public int compareTo(add_args other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -2185,66 +2256,66 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class add_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class add_argsStandardSchemeFactory implements SchemeFactory { @Override public add_argsStandardScheme getScheme() { return new add_argsStandardScheme(); } } - private static class add_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class add_argsStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, add_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, add_args struct) throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 1: // NUM1 - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // NUM2 - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.num2 = iprot.readI32(); struct.setNum2IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -2255,7 +2326,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, add_args struct) th } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, add_args struct) throws org.apache.thrift.TException { + public void write(TProtocol oprot, add_args struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -2271,19 +2342,19 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_args struct) t } - private static class add_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class add_argsTupleSchemeFactory implements SchemeFactory { @Override public add_argsTupleScheme getScheme() { return new add_argsTupleScheme(); } } - private static class add_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class add_argsTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, add_args struct) throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetNum1()) { optionals.set(0); } @@ -2300,9 +2371,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_args struct) th } @Override - 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); + public void read(TProtocol prot, add_args struct) throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); @@ -2314,37 +2385,37 @@ public void read(org.apache.thrift.protocol.TProtocol prot, add_args struct) thr } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class add_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("add_result"); + private static final TStruct STRUCT_DESC + = new TStruct("add_result"); - 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 TField SUCCESS_FIELD_DESC + = new TField("success", TType.I32, (short) 0); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new add_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new add_resultTupleSchemeFactory(); + private static final 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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short) 0, "success"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -2352,7 +2423,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -2375,7 +2446,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -2402,16 +2473,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_result.class, metaDataMap); + new FieldMetaData( + "success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(add_result.class, metaDataMap); } public add_result() { @@ -2454,20 +2525,20 @@ public add_result setSuccess(int success) { } public void unsetSuccess() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -2480,7 +2551,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -2552,7 +2623,7 @@ public int compareTo(add_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + lastComparison = TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -2560,18 +2631,18 @@ public int compareTo(add_result other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -2587,59 +2658,59 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class add_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class add_resultStandardSchemeFactory implements SchemeFactory { @Override public add_resultStandardScheme getScheme() { return new add_resultStandardScheme(); } } - private static class add_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class add_resultStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, add_result struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, add_result struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -2650,8 +2721,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, add_result struct) } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, add_result struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, add_result struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -2666,20 +2737,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, add_result struct) } - private static class add_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class add_resultTupleSchemeFactory implements SchemeFactory { @Override public add_resultTupleScheme getScheme() { return new add_resultTupleScheme(); } } - private static class add_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class add_resultTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, add_result struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -2690,9 +2761,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, add_result struct) } @Override - 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); + public void read(TProtocol prot, add_result struct) throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); @@ -2700,42 +2771,42 @@ public void read(org.apache.thrift.protocol.TProtocol prot, add_result struct) t } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class calculate_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("calculate_args"); + private static final TStruct STRUCT_DESC + = new TStruct("calculate_args"); - 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 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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new calculate_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY + private static final SchemeFactory TUPLE_SCHEME_FACTORY = new calculate_argsTupleSchemeFactory(); public int logid; // required - public @org.apache.thrift.annotation.Nullable Work w; // required + public @Nullable Work w; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { LOGID((short) 1, "logid"), W((short) 2, "w"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -2743,7 +2814,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // LOGID @@ -2768,7 +2839,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -2795,19 +2866,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); tmpMap.put(_Fields.LOGID, - 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); + 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); } public calculate_args() { @@ -2856,24 +2927,24 @@ public calculate_args setLogid(int logid) { } public void unsetLogid() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOGID_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOGID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __LOGID_ISSET_ID); } public void setLogidIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOGID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOGID_ISSET_ID, value); } - @org.apache.thrift.annotation.Nullable + @Nullable public Work getW() { return this.w; } - public calculate_args setW(@org.apache.thrift.annotation.Nullable Work w) { + public calculate_args setW(@Nullable Work w) { this.w = w; return this; } @@ -2894,7 +2965,7 @@ public void setWIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case LOGID: if (value == null) { @@ -2915,7 +2986,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -3005,7 +3076,7 @@ public int compareTo(calculate_args other) { return lastComparison; } if (isSetLogid()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.logid, other.logid); + lastComparison = TBaseHelper.compareTo(this.logid, other.logid); if (lastComparison != 0) { return lastComparison; } @@ -3015,7 +3086,7 @@ public int compareTo(calculate_args other) { return lastComparison; } if (isSetW()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.w, other.w); + lastComparison = TBaseHelper.compareTo(this.w, other.w); if (lastComparison != 0) { return lastComparison; } @@ -3023,19 +3094,19 @@ public int compareTo(calculate_args other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -3060,7 +3131,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity if (w != null) { @@ -3068,63 +3139,63 @@ public void validate() throws org.apache.thrift.TException { } } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class calculate_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class calculate_argsStandardSchemeFactory implements SchemeFactory { @Override public calculate_argsStandardScheme getScheme() { return new calculate_argsStandardScheme(); } } - private static class calculate_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class calculate_argsStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, calculate_args struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, calculate_args struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 1: // LOGID - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.logid = iprot.readI32(); struct.setLogidIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // W - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + if (schemeField.type == TType.STRUCT) { struct.w = new Work(); struct.w.read(iprot); struct.setWIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -3135,8 +3206,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, calculate_args stru } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, calculate_args struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, calculate_args struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -3154,20 +3225,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, calculate_args str } - private static class calculate_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class calculate_argsTupleSchemeFactory implements SchemeFactory { @Override public calculate_argsTupleScheme getScheme() { return new calculate_argsTupleScheme(); } } - private static class calculate_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class calculate_argsTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, calculate_args struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetLogid()) { optionals.set(0); } @@ -3184,10 +3255,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, calculate_args stru } @Override - 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); + public void read(TProtocol prot, calculate_args struct) + throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.logid = iprot.readI32(); struct.setLogidIsSet(true); @@ -3200,42 +3271,42 @@ public void read(org.apache.thrift.protocol.TProtocol prot, calculate_args struc } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class calculate_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("calculate_result"); + private static final TStruct STRUCT_DESC + = new TStruct("calculate_result"); - 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 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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new calculate_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY + private static final SchemeFactory TUPLE_SCHEME_FACTORY = new calculate_resultTupleSchemeFactory(); public int success; // required - public @org.apache.thrift.annotation.Nullable InvalidOperation ouch; // required + public @Nullable InvalidOperation ouch; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short) 0, "success"), OUCH((short) 1, "ouch"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -3243,7 +3314,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -3268,7 +3339,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -3295,21 +3366,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + new FieldMetaData( + "success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.OUCH, - 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); + new FieldMetaData( + "ouch", TFieldRequirementType.DEFAULT, + new StructMetaData( + TType.STRUCT, InvalidOperation.class))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(calculate_result.class, metaDataMap); } public calculate_result() { @@ -3358,24 +3429,24 @@ public calculate_result setSuccess(int success) { } public void unsetSuccess() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } - @org.apache.thrift.annotation.Nullable + @Nullable public InvalidOperation getOuch() { return this.ouch; } - public calculate_result setOuch(@org.apache.thrift.annotation.Nullable InvalidOperation ouch) { + public calculate_result setOuch(@Nullable InvalidOperation ouch) { this.ouch = ouch; return this; } @@ -3396,7 +3467,7 @@ public void setOuchIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -3417,7 +3488,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -3507,7 +3578,7 @@ public int compareTo(calculate_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + lastComparison = TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -3517,7 +3588,7 @@ public int compareTo(calculate_result other) { return lastComparison; } if (isSetOuch()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ouch, other.ouch); + lastComparison = TBaseHelper.compareTo(this.ouch, other.ouch); if (lastComparison != 0) { return lastComparison; } @@ -3525,18 +3596,18 @@ public int compareTo(calculate_result other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -3561,68 +3632,68 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class calculate_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class calculate_resultStandardSchemeFactory implements SchemeFactory { @Override public calculate_resultStandardScheme getScheme() { return new calculate_resultStandardScheme(); } } - private static class calculate_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class calculate_resultStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, calculate_result struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, calculate_result struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 1: // OUCH - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + if (schemeField.type == TType.STRUCT) { struct.ouch = new InvalidOperation(); struct.ouch.read(iprot); struct.setOuchIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -3633,8 +3704,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, calculate_result st } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, calculate_result struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, calculate_result struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -3654,20 +3725,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, calculate_result s } - private static class calculate_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class calculate_resultTupleSchemeFactory implements SchemeFactory { @Override public calculate_resultTupleScheme getScheme() { return new calculate_resultTupleScheme(); } } - private static class calculate_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class calculate_resultTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, calculate_result struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -3684,10 +3755,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, calculate_result st } @Override - 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); + public void read(TProtocol prot, calculate_result struct) + throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); @@ -3700,32 +3771,32 @@ public void read(org.apache.thrift.protocol.TProtocol prot, calculate_result str } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class zip_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("zip_args"); + private static final TStruct STRUCT_DESC + = new TStruct("zip_args"); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new zip_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new zip_argsTupleSchemeFactory(); + private static final 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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { ; - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -3733,7 +3804,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { default: @@ -3754,7 +3825,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -3778,12 +3849,12 @@ public java.lang.String getFieldName() { } } - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - 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); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(zip_args.class, metaDataMap); } public zip_args() { @@ -3805,12 +3876,12 @@ public void clear() { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -3864,19 +3935,19 @@ public int compareTo(zip_args other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -3889,48 +3960,48 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { try { - 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); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class zip_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class zip_argsStandardSchemeFactory implements SchemeFactory { @Override public zip_argsStandardScheme getScheme() { return new zip_argsStandardScheme(); } } - private static class zip_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class zip_argsStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, zip_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, zip_args struct) throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -3941,7 +4012,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, zip_args struct) th } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, zip_args struct) throws org.apache.thrift.TException { + public void write(TProtocol oprot, zip_args struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -3951,57 +4022,57 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, zip_args struct) t } - private static class zip_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class zip_argsTupleSchemeFactory implements SchemeFactory { @Override public zip_argsTupleScheme getScheme() { return new zip_argsTupleScheme(); } } - private static class zip_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class zip_argsTupleScheme extends TupleScheme { @Override - 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; + public void write(TProtocol prot, zip_args struct) throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - 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; + public void read(TProtocol prot, zip_args struct) throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class echo_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("echo_args"); + private static final TStruct STRUCT_DESC + = new TStruct("echo_args"); - 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 TField W_FIELD_DESC + = new TField("w", TType.STRUCT, (short) 1); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new echo_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new echo_argsTupleSchemeFactory(); + private static final SchemeFactory TUPLE_SCHEME_FACTORY = new echo_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable Work w; // required + public @Nullable Work w; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { W((short) 1, "w"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4009,7 +4080,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // W @@ -4032,7 +4103,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -4057,15 +4128,15 @@ public java.lang.String getFieldName() { } // isset id assignments - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - 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); + 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); } public echo_args() { @@ -4096,12 +4167,12 @@ public void clear() { this.w = null; } - @org.apache.thrift.annotation.Nullable + @Nullable public Work getW() { return this.w; } - public echo_args setW(@org.apache.thrift.annotation.Nullable Work w) { + public echo_args setW(@Nullable Work w) { this.w = w; return this; } @@ -4122,7 +4193,7 @@ public void setWIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case W: if (value == null) { @@ -4135,7 +4206,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -4209,7 +4280,7 @@ public int compareTo(echo_args other) { return lastComparison; } if (isSetW()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.w, other.w); + lastComparison = TBaseHelper.compareTo(this.w, other.w); if (lastComparison != 0) { return lastComparison; } @@ -4217,19 +4288,19 @@ public int compareTo(echo_args other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -4249,7 +4320,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity if (w != null) { @@ -4257,52 +4328,52 @@ public void validate() throws org.apache.thrift.TException { } } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { try { - 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); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class echo_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class echo_argsStandardSchemeFactory implements SchemeFactory { @Override public echo_argsStandardScheme getScheme() { return new echo_argsStandardScheme(); } } - private static class echo_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class echo_argsStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, echo_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, echo_args struct) throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 1: // W - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + if (schemeField.type == TType.STRUCT) { struct.w = new Work(); struct.w.read(iprot); struct.setWIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -4313,8 +4384,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, echo_args struct) t } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, echo_args struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, echo_args struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4329,19 +4400,19 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, echo_args struct) } - private static class echo_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class echo_argsTupleSchemeFactory implements SchemeFactory { @Override public echo_argsTupleScheme getScheme() { return new echo_argsTupleScheme(); } } - private static class echo_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class echo_argsTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, echo_args struct) throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetW()) { optionals.set(0); } @@ -4352,9 +4423,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, echo_args struct) t } @Override - 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); + public void read(TProtocol prot, echo_args struct) throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.w = new Work(); struct.w.read(iprot); @@ -4363,37 +4434,37 @@ public void read(org.apache.thrift.protocol.TProtocol prot, echo_args struct) th } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class echo_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("echo_result"); + private static final TStruct STRUCT_DESC + = new TStruct("echo_result"); - 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 TField SUCCESS_FIELD_DESC + = new TField("success", TType.STRUCT, (short) 0); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new echo_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new echo_resultTupleSchemeFactory(); + private static final SchemeFactory TUPLE_SCHEME_FACTORY = new echo_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable Work success; // required + public @Nullable Work success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short) 0, "success"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4401,7 +4472,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -4424,7 +4495,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -4449,15 +4520,15 @@ public java.lang.String getFieldName() { } // isset id assignments - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - 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); + 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); } public echo_result() { @@ -4488,12 +4559,12 @@ public void clear() { this.success = null; } - @org.apache.thrift.annotation.Nullable + @Nullable public Work getSuccess() { return this.success; } - public echo_result setSuccess(@org.apache.thrift.annotation.Nullable Work success) { + public echo_result setSuccess(@Nullable Work success) { this.success = success; return this; } @@ -4514,7 +4585,7 @@ public void setSuccessIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -4527,7 +4598,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -4601,7 +4672,7 @@ public int compareTo(echo_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + lastComparison = TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -4609,18 +4680,18 @@ public int compareTo(echo_result other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -4640,7 +4711,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity if (success != null) { @@ -4648,53 +4719,53 @@ public void validate() throws org.apache.thrift.TException { } } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws IOException, java.lang.ClassNotFoundException { try { - 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); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class echo_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class echo_resultStandardSchemeFactory implements SchemeFactory { @Override public echo_resultStandardScheme getScheme() { return new echo_resultStandardScheme(); } } - private static class echo_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class echo_resultStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, echo_result struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, echo_result struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + if (schemeField.type == TType.STRUCT) { struct.success = new Work(); struct.success.read(iprot); struct.setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -4705,8 +4776,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, echo_result struct) } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, echo_result struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, echo_result struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4721,20 +4792,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, echo_result struct } - private static class echo_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class echo_resultTupleSchemeFactory implements SchemeFactory { @Override public echo_resultTupleScheme getScheme() { return new echo_resultTupleScheme(); } } - private static class echo_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class echo_resultTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, echo_result struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -4745,10 +4816,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, echo_result struct) } @Override - 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); + public void read(TProtocol prot, echo_result struct) + throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = new Work(); struct.success.read(iprot); @@ -4757,47 +4828,47 @@ public void read(org.apache.thrift.protocol.TProtocol prot, echo_result struct) } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class alltypes_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - 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 + 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 = new alltypes_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY + private static final SchemeFactory TUPLE_SCHEME_FACTORY = new alltypes_argsTupleSchemeFactory(); public boolean v1; // required @@ -4806,15 +4877,15 @@ public static class alltypes_args public int v4; // required public long v5; // required public double v6; // 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 + 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 /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { V1((short) 1, "v1"), V2((short) 2, "v2"), V3((short) 3, "v3"), @@ -4828,11 +4899,11 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { V11((short) 11, "v11"), V12((short) 12, "v12"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4840,7 +4911,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // V1 @@ -4885,7 +4956,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -4917,65 +4988,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); tmpMap.put(_Fields.V1, - 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))); + new FieldMetaData( + "v1", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.BOOL))); tmpMap.put(_Fields.V2, - 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))); + new FieldMetaData( + "v2", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.BYTE))); tmpMap.put(_Fields.V3, - 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))); + new FieldMetaData( + "v3", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I16))); tmpMap.put(_Fields.V4, - 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))); + new FieldMetaData( + "v4", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.V5, - 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))); + new FieldMetaData( + "v5", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); tmpMap.put(_Fields.V6, - 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))); + new FieldMetaData( + "v6", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.DOUBLE))); tmpMap.put(_Fields.V7, - 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))); + new FieldMetaData( + "v7", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING))); tmpMap.put(_Fields.V8, - 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))); + 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))); tmpMap.put(_Fields.V10, - 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)))); + 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)))); tmpMap.put(_Fields.V12, - 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); + 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); } public alltypes_args() { @@ -4989,11 +5060,11 @@ public alltypes_args( long v5, double v6, java.lang.String v7, - java.nio.ByteBuffer v8, + ByteBuffer v8, Work v9, - java.util.List v10, - java.util.Set v11, - java.util.Map v12) { + List v10, + Set v11, + Map v12) { this(); this.v1 = v1; setV1IsSet(true); @@ -5008,7 +5079,7 @@ public alltypes_args( this.v6 = v6; setV6IsSet(true); this.v7 = v7; - this.v8 = org.apache.thrift.TBaseHelper.copyBinary(v8); + this.v8 = TBaseHelper.copyBinary(v8); this.v9 = v9; this.v10 = v10; this.v11 = v11; @@ -5030,22 +5101,22 @@ public alltypes_args(alltypes_args other) { this.v7 = other.v7; } if (other.isSetV8()) { - this.v8 = org.apache.thrift.TBaseHelper.copyBinary(other.v8); + this.v8 = TBaseHelper.copyBinary(other.v8); } if (other.isSetV9()) { this.v9 = new Work(other.v9); } if (other.isSetV10()) { - java.util.List __this__v10 = new java.util.ArrayList(other.v10); + List __this__v10 = new ArrayList(other.v10); this.v10 = __this__v10; } if (other.isSetV11()) { - java.util.Set __this__v11 = new java.util.HashSet(other.v11); + Set __this__v11 = new HashSet(other.v11); this.v11 = __this__v11; } if (other.isSetV12()) { - java.util.Map __this__v12 - = new java.util.HashMap(other.v12); + Map __this__v12 + = new HashMap(other.v12); this.v12 = __this__v12; } } @@ -5088,16 +5159,16 @@ public alltypes_args setV1(boolean v1) { } public void unsetV1() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V1_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V1_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __V1_ISSET_ID); } public void setV1IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V1_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V1_ISSET_ID, value); } public byte getV2() { @@ -5111,16 +5182,16 @@ public alltypes_args setV2(byte v2) { } public void unsetV2() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V2_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V2_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __V2_ISSET_ID); } public void setV2IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V2_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V2_ISSET_ID, value); } public short getV3() { @@ -5134,16 +5205,16 @@ public alltypes_args setV3(short v3) { } public void unsetV3() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V3_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V3_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __V3_ISSET_ID); } public void setV3IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V3_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V3_ISSET_ID, value); } public int getV4() { @@ -5157,16 +5228,16 @@ public alltypes_args setV4(int v4) { } public void unsetV4() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V4_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V4_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __V4_ISSET_ID); } public void setV4IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V4_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V4_ISSET_ID, value); } public long getV5() { @@ -5180,16 +5251,16 @@ public alltypes_args setV5(long v5) { } public void unsetV5() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V5_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V5_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __V5_ISSET_ID); } public void setV5IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V5_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V5_ISSET_ID, value); } public double getV6() { @@ -5203,24 +5274,24 @@ public alltypes_args setV6(double v6) { } public void unsetV6() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __V6_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __V6_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __V6_ISSET_ID); } public void setV6IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __V6_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __V6_ISSET_ID, value); } - @org.apache.thrift.annotation.Nullable + @Nullable public java.lang.String getV7() { return this.v7; } - public alltypes_args setV7(@org.apache.thrift.annotation.Nullable java.lang.String v7) { + public alltypes_args setV7(@Nullable java.lang.String v7) { this.v7 = v7; return this; } @@ -5241,21 +5312,21 @@ public void setV7IsSet(boolean value) { } public byte[] getV8() { - setV8(org.apache.thrift.TBaseHelper.rightSize(v8)); + setV8(TBaseHelper.rightSize(v8)); return v8 == null ? null : v8.array(); } - public java.nio.ByteBuffer bufferForV8() { - return org.apache.thrift.TBaseHelper.copyBinary(v8); + public ByteBuffer bufferForV8() { + return TBaseHelper.copyBinary(v8); } public alltypes_args setV8(byte[] v8) { - this.v8 = v8 == null ? (java.nio.ByteBuffer) null : java.nio.ByteBuffer.wrap(v8.clone()); + this.v8 = v8 == null ? (ByteBuffer) null : ByteBuffer.wrap(v8.clone()); return this; } - public alltypes_args setV8(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer v8) { - this.v8 = org.apache.thrift.TBaseHelper.copyBinary(v8); + public alltypes_args setV8(@Nullable ByteBuffer v8) { + this.v8 = TBaseHelper.copyBinary(v8); return this; } @@ -5274,12 +5345,12 @@ public void setV8IsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable + @Nullable public Work getV9() { return this.v9; } - public alltypes_args setV9(@org.apache.thrift.annotation.Nullable Work v9) { + public alltypes_args setV9(@Nullable Work v9) { this.v9 = v9; return this; } @@ -5303,24 +5374,24 @@ public int getV10Size() { return (this.v10 == null) ? 0 : this.v10.size(); } - @org.apache.thrift.annotation.Nullable - public java.util.Iterator getV10Iterator() { + @Nullable + public Iterator getV10Iterator() { return (this.v10 == null) ? null : this.v10.iterator(); } public void addToV10(int elem) { if (this.v10 == null) { - this.v10 = new java.util.ArrayList(); + this.v10 = new ArrayList(); } this.v10.add(elem); } - @org.apache.thrift.annotation.Nullable - public java.util.List getV10() { + @Nullable + public List getV10() { return this.v10; } - public alltypes_args setV10(@org.apache.thrift.annotation.Nullable java.util.List v10) { + public alltypes_args setV10(@Nullable List v10) { this.v10 = v10; return this; } @@ -5344,24 +5415,24 @@ public int getV11Size() { return (this.v11 == null) ? 0 : this.v11.size(); } - @org.apache.thrift.annotation.Nullable - public java.util.Iterator getV11Iterator() { + @Nullable + public Iterator getV11Iterator() { return (this.v11 == null) ? null : this.v11.iterator(); } public void addToV11(java.lang.String elem) { if (this.v11 == null) { - this.v11 = new java.util.HashSet(); + this.v11 = new HashSet(); } this.v11.add(elem); } - @org.apache.thrift.annotation.Nullable - public java.util.Set getV11() { + @Nullable + public Set getV11() { return this.v11; } - public alltypes_args setV11(@org.apache.thrift.annotation.Nullable java.util.Set v11) { + public alltypes_args setV11(@Nullable Set v11) { this.v11 = v11; return this; } @@ -5387,18 +5458,18 @@ public int getV12Size() { public void putToV12(java.lang.String key, long val) { if (this.v12 == null) { - this.v12 = new java.util.HashMap(); + this.v12 = new HashMap(); } this.v12.put(key, val); } - @org.apache.thrift.annotation.Nullable - public java.util.Map getV12() { + @Nullable + public Map getV12() { return this.v12; } public alltypes_args setV12( - @org.apache.thrift.annotation.Nullable java.util.Map v12) { + @Nullable Map v12) { this.v12 = v12; return this; } @@ -5419,7 +5490,7 @@ public void setV12IsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case V1: if (value == null) { @@ -5484,7 +5555,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value instanceof byte[]) { setV8((byte[]) value); } else { - setV8((java.nio.ByteBuffer) value); + setV8((ByteBuffer) value); } } break; @@ -5501,7 +5572,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetV10(); } else { - setV10((java.util.List) value); + setV10((List) value); } break; @@ -5509,7 +5580,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetV11(); } else { - setV11((java.util.Set) value); + setV11((Set) value); } break; @@ -5517,14 +5588,14 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable if (value == null) { unsetV12(); } else { - setV12((java.util.Map) value); + setV12((Map) value); } break; } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -5740,9 +5811,9 @@ public int hashCode() { hashCode = hashCode * 8191 + v4; - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(v5); + hashCode = hashCode * 8191 + TBaseHelper.hashCode(v5); - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(v6); + hashCode = hashCode * 8191 + TBaseHelper.hashCode(v6); hashCode = hashCode * 8191 + ((isSetV7()) ? 131071 : 524287); if (isSetV7()) @@ -5784,7 +5855,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV1()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v1, other.v1); + lastComparison = TBaseHelper.compareTo(this.v1, other.v1); if (lastComparison != 0) { return lastComparison; } @@ -5794,7 +5865,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV2()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v2, other.v2); + lastComparison = TBaseHelper.compareTo(this.v2, other.v2); if (lastComparison != 0) { return lastComparison; } @@ -5804,7 +5875,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV3()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v3, other.v3); + lastComparison = TBaseHelper.compareTo(this.v3, other.v3); if (lastComparison != 0) { return lastComparison; } @@ -5814,7 +5885,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV4()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v4, other.v4); + lastComparison = TBaseHelper.compareTo(this.v4, other.v4); if (lastComparison != 0) { return lastComparison; } @@ -5824,7 +5895,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV5()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v5, other.v5); + lastComparison = TBaseHelper.compareTo(this.v5, other.v5); if (lastComparison != 0) { return lastComparison; } @@ -5834,7 +5905,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV6()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v6, other.v6); + lastComparison = TBaseHelper.compareTo(this.v6, other.v6); if (lastComparison != 0) { return lastComparison; } @@ -5844,7 +5915,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV7()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v7, other.v7); + lastComparison = TBaseHelper.compareTo(this.v7, other.v7); if (lastComparison != 0) { return lastComparison; } @@ -5854,7 +5925,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV8()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v8, other.v8); + lastComparison = TBaseHelper.compareTo(this.v8, other.v8); if (lastComparison != 0) { return lastComparison; } @@ -5864,7 +5935,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV9()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v9, other.v9); + lastComparison = TBaseHelper.compareTo(this.v9, other.v9); if (lastComparison != 0) { return lastComparison; } @@ -5874,7 +5945,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV10()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v10, other.v10); + lastComparison = TBaseHelper.compareTo(this.v10, other.v10); if (lastComparison != 0) { return lastComparison; } @@ -5884,7 +5955,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV11()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v11, other.v11); + lastComparison = TBaseHelper.compareTo(this.v11, other.v11); if (lastComparison != 0) { return lastComparison; } @@ -5894,7 +5965,7 @@ public int compareTo(alltypes_args other) { return lastComparison; } if (isSetV12()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.v12, other.v12); + lastComparison = TBaseHelper.compareTo(this.v12, other.v12); if (lastComparison != 0) { return lastComparison; } @@ -5902,19 +5973,19 @@ public int compareTo(alltypes_args other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -5966,7 +6037,7 @@ public java.lang.String toString() { if (this.v8 == null) { sb.append("null"); } else { - org.apache.thrift.TBaseHelper.toString(this.v8, sb); + TBaseHelper.toString(this.v8, sb); } first = false; if (!first) @@ -6009,7 +6080,7 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity if (v9 != null) { @@ -6017,122 +6088,122 @@ public void validate() throws org.apache.thrift.TException { } } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class alltypes_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class alltypes_argsStandardSchemeFactory implements SchemeFactory { @Override public alltypes_argsStandardScheme getScheme() { return new alltypes_argsStandardScheme(); } } - private static class alltypes_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class alltypes_argsStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_args struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, alltypes_args struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 1: // V1 - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + if (schemeField.type == TType.BOOL) { struct.v1 = iprot.readBool(); struct.setV1IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // V2 - if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) { + if (schemeField.type == TType.BYTE) { struct.v2 = iprot.readByte(); struct.setV2IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 3: // V3 - if (schemeField.type == org.apache.thrift.protocol.TType.I16) { + if (schemeField.type == TType.I16) { struct.v3 = iprot.readI16(); struct.setV3IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 4: // V4 - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.v4 = iprot.readI32(); struct.setV4IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 5: // V5 - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + if (schemeField.type == TType.I64) { struct.v5 = iprot.readI64(); struct.setV5IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 6: // V6 - if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) { + if (schemeField.type == TType.DOUBLE) { struct.v6 = iprot.readDouble(); struct.setV6IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 7: // V7 - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + if (schemeField.type == TType.STRING) { struct.v7 = iprot.readString(); struct.setV7IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 8: // V8 - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + if (schemeField.type == TType.STRING) { struct.v8 = iprot.readBinary(); struct.setV8IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 9: // V9 - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + if (schemeField.type == TType.STRUCT) { struct.v9 = new Work(); struct.v9.read(iprot); struct.setV9IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 10: // V10 - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + if (schemeField.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.v10 = new java.util.ArrayList(_list0.size); + TList _list0 = iprot.readListBegin(); + struct.v10 = new ArrayList(_list0.size); int _elem1; for (int _i2 = 0; _i2 < _list0.size; ++_i2) { _elem1 = iprot.readI32(); @@ -6142,15 +6213,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_args struc } struct.setV10IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 11: // V11 - if (schemeField.type == org.apache.thrift.protocol.TType.SET) { + if (schemeField.type == TType.SET) { { - org.apache.thrift.protocol.TSet _set3 = iprot.readSetBegin(); - struct.v11 = new java.util.HashSet(2 * _set3.size); - @org.apache.thrift.annotation.Nullable + TSet _set3 = iprot.readSetBegin(); + struct.v11 = new HashSet(2 * _set3.size); + @Nullable java.lang.String _elem4; for (int _i5 = 0; _i5 < _set3.size; ++_i5) { _elem4 = iprot.readString(); @@ -6160,15 +6231,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_args struc } struct.setV11IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 12: // V12 - if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + if (schemeField.type == TType.MAP) { { - org.apache.thrift.protocol.TMap _map6 = iprot.readMapBegin(); - struct.v12 = new java.util.HashMap(2 * _map6.size); - @org.apache.thrift.annotation.Nullable + TMap _map6 = iprot.readMapBegin(); + struct.v12 = new HashMap(2 * _map6.size); + @Nullable java.lang.String _key7; long _val8; for (int _i9 = 0; _i9 < _map6.size; ++_i9) { @@ -6180,11 +6251,11 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_args struc } struct.setV12IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -6195,8 +6266,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_args struc } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_args struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, alltypes_args struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -6237,7 +6308,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_args stru oprot.writeFieldBegin(V10_FIELD_DESC); { oprot.writeListBegin( - new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.v10.size())); + new TList(TType.I32, struct.v10.size())); for (int _iter10 : struct.v10) { oprot.writeI32(_iter10); } @@ -6248,8 +6319,8 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_args stru if (struct.v11 != null) { oprot.writeFieldBegin(V11_FIELD_DESC); { - oprot.writeSetBegin(new org.apache.thrift.protocol.TSet( - org.apache.thrift.protocol.TType.STRING, struct.v11.size())); + oprot.writeSetBegin(new TSet( + TType.STRING, struct.v11.size())); for (java.lang.String _iter11 : struct.v11) { oprot.writeString(_iter11); } @@ -6260,10 +6331,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_args stru if (struct.v12 != null) { oprot.writeFieldBegin(V12_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap( - org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, + oprot.writeMapBegin(new TMap( + TType.STRING, TType.I64, struct.v12.size())); - for (java.util.Map.Entry _iter12 : struct.v12.entrySet()) { + for (Map.Entry _iter12 : struct.v12.entrySet()) { oprot.writeString(_iter12.getKey()); oprot.writeI64(_iter12.getValue()); } @@ -6277,20 +6348,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_args stru } - private static class alltypes_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class alltypes_argsTupleSchemeFactory implements SchemeFactory { @Override public alltypes_argsTupleScheme getScheme() { return new alltypes_argsTupleScheme(); } } - private static class alltypes_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class alltypes_argsTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, alltypes_args struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetV1()) { optionals.set(0); } @@ -6374,7 +6445,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alltypes_args struc if (struct.isSetV12()) { { oprot.writeI32(struct.v12.size()); - for (java.util.Map.Entry _iter15 : struct.v12.entrySet()) { + for (Map.Entry _iter15 : struct.v12.entrySet()) { oprot.writeString(_iter15.getKey()); oprot.writeI64(_iter15.getValue()); } @@ -6383,10 +6454,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alltypes_args struc } @Override - 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); + public void read(TProtocol prot, alltypes_args struct) + throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.v1 = iprot.readBool(); struct.setV1IsSet(true); @@ -6426,8 +6497,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, alltypes_args struct } if (incoming.get(9)) { { - org.apache.thrift.protocol.TList _list16 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32); - struct.v10 = new java.util.ArrayList(_list16.size); + TList _list16 = iprot.readListBegin(TType.I32); + struct.v10 = new ArrayList(_list16.size); int _elem17; for (int _i18 = 0; _i18 < _list16.size; ++_i18) { _elem17 = iprot.readI32(); @@ -6438,9 +6509,9 @@ public void read(org.apache.thrift.protocol.TProtocol prot, alltypes_args struct } if (incoming.get(10)) { { - 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 + TSet _set19 = iprot.readSetBegin(TType.STRING); + struct.v11 = new HashSet(2 * _set19.size); + @Nullable java.lang.String _elem20; for (int _i21 = 0; _i21 < _set19.size; ++_i21) { _elem20 = iprot.readString(); @@ -6451,10 +6522,10 @@ public void read(org.apache.thrift.protocol.TProtocol prot, alltypes_args struct } if (incoming.get(11)) { { - 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 + TMap _map22 = iprot.readMapBegin(TType.STRING, + TType.I64); + struct.v12 = new HashMap(2 * _map22.size); + @Nullable java.lang.String _key23; long _val24; for (int _i25 = 0; _i25 < _map22.size; ++_i25) { @@ -6468,38 +6539,38 @@ public void read(org.apache.thrift.protocol.TProtocol prot, alltypes_args struct } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); } } @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) public static class alltypes_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("alltypes_result"); + private static final TStruct STRUCT_DESC + = new TStruct("alltypes_result"); - 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 TField SUCCESS_FIELD_DESC + = new TField("success", TType.I32, (short) 0); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new alltypes_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY + private static final 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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short) 0, "success"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -6507,7 +6578,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 0: // SUCCESS @@ -6530,7 +6601,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -6557,16 +6628,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(alltypes_result.class, metaDataMap); + new FieldMetaData( + "success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(alltypes_result.class, metaDataMap); } public alltypes_result() { @@ -6609,20 +6680,20 @@ public alltypes_result setSuccess(int success) { } public void unsetSuccess() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -6635,7 +6706,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -6707,7 +6778,7 @@ public int compareTo(alltypes_result other) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + lastComparison = TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -6715,18 +6786,18 @@ public int compareTo(alltypes_result other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -6742,59 +6813,59 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class alltypes_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class alltypes_resultStandardSchemeFactory implements SchemeFactory { @Override public alltypes_resultStandardScheme getScheme() { return new alltypes_resultStandardScheme(); } } - private static class alltypes_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class alltypes_resultStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_result struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, alltypes_result struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -6805,8 +6876,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, alltypes_result str } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_result struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, alltypes_result struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -6821,20 +6892,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, alltypes_result st } - private static class alltypes_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class alltypes_resultTupleSchemeFactory implements SchemeFactory { @Override public alltypes_resultTupleScheme getScheme() { return new alltypes_resultTupleScheme(); } } - private static class alltypes_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class alltypes_resultTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, alltypes_result struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -6845,10 +6916,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, alltypes_result str } @Override - 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); + public void read(TProtocol prot, alltypes_result struct) + throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); @@ -6856,8 +6927,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, alltypes_result stru } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (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 a06b9530969fc..e5d6f6763c29e 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,39 +22,74 @@ */ 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" }) -@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, +@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public class InvalidOperation extends TException + implements TBase, Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC - = new org.apache.thrift.protocol.TStruct("InvalidOperation"); + private static final TStruct STRUCT_DESC + = new TStruct("InvalidOperation"); - 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 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.scheme.SchemeFactory STANDARD_SCHEME_FACTORY + private static final SchemeFactory STANDARD_SCHEME_FACTORY = new InvalidOperationStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new InvalidOperationTupleSchemeFactory(); + private static final SchemeFactory TUPLE_SCHEME_FACTORY = new InvalidOperationTupleSchemeFactory(); public int whatOp; // required - public @org.apache.thrift.annotation.Nullable java.lang.String why; // required + public @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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { WHAT_OP((short) 1, "whatOp"), WHY((short) 2, "why"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -62,7 +97,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // WHAT_OP @@ -87,7 +122,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -114,20 +149,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); tmpMap.put(_Fields.WHAT_OP, - 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))); + new FieldMetaData( + "whatOp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.WHY, - 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); + new FieldMetaData( + "why", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(InvalidOperation.class, metaDataMap); } public InvalidOperation() { @@ -176,24 +211,24 @@ public InvalidOperation setWhatOp(int whatOp) { } public void unsetWhatOp() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WHATOP_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WHATOP_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __WHATOP_ISSET_ID); } public void setWhatOpIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WHATOP_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WHATOP_ISSET_ID, value); } - @org.apache.thrift.annotation.Nullable + @Nullable public java.lang.String getWhy() { return this.why; } - public InvalidOperation setWhy(@org.apache.thrift.annotation.Nullable java.lang.String why) { + public InvalidOperation setWhy(@Nullable java.lang.String why) { this.why = why; return this; } @@ -214,7 +249,7 @@ public void setWhyIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case WHAT_OP: if (value == null) { @@ -235,7 +270,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -325,7 +360,7 @@ public int compareTo(InvalidOperation other) { return lastComparison; } if (isSetWhatOp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.whatOp, other.whatOp); + lastComparison = TBaseHelper.compareTo(this.whatOp, other.whatOp); if (lastComparison != 0) { return lastComparison; } @@ -335,7 +370,7 @@ public int compareTo(InvalidOperation other) { return lastComparison; } if (isSetWhy()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why); + lastComparison = TBaseHelper.compareTo(this.why, other.why); if (lastComparison != 0) { return lastComparison; } @@ -343,19 +378,19 @@ public int compareTo(InvalidOperation other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -380,67 +415,67 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class InvalidOperationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class InvalidOperationStandardSchemeFactory implements SchemeFactory { @Override public InvalidOperationStandardScheme getScheme() { return new InvalidOperationStandardScheme(); } } - private static class InvalidOperationStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class InvalidOperationStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidOperation struct) - throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, InvalidOperation struct) + throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 1: // WHAT_OP - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.whatOp = iprot.readI32(); struct.setWhatOpIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // WHY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + if (schemeField.type == TType.STRING) { struct.why = iprot.readString(); struct.setWhyIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -451,8 +486,8 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidOperation st } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidOperation struct) - throws org.apache.thrift.TException { + public void write(TProtocol oprot, InvalidOperation struct) + throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -470,20 +505,20 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidOperation s } - private static class InvalidOperationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class InvalidOperationTupleSchemeFactory implements SchemeFactory { @Override public InvalidOperationTupleScheme getScheme() { return new InvalidOperationTupleScheme(); } } - private static class InvalidOperationTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class InvalidOperationTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, InvalidOperation struct) + throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetWhatOp()) { optionals.set(0); } @@ -500,10 +535,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, InvalidOperation st } @Override - 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); + public void read(TProtocol prot, InvalidOperation struct) + throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.whatOp = iprot.readI32(); struct.setWhatOpIsSet(true); @@ -515,8 +550,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, InvalidOperation str } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (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 7c722d49b0a0c..95d216ed7b980 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,12 +22,16 @@ */ 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. */ -@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") -public enum Operation implements org.apache.thrift.TEnum { +@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public enum Operation implements TEnum { ADD(1), SUBTRACT(2), MULTIPLY(3), @@ -52,7 +56,7 @@ public int getValue() { * * @return null if the value is not found. */ - @org.apache.thrift.annotation.Nullable + @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 453aa979d36d2..0ef238de927fb 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,6 +22,42 @@ */ 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. @@ -30,21 +66,21 @@ * set. Note that this requires some manual management in some languages. */ @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) -@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(); +@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(); public int num1; // required public int num2; // required @@ -52,11 +88,11 @@ public class Work implements org.apache.thrift.TBase, java.i * * @see Operation */ - public @org.apache.thrift.annotation.Nullable Operation op; // required - public @org.apache.thrift.annotation.Nullable java.lang.String comment; // optional + public @Nullable Operation op; // required + public @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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { NUM1((short) 1, "num1"), NUM2((short) 2, "num2"), /** @@ -66,11 +102,11 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { OP((short) 3, "op"), COMMENT((short) 4, "comment"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -78,7 +114,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // NUM1 @@ -107,7 +143,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -136,28 +172,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); tmpMap.put(_Fields.NUM1, - 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))); + new FieldMetaData( + "num1", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.NUM2, - 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))); + new FieldMetaData( + "num2", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.OP, - 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))); + new FieldMetaData( + "op", TFieldRequirementType.DEFAULT, + new EnumMetaData(TType.ENUM, Operation.class))); tmpMap.put(_Fields.COMMENT, - 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); + new FieldMetaData( + "comment", TFieldRequirementType.OPTIONAL, + new FieldValueMetaData(TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(Work.class, metaDataMap); } public Work() { @@ -218,16 +254,16 @@ public Work setNum1(int num1) { } public void unsetNum1() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); } public void setNum1IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); } public int getNum2() { @@ -241,23 +277,23 @@ public Work setNum2(int num2) { } public void unsetNum2() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); } public void setNum2IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); } /** * * @see Operation */ - @org.apache.thrift.annotation.Nullable + @Nullable public Operation getOp() { return this.op; } @@ -266,7 +302,7 @@ public Operation getOp() { * * @see Operation */ - public Work setOp(@org.apache.thrift.annotation.Nullable Operation op) { + public Work setOp(@Nullable Operation op) { this.op = op; return this; } @@ -286,12 +322,12 @@ public void setOpIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable + @Nullable public java.lang.String getComment() { return this.comment; } - public Work setComment(@org.apache.thrift.annotation.Nullable java.lang.String comment) { + public Work setComment(@Nullable java.lang.String comment) { this.comment = comment; return this; } @@ -312,7 +348,7 @@ public void setCommentIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case NUM1: if (value == null) { @@ -349,7 +385,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -473,7 +509,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum1()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num1, other.num1); + lastComparison = TBaseHelper.compareTo(this.num1, other.num1); if (lastComparison != 0) { return lastComparison; } @@ -483,7 +519,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum2()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num2, other.num2); + lastComparison = TBaseHelper.compareTo(this.num2, other.num2); if (lastComparison != 0) { return lastComparison; } @@ -493,7 +529,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetOp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, other.op); + lastComparison = TBaseHelper.compareTo(this.op, other.op); if (lastComparison != 0) { return lastComparison; } @@ -503,7 +539,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetComment()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, other.comment); + lastComparison = TBaseHelper.compareTo(this.comment, other.comment); if (lastComparison != 0) { return lastComparison; } @@ -511,19 +547,19 @@ public int compareTo(Work other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -564,82 +600,82 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class WorkStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class WorkStandardSchemeFactory implements SchemeFactory { @Override public WorkStandardScheme getScheme() { return new WorkStandardScheme(); } } - private static class WorkStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class WorkStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, Work struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, Work struct) throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 1: // NUM1 - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // NUM2 - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.num2 = iprot.readI32(); struct.setNum2IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 3: // OP - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.op = org.apache.camel.component.thrift.generated.Operation.findByValue(iprot.readI32()); + if (schemeField.type == TType.I32) { + struct.op = Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 4: // COMMENT - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + if (schemeField.type == TType.STRING) { struct.comment = iprot.readString(); struct.setCommentIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -650,7 +686,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Work struct) throws } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, Work struct) throws org.apache.thrift.TException { + public void write(TProtocol oprot, Work struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -678,19 +714,19 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Work struct) throw } - private static class WorkTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class WorkTupleSchemeFactory implements SchemeFactory { @Override public WorkTupleScheme getScheme() { return new WorkTupleScheme(); } } - private static class WorkTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class WorkTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, Work struct) throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetNum1()) { optionals.set(0); } @@ -719,9 +755,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Work struct) throws } @Override - 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); + public void read(TProtocol prot, Work struct) throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); @@ -731,7 +767,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Work struct) throws struct.setNum2IsSet(true); } if (incoming.get(2)) { - struct.op = org.apache.camel.component.thrift.generated.Operation.findByValue(iprot.readI32()); + struct.op = Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } if (incoming.get(3)) { @@ -741,8 +777,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Work struct) throws } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (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 aade8b33bd8b3..bc4f8f1ce7cd7 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,12 +22,16 @@ */ 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. */ -@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") -public enum Operation implements org.apache.thrift.TEnum { +@Generated(value = "Autogenerated by Thrift Compiler (0.21.0)", date = "2024-09-30") +public enum Operation implements TEnum { ADD(1), SUBTRACT(2), MULTIPLY(3), @@ -52,7 +56,7 @@ public int getValue() { * * @return null if the value is not found. */ - @org.apache.thrift.annotation.Nullable + @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 68efccc176eca..c5d20f3349f9b 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,6 +22,42 @@ */ 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. @@ -30,21 +66,21 @@ * set. Note that this requires some manual management in some languages. */ @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" }) -@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(); +@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(); public int num1; // required public int num2; // required @@ -52,11 +88,11 @@ public class Work implements org.apache.thrift.TBase, java.i * * @see Operation */ - public @org.apache.thrift.annotation.Nullable Operation op; // required - public @org.apache.thrift.annotation.Nullable java.lang.String comment; // optional + public @Nullable Operation op; // required + public @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 org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { NUM1((short) 1, "num1"), NUM2((short) 2, "num2"), /** @@ -66,11 +102,11 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { OP((short) 3, "op"), COMMENT((short) 4, "comment"); - private static final java.util.Map byName - = new java.util.HashMap(); + private static final Map byName + = new HashMap(); static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { + for (_Fields field : EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -78,7 +114,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByThriftId(int fieldId) { switch (fieldId) { case 1: // NUM1 @@ -107,7 +143,7 @@ public static _Fields findByThriftIdOrThrow(int fieldId) { /** * Find the _Fields constant that matches name, or null if its not found. */ - @org.apache.thrift.annotation.Nullable + @Nullable public static _Fields findByName(java.lang.String name) { return byName.get(name); } @@ -136,28 +172,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 java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap - = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap + = new EnumMap<_Fields, FieldMetaData>(_Fields.class); tmpMap.put(_Fields.NUM1, - 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))); + new FieldMetaData( + "num1", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.NUM2, - 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))); + new FieldMetaData( + "num2", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); tmpMap.put(_Fields.OP, - 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))); + new FieldMetaData( + "op", TFieldRequirementType.DEFAULT, + new EnumMetaData(TType.ENUM, Operation.class))); tmpMap.put(_Fields.COMMENT, - 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); + new FieldMetaData( + "comment", TFieldRequirementType.OPTIONAL, + new FieldValueMetaData(TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + FieldMetaData.addStructMetaDataMap(Work.class, metaDataMap); } public Work() { @@ -218,16 +254,16 @@ public Work setNum1(int num1) { } public void unsetNum1() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM1_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUM1_ISSET_ID); } public void setNum1IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM1_ISSET_ID, value); } public int getNum2() { @@ -241,23 +277,23 @@ public Work setNum2(int num2) { } public void unsetNum2() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NUM2_ISSET_ID); + __isset_bitfield = 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 org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUM2_ISSET_ID); } public void setNum2IsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM2_ISSET_ID, value); } /** * * @see Operation */ - @org.apache.thrift.annotation.Nullable + @Nullable public Operation getOp() { return this.op; } @@ -266,7 +302,7 @@ public Operation getOp() { * * @see Operation */ - public Work setOp(@org.apache.thrift.annotation.Nullable Operation op) { + public Work setOp(@Nullable Operation op) { this.op = op; return this; } @@ -286,12 +322,12 @@ public void setOpIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable + @Nullable public java.lang.String getComment() { return this.comment; } - public Work setComment(@org.apache.thrift.annotation.Nullable java.lang.String comment) { + public Work setComment(@Nullable java.lang.String comment) { this.comment = comment; return this; } @@ -312,7 +348,7 @@ public void setCommentIsSet(boolean value) { } @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { + public void setFieldValue(_Fields field, @Nullable java.lang.Object value) { switch (field) { case NUM1: if (value == null) { @@ -349,7 +385,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { @@ -473,7 +509,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum1()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num1, other.num1); + lastComparison = TBaseHelper.compareTo(this.num1, other.num1); if (lastComparison != 0) { return lastComparison; } @@ -483,7 +519,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetNum2()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num2, other.num2); + lastComparison = TBaseHelper.compareTo(this.num2, other.num2); if (lastComparison != 0) { return lastComparison; } @@ -493,7 +529,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetOp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, other.op); + lastComparison = TBaseHelper.compareTo(this.op, other.op); if (lastComparison != 0) { return lastComparison; } @@ -503,7 +539,7 @@ public int compareTo(Work other) { return lastComparison; } if (isSetComment()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, other.comment); + lastComparison = TBaseHelper.compareTo(this.comment, other.comment); if (lastComparison != 0) { return lastComparison; } @@ -511,19 +547,19 @@ public int compareTo(Work other) { return 0; } - @org.apache.thrift.annotation.Nullable + @Nullable @Override public _Fields fieldForId(int fieldId) { return _Fields.findByThriftId(fieldId); } @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + public void read(TProtocol iprot) throws TException { scheme(iprot).read(iprot, this); } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { scheme(oprot).write(oprot, this); } @@ -564,82 +600,82 @@ public java.lang.String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields // check for sub-struct validity } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + private void writeObject(ObjectOutputStream out) throws IOException { try { - 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); + write(new TCompactProtocol(new TIOStreamTransport(out))); + } catch (TException te) { + throw new IOException(te); } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { + private void readObject(ObjectInputStream in) throws 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 org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); + read(new TCompactProtocol(new TIOStreamTransport(in))); + } catch (TException te) { + throw new IOException(te); } } - private static class WorkStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class WorkStandardSchemeFactory implements SchemeFactory { @Override public WorkStandardScheme getScheme() { return new WorkStandardScheme(); } } - private static class WorkStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class WorkStandardScheme extends StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, Work struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; + public void read(TProtocol iprot, Work struct) throws TException { + TField schemeField; iprot.readStructBegin(); while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == TType.STOP) { break; } switch (schemeField.id) { case 1: // NUM1 - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 2: // NUM2 - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + if (schemeField.type == TType.I32) { struct.num2 = iprot.readI32(); struct.setNum2IsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 3: // OP - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.op = org.apache.camel.dataformat.thrift.generated.Operation.findByValue(iprot.readI32()); + if (schemeField.type == TType.I32) { + struct.op = Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; case 4: // COMMENT - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + if (schemeField.type == TType.STRING) { struct.comment = iprot.readString(); struct.setCommentIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + TProtocolUtil.skip(iprot, schemeField.type); } iprot.readFieldEnd(); } @@ -650,7 +686,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Work struct) throws } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, Work struct) throws org.apache.thrift.TException { + public void write(TProtocol oprot, Work struct) throws TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -678,19 +714,19 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, Work struct) throw } - private static class WorkTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class WorkTupleSchemeFactory implements SchemeFactory { @Override public WorkTupleScheme getScheme() { return new WorkTupleScheme(); } } - private static class WorkTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class WorkTupleScheme extends TupleScheme { @Override - 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(); + public void write(TProtocol prot, Work struct) throws TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); if (struct.isSetNum1()) { optionals.set(0); } @@ -719,9 +755,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, Work struct) throws } @Override - 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); + public void read(TProtocol prot, Work struct) throws TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.num1 = iprot.readI32(); struct.setNum1IsSet(true); @@ -731,7 +767,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Work struct) throws struct.setNum2IsSet(true); } if (incoming.get(2)) { - struct.op = org.apache.camel.dataformat.thrift.generated.Operation.findByValue(iprot.readI32()); + struct.op = Operation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } if (incoming.get(3)) { @@ -741,8 +777,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Work struct) throws } } - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) + private static S scheme(TProtocol proto) { + return (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 24ccf109f650b..1367cb6fc0f81 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,6 +27,7 @@ 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; /** @@ -36,7 +37,7 @@ * Represents the component that manages {@link TimerEndpoint}. It holds the list of {@link TimerConsumer} objects that * are started. */ -@org.apache.camel.spi.annotations.Component("timer") +@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 23c0d894d7d76..67fb6f2054dd1 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,6 +16,7 @@ */ package org.apache.camel.component.undertow; +import io.undertow.util.HttpString; import org.apache.camel.Exchange; import org.apache.camel.http.base.HttpHeaderFilterStrategy; @@ -27,7 +28,7 @@ public UndertowHeaderFilterStrategy() { @Override public boolean applyFilterToExternalHeaders(String headerName, Object headerValue, Exchange exchange) { - boolean skip = io.undertow.util.HttpString.tryFromString(headerName) == null; + boolean skip = 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 bd74b5fa2e3c4..59c746ce5bbd2 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( - org.apache.camel.component.undertow.spi.ProviderWithServletTest.MockSecurityProvider.class); + 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 9d67829a60e33..7a5919d761ee4 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,6 +17,7 @@ package org.apache.camel.component.undertow.ws; import java.net.URL; +import java.security.SecureRandom; import javax.net.ssl.SSLContext; @@ -83,7 +84,7 @@ protected CamelContext createCamelContext() throws Exception { @Test public void testWSHttpCall() throws Exception { SSLContext sc = SSLContext.getInstance("SSL"); - sc.init(null, InsecureTrustManagerFactory.INSTANCE.getTrustManagers(), new java.security.SecureRandom()); + sc.init(null, InsecureTrustManagerFactory.INSTANCE.getTrustManagers(), new 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 d5b3e7143ce88..afa66f88af6cd 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,12 +20,13 @@ 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 */ -@org.apache.camel.spi.annotations.Component("validator") +@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 8b3ab06dc4d0d..9c85708ca7bb2 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,6 +17,7 @@ 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; @@ -46,7 +47,7 @@ protected RoutesBuilder createRouteBuilder() { @Override public void configure() { errorHandler(defaultErrorHandler().maximumRedeliveries(3).redeliveryDelay(0) - .retryAttemptedLogLevel(org.apache.camel.LoggingLevel.WARN)); + .retryAttemptedLogLevel(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 1ed2cacb624cf..45b91d887f11c 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,6 +16,8 @@ */ 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; @@ -155,13 +157,13 @@ protected Map doCallJson(Map options) { } Map> getConsumersByHost() { - Map> consumersByHost = new java.util.LinkedHashMap<>(); + Map> consumersByHost = new 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 java.util.ArrayList<>()).add(consumer); + consumersByHost.computeIfAbsent(hostKey, k -> new 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 fd4ab876b3813..d4619fe14a372 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,6 +30,8 @@ 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; @@ -384,8 +386,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); - org.web3j.protocol.core.methods.request.Transaction transaction - = new org.web3j.protocol.core.methods.request.Transaction( + Transaction transaction + = new Transaction( fromAddress, nonce, gasPrice, gasLimit, toAddress, value, data); Request request = web3j.ethSendTransaction(transaction); @@ -422,8 +424,8 @@ void ethCall(Message message) throws IOException { DefaultBlockParameter atBlock = toDefaultBlockParameter(message.getHeader(Web3jConstants.AT_BLOCK, configuration::getAtBlock, String.class)); - org.web3j.protocol.core.methods.request.Transaction transaction - = new org.web3j.protocol.core.methods.request.Transaction( + Transaction transaction + = new Transaction( fromAddress, nonce, gasPrice, gasLimit, toAddress, value, data); Request request = web3j.ethCall(transaction, atBlock); @@ -441,8 +443,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); - org.web3j.protocol.core.methods.request.Transaction transaction - = new org.web3j.protocol.core.methods.request.Transaction( + Transaction transaction + = new Transaction( fromAddress, null, null, null, toAddress, null, data); Request request = web3j.ethEstimateGas(transaction); @@ -881,7 +883,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); - org.web3j.protocol.core.methods.request.ShhFilter shhFilter = Web3jEndpoint.buildShhFilter(data, topics); + 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 3ed7127e37bd9..87b698b71a7bc 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,6 +56,7 @@ 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. @@ -338,7 +339,7 @@ protected static InputStream readXslTransform(String path) throws Exception { if (path == null) { throw new IllegalArgumentException("path is null"); } - InputStream is = org.apache.camel.util.ObjectHelper.loadResourceAsStream(path); + InputStream is = 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 be2d44fb257af..25ff9d76ec8de 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,6 +21,7 @@ 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 { @@ -44,7 +45,7 @@ public static void initializeSantuario() { //ignore } - org.apache.xml.security.Init.init(); + 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 ab86f047bd4ba..89b5b739786ba 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,6 +26,7 @@ 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; @@ -35,6 +36,7 @@ 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; @@ -54,6 +56,7 @@ 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; @@ -125,7 +128,7 @@ public XMLSecurityDataFormat() { //ignore } - org.apache.xml.security.Init.init(); + Init.init(); if (!wasSet) { try { @@ -342,7 +345,7 @@ private void encryptAsymmetric(Exchange exchange, Document document, OutputStrea // Clean the secret key from memory try { dataEncryptionKey.destroy(); - } catch (javax.security.auth.DestroyFailedException ex) { + } catch (DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } } @@ -372,13 +375,13 @@ private void encryptSymmetric(Exchange exchange, Document document, OutputStream // Clean the secret keys from memory try { dataEncryptionKey.destroy(); - } catch (javax.security.auth.DestroyFailedException ex) { + } catch (DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } try { keyEncryptionKey.destroy(); - } catch (javax.security.auth.DestroyFailedException ex) { + } catch (DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } } @@ -401,7 +404,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 { - java.security.cert.Certificate cert = keystore.getCertificate(alias); + Certificate cert = keystore.getCertificate(alias); if (cert != null) { // Get public key return cert.getPublicKey(); @@ -482,7 +485,7 @@ private Object decodeWithSymmetricKey(Exchange exchange, Document encodedDocumen Object ret = null; try { ret = decode(exchange, encodedDocument, keyEncryptionKey, true); - } catch (org.apache.xml.security.encryption.XMLEncryptionException ex) { + } catch (XMLEncryptionException ex) { if (ex.getMessage().equals("encryption.nokey")) { //the message don't have EncryptionKey, try key directly ret = decode(exchange, encodedDocument, keyEncryptionKey, false); @@ -494,7 +497,7 @@ private Object decodeWithSymmetricKey(Exchange exchange, Document encodedDocumen // Clean the secret key from memory try { keyEncryptionKey.destroy(); - } catch (javax.security.auth.DestroyFailedException ex) { + } catch (DestroyFailedException ex) { LOG.debug("Error destroying key: {}", ex.getMessage()); } @@ -517,7 +520,7 @@ private Object decodeWithAsymmetricKey(Exchange exchange, Document encodedDocume Object ret = null; try { ret = decode(exchange, encodedDocument, keyEncryptionKey, true); - } catch (org.apache.xml.security.encryption.XMLEncryptionException ex) { + } catch (XMLEncryptionException ex) { if (ex.getMessage().equals("encryption.nokey")) { //the message don't have EncryptionKey, try key directly ret = decode(exchange, encodedDocument, keyEncryptionKey, false); @@ -529,7 +532,7 @@ private Object decodeWithAsymmetricKey(Exchange exchange, Document encodedDocume // Clean the private key from memory try { keyEncryptionKey.destroy(); - } catch (javax.security.auth.DestroyFailedException ex) { + } catch (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 0889b66d1847f..45de8606b151a 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 = (java.security.Provider) cons.newInstance(); + Provider provider = (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 6e68523b89f94..622c013c53015 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 = (java.security.Provider) cons.newInstance(); + Provider provider = (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 74472e81be671..159618622bd72 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 = (java.security.Provider) cons.newInstance(); + Provider provider = (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 369c8036e0aa7..6f8c53cf5772e 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,6 +34,7 @@ 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; @@ -80,7 +81,7 @@ public class TestHelper { static { boolean ok = false; try { - org.apache.xml.security.Init.init(); + 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 e3b57d1a6e424..5ab516a556052 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 = (java.security.Provider) cons.newInstance(); + Provider provider = (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 faadda0129761..138cf53aa9157 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,6 +26,13 @@ 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; @@ -45,8 +52,8 @@ public void setUseJsonBody(boolean useJsonBody) { this.useJsonBody = useJsonBody; } - private net.sf.saxon.s9api.Processor saxonProcessor; - private net.sf.saxon.s9api.XPathExecutable saxonJsonToXmlExecutable; + private Processor saxonProcessor; + private XPathExecutable saxonJsonToXmlExecutable; private DocumentBuilder documentBuilder; @Override @@ -84,13 +91,13 @@ protected Source getSource(Exchange exchange, Object body) { private Source convertJsonToXmlSource(String jsonString) { try { - 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(); + XPathSelector selector = getSaxonJsonToXmlExecutable().load(); + selector.setContextItem(new XdmAtomicValue(jsonString)); + XdmValue result = selector.evaluate(); if (!result.isEmpty()) { - net.sf.saxon.s9api.XdmItem item = result.itemAt(0); - if (item instanceof net.sf.saxon.s9api.XdmNode xdmNode) { + XdmItem item = result.itemAt(0); + if (item instanceof 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 @@ -111,10 +118,10 @@ private Source convertJsonToXmlSource(String jsonString) { return null; } - private synchronized net.sf.saxon.s9api.XPathExecutable getSaxonJsonToXmlExecutable() throws SaxonApiException { + private synchronized XPathExecutable getSaxonJsonToXmlExecutable() throws SaxonApiException { if (saxonJsonToXmlExecutable == null) { saxonProcessor = new Processor(false); - net.sf.saxon.s9api.XPathCompiler xpathCompiler = saxonProcessor.newXPathCompiler(); + 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 14e6b041815e8..3aea39c0d2686 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,10 +23,11 @@ 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") -@org.apache.camel.spi.annotations.Component("zeebe") +@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 15472f0ba0a82..ae96a39d801ee 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 org.apache.camel.model.dataformat.ZipFileDataFormat multiEntryZipFormat() { + private 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 99993d0ae06fe..46700aa307513 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(java.util.function.Predicate filter); + Service hasService(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 adf0a3b3f389e..cf0197e0897bf 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,6 +18,7 @@ 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; @@ -275,7 +276,7 @@ public interface FluentProducerTemplate extends Service { * * @param templateCustomizer the customizer */ - FluentProducerTemplate withTemplateCustomizer(java.util.function.Consumer templateCustomizer); + FluentProducerTemplate withTemplateCustomizer(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 7b279bbee92fc..591e8af702b4e 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,6 +17,9 @@ /** * The core Camel API. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 ce38b989e30c5..b340a1c64cc23 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,6 +16,8 @@ */ package org.apache.camel.spi; +import java.util.function.Predicate; + import org.apache.camel.BindToRegistry; /** @@ -97,11 +99,11 @@ default void addCamelBeanPostProjectInjector(CamelBeanPostProcessorInjector inje /** * Custom strategy for handling {@link BindToRegistry} beans and whether they are lazy or not. */ - void setLazyBeanStrategy(java.util.function.Predicate strategy); + void setLazyBeanStrategy(Predicate strategy); /** * Custom strategy for handling {@link BindToRegistry} beans and whether they are lazy or not. */ - java.util.function.Predicate getLazyBeanStrategy(); + 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 521321afa7113..508ab8c2152e9 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,6 +40,7 @@ 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; @@ -71,7 +72,7 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor, Ca protected CamelContext camelContext; protected boolean enabled = true; protected boolean unbindEnabled; - protected java.util.function.Predicate lazyBeanStrategy; + protected Predicate lazyBeanStrategy; public DefaultCamelBeanPostProcessor() { } @@ -483,7 +484,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 = org.apache.camel.util.ObjectHelper.getPropertyName(method); + String propertyName = 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 cebf926661ab8..2a39e1d5b5507 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 org.apache.camel.spi.ConsumerCache getConsumerCache() { + private 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 91f4f57f84b7f..9455fa52f2719 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 org.apache.camel.spi.ProducerCache getProducerCache() { + private 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 fe627dc23f80b..ddc8ac1070116 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,6 +28,7 @@ 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; @@ -42,7 +43,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 org.apache.camel.support.RoutePolicySupport implements CamelContextAware { +public class DurationRoutePolicy extends 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 84909fada5a4f..246034c73e36b 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,6 +25,7 @@ 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; @@ -368,7 +369,7 @@ protected void doResume() { } } - private void routePolicyCallback(java.util.function.BiConsumer callback) { + private void routePolicyCallback(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 81946c834198c..5115984d7be96 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,6 +35,7 @@ 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; @@ -305,8 +306,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 - org.apache.camel.spi.UriEndpoint ann - = ObjectHelper.getAnnotationDeep(target, org.apache.camel.spi.UriEndpoint.class); + UriEndpoint ann + = ObjectHelper.getAnnotationDeep(target, UriEndpoint.class); if (ann != null) { if (ann.producerOnly()) { // skip if the endpoint cannot consume (we need to be able to consume to receive) @@ -330,8 +331,8 @@ protected static Endpoint findMatchingEndpoint(CamelContext camelContext, String } else { target = camelContext.getEndpoint(endpoint); // is the target able to create a consumer - org.apache.camel.spi.UriEndpoint ann - = ObjectHelper.getAnnotationDeep(target, org.apache.camel.spi.UriEndpoint.class); + UriEndpoint ann + = ObjectHelper.getAnnotationDeep(target, 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 6bb9e3a670efa..f15bb94fd69c3 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,6 +20,7 @@ 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; @@ -27,7 +28,7 @@ /** * A language for constant expressions. */ -@org.apache.camel.spi.annotations.Language("constant") +@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 2f3a4c2e44db6..21fc2018c5797 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,6 +18,7 @@ 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; @@ -261,10 +262,10 @@ public static String toJsonBody(Exchange exchange, boolean pretty) { if (body instanceof String str) { return str; } - final java.io.StringWriter writer = new java.io.StringWriter(); + final StringWriter writer = new StringWriter(); try { Jsoner.serializeCarelessly(body, writer); - } catch (final java.io.IOException caught) { + } catch (final 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 bcc0ceb87da03..29d2a9207f255 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,6 +18,7 @@ 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; @@ -25,7 +26,7 @@ /** * A language for header expressions. */ -@org.apache.camel.spi.annotations.Language("header") +@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 ce6d6381cfbc8..da678eccd338e 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,6 +21,7 @@ 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; @@ -30,7 +31,7 @@ /** * A language for referred expressions or predicates. */ -@org.apache.camel.spi.annotations.Language("ref") +@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 09902ffd6fe01..3a17718406b24 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) { - org.apache.camel.util.ObjectHelper.notNull(left, "left node", this); - org.apache.camel.util.ObjectHelper.notNull(right, "right node", this); + ObjectHelper.notNull(left, "left node", this); + 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 { - org.apache.camel.util.ObjectHelper.notNull(left, "left node", this); - org.apache.camel.util.ObjectHelper.notNull(right, "right node", this); + ObjectHelper.notNull(left, "left node", this); + 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 e596c186ee9c4..59d16652403c4 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,6 +21,7 @@ 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; @@ -38,7 +39,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. */ -@org.apache.camel.spi.annotations.Language("tokenize") +@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 76896ae929ef3..ba6a306d4e1bf 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,6 +18,7 @@ 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; @@ -25,7 +26,7 @@ /** * A language for variable expressions. */ -@org.apache.camel.spi.annotations.Language("variable") +@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 e4366e7b7f375..2b93eef7c385b 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,6 +30,7 @@ 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; /** @@ -262,7 +263,7 @@ public LegacyDefaultErrorHandlerBuilder loggingLevel(LoggingLevel level) { * @param log the logger * @return the builder */ - public LegacyDefaultErrorHandlerBuilder log(org.slf4j.Logger log) { + public LegacyDefaultErrorHandlerBuilder log(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 2f74dd05e06ba..7110c7642a6f1 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,6 +60,7 @@ 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; @@ -244,8 +245,8 @@ public void customize(Class type, VoidFunction code) throws Exception } if (obj == null && DataFormat.class.isAssignableFrom(type)) { // it's maybe a dataformat - org.apache.camel.spi.annotations.Dataformat ann - = type.getAnnotation(org.apache.camel.spi.annotations.Dataformat.class); + Dataformat ann + = type.getAnnotation(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 33dad025217fe..689150daa8ec4 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,6 +26,7 @@ import org.apache.camel.Expression; import org.apache.camel.Predicate; +import org.apache.camel.builder.ExpressionClause; import org.apache.camel.model.language.ExpressionDefinition; /** @@ -86,8 +87,8 @@ public void setExpression(ExpressionDefinition expression) { if (expression != null && getExpression() != null && !outputs.isEmpty()) { ExpressionDefinition existing = getExpression(); boolean isExpressionClause - = existing.getExpressionValue() instanceof org.apache.camel.builder.ExpressionClause - || existing.getPredicate() instanceof org.apache.camel.builder.ExpressionClause; + = existing.getExpressionValue() instanceof ExpressionClause + || existing.getPredicate() instanceof 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 a64aa436cb1ff..c11221f1c63f9 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,6 +30,7 @@ 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; @@ -194,7 +195,7 @@ public static void bind(BeanFactoryDefinition def, RouteTemplateContext route PropertyBindingSupport.setPropertiesOnTarget(camelContext, local, props); } if (def.getInitMethod() != null) { - org.apache.camel.support.ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); + ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); } if (def.getDestroyMethod() != null) { routeTemplateContext.registerDestroyMethod(def.getName(), def.getDestroyMethod()); @@ -221,7 +222,7 @@ public static void bind(BeanFactoryDefinition def, RouteTemplateContext route } if (def.getInitMethod() != null) { try { - org.apache.camel.support.ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); + ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); } catch (Exception e) { throw RuntimeCamelException.wrapRuntimeException(e); } @@ -283,7 +284,7 @@ public static void bind(BeanFactoryDefinition def, RouteTemplateContext route } } if (def.getInitMethod() != null) { - org.apache.camel.support.ObjectHelper.invokeMethodSafe(def.getInitMethod(), local); + 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 39a1eb303964f..92217392127e7 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,6 +16,7 @@ */ package org.apache.camel.model; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -43,7 +44,7 @@ public class SetHeadersDefinition extends ProcessorDefinition headers = new java.util.ArrayList<>(); + private List headers = new 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 9187de5302c28..522b36423c0db 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,6 +16,7 @@ */ package org.apache.camel.model; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -41,7 +42,7 @@ public class SetVariablesDefinition extends ProcessorDefinition variables = new java.util.ArrayList<>(); + private List variables = new 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 02d4b1b9f97a4..e7fb1e33e5357 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,6 +28,7 @@ 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 @@ -83,7 +84,7 @@ public void setOutputs(List> outputs) { @Override public String toString() { String desc = description(); - if (org.apache.camel.util.ObjectHelper.isEmpty(desc)) { + if (ObjectHelper.isEmpty(desc)) { return "Transacted"; } else { return "Transacted[" + desc + "]"; @@ -108,7 +109,7 @@ public String getShortName() { @Override public String getLabel() { String desc = description(); - if (org.apache.camel.util.ObjectHelper.isEmpty(desc)) { + if (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 ef60d6c73d8df..1829ffcc1e9da 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,6 +20,9 @@ * 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. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 b1dfb0b7bae01..a2ecc1242525d 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,6 +18,9 @@ * The JAXB POJOs for various configurations for the XML * Configuration of the routing rules. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 ba82f51939b32..9a1fa6036c159 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,6 +18,9 @@ * The JAXB POJOs for the Data Formats used to marshal and * unmarshal objects to and from streams inside components */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 d8086a96cd76d..78934c2a20a28 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,6 +36,7 @@ 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; /** @@ -643,7 +644,7 @@ public DefaultErrorHandlerDefinition loggingLevel(LoggingLevel level) { * @param log the logger * @return the builder */ - public DefaultErrorHandlerDefinition log(org.slf4j.Logger log) { + public DefaultErrorHandlerDefinition log(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 c95be1ced7932..030b995222e4e 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,6 +17,9 @@ /** * The JAXB POJOs for the Error Handler. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 c5f481224232e..1b9735a243805 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,6 +19,9 @@ * Predicate plugins for the * XML Configuration. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 a28a95842767b..e27aead7693d9 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,6 +19,9 @@ * The JAXB POJOs for the Load Balancer EIP pattern for the * XML Configuration. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 9adf5ec265ac2..03e1887e955a6 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,6 +18,9 @@ * The JAXB POJOs for the XML Configuration of the routing * rules. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 8dfb6449b61cf..a990cecc17dc4 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,6 +18,9 @@ /** * The JAXB POJOs for the REST DSL */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 5a408856b1221..b13b28cde90c0 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,6 +19,9 @@ * Predicate plugins for the * XML Configuration. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 54b13e99842ac..3efb354c8285f 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,6 +18,9 @@ * The JAXB POJOs for the Transformers used to transform message * contents according to declared data types inside components */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 fe194b5b94ca9..4c85844775b00 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,6 +18,9 @@ * The JAXB POJOs for the Transformers used to transform message * contents according to declared data types inside components */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 606c6bbd6edcc..d094659d4c859 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,6 +35,7 @@ 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; @@ -92,7 +93,7 @@ public RecipientList(CamelContext camelContext, Expression expression) { public RecipientList(CamelContext camelContext, Expression expression, String delimiter) { notNull(camelContext, "camelContext"); - org.apache.camel.util.ObjectHelper.notNull(expression, "expression"); + 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 9bbb45d426710..960d3299e4d62 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,6 +24,7 @@ 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; @@ -46,7 +47,7 @@ public Policy resolvePolicy(Policy policy, String ref, Class t return policy; } // explicit ref given so lookup by it - if (org.apache.camel.util.ObjectHelper.isNotEmpty(ref)) { + if (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 5b474db7da739..2a6d196213d91 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 org.apache.camel.Route route; + protected final 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 1598470eb095f..4cb2000d415b4 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,6 +16,7 @@ */ package org.apache.camel.reifier; +import java.util.ArrayList; import java.util.List; import org.apache.camel.Expression; @@ -38,8 +39,8 @@ public Processor createProcessor() throws Exception { if (definition.getHeaders().isEmpty()) { throw new IllegalArgumentException("There must be at least one header specified"); } - List nameExprs = new java.util.ArrayList<>(definition.getHeaders().size()); - List valueExprs = new java.util.ArrayList<>(definition.getHeaders().size()); + List nameExprs = new ArrayList<>(definition.getHeaders().size()); + List valueExprs = new 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 90e7ece6c9169..7cec3889264c9 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,6 +16,7 @@ */ package org.apache.camel.reifier; +import java.util.ArrayList; import java.util.List; import org.apache.camel.Expression; @@ -38,8 +39,8 @@ public Processor createProcessor() throws Exception { if (definition.getVariables().isEmpty()) { throw new IllegalArgumentException("There must be at least one variable specified"); } - List nameExprs = new java.util.ArrayList<>(definition.getVariables().size()); - List valueExprs = new java.util.ArrayList<>(definition.getVariables().size()); + List nameExprs = new ArrayList<>(definition.getVariables().size()); + List valueExprs = new 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 d8d7c684f3afa..14800054470e8 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,6 +24,7 @@ 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 { @@ -38,7 +39,7 @@ public TransactedReifier(CamelContext camelContext, ProcessorDefinition defin @Override public Processor createProcessor() throws Exception { Policy policy = resolvePolicy(); - org.apache.camel.util.ObjectHelper.notNull(policy, "policy", this); + 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 a2305b578cb36..3235fbb1b8f7a 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,6 +17,9 @@ /** * The classes for working with Camel and XML along with the primary factory beans. */ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@XmlSchema(namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = 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 55f91d28f0c18..d168acd8b0e69 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,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jakarta.xml.bind.annotation.XmlSchema( +@XmlSchema( namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = 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 3adb9290a7046..ced209a2aa8c9 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(java.lang.String o1, java.lang.String o2) { + public int compare(String o1, 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 c7f4378eecd2c..069c03e9bf2bf 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,6 +17,7 @@ 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; @@ -66,7 +67,7 @@ public void configure() { }; } - private static class EvenPredicate implements java.util.function.Predicate { + private static class EvenPredicate implements 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 ea786c20d7bd6..f3f5b0398f02c 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,6 +20,7 @@ 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; @@ -36,7 +37,7 @@ public boolean isUseRouteBuilder() { void testLoadProperties() { context.start(); - org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); + 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 98e16b4b74869..34ea611fb7707 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,6 +21,7 @@ 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; @@ -43,7 +44,7 @@ public boolean isUseRouteBuilder() { public void testReloadProperties() throws Exception { context.start(); - org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); + PropertiesComponent pc = context.getPropertiesComponent(); Properties prop = pc.loadProperties(); assertNotNull(prop); @@ -70,7 +71,7 @@ public void testReloadProperties() throws Exception { public void testReloadPropertiesPattern() throws Exception { context.start(); - org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); + PropertiesComponent pc = context.getPropertiesComponent(); Properties prop = pc.loadProperties(); assertNotNull(prop); @@ -98,7 +99,7 @@ public void testReloadPropertiesPattern() throws Exception { public void testReloadNotMatch() { context.start(); - org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); + 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 c7768d3341228..b2e6fa95c0680 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,6 +19,7 @@ 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; @@ -26,7 +27,7 @@ public class PropertiesComponentResolvedValueTest extends ContextTestSupport { @Test public void testResolved() { - org.apache.camel.spi.PropertiesComponent pc = context.getPropertiesComponent(); + 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 507f101ec8f6e..d41c2359206a4 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,6 +16,8 @@ */ 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; @@ -38,7 +40,7 @@ public void testXsltException() throws Exception { () -> template.sendBody("direct:start", BAD_XML_STRING), "Except a camel Execution exception here"); - boolean b = ex.getCause() instanceof javax.xml.transform.TransformerException; + boolean b = ex.getCause() instanceof TransformerException; assertTrue(b); // we should not get any message from the result endpoint @@ -56,7 +58,7 @@ public void testXsltWithoutException() throws Exception { () -> template.sendBody("direct:start", GOOD_XML_STRING), "Except a camel Execution exception here"); - boolean b = ex.getCause() instanceof javax.xml.transform.TransformerException; + boolean b = ex.getCause() instanceof 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 71c0fe689a18d..554c524f9be6b 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,12 +16,7 @@ */ package org.apache.camel.converter.stream; -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.io.*; import java.nio.charset.StandardCharsets; import java.util.StringJoiner; @@ -161,7 +156,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"); - java.io.FileInputStream tmpin = new java.io.FileInputStream(new File(file, files[0])); + FileInputStream tmpin = new 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 e760fe644ce2d..2ec56f830e863 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,6 +33,7 @@ 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; @@ -136,7 +137,7 @@ public void setCookiePolicy(CookiePolicy cookiePolicy) { } } - private static class MyComponentConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport + private static class MyComponentConfigurer extends 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 d9224bc8ab409..745b7a672744d 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,6 +28,7 @@ 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; @@ -57,8 +58,8 @@ public void testAutowired() { private static final class MyComponent extends DefaultComponent { - private java.net.ContentHandlerFactory contentHandlerFactory; - private java.net.CookiePolicy cookiePolicy; + private ContentHandlerFactory contentHandlerFactory; + private CookiePolicy cookiePolicy; private MyComponent(CamelContext context) { super(context); @@ -86,7 +87,7 @@ public void setCookiePolicy(CookiePolicy cookiePolicy) { } } - private static class MyComponentConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport + private static class MyComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { @Override @@ -108,7 +109,7 @@ public boolean configure(CamelContext camelContext, Object target, String name, @Override public Class getOptionType(String name, boolean ignoreCase) { if ("contentHandlerFactory".equals(name)) { - return java.net.ContentHandlerFactory.class; + return 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 b2f5e123ad001..ac2c17dd675b6 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, org.apache.camel.Route route) { + public void onServiceAdd(CamelContext context, Service service, Route route) { events.add("onServiceAdd"); } @Override - public void onServiceRemove(CamelContext context, Service service, org.apache.camel.Route route) { + public void onServiceRemove(CamelContext context, Service service, 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 edfe94db1e2d3..f6ee76fde05b4 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,7 +16,9 @@ */ package org.apache.camel.impl.engine; -@org.apache.camel.spi.annotations.Component(value = "MyBean") +import org.apache.camel.spi.annotations.Component; + +@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 3739c16ff4b2c..031cad3972dd1 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,6 +16,8 @@ */ package org.apache.camel.model; +import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -29,7 +31,7 @@ class SetHeadersDefinitionTest extends TestSupport { @Test void testSetFromMap() { - Map headerMap = new java.util.LinkedHashMap<>(3); + Map headerMap = new LinkedHashMap<>(3); headerMap.put("fromBody", body()); headerMap.put("isCamel", ExpressionNodeHelper.toExpressionDefinition(body().contains("Camel"))); headerMap.put("isHorse", ExpressionNodeHelper.toExpressionDefinition(body().contains("Horse"))); @@ -46,7 +48,7 @@ void testSetFromMapOf() { "isCamel", body().contains("Camel"), "isHorse", body().contains("Horse"))); assertNotNull(setHeadersDef.getHeaders()); assertEquals(3, setHeadersDef.getHeaders().size()); - Set names = new java.util.HashSet<>(); + Set names = new 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 e1fca27ec956f..20c835de80c84 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,6 +16,8 @@ */ package org.apache.camel.model; +import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -30,7 +32,7 @@ class SetVariablesDefinitionTest extends TestSupport { @Test void testSetFromMap() { - Map map = new java.util.LinkedHashMap<>(3); + Map map = new LinkedHashMap<>(3); map.put("fromBody", body()); map.put("isCamel", ExpressionNodeHelper.toExpressionDefinition(body().contains("Camel"))); map.put("isHorse", ExpressionNodeHelper.toExpressionDefinition(body().contains("Horse"))); @@ -47,7 +49,7 @@ void testSetFromMapOf() { "isCamel", body().contains("Camel"), "isHorse", body().contains("Horse"))); assertNotNull(def.getVariables()); assertEquals(3, def.getVariables().size()); - Set names = new java.util.HashSet<>(); + Set names = new 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 7b238ee730445..d9928be829df0 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,6 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger; +import org.apache.camel.RecipientList; import org.apache.camel.spi.Registry; public class BeanRecipientListInterfaceAnnotationTest extends BeanRecipientListTest { @@ -34,7 +35,7 @@ protected Registry createCamelRegistry() throws Exception { } interface Route { - @org.apache.camel.RecipientList + @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 dd0e6fffe07a8..36bec8aec17bb 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,6 +19,7 @@ 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; @@ -85,7 +86,7 @@ public String toString() { return "MyBean:" + id; } - @org.apache.camel.RecipientList + @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 095a88fc0377a..86449076fa1e3 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,6 +20,7 @@ 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; @@ -68,7 +69,7 @@ public void configure() { // START SNIPPET: e2 public static class MyBean { - @org.apache.camel.DynamicRouter + @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 fa56e96d4e490..cc57ae7f20149 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,6 +19,7 @@ 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; @@ -80,7 +81,7 @@ public void process(Exchange exchange) { }; } - @org.apache.camel.RecipientList(onPrepare = "myPrepare") + @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 c8388696ce8c1..df64d3010c07d 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,6 +19,7 @@ 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; @@ -83,7 +84,7 @@ public void configure() { public static class WhereToGoBean { - @org.apache.camel.RecipientList(shareUnitOfWork = true) + @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 35cf3535c4cb7..d14a4b6cad877 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,6 +21,7 @@ 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; @@ -185,7 +186,7 @@ public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { public static class MyRecipientBean { - @org.apache.camel.RecipientList(stopOnException = true) + @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 fbe751d8a1145..a052d114813dd 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,6 +20,7 @@ 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; @@ -138,7 +139,7 @@ public boolean isUseRouteBuilder() { public static class MyRecipientBean { - @org.apache.camel.RecipientList(stopOnException = true, parallelProcessing = true) + @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 8ec97b7c27980..0b598d9ff2eeb 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,6 +17,7 @@ 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; @@ -74,7 +75,7 @@ public void configure() { public static class MyBean { - @org.apache.camel.RecipientList + @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 fb92857bc9ede..b7edde03ab45d 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,6 +16,7 @@ */ package org.apache.camel.processor; +import java.util.LinkedHashMap; import java.util.Map; import org.apache.camel.ContextTestSupport; @@ -29,7 +30,7 @@ public class SetHeadersProcessorTest extends ContextTestSupport { public static class HeaderBean { - final Map map = new java.util.LinkedHashMap<>(); + final Map map = new LinkedHashMap<>(); public HeaderBean() { } @@ -44,7 +45,7 @@ Map getHeaders(String body) { } } - private final Map headerMap = new java.util.LinkedHashMap<>(); + private final Map headerMap = new 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 c8bba506e8fee..4c0d5610f947a 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,6 +16,7 @@ */ package org.apache.camel.processor; +import java.util.LinkedHashMap; import java.util.Map; import org.apache.camel.ContextTestSupport; @@ -29,7 +30,7 @@ public class SetVariablesProcessorTest extends ContextTestSupport { public static class VarBean { - final Map map = new java.util.LinkedHashMap<>(); + final Map map = new LinkedHashMap<>(); public VarBean() { } @@ -44,7 +45,7 @@ Map getVariables(String body) { } } - private final Map varMap = new java.util.LinkedHashMap<>(); + private final Map varMap = new 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 c14fded45e14b..6be2a34d93cfe 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,6 +19,7 @@ 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; @@ -44,7 +45,7 @@ public void configure() { }; } - private static class MyProcessor implements Processor, org.apache.camel.Traceable { + private static class MyProcessor implements Processor, 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 f5904163b6a75..f0a20449bf673 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,10 +16,7 @@ */ package org.apache.camel.support.component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; class TestProxy { @@ -79,16 +76,16 @@ public Map greetAll(Map nameMap) { return result; } - public final T sayHiResource(java.util.Set resourceType, String resourceId) { + public final T sayHiResource(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 8315d9f4a66e1..3cd58d8e91e06 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,12 +22,13 @@ 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. */ -@org.apache.camel.spi.annotations.HealthCheck("context-check") +@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 b483188295b0e..4aefc0a0a48be 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,13 +26,14 @@ 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. */ -@org.apache.camel.spi.annotations.HealthCheck("route-controller-check") +@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 4c8543b52719b..483f87f189dbe 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,6 +21,7 @@ import java.util.StringJoiner; import org.apache.camel.health.HealthCheckResultBuilder; +import org.apache.camel.spi.annotations.HealthCheck; import org.apache.camel.util.SecurityViolation; /** @@ -33,7 +34,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. */ -@org.apache.camel.spi.annotations.HealthCheck("security-policy-check") +@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 bbd751cbb94ee..a7b580fe897ad 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 (org.apache.camel.util.ObjectHelper.isNotEmpty(repositories)) { + if (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 f1b46e6a6efc6..917145853f89a 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,6 +18,7 @@ import java.util.Collections; import java.util.LinkedHashSet; +import java.util.Locale; import java.util.Set; import org.apache.camel.spi.BootstrapCloseable; @@ -185,7 +186,7 @@ private static String normalizePolicy(String value) { if (value == null) { return null; } - String normalized = value.toLowerCase(java.util.Locale.ENGLISH); + String normalized = value.toLowerCase(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 a5a679a397fc9..abdfea83fcc1c 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,6 +26,7 @@ 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; @@ -115,7 +116,7 @@ public void setHello(String hello) { } } - private static class MyComponentConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport + private static class MyComponentConfigurer extends 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 b9f18ad2e938e..9f0de001d989d 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,6 +17,8 @@ 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; @@ -455,12 +457,12 @@ public void testSelfSignedCertificateGenerator() throws Exception { Assertions.assertTrue(ks.containsAlias("camel-self-signed")); assertNotNull(ks.getKey("camel-self-signed", "test-password".toCharArray())); - java.security.cert.X509Certificate cert - = (java.security.cert.X509Certificate) ks.getCertificate("camel-self-signed"); + X509Certificate cert + = (X509Certificate) ks.getCertificate("camel-self-signed"); assertNotNull(cert); // verify the certificate has a SAN extension with localhost - java.util.Collection> sans = cert.getSubjectAlternativeNames(); + 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 ef627f2816bc2..521a696bf59b2 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,11 +16,13 @@ */ 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; @@ -90,8 +92,8 @@ public void testHealthCheckDownWithFailViolations() { // create result with a fail-level violation SecurityPolicyResult policyResult = new SecurityPolicyResult( - java.util.List.of( - new org.apache.camel.util.SecurityViolation( + List.of( + new 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 9f1ceb1a40833..a6f8f47fb77d9 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,6 +31,7 @@ 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; @@ -377,7 +378,7 @@ public ObjectName getObjectNameForEventNotifier(CamelContext context, EventNotif } @Override - public ObjectName getObjectNameForRoute(org.apache.camel.Route route) throws MalformedObjectNameException { + public ObjectName getObjectNameForRoute(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 c6441361d8f6b..e9f8f57a5bacb 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,6 +18,7 @@ import java.util.List; import java.util.Map; +import java.util.function.Consumer; import org.apache.camel.CamelContext; import org.apache.camel.spi.LifecycleStrategy; @@ -54,7 +55,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) @@ -64,7 +65,7 @@ public void setupManagement(CamelContext camelContext, ManagementStrategy strate } if (preServices != null && !preServices.isEmpty() && lifecycle instanceof JmxManagementLifecycleStrategy existing) { - for (java.util.function.Consumer pre : preServices) { + for (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 d84d414ff789d..4a9f8e5f04065 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); - org.apache.camel.api.management.mbean.RouteError re = (RouteError) mbeanServer.getAttribute(on, "LastError"); + 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 b0887bd08a8b2..3ff4012392d16 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,6 +22,7 @@ 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; @@ -65,7 +66,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(org.apache.camel.ServiceStatus.Started.name(), state, "Should be started"); + assertEquals(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 e691ac749a09b..5d6d29d06be36 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 { - org.apache.camel.support.ObjectHelper.invokeMethodSafe(initMethod, bean); + 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 { - org.apache.camel.support.ObjectHelper.invokeMethodSafe(destroyMethod, target); + 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 7218c2ba55c1e..14db96b922eaa 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, org.apache.camel.Route route) { + public void onServiceAdd(CamelContext context, Service service, Route route) { // noop } @Override - public void onServiceRemove(CamelContext context, Service service, org.apache.camel.Route route) { + public void onServiceRemove(CamelContext context, Service service, 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 42d364542a5e4..e43758f5bfaac 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 { - org.apache.camel.support.ObjectHelper.invokeMethodSafe(method, bean); + 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 6d6f1e4ce3e2a..1d7ddf67a898b 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) { - org.apache.camel.support.ObjectHelper.invokeMethod(method, newTarget, obj); + 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 49c0ed3132b67..49d63c3005b32 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,6 +16,8 @@ */ 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; @@ -2810,10 +2812,10 @@ private static String prettyXml(String rawXml) { } private static String serializeCarelessly(Object value) { - final java.io.StringWriter writer = new java.io.StringWriter(); + final StringWriter writer = new StringWriter(); try { Jsoner.serializeCarelessly(value, writer); - } catch (final java.io.IOException caught) { + } catch (final 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 e8c621ecf0fb9..81ece9086cade 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,6 +40,7 @@ import javax.naming.spi.NamingManager; import org.apache.camel.util.CastUtils; +import org.apache.camel.util.ObjectHelper; /** * A default JNDI context @@ -109,8 +110,8 @@ boolean isFrozen() { * (the names are suitably extended by the segment originally lopped off). */ protected Map internalBind(String name, Object value) throws NamingException { - org.apache.camel.util.ObjectHelper.notNullOrEmpty(name, "name"); - org.apache.camel.util.ObjectHelper.notNull(frozen, "frozen"); + ObjectHelper.notNullOrEmpty(name, "name"); + ObjectHelper.notNull(frozen, "frozen"); Map newBindings = new HashMap<>(); int pos = name.indexOf('/'); @@ -122,7 +123,7 @@ protected Map internalBind(String name, Object value) throws Nam newBindings.put(name, value); } else { String segment = name.substring(0, pos); - org.apache.camel.util.ObjectHelper.notNullOrEmpty(segment, "segment"); + 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 781de63fad044..1a370d5a60756 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,6 +32,7 @@ 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; @@ -162,7 +163,7 @@ public static void registerBeans(CamelContext camelContext, Set packages String method = entry.getValue(); // phase-5: now call init method on created beans try { - org.apache.camel.support.ObjectHelper.invokeMethodSafe(method, bean); + 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 4d4a80ba5b05d..bf539d8a83b46 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,6 +42,7 @@ 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; @@ -492,7 +493,7 @@ public static void closeIterator(Object it) throws IOException { if (it instanceof Closeable closeable) { IOHelper.closeWithException(closeable); } - if (it instanceof java.util.Scanner scanner) { + if (it instanceof 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 9316bdf8ae869..497afb0977446 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) { - org.apache.camel.util.ObjectHelper.notNull(supplier, "Supplier"); + 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 (org.apache.camel.util.ObjectHelper.isEmpty(name)) { + if (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 * @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 63ba11da1b72b..fdb98e05e0022 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(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (TransformerConfigurationException e) { LOG.warn("TransformerFactory doesn't support the feature {} with value {}, due to {}.", - javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); + 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(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); + sfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (Exception e) { LOG.warn("SAXParser doesn't support the feature {} with value {}, due to {}.", - javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage()); + 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 1329c00dc5a1e..f9d7fc62a7a7c 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 org.w3c.dom.Element) { + if (parentNode instanceof 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 a473e537c9165..97fb40fde2617 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(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); } catch (TransformerConfigurationException e) { LOG.warn("TransformerFactory doesn't support the feature {} with value {}, due to {}.", - javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e.getMessage(), e); + 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 6b7d736417607..d0ac8e872decc 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,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.Reader; import javax.xml.transform.stream.StreamSource; @@ -67,7 +68,7 @@ public StreamSourceCache(StreamCache streamCache) { this.readCache = null; } else if (streamCache instanceof ReaderCache readerCache) { this.readCache = readerCache; - setReader((java.io.Reader) streamCache); + setReader((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 6f71d159b2436..0fba4ee4d9114 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 org.apache.camel.yaml.out.ModelWriter(sw).writeRoutesDefinition(routesDefinition.get()); + new 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 aa454cccbabb2..bcfac837bd932 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,6 +22,7 @@ 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; @@ -212,7 +213,7 @@ protected Integer export() throws Exception { Path buildDir = Paths.get(EXPORT_DIR); try { Files.walk(buildDir) - .sorted(java.util.Comparator.reverseOrder()) + .sorted(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 5854f14979d9c..319f783da2a58 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,6 +20,7 @@ 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; @@ -602,7 +603,7 @@ private String sendStreamingRequest(String url, JsonObject body) { printer().println(); return fullResponse.toString(); - } catch (java.net.http.HttpTimeoutException e) { + } catch (HttpTimeoutException e) { printer().printErr("\nRequest timed out after " + timeout + " seconds."); return null; } catch (Exception e) { @@ -632,7 +633,7 @@ private JsonObject sendRequest(String url, JsonObject body, String authKey) { handleErrorStatus(response.statusCode(), response.body()); return null; - } catch (java.net.http.HttpTimeoutException e) { + } catch (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 a07b0651fea5a..125be1559e744 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,6 +16,7 @@ */ package org.apache.camel.dsl.jbang.core.commands; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -1255,7 +1256,7 @@ protected static String jkubeMavenPluginVersion(Path settings, Properties props) // This method is kept for backward compatibility with derived classes @Deprecated - protected void safeCopy(java.io.File source, java.io.File target, boolean override) throws Exception { + protected void safeCopy(File source, File target, boolean override) throws Exception { ExportHelper.safeCopy(source.toPath(), target.toPath(), override); } @@ -1297,7 +1298,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, java.io.File target) throws Exception { + protected void safeCopy(InputStream source, File target) throws Exception { ExportHelper.safeCopy(source, target.toPath()); } @@ -1465,7 +1466,7 @@ protected void copyApplicationPropertiesFiles(Path srcResourcesDir) throws Excep // This method is kept for backward compatibility with derived classes @Deprecated - protected void copyApplicationPropertiesFiles(java.io.File srcResourcesDir) throws Exception { + protected void copyApplicationPropertiesFiles(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 2fcc6fb4b470a..e7f5a2fca0e6e 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,6 +20,7 @@ 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; @@ -646,7 +647,7 @@ private String sendStreamingRequest(String requestUrl, JsonObject body) { printer().println(); return fullResponse.toString(); - } catch (java.net.http.HttpTimeoutException e) { + } catch (HttpTimeoutException e) { printer().printErr("\nRequest timed out after " + timeout + " seconds."); return null; } catch (Exception e) { @@ -676,7 +677,7 @@ private JsonObject sendRequest(String requestUrl, JsonObject body, String authKe handleErrorStatus(response.statusCode(), response.body()); return null; - } catch (java.net.http.HttpTimeoutException e) { + } catch (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 a0f65cf76e467..e3e3f42ca0375 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,6 +16,7 @@ */ package org.apache.camel.dsl.jbang.core.commands; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -234,7 +235,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(java.io.File.separatorChar, '.'); + String packageName = packagePath.replace(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 9e21ceedead18..83383946d44c9 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(java.util.Comparator.reverseOrder()) + files.sorted(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 b315fafafd626..4198263a5d77f 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,6 +16,7 @@ */ 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; @@ -224,7 +225,7 @@ public static String findMavenProperty(Path pomPath, String placeholder, MavenDe // Keep for backward compatibility @Deprecated - public static String findMavenProperty(java.io.File f, String placeholder, MavenDependencyDownloader downloader) { + public static String findMavenProperty(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 81f85fb3d84a8..20c7f91a4810e 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,10 +22,7 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; -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.dsl.jbang.core.common.*; import org.apache.camel.util.CamelCaseOrderedProperties; import org.apache.camel.util.FileUtil; import picocli.CommandLine; @@ -162,7 +159,7 @@ protected Integer export() throws Exception { } } // cleanup dir after complete - org.apache.camel.dsl.jbang.core.common.PathUtils.deleteDirectory(buildDir); + 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 4eba851ed482d..60fab48d5ec0c 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,6 +21,7 @@ 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; @@ -157,7 +158,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, java.util.function.Consumer configureAction) { + protected Path prepareAction(String pid, String action, 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 cc351121743a7..7a3616d668f64 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,6 +16,7 @@ */ 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; @@ -150,7 +151,7 @@ public Integer doCall() throws Exception { currentY = lr.maxY + RouteDiagramLayoutEngine.V_GAP; } - java.awt.image.BufferedImage 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/commands/action/RouteDiagramRenderer.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteDiagramRenderer.java index a49d024ed4d27..9265f5a138a97 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteDiagramRenderer.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteDiagramRenderer.java @@ -32,6 +32,7 @@ import org.apache.camel.dsl.jbang.core.commands.action.RouteDiagramLayoutEngine.RouteInfo; import org.apache.camel.dsl.jbang.core.commands.action.RouteDiagramLayoutEngine.TreeNode; import org.apache.camel.dsl.jbang.core.common.Printer; +import org.jline.utils.Colors; import static org.apache.camel.dsl.jbang.core.commands.action.RouteDiagramLayoutEngine.NODE_HEIGHT; import static org.apache.camel.dsl.jbang.core.commands.action.RouteDiagramLayoutEngine.NODE_WIDTH; @@ -121,9 +122,9 @@ private static Color parseColor(String value) { return null; } } - Integer idx = org.jline.utils.Colors.rgbColor(value); + Integer idx = Colors.rgbColor(value); if (idx != null) { - return new Color(org.jline.utils.Colors.rgbColor(idx.intValue())); + return new Color(Colors.rgbColor(idx.intValue())); } return null; } 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 1840bd20712ce..773978829eea0 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,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.util.Comparator; import java.util.stream.Stream; /** @@ -99,7 +100,7 @@ public static boolean deleteDirectory(Path directory) { } try (Stream paths = Files.walk(directory)) { - paths.sorted(java.util.Comparator.reverseOrder()) + paths.sorted(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 f5d2e31ad1ba9..82f79c6b9025c 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,6 +30,7 @@ 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; @@ -63,7 +64,7 @@ public void setup() throws IOException { @AfterEach public void end() throws IOException { // force removing, since deleteOnExit is not removing. - org.apache.camel.util.FileUtil.removeDir(workingDir); + 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 9e6aceea6ee71..66c1a77d0cb2e 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 @@ -27,6 +27,8 @@ import org.apache.camel.dsl.jbang.core.commands.action.RouteDiagramLayoutEngine.TreeNode; import org.apache.camel.dsl.jbang.core.commands.action.RouteDiagramRenderer.DiagramColors; import org.apache.camel.dsl.jbang.core.common.Printer; +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; @@ -401,7 +403,7 @@ void testTextDiagramEmptyRoute() { @Test void testParseRoutesEmpty() { - org.apache.camel.util.json.JsonObject jo = new org.apache.camel.util.json.JsonObject(); + JsonObject jo = new JsonObject(); CamelRouteDiagramAction action = new CamelRouteDiagramAction(null); List routes = action.parseRoutes(jo); assertTrue(routes.isEmpty()); @@ -409,28 +411,28 @@ void testParseRoutesEmpty() { @Test void testParseRoutesWithData() { - org.apache.camel.util.json.JsonObject line1 = new org.apache.camel.util.json.JsonObject(); + JsonObject line1 = new JsonObject(); line1.put("type", "from"); line1.put("code", "timer:tick"); line1.put("level", 0); - org.apache.camel.util.json.JsonObject line2 = new org.apache.camel.util.json.JsonObject(); + JsonObject line2 = new JsonObject(); line2.put("type", "to"); line2.put("code", "log:a"); line2.put("level", 1); - org.apache.camel.util.json.JsonArray code = new org.apache.camel.util.json.JsonArray(); + JsonArray code = new JsonArray(); code.add(line1); code.add(line2); - org.apache.camel.util.json.JsonObject routeObj = new org.apache.camel.util.json.JsonObject(); + JsonObject routeObj = new JsonObject(); routeObj.put("routeId", "route1"); routeObj.put("code", code); - org.apache.camel.util.json.JsonArray routesArr = new org.apache.camel.util.json.JsonArray(); + JsonArray routesArr = new JsonArray(); routesArr.add(routeObj); - org.apache.camel.util.json.JsonObject jo = new org.apache.camel.util.json.JsonObject(); + JsonObject jo = new 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 9f638f385b2ba..a51ed3eb5ffc8 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,6 +43,7 @@ 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. @@ -228,7 +229,7 @@ private String transformXmlToYaml(String xml) throws Exception { } StringWriter sw = new StringWriter(); - new org.apache.camel.yaml.out.ModelWriter(sw).writeRoutesDefinition(routes); + new 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 9e2546a8ca427..8ff6121fd3be1 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,6 +16,8 @@ */ 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; @@ -29,7 +31,7 @@ class DependencyCheckToolsTest { DependencyCheckToolsTest() { tools = new DependencyCheckTools(); CatalogService catalogService = new CatalogService(); - catalogService.catalogRepos = java.util.Optional.empty(); + catalogService.catalogRepos = 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 12fbf33b84040..581d8ee5d6e8f 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,6 +16,8 @@ */ 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; @@ -29,7 +31,7 @@ class DiagnoseToolsTest { DiagnoseToolsTest() { tools = new DiagnoseTools(); CatalogService catalogService = new CatalogService(); - catalogService.catalogRepos = java.util.Optional.empty(); + catalogService.catalogRepos = 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 d561ffacf828f..da5d5760779ea 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,6 +17,7 @@ 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; @@ -39,7 +40,7 @@ class TestScaffoldToolsTest { private static CatalogService createCatalogService() { CatalogService service = new CatalogService(); - service.catalogRepos = java.util.Optional.empty(); + service.catalogRepos = 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 0935dced4c0f5..f6f7817d8bc3f 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 picocli.CommandLine(new CodeGenerator(main)) + var cmd = new 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 6cc0172093a6f..867af260e59cd 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,6 +24,7 @@ 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; @@ -67,8 +68,8 @@ public void shouldAddKnativeServiceSpec(RuntimeType rt) throws Exception { Assertions.assertFalse(hasService(rt)); Assertions.assertTrue(hasKnativeService(rt)); - io.fabric8.knative.serving.v1.Service service - = getResource(rt, io.fabric8.knative.serving.v1.Service.class) + Service service + = getResource(rt, 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 accb3efd8bdf4..cbd2e3022b0c6 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,6 +50,7 @@ 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", @@ -94,7 +95,7 @@ public Integer doCall() throws Exception { loadCatalog(); try (var tui = TuiRunner.create()) { - sun.misc.Signal.handle(new sun.misc.Signal("INT"), sig -> tui.quit()); + Signal.handle(new 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 913b55f861db5..3b1e60b2df79c 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,6 +22,7 @@ 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; @@ -32,6 +33,8 @@ 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; @@ -73,6 +76,7 @@ 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; @@ -173,7 +177,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 - sun.misc.Signal.handle(new sun.misc.Signal("INT"), sig -> tui.quit()); + Signal.handle(new Signal("INT"), sig -> tui.quit()); tui.run( this::handleEvent, this::render); @@ -1083,7 +1087,7 @@ 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 java.util.regex.Pattern LOG_PATTERN = java.util.regex.Pattern.compile( + private static final Pattern LOG_PATTERN = 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+" @@ -1094,7 +1098,7 @@ private static LogEntry parseLogLine(String line) { LogEntry entry = new LogEntry(); entry.raw = line; try { - java.util.regex.Matcher m = LOG_PATTERN.matcher(line); + 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) @@ -1615,8 +1619,8 @@ private TraceEntry parseTraceEntry(JsonObject json, String pid) { Object tsObj = json.get("timestamp"); if (tsObj instanceof Number n) { long epochMs = n.longValue(); - entry.timestamp = java.time.Instant.ofEpochMilli(epochMs) - .atZone(java.time.ZoneId.systemDefault()) + entry.timestamp = Instant.ofEpochMilli(epochMs) + .atZone(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 ff65d4bc21ef2..e8eb934667963 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 picocli.CommandLine(new TuiCommand(main, classLoader)) + var cmd = new 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 56dec5ef545ba..0bd2a87733a18 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,6 +31,7 @@ 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; @@ -104,7 +105,7 @@ private void downloadLoader(String groupId, String artifactId, String version) { } protected void autoConfigure(String key) { - var config = new org.apache.camel.util.OrderedLocationProperties(); + var config = new 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 6731c8038cb0c..59bf9a8dda12d 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 = org.apache.camel.model.KameletDefinition.class, + types = 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 ceda72ff9c27f..e587b71ef4a0a 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,6 +27,7 @@ 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; @@ -79,7 +80,7 @@ protected void setProperties(OutputAwareFromDefinition target, MappingNode node) setDeserializationContext(val, dc); - key = org.apache.camel.util.StringHelper.dashToCamelCase(key); + key = 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 4d80feba7015f..45f0dbdab21cc 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,6 +30,7 @@ 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; @@ -37,7 +38,7 @@ @YamlIn @YamlType( inline = false, - types = org.apache.camel.model.RouteConfigurationDefinition.class, + types = RouteConfigurationDefinition.class, order = YamlDeserializerResolver.ORDER_DEFAULT, nodes = { "routeConfiguration" }, properties = { @@ -79,7 +80,7 @@ public Object construct(Node node) { String key = asText(tuple.getKeyNode()); Node val = tuple.getValueNode(); - key = org.apache.camel.util.StringHelper.dashToCamelCase(key); + key = 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 90567986a2819..ab0f0868fe063 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,6 +28,7 @@ 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; @@ -89,7 +90,7 @@ protected void setProperties(RouteDefinition target, MappingNode node) { setDeserializationContext(val, dc); - key = org.apache.camel.util.StringHelper.dashToCamelCase(key); + key = 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 c2139b4ecf95a..2322b47349f3e 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,6 +19,7 @@ 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; @@ -27,13 +28,14 @@ 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 = org.apache.camel.model.RouteTemplateDefinition.class, - order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, + types = RouteTemplateDefinition.class, + order = YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { @YamlProperty(name = "id", type = "string", @@ -65,7 +67,7 @@ protected RouteTemplateDefinition newInstance() { protected boolean setProperty( RouteTemplateDefinition target, String propertyKey, String propertyName, Node node) { - propertyKey = org.apache.camel.util.StringHelper.dashToCamelCase(propertyKey); + propertyKey = 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 162e34c9bc8bb..93f4f62a4cbcf 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,19 +19,21 @@ 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 = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, + order = YamlDeserializerResolver.ORDER_LOWEST - 1, properties = { @YamlProperty(name = "routeId", type = "string"), @@ -62,7 +64,7 @@ protected TemplatedRouteDefinition newInstance() { protected boolean setProperty( TemplatedRouteDefinition target, String propertyKey, String propertyName, Node node) { - propertyKey = org.apache.camel.util.StringHelper.dashToCamelCase(propertyKey); + propertyKey = StringHelper.dashToCamelCase(propertyKey); switch (propertyKey) { case "routeId": { target.setRouteId(asText(node)); diff --git a/parent/pom.xml b/parent/pom.xml index 23ab701136ce4..e51cb3412ee5a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3912,6 +3912,7 @@ rewrite-maven-plugin ${rewrite-maven-plugin-version} + true org.openrewrite.java.ShortenFullyQualifiedTypeReferences @@ -4209,9 +4210,9 @@ shorten-fqcn - run + runNoFork - process-sources + process-classes 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 161548c2726c4..bdbf0e66181f0 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,6 +25,7 @@ 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; @@ -406,7 +407,7 @@ private void installJBang() { ProcessBuilder pb; if (IS_WINDOWS) { String script = "iex \"& { $(iwr -useb https://ps.jbang.dev) } app setup\""; - String encoded = java.util.Base64.getEncoder().encodeToString( + String encoded = 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 bf641dd711440..57cdc32d8abec 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,6 +19,7 @@ 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; @@ -47,8 +48,8 @@ public TestInfraIggyContainer() { // Required capabilities for Iggy container as per docker-compose withCreateContainerCmdModifier(cmd -> { cmd.getHostConfig() - .withCapAdd(com.github.dockerjava.api.model.Capability.SYS_NICE) - .withSecurityOpts(java.util.List.of("seccomp:unconfined")) + .withCapAdd(Capability.SYS_NICE) + .withSecurityOpts(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 e1b2a981c1133..b2f58ae3213a3 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,6 +18,8 @@ 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; @@ -107,7 +109,7 @@ private int resolveHostPort() { private static int findFreePort() { try (ServerSocket socket = new ServerSocket()) { socket.setReuseAddress(true); - socket.bind(new java.net.InetSocketAddress((java.net.InetAddress) null, 0), 1); + socket.bind(new InetSocketAddress((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 e787f2812fb71..9a362ccb6389a 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,6 +18,8 @@ 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; @@ -106,7 +108,7 @@ private int resolveHostPort() { private static int findFreePort() { try (ServerSocket socket = new ServerSocket()) { socket.setReuseAddress(true); - socket.bind(new java.net.InetSocketAddress((java.net.InetAddress) null, 0), 1); + socket.bind(new InetSocketAddress((InetAddress) null, 0), 1); return socket.getLocalPort(); } catch (IOException e) { throw new RuntimeException("Failed to find a free port", e); 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 7224dd5fd1650..9592e1e2bed42 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,10 +16,12 @@ */ 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; @@ -47,7 +49,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 java.net.URL WSDL_LOC; + private static final URL WSDL_LOC; static { WSDL_LOC = GreeterClientTest.class.getClassLoader().getResource("wsdl/hello_world.wsdl"); } @@ -59,7 +61,7 @@ public class GreeterClientTest { protected CamelContext camelContext; protected String sendMessageWithUsernameToken(String username, String password, String message) throws Exception { - final jakarta.xml.ws.Service svc = jakarta.xml.ws.Service.create(WSDL_LOC, SERVICE_QNAME); + final Service svc = 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 a9f2c167d616a..94a94b8a119ee 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,11 +18,12 @@ 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; -@jakarta.jws.WebService(portName = "SoapOverHttp", serviceName = "SOAPService", +@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") 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 f49523c101b77..adb80c0b62a85 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,6 +44,8 @@ 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; @@ -212,9 +214,9 @@ private void configureRepositoriesForEmbeddedMode() { .collect(Collectors.toSet()); for (String profileId : settings.getActiveProfiles()) { - org.apache.maven.settings.Profile profile = settings.getProfilesAsMap().get(profileId); + Profile profile = settings.getProfilesAsMap().get(profileId); if (profile != null) { - for (org.apache.maven.settings.Repository repo : profile.getRepositories()) { + for (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 ed51e9a2f3354..c9ea6043aed80 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,6 +23,7 @@ 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; @@ -835,11 +836,11 @@ public static JsonObject asJsonObject(JBangModel model) { private static JsonObject asGroupedOptionsJson( List groups, - java.util.function.Function groupName, - java.util.function.Function groupDescription, - java.util.function.Function groupSourceType, + Function groupName, + Function groupDescription, + Function groupSourceType, List options, - java.util.function.Function optionSourceType) { + 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 7a0421e1c248d..47d0a5024da1d 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; } - java.util.Optional o = doPath(path.substring(0, pos)); + 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; - java.util.Optional o = doPath(path); + 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 b5fcb55da5c4b..60bc62ce6f632 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,6 +16,12 @@ */ 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 @@ -133,7 +139,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 java.io.Reader zzReader; + private Reader zzReader; /** the current state of the DFA */ private int zzState; @@ -190,7 +196,7 @@ class Yylex { * * @param in the java.io.Reader to read input from. */ - Yylex(java.io.Reader in) { + Yylex(Reader in) { this.zzReader = in; } @@ -199,8 +205,8 @@ class Yylex { * * @param in the java.io.Inputstream to read input from. */ - Yylex(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); + Yylex(InputStream in) { + this(new InputStreamReader(in)); } private static int[] zzUnpackAction() { @@ -293,7 +299,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 java.io.IOException { + private boolean zzRefill() throws IOException { /* first: make room (if you can) */ if (zzStartRead > 0) { @@ -340,7 +346,7 @@ private boolean zzRefill() throws java.io.IOException { /** * Closes the input stream. */ - public final void yyclose() throws java.io.IOException { + public final void yyclose() throws IOException { zzAtEOF = true; /* indicate end of file */ zzEndRead = zzStartRead; /* invalidate buffer */ @@ -356,7 +362,7 @@ public final void yyclose() throws java.io.IOException { * * @param reader the new input stream */ - public final void yyreset(java.io.Reader reader) { + public final void yyreset(Reader reader) { zzReader = reader; zzAtBOL = true; zzAtEOF = false; @@ -448,7 +454,7 @@ public void yypushback(int number) { * @return the next token * @exception java.io.IOException if any I/O-Error occurs */ - public Yytoken yylex() throws java.io.IOException, DeserializationException { + public Yytoken yylex() throws IOException, DeserializationException { int zzInput; int zzAction; @@ -593,7 +599,7 @@ public Yytoken yylex() throws java.io.IOException, DeserializationException { case 35: break; case 2: { - java.math.BigDecimal val = new java.math.BigDecimal(yytext()); + BigDecimal val = new 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 e5614031299a6..d2bc454581200 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 (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 9023b28c54b6b..8d8503791c3ba 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,6 +30,7 @@ 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; @@ -296,7 +297,7 @@ private void updateSensitiveJsonSchema(File camelDir, Set secrets) throw } private static void collectSecretOption( - org.apache.camel.tooling.model.BaseOptionModel o, Set secrets) { + BaseOptionModel o, Set secrets) { if (o.isSecret() || SECRET.equals(o.getSecurity())) { String key = o.getName().toLowerCase(Locale.ENGLISH); key = key.replace("-", ""); @@ -305,7 +306,7 @@ private static void collectSecretOption( } private static void collectSecurityOption( - org.apache.camel.tooling.model.BaseOptionModel o, Map securityOptions) { + 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 fbb12ca2fc33c..a0becc4767918 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 java.lang.String PLAYBOOK = "antora-playbook-local-xref-check.yml"; + public static final 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 11699c654ba86..06375a07d6f78 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,6 +35,7 @@ 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; @@ -148,14 +149,14 @@ public void execute() throws MojoExecutionException, MojoFailureException { final Model camelParentPomXmlModel; try (Reader r = Files.newBufferedReader(camelParentPomXmlPath, charset)) { - camelParentPomXmlModel = new org.apache.maven.model.io.xpp3.MavenXpp3Reader().read(r); + camelParentPomXmlModel = new 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 org.apache.maven.model.io.xpp3.MavenXpp3Reader().read(r); + camelPomXmlModel = new MavenXpp3Reader().read(r); } catch (XmlPullParserException | IOException e) { throw new RuntimeException("Could not parse " + camelPomXmlPath, e); } From 0ae16e36719bda07249d7dad8ed4489d85e60de6 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 5 May 2026 15:02:51 +0200 Subject: [PATCH 3/6] Fix missing Colors import after merge conflict resolution Co-Authored-By: Claude Opus 4.6 (1M context) --- .../main/java/org/apache/camel/diagram/RouteDiagramRenderer.java | 1 + 1 file changed, 1 insertion(+) 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 20045c3b22cf6..5bf1f847fd734 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 @@ -32,6 +32,7 @@ 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.NODE_HEIGHT; import static org.apache.camel.diagram.RouteDiagramLayoutEngine.NODE_WIDTH; From 9dcd825cf077bc3b03501c0b647edf687f89f36d Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 5 May 2026 23:22:27 +0200 Subject: [PATCH 4/6] Fix missing JsonObject/JsonArray imports after merge conflict resolution Co-Authored-By: Claude Opus 4.6 (1M context) --- .../jbang/core/commands/action/CamelRouteDiagramActionTest.java | 2 ++ 1 file changed, 2 insertions(+) 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 a849e5635dc5d..3527814fa2d73 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 @@ -19,6 +19,8 @@ import java.util.List; 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; From 37e5c5e489ff1c89e3cf4e93a04b6c62cf3560a0 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 6 May 2026 10:10:42 +0200 Subject: [PATCH 5/6] Merge origin/main and fix FQCNs in merged code Co-Authored-By: Claude Opus 4.6 (1M context) --- .../api/guardrails/PromptInjectionGuardrailTest.java | 1 - .../component/as2/AS2ServerWildcardPatternIT.java | 1 - .../camel/avro/generated/KeyValueProtocol.java | 1 - .../component/avro/spi/JettyHttpServerFactory.java | 2 +- .../runtime/integration/BedrockGuardrailsIT.java | 1 - .../runtime/integration/BedrockProducerIT.java | 1 - .../component/cxf/multipart/MultiPartInvokeImpl.java | 8 ++++---- .../component/cxf/soap/headers/HeaderTesterImpl.java | 4 ++-- .../component/cxf/multipart/MultiPartInvokeImpl.java | 8 ++++---- .../component/cxf/soap/headers/HeaderTesterImpl.java | 4 ++-- .../component/cxf/wssecurity/server/GreeterImpl.java | 10 +++++----- .../cxf/common/header/CxfHeaderHelperTest.java | 1 - .../cxf/transport/JaxWSCamelTestSupport.java | 1 - .../camel/component/flink/DataStreamEdgeCasesIT.java | 1 - .../github/producer/PullRequestFilesProducer.java | 1 - .../google/calendar/CalendarCalendarListIT.java | 1 - .../drive/InteractiveGoogleDriveClientFactory.java | 2 +- .../component/google/mail/GmailUsersMessagesIT.java | 4 ++-- .../component/google/mail/GmailUsersThreadsIT.java | 10 +++++----- .../component/iggy/client/IggyClientFactory.java | 1 - .../camel/converter/jaxb/address/package-info.java | 2 +- .../camel/converter/jaxb/person/package-info.java | 2 +- .../component/jms/JmsObjectMessageEnabledTest.java | 1 - .../RestOpenApiReaderFileResponseModelTest.java | 1 - .../component/pqc/PQCEndToEndIntegrationTest.java | 4 ++-- .../salesforce/api/dto/bulk/package-info.java | 2 +- .../salesforce/internal/SalesforceSession.java | 4 ++-- .../schematron/processor/TemplatesFactory.java | 3 ++- .../sjms/producer/SjmsObjectMessageEnabledTest.java | 5 ++++- .../springai/chat/SpringAiChatComponentTest.java | 1 - .../java/net/javacrumbs/calc/model/package-info.java | 2 +- .../camel/component/spring/ws/jaxb/package-info.java | 2 +- .../org/apache/camel/spring/xml/package-info.java | 2 +- .../camel/component/thrift/generated/Calculator.java | 2 +- .../component/thrift/generated/InvalidOperation.java | 2 +- .../camel/component/thrift/generated/Operation.java | 1 + .../camel/component/thrift/generated/Work.java | 2 +- .../camel/dataformat/thrift/generated/Operation.java | 1 + .../camel/dataformat/thrift/generated/Work.java | 2 +- .../src/main/java/org/apache/camel/package-info.java | 2 +- .../org/apache/camel/model/app/package-info.java | 2 +- .../org/apache/camel/model/config/package-info.java | 2 +- .../apache/camel/model/dataformat/package-info.java | 2 +- .../camel/model/errorhandler/package-info.java | 2 +- .../apache/camel/model/language/package-info.java | 2 +- .../camel/model/loadbalancer/package-info.java | 2 +- .../java/org/apache/camel/model/package-info.java | 2 +- .../org/apache/camel/model/rest/package-info.java | 2 +- .../apache/camel/model/tokenizer/package-info.java | 2 +- .../apache/camel/model/transformer/package-info.java | 2 +- .../apache/camel/model/validator/package-info.java | 2 +- .../java/org/apache/camel/core/xml/package-info.java | 2 +- .../camel/core/xml/util/jsse/package-info.java | 4 ++-- .../commands/action/CamelRouteDiagramActionTest.java | 12 ++++++------ .../mock/AudioTranscriptionResponseBuilder.java | 11 +++++++---- 55 files changed, 76 insertions(+), 81 deletions(-) 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 9e80744df0e3f..63a2a369a4f98 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 @@ -18,7 +18,6 @@ import java.util.regex.Pattern; - import dev.langchain4j.data.message.UserMessage; import dev.langchain4j.guardrail.InputGuardrailResult; import org.junit.jupiter.api.Test; 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 e74a239cd0467..b3f9a6114d802 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 @@ -18,7 +18,6 @@ import java.security.cert.Certificate; - import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.as2.api.*; 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 772f4f12d60fe..68afd461512f9 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 @@ -23,7 +23,6 @@ import java.io.IOException; - import org.apache.avro.AvroRemoteException; import org.apache.avro.Protocol; 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 55b77e9665598..c74128f9840fb 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 @@ -17,11 +17,11 @@ package org.apache.camel.component.avro.spi; import java.io.IOException; -import org.apache.camel.spi.annotations.JdkService; 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 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 65f2b9bd834ea..77dcadd078ece 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 @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; - import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; 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 6b996ac49f449..9e96e0bbeea95 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 @@ -19,7 +19,6 @@ 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; 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 0697c8da059ef..3359361173b39 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 @@ -25,10 +25,10 @@ import org.slf4j.LoggerFactory; @WebService( - serviceName = "MultiPartInvokeService", - portName = "MultiPartInvokePort", - targetNamespace = "http://adapter.ti.tongtech.com/ws", - endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke") + 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 006f5a2b14873..27e47d53229dd 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 @@ -41,8 +41,8 @@ import org.slf4j.LoggerFactory; @WebService(serviceName = "HeaderService", - targetNamespace = "http://apache.org/camel/cxf/soap/headers", - endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") + 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); 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 0697c8da059ef..3359361173b39 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 @@ -25,10 +25,10 @@ import org.slf4j.LoggerFactory; @WebService( - serviceName = "MultiPartInvokeService", - portName = "MultiPartInvokePort", - targetNamespace = "http://adapter.ti.tongtech.com/ws", - endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke") + 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/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java index 006f5a2b14873..27e47d53229dd 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 @@ -41,8 +41,8 @@ import org.slf4j.LoggerFactory; @WebService(serviceName = "HeaderService", - targetNamespace = "http://apache.org/camel/cxf/soap/headers", - endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") + 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); 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 e9668f2da9175..e204b5ae6951d 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,14 @@ import java.util.logging.Logger; -import org.apache.camel.hello_world_soap_http.Greeter; - 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") + 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-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 4e69152a225a0..8c1c00b7345b7 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 @@ -31,7 +31,6 @@ 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; 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 b45c6de218203..277bde86cbf11 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 @@ -36,7 +36,6 @@ 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 { 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 a3db558ac7d3c..43f0b856ae53a 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 @@ -18,7 +18,6 @@ import java.util.Collections; - import org.apache.camel.BindToRegistry; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; 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 d7b1390508dc4..beb91baa5b16e 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 @@ -18,7 +18,6 @@ import java.util.List; - import org.apache.camel.Exchange; import org.apache.camel.component.github.GitHubConstants; import org.apache.camel.component.github.GitHubEndpoint; 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 799446cbcbc7d..ea6a15270c325 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 @@ -18,7 +18,6 @@ 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; 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 51dced47e9a28..080ff11e4fc0f 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,7 @@ */ package org.apache.camel.component.google.drive; -import java.io.File; +import java.io.File; import java.util.Collection; import com.google.api.client.auth.oauth2.Credential; 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 2285d868c564b..b14e9d41d2ebf 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 @@ -28,8 +28,8 @@ import jakarta.mail.internet.MimeMessage; import com.google.api.services.gmail.model.ListMessagesResponse; -import com.google.api.services.gmail.model.Message; -import com.google.api.services.gmail.model.Profile; +import 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; 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 7311018d5f787..573e59abcef18 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 @@ -24,11 +24,11 @@ import jakarta.mail.MessagingException; import jakarta.mail.Session; -import jakarta.mail.internet.MimeMessage; - -import com.google.api.services.gmail.model.ListThreadsResponse; -import com.google.api.services.gmail.model.Message; -import com.google.api.services.gmail.model.Profile; +import 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; 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 03ef920ff999a..bcda204215371 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 @@ -18,7 +18,6 @@ import java.util.function.Consumer; - import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.commons.pool2.BasePooledObjectFactory; import org.apache.commons.pool2.PooledObject; 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 a2408c8696a7e..448e75c2cc387 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 @@ -15,7 +15,7 @@ * limitations under the License. */ @XmlSchema(namespace = "address.jaxb.converter.camel.apache.org", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.converter.jaxb.address; import jakarta.xml.bind.annotation.XmlNsForm; 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 7903df8860868..91c98c28ee5ff 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 @@ -15,7 +15,7 @@ * limitations under the License. */ @XmlSchema(namespace = "person.jaxb.converter.camel.apache.org", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.converter.jaxb.person; import jakarta.xml.bind.annotation.XmlNsForm; 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 77ea19bc24905..e43d974940003 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 @@ -18,7 +18,6 @@ import java.io.Serializable; - import jakarta.jms.ConnectionFactory; import jakarta.jms.ObjectMessage; 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 9d99e036ad68b..3fab7602f41c0 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 @@ -18,7 +18,6 @@ import java.io.File; - import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import org.apache.camel.BindToRegistry; 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 d2b98676970bb..179a8d29ddefd 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,9 +21,9 @@ import java.security.Security; import java.security.Signature; -import org.apache.camel.BindToRegistry; - import javax.crypto.KeyGenerator; + +import org.apache.camel.BindToRegistry; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; 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 f150aca9342b9..ddc6623c1ea95 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 @@ -15,7 +15,7 @@ * limitations under the License. */ @XmlSchema(namespace = "http://www.force.com/2009/06/asyncapi/dataload", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.component.salesforce.api.dto.bulk; import jakarta.xml.bind.annotation.XmlNsForm; 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 d3224d57c5ecf..e810917ce0667 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,9 +37,9 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import com.fasterxml.jackson.databind.ObjectMapper; - import javax.security.auth.DestroyFailedException; + +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.CamelContext; import org.apache.camel.component.salesforce.AuthenticationType; import org.apache.camel.component.salesforce.SalesforceHttpClient; 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 29dfe0bf3fc6c..b141d9253ab93 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 @@ -25,11 +25,12 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; -import org.apache.camel.util.ObjectHelper; + import org.w3c.dom.Node; 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 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 2c26c4eb0dcae..66304e9989191 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,6 +16,9 @@ */ package org.apache.camel.component.sjms.producer; +import java.io.Serializable; + + import jakarta.jms.Message; import jakarta.jms.MessageConsumer; import jakarta.jms.MessageProducer; @@ -124,7 +127,7 @@ private static Throwable rootCause(Throwable t) { return cause; } - public static class MyOrder implements java.io.Serializable { + public static class MyOrder implements Serializable { private static final long serialVersionUID = 1L; private final String item; private final int quantity; 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 5054f31f783e1..6d290092d1619 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 @@ -18,7 +18,6 @@ import java.util.List; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; 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 0e766a9ea589a..9ea329a63922d 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 @@ -23,7 +23,7 @@ // @XmlSchema(namespace = "http://javacrumbs.net/calc", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package net.javacrumbs.calc.model; import jakarta.xml.bind.annotation.XmlNsForm; 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 2abe89cc84bfa..c3b57bdb4027d 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 @@ -15,7 +15,7 @@ * limitations under the License. */ @XmlSchema(namespace = "http://www.stockquotes.edu/", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.component.spring.ws.jaxb; import jakarta.xml.bind.annotation.XmlNsForm; 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 bce06d915dc52..b2c3df9947837 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 @@ -15,7 +15,7 @@ * limitations under the License. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.spring.xml; import jakarta.xml.bind.annotation.XmlNsForm; 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 0b6aac569a1fe..e442a9f7dbba9 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 @@ -39,8 +39,8 @@ 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; 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 e5d6f6763c29e..dab40c102f4e6 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 @@ -33,8 +33,8 @@ 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; 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 95d216ed7b980..d4fb124d10c6d 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 @@ -23,6 +23,7 @@ package org.apache.camel.component.thrift.generated; import jakarta.annotation.Generated; + import org.apache.thrift.TEnum; import org.apache.thrift.annotation.Nullable; 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 0ef238de927fb..cd3ae8c2d664d 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 @@ -33,8 +33,8 @@ 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; 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 bc4f8f1ce7cd7..d8fba673be71f 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 @@ -23,6 +23,7 @@ package org.apache.camel.dataformat.thrift.generated; import jakarta.annotation.Generated; + import org.apache.thrift.TEnum; import org.apache.thrift.annotation.Nullable; 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 c5d20f3349f9b..807c067935995 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 @@ -33,8 +33,8 @@ 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; 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 591e8af702b4e..3defafe1460df 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 @@ -18,7 +18,7 @@ * The core Camel API. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel; import jakarta.xml.bind.annotation.XmlNsForm; 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 1829ffcc1e9da..8ab7197a24384 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 @@ -21,7 +21,7 @@ * but when Spring's {@code } concept feels appropriate. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.app; import jakarta.xml.bind.annotation.XmlNsForm; 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 a2ecc1242525d..9f0305d75140a 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 @@ -19,7 +19,7 @@ * Configuration of the routing rules. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.config; import jakarta.xml.bind.annotation.XmlNsForm; 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 9a1fa6036c159..581324bae468c 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 @@ -19,7 +19,7 @@ * unmarshal objects to and from streams inside components */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.dataformat; import jakarta.xml.bind.annotation.XmlNsForm; 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 030b995222e4e..45df83cb08aef 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 @@ -18,7 +18,7 @@ * The JAXB POJOs for the Error Handler. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.errorhandler; import jakarta.xml.bind.annotation.XmlNsForm; 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 1b9735a243805..b0fa5d9da8999 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 @@ -20,7 +20,7 @@ * XML Configuration. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.language; import jakarta.xml.bind.annotation.XmlNsForm; 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 e27aead7693d9..8d226ffa2ed7b 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 @@ -20,7 +20,7 @@ * XML Configuration. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.loadbalancer; import jakarta.xml.bind.annotation.XmlNsForm; 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 03e1887e955a6..3ee7e6e90cfa9 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 @@ -19,7 +19,7 @@ * rules. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model; import jakarta.xml.bind.annotation.XmlNsForm; 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 a990cecc17dc4..ff8e2aa3cffef 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 @@ -19,7 +19,7 @@ * The JAXB POJOs for the REST DSL */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.rest; import jakarta.xml.bind.annotation.XmlNsForm; 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 b13b28cde90c0..ca16fee8aeb0e 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 @@ -20,7 +20,7 @@ * XML Configuration. */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.tokenizer; import jakarta.xml.bind.annotation.XmlNsForm; 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 3efb354c8285f..205660e580ade 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 @@ -19,7 +19,7 @@ * contents according to declared data types inside components */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.transformer; import jakarta.xml.bind.annotation.XmlNsForm; 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 4c85844775b00..de052f291347e 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 @@ -19,7 +19,7 @@ * contents according to declared data types inside components */ @XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.model.validator; import jakarta.xml.bind.annotation.XmlNsForm; 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 3235fbb1b8f7a..db781ae8ef92b 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 @@ -18,7 +18,7 @@ * 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) + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.core.xml; import jakarta.xml.bind.annotation.XmlNsForm; 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 d168acd8b0e69..095e22d8794e8 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 @@ -15,8 +15,8 @@ * limitations under the License. */ @XmlSchema( - namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = XmlNsForm.QUALIFIED) + namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = XmlNsForm.QUALIFIED) package org.apache.camel.core.xml.util.jsse; import jakarta.xml.bind.annotation.XmlNsForm; 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 cc3f21f276742..230b74608f0db 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 @@ -76,29 +76,29 @@ void testParseRoutesWithData() { @Test void testParseRoutesWithDescription() { - org.apache.camel.util.json.JsonObject line1 = new org.apache.camel.util.json.JsonObject(); + JsonObject line1 = new JsonObject(); line1.put("type", "from"); line1.put("code", "timer:tick?period=1000"); line1.put("description", "Poll every second"); line1.put("level", 0); - org.apache.camel.util.json.JsonObject line2 = new org.apache.camel.util.json.JsonObject(); + JsonObject line2 = new JsonObject(); line2.put("type", "to"); line2.put("code", "log:a"); line2.put("level", 1); - org.apache.camel.util.json.JsonArray code = new org.apache.camel.util.json.JsonArray(); + JsonArray code = new JsonArray(); code.add(line1); code.add(line2); - org.apache.camel.util.json.JsonObject routeObj = new org.apache.camel.util.json.JsonObject(); + JsonObject routeObj = new JsonObject(); routeObj.put("routeId", "route1"); routeObj.put("code", code); - org.apache.camel.util.json.JsonArray routesArr = new org.apache.camel.util.json.JsonArray(); + JsonArray routesArr = new JsonArray(); routesArr.add(routeObj); - org.apache.camel.util.json.JsonObject jo = new org.apache.camel.util.json.JsonObject(); + JsonObject jo = new JsonObject(); jo.put("routes", routesArr); CamelRouteDiagramAction action = new CamelRouteDiagramAction(null); 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 ae675f20b6732..98c40353f0067 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,6 +16,9 @@ */ package org.apache.camel.test.infra.openai.mock; +import java.util.List; + + import com.fasterxml.jackson.databind.ObjectMapper; /** @@ -43,15 +46,15 @@ record TranscriptionResponse(String text) { } private String createVerboseResponse(AudioTranscriptionExpectation expectation) throws Exception { - record VerboseTranscriptionResponse(String text, String language, double duration, java.util.List segments, - java.util.List words) { + record VerboseTranscriptionResponse(String text, String language, double duration, List segments, + List words) { } return objectMapper.writeValueAsString(new VerboseTranscriptionResponse( expectation.getTranscriptionText(), expectation.getLanguage(), expectation.getDuration(), - java.util.List.of(), - java.util.List.of())); + List.of(), + List.of())); } } From 9a4d8baeba49a60b0b14783e8754aa1952b18492 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 6 May 2026 13:25:47 +0200 Subject: [PATCH 6/6] Fix remaining FQCNs missed by partial build Co-Authored-By: Claude Opus 4.6 (1M context) --- .../sjms/producer/SjmsObjectMessageEnabledTest.java | 1 - .../camel/dsl/jbang/core/commands/tui/CamelMonitor.java | 8 ++++---- .../openai/mock/AudioTranscriptionResponseBuilder.java | 1 - .../apache/camel/itest/utils/extensions/GreeterImpl.java | 7 ++++--- 4 files changed, 8 insertions(+), 9 deletions(-) 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 66304e9989191..050876a9f6c27 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 @@ -18,7 +18,6 @@ import java.io.Serializable; - import jakarta.jms.Message; import jakarta.jms.MessageConsumer; import jakarta.jms.MessageProducer; 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 3b1e60b2df79c..3a5f9b5dde320 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 @@ -1089,10 +1089,10 @@ private void applyLogFilters() { // "2026-03-23 21:24:11.705 WARN 11283 --- [thread] logger : message" private static final Pattern LOG_PATTERN = 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(); 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 98c40353f0067..d57c24ce82b4a 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 @@ -18,7 +18,6 @@ import java.util.List; - import com.fasterxml.jackson.databind.ObjectMapper; /** 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 94a94b8a119ee..164f6e31880a7 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 @@ -19,14 +19,15 @@ 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") + 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 {