Fix wrong isNotEmpty calls

apache · May 14, 2024 · 0c120c9 · 0c120c9
1 parent c254804
commit 0c120c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
@@ -104,18 +104,14 @@ public ApiMethodHelper(Class<T> apiMethodEnum, Map<String, String> aliases, List
                     // add method name alias
                     String alias = matcher.replaceAll(aliasEntry.getValue());
                     // convert first character to lowercase
-                    ObjectHelper.isNotEmpty(alias);
+                    ObjectHelper.notNullOrEmpty(alias, "alias");
                     final char firstChar = alias.charAt(0);
                     if (!Character.isLowerCase(firstChar)) {
                         final StringBuilder builder = new StringBuilder();
                         builder.append(Character.toLowerCase(firstChar)).append(alias, 1, alias.length());
                         alias = builder.toString();
                     }
-                    Set<String> names = tmpAliasesMap.get(alias);
-                    if (names == null) {
-                        names = new HashSet<>();
-                        tmpAliasesMap.put(alias, names);
-                    }
+                    Set<String> names = tmpAliasesMap.computeIfAbsent(alias, k -> new HashSet<>());
                     names.add(name);
                 }
             }

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
@@ -109,7 +109,7 @@ boolean isFrozen() {
      * (the names are suitably extended by the segment originally lopped off).
      */
     protected Map<String, Object> internalBind(String name, Object value) throws NamingException {
-        org.apache.camel.util.ObjectHelper.isNotEmpty(name);
+        org.apache.camel.util.ObjectHelper.notNullOrEmpty(name, "name");
         org.apache.camel.util.ObjectHelper.notNull(frozen, "frozen");
 
         Map<String, Object> newBindings = new HashMap<>();
@@ -122,7 +122,7 @@ protected Map<String, Object> internalBind(String name, Object value) throws Nam
             newBindings.put(name, value);
         } else {
             String segment = name.substring(0, pos);
-            org.apache.camel.util.ObjectHelper.isNotEmpty(segment);
+            org.apache.camel.util.ObjectHelper.notNullOrEmpty(segment, "segment");
             Object o = treeBindings.get(segment);
             if (o == null) {
                 o = newContext();