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
The following commit(s) were added to refs/heads/master by this push:
new 8a9a2a4 Fix #31 Move infinispan integration-tests out of core
8a9a2a4 is described below
commit 8a9a2a41a4d2c0a2ede2cd8f9fe38be197674996
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Tue Jul 9 20:53:56 2019 +0200
Fix #31 Move infinispan integration-tests out of core
---
extensions/infinispan/deployment/pom.xml | 8 +--
extensions/infinispan/runtime/pom.xml | 9 +--
extensions/netty4-http/runtime/pom.xml | 4 ++
integration-tests/core/pom.xml | 18 ------
.../java/io/quarkus/it/camel/core/CamelRoute.java | 19 +-----
.../java/io/quarkus/it/camel/core/CamelTest.java | 1 -
integration-tests/{core => infinispan}/pom.xml | 70 ++++++----------------
.../io/quarkus/it/camel/infinispan/CamelRoute.java | 47 +++++++++++++++
.../camel/infinispan}/CamelInfinispanITCase.java | 2 +-
.../it/camel/infinispan}/CamelInfinispanTest.java | 2 +-
.../infinispan}/InfinispanServerTestResource.java | 2 +-
integration-tests/pom.xml | 1 +
12 files changed, 84 insertions(+), 99 deletions(-)
diff --git a/extensions/infinispan/deployment/pom.xml
b/extensions/infinispan/deployment/pom.xml
index 704217f..40cd4ff 100644
--- a/extensions/infinispan/deployment/pom.xml
+++ b/extensions/infinispan/deployment/pom.xml
@@ -31,12 +31,12 @@
<name>Camel Quarkus :: Infinispan :: Deployment</name>
<dependencies>
-
- <!-- quarkus -->
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-core-deployment</artifactId>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-core-deployment</artifactId>
</dependency>
+
+ <!-- quarkus -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
diff --git a/extensions/infinispan/runtime/pom.xml
b/extensions/infinispan/runtime/pom.xml
index b8e655d..7054c49 100644
--- a/extensions/infinispan/runtime/pom.xml
+++ b/extensions/infinispan/runtime/pom.xml
@@ -32,14 +32,15 @@
<dependencies>
- <!-- quarkus -->
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-arc</artifactId>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-core</artifactId>
</dependency>
+
+ <!-- quarkus -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-core</artifactId>
+ <artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/extensions/netty4-http/runtime/pom.xml
b/extensions/netty4-http/runtime/pom.xml
index 303be8b..53744ec 100644
--- a/extensions/netty4-http/runtime/pom.xml
+++ b/extensions/netty4-http/runtime/pom.xml
@@ -42,6 +42,10 @@
<artifactId>quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-netty</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.oracle.substratevm</groupId>
<artifactId>svm</artifactId>
</dependency>
diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml
index 6ad1314..2b7215e 100644
--- a/integration-tests/core/pom.xml
+++ b/integration-tests/core/pom.xml
@@ -53,10 +53,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-netty4-http</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-infinispan</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss.slf4j</groupId>
@@ -66,20 +62,6 @@
<!-- test dependencies -->
<dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-hotrod</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-hotrod</artifactId>
- </dependency>
- <dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
</dependency>
diff --git
a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
b/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
index 076cf78..c6b8436 100644
---
a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
+++
b/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java
@@ -16,7 +16,6 @@
*/
package io.quarkus.it.camel.core;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -29,8 +28,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.BeanProcessor;
-import org.apache.camel.component.infinispan.InfinispanConstants;
-import org.apache.camel.component.infinispan.InfinispanOperation;
import org.apache.camel.support.DefaultExchange;
import io.quarkus.runtime.annotations.RegisterForReflection;
@@ -62,21 +59,7 @@ public class CamelRoute extends RouteBuilder {
from("netty4-http:http://0.0.0.0:8999/foo";)
.transform().constant("Netty Hello World");
- from("netty4-http:http://0.0.0.0:8999/put";)
- .convertBodyTo(byte[].class)
- .to("log:cache?showAll=true")
-
.setHeader(InfinispanConstants.OPERATION).constant(InfinispanOperation.PUT)
-
.setHeader(InfinispanConstants.KEY).constant("the-key".getBytes(StandardCharsets.UTF_8))
- .setHeader(InfinispanConstants.VALUE).body()
- .to("infinispan:default?hosts=localhost:11232");
-
- from("netty4-http:http://0.0.0.0:8999/get";)
- .setHeader(InfinispanConstants.OPERATION)
- .constant(InfinispanOperation.GET)
- .setHeader(InfinispanConstants.KEY)
- .constant("the-key".getBytes(StandardCharsets.UTF_8))
- .to("infinispan:default?hosts=localhost:11232")
- .to("log:cache?showAll=true");
+
}
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
diff --git
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
b/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
index 05d56cb..7281cd1 100644
---
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
+++
b/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java
@@ -28,7 +28,6 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
@QuarkusTest
-@QuarkusTestResource(InfinispanServerTestResource.class)
public class CamelTest {
@Test
public void testRoutes() {
diff --git a/integration-tests/core/pom.xml
b/integration-tests/infinispan/pom.xml
similarity index 78%
copy from integration-tests/core/pom.xml
copy to integration-tests/infinispan/pom.xml
index 6ad1314..74241c8 100644
--- a/integration-tests/core/pom.xml
+++ b/integration-tests/infinispan/pom.xml
@@ -27,45 +27,41 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-integration-test-core</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Core</name>
- <description>The camel integration tests</description>
+ <artifactId>camel-quarkus-integration-test-infinispan</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Infinispan</name>
+ <description>Integration tests for Camel Infinispan component</description>
+ <properties>
+ <!-- Skip enforcer plugin as we want to use jboss marshalling for test
class -->
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
<dependencies>
<dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-arc</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
+ <artifactId>camel-quarkus-infinispan</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-netty4-http</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-infinispan</artifactId>
- </dependency>
+ <!-- Undertow is here only for the test runner to be able to detect
that the server has started -->
<dependency>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- <scope>provided</scope>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-undertow</artifactId>
</dependency>
<!-- test dependencies -->
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-junit5</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<type>test-jar</type>
@@ -79,37 +75,10 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- </dependency>
-
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
- <!-- Skip enforcer plugin as we want to use jboss marshalling for
test class -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
@@ -178,5 +147,4 @@
</profile>
</profiles>
-
</project>
diff --git
a/integration-tests/infinispan/src/main/java/io/quarkus/it/camel/infinispan/CamelRoute.java
b/integration-tests/infinispan/src/main/java/io/quarkus/it/camel/infinispan/CamelRoute.java
new file mode 100644
index 0000000..ecc96f2
--- /dev/null
+++
b/integration-tests/infinispan/src/main/java/io/quarkus/it/camel/infinispan/CamelRoute.java
@@ -0,0 +1,47 @@
+/*
+ * 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 io.quarkus.it.camel.infinispan;
+
+import java.nio.charset.StandardCharsets;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.infinispan.InfinispanConstants;
+import org.apache.camel.component.infinispan.InfinispanOperation;
+
+public class CamelRoute extends RouteBuilder {
+
+ @Override
+ public void configure() {
+
+ from("netty4-http:http://0.0.0.0:8999/put";)
+ .convertBodyTo(byte[].class)
+ .to("log:cache?showAll=true")
+
.setHeader(InfinispanConstants.OPERATION).constant(InfinispanOperation.PUT)
+
.setHeader(InfinispanConstants.KEY).constant("the-key".getBytes(StandardCharsets.UTF_8))
+ .setHeader(InfinispanConstants.VALUE).body()
+ .to("infinispan:default?hosts=localhost:11232");
+
+ from("netty4-http:http://0.0.0.0:8999/get";)
+ .setHeader(InfinispanConstants.OPERATION)
+ .constant(InfinispanOperation.GET)
+ .setHeader(InfinispanConstants.KEY)
+ .constant("the-key".getBytes(StandardCharsets.UTF_8))
+ .to("infinispan:default?hosts=localhost:11232")
+ .to("log:cache?showAll=true");
+ }
+
+}
diff --git
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanITCase.java
b/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanITCase.java
similarity index 95%
rename from
integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanITCase.java
rename to
integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanITCase.java
index aa33a7e..33ff45e 100644
---
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanITCase.java
+++
b/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanITCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.quarkus.it.camel.core;
+package io.quarkus.it.camel.infinispan;
import io.quarkus.test.junit.SubstrateTest;
diff --git
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanTest.java
b/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanTest.java
similarity index 97%
rename from
integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanTest.java
rename to
integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanTest.java
index 1723a30..3f7a0ce 100644
---
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanTest.java
+++
b/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.quarkus.it.camel.core;
+package io.quarkus.it.camel.infinispan;
import static org.hamcrest.Matchers.is;
diff --git
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/InfinispanServerTestResource.java
b/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/InfinispanServerTestResource.java
similarity index 98%
rename from
integration-tests/core/src/test/java/io/quarkus/it/camel/core/InfinispanServerTestResource.java
rename to
integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/InfinispanServerTestResource.java
index a29cf32..f0c275f 100644
---
a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/InfinispanServerTestResource.java
+++
b/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/InfinispanServerTestResource.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.quarkus.it.camel.core;
+package io.quarkus.it.camel.infinispan;
import java.util.Collections;
import java.util.Map;
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index cac9b21..311d2e3 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -38,6 +38,7 @@
<module>aws-s3</module>
<module>aws-sns</module>
<module>aws-sqs</module>
+ <module>infinispan</module>
<module>jdbc</module>
<module>salesforce</module>
<module>servlet</module>
