From 616769474c215ddfd4ac310f005a2d41cd70dbec Mon Sep 17 00:00:00 2001
From: Gabor Gyimesi <gamezbird@gmail.com>
Date: Thu, 6 Mar 2025 13:41:00 +0100
Subject: [PATCH] Review update

---
 minifi_main/CMakeLists.txt                            | 2 +-
 utils/src/utils/FipsUtils.cpp => minifi_main/Fips.cpp | 6 +++---
 utils/include/utils/FipsUtils.h => minifi_main/Fips.h | 2 +-
 minifi_main/MiNiFiMain.cpp                            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename utils/src/utils/FipsUtils.cpp => minifi_main/Fips.cpp (97%)
 rename utils/include/utils/FipsUtils.h => minifi_main/Fips.h (95%)

diff --git a/minifi_main/CMakeLists.txt b/minifi_main/CMakeLists.txt
index 47a4ab6699..cddaf88736 100644
--- a/minifi_main/CMakeLists.txt
+++ b/minifi_main/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 include(CppVersion)
 set_cpp_version()
 
-set(MINIFIEXE_SOURCES MiNiFiMain.cpp MainHelper.cpp MiNiFiWindowsService.cpp AgentDocs.cpp TableFormatter.cpp)
+set(MINIFIEXE_SOURCES MiNiFiMain.cpp MainHelper.cpp MiNiFiWindowsService.cpp AgentDocs.cpp TableFormatter.cpp Fips.cpp)
 if(WIN32)
     set_source_files_properties("${CMAKE_BINARY_DIR}/libminifi/src/core/logging/WindowsMessageTextFile.rc" PROPERTIES GENERATED TRUE)
     list(APPEND MINIFIEXE_SOURCES "${CMAKE_BINARY_DIR}/libminifi/src/core/logging/WindowsMessageTextFile.rc")
diff --git a/utils/src/utils/FipsUtils.cpp b/minifi_main/Fips.cpp
similarity index 97%
rename from utils/src/utils/FipsUtils.cpp
rename to minifi_main/Fips.cpp
index 2943392a35..4a305a104d 100644
--- a/utils/src/utils/FipsUtils.cpp
+++ b/minifi_main/Fips.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "utils/FipsUtils.h"
+#include "Fips.h"
 
 #include <fstream>
 #include <algorithm>
@@ -26,7 +26,7 @@
 #include "utils/StringUtils.h"
 #include "utils/OptionalUtils.h"
 
-namespace org::apache::nifi::minifi::utils::fips {
+namespace org::apache::nifi::minifi::fips {
 
 namespace {
 bool replaceMinifiHomeVariable(const std::filesystem::path& file_path, const std::filesystem::path& minifi_home_path, const std::shared_ptr<core::logging::Logger>& logger) {
@@ -128,4 +128,4 @@ void initializeFipsMode(const std::shared_ptr<minifi::Configure>& configure, con
   logger->log_info("FIPS mode enabled in MiNiFi C++");
 }
 
-}  // namespace org::apache::nifi::minifi::utils::fips
+}  // namespace org::apache::nifi::minifi::fips
diff --git a/utils/include/utils/FipsUtils.h b/minifi_main/Fips.h
similarity index 95%
rename from utils/include/utils/FipsUtils.h
rename to minifi_main/Fips.h
index e8d461f3f9..ab3261b0e1 100644
--- a/utils/include/utils/FipsUtils.h
+++ b/minifi_main/Fips.h
@@ -21,7 +21,7 @@
 #include "core/logging/Logger.h"
 #include "minifi-cpp/properties/Configure.h"
 
-namespace org::apache::nifi::minifi::utils::fips {
+namespace org::apache::nifi::minifi::fips {
 
 void initializeFipsMode(const std::shared_ptr<Configure>& configure, const std::filesystem::path& minifi_home, const std::shared_ptr<core::logging::Logger>& logger);
 
diff --git a/minifi_main/MiNiFiMain.cpp b/minifi_main/MiNiFiMain.cpp
index 340b294883..f1c506c431 100644
--- a/minifi_main/MiNiFiMain.cpp
+++ b/minifi_main/MiNiFiMain.cpp
@@ -69,7 +69,7 @@
 #include "core/state/MetricsPublisherStore.h"
 #include "argparse/argparse.hpp"
 #include "agent/agent_version.h"
-#include "utils/FipsUtils.h"
+#include "Fips.h"
 
 namespace minifi = org::apache::nifi::minifi;
 namespace core = minifi::core;
@@ -339,7 +339,7 @@ int main(int argc, char **argv) {
     dumpDocsIfRequested(argument_parser, configure);
     writeSchemaIfRequested(argument_parser, configure);
 
-    utils::fips::initializeFipsMode(configure, minifiHome, logger);
+    minifi::fips::initializeFipsMode(configure, minifiHome, logger);
 
     std::chrono::milliseconds stop_wait_time = configure->get(minifi::Configure::nifi_graceful_shutdown_seconds)
         | utils::andThen(utils::timeutils::StringToDuration<std::chrono::milliseconds>)