This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch camel-karaf-4.8.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/camel-karaf-4.8.x by this push: new f3902d094 Ref #602 Repair camel-azure-storage-queue and add integration test (#603) f3902d094 is described below commit f3902d094667fafdc01425a80bf800b06cf8425e Author: François de Parscau <116000379+f2p...@users.noreply.github.com> AuthorDate: Fri Mar 14 17:52:24 2025 +0100 Ref #602 Repair camel-azure-storage-queue and add integration test (#603) --- features/src/main/feature/camel-features.xml | 13 ++ tests/features/camel-azure-storage-queue/pom.xml | 44 +++++ .../test/CamelAzureStorageQueueRouteSupplier.java | 92 ++++++++++ .../src/main/resources/LICENSE | 202 +++++++++++++++++++++ .../src/main/resources/NOTICE | 5 + .../camel/itest/CamelAzureStorageQueueITest.java | 76 ++++++++ tests/features/pom.xml | 1 + 7 files changed, 433 insertions(+) diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml index 2fabf9add..eb797d536 100644 --- a/features/src/main/feature/camel-features.xml +++ b/features/src/main/feature/camel-features.xml @@ -682,6 +682,19 @@ <feature name='camel-azure-storage-queue' version='${project.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version='[${azure-core-version},2)'>azure-storage</feature> + <feature version='[4.1,5)'>netty</feature> + <bundle>wrap:mvn:com.azure/azure-core-http-netty/${auto-detect-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-transport-classes-epoll/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-handler-proxy/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle> + <bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${auto-detect-version}</bundle> + <bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:com.azure/azure-storage-queue/${auto-detect-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-azure-storage-queue/${project.version}</bundle> </feature> diff --git a/tests/features/camel-azure-storage-queue/pom.xml b/tests/features/camel-azure-storage-queue/pom.xml new file mode 100644 index 000000000..9dfc9ffe8 --- /dev/null +++ b/tests/features/camel-azure-storage-queue/pom.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>camel-karaf-features-test</artifactId> + <version>4.8.6-SNAPSHOT</version> + </parent> + + <artifactId>camel-azure-storage-queue-test</artifactId> + <name>Apache Camel :: Karaf :: Tests :: Features :: Azure Storage Queue</name> + + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-azure-storage-queue</artifactId> + <version>${camel-version}</version> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers</artifactId> + <version>${testcontainers-version}</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file diff --git a/tests/features/camel-azure-storage-queue/src/main/java/org/apache/karaf/camel/test/CamelAzureStorageQueueRouteSupplier.java b/tests/features/camel-azure-storage-queue/src/main/java/org/apache/karaf/camel/test/CamelAzureStorageQueueRouteSupplier.java new file mode 100644 index 000000000..e5f1e2f3c --- /dev/null +++ b/tests/features/camel-azure-storage-queue/src/main/java/org/apache/karaf/camel/test/CamelAzureStorageQueueRouteSupplier.java @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.camel.test; + +import java.util.function.Function; + +import org.apache.camel.CamelContext; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.azure.storage.queue.QueueComponent; +import org.apache.camel.component.azure.storage.queue.QueueConfiguration; +import org.apache.camel.component.azure.storage.queue.QueueConstants; +import org.apache.camel.component.azure.storage.queue.QueueOperationDefinition; +import org.apache.camel.model.RouteDefinition; +import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier; +import org.apache.karaf.camel.itests.CamelRouteSupplier; +import org.osgi.service.component.annotations.Component; + +import com.azure.core.http.policy.HttpLogDetailLevel; +import com.azure.core.http.policy.HttpLogOptions; +import com.azure.storage.common.StorageSharedKeyCredential; +import com.azure.storage.queue.QueueServiceClient; +import com.azure.storage.queue.QueueServiceClientBuilder; + +import static org.apache.camel.component.azure.storage.queue.CredentialType.SHARED_KEY_CREDENTIAL; +import static org.apache.camel.component.azure.storage.queue.QueueConstants.QUEUE_OPERATION; + +@Component(name = "karaf-camel-azure-storage-queue-test", immediate = true, service = CamelRouteSupplier.class) +public class CamelAzureStorageQueueRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier { + + private static final String TEST_QUEUE_NAME = "test-queue"; + private static final String TEST_ACCOUNT = System.getProperty("azure.accountName"); + public static final String TEST_QUEUE_CONTENT = "This is the queue!"; + + @Override + public void configure(CamelContext camelContext) { + + final String host = System.getProperty("azure.host"); + final String port = System.getProperty("azure.port"); + final StorageSharedKeyCredential credential = + new StorageSharedKeyCredential(TEST_ACCOUNT, System.getProperty("azure.accountKey")); + final String endpoint = "http://" + host + ":" + port + "/" + TEST_ACCOUNT; + + final QueueServiceClient queueServiceClient = new QueueServiceClientBuilder().endpoint(endpoint) + .credential(credential) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS).setPrettyPrintBody(true)) + .buildClient(); + + final QueueConfiguration configuration = new QueueConfiguration(); + configuration.setServiceClient(queueServiceClient); + configuration.setAccountName(TEST_ACCOUNT); + configuration.setCredentials(credential); + configuration.setCredentialType(SHARED_KEY_CREDENTIAL); + + final QueueComponent blobComponent = new QueueComponent(); + blobComponent.setConfiguration(configuration); + + camelContext.addComponent("azure-storage-queue", blobComponent); + } + + @Override + protected Function<RouteBuilder, RouteDefinition> consumerRoute() { + return builder -> builder.fromF("azure-storage-queue://%s/%s", TEST_ACCOUNT, TEST_QUEUE_NAME) + .setHeader(QueueConstants.QUEUE_NAME, builder.constant(TEST_QUEUE_NAME)) + .log("Downloaded the blob with content: ${body}"); + } + + @Override + protected void configureProducer(RouteBuilder builder, RouteDefinition producerRoute) { + producerRoute.setHeader(QUEUE_OPERATION, builder.constant(QueueOperationDefinition.createQueue.name())) + .setHeader(QueueConstants.QUEUE_NAME, builder.constant(TEST_QUEUE_NAME)) + .toF("azure-storage-queue://%s", TEST_ACCOUNT) + .log("Created container successful: ${body}") + .setHeader(QUEUE_OPERATION, builder.constant(QueueOperationDefinition.sendMessage.name())) + .setHeader(QueueConstants.QUEUE_NAME, builder.constant(TEST_QUEUE_NAME)) + .setBody(builder.constant(TEST_QUEUE_CONTENT)) + .toF("azure-storage-queue://%s", TEST_ACCOUNT) + .log("Uploaded blob successful: ${body}"); + } +} \ No newline at end of file diff --git a/tests/features/camel-azure-storage-queue/src/main/resources/LICENSE b/tests/features/camel-azure-storage-queue/src/main/resources/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/tests/features/camel-azure-storage-queue/src/main/resources/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/tests/features/camel-azure-storage-queue/src/main/resources/NOTICE b/tests/features/camel-azure-storage-queue/src/main/resources/NOTICE new file mode 100644 index 000000000..135a6b1bf --- /dev/null +++ b/tests/features/camel-azure-storage-queue/src/main/resources/NOTICE @@ -0,0 +1,5 @@ +Apache Camel Karaf - Tests Features Camel Azure Storage Queue +Copyright 2025 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java b/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java new file mode 100644 index 000000000..d8b970226 --- /dev/null +++ b/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java @@ -0,0 +1,76 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.camel.itest; + +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest; +import org.apache.karaf.camel.itests.CamelKarafTestHint; +import org.apache.karaf.camel.itests.GenericContainerResource; +import org.apache.karaf.camel.itests.PaxExamWithExternalResource; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.wait.strategy.Wait; + +import static org.apache.karaf.camel.test.CamelAzureStorageQueueRouteSupplier.TEST_QUEUE_CONTENT; + +@CamelKarafTestHint(externalResourceProvider = CamelAzureStorageQueueITest.ExternalResourceProviders.class) +@RunWith(PaxExamWithExternalResource.class) +@ExamReactorStrategy(PerClass.class) +public class CamelAzureStorageQueueITest extends AbstractCamelSingleFeatureResultMockBasedRouteITest { + + private static final int AZURITE_ORIGINAL_PORT = 10001; + + @Override + public void configureMock(MockEndpoint mock) { + mock.expectedBodiesReceived(TEST_QUEUE_CONTENT); + } + + @Test + public void testResultMock() throws Exception { + assertMockEndpointsSatisfied(); + } + + public static final class ExternalResourceProviders { + private static final String DEFAULT_ACCOUNT_NAME = "devstoreaccount1"; + private static final String DEFAULT_ACCOUNT_KEY + = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="; + + public static GenericContainerResource<AzuriteContainer> createAzureStorageQueueContainer() { + + AzuriteContainer azuriteContainer = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.31.0"); + + return new GenericContainerResource<>(azuriteContainer, resource -> { + resource.setProperty("azure.host", azuriteContainer.getHost()); + resource.setProperty("azure.port", + Integer.toString(azuriteContainer.getMappedPort(AZURITE_ORIGINAL_PORT))); + resource.setProperty("azure.accountName", DEFAULT_ACCOUNT_NAME); + resource.setProperty("azure.accountKey", DEFAULT_ACCOUNT_KEY); + }); + } + } + + public static class AzuriteContainer extends GenericContainer<AzuriteContainer> { + + public AzuriteContainer(final String containerName) { + super(containerName); + + withExposedPorts(AZURITE_ORIGINAL_PORT) + .waitingFor(Wait.forListeningPort()); + } + + } +} \ No newline at end of file diff --git a/tests/features/pom.xml b/tests/features/pom.xml index 40d97b6f1..9e4511a01 100644 --- a/tests/features/pom.xml +++ b/tests/features/pom.xml @@ -56,6 +56,7 @@ <module>camel-aws2-sqs</module> <module>camel-aws2-sts</module> <module>camel-azure-storage-blob</module> + <module>camel-azure-storage-queue</module> <module>camel-barcode</module> <module>camel-base64</module> <module>camel-bean-validator</module>