You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2025/07/31 10:58:31 UTC
(camel-quarkus) branch main updated (baceec93b1 -> 4fa40046ae)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from baceec93b1 Bump com.microsoft.graph:microsoft-graph from 6.47.0 to 6.48.0
new 8319cf6c65 Deprecate RoutesDiscoveryConfig, CamelRoutesLoaderBuildItems and remove redundant tests
new 71500e6d94 Deprecate CamelRoutesCollectorBuildItem and simplify testing
new bc732bdc72 Remove redundant custom-log-component tests
new 4fa40046ae Simplify testing of MainListener
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
catalog/pom.xml | 39 ------
.../main/spi/CamelRoutesCollectorBuildItem.java | 1 +
.../spi/CamelRoutesLoaderBuildItems.java | 1 +
...izerTest.java => CamelRoutesCollectorTest.java} | 37 +++---
.../core/deployment}/CustomRoutesCollector.java | 21 ++-
.../CamelMainListenerTest.java} | 42 +++---
.../core/deployment/main}/CustomMainListener.java | 29 ++--
.../org/apache/camel/quarkus/core/CamelConfig.java | 1 +
.../foundation/customized-log-component/pom.xml | 109 ---------------
.../log/it/CustomizedLogComponentResource.java | 57 --------
.../component/log/it/CustomizedLogComponentIT.java | 23 ----
.../log/it/CustomizedLogComponentTest.java | 42 ------
integration-test-groups/foundation/pom.xml | 1 -
.../custom-log-component/deployment/pom.xml | 78 -----------
.../quarkus/core/support/deployment/Feature.java | 29 ----
.../core/support/deployment/SupportBuildStep.java | 35 -----
.../custom-log-component/pom.xml | 39 ------
.../custom-log-component/runtime/pom.xml | 64 ---------
.../quarkus/core/support/SupportRecorder.java | 37 ------
.../custom-main-listener/deployment/pom.xml | 74 -----------
.../deployment/CustomMainListenerFeature.java | 29 ----
.../deployment/CustomMainListenerProcessor.java | 31 -----
.../custom-main-listener/pom.xml | 39 ------
.../custom-main-listener/runtime/pom.xml | 72 ----------
.../mainlistener/CustomMainListenerRecorder.java | 28 ----
.../custom-routes-collector/deployment/pom.xml | 74 -----------
.../deployment/CustomRoutesCollectorFeature.java | 29 ----
.../deployment/CustomRoutesCollectorProcessor.java | 31 -----
.../custom-routes-collector/pom.xml | 39 ------
.../custom-routes-collector/runtime/pom.xml | 60 ---------
.../support/CustomRoutesCollectorRecorder.java | 28 ----
integration-tests-support/pom.xml | 3 -
integration-tests/core-discovery-disabled/pom.xml | 148 ---------------------
.../core/CoreDiscoveryDisabledResource.java | 55 --------
.../quarkus/core/CoreDiscoveryDisabledRoutes.java | 29 ----
.../core/CoreDiscoveryDisabledRoutesCDI.java | 31 -----
.../src/main/resources/application.properties | 21 ---
.../quarkus/core/CoreDiscoveryDisabledIT.java | 23 ----
.../quarkus/core/CoreDiscoveryDisabledTest.java | 39 ------
integration-tests/foundation-grouped/pom.xml | 17 ---
integration-tests/main-collector/pom.xml | 146 --------------------
.../quarkus/main/CoreMainCollectorResource.java | 48 -------
.../src/main/resources/application.properties | 22 ---
.../camel/quarkus/main/CoreMainCollectorTest.java | 38 ------
integration-tests/main-discovery-disabled/pom.xml | 140 -------------------
.../main/MainDiscoveryDisabledResource.java | 55 --------
.../quarkus/main/MainDiscoveryDisabledRoutes.java | 29 ----
.../main/MainDiscoveryDisabledRoutesCDI.java | 31 -----
.../src/main/resources/application.properties | 21 ---
.../quarkus/main/MainDiscoveryDisabledIT.java | 23 ----
.../quarkus/main/MainDiscoveryDisabledTest.java | 39 ------
integration-tests/main/pom.xml | 17 ---
.../camel/quarkus/main/CoreMainResource.java | 3 -
.../apache/camel/quarkus/main/CoreMainTest.java | 5 +-
integration-tests/pom.xml | 3 -
poms/bom-test/pom.xml | 15 ---
tooling/scripts/test-categories.yaml | 3 -
57 files changed, 65 insertions(+), 2158 deletions(-)
copy extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/{CamelContextCustomizerTest.java => CamelRoutesCollectorTest.java} (71%)
rename {integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support => extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment}/CustomRoutesCollector.java (75%)
copy extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/{CamelContextCustomizerTest.java => main/CamelMainListenerTest.java} (68%)
rename {integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener => extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main}/CustomMainListener.java (76%)
delete mode 100644 integration-test-groups/foundation/customized-log-component/pom.xml
delete mode 100644 integration-test-groups/foundation/customized-log-component/src/main/java/org/apache/camel/quarkus/component/customized/log/it/CustomizedLogComponentResource.java
delete mode 100644 integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentIT.java
delete mode 100644 integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentTest.java
delete mode 100644 integration-tests-support/custom-log-component/deployment/pom.xml
delete mode 100644 integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java
delete mode 100644 integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
delete mode 100644 integration-tests-support/custom-log-component/pom.xml
delete mode 100644 integration-tests-support/custom-log-component/runtime/pom.xml
delete mode 100644 integration-tests-support/custom-log-component/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java
delete mode 100644 integration-tests-support/custom-main-listener/deployment/pom.xml
delete mode 100644 integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerFeature.java
delete mode 100644 integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerProcessor.java
delete mode 100644 integration-tests-support/custom-main-listener/pom.xml
delete mode 100644 integration-tests-support/custom-main-listener/runtime/pom.xml
delete mode 100644 integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListenerRecorder.java
delete mode 100644 integration-tests-support/custom-routes-collector/deployment/pom.xml
delete mode 100644 integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorFeature.java
delete mode 100644 integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorProcessor.java
delete mode 100644 integration-tests-support/custom-routes-collector/pom.xml
delete mode 100644 integration-tests-support/custom-routes-collector/runtime/pom.xml
delete mode 100644 integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support/CustomRoutesCollectorRecorder.java
delete mode 100644 integration-tests/core-discovery-disabled/pom.xml
delete mode 100644 integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledResource.java
delete mode 100644 integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutes.java
delete mode 100644 integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutesCDI.java
delete mode 100644 integration-tests/core-discovery-disabled/src/main/resources/application.properties
delete mode 100644 integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledIT.java
delete mode 100644 integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledTest.java
delete mode 100644 integration-tests/main-collector/pom.xml
delete mode 100644 integration-tests/main-collector/src/main/java/org/apache/camel/quarkus/main/CoreMainCollectorResource.java
delete mode 100644 integration-tests/main-collector/src/main/resources/application.properties
delete mode 100644 integration-tests/main-collector/src/test/java/org/apache/camel/quarkus/main/CoreMainCollectorTest.java
delete mode 100644 integration-tests/main-discovery-disabled/pom.xml
delete mode 100644 integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledResource.java
delete mode 100644 integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutes.java
delete mode 100644 integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutesCDI.java
delete mode 100644 integration-tests/main-discovery-disabled/src/main/resources/application.properties
delete mode 100644 integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledIT.java
delete mode 100644 integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledTest.java
(camel-quarkus) 03/04: Remove redundant custom-log-component tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit bc732bdc725a487a102f1a810569219a80ac57a3
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jul 31 08:56:01 2025 +0100
Remove redundant custom-log-component tests
---
catalog/pom.xml | 13 ---
.../foundation/customized-log-component/pom.xml | 109 ---------------------
.../log/it/CustomizedLogComponentResource.java | 57 -----------
.../component/log/it/CustomizedLogComponentIT.java | 23 -----
.../log/it/CustomizedLogComponentTest.java | 42 --------
integration-test-groups/foundation/pom.xml | 1 -
.../custom-log-component/deployment/pom.xml | 78 ---------------
.../quarkus/core/support/deployment/Feature.java | 29 ------
.../core/support/deployment/SupportBuildStep.java | 35 -------
.../custom-log-component/pom.xml | 39 --------
.../custom-log-component/runtime/pom.xml | 64 ------------
.../quarkus/core/support/SupportRecorder.java | 37 -------
integration-tests-support/pom.xml | 1 -
integration-tests/foundation-grouped/pom.xml | 17 ----
poms/bom-test/pom.xml | 5 -
15 files changed, 550 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index acfbd42685..ac6ef8dadf 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -1852,19 +1852,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
diff --git a/integration-test-groups/foundation/customized-log-component/pom.xml b/integration-test-groups/foundation/customized-log-component/pom.xml
deleted file mode 100644
index 33d6652056..0000000000
--- a/integration-test-groups/foundation/customized-log-component/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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-build-parent-it</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-customized-log-component</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Customize Log component :: Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component</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>
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-</project>
diff --git a/integration-test-groups/foundation/customized-log-component/src/main/java/org/apache/camel/quarkus/component/customized/log/it/CustomizedLogComponentResource.java b/integration-test-groups/foundation/customized-log-component/src/main/java/org/apache/camel/quarkus/component/customized/log/it/CustomizedLogComponentResource.java
deleted file mode 100644
index 30904049d3..0000000000
--- a/integration-test-groups/foundation/customized-log-component/src/main/java/org/apache/camel/quarkus/component/customized/log/it/CustomizedLogComponentResource.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.customized.log.it;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.log.LogComponent;
-import org.apache.camel.spi.Registry;
-import org.apache.camel.support.processor.DefaultExchangeFormatter;
-
-@Path("/customized-log-component")
-@ApplicationScoped
-public class CustomizedLogComponentResource {
- @Inject
- Registry registry;
-
- @Inject
- ProducerTemplate producerTemplate;
-
- @Path("/exchange-formatter/{key}")
- @GET
- @Produces(MediaType.TEXT_PLAIN)
- public String exchangeFormatterConfig(@PathParam("key") String key) {
- LogComponent component = registry.lookupByNameAndType("log", LogComponent.class);
- DefaultExchangeFormatter def = (DefaultExchangeFormatter) component.getExchangeFormatter();
-
- switch (key) {
- case "show-all":
- return String.valueOf(def.isShowAll());
- case "multi-line":
- return String.valueOf(def.isMultiline());
- default:
- throw new IllegalStateException("Unexpected key " + key);
- }
- }
-
-}
diff --git a/integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentIT.java b/integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentIT.java
deleted file mode 100644
index de3f265321..0000000000
--- a/integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentIT.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.log.it;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-public class CustomizedLogComponentIT extends CustomizedLogComponentTest {
-}
diff --git a/integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentTest.java b/integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentTest.java
deleted file mode 100644
index 3b098eaa5b..0000000000
--- a/integration-test-groups/foundation/customized-log-component/src/test/java/org/apache/camel/quarkus/component/log/it/CustomizedLogComponentTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.log.it;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class CustomizedLogComponentTest {
-
- @Test
- public void customLogComponent() {
- RestAssured
- .get("/customized-log-component/exchange-formatter/show-all")
- .then()
- .statusCode(200)
- .body(Matchers.is("true"));
- RestAssured
- .get("/customized-log-component/exchange-formatter/multi-line")
- .then()
- .statusCode(200)
- .body(Matchers.is("true"));
-
- }
-
-}
diff --git a/integration-test-groups/foundation/pom.xml b/integration-test-groups/foundation/pom.xml
index 47d64db494..700de877b8 100644
--- a/integration-test-groups/foundation/pom.xml
+++ b/integration-test-groups/foundation/pom.xml
@@ -41,7 +41,6 @@
<module>core-annotations</module>
<module>core-languages</module>
<module>core-thread-pools</module>
- <module>customized-log-component</module>
<module>dataset</module>
<module>direct</module>
<module>eip</module>
diff --git a/integration-tests-support/custom-log-component/deployment/pom.xml b/integration-tests-support/custom-log-component/deployment/pom.xml
deleted file mode 100644
index fd67a89373..0000000000
--- a/integration-tests-support/custom-log-component/deployment/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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">
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component-parent</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component-deployment</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Log Component :: Deployment</name>
- <description>A test extension</description>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom-test</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-log-deployment</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component</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/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java b/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java
deleted file mode 100644
index 922fb0d77d..0000000000
--- a/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.core.support.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-
-public class Feature {
- private static final String FEATURE = "camel-core-support";
-
- @BuildStep
- FeatureBuildItem feature() {
- return new FeatureBuildItem(FEATURE);
- }
-}
diff --git a/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java b/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
deleted file mode 100644
index 16e9c7804b..0000000000
--- a/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.core.support.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import org.apache.camel.component.log.LogComponent;
-import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem;
-import org.apache.camel.quarkus.core.support.SupportRecorder;
-
-public class SupportBuildStep {
- @Record(ExecutionTime.STATIC_INIT)
- @BuildStep
- CamelBeanBuildItem logComponent(SupportRecorder recorder) {
- return new CamelBeanBuildItem(
- "log",
- LogComponent.class.getName(),
- recorder.logComponent());
- }
-}
diff --git a/integration-tests-support/custom-log-component/pom.xml b/integration-tests-support/custom-log-component/pom.xml
deleted file mode 100644
index 10c8b91dda..0000000000
--- a/integration-tests-support/custom-log-component/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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-integration-tests-support</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component-parent</artifactId>
- <packaging>pom</packaging>
-
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Log Component</name>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/integration-tests-support/custom-log-component/runtime/pom.xml b/integration-tests-support/custom-log-component/runtime/pom.xml
deleted file mode 100644
index 1b68efda7c..0000000000
--- a/integration-tests-support/custom-log-component/runtime/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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">
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component-parent</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Log Component :: Runtime</name>
- <description>A test extension</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <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/integration-tests-support/custom-log-component/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java b/integration-tests-support/custom-log-component/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java
deleted file mode 100644
index 06508e5bc2..0000000000
--- a/integration-tests-support/custom-log-component/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.core.support;
-
-import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.runtime.annotations.Recorder;
-import org.apache.camel.Component;
-import org.apache.camel.component.log.LogComponent;
-import org.apache.camel.support.processor.DefaultExchangeFormatter;
-
-@Recorder
-public class SupportRecorder {
- public RuntimeValue<Component> logComponent() {
- DefaultExchangeFormatter def = new DefaultExchangeFormatter();
- def.setShowAll(true);
- def.setMultiline(true);
-
- LogComponent component = new LogComponent();
- component.setExchangeFormatter(def);
-
- return new RuntimeValue<>(component);
- }
-}
diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml
index e800383b96..a54fb1e280 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -52,7 +52,6 @@
<module>azure</module>
<module>certificate-generator</module>
<module>custom-dataformat</module>
- <module>custom-log-component</module>
<module>custom-type-converter</module>
<module>custom-main-listener</module>
<module>custom-kamelet-resource</module>
diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml
index de60304035..a95c6cc9bd 100644
--- a/integration-tests/foundation-grouped/pom.xml
+++ b/integration-tests/foundation-grouped/pom.xml
@@ -100,10 +100,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-http</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
@@ -391,19 +387,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter-deployment</artifactId>
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index ab8761adbe..05929456d9 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -164,11 +164,6 @@
<artifactId>camel-quarkus-integration-tests-support-kafka</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
(camel-quarkus) 01/04: Deprecate RoutesDiscoveryConfig, CamelRoutesLoaderBuildItems and remove redundant tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8319cf6c65adff3625aae7227f5f23e0e165c384
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jul 31 08:55:46 2025 +0100
Deprecate RoutesDiscoveryConfig, CamelRoutesLoaderBuildItems and remove redundant tests
---
.../spi/CamelRoutesLoaderBuildItems.java | 1 +
.../org/apache/camel/quarkus/core/CamelConfig.java | 1 +
integration-tests/core-discovery-disabled/pom.xml | 148 ---------------------
.../core/CoreDiscoveryDisabledResource.java | 55 --------
.../quarkus/core/CoreDiscoveryDisabledRoutes.java | 29 ----
.../core/CoreDiscoveryDisabledRoutesCDI.java | 31 -----
.../src/main/resources/application.properties | 21 ---
.../quarkus/core/CoreDiscoveryDisabledIT.java | 23 ----
.../quarkus/core/CoreDiscoveryDisabledTest.java | 39 ------
integration-tests/main-discovery-disabled/pom.xml | 140 -------------------
.../main/MainDiscoveryDisabledResource.java | 55 --------
.../quarkus/main/MainDiscoveryDisabledRoutes.java | 29 ----
.../main/MainDiscoveryDisabledRoutesCDI.java | 31 -----
.../src/main/resources/application.properties | 21 ---
.../quarkus/main/MainDiscoveryDisabledIT.java | 23 ----
.../quarkus/main/MainDiscoveryDisabledTest.java | 39 ------
integration-tests/pom.xml | 2 -
tooling/scripts/test-categories.yaml | 2 -
18 files changed, 2 insertions(+), 688 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
index 71cee44d74..52d325e5bb 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelRoutesLoaderBuildItems.java
@@ -20,6 +20,7 @@ import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.runtime.RuntimeValue;
import org.apache.camel.quarkus.core.RegistryRoutesLoader;
+@Deprecated(since = "3.26.0", forRemoval = true)
public final class CamelRoutesLoaderBuildItems {
private CamelRoutesLoaderBuildItems() {
}
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
index 77d82bcc42..d1cbfa6a7c 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
@@ -52,6 +52,7 @@ public interface CamelConfig {
*
* @asciidoclet
*/
+ @Deprecated(since = "3.26.0", forRemoval = true)
RoutesDiscoveryConfig routesDiscovery();
/**
diff --git a/integration-tests/core-discovery-disabled/pom.xml b/integration-tests/core-discovery-disabled/pom.xml
deleted file mode 100644
index 1213c4d251..0000000000
--- a/integration-tests/core-discovery-disabled/pom.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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-build-parent-it</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-core-discovery-disabled</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Core Discovery Disabled :: Tests</name>
- <description>The camel integration tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-direct</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jsonb</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jsonb</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jackson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</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>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-direct-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
-</project>
diff --git a/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledResource.java b/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledResource.java
deleted file mode 100644
index 19e0d97dbd..0000000000
--- a/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledResource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.core;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
-
-@Path("/test")
-@ApplicationScoped
-public class CoreDiscoveryDisabledResource {
- @Inject
- CamelContext context;
-
- @Path("/inspect")
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- public JsonObject inspect() {
- // collect the list of route classes instead of just the
- // number of routes to help debugging in case of a failing
- // tests
- List<String> routes = context.getRoutes().stream()
- .map(Route::getClass)
- .map(Class::getName)
- .collect(Collectors.toList());
-
- return Json.createObjectBuilder()
- .add("routes", Json.createArrayBuilder(routes))
- .build();
- }
-}
diff --git a/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutes.java b/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutes.java
deleted file mode 100644
index 3fedf19dcf..0000000000
--- a/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutes.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.core;
-
-import org.apache.camel.builder.RouteBuilder;
-
-public class CoreDiscoveryDisabledRoutes extends RouteBuilder {
- @Override
- public void configure() {
- from("direct:camel")
- .id("camel")
- .to("log:camel");
-
- }
-}
diff --git a/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutesCDI.java b/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutesCDI.java
deleted file mode 100644
index a424eaad60..0000000000
--- a/integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutesCDI.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.core;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import org.apache.camel.builder.RouteBuilder;
-
-@ApplicationScoped
-public class CoreDiscoveryDisabledRoutesCDI extends RouteBuilder {
- @Override
- public void configure() {
- from("direct:cdi")
- .id("cdi")
- .to("log:cdi");
-
- }
-}
diff --git a/integration-tests/core-discovery-disabled/src/main/resources/application.properties b/integration-tests/core-discovery-disabled/src/main/resources/application.properties
deleted file mode 100644
index 9de62fae58..0000000000
--- a/integration-tests/core-discovery-disabled/src/main/resources/application.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-#
-# Quarkus :: Camel
-#
-quarkus.camel.routes-discovery.enabled = false
diff --git a/integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledIT.java b/integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledIT.java
deleted file mode 100644
index 9eeae69e99..0000000000
--- a/integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledIT.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.core;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-public class CoreDiscoveryDisabledIT extends CoreDiscoveryDisabledTest {
-}
diff --git a/integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledTest.java b/integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledTest.java
deleted file mode 100644
index c9e0d23ad9..0000000000
--- a/integration-tests/core-discovery-disabled/src/test/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.core;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@QuarkusTest
-public class CoreDiscoveryDisabledTest {
- @Test
- public void inspect() {
- JsonPath path = RestAssured.when()
- .get("/test/inspect")
- .then()
- .statusCode(200)
- .extract()
- .jsonPath();
-
- assertThat(path.getList("routes", String.class)).isEmpty();
- }
-}
diff --git a/integration-tests/main-discovery-disabled/pom.xml b/integration-tests/main-discovery-disabled/pom.xml
deleted file mode 100644
index 5d91b33e0f..0000000000
--- a/integration-tests/main-discovery-disabled/pom.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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-build-parent-it</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-main-discovery-disabled</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Main Discovery Disabled :: Tests</name>
- <description>The camel integration tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-direct</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jsonb</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jsonb</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>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-direct-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
-</project>
diff --git a/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledResource.java b/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledResource.java
deleted file mode 100644
index 22fe00b35f..0000000000
--- a/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledResource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.main;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
-
-@Path("/test")
-@ApplicationScoped
-public class MainDiscoveryDisabledResource {
- @Inject
- CamelContext context;
-
- @Path("/inspect")
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- public JsonObject inspect() {
- // collect the list of route classes instead of just the
- // number of routes to help debugging in case of a failing
- // tests
- List<String> routes = context.getRoutes().stream()
- .map(Route::getClass)
- .map(Class::getName)
- .collect(Collectors.toList());
-
- return Json.createObjectBuilder()
- .add("routes", Json.createArrayBuilder(routes))
- .build();
- }
-}
diff --git a/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutes.java b/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutes.java
deleted file mode 100644
index 817893c6d4..0000000000
--- a/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutes.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.main;
-
-import org.apache.camel.builder.RouteBuilder;
-
-public class MainDiscoveryDisabledRoutes extends RouteBuilder {
- @Override
- public void configure() {
- from("direct:camel")
- .id("camel")
- .to("log:camel");
-
- }
-}
diff --git a/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutesCDI.java b/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutesCDI.java
deleted file mode 100644
index 952844a3da..0000000000
--- a/integration-tests/main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledRoutesCDI.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.main;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import org.apache.camel.builder.RouteBuilder;
-
-@ApplicationScoped
-public class MainDiscoveryDisabledRoutesCDI extends RouteBuilder {
- @Override
- public void configure() {
- from("direct:cdi")
- .id("cdi")
- .to("log:cdi");
-
- }
-}
diff --git a/integration-tests/main-discovery-disabled/src/main/resources/application.properties b/integration-tests/main-discovery-disabled/src/main/resources/application.properties
deleted file mode 100644
index 9de62fae58..0000000000
--- a/integration-tests/main-discovery-disabled/src/main/resources/application.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-#
-# Quarkus :: Camel
-#
-quarkus.camel.routes-discovery.enabled = false
diff --git a/integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledIT.java b/integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledIT.java
deleted file mode 100644
index c45e8d9407..0000000000
--- a/integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledIT.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.main;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-public class MainDiscoveryDisabledIT extends MainDiscoveryDisabledTest {
-}
diff --git a/integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledTest.java b/integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledTest.java
deleted file mode 100644
index 934f7387c2..0000000000
--- a/integration-tests/main-discovery-disabled/src/test/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.main;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@QuarkusTest
-public class MainDiscoveryDisabledTest {
- @Test
- public void inspect() {
- JsonPath path = RestAssured.when()
- .get("/test/inspect")
- .then()
- .statusCode(200)
- .extract()
- .jsonPath();
-
- assertThat(path.getList("routes", String.class)).isEmpty();
- }
-}
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index d2c03ad767..9014d0f1fc 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -39,10 +39,8 @@
<modules>
<!-- build those first -->
<module>foundation-grouped</module>
- <module>core-discovery-disabled</module>
<module>main</module>
<module>main-devmode</module>
- <module>main-discovery-disabled</module>
<module>main-xml-jaxb</module>
<module>main-xml-io</module>
<module>main-collector</module>
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index a57c6aa667..055a99fc5c 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -54,7 +54,6 @@ group-03:
- bean-validator
- box
- foundation-grouped
- - core-discovery-disabled
- freemarker
- github
- google
@@ -64,7 +63,6 @@ group-03:
- main-collector
- main-command-mode
- main-devmode
- - main-discovery-disabled
- main-xml-io
- main-xml-jaxb
- main-yaml
(camel-quarkus) 02/04: Deprecate CamelRoutesCollectorBuildItem and simplify testing
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 71500e6d949964a331b4ad4a2a44e8dcca4fee4b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jul 31 08:55:53 2025 +0100
Deprecate CamelRoutesCollectorBuildItem and simplify testing
---
catalog/pom.xml | 13 --
.../main/spi/CamelRoutesCollectorBuildItem.java | 1 +
.../core/deployment/CamelRoutesCollectorTest.java | 73 +++++++++++
.../core/deployment}/CustomRoutesCollector.java | 21 ++-
.../custom-routes-collector/deployment/pom.xml | 74 -----------
.../deployment/CustomRoutesCollectorFeature.java | 29 ----
.../deployment/CustomRoutesCollectorProcessor.java | 31 -----
.../custom-routes-collector/pom.xml | 39 ------
.../custom-routes-collector/runtime/pom.xml | 60 ---------
.../support/CustomRoutesCollectorRecorder.java | 28 ----
integration-tests-support/pom.xml | 1 -
integration-tests/main-collector/pom.xml | 146 ---------------------
.../quarkus/main/CoreMainCollectorResource.java | 48 -------
.../src/main/resources/application.properties | 22 ----
.../camel/quarkus/main/CoreMainCollectorTest.java | 38 ------
integration-tests/pom.xml | 1 -
poms/bom-test/pom.xml | 5 -
tooling/scripts/test-categories.yaml | 1 -
18 files changed, 82 insertions(+), 549 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 65f34b2120..acfbd42685 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -1878,19 +1878,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/spi/CamelRoutesCollectorBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/spi/CamelRoutesCollectorBuildItem.java
index c7f68e4e64..5a403d8304 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/spi/CamelRoutesCollectorBuildItem.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/spi/CamelRoutesCollectorBuildItem.java
@@ -23,6 +23,7 @@ import org.apache.camel.main.RoutesCollector;
/**
* Holds the {@link RoutesCollector} {@link RuntimeValue}.
*/
+@Deprecated(since = "3.26.0", forRemoval = true)
public final class CamelRoutesCollectorBuildItem extends SimpleBuildItem {
private final RuntimeValue<RoutesCollector> value;
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java
new file mode 100644
index 0000000000..d75d75c360
--- /dev/null
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.core.deployment;
+
+import java.util.function.Consumer;
+
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.deployment.builditem.StaticBytecodeRecorderBuildItem;
+import io.quarkus.deployment.recording.BytecodeRecorderImpl;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.test.QuarkusUnitTest;
+import jakarta.inject.Inject;
+import org.apache.camel.main.Main;
+import org.apache.camel.main.RoutesCollector;
+import org.apache.camel.quarkus.core.deployment.main.spi.CamelRoutesCollectorBuildItem;
+import org.apache.camel.quarkus.main.CamelMain;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class CamelRoutesCollectorTest {
+ @RegisterExtension
+ static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
+ .addBuildChainCustomizer(buildCustomizer())
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+ .addClasses(CustomRoutesCollector.class));
+
+ @Inject
+ CamelMain main;
+
+ @Test
+ void customRoutesCollector() {
+ Assertions.assertInstanceOf(CustomRoutesCollector.class, main.getRoutesCollector());
+ }
+
+ static Consumer<BuildChainBuilder> buildCustomizer() {
+ return new Consumer<>() {
+ @Override
+ public void accept(BuildChainBuilder builder) {
+ builder.addBuildStep(new BuildStep() {
+ @Override
+ public void execute(BuildContext context) {
+ String methodName = "execute";
+ BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
+ Integer.toString(methodName.hashCode()), true, s -> null);
+ RuntimeValue<RoutesCollector> value = bri.newInstance(CustomRoutesCollector.class.getName());
+ context.produce(new CamelRoutesCollectorBuildItem(value));
+ context.produce(new StaticBytecodeRecorderBuildItem(bri));
+ }
+ }).produces(CamelRoutesCollectorBuildItem.class).produces(StaticBytecodeRecorderBuildItem.class).build();
+ }
+ };
+ }
+
+}
diff --git a/integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support/CustomRoutesCollector.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CustomRoutesCollector.java
similarity index 75%
rename from integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support/CustomRoutesCollector.java
rename to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CustomRoutesCollector.java
index 091f64c01c..554208d05a 100644
--- a/integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support/CustomRoutesCollector.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CustomRoutesCollector.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.main.runtime.support;
+package org.apache.camel.quarkus.core.deployment;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.apache.camel.CamelContext;
@@ -25,7 +24,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.main.RoutesCollector;
import org.apache.camel.spi.Resource;
-public class CustomRoutesCollector implements RoutesCollector {
+public final class CustomRoutesCollector implements RoutesCollector {
@Override
public boolean isIgnoreLoadingError() {
return false;
@@ -33,28 +32,24 @@ public class CustomRoutesCollector implements RoutesCollector {
@Override
public void setIgnoreLoadingError(boolean ignoreLoadingError) {
- // Noop
+ // NoOp
}
@Override
- public List<RoutesBuilder> collectRoutesFromRegistry(
- CamelContext camelContext,
- String excludePattern,
+ public Collection<RoutesBuilder> collectRoutesFromRegistry(CamelContext camelContext, String excludePattern,
String includePattern) {
- return Collections.emptyList();
+ return List.of();
}
@Override
- public Collection<RoutesBuilder> collectRoutesFromDirectory(
- CamelContext camelContext,
- String excludePattern,
+ public Collection<RoutesBuilder> collectRoutesFromDirectory(CamelContext camelContext, String excludePattern,
String includePattern) {
- return Collections.emptyList();
+ return List.of();
}
@Override
public Collection<Resource> findRouteResourcesFromDirectory(CamelContext camelContext, String excludePattern,
String includePattern) {
- return Collections.emptyList();
+ return List.of();
}
}
diff --git a/integration-tests-support/custom-routes-collector/deployment/pom.xml b/integration-tests-support/custom-routes-collector/deployment/pom.xml
deleted file mode 100644
index e9d85006b3..0000000000
--- a/integration-tests-support/custom-routes-collector/deployment/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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">
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-parent</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-deployment</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Routes Collector :: Deployment</name>
- <description>A test extension</description>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom-test</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-integration-tests-support-custom-routes-collector</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/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorFeature.java b/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorFeature.java
deleted file mode 100644
index 8ea61884ae..0000000000
--- a/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorFeature.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.main.runtime.support.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-
-public class CustomRoutesCollectorFeature {
- private static final String FEATURE = "camel-main-collector-support";
-
- @BuildStep
- FeatureBuildItem feature() {
- return new FeatureBuildItem(FEATURE);
- }
-}
diff --git a/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorProcessor.java b/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorProcessor.java
deleted file mode 100644
index a02c52310f..0000000000
--- a/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/main/runtime/support/deployment/CustomRoutesCollectorProcessor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.main.runtime.support.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import org.apache.camel.quarkus.core.deployment.main.spi.CamelRoutesCollectorBuildItem;
-import org.apache.camel.quarkus.main.runtime.support.CustomRoutesCollectorRecorder;
-
-public class CustomRoutesCollectorProcessor {
- @Record(ExecutionTime.STATIC_INIT)
- @BuildStep
- CamelRoutesCollectorBuildItem collector(CustomRoutesCollectorRecorder recorder) {
- return new CamelRoutesCollectorBuildItem(recorder.createSupportCollector());
- }
-}
diff --git a/integration-tests-support/custom-routes-collector/pom.xml b/integration-tests-support/custom-routes-collector/pom.xml
deleted file mode 100644
index 6b928fde02..0000000000
--- a/integration-tests-support/custom-routes-collector/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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>
- <version>3.26.0-SNAPSHOT</version>
- <artifactId>camel-quarkus-integration-tests-support</artifactId>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-parent</artifactId>
- <packaging>pom</packaging>
-
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Routes Collector</name>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/integration-tests-support/custom-routes-collector/runtime/pom.xml b/integration-tests-support/custom-routes-collector/runtime/pom.xml
deleted file mode 100644
index 18e9582601..0000000000
--- a/integration-tests-support/custom-routes-collector/runtime/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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">
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-parent</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Routes Collector :: Runtime</name>
- <description>A test extension</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <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/integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support/CustomRoutesCollectorRecorder.java b/integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support/CustomRoutesCollectorRecorder.java
deleted file mode 100644
index a96601fb3a..0000000000
--- a/integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/main/runtime/support/CustomRoutesCollectorRecorder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.main.runtime.support;
-
-import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.runtime.annotations.Recorder;
-import org.apache.camel.main.RoutesCollector;
-
-@Recorder
-public class CustomRoutesCollectorRecorder {
- public RuntimeValue<RoutesCollector> createSupportCollector() {
- return new RuntimeValue<>(new CustomRoutesCollector());
- }
-}
diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml
index 9b09167ccd..e800383b96 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -53,7 +53,6 @@
<module>certificate-generator</module>
<module>custom-dataformat</module>
<module>custom-log-component</module>
- <module>custom-routes-collector</module>
<module>custom-type-converter</module>
<module>custom-main-listener</module>
<module>custom-kamelet-resource</module>
diff --git a/integration-tests/main-collector/pom.xml b/integration-tests/main-collector/pom.xml
deleted file mode 100644
index 35503a47db..0000000000
--- a/integration-tests/main-collector/pom.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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-build-parent-it</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-main-collector</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Main Collector :: Tests</name>
- <description>The camel integration tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-direct</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-timer</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jsonb</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jsonb</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>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-direct-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-timer-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
-</project>
diff --git a/integration-tests/main-collector/src/main/java/org/apache/camel/quarkus/main/CoreMainCollectorResource.java b/integration-tests/main-collector/src/main/java/org/apache/camel/quarkus/main/CoreMainCollectorResource.java
deleted file mode 100644
index 2442ddb7dc..0000000000
--- a/integration-tests/main-collector/src/main/java/org/apache/camel/quarkus/main/CoreMainCollectorResource.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.main;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.Registry;
-
-@Path("/test")
-@ApplicationScoped
-public class CoreMainCollectorResource {
- @Inject
- CamelMain main;
- @Inject
- Registry registry;
- @Inject
- CamelContext context;
-
- @Path("/main/describe")
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- public JsonObject describeMain() {
- return Json.createObjectBuilder()
- .add("routes-collector-type", main.getRoutesCollector().getClass().getName())
- .build();
- }
-}
diff --git a/integration-tests/main-collector/src/main/resources/application.properties b/integration-tests/main-collector/src/main/resources/application.properties
deleted file mode 100644
index 51c510b9e5..0000000000
--- a/integration-tests/main-collector/src/main/resources/application.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-#
-# Camel
-#
-camel.context.name=quarkus-camel-example
-
diff --git a/integration-tests/main-collector/src/test/java/org/apache/camel/quarkus/main/CoreMainCollectorTest.java b/integration-tests/main-collector/src/test/java/org/apache/camel/quarkus/main/CoreMainCollectorTest.java
deleted file mode 100644
index 9cceae6d96..0000000000
--- a/integration-tests/main-collector/src/test/java/org/apache/camel/quarkus/main/CoreMainCollectorTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.main;
-
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.quarkus.main.runtime.support.CustomRoutesCollector;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.Matchers.is;
-
-@QuarkusTest
-public class CoreMainCollectorTest {
- @Test
- public void testMainInstanceWithCustomCollector() {
- RestAssured.given()
- .accept(MediaType.APPLICATION_JSON)
- .get("/test/main/describe")
- .then()
- .statusCode(200)
- .body("routes-collector-type", is(CustomRoutesCollector.class.getName()));
- }
-}
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 9014d0f1fc..8d5f3cec79 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -43,7 +43,6 @@
<module>main-devmode</module>
<module>main-xml-jaxb</module>
<module>main-xml-io</module>
- <module>main-collector</module>
<module>main-command-mode</module>
<module>main-unknown-args-fail</module>
<module>main-unknown-args-ignore</module>
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 8940ea8af8..ab8761adbe 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -174,11 +174,6 @@
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 055a99fc5c..3119aef559 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -60,7 +60,6 @@ group-03:
- json-validator
- mail-microsoft-oauth
- main
- - main-collector
- main-command-mode
- main-devmode
- main-xml-io
(camel-quarkus) 04/04: Simplify testing of MainListener
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4fa40046ae62829b58fc47f97630618df3b8bb63
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jul 31 08:56:08 2025 +0100
Simplify testing of MainListener
---
catalog/pom.xml | 13 ----
.../core/deployment/CamelRoutesCollectorTest.java | 1 -
.../CamelMainListenerTest.java} | 28 ++++----
.../core/deployment/main}/CustomMainListener.java | 29 ++++-----
.../custom-main-listener/deployment/pom.xml | 74 ----------------------
.../deployment/CustomMainListenerFeature.java | 29 ---------
.../deployment/CustomMainListenerProcessor.java | 31 ---------
.../custom-main-listener/pom.xml | 39 ------------
.../custom-main-listener/runtime/pom.xml | 72 ---------------------
.../mainlistener/CustomMainListenerRecorder.java | 28 --------
integration-tests-support/pom.xml | 1 -
integration-tests/main/pom.xml | 17 -----
.../camel/quarkus/main/CoreMainResource.java | 3 -
.../apache/camel/quarkus/main/CoreMainTest.java | 5 +-
poms/bom-test/pom.xml | 5 --
15 files changed, 29 insertions(+), 346 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index ac6ef8dadf..a5bc66e4d7 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -1852,19 +1852,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java
index d75d75c360..4880b680a2 100644
--- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java
@@ -26,7 +26,6 @@ import io.quarkus.deployment.recording.BytecodeRecorderImpl;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.test.QuarkusUnitTest;
import jakarta.inject.Inject;
-import org.apache.camel.main.Main;
import org.apache.camel.main.RoutesCollector;
import org.apache.camel.quarkus.core.deployment.main.spi.CamelRoutesCollectorBuildItem;
import org.apache.camel.quarkus.main.CamelMain;
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CamelMainListenerTest.java
similarity index 71%
copy from extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java
copy to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CamelMainListenerTest.java
index d75d75c360..e7817db641 100644
--- a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorTest.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CamelMainListenerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.deployment;
+package org.apache.camel.quarkus.core.deployment.main;
import java.util.function.Consumer;
@@ -26,29 +26,32 @@ import io.quarkus.deployment.recording.BytecodeRecorderImpl;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.test.QuarkusUnitTest;
import jakarta.inject.Inject;
-import org.apache.camel.main.Main;
-import org.apache.camel.main.RoutesCollector;
-import org.apache.camel.quarkus.core.deployment.main.spi.CamelRoutesCollectorBuildItem;
+import org.apache.camel.main.MainListener;
+import org.apache.camel.quarkus.core.deployment.main.spi.CamelMainListenerBuildItem;
import org.apache.camel.quarkus.main.CamelMain;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-class CamelRoutesCollectorTest {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class CamelMainListenerTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.addBuildChainCustomizer(buildCustomizer())
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addClasses(CustomRoutesCollector.class));
+ .addClasses(CustomMainListener.class));
@Inject
CamelMain main;
@Test
- void customRoutesCollector() {
- Assertions.assertInstanceOf(CustomRoutesCollector.class, main.getRoutesCollector());
+ void customMainListener() {
+ assertEquals(2, main.getCamelContext().getRoutes().size());
+ assertEquals(2, main.getMainListeners().size());
+ assertTrue(main.getMainListeners().stream().anyMatch(listener -> listener instanceof CustomMainListener));
}
static Consumer<BuildChainBuilder> buildCustomizer() {
@@ -61,13 +64,12 @@ class CamelRoutesCollectorTest {
String methodName = "execute";
BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
Integer.toString(methodName.hashCode()), true, s -> null);
- RuntimeValue<RoutesCollector> value = bri.newInstance(CustomRoutesCollector.class.getName());
- context.produce(new CamelRoutesCollectorBuildItem(value));
+ RuntimeValue<MainListener> value = bri.newInstance(CustomMainListener.class.getName());
+ context.produce(new CamelMainListenerBuildItem(value));
context.produce(new StaticBytecodeRecorderBuildItem(bri));
}
- }).produces(CamelRoutesCollectorBuildItem.class).produces(StaticBytecodeRecorderBuildItem.class).build();
+ }).produces(CamelMainListenerBuildItem.class).produces(StaticBytecodeRecorderBuildItem.class).build();
}
};
}
-
}
diff --git a/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListener.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CustomMainListener.java
similarity index 76%
rename from integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListener.java
rename to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CustomMainListener.java
index 6c06003c9f..850daa5ed4 100644
--- a/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListener.java
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/CustomMainListener.java
@@ -14,35 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.it.support.mainlistener;
+package org.apache.camel.quarkus.core.deployment.main;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.main.BaseMainSupport;
import org.apache.camel.main.MainListener;
-public class CustomMainListener implements MainListener {
+public final class CustomMainListener implements MainListener {
+
@Override
public void beforeInitialize(BaseMainSupport main) {
- try {
- main.configure().addRoutesBuilder(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("timer:configure")
- .id("configure")
- .to("log:configure");
- }
- });
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ main.configure().addRoutesBuilder(new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("timer:configure")
+ .id("configure")
+ .to("log:configure");
+ }
+ });
}
@Override
- public void afterConfigure(BaseMainSupport main) {
+ public void beforeConfigure(BaseMainSupport main) {
}
@Override
- public void beforeConfigure(BaseMainSupport main) {
+ public void afterConfigure(BaseMainSupport main) {
}
@Override
diff --git a/integration-tests-support/custom-main-listener/deployment/pom.xml b/integration-tests-support/custom-main-listener/deployment/pom.xml
deleted file mode 100644
index e4cb0c9b7b..0000000000
--- a/integration-tests-support/custom-main-listener/deployment/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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">
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener-parent</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener-deployment</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Main Listener :: Deployment</name>
- <description>A test extension</description>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-bom-test</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-integration-tests-support-custom-main-listener</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/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerFeature.java b/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerFeature.java
deleted file mode 100644
index 028b8b0b4c..0000000000
--- a/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerFeature.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.it.support.mainlistener.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-
-public class CustomMainListenerFeature {
- private static final String FEATURE = "camel-main-listener-support";
-
- @BuildStep
- FeatureBuildItem feature() {
- return new FeatureBuildItem(FEATURE);
- }
-}
diff --git a/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerProcessor.java b/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerProcessor.java
deleted file mode 100644
index 2ddee21e2d..0000000000
--- a/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerProcessor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.it.support.mainlistener.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import org.apache.camel.quarkus.core.deployment.main.spi.CamelMainListenerBuildItem;
-import org.apache.camel.quarkus.it.support.mainlistener.CustomMainListenerRecorder;
-
-public class CustomMainListenerProcessor {
- @Record(ExecutionTime.STATIC_INIT)
- @BuildStep
- CamelMainListenerBuildItem listener(CustomMainListenerRecorder recorder) {
- return new CamelMainListenerBuildItem(recorder.createSupportListener());
- }
-}
diff --git a/integration-tests-support/custom-main-listener/pom.xml b/integration-tests-support/custom-main-listener/pom.xml
deleted file mode 100644
index 3f1a02fa2e..0000000000
--- a/integration-tests-support/custom-main-listener/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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>
- <version>3.26.0-SNAPSHOT</version>
- <artifactId>camel-quarkus-integration-tests-support</artifactId>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener-parent</artifactId>
- <packaging>pom</packaging>
-
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Main Listener</name>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/integration-tests-support/custom-main-listener/runtime/pom.xml b/integration-tests-support/custom-main-listener/runtime/pom.xml
deleted file mode 100644
index 20c47338a4..0000000000
--- a/integration-tests-support/custom-main-listener/runtime/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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">
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener-parent</artifactId>
- <version>3.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Custom Main Listener :: Runtime</name>
- <description>A test extension</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.jandex</groupId>
- <artifactId>jandex-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-extension-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <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/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListenerRecorder.java b/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListenerRecorder.java
deleted file mode 100644
index debf9c2280..0000000000
--- a/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListenerRecorder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.it.support.mainlistener;
-
-import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.runtime.annotations.Recorder;
-import org.apache.camel.main.MainListener;
-
-@Recorder
-public class CustomMainListenerRecorder {
- public RuntimeValue<MainListener> createSupportListener() {
- return new RuntimeValue<>(new CustomMainListener());
- }
-}
diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml
index a54fb1e280..5c9bdd7380 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -53,7 +53,6 @@
<module>certificate-generator</module>
<module>custom-dataformat</module>
<module>custom-type-converter</module>
- <module>custom-main-listener</module>
<module>custom-kamelet-resource</module>
<module>debezium</module>
<module>google</module>
diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml
index 155447ecf7..43801ade69 100644
--- a/integration-tests/main/pom.xml
+++ b/integration-tests/main/pom.xml
@@ -55,10 +55,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-support-custom-dataformat</artifactId>
@@ -184,19 +180,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter-deployment</artifactId>
diff --git a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
index b885520593..3c9eb0c381 100644
--- a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
+++ b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java
@@ -109,8 +109,6 @@ public class CoreMainResource {
@Produces(MediaType.APPLICATION_JSON)
public JsonObject describeMain() {
CamelContext camelContext = main.getCamelContext();
- JsonArrayBuilder listeners = Json.createArrayBuilder();
- main.getMainListeners().forEach(listener -> listeners.add(listener.getClass().getName()));
JsonArrayBuilder routeBuilders = Json.createArrayBuilder();
main.configure().getRoutesBuilders().forEach(builder -> routeBuilders.add(builder.getClass().getName()));
@@ -148,7 +146,6 @@ public class CoreMainResource {
return Json.createObjectBuilder()
.add("xml-model-dumper", PluginHelper.getModelToXMLDumper(camelContext).getClass().getName())
.add("routes-collector", collector)
- .add("listeners", listeners)
.add("routeBuilders", routeBuilders)
.add("routes", routes)
.add("lru-cache-factory", LRUCacheFactory.getInstance().getClass().getName())
diff --git a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java
index 125726ed7e..29f75e1a28 100644
--- a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java
+++ b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java
@@ -28,7 +28,6 @@ import jakarta.ws.rs.core.MediaType;
import org.apache.camel.ServiceStatus;
import org.apache.camel.quarkus.core.DisabledModelToXMLDumper;
import org.apache.camel.quarkus.core.RegistryRoutesLoaders;
-import org.apache.camel.quarkus.it.support.mainlistener.CustomMainListener;
import org.apache.camel.reactive.vertx.VertXReactiveExecutor;
import org.apache.camel.reactive.vertx.VertXThreadPoolFactory;
import org.apache.camel.support.DefaultLRUCacheFactory;
@@ -82,13 +81,11 @@ public class CoreMainTest {
assertThat(p.getString("routes-collector.type")).isEqualTo(CamelMainRoutesCollector.class.getName());
assertThat(p.getString("routes-collector.type-registry")).isEqualTo(RegistryRoutesLoaders.Default.class.getName());
- assertThat(p.getList("listeners", String.class))
- .containsAnyOf(CamelMainEventBridge.class.getName(), CustomMainListener.class.getName());
assertThat(p.getList("routeBuilders", String.class))
.contains(CamelRoute.class.getName())
.doesNotContain(CamelRouteFiltered.class.getName());
assertThat(p.getList("routes", String.class))
- .contains("keep-alive", "configure", "beforeStart", "produced", "endpointdsl", "lambdaEndpointRoute")
+ .contains("keep-alive", "produced", "endpointdsl", "lambdaEndpointRoute")
.doesNotContain("filtered");
assertThat(p.getString("lru-cache-factory")).isEqualTo(DefaultLRUCacheFactory.class.getName());
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 05929456d9..5e14d6b322 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -164,11 +164,6 @@
<artifactId>camel-quarkus-integration-tests-support-kafka</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>