[camel] branch master updated: [CAMEL-14437] Fix unit test

[gnodet]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 91e04da  [CAMEL-14437] Fix unit test
91e04da is described below

commit 91e04da0d503db41f4b4687e2e0ee11300eb90ac
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jan 29 01:51:01 2020 +0100

    [CAMEL-14437] Fix unit test
---
 .../runtimecatalog/impl/AbstractCamelCatalog.java  |  5 +++--
 .../org/apache/camel/tooling/model/JsonMapper.java | 24 +++++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
 
b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
index d7b0de5..17b0f08 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
@@ -771,8 +771,9 @@ public abstract class AbstractCamelCatalog {
                 boolean contains = properties.containsKey(key);
                 if (!contains) {
                     // if the key are similar we have no explicit value and 
can try to find a default value if the option is required
-                    if (rows.get(key).isRequired()) {
-                        Object value = rows.get(key).getDefaultValue();
+                    BaseOptionModel row = rows.get(key);
+                    if (row != null && row.isRequired()) {
+                        Object value = row.getDefaultValue();
                         if (!URISupport.isEmpty(value)) {
                             properties.put(key, key2 = value.toString());
                         }
diff --git 
a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java
 
b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java
index e9cd45c..8d3129b 100644
--- 
a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java
+++ 
b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java
@@ -90,18 +90,22 @@ public class JsonMapper {
         model.setArtifactId(mobj.getString("artifactId"));
         model.setVersion(mobj.getString("version"));
         JsonObject mcprp = (JsonObject) obj.get("componentProperties");
-        for (Map.Entry<String, Object> entry : mcprp.entrySet()) {
-            JsonObject mp = (JsonObject) entry.getValue();
-            ComponentOptionModel option = new ComponentOptionModel();
-            parseOption(mp, option, entry.getKey());
-            model.addComponentOption(option);
+        if (mcprp != null) {
+            for (Map.Entry<String, Object> entry : mcprp.entrySet()) {
+                JsonObject mp = (JsonObject) entry.getValue();
+                ComponentOptionModel option = new ComponentOptionModel();
+                parseOption(mp, option, entry.getKey());
+                model.addComponentOption(option);
+            }
         }
         JsonObject mprp = (JsonObject) obj.get("properties");
-        for (Map.Entry<String, Object> entry : mprp.entrySet()) {
-            JsonObject mp = (JsonObject) entry.getValue();
-            EndpointOptionModel option = new EndpointOptionModel();
-            parseOption(mp, option, entry.getKey());
-            model.addEndpointOption(option);
+        if (mprp != null) {
+            for (Map.Entry<String, Object> entry : mprp.entrySet()) {
+                JsonObject mp = (JsonObject) entry.getValue();
+                EndpointOptionModel option = new EndpointOptionModel();
+                parseOption(mp, option, entry.getKey());
+                model.addEndpointOption(option);
+            }
         }
         return model;
     }