This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e6a360c72a0907ab620dd8b81458d00692063df7 Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Thu Mar 19 23:21:59 2020 +0100 Fix #927 MongoDB GridFS support (JVM only) --- .../pages/list-of-camel-quarkus-extensions.adoc | 6 +- extensions-jvm/mongodb-gridfs/deployment/pom.xml | 75 +++++++++++++++++++ .../gridfs/deployment/MongodbGridfsProcessor.java | 31 ++++++++ .../mongodb-gridfs/integration-test/pom.xml | 82 +++++++++++++++++++++ .../mongodb/gridfs/it/MongodbGridfsResource.java | 51 +++++++++++++ .../mongodb/gridfs/it/MongodbGridfsTest.java | 34 +++++++++ extensions-jvm/{ => mongodb-gridfs}/pom.xml | 29 +++----- extensions-jvm/mongodb-gridfs/runtime/pom.xml | 83 ++++++++++++++++++++++ .../main/resources/META-INF/quarkus-extension.yaml | 29 ++++++++ extensions-jvm/pom.xml | 1 + poms/bom-deployment/pom.xml | 5 ++ poms/bom/pom.xml | 10 +++ 12 files changed, 416 insertions(+), 20 deletions(-) diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc index 4223a4e..873152f 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -18,7 +18,7 @@ In case you are missing some Camel feature in the list: == Camel Components // components: START -Number of Camel components: 93 in 80 JAR artifacts (0 deprecated) +Number of Camel components: 94 in 81 JAR artifacts (0 deprecated) [width="100%",cols="4,1,1,5",options="header"] |=== @@ -273,6 +273,10 @@ Level | Since | Description `mongodb:connectionBean` | Native + Stable | 1.0.0-M1 | Component for working with documents stored in MongoDB database. +| link:https://camel.apache.org/components/latest/mongodb-gridfs-component.html[MongoDB GridFS] (camel-quarkus-mongodb-gridfs) + +`mongodb-gridfs:connectionBean` | JVM + + Preview | 1.0.0-M6 | Component for working with MongoDB GridFS. + | link:https://camel.apache.org/components/latest/mustache-component.html[Mustache] (camel-quarkus-mustache) + `mustache:resourceUri` | Native + Stable | 1.0.0-M5 | Transforms the message using a Mustache template. diff --git a/extensions-jvm/mongodb-gridfs/deployment/pom.xml b/extensions-jvm/mongodb-gridfs/deployment/pom.xml new file mode 100644 index 0000000..986d243 --- /dev/null +++ b/extensions-jvm/mongodb-gridfs/deployment/pom.xml @@ -0,0 +1,75 @@ +<?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.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-gridfs-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-mongodb-gridfs-deployment</artifactId> + <name>Camel Quarkus :: MongoDB GridFS :: Deployment</name> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-bom-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-gridfs</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-processor</artifactId> + <version>${quarkus.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/extensions-jvm/mongodb-gridfs/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/gridfs/deployment/MongodbGridfsProcessor.java b/extensions-jvm/mongodb-gridfs/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/gridfs/deployment/MongodbGridfsProcessor.java new file mode 100644 index 0000000..6a33f5c --- /dev/null +++ b/extensions-jvm/mongodb-gridfs/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/gridfs/deployment/MongodbGridfsProcessor.java @@ -0,0 +1,31 @@ +/* + * 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.camel.quarkus.component.mongodb.gridfs.deployment; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; + +class MongodbGridfsProcessor { + + private static final String FEATURE = "camel-mongodb-gridfs"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + +} diff --git a/extensions-jvm/mongodb-gridfs/integration-test/pom.xml b/extensions-jvm/mongodb-gridfs/integration-test/pom.xml new file mode 100644 index 0000000..da51b5d --- /dev/null +++ b/extensions-jvm/mongodb-gridfs/integration-test/pom.xml @@ -0,0 +1,82 @@ +<?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.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-gridfs-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-quarkus-mongodb-gridfs-integration-test</artifactId> + <name>Camel Quarkus :: MongoDB GridFS :: Integration Test</name> + <description>Integration tests for Camel Quarkus MongoDB GridFS extension</description> + + <properties> + <!-- mvnd, a.k.a. Maven Daemon: https://github.com/gnodet/mvnd --> + <!-- The following rule tells mvnd to build the listed deployment modules before this module. --> + <!-- This is important because mvnd builds modules in parallel by default. The deployment modules are not --> + <!-- explicit dependencies of this module in the Maven sense, although they are required by the Quarkus Maven plugin. --> + <!-- Please update rule whenever you change the dependencies of this module by running --> + <!-- mvn process-resources -Pformat from the root directory --> + <mvnd.builder.rule>camel-quarkus-mongodb-gridfs-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-gridfs</artifactId> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-junit5</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>build</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/extensions-jvm/mongodb-gridfs/integration-test/src/main/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsResource.java b/extensions-jvm/mongodb-gridfs/integration-test/src/main/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsResource.java new file mode 100644 index 0000000..ebce1fa --- /dev/null +++ b/extensions-jvm/mongodb-gridfs/integration-test/src/main/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsResource.java @@ -0,0 +1,51 @@ +/* + * 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.camel.quarkus.component.mongodb.gridfs.it; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import org.apache.camel.CamelContext; +import org.jboss.logging.Logger; + +@Path("/mongodb-gridfs") +@ApplicationScoped +public class MongodbGridfsResource { + + private static final Logger LOG = Logger.getLogger(MongodbGridfsResource.class); + + private static final String COMPONENT_MONGODB_GRIDFS = "mongodb-gridfs"; + @Inject + CamelContext context; + + @Path("/load/component/mongodb-gridfs") + @GET + @Produces(MediaType.TEXT_PLAIN) + public Response loadComponentMongodbGridfs() throws Exception { + /* This is an autogenerated test */ + if (context.getComponent(COMPONENT_MONGODB_GRIDFS) != null) { + return Response.ok().build(); + } + LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_MONGODB_GRIDFS); + return Response.status(500, COMPONENT_MONGODB_GRIDFS + " could not be loaded from the Camel context").build(); + } +} diff --git a/extensions-jvm/mongodb-gridfs/integration-test/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java b/extensions-jvm/mongodb-gridfs/integration-test/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java new file mode 100644 index 0000000..3f88415 --- /dev/null +++ b/extensions-jvm/mongodb-gridfs/integration-test/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java @@ -0,0 +1,34 @@ +/* + * 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.camel.quarkus.component.mongodb.gridfs.it; + +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; +import org.junit.jupiter.api.Test; + +@QuarkusTest +class MongodbGridfsTest { + + @Test + public void loadComponentMongodbGridfs() { + /* A simple autogenerated test */ + RestAssured.get("/mongodb-gridfs/load/component/mongodb-gridfs") + .then() + .statusCode(200); + } + +} diff --git a/extensions-jvm/pom.xml b/extensions-jvm/mongodb-gridfs/pom.xml similarity index 52% copy from extensions-jvm/pom.xml copy to extensions-jvm/mongodb-gridfs/pom.xml index 2bd3ab8..2d1e02c 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/mongodb-gridfs/pom.xml @@ -17,33 +17,24 @@ 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"> - +<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.quarkus</groupId> - <artifactId>camel-quarkus-parent</artifactId> + <artifactId>camel-quarkus-build-parent</artifactId> <version>1.1.0-SNAPSHOT</version> + <relativePath>../../poms/build-parent/pom.xml</relativePath> </parent> - <artifactId>camel-quarkus-extensions-jvm</artifactId> + <artifactId>camel-quarkus-mongodb-gridfs-parent</artifactId> + <name>Camel Quarkus :: MongoDB GridFS</name> <packaging>pom</packaging> - <name>Camel Quarkus :: Extensions JVM</name> - <description>Autogenerated extensions not yet tested in the native mode</description> - <modules> - <!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat --> - <module>cassandraql</module> - <module>couchbase</module> - <module>couchdb</module> - <module>debezium-mongodb</module> - <module>debezium-mysql</module> - <module>debezium-postgres</module> - <module>debezium-sqlserver</module> - <module>elasticsearch-rest</module> - <module>influxdb</module> - <module>kudu</module> + <module>deployment</module> + <module>runtime</module> + <module>integration-test</module> </modules> - </project> diff --git a/extensions-jvm/mongodb-gridfs/runtime/pom.xml b/extensions-jvm/mongodb-gridfs/runtime/pom.xml new file mode 100644 index 0000000..cbc59fb --- /dev/null +++ b/extensions-jvm/mongodb-gridfs/runtime/pom.xml @@ -0,0 +1,83 @@ +<?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.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-gridfs-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-mongodb-gridfs</artifactId> + <name>Camel Quarkus :: MongoDB GridFS :: Runtime</name> + <description>Component for working with MongoDB GridFS.</description> + + <properties> + <firstVersion>1.0.0-M6</firstVersion> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-mongodb-gridfs</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-bootstrap-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-processor</artifactId> + <version>${quarkus.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/extensions-jvm/mongodb-gridfs/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/mongodb-gridfs/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000..2f87a25 --- /dev/null +++ b/extensions-jvm/mongodb-gridfs/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,29 @@ +# +# 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. +# + +--- +name: "MongoDB GridFS" +description: "Component for working with MongoDB GridFS." +metadata: + unlisted: true + keywords: + - "database" + - "nosql" + guide: "https://camel.apache.org/components/latest/mongodb-gridfs-component.html" + categories: + - "integration" + status: "preview" diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index 2bd3ab8..40c95f2 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -44,6 +44,7 @@ <module>elasticsearch-rest</module> <module>influxdb</module> <module>kudu</module> + <module>mongodb-gridfs</module> </modules> </project> diff --git a/poms/bom-deployment/pom.xml b/poms/bom-deployment/pom.xml index ec54beb..d47f454 100644 --- a/poms/bom-deployment/pom.xml +++ b/poms/bom-deployment/pom.xml @@ -439,6 +439,11 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-gridfs-deployment</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-mustache-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 737eb78..587b85d 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -569,6 +569,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-mongodb-gridfs</artifactId> + <version>${camel.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-mustache</artifactId> <version>${camel.version}</version> </dependency> @@ -1174,6 +1179,11 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-mongodb-gridfs</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-mustache</artifactId> <version>${camel-quarkus.version}</version> </dependency>