This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6c19894d6563d815b8022076a76b869713cc32fe
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Fri Jul 12 12:40:25 2019 +0200
Add rest extenstion
---
bom/pom.xml | 10 +++++
extensions/core/runtime/pom.xml | 4 ++
extensions/pom.xml | 1 +
extensions/rest/deployment/pom.xml | 45 +++++++++++++++++++
.../component/rest/deployment/RestProcessor.java | 15 +++++++
extensions/rest/pom.xml | 21 +++++++++
extensions/rest/runtime/pom.xml | 50 ++++++++++++++++++++++
.../component/servlet/test/MinimalConfigTest.java | 13 ------
integration-tests/servlet/pom.xml | 5 +++
9 files changed, 151 insertions(+), 13 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 47156c0..a21d50c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -154,6 +154,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-rest</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
<version>${camel.version}</version>
</dependency>
@@ -206,6 +211,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-rest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-netty4-http</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml
index 7d2b035..e6e0be4 100644
--- a/extensions/core/runtime/pom.xml
+++ b/extensions/core/runtime/pom.xml
@@ -59,6 +59,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-direct</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-rest</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 1f2672f..e9c1ecb 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -44,6 +44,7 @@
<module>servlet</module>
<module>log</module>
<module>direct</module>
+ <module>rest</module>
</modules>
</project>
diff --git a/extensions/rest/deployment/pom.xml
b/extensions/rest/deployment/pom.xml
new file mode 100644
index 0000000..917f8fb
--- /dev/null
+++ b/extensions/rest/deployment/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-rest-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>camel-quarkus-rest-deployment</artifactId>
+ <name>Camel Quarkus :: Rest :: Deployment</name>
+
+ <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-rest</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/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
b/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
new file mode 100644
index 0000000..8c81b49
--- /dev/null
+++
b/extensions/rest/deployment/src/main/java/org/apache/camel/quarkus/component/rest/deployment/RestProcessor.java
@@ -0,0 +1,15 @@
+package org.apache.camel.quarkus.component.rest.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+class RestProcessor {
+
+ private static final String FEATURE = "camel-rest";
+
+ @BuildStep
+ FeatureBuildItem feature() {
+ return new FeatureBuildItem(FEATURE);
+ }
+
+}
diff --git a/extensions/rest/pom.xml b/extensions/rest/pom.xml
new file mode 100644
index 0000000..1729478
--- /dev/null
+++ b/extensions/rest/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-build-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../build-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>camel-quarkus-rest-parent</artifactId>
+ <name>Camel Quarkus :: Rest</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>deployment</module>
+ <module>runtime</module>
+ </modules>
+</project>
diff --git a/extensions/rest/runtime/pom.xml b/extensions/rest/runtime/pom.xml
new file mode 100644
index 0000000..828c1a6
--- /dev/null
+++ b/extensions/rest/runtime/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-rest-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>camel-quarkus-rest</artifactId>
+ <name>Camel Quarkus :: Rest :: Runtime</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-core</artifactId>
+ </dependency>
+
+ <!-- camel -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-rest</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/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/MinimalConfigTest.java
b/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/MinimalConfigTest.java
index 3dcf8af..a248ad4 100644
---
a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/MinimalConfigTest.java
+++
b/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/MinimalConfigTest.java
@@ -38,8 +38,6 @@ public class MinimalConfigTest {
@Test
public void minimal() {
- RestAssured.when().get("/rest-get").then().body(IsEqual.equalTo("GET:
/rest-get"));
-
RestAssured.when().post("/rest-post").then().body(IsEqual.equalTo("POST:
/rest-post"));
RestAssured.when().get("/hello").then().body(IsEqual.equalTo("GET:
/hello"));
}
@@ -47,17 +45,6 @@ public class MinimalConfigTest {
@Override
public void configure() {
-
- rest()
- .get("/rest-get")
- .route()
- .setBody(constant("GET: /rest-get"))
- .endRest()
- .post("/rest-post")
- .route()
- .setBody(constant("POST: /rest-post"))
- .endRest();
-
from("servlet://hello?matchOnUriPrefix=true")
.setBody(constant("GET: /hello"));
}
diff --git a/integration-tests/servlet/pom.xml
b/integration-tests/servlet/pom.xml
index c833553..48449d8 100644
--- a/integration-tests/servlet/pom.xml
+++ b/integration-tests/servlet/pom.xml
@@ -36,6 +36,11 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-servlet</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-rest</artifactId>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
