[camel] branch main updated: camel-catalog - Fix language validator classloading from external editors such as IDEA camel tooling

[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


The following commit(s) were added to refs/heads/main by this push:
     new bea463b  camel-catalog - Fix language validator classloading from 
external editors such as IDEA camel tooling
bea463b is described below

commit bea463b15fd3dc4fed5ee0ab3d7b8934e8d38279
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 28 11:01:16 2021 +0200

    camel-catalog - Fix language validator classloading from external editors 
such as IDEA camel tooling
---
 .../java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
 
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index 73d9c6c..d47e6c5 100644
--- 
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ 
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -54,7 +54,6 @@ import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.model.LanguageModel;
 import org.apache.camel.tooling.model.MainModel;
 import org.apache.camel.tooling.model.OtherModel;
-import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
 
 /**
@@ -1528,7 +1527,7 @@ public abstract class AbstractCamelCatalog {
     private static String stripOptionalPrefixFromName(Map<String, 
BaseOptionModel> rows, String name) {
         for (BaseOptionModel row : rows.values()) {
             String optionalPrefix = row.getOptionalPrefix();
-            if (ObjectHelper.isNotEmpty(optionalPrefix) && 
name.startsWith(optionalPrefix)) {
+            if (optionalPrefix != null && !optionalPrefix.isEmpty() && 
name.startsWith(optionalPrefix)) {
                 // try again
                 return stripOptionalPrefixFromName(rows, 
name.substring(optionalPrefix.length()));
             } else {
@@ -1543,7 +1542,7 @@ public abstract class AbstractCamelCatalog {
     private static String getPropertyNameFromNameWithPrefix(Map<String, 
BaseOptionModel> rows, String name) {
         for (BaseOptionModel row : rows.values()) {
             String prefix = row.getPrefix();
-            if (ObjectHelper.isNotEmpty(prefix) && name.startsWith(prefix)) {
+            if (prefix != null && !prefix.isEmpty() && 
name.startsWith(prefix)) {
                 return row.getName();
             }
         }