Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MINIFICPP-739: Resolve json checks for c2 responses #488

Closed
wants to merge 2 commits into from

Conversation

phrocker
Copy link
Contributor

Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically master)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file?
  • If applicable, have you updated the NOTICE file?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.

@phrocker phrocker requested a review from apiri February 19, 2019 18:36
if (root.HasMember("operationid")) {
identifier = root["operationid"].GetString();
} else if (root.HasMember("operationId")) {
identifier = root["operationId"].GetString();
} else if (root.HasMember("identifier")) {
identifier = root["identifier"].GetString();
}
if (root["requested_operations"].Size() == 0 && root["requestedOperations"].Size() == 0)

Copy link
Contributor

@arpadboda arpadboda Feb 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch. It's pretty painful that both can occur.

I my opinion the following way is a bit more straight forward to deal with this, but I don't adhere to it:

std::array<std::string, 2> ops = {"requested_operations", "requestedOperations"};
auto it = ops.begin();
for(; it != ops.end() ; ++it) {
  if(root.HasMember(*it) && root[*it].Size() > 0) break;
}
if(it == ops.end()) //none found 
  return C2Payload(payload.getOperation(), state::UpdateState::READ_COMPLETE, true);

//no need to bother with size as it's surely found
for (const rapidjson::Value& request : root[*it].GetArray()) {
...

@apiri
Copy link
Member

apiri commented Feb 20, 2019

reviewing

@asfgit asfgit closed this in 840610d Feb 20, 2019
nghiaxlee pushed a commit to nghiaxlee/nifi-minifi-cpp that referenced this pull request Jul 8, 2019
This closes apache#488.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants