This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7e2260b534180a99debf26115d2d734524c99dc0 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Wed Oct 9 11:11:56 2024 +0200 Removed groovy-dsl extension/tests --- docs/modules/ROOT/examples/others/groovy-dsl.yml | 13 -- docs/modules/ROOT/nav.adoc | 1 - .../pages/reference/extensions/groovy-dsl.adoc | 45 ----- extensions/groovy-dsl/deployment/pom.xml | 69 ------- .../dsl/groovy/deployment/GroovyDslProcessor.java | 197 -------------------- extensions/groovy-dsl/pom.xml | 37 ---- extensions/groovy-dsl/runtime/pom.xml | 79 -------- .../quarkus/dsl/groovy/runtime/Configurer.java | 30 --- .../main/resources/META-INF/quarkus-extension.yaml | 34 ---- extensions/pom.xml | 1 - integration-tests/groovy-dsl/pom.xml | 201 --------------------- .../quarkus/dsl/groovy/GroovyDslResource.java | 106 ----------- .../src/main/resources/application.properties | 21 --- .../src/main/resources/routes/my-routes.groovy | 21 --- .../routes-with-components-configuration.groovy | 36 ---- .../routes-with-dataformats-configuration.groovy | 36 ---- .../main/resources/routes/routes-with-eip.groovy | 36 ---- .../routes/routes-with-endpoint-dsl.groovy | 23 --- .../routes/routes-with-error-handler.groovy | 26 --- .../routes-with-languages-configuration.groovy | 33 ---- .../main/resources/routes/routes-with-rest.groovy | 48 ----- .../camel/quarkus/dsl/groovy/GroovyDslIT.java | 24 --- .../camel/quarkus/dsl/groovy/GroovyDslTest.java | 79 -------- integration-tests/pom.xml | 1 - poms/bom/pom.xml | 22 +-- poms/bom/src/main/generated/flattened-full-pom.xml | 20 -- .../src/main/generated/flattened-reduced-pom.xml | 20 -- .../generated/flattened-reduced-verbose-pom.xml | 20 -- 28 files changed, 1 insertion(+), 1278 deletions(-) diff --git a/docs/modules/ROOT/examples/others/groovy-dsl.yml b/docs/modules/ROOT/examples/others/groovy-dsl.yml deleted file mode 100644 index f70adafc72..0000000000 --- a/docs/modules/ROOT/examples/others/groovy-dsl.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Do not edit directly! -# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -cqArtifactId: camel-quarkus-groovy-dsl -cqArtifactIdBase: groovy-dsl -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: true -cqJvmSince: 1.8.0 -cqNativeSince: 2.16.0 -cqCamelPartName: groovy-dsl -cqCamelPartTitle: Groovy DSL -cqCamelPartDescription: Camel DSL with Groovy -cqExtensionPageTitle: Groovy DSL diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 000726f49a..5097fa461f 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -143,7 +143,6 @@ *** xref:reference/extensions/graphql.adoc[GraphQL] *** xref:reference/extensions/grok.adoc[Grok] *** xref:reference/extensions/groovy.adoc[Groovy] -*** xref:reference/extensions/groovy-dsl.adoc[Groovy DSL] *** xref:reference/extensions/gson.adoc[Gson] *** xref:reference/extensions/guava-eventbus.adoc[Guava EventBus] *** xref:reference/extensions/hl7.adoc[HL7] diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc b/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc deleted file mode 100644 index 3f4d94e0e8..0000000000 --- a/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc +++ /dev/null @@ -1,45 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-groovy-dsl"] -= Groovy DSL -:linkattrs: -:cq-artifact-id: camel-quarkus-groovy-dsl -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable Deprecated -:cq-description: Support for parsing Groovy route definitions at runtime -:cq-deprecated: true -:cq-jvm-since: 1.8.0 -:cq-native-since: 2.16.0 - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.8.0## [.badge-key]##Native since##[.badge-supported]##2.16.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## -endif::[] - -Support for parsing Groovy route definitions at runtime - -[id="extensions-groovy-dsl-whats-inside"] -== What's inside - -* xref:{cq-camel-components}:others:groovy-dsl.adoc[Groovy DSL] - -Please refer to the above link for usage and configuration details. - -[id="extensions-groovy-dsl-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-groovy-dsl[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-dsl</artifactId> -</dependency> ----- -ifeval::[{doc-show-user-guide-link} == true] -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. -endif::[] diff --git a/extensions/groovy-dsl/deployment/pom.xml b/extensions/groovy-dsl/deployment/pom.xml deleted file mode 100644 index 4afad6dfb6..0000000000 --- a/extensions/groovy-dsl/deployment/pom.xml +++ /dev/null @@ -1,69 +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-groovy-dsl-parent</artifactId> - <version>3.17.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-groovy-dsl-deployment</artifactId> - <name>Camel Quarkus :: Groovy DSL :: Deployment</name> - - <dependencies> - <dependency> - <groupId>io.quarkiverse.groovy</groupId> - <artifactId>quarkus-groovy-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-dsl-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-dsl</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java b/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java deleted file mode 100644 index ff03faea78..0000000000 --- a/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java +++ /dev/null @@ -1,197 +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.dsl.groovy.deployment; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.GeneratedClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; -import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.paths.PathCollection; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.ExchangePattern; -import org.apache.camel.Message; -import org.apache.camel.quarkus.core.deployment.main.CamelMainHelper; -import org.apache.camel.quarkus.dsl.groovy.runtime.Configurer; -import org.apache.camel.quarkus.support.dsl.deployment.DslGeneratedClassBuildItem; -import org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor; -import org.apache.camel.spi.Resource; -import org.apache.camel.util.IOHelper; -import org.codehaus.groovy.control.CompilationUnit; -import org.codehaus.groovy.control.CompilerConfiguration; -import org.codehaus.groovy.control.Phases; -import org.codehaus.groovy.tools.GroovyClass; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; -import org.jboss.jandex.IndexView; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.determineName; -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.extractImports; - -public class GroovyDslProcessor { - - private static final Logger LOG = LoggerFactory.getLogger(GroovyDslProcessor.class); - private static final List<Class<?>> CAMEL_REFLECTIVE_CLASSES = Arrays.asList( - Exchange.class, - Message.class, - ExchangePattern.class, - CamelContext.class); - private static final String PACKAGE_NAME = "org.apache.camel.quarkus.dsl.groovy.generated"; - private static final String FILE_FORMAT = """ - package %s - %s - @groovy.transform.InheritConstructors - class %s extends %s { - void configure() { - %s - } - } - """; - - private static final String FEATURE = "camel-groovy-dsl"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void compileScriptsAOT(BuildProducer<GeneratedClassBuildItem> generatedClass, - BuildProducer<ReflectiveClassBuildItem> reflectiveClass, - BuildProducer<DslGeneratedClassBuildItem> generatedGroovyClass, - CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception { - LOG.debug("Loading .groovy resources"); - Map<String, Resource> nameToResource = new HashMap<>(); - CompilationUnit unit = new CompilationUnit(); - CamelMainHelper.forEachMatchingResource( - resource -> { - if (!resource.getLocation().endsWith(".groovy")) { - return; - } - try (InputStream is = resource.getInputStream()) { - String name = determineName(resource); - String fqn = String.format("%s.%s", PACKAGE_NAME, name); - unit.addSource(fqn, toGroovyClass(name, IOHelper.loadText(is))); - nameToResource.put(fqn, resource); - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - if (nameToResource.isEmpty()) { - return; - } - CompilerConfiguration cc = new CompilerConfiguration(); - cc.setClasspathList( - curateOutcomeBuildItem.getApplicationModel().getDependencies().stream() - .map(ResolvedDependency::getResolvedPaths) - .flatMap(PathCollection::stream) - .map(Objects::toString) - .toList()); - unit.configure(cc); - unit.compile(Phases.CLASS_GENERATION); - for (GroovyClass clazz : unit.getClasses()) { - String className = clazz.getName(); - generatedClass.produce(new GeneratedClassBuildItem(true, className, clazz.getBytes())); - if (nameToResource.containsKey(className)) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder(className).build()); - generatedGroovyClass - .produce(new DslGeneratedClassBuildItem(className, nameToResource.get(className).getLocation())); - } - } - } - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void registerReflectiveClasses( - BuildProducer<ReflectiveClassBuildItem> reflectiveClass, - CombinedIndexBuildItem combinedIndexBuildItem) { - - IndexView view = combinedIndexBuildItem.getIndex(); - - for (Class<?> type : CAMEL_REFLECTIVE_CLASSES) { - DotName name = DotName.createSimple(type.getName()); - - if (type.isInterface()) { - for (ClassInfo info : view.getAllKnownImplementors(name)) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder(info.name().toString()).methods().build()); - } - } else { - for (ClassInfo info : view.getAllKnownSubclasses(name)) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder(info.name().toString()).methods().build()); - } - } - - reflectiveClass.produce(ReflectiveClassBuildItem.builder(type).methods().fields(type.isEnum()).build()); - } - - Set<Class<?>> types = new HashSet<>(); - // Register all the Camel return types of public methods of the camel reflective classes for reflection to - // be accessible in native mode from a Groovy resource - for (Class<?> c : CAMEL_REFLECTIVE_CLASSES) { - for (Method method : c.getMethods()) { - if (!method.getDeclaringClass().equals(Object.class)) { - Class<?> returnType = method.getReturnType(); - if (returnType.getPackageName().startsWith("org.apache.camel.") - && !CAMEL_REFLECTIVE_CLASSES.contains(returnType)) { - types.add(returnType); - } - } - } - } - // Allow access to methods by reflection to be accessible in native mode from a Groovy resource - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(types.toArray(new Class<?>[0])).constructors(false).methods().build()); - - } - - /** - * Convert a Groovy script into a Groovy class to be able to compile it. - * - * @param name the name of the Groovy class - * @param contentResource the content of the Groovy script - * @return the content of the corresponding Groovy class. - */ - private static String toGroovyClass(String name, String contentResource) { - List<String> imports = new ArrayList<>(); - imports.add("import org.apache.camel.*"); - imports.add("import org.apache.camel.spi.*"); - DslSupportProcessor.ExtractImportResult extractImportResult = extractImports(contentResource); - imports.addAll(extractImportResult.getImports()); - return String.format( - FILE_FORMAT, PACKAGE_NAME, String.join("\n", imports), name, Configurer.class.getName(), - extractImportResult.getContent()); - } -} diff --git a/extensions/groovy-dsl/pom.xml b/extensions/groovy-dsl/pom.xml deleted file mode 100644 index d82fe38244..0000000000 --- a/extensions/groovy-dsl/pom.xml +++ /dev/null @@ -1,37 +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-extensions</artifactId> - <version>3.17.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-groovy-dsl-parent</artifactId> - <name>Camel Quarkus :: Groovy DSL</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> -</project> diff --git a/extensions/groovy-dsl/runtime/pom.xml b/extensions/groovy-dsl/runtime/pom.xml deleted file mode 100644 index 79c517289d..0000000000 --- a/extensions/groovy-dsl/runtime/pom.xml +++ /dev/null @@ -1,79 +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-groovy-dsl-parent</artifactId> - <version>3.17.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-groovy-dsl</artifactId> - <name>Camel Quarkus :: Groovy DSL :: Runtime</name> - <description>Support for parsing Groovy route definitions at runtime</description> - - <properties> - <camel.quarkus.jvmSince>1.8.0</camel.quarkus.jvmSince> - <camel.quarkus.nativeSince>2.16.0</camel.quarkus.nativeSince> - <quarkus.metadata.deprecated>true</quarkus.metadata.deprecated> - </properties> - - <dependencies> - <dependency> - <groupId>io.quarkiverse.groovy</groupId> - <artifactId>quarkus-groovy</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-support-dsl</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-dsl</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/Configurer.java b/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/Configurer.java deleted file mode 100644 index b4c39432e7..0000000000 --- a/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/Configurer.java +++ /dev/null @@ -1,30 +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.dsl.groovy.runtime; - -import org.apache.camel.builder.endpoint.EndpointRouteBuilder; -import org.apache.camel.dsl.groovy.common.GroovyDSL; -import org.apache.camel.quarkus.support.dsl.runtime.RoutesBuilderConfigurer; - -public abstract class Configurer extends GroovyDSL implements RoutesBuilderConfigurer { - - // The constructor needs to remain public to be accessible from a Groovy Script - public Configurer(EndpointRouteBuilder builder) { - super(builder); - } - -} diff --git a/extensions/groovy-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/groovy-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index c1f868e18b..0000000000 --- a/extensions/groovy-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,34 +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. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel Groovy DSL" -description: "Support for parsing Groovy route definitions at runtime" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" - sponsor: "Apache Software Foundation" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/groovy-dsl.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/pom.xml b/extensions/pom.xml index 71bc39d946..43c412b281 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -122,7 +122,6 @@ <module>graphql</module> <module>grok</module> <module>groovy</module> - <module>groovy-dsl</module> <module>grpc</module> <module>gson</module> <module>hashicorp-vault</module> diff --git a/integration-tests/groovy-dsl/pom.xml b/integration-tests/groovy-dsl/pom.xml deleted file mode 100644 index e653869102..0000000000 --- a/integration-tests/groovy-dsl/pom.xml +++ /dev/null @@ -1,201 +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.17.0-SNAPSHOT</version> - <relativePath>../../poms/build-parent-it/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-integration-test-groovy-dsl</artifactId> - <name>Camel Quarkus :: Integration Tests :: Groovy DSL</name> - <description>Integration tests for Camel Groovy DSL extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-dsl</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-jackson</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bean</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-rest</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> - </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-bean-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-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-groovy-dsl-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-jackson-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-rest-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - <!-- TODO: https://github.com/apache/camel-quarkus/issues/5441 - <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> - --> - </profiles> - -</project> diff --git a/integration-tests/groovy-dsl/src/main/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslResource.java b/integration-tests/groovy-dsl/src/main/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslResource.java deleted file mode 100644 index 8eb3c028b2..0000000000 --- a/integration-tests/groovy-dsl/src/main/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslResource.java +++ /dev/null @@ -1,106 +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.dsl.groovy; - -import java.util.Set; -import java.util.stream.Collectors; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.Route; -import org.apache.camel.component.direct.DirectEndpoint; -import org.apache.camel.dsl.groovy.GroovyRoutesBuilderLoader; -import org.apache.camel.quarkus.main.CamelMain; -import org.apache.camel.spi.RoutesBuilderLoader; - -@Path("/groovy-dsl") -@ApplicationScoped -public class GroovyDslResource { - @Inject - CamelMain main; - - @Inject - ProducerTemplate producerTemplate; - - @GET - @Produces(MediaType.TEXT_PLAIN) - public String ready() { - return "OK"; - } - - @Path("/main/groovyRoutesBuilderLoader") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String groovyRoutesBuilder() { - final ExtendedCamelContext camelContext = main.getCamelContext().getCamelContextExtension(); - return camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH) - .findClass(GroovyRoutesBuilderLoader.EXTENSION).get().getName(); - } - - @Path("/main/routeBuilders") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routeBuilders() { - return main.configure().getRoutesBuilders().stream() - .map(rb -> rb.getClass().getSimpleName()) - .sorted() - .collect(Collectors.joining(",")); - } - - @Path("/main/routes") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routes() { - return main.getCamelContext().getRoutes().stream() - .map(Route::getId) - .sorted() - .collect(Collectors.joining(",")); - } - - @GET - @Path("/main/successful/routes") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public int successfulRoutes() { - int successful = 0; - Set<String> excluded = Set.of("my-groovy-route", "routes-with-rest-dsl-get", "routes-with-rest-dsl-post"); - for (Route route : main.getCamelContext().getRoutes()) { - String name = route.getRouteId(); - if (route.getEndpoint() instanceof DirectEndpoint && !excluded.contains(name) - && producerTemplate.requestBody(route.getEndpoint(), "", Boolean.class) == Boolean.TRUE) { - successful++; - } - } - return successful; - } - - @POST - @Path("/hello") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public String hello(String message) { - return producerTemplate.requestBody("direct:groovyHello", message, String.class); - } -} diff --git a/integration-tests/groovy-dsl/src/main/resources/application.properties b/integration-tests/groovy-dsl/src/main/resources/application.properties deleted file mode 100644 index 7ab2bf28e3..0000000000 --- a/integration-tests/groovy-dsl/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. -## --------------------------------------------------------------------------- - -# -# Main -# -camel.main.routes-include-pattern = classpath:routes/*.groovy diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/my-routes.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/my-routes.groovy deleted file mode 100644 index e1e7cb2972..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/my-routes.groovy +++ /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. - */ -from('direct:groovyHello') - .id('my-groovy-route') - .setBody().simple('Hello ${body} from Groovy!') - // Extensions are not supported due to https://github.com/apache/camel-quarkus/issues/4384 - // .setBody { e -> "Hello " + e.in.body + " from Groovy!" } diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-components-configuration.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-components-configuration.groovy deleted file mode 100644 index 276b1246d1..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-components-configuration.groovy +++ /dev/null @@ -1,36 +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. - */ -import org.apache.camel.component.direct.DirectComponent - -camel { - components { - direct { - // set value as method - timeout 1234 - } - myDirect(DirectComponent) { - // set value as method - timeout = 4321 - } - } -} - - - -from('direct:routes-with-components-configuration') - .id('routes-with-components-configuration') - .setBody(simple('${camelContext.getComponent("myDirect")} != null', Boolean.class)) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-dataformats-configuration.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-dataformats-configuration.groovy deleted file mode 100644 index 3e2788cbaf..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-dataformats-configuration.groovy +++ /dev/null @@ -1,36 +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. - */ - -import org.apache.camel.component.jackson.JacksonDataFormat - -camel { - dataFormats { - dataFormat("jackson") { - unmarshalType = Map.class - prettyPrint = true - } - dataFormat("my-jackson", JacksonDataFormat) { - unmarshalType = String.class - prettyPrint = false - } - } -} - - -from('direct:routes-with-dataformats-configuration') - .id('routes-with-dataformats-configuration') - .setBody(simple('${ref:my-jackson} != null', Boolean.class)) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-eip.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-eip.groovy deleted file mode 100644 index 8d21881910..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-eip.groovy +++ /dev/null @@ -1,36 +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. - */ - -from('direct:routes-with-eip-setBody') - .id('routes-with-eip-setBody') - .setBody { "true" } - -from('direct:routes-with-eip-body') - .id('routes-with-eip-body') - .transform().body { b -> "true"} - -from('direct:routes-with-eip-message') - .id('routes-with-eip-message') - .transform().message { m -> m.body = "true"} - -from('direct:routes-with-eip-exchange') - .id('routes-with-eip-exchange') - .transform().exchange { e -> e.in.body = "true"} - -from('direct:routes-with-eip-process') - .id('routes-with-eip-process') - .process {e -> e.in.body = "true" } diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-endpoint-dsl.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-endpoint-dsl.groovy deleted file mode 100644 index 269ccd7e3a..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-endpoint-dsl.groovy +++ /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. - */ -def f = direct("routes-with-endpoint-dsl").advanced().synchronous(true) -def t = log('info') - -from(f) - .id('routes-with-endpoint-dsl') - .setBody().constant("true") - .to(t) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-error-handler.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-error-handler.groovy deleted file mode 100644 index ecf90a4949..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-error-handler.groovy +++ /dev/null @@ -1,26 +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. - */ - -onException(IllegalArgumentException.class) - .id('my-on-exception') - .to('log:exception') - -from('direct:routes-with-error-handler') - .id('routes-with-error-handler') - .setHeader("SomeHeader", constant("SomeHeaderValue")) - .filter().simple('${header.SomeHeader} == "SomeHeaderValue"') - .setBody().constant("true") diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-languages-configuration.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-languages-configuration.groovy deleted file mode 100644 index 7339de1b0e..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-languages-configuration.groovy +++ /dev/null @@ -1,33 +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. - */ -import org.apache.camel.language.bean.BeanLanguage - -camel { - - languages { - bean(BeanLanguage) { - validate = false - } - myBean(BeanLanguage) { - validate = true - } - } -} - -from('direct:routes-with-languages-configuration') - .id('routes-with-languages-configuration') - .setBody(simple('${ref:my-bean} != null', Boolean.class)) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy deleted file mode 100644 index b09e06b0bd..0000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy +++ /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. - */ -rest { - configuration { - contextPath = "/root" - } - - path("/my/path") { - get("/get") { - produces("text/plain") - to("direct:get") - } - } - - post { - path("/post") - consumes("text/plain") - produces("text/plain") - to("direct:post") - } -} - -from('direct:get') - .id("routes-with-rest-dsl-get") - .transform().constant("Hello World") -from('direct:post') - .id("routes-with-rest-dsl-post") - .setBody().simple('Hello ${body}') - -from("direct:routes-with-rest") - .id("routes-with-rest") - .setHeader("AnotherHeader", constant("AnotherHeaderValue")) - .filter().simple('${header.AnotherHeader} == "AnotherHeaderValue"') - .setBody().constant("true") diff --git a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslIT.java b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslIT.java deleted file mode 100644 index 50fb8bd47d..0000000000 --- a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslIT.java +++ /dev/null @@ -1,24 +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.dsl.groovy; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -class GroovyDslIT extends GroovyDslTest { - -} diff --git a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java deleted file mode 100644 index 5d366194af..0000000000 --- a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java +++ /dev/null @@ -1,79 +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.dsl.groovy; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.apache.camel.dsl.groovy.GroovyRoutesBuilderLoader; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class GroovyDslTest { - - @Test - void groovyHello() { - RestAssured.given() - .body("John Smith") - .post("/groovy-dsl/hello") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello John Smith from Groovy!")); - } - - @Test - void testMainInstanceWithJavaRoutes() { - RestAssured.given() - .get("/groovy-dsl/main/groovyRoutesBuilderLoader") - .then() - .statusCode(200) - .body(CoreMatchers.is(GroovyRoutesBuilderLoader.class.getName())); - - RestAssured.given() - .get("/groovy-dsl/main/routeBuilders") - .then() - .statusCode(200) - .body(CoreMatchers.is("")); - - RestAssured.given() - .get("/groovy-dsl/main/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is( - "my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post")); - RestAssured.given() - .get("/groovy-dsl/main/successful/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is("10")); - } - - @Test - void testRestEndpoints() { - RestAssured.given() - .get("/root/my/path/get") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello World")); - RestAssured.given() - .body("Will") - .post("/root/post") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello Will")); - } -} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index aa37acfd8b..5f3b8574ea 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -105,7 +105,6 @@ <module>graphql</module> <module>grok</module> <module>groovy</module> - <module>groovy-dsl</module> <module>grpc</module> <module>hashicorp-vault</module> <module>hazelcast</module> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 684e487ac9..e897257391 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1331,17 +1331,7 @@ <artifactId>camel-groovy</artifactId> <version>${camel.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-dsl</artifactId> - <version>${camel.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-dsl-common</artifactId> - <version>${camel.version}</version> - </dependency> - <dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-grpc</artifactId> <version>${camel.version}</version> @@ -4160,16 +4150,6 @@ <artifactId>camel-quarkus-groovy-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-dsl</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-dsl-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-grpc</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 29156b1fdf..d518b854e9 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1269,16 +1269,6 @@ <artifactId>camel-groovy</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.9.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-groovy-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.9.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-groovy-dsl-common</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.9.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-grpc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -4097,16 +4087,6 @@ <artifactId>camel-quarkus-groovy-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.16.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-quarkus-groovy-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.16.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-quarkus-groovy-dsl-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.16.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-grpc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 4f56479b39..776d3acf5b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1269,16 +1269,6 @@ <artifactId>camel-groovy</artifactId> <version>4.9.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-dsl</artifactId> - <version>4.9.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy-dsl-common</artifactId> - <version>4.9.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-grpc</artifactId> @@ -4097,16 +4087,6 @@ <artifactId>camel-quarkus-groovy-deployment</artifactId> <version>3.16.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-dsl</artifactId> - <version>3.16.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-groovy-dsl-deployment</artifactId> - <version>3.16.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-grpc</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 1abc92b64e..a3094ee6cc 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1269,16 +1269,6 @@ <artifactId>camel-groovy</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.9.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-groovy-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.9.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-groovy-dsl-common</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.9.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-grpc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -4097,16 +4087,6 @@ <artifactId>camel-quarkus-groovy-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.16.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-quarkus-groovy-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.16.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>camel-quarkus-groovy-dsl-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.16.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-grpc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->