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 5badb3f9566d09e5aefa5e6d066b223f291b39b3 Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Thu Mar 19 23:12:34 2020 +0100 Fix #925 InfluxDB support (JVM only) --- .../pages/list-of-camel-quarkus-extensions.adoc | 6 +- extensions-jvm/influxdb/deployment/pom.xml | 75 +++++++++++++++++++ .../influxdb/deployment/InfluxdbProcessor.java | 31 ++++++++ extensions-jvm/influxdb/integration-test/pom.xml | 82 +++++++++++++++++++++ .../component/influxdb/it/InfluxdbResource.java | 51 +++++++++++++ .../component/influxdb/it/InfluxdbTest.java | 34 +++++++++ extensions-jvm/{ => influxdb}/pom.xml | 27 +++---- extensions-jvm/influxdb/runtime/pom.xml | 83 ++++++++++++++++++++++ .../main/resources/META-INF/quarkus-extension.yaml | 28 ++++++++ extensions-jvm/pom.xml | 1 + poms/bom-deployment/pom.xml | 5 ++ poms/bom/pom.xml | 10 +++ 12 files changed, 415 insertions(+), 18 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 fd2b8fb..64ef673 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: 91 in 78 JAR artifacts (0 deprecated) +Number of Camel components: 92 in 79 JAR artifacts (0 deprecated) [width="100%",cols="4,1,1,5",options="header"] |=== @@ -229,6 +229,10 @@ Level | Since | Description `infinispan:cacheName` | Native + Stable | 0.2.0 | For reading/writing from/to Infinispan distributed key/value store and data grid. +| link:https://camel.apache.org/components/latest/influxdb-component.html[InfluxDB] (camel-quarkus-influxdb) + +`influxdb:connectionBean` | JVM + + Preview | 1.0.0-M6 | The influxdb component allows you to interact with InfluxDB, a time series database. + | xref:extensions/websocket-jsr356.adoc[Javax Websocket] (camel-quarkus-websocket-jsr356) + `websocket-jsr356:uri` | Native + Stable | 1.0.0-M4 | Camel WebSocket using JSR356 (javax) diff --git a/extensions-jvm/influxdb/deployment/pom.xml b/extensions-jvm/influxdb/deployment/pom.xml new file mode 100644 index 0000000..8ded0ab --- /dev/null +++ b/extensions-jvm/influxdb/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-influxdb-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-influxdb-deployment</artifactId> + <name>Camel Quarkus :: InfluxDB :: 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-influxdb</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/influxdb/deployment/src/main/java/org/apache/camel/quarkus/component/influxdb/deployment/InfluxdbProcessor.java b/extensions-jvm/influxdb/deployment/src/main/java/org/apache/camel/quarkus/component/influxdb/deployment/InfluxdbProcessor.java new file mode 100644 index 0000000..bb359aa --- /dev/null +++ b/extensions-jvm/influxdb/deployment/src/main/java/org/apache/camel/quarkus/component/influxdb/deployment/InfluxdbProcessor.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.influxdb.deployment; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; + +class InfluxdbProcessor { + + private static final String FEATURE = "camel-influxdb"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + +} diff --git a/extensions-jvm/influxdb/integration-test/pom.xml b/extensions-jvm/influxdb/integration-test/pom.xml new file mode 100644 index 0000000..e50a428 --- /dev/null +++ b/extensions-jvm/influxdb/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-influxdb-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-quarkus-influxdb-integration-test</artifactId> + <name>Camel Quarkus :: InfluxDB :: Integration Test</name> + <description>Integration tests for Camel Quarkus InfluxDB 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-influxdb-deployment,camel-quarkus-support-policy-deployment</mvnd.builder.rule> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-influxdb</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/influxdb/integration-test/src/main/java/org/apache/camel/quarkus/component/influxdb/it/InfluxdbResource.java b/extensions-jvm/influxdb/integration-test/src/main/java/org/apache/camel/quarkus/component/influxdb/it/InfluxdbResource.java new file mode 100644 index 0000000..23d07fa --- /dev/null +++ b/extensions-jvm/influxdb/integration-test/src/main/java/org/apache/camel/quarkus/component/influxdb/it/InfluxdbResource.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.influxdb.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("/influxdb") +@ApplicationScoped +public class InfluxdbResource { + + private static final Logger LOG = Logger.getLogger(InfluxdbResource.class); + + private static final String COMPONENT_INFLUXDB = "influxdb"; + @Inject + CamelContext context; + + @Path("/load/component/influxdb") + @GET + @Produces(MediaType.TEXT_PLAIN) + public Response loadComponentInfluxdb() throws Exception { + /* This is an autogenerated test */ + if (context.getComponent(COMPONENT_INFLUXDB) != null) { + return Response.ok().build(); + } + LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_INFLUXDB); + return Response.status(500, COMPONENT_INFLUXDB + " could not be loaded from the Camel context").build(); + } +} diff --git a/extensions-jvm/influxdb/integration-test/src/test/java/org/apache/camel/quarkus/component/influxdb/it/InfluxdbTest.java b/extensions-jvm/influxdb/integration-test/src/test/java/org/apache/camel/quarkus/component/influxdb/it/InfluxdbTest.java new file mode 100644 index 0000000..d5b458c --- /dev/null +++ b/extensions-jvm/influxdb/integration-test/src/test/java/org/apache/camel/quarkus/component/influxdb/it/InfluxdbTest.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.influxdb.it; + +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; +import org.junit.jupiter.api.Test; + +@QuarkusTest +class InfluxdbTest { + + @Test + public void loadComponentInfluxdb() { + /* A simple autogenerated test */ + RestAssured.get("/influxdb/load/component/influxdb") + .then() + .statusCode(200); + } + +} diff --git a/extensions-jvm/pom.xml b/extensions-jvm/influxdb/pom.xml similarity index 54% copy from extensions-jvm/pom.xml copy to extensions-jvm/influxdb/pom.xml index fce4d6b..5292b02 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/influxdb/pom.xml @@ -17,31 +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-influxdb-parent</artifactId> + <name>Camel Quarkus :: InfluxDB</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>deployment</module> + <module>runtime</module> + <module>integration-test</module> </modules> - </project> diff --git a/extensions-jvm/influxdb/runtime/pom.xml b/extensions-jvm/influxdb/runtime/pom.xml new file mode 100644 index 0000000..02587c4 --- /dev/null +++ b/extensions-jvm/influxdb/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-influxdb-parent</artifactId> + <version>1.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-influxdb</artifactId> + <name>Camel Quarkus :: InfluxDB :: Runtime</name> + <description>The influxdb component allows you to interact with InfluxDB, a time series database.</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-influxdb</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/influxdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/influxdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000..d198b0d --- /dev/null +++ b/extensions-jvm/influxdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,28 @@ +# +# 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: "InfluxDB" +description: "The influxdb component allows you to interact with InfluxDB, a time series database." +metadata: + unlisted: true + keywords: + - "database" + guide: "https://camel.apache.org/components/latest/influxdb-component.html" + categories: + - "integration" + status: "preview" diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index fce4d6b..8a4b5ab 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -42,6 +42,7 @@ <module>debezium-postgres</module> <module>debezium-sqlserver</module> <module>elasticsearch-rest</module> + <module>influxdb</module> </modules> </project> diff --git a/poms/bom-deployment/pom.xml b/poms/bom-deployment/pom.xml index 94e0bec..a9b083d 100644 --- a/poms/bom-deployment/pom.xml +++ b/poms/bom-deployment/pom.xml @@ -354,6 +354,11 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-influxdb-deployment</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-jackson-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 28dbadd..25a3387 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -428,6 +428,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-influxdb</artifactId> + <version>${camel.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-jackson</artifactId> <version>${camel.version}</version> </dependency> @@ -1074,6 +1079,11 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-influxdb</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-jackson</artifactId> <version>${camel-quarkus.version}</version> </dependency>