This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new bf3c9e3 MINIFICPP-1447 - Remove unused C2Payload::isResponse
bf3c9e3 is described below
commit bf3c9e326770adf633f918b98e87ae0d02102d69
Author: Adam Debreceni <[email protected]>
AuthorDate: Tue Jan 5 16:01:46 2021 +0100
MINIFICPP-1447 - Remove unused C2Payload::isResponse
Signed-off-by: Arpad Boda <[email protected]>
This closes #971
---
extensions/coap/protocols/CoapC2Protocol.cpp | 18 +++++-----
extensions/coap/protocols/CoapC2Protocol.h | 4 +--
extensions/http-curl/protocols/RESTSender.cpp | 6 ++--
extensions/mqtt/processors/ConvertJSONAck.cpp | 4 +--
extensions/mqtt/protocol/MQTTC2Protocol.cpp | 8 ++---
libminifi/include/c2/C2Payload.h | 9 +++--
libminifi/include/c2/PayloadSerializer.h | 4 +--
libminifi/src/c2/C2Agent.cpp | 46 ++++++++++++-------------
libminifi/src/c2/C2Payload.cpp | 19 +++++-----
libminifi/src/c2/protocols/RESTProtocol.cpp | 10 +++---
libminifi/src/c2/triggers/FileUpdateTrigger.cpp | 4 +--
11 files changed, 64 insertions(+), 68 deletions(-)
diff --git a/extensions/coap/protocols/CoapC2Protocol.cpp
b/extensions/coap/protocols/CoapC2Protocol.cpp
index 805f78c..65661a6 100644
--- a/extensions/coap/protocols/CoapC2Protocol.cpp
+++ b/extensions/coap/protocols/CoapC2Protocol.cpp
@@ -190,7 +190,7 @@ minifi::c2::C2Payload CoapProtocol::serialize(const
minifi::c2::C2Payload &paylo
if (nullptr == coap_service_) {
// return an error if we don't have a coap service
logger_->log_error("CoAP service requested without any configured hostname
or port");
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR, true);
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR);
}
if (require_registration_) {
@@ -198,13 +198,13 @@ minifi::c2::C2Payload CoapProtocol::serialize(const
minifi::c2::C2Payload &paylo
auto response = minifi::c2::RESTSender::consumePayload(rest_uri_, payload,
minifi::c2::TRANSMIT, false);
if (response.getStatus().getState() == state::UpdateState::READ_ERROR) {
logger_->log_trace("Could not register");
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true);
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE);
} else {
logger_->log_trace("Registered agent.");
}
require_registration_ = false;
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true);
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE);
}
@@ -222,7 +222,7 @@ minifi::c2::C2Payload CoapProtocol::serialize(const
minifi::c2::C2Payload &paylo
payload_type = 0;
stream.write(&payload_type, 1);
if (writeAcknowledgement(&stream, payload) != 0) {
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR, true);
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR);
}
break;
case minifi::c2::HEARTBEAT:
@@ -230,12 +230,12 @@ minifi::c2::C2Payload CoapProtocol::serialize(const
minifi::c2::C2Payload &paylo
stream.write(&payload_type, 1);
if (writeHeartbeat(&stream, payload) != 0) {
logger_->log_error("Could not write heartbeat");
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR, true);
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR);
}
break;
default:
logger_->log_error("Could not identify operation");
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR, true);
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR);
};
size_t bsize = stream.size();
@@ -253,7 +253,7 @@ minifi::c2::C2Payload CoapProtocol::serialize(const
minifi::c2::C2Payload &paylo
responseStream.read(version);
responseStream.read(size);
logger_->log_trace("Received ack. version %d. number of operations %d",
version, size);
- minifi::c2::C2Payload new_payload(payload.getOperation(),
state::UpdateState::NESTED, true);
+ minifi::c2::C2Payload new_payload(payload.getOperation(),
state::UpdateState::NESTED);
for (int i = 0; i < size; i++) {
uint8_t operationType;
@@ -265,7 +265,7 @@ minifi::c2::C2Payload CoapProtocol::serialize(const
minifi::c2::C2Payload &paylo
logger_->log_trace("Received op %d, with id %s and operand %s",
operationType, id, operand);
auto newOp = getOperation(operationType);
- minifi::c2::C2Payload nested_payload(newOp,
state::UpdateState::READ_COMPLETE, true);
+ minifi::c2::C2Payload nested_payload(newOp,
state::UpdateState::READ_COMPLETE);
nested_payload.setIdentifier(id);
minifi::c2::C2ContentResponse new_command(newOp);
new_command.delay = 0;
@@ -287,7 +287,7 @@ minifi::c2::C2Payload CoapProtocol::serialize(const
minifi::c2::C2Payload &paylo
return new_payload;
}
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR, true);
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR);
}
} /* namespace c2 */
diff --git a/extensions/coap/protocols/CoapC2Protocol.h
b/extensions/coap/protocols/CoapC2Protocol.h
index ce74f35..f76056b 100644
--- a/extensions/coap/protocols/CoapC2Protocol.h
+++ b/extensions/coap/protocols/CoapC2Protocol.h
@@ -50,12 +50,12 @@ namespace c2 {
#define REQUIRE_VALID(x) \
if (-1 == x){ \
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR, true); \
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR); \
}
#define REQUIRE_SIZE_IF(y,x) \
if (y != x){ \
- return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR, true); \
+ return minifi::c2::C2Payload(payload.getOperation(),
state::UpdateState::READ_ERROR); \
}
/**
diff --git a/extensions/http-curl/protocols/RESTSender.cpp
b/extensions/http-curl/protocols/RESTSender.cpp
index 37c6a2c..478fb51 100644
--- a/extensions/http-curl/protocols/RESTSender.cpp
+++ b/extensions/http-curl/protocols/RESTSender.cpp
@@ -91,7 +91,7 @@ void RESTSender::setSecurityContext(utils::HTTPClient
&client, const std::string
const C2Payload RESTSender::sendPayload(const std::string url, const Direction
direction, const C2Payload &payload, const std::string outputConfig) {
if (url.empty()) {
- return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR,
true);
+ return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR);
}
// Callback for transmit. Declared in order to destruct in proper order -
take care!
@@ -142,13 +142,13 @@ const C2Payload RESTSender::sendPayload(const std::string
url, const Direction d
auto rs = client.getResponseBody();
if (isOkay && respCode) {
if (payload.isRaw()) {
- C2Payload response_payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true, true);
+ C2Payload response_payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true);
response_payload.setRawData(client.getResponseBody());
return response_payload;
}
return parseJsonResponse(payload, client.getResponseBody());
} else {
- return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR,
true);
+ return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR);
}
}
diff --git a/extensions/mqtt/processors/ConvertJSONAck.cpp
b/extensions/mqtt/processors/ConvertJSONAck.cpp
index 51ec140..00f21af 100644
--- a/extensions/mqtt/processors/ConvertJSONAck.cpp
+++ b/extensions/mqtt/processors/ConvertJSONAck.cpp
@@ -74,7 +74,7 @@ void ConvertJSONAck::onTrigger(const
std::shared_ptr<core::ProcessContext> &cont
std::string topic;
{
// expect JSON response from InvokeHTTP and thus we expect a heartbeat and
then the output from the HTTP
- c2::C2Payload response_payload(c2::Operation::HEARTBEAT,
state::UpdateState::READ_COMPLETE, true, true);
+ c2::C2Payload response_payload(c2::Operation::HEARTBEAT,
state::UpdateState::READ_COMPLETE, true);
ReadCallback callback;
session->read(flow, &callback);
@@ -93,7 +93,7 @@ void ConvertJSONAck::onTrigger(const
std::shared_ptr<core::ProcessContext> &cont
ReadCallback callback;
session->read(flow, &callback);
- c2::C2Payload response_payload(c2::Operation::HEARTBEAT,
state::UpdateState::READ_COMPLETE, true, true);
+ c2::C2Payload response_payload(c2::Operation::HEARTBEAT,
state::UpdateState::READ_COMPLETE, true);
std::string str(callback.buffer_.data(),callback.buffer_.size());
auto payload = parseJsonResponse(response_payload, callback.buffer_);
diff --git a/extensions/mqtt/protocol/MQTTC2Protocol.cpp
b/extensions/mqtt/protocol/MQTTC2Protocol.cpp
index 8db15a1..273a230 100644
--- a/extensions/mqtt/protocol/MQTTC2Protocol.cpp
+++ b/extensions/mqtt/protocol/MQTTC2Protocol.cpp
@@ -70,17 +70,17 @@ C2Payload MQTTC2Protocol::consumePayload(const std::string
&url, const C2Payload
std::vector<uint8_t> response;
auto transmit_id = mqtt_service_->send(update_topic_, stream.getBuffer(),
stream.size());
if (transmit_id > 0 && mqtt_service_->awaitResponse(5000, transmit_id,
in_topic_, response)) {
- C2Payload response_payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true, true);
+ C2Payload response_payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true);
response_payload.setRawData(response);
return response_payload;
} else {
- return C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true);
+ return C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE);
}
}
C2Payload MQTTC2Protocol::serialize(const C2Payload &payload) {
if (mqtt_service_ == nullptr || !mqtt_service_->isRunning()) {
- return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR,
true);
+ return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR);
}
std::lock_guard<std::mutex> lock(input_mutex_);
@@ -92,7 +92,7 @@ C2Payload MQTTC2Protocol::serialize(const C2Payload &payload)
{
if (transmit_id > 0 && mqtt_service_->awaitResponse(5000, transmit_id,
in_topic_, response)) {
return c2::PayloadSerializer::deserialize(response);
}
- return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR,
true);
+ return C2Payload(payload.getOperation(), state::UpdateState::READ_ERROR);
}
} /* namespace c2 */
diff --git a/libminifi/include/c2/C2Payload.h b/libminifi/include/c2/C2Payload.h
index 0269585..fe81da3 100644
--- a/libminifi/include/c2/C2Payload.h
+++ b/libminifi/include/c2/C2Payload.h
@@ -97,10 +97,10 @@ struct C2ContentResponse {
*/
class C2Payload : public state::Update {
public:
- C2Payload(Operation op, std::string identifier, bool resp = false, bool
isRaw = false);
- C2Payload(Operation op, state::UpdateState state, std::string identifier,
bool resp = false, bool isRaw = false);
- explicit C2Payload(Operation op, bool resp = false, bool isRaw = false);
- C2Payload(Operation op, state::UpdateState state, bool resp = false, bool
isRaw = false);
+ C2Payload(Operation op, std::string identifier, bool isRaw = false);
+ C2Payload(Operation op, state::UpdateState state, std::string identifier,
bool isRaw = false);
+ explicit C2Payload(Operation op, bool isRaw = false);
+ C2Payload(Operation op, state::UpdateState state, bool isRaw = false);
C2Payload(const C2Payload&) = default;
C2Payload(C2Payload&&) = default;
@@ -182,7 +182,6 @@ class C2Payload : public state::Update {
Operation op_;
bool raw_{ false };
std::vector<char> raw_data_;
- bool isResponse{ false };
bool is_container_{ false };
bool is_collapsible_{ true };
};
diff --git a/libminifi/include/c2/PayloadSerializer.h
b/libminifi/include/c2/PayloadSerializer.h
index 0efd133..b03da5e 100644
--- a/libminifi/include/c2/PayloadSerializer.h
+++ b/libminifi/include/c2/PayloadSerializer.h
@@ -198,11 +198,11 @@ class PayloadSerializer {
return node;
}
static C2Payload deserialize(std::vector<uint8_t> data) {
- C2Payload payload(Operation::HEARTBEAT, state::UpdateState::READ_COMPLETE,
true);
+ C2Payload payload(Operation::HEARTBEAT, state::UpdateState::READ_COMPLETE);
if (deserialize(data, payload)) {
return payload;
}
- return C2Payload(Operation::HEARTBEAT, state::UpdateState::READ_ERROR,
true);
+ return C2Payload(Operation::HEARTBEAT, state::UpdateState::READ_ERROR);
}
/**
* Deserializes the payloads
diff --git a/libminifi/src/c2/C2Agent.cpp b/libminifi/src/c2/C2Agent.cpp
index cc9c1a6..c94fa1b 100644
--- a/libminifi/src/c2/C2Agent.cpp
+++ b/libminifi/src/c2/C2Agent.cpp
@@ -360,11 +360,11 @@ void C2Agent::handle_c2_server_response(const
C2ContentResponse &resp) {
logger_->log_debug("Clearing connection %s",
connection.second.to_string());
update_sink_->clearConnection(connection.second.to_string());
}
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
enqueue_c2_response(std::move(response));
} else if (resp.name == "repositories") {
update_sink_->drainRepositories();
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
enqueue_c2_response(std::move(response));
} else if (resp.name == "corecomponentstate") {
// TODO(bakaid): untested
@@ -386,7 +386,7 @@ void C2Agent::handle_c2_server_response(const
C2ContentResponse &resp) {
} else {
logger_->log_error("Failed to get StateManagerProvider");
}
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
enqueue_c2_response(std::move(response));
} else {
logger_->log_debug("Clearing unknown %s", resp.name);
@@ -401,7 +401,7 @@ void C2Agent::handle_c2_server_response(const
C2ContentResponse &resp) {
break;
case Operation::RESTART: {
update_sink_->stop();
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
protocol_.load()->consumePayload(std::move(response));
restart_agent();
}
@@ -423,7 +423,7 @@ void C2Agent::handle_c2_server_response(const
C2ContentResponse &resp) {
}
if (resp.ident.length() > 0) {
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
enqueue_c2_response(std::move(response));
}
}
@@ -441,7 +441,7 @@ C2Payload C2Agent::prepareConfigurationOptions(const
C2ContentResponse &resp) co
std::copy_if(unsanitized_keys.begin(), unsanitized_keys.end(),
std::back_inserter(keys),
[](std::string key) {return key.find("pass") ==
std::string::npos;});
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
C2Payload options(Operation::ACKNOWLEDGE);
options.setLabel("configuration_options");
std::string value;
@@ -464,7 +464,7 @@ C2Payload C2Agent::prepareConfigurationOptions(const
C2ContentResponse &resp) co
void C2Agent::handle_describe(const C2ContentResponse &resp) {
auto reporter =
std::dynamic_pointer_cast<state::response::NodeReporter>(update_sink_);
if (resp.name == "metrics") {
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
if (reporter != nullptr) {
auto iter = resp.operation_arguments.find("metricsClass");
std::string metricsClass;
@@ -488,7 +488,7 @@ void C2Agent::handle_describe(const C2ContentResponse
&resp) {
} else if (resp.name == "manifest") {
C2Payload response(prepareConfigurationOptions(resp));
if (reporter != nullptr) {
- C2Payload agentInfo(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload agentInfo(Operation::ACKNOWLEDGE, resp.ident, true);
agentInfo.setLabel("agentInfo");
const auto manifest = reporter->getAgentManifest();
@@ -506,9 +506,9 @@ void C2Agent::handle_describe(const C2ContentResponse
&resp) {
}
}
auto keys = configuration_->getConfiguredKeys();
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
for (const auto &trace : traces) {
- C2Payload options(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload options(Operation::ACKNOWLEDGE, resp.ident, true);
options.setLabel(trace.getName());
std::string value;
for (const auto &line : trace.getTraces()) {
@@ -523,15 +523,15 @@ void C2Agent::handle_describe(const C2ContentResponse
&resp) {
return;
}
} else if (resp.name == "corecomponentstate") {
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
response.setLabel("corecomponentstate");
- C2Payload states(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload states(Operation::ACKNOWLEDGE, resp.ident, true);
states.setLabel("corecomponentstate");
auto state_manager_provider =
core::ProcessContext::getStateManagerProvider(logger_, controller_,
configuration_);
if (state_manager_provider != nullptr) {
auto core_component_states =
state_manager_provider->getAllCoreComponentStates();
for (const auto& core_component_state : core_component_states) {
- C2Payload state(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload state(Operation::ACKNOWLEDGE, resp.ident, true);
state.setLabel(core_component_state.first.to_string());
for (const auto& kv : core_component_state.second) {
C2ContentResponse entry(Operation::ACKNOWLEDGE);
@@ -546,7 +546,7 @@ void C2Agent::handle_describe(const C2ContentResponse
&resp) {
enqueue_c2_response(std::move(response));
return;
}
- C2Payload response(Operation::ACKNOWLEDGE, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, resp.ident, true);
enqueue_c2_response(std::move(response));
}
@@ -580,7 +580,7 @@ void C2Agent::handle_update(const C2ContentResponse &resp) {
if (resp.operation_arguments.size() > 0)
configure(running_c2_configuration);
- C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::FULLY_APPLIED, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::FULLY_APPLIED, resp.ident, true);
enqueue_c2_response(std::move(response));
} else if (resp.name == "agent") {
// we are upgrading the agent. therefore we must be given a location
@@ -594,7 +594,7 @@ void C2Agent::handle_update(const C2ContentResponse &resp) {
if (location != resp.operation_arguments.end()) {
logger_->log_trace("Update agent with location %s",
location->second.to_string());
// we will not have a raw payload
- C2Payload payload(Operation::TRANSFER, false, true);
+ C2Payload payload(Operation::TRANSFER, true);
C2Payload &&response =
protocol_.load()->consumePayload(location->second.to_string(), payload,
RECEIVE, false);
@@ -606,7 +606,7 @@ void C2Agent::handle_update(const C2ContentResponse &resp) {
// acknowledge the transfer. For a transfer, the response identifier
should be the checksum of the
// file transferred.
- C2Payload transfer_response(Operation::ACKNOWLEDGE,
state::UpdateState::FULLY_APPLIED, response.getIdentifier(), false, true);
+ C2Payload transfer_response(Operation::ACKNOWLEDGE,
state::UpdateState::FULLY_APPLIED, response.getIdentifier(), true);
protocol_.load()->consumePayload(std::move(transfer_response));
@@ -629,7 +629,7 @@ void C2Agent::handle_update(const C2ContentResponse &resp) {
logger_->log_trace("No location present");
}
} else {
- C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::NOT_APPLIED, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::NOT_APPLIED, resp.ident, true);
enqueue_c2_response(std::move(response));
}
}
@@ -755,7 +755,7 @@ utils::optional<std::string> C2Agent::fetchFlow(const
std::string& uri) const {
}
}
- C2Payload payload(Operation::TRANSFER, false, true);
+ C2Payload payload(Operation::TRANSFER, true);
C2Payload &&response = protocol_.load()->consumePayload(resolved_url,
payload, RECEIVE, false);
auto raw_data = response.getRawData();
@@ -773,7 +773,7 @@ bool C2Agent::handleConfigurationUpdate(const
C2ContentResponse &resp) {
utils::optional<std::string> optional_configuration_str =
fetchFlow(file_uri);
if (!optional_configuration_str) {
logger_->log_debug("Couldn't load new flow configuration from: \"%s\"",
file_uri);
- C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::SET_ERROR, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::SET_ERROR, resp.ident, true);
response.setRawData("Error while applying flow. Couldn't load flow
configuration.");
enqueue_c2_response(std::move(response));
return false;
@@ -784,7 +784,7 @@ bool C2Agent::handleConfigurationUpdate(const
C2ContentResponse &resp) {
auto update_text = resp.operation_arguments.find("configuration_data");
if (update_text == resp.operation_arguments.end()) {
logger_->log_debug("Neither the config file location nor the data is
provided");
- C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::SET_ERROR, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::SET_ERROR, resp.ident, true);
response.setRawData("Error while applying flow. Neither the config file
location nor the data is provided.");
enqueue_c2_response(std::move(response));
return false;
@@ -803,13 +803,13 @@ bool C2Agent::handleConfigurationUpdate(const
C2ContentResponse &resp) {
int16_t err = {update_sink_->applyUpdate(file_uri, configuration_str,
should_persist)};
if (err != 0) {
logger_->log_debug("Flow configuration update failed with error code %"
PRIi16, err);
- C2Payload response(Operation::ACKNOWLEDGE, state::UpdateState::SET_ERROR,
resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE, state::UpdateState::SET_ERROR,
resp.ident, true);
response.setRawData("Error while applying flow. Likely missing
processors");
enqueue_c2_response(std::move(response));
return false;
}
- C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::FULLY_APPLIED, resp.ident, false, true);
+ C2Payload response(Operation::ACKNOWLEDGE,
state::UpdateState::FULLY_APPLIED, resp.ident, true);
enqueue_c2_response(std::move(response));
if (should_persist) {
diff --git a/libminifi/src/c2/C2Payload.cpp b/libminifi/src/c2/C2Payload.cpp
index 868c6ef..910e6cd 100644
--- a/libminifi/src/c2/C2Payload.cpp
+++ b/libminifi/src/c2/C2Payload.cpp
@@ -27,31 +27,28 @@ namespace nifi {
namespace minifi {
namespace c2 {
-C2Payload::C2Payload(Operation op, std::string identifier, bool resp, bool
isRaw)
- : C2Payload(op, state::UpdateState::FULLY_APPLIED, std::move(identifier),
resp, isRaw) {
+C2Payload::C2Payload(Operation op, std::string identifier, bool isRaw)
+ : C2Payload(op, state::UpdateState::FULLY_APPLIED, std::move(identifier),
isRaw) {
}
-C2Payload::C2Payload(Operation op, state::UpdateState state, std::string
identifier, bool resp, bool isRaw)
+C2Payload::C2Payload(Operation op, state::UpdateState state, std::string
identifier, bool isRaw)
: state::Update(state::UpdateStatus(state, 0)),
op_(op),
raw_(isRaw),
- ident_(std::move(identifier)),
- isResponse(resp) {
+ ident_(std::move(identifier)) {
}
-C2Payload::C2Payload(Operation op, bool resp, bool isRaw)
+C2Payload::C2Payload(Operation op, bool isRaw)
: state::Update(state::UpdateStatus(state::UpdateState::INITIATE, 0)),
op_(op),
- raw_(isRaw),
- isResponse(resp) {
+ raw_(isRaw) {
}
-C2Payload::C2Payload(Operation op, state::UpdateState state, bool resp, bool
isRaw)
+C2Payload::C2Payload(Operation op, state::UpdateState state, bool isRaw)
: state::Update(state::UpdateStatus(state, 0)),
op_(op),
- raw_(isRaw),
- isResponse(resp) {
+ raw_(isRaw) {
}
void C2Payload::addContent(C2ContentResponse &&content, bool collapsible) {
diff --git a/libminifi/src/c2/protocols/RESTProtocol.cpp
b/libminifi/src/c2/protocols/RESTProtocol.cpp
index 2b43497..2f4fd8c 100644
--- a/libminifi/src/c2/protocols/RESTProtocol.cpp
+++ b/libminifi/src/c2/protocols/RESTProtocol.cpp
@@ -66,9 +66,9 @@ const C2Payload RESTProtocol::parseJsonResponse(const
C2Payload &payload, const
// neither must be there. We don't want assign array yet and cause an
assertion error
if (size == 0)
- return C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE, true);
+ return C2Payload(payload.getOperation(),
state::UpdateState::READ_COMPLETE);
- C2Payload new_payload(payload.getOperation(),
state::UpdateState::NESTED, true);
+ C2Payload new_payload(payload.getOperation(),
state::UpdateState::NESTED);
if (!identifier.empty())
new_payload.setIdentifier(identifier);
@@ -76,7 +76,7 @@ const C2Payload RESTProtocol::parseJsonResponse(const
C2Payload &payload, const
for (const rapidjson::Value& request : array) {
Operation newOp = stringToOperation(request["operation"].GetString());
- C2Payload nested_payload(newOp, state::UpdateState::READ_COMPLETE,
true);
+ C2Payload nested_payload(newOp, state::UpdateState::READ_COMPLETE);
C2ContentResponse new_command(newOp);
new_command.delay = 0;
new_command.required = true;
@@ -142,7 +142,7 @@ const C2Payload RESTProtocol::parseJsonResponse(const
C2Payload &payload, const
}
} catch (...) {
}
- return C2Payload(payload.getOperation(), state::UpdateState::READ_COMPLETE,
true);
+ return C2Payload(payload.getOperation(), state::UpdateState::READ_COMPLETE);
}
void setJsonStr(const std::string& key, const state::response::ValueNode&
value, rapidjson::Value& parent, rapidjson::Document::AllocatorType& alloc) {
// NOLINT
@@ -319,7 +319,7 @@ bool RESTProtocol::containsPayload(const C2Payload &o) {
rapidjson::Value RESTProtocol::serializeConnectionQueues(const C2Payload
&payload, std::string &label, rapidjson::Document::AllocatorType &alloc) {
rapidjson::Value json_payload(payload.isContainer() ? rapidjson::kArrayType
: rapidjson::kObjectType);
- C2Payload adjusted(payload.getOperation(), payload.getIdentifier(), false,
payload.isRaw());
+ C2Payload adjusted(payload.getOperation(), payload.getIdentifier(),
payload.isRaw());
auto name = payload.getLabel();
std::string uuid;
diff --git a/libminifi/src/c2/triggers/FileUpdateTrigger.cpp
b/libminifi/src/c2/triggers/FileUpdateTrigger.cpp
index 84cf0d3..87a682f 100644
--- a/libminifi/src/c2/triggers/FileUpdateTrigger.cpp
+++ b/libminifi/src/c2/triggers/FileUpdateTrigger.cpp
@@ -29,7 +29,7 @@ namespace c2 {
*/
C2Payload FileUpdateTrigger::getAction() {
if (update_) {
- C2Payload response_payload(Operation::UPDATE,
state::UpdateState::READ_COMPLETE, true, true);
+ C2Payload response_payload(Operation::UPDATE,
state::UpdateState::READ_COMPLETE, true);
C2ContentResponse resp(Operation::UPDATE);
resp.ident = "triggered";
resp.name = "configuration";
@@ -39,7 +39,7 @@ C2Payload FileUpdateTrigger::getAction() {
update_ = false;
return response_payload;
}
- C2Payload response_payload(Operation::HEARTBEAT,
state::UpdateState::READ_COMPLETE, true, true);
+ C2Payload response_payload(Operation::HEARTBEAT,
state::UpdateState::READ_COMPLETE, true);
return response_payload;
}
} /* namespace c2 */
