typo fix Commited -> Committed

Author: martinzink

docker/test/integration/features/consume_kafka.feature

@@ -280,17 +280,17 @@ Feature: Receiving data from using Kafka streaming platform using ConsumeKafka
   Scenario Outline: MiNiFi commit policy tests with incoming flowfiles
     Given a ConsumeKafka processor set up in a "kafka-consumer-flow" flow
     And there is a "processed" subdirectory in the monitored directory
-    And there is a "commited" subdirectory in the monitored directory
+    And there is a "committed" subdirectory in the monitored directory
     And the "Topic Names" property of the ConsumeKafka processor is set to "ConsumeKafkaTest"
     And the "Commit Offsets Policy" property of the ConsumeKafka processor is set to "<commit_policy>"
     And the "Offset Reset" property of the ConsumeKafka processor is set to "<offset_reset>"
     And the "Security Protocol" property of the ConsumeKafka processor is set to "plaintext"
     And the "SASL Mechanism" property of the ConsumeKafka processor is set to "PLAIN"
     And a PutFile processor with the name "Consumed" and the "Directory" property set to "/tmp/output/processed" in the "kafka-consumer-flow" flow
-    And a PutFile processor with the name "Commited" and the "Directory" property set to "/tmp/output/commited" in the "kafka-consumer-flow" flow
+    And a PutFile processor with the name "Committed" and the "Directory" property set to "/tmp/output/committed" in the "kafka-consumer-flow" flow
     And the "success" relationship of the ConsumeKafka processor is connected to the Consumed
     And the "success" relationship of the Consumed processor is connected to the ConsumeKafka
-    And the "commited" relationship of the ConsumeKafka processor is connected to the Commited
+    And the "committed" relationship of the ConsumeKafka processor is connected to the Committed
 
     And a kafka broker is set up in correspondence with the third-party kafka publisher
     And the kafka broker is started
@@ -303,7 +303,7 @@ Feature: Receiving data from using Kafka streaming platform using ConsumeKafka
 
     When a message with content "Tiberius" is published to the "ConsumeKafkaTest" topic
     Then exactly these flowfiles are in the monitored directory's "processed" subdirectory in less than 15 seconds: "<contents_after_tiberius>"
-    And exactly these flowfiles are in the monitored directory's "commited" subdirectory in less than 15 seconds: "<contents_after_tiberius>"
+    And exactly these flowfiles are in the monitored directory's "committed" subdirectory in less than 15 seconds: "<contents_after_tiberius>"
 
     When a message with content "Caligula" is published to the "ConsumeKafkaTest" topic
     Then exactly these flowfiles are in the monitored directory's "processed" subdirectory in less than 15 seconds: "<contents_after_caligula>"

extensions/civetweb/tests/ListenHTTPTests.cpp

@@ -198,7 +198,7 @@ class ListenHTTPTestsFixture {
 
   void test_connect(
       const std::vector<HttpResponseExpectations>& response_expectations = {HttpResponseExpectations{}},
-      std::size_t expected_commited_requests = 1,
+      std::size_t expected_committed_requests = 1,
       std::unique_ptr<minifi::http::HTTPClient> client_to_use = {}) {
     if (client_to_use) {
       REQUIRE(response_expectations.size() == 1);
@@ -231,10 +231,10 @@ class ListenHTTPTestsFixture {
       thread.join();
     }
 
-    if (expected_commited_requests > 0 && (method == HttpRequestMethod::GET || method == HttpRequestMethod::POST)) {
+    if (expected_committed_requests > 0 && (method == HttpRequestMethod::GET || method == HttpRequestMethod::POST)) {
       REQUIRE(LogTestController::getInstance().contains("Size:" + std::to_string(payload.size()) + " Offset:0"));
     }
-    REQUIRE(LogTestController::getInstance().contains("Logged " + std::to_string(expected_commited_requests) + " flow files"));
+    REQUIRE(LogTestController::getInstance().contains("Logged " + std::to_string(expected_committed_requests) + " flow files"));
   }
 
   std::unique_ptr<minifi::http::HTTPClient> initialize_client() {
@@ -330,8 +330,8 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTP no body", "[basic]") {
   }
 
   run_server();
-  const std::size_t expected_commited_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
-  test_connect({HttpResponseExpectations{}}, expected_commited_requests);
+  const std::size_t expected_committed_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
+  test_connect({HttpResponseExpectations{}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTP body with different mime type", "[basic][mime]") {
@@ -349,8 +349,8 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTP body with different mime type", "
   }
 
   run_server();
-  const std::size_t expected_commited_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
-  test_connect({HttpResponseExpectations{}}, expected_commited_requests);
+  const std::size_t expected_committed_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
+  test_connect({HttpResponseExpectations{}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTP all headers", "[basic][headers]") {
@@ -471,8 +471,8 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS without CA", "[basic][https]") {
   }
 
   run_server();
-  const std::size_t expected_commited_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
-  test_connect({HttpResponseExpectations{}}, expected_commited_requests);
+  const std::size_t expected_committed_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
+  test_connect({HttpResponseExpectations{}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS without client cert", "[basic][https]") {
@@ -494,8 +494,8 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS without client cert", "[basic][h
   }
 
   run_server();
-  const std::size_t expected_commited_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
-  test_connect({HttpResponseExpectations{}}, expected_commited_requests);
+  const std::size_t expected_committed_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
+  test_connect({HttpResponseExpectations{}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert from good CA", "[https]") {
@@ -518,8 +518,8 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert from good CA",
   }
 
   run_server();
-  const std::size_t expected_commited_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
-  test_connect({HttpResponseExpectations{}}, expected_commited_requests);
+  const std::size_t expected_committed_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
+  test_connect({HttpResponseExpectations{}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with PKCS12 client cert from good CA", "[https]") {
@@ -542,8 +542,8 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with PKCS12 client cert from goo
   }
 
   run_server();
-  const std::size_t expected_commited_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
-  test_connect({HttpResponseExpectations{}}, expected_commited_requests);
+  const std::size_t expected_committed_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
+  test_connect({HttpResponseExpectations{}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert from bad CA", "[https]") {
@@ -553,7 +553,7 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert from bad CA", "
 
   bool should_succeed = false;
   int64_t response_code = 0;
-  std::size_t expected_commited_requests = 0;
+  std::size_t expected_committed_requests = 0;
   SECTION("verify peer") {
     should_succeed = false;
     plan->setProperty(listen_http, minifi::processors::ListenHTTP::SSLVerifyPeer, "yes");
@@ -575,12 +575,12 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert from bad CA", "
 
     SECTION("GET") {
       method = HttpRequestMethod::GET;
-      expected_commited_requests = 1;
+      expected_committed_requests = 1;
     }
     SECTION("POST") {
       method = HttpRequestMethod::POST;
       payload = "Test payload";
-      expected_commited_requests = 1;
+      expected_committed_requests = 1;
     }
     SECTION("HEAD") {
       method = HttpRequestMethod::HEAD;
@@ -590,7 +590,7 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert from bad CA", "
   create_ssl_context_service("goodCA.crt", "badCA_goodClient.pem");
 
   run_server();
-  test_connect({HttpResponseExpectations{should_succeed, response_code}}, expected_commited_requests);
+  test_connect({HttpResponseExpectations{should_succeed, response_code}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert with matching DN", "[https][DN]") {
@@ -614,8 +614,8 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert with matching D
   }
 
   run_server();
-  const std::size_t expected_commited_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
-  test_connect({HttpResponseExpectations{}}, expected_commited_requests);
+  const std::size_t expected_committed_requests = (method == HttpRequestMethod::POST || method == HttpRequestMethod::GET) ? 1 : 0;
+  test_connect({HttpResponseExpectations{}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert with non-matching DN", "[https][DN]") {
@@ -625,7 +625,7 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert with non-matchi
   plan->setProperty(listen_http, minifi::processors::ListenHTTP::AuthorizedDNPattern, ".*/CN=good\\..*");
 
   int64_t response_code = 0;
-  std::size_t expected_commited_requests = 0;
+  std::size_t expected_committed_requests = 0;
   SECTION("verify peer") {
     plan->setProperty(listen_http, minifi::processors::ListenHTTP::SSLVerifyPeer, "yes");
     response_code = 403;
@@ -646,12 +646,12 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert with non-matchi
 
     SECTION("GET") {
       method = HttpRequestMethod::GET;
-      expected_commited_requests = 1;
+      expected_committed_requests = 1;
     }
     SECTION("POST") {
       method = HttpRequestMethod::POST;
       payload = "Test payload";
-      expected_commited_requests = 1;
+      expected_committed_requests = 1;
     }
     SECTION("HEAD") {
       method = HttpRequestMethod::HEAD;
@@ -661,7 +661,7 @@ TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS with client cert with non-matchi
   create_ssl_context_service("goodCA.crt", "goodCA_badClient.pem");
 
   run_server();
-  test_connect({HttpResponseExpectations{true, response_code}}, expected_commited_requests);
+  test_connect({HttpResponseExpectations{true, response_code}}, expected_committed_requests);
 }
 
 TEST_CASE_METHOD(ListenHTTPTestsFixture, "HTTPS minimum SSL version", "[https]") {

extensions/kafka/ConsumeKafka.cpp

@@ -203,10 +203,10 @@ void ConsumeKafka::configureNewConnection(core::ProcessContext &context) {
   //
   // As far as I understand, instead of rd_kafka_position() an rd_kafka_committed() call if preferred here,
   // as it properly fetches offsets from the broker
-  if (const auto retrieved_commited = rd_kafka_committed(consumer_.get(), kf_topic_partition_list_.get(), METADATA_COMMUNICATIONS_TIMEOUT_MS); RD_KAFKA_RESP_ERR_NO_ERROR != retrieved_commited) {
+  if (const auto retrieved_committed = rd_kafka_committed(consumer_.get(), kf_topic_partition_list_.get(), METADATA_COMMUNICATIONS_TIMEOUT_MS); RD_KAFKA_RESP_ERR_NO_ERROR != retrieved_committed) {
     logger_->log_error("Retrieving committed offsets for topics+partitions failed {}: {}",
-      magic_enum::enum_underlying(retrieved_commited),
-      rd_kafka_err2str(retrieved_commited));
+      magic_enum::enum_underlying(retrieved_committed),
+      rd_kafka_err2str(retrieved_committed));
   }
 
   if (rd_kafka_resp_err_t poll_set_consumer_response = rd_kafka_poll_set_consumer(consumer_.get()); RD_KAFKA_RESP_ERR_NO_ERROR != poll_set_consumer_response) {
@@ -335,7 +335,7 @@ void ConsumeKafka::commitOffsetsFromMessages(const std::unordered_map<KafkaMessa
 
 void ConsumeKafka::commitOffsetsFromIncomingFlowFiles(core::ProcessSession& session) const {
   std::vector<std::pair<std::shared_ptr<core::FlowFile>, core::Relationship>> flow_files;
-  while (auto ff = session.get()) { flow_files.push_back({ff, Commited}); }
+  while (auto ff = session.get()) { flow_files.push_back({ff, Committed}); }
   if (flow_files.empty()) { return; }
 
   std::unordered_map<KafkaMessageLocation, int64_t> max_offsets;

extensions/kafka/ConsumeKafka.h

@@ -261,7 +261,7 @@ class ConsumeKafka final : public KafkaProcessorBase {
 
   EXTENSIONAPI static constexpr auto Success = core::RelationshipDefinition{"success",
       "Incoming Kafka messages as flowfiles. Depending on the demarcation strategy, this can be one or multiple messages per flowfile."};
-  EXTENSIONAPI static constexpr auto Commited = core::RelationshipDefinition{"commited",
+  EXTENSIONAPI static constexpr auto Committed = core::RelationshipDefinition{"committed",
       "Only when using \"Commit from incoming flowfiles\" policy. Flowfiles that were used for commiting offsets are routed here."};
   EXTENSIONAPI static constexpr auto Failure = core::RelationshipDefinition{"failure",
       "Only when using \"Commit from incoming flowfiles\" policy. Flowfiles that were malformed for commiting offsets are routed here."};