diff options
Diffstat (limited to 'appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main')
| -rw-r--r-- | appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java index d26c85c44..64aedcc24 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java @@ -28,6 +28,7 @@ import com.att.eelf.configuration.EELFManager; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Optional; import org.apache.commons.lang.StringUtils; import org.json.JSONException; import org.json.JSONObject; @@ -288,12 +289,13 @@ public class ChefAdapterImpl implements ChefAdapter { allNodeData = allNodeData.getJSONObject("normal"); String attribute = "PushJobOutput"; - String resultData = allNodeData.optString(attribute); + String resultData = allNodeData.optString(attribute, null); if (resultData == null) { - resultData = allNodeData.optJSONObject(attribute).toString(); - + resultData = Optional.ofNullable(allNodeData.optJSONObject(attribute)) + .map(p -> p.toString()).orElse(null); if (resultData == null) { - resultData = allNodeData.optJSONArray(attribute).toString(); + resultData = Optional.ofNullable(allNodeData.optJSONArray(attribute)) + .map(p -> p.toString()).orElse(null); if (resultData == null) { code = 500; @@ -653,4 +655,4 @@ public class ChefAdapterImpl implements ChefAdapter { throw new SvcLogicException("Chef Adapter error:" + cutMessage); } -} +}
\ No newline at end of file |