(camel) branch main updated: CAMEL-20093: cleaned up duplicated code in camel-route-parser

[orpiske]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 7fd7cf1c857 CAMEL-20093: cleaned up duplicated code in 
camel-route-parser
7fd7cf1c857 is described below

commit 7fd7cf1c85754ac63e4d8a122dcf9d48e817df4b
Author: Nikita Konovalov <nkono...@redhat.com>
AuthorDate: Thu Nov 16 11:36:29 2023 +0100

    CAMEL-20093: cleaned up duplicated code in camel-route-parser
---
 .../org/apache/camel/parser/RestDslParser.java     | 27 ++++------------------
 .../apache/camel/parser/RouteBuilderParser.java    |  2 +-
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git 
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java
 
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java
index 9e125831ac5..8f33f5bf452 100644
--- 
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java
+++ 
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RestDslParser.java
@@ -20,13 +20,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.camel.parser.helper.CamelJavaParserHelper;
 import org.apache.camel.parser.helper.CamelJavaRestDslParserHelper;
 import org.apache.camel.parser.model.RestConfigurationDetails;
 import org.apache.camel.parser.model.RestServiceDetails;
 import org.jboss.forge.roaster.model.source.JavaClassSource;
 import org.jboss.forge.roaster.model.source.MethodSource;
 
+import static 
org.apache.camel.parser.RouteBuilderParser.findAllConfigureMethods;
+
 /**
  * A Camel parser that parses Camel Java Rest DSL source code.
  * <p/>
@@ -49,17 +50,7 @@ public final class RestDslParser {
             JavaClassSource clazz, String fullyQualifiedFileName,
             boolean includeInlinedRouteBuilders) {
 
-        List<MethodSource<JavaClassSource>> methods = new ArrayList<>();
-        MethodSource<JavaClassSource> method = 
CamelJavaParserHelper.findConfigureMethod(clazz);
-        if (method != null) {
-            methods.add(method);
-        }
-        if (includeInlinedRouteBuilders) {
-            List<MethodSource<JavaClassSource>> inlinedMethods = 
CamelJavaParserHelper.findInlinedConfigureMethods(clazz);
-            if (!inlinedMethods.isEmpty()) {
-                methods.addAll(inlinedMethods);
-            }
-        }
+        List<MethodSource<JavaClassSource>> methods = 
findAllConfigureMethods(clazz, includeInlinedRouteBuilders);
 
         CamelJavaRestDslParserHelper parser = new 
CamelJavaRestDslParserHelper();
         List<RestConfigurationDetails> list = new ArrayList<>();
@@ -87,17 +78,7 @@ public final class RestDslParser {
             JavaClassSource clazz, String fullyQualifiedFileName,
             boolean includeInlinedRouteBuilders) {
 
-        List<MethodSource<JavaClassSource>> methods = new ArrayList<>();
-        MethodSource<JavaClassSource> method = 
CamelJavaParserHelper.findConfigureMethod(clazz);
-        if (method != null) {
-            methods.add(method);
-        }
-        if (includeInlinedRouteBuilders) {
-            List<MethodSource<JavaClassSource>> inlinedMethods = 
CamelJavaParserHelper.findInlinedConfigureMethods(clazz);
-            if (!inlinedMethods.isEmpty()) {
-                methods.addAll(inlinedMethods);
-            }
-        }
+        List<MethodSource<JavaClassSource>> methods = 
findAllConfigureMethods(clazz, includeInlinedRouteBuilders);
 
         CamelJavaRestDslParserHelper parser = new 
CamelJavaRestDslParserHelper();
         List<RestServiceDetails> list = new ArrayList<>();
diff --git 
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
 
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
index d3fceef50dc..e2889c5086c 100644
--- 
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
+++ 
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
@@ -216,7 +216,7 @@ public final class RouteBuilderParser {
         }
     }
 
-    private static List<MethodSource<JavaClassSource>> findAllConfigureMethods(
+    static List<MethodSource<JavaClassSource>> findAllConfigureMethods(
             JavaClassSource clazz, boolean includeInlinedRouteBuilders) {
         List<MethodSource<JavaClassSource>> methods = new ArrayList<>();
         MethodSource<JavaClassSource> method = 
CamelJavaParserHelper.findConfigureMethod(clazz);