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;
} else {
throw new SvcLogicException("Missing Mandatory param(s) NodeList ");
}
- } catch (JSONException e) {
- code = 401;
- logger.error(POSTING_REQUEST_JSON_ERROR_STR, e);
- doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + e.getMessage());
} catch (Exception e) {
code = 401;
logger.error(POSTING_REQUEST_ERROR_STR, e);
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;
throw new SvcLogicException("Chef Adapter error:" + cutMessage);
}
-}
+}
\ No newline at end of file