This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit e070aae9898ebc4bfd5c3fd25673248f1a63b9dd Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Apr 4 11:03:55 2024 +0200 CAMEL-20557: Rest DSL to use openapi spec directly --- .../component/rest/openapi/RestOpenApiProcessor.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java index 888cea1fa25..06a362fa789 100644 --- a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java +++ b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java @@ -27,6 +27,14 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.stream.Collectors; +<<<<<<< HEAD +======= +import jakarta.xml.bind.annotation.XmlRootElement; + +import javax.annotation.processing.Generated; + +import com.fasterxml.jackson.annotation.JsonTypeName; +>>>>>>> 7d080d57250 (CAMEL-20557: Rest DSL to use openapi spec directly) import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Content; @@ -509,8 +517,15 @@ public class RestOpenApiProcessor extends DelegateAsyncProcessor implements Came "OpenAPI binding classes package scan"); String[] pcks = base.split(","); PackageScanClassResolver resolver = PluginHelper.getPackageScanClassResolver(camelContext); +<<<<<<< HEAD // just add all classes as the POJOs can be generated with all kind of tools and with and without annotations scannedClasses.addAll(resolver.findImplementations(Object.class, pcks)); +======= + // discover POJO generated classes for JSon/XML + scannedClasses.addAll(resolver.findAnnotated(Generated.class, pcks)); + scannedClasses.addAll(resolver.findAnnotated(JsonTypeName.class, pcks)); + scannedClasses.addAll(resolver.findAnnotated(XmlRootElement.class, pcks)); +>>>>>>> 7d080d57250 (CAMEL-20557: Rest DSL to use openapi spec directly) if (!scannedClasses.isEmpty()) { LOG.info("Binding package scan found {} classes in packages: {}", scannedClasses.size(), base); }