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 33bba4d6a6f (chores) camel-kamelet-main: break large method 33bba4d6a6f is described below commit 33bba4d6a6fc7f81e3bbb20df499be0b2502d754 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Mon Nov 11 18:27:53 2024 +0100 (chores) camel-kamelet-main: break large method --- .../main/download/MavenDependencyDownloader.java | 32 ++++++++++++++-------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java index 344723b0bd1..dd7c219e2cf 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java @@ -370,18 +370,9 @@ public class MavenDependencyDownloader extends ServiceSupport implements Depende for (MavenGav mavenGav : gavs) { String v = mavenGav.getVersion(); if ("camel-spring-boot".equals(artifactId)) { - String sbv = null; - if (VersionHelper.isGE(v, minimumVersion)) { - sbv = resolveSpringBootVersionByCamelVersion(v, extraRepos); - } - answer.add(new String[] { v, sbv }); + resolveSpringBoot(minimumVersion, v, extraRepos, answer); } else if ("camel-quarkus-catalog".equals(artifactId)) { - if (VersionHelper.isGE(v, MINIMUM_QUARKUS_VERSION)) { - String cv = resolveCamelVersionByQuarkusVersion(v, extraRepos); - if (cv != null && VersionHelper.isGE(cv, minimumVersion)) { - answer.add(new String[] { cv, v }); - } - } + resolveQuarkus(minimumVersion, v, extraRepos, answer); } else { answer.add(new String[] { v, null }); } @@ -393,6 +384,25 @@ public class MavenDependencyDownloader extends ServiceSupport implements Depende return answer; } + private void resolveQuarkus(String minimumVersion, String v, Set<String> extraRepos, List<String[]> answer) + throws Exception { + if (VersionHelper.isGE(v, MINIMUM_QUARKUS_VERSION)) { + String cv = resolveCamelVersionByQuarkusVersion(v, extraRepos); + if (cv != null && VersionHelper.isGE(cv, minimumVersion)) { + answer.add(new String[] { cv, v }); + } + } + } + + private void resolveSpringBoot(String minimumVersion, String v, Set<String> extraRepos, List<String[]> answer) + throws Exception { + String sbv = null; + if (VersionHelper.isGE(v, minimumVersion)) { + sbv = resolveSpringBootVersionByCamelVersion(v, extraRepos); + } + answer.add(new String[] { v, sbv }); + } + public boolean alreadyOnClasspath(String groupId, String artifactId, String version) { return alreadyOnClasspath(groupId, artifactId, version, true); }