(camel) 02/02: CAMEL-20557: Rest DSL to use openapi spec directly

[davsclaus]

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 3e03b8e2c508159b6af8a975ce7f877e16f393ea
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Apr 4 15:08:12 2024 +0200

    CAMEL-20557: Rest DSL to use openapi spec directly
---
 .../component/rest/openapi/RestOpenApiProcessor.java      | 15 ---------------
 1 file changed, 15 deletions(-)

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 06a362fa789..888cea1fa25 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,14 +27,6 @@ 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;
@@ -517,15 +509,8 @@ 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);
                 }