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 <[email protected]> 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
