This is an automated email from the ASF dual-hosted git repository. cdeppisch 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 abe55400a6d chore(jbang): Fix plugin helper abe55400a6d is described below commit abe55400a6ddafe13bdffdf4eec01ba9a60f7f0e Author: Christoph Deppisch <cdeppi...@redhat.com> AuthorDate: Wed Jul 3 08:29:00 2024 +0200 chore(jbang): Fix plugin helper - Maven GAV dependency from the plugin configuration can be empty - Avoid Nullpointer when plugin needs to be resolved by naming convention defaults instead --- .../org/apache/camel/dsl/jbang/core/common/PluginHelper.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java index e2588bc27ea..d087c75d7fe 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java @@ -113,12 +113,12 @@ public final class PluginHelper { } private static MavenGav dependencyAsMavenGav(JsonObject properties) { - final String dependency = properties.get("dependency").toString(); + final Object dependency = properties.get("dependency"); if (dependency == null) { return null; } - return MavenGav.parseGav(dependency); + return MavenGav.parseGav(dependency.toString()); } private static void versionCheck(CamelJBangMain main, String version, String firstVersion, String command) { @@ -255,8 +255,7 @@ public final class PluginHelper { * @return The group in g:a:v. That is, "g". */ private static String extractGroup(MavenGav gav, String defaultGroup) { - return doExtractInfo(gav, defaultGroup, gav::getGroupId); - + return doExtractInfo(gav, defaultGroup, gav != null ? gav::getGroupId : () -> ""); } /** @@ -267,6 +266,6 @@ public final class PluginHelper { * @return The group in g:a:v. That is, "v". */ private static String extractVersion(MavenGav gav, String defaultVersion) { - return doExtractInfo(gav, defaultVersion, gav::getVersion); + return doExtractInfo(gav, defaultVersion, gav != null ? gav::getVersion : () -> ""); } }