Addressing PR comments and other fixes, part 2

lukin-oleksiy · lukin-oleksiy · commit 477236be8a29 · 2025-09-30T14:26:47.000+03:00
diff --git a/kmipclient/CMakeLists.txt b/kmipclient/CMakeLists.txt
@@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF) # Optional, but recommended for standard compliance
 
+include_directories(${PROJECT_SOURCE_DIR}/include)
 add_library(
   kmipclient
   STATIC
@@ -13,7 +14,7 @@ add_library(
         include/NetClient.hpp
         src/NetClientOpenSSL.cpp
         include/NetClientOpenSSL.hpp
-        include/v_expected.hpp
+        include/ve_expected.hpp
         include/kmip_data_types.hpp
         src/RequestFactory.cpp
         src/RequestFactory.hpp
diff --git a/kmipclient/examples/example_activate.cpp b/kmipclient/examples/example_activate.cpp
@@ -1,12 +1,13 @@
 //
 // Created by al on 02.04.25.
 //
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
 
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
diff --git a/kmipclient/examples/example_create_aes.cpp b/kmipclient/examples/example_create_aes.cpp
@@ -1,10 +1,12 @@
 
 
-#include "../include/Kmip.hpp"
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
+
 #include <iostream>
 
+#include "Kmip.hpp"
+#include "KmipClient.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
diff --git a/kmipclient/examples/example_destroy.cpp b/kmipclient/examples/example_destroy.cpp
@@ -2,12 +2,13 @@
 // Created by al on 02.04.25.
 //
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
 
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
diff --git a/kmipclient/examples/example_get.cpp b/kmipclient/examples/example_get.cpp
@@ -1,11 +1,12 @@
 
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
 
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 void
diff --git a/kmipclient/examples/example_get_all_ids.cpp b/kmipclient/examples/example_get_all_ids.cpp
@@ -1,11 +1,11 @@
 
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
-
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
@@ -21,7 +21,7 @@ main (int argc, char **argv)
   NetClientOpenSSL net_client (argv[1], argv[2], argv[3], argv[4], argv[5], 200);
   KmipClient       client (net_client);
 
-  const auto opt_ids = client.op_all (KMIP_ENTITY_SYMMETRIC_KEY);
+  const auto opt_ids = client.op_all (KMIP_OBJTYPE_SYMMETRIC_KEY);
   if (opt_ids.has_value ())
     {
       std::cout << "Found IDs of symmetric keys:" << std::endl;
@@ -35,7 +35,7 @@ main (int argc, char **argv)
       std::cerr << "Can not get keys." << " Cause: " << opt_ids.error ().message << std::endl;
     };
 
-  const auto opt_ids_s = client.op_all (KMIP_ENTITY_SECRET_DATA);
+  const auto opt_ids_s = client.op_all ( KMIP_OBJTYPE_SECRET_DATA);
   if (opt_ids.has_value ())
     {
       std::cout << "Found IDs of secret data:" << std::endl;
diff --git a/kmipclient/examples/example_get_name.cpp b/kmipclient/examples/example_get_name.cpp
@@ -1,11 +1,12 @@
 
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
 
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
diff --git a/kmipclient/examples/example_get_secret.cpp b/kmipclient/examples/example_get_secret.cpp
@@ -1,11 +1,12 @@
 
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
 
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
diff --git a/kmipclient/examples/example_locate.cpp b/kmipclient/examples/example_locate.cpp
@@ -1,11 +1,11 @@
 
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
-
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
@@ -23,7 +23,7 @@ main (int argc, char **argv)
 
   std::cout << "Searching for name: " << argv[6] << std::endl;
 
-  const auto opt_ids = client.op_locate_by_name (argv[6], KMIP_ENTITY_SYMMETRIC_KEY);
+  const auto opt_ids = client.op_locate_by_name (argv[6], KMIP_OBJTYPE_SYMMETRIC_KEY);
   if (opt_ids.has_value ())
     {
       std::cout << "Found IDs of symmetric keys:" << std::endl;
@@ -37,7 +37,7 @@ main (int argc, char **argv)
       std::cerr << "Can not get keys with name:" << argv[6] << " Cause: " << opt_ids.error ().message << std::endl;
     };
 
-  const auto opt_ids_s = client.op_locate_by_name (argv[6], KMIP_ENTITY_SECRET_DATA);
+  const auto opt_ids_s = client.op_locate_by_name (argv[6], KMIP_OBJTYPE_SECRET_DATA);
   if (opt_ids.has_value ())
     {
       std::cout << "Found IDs of secret data:" << std::endl;
diff --git a/kmipclient/examples/example_locate_by_group.cpp b/kmipclient/examples/example_locate_by_group.cpp
@@ -1,11 +1,11 @@
 
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
-
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
@@ -24,7 +24,7 @@ main (int argc, char **argv)
 
   std::cout << "Searching for group with name: " << argv[6] << std::endl;
 
-  const auto opt_ids = client.op_locate_by_group (argv[6], KMIP_ENTITY_SYMMETRIC_KEY);
+  const auto opt_ids = client.op_locate_by_group (argv[6], KMIP_OBJTYPE_SYMMETRIC_KEY);
   if (opt_ids.has_value ())
     {
       std::cout << "Found IDs of symmetric keys:";
@@ -39,7 +39,7 @@ main (int argc, char **argv)
                 << std::endl;
     };
 
-  const auto opt_ids_s = client.op_locate_by_group (argv[6], KMIP_ENTITY_SECRET_DATA);
+  const auto opt_ids_s = client.op_locate_by_group (argv[6], KMIP_OBJTYPE_SECRET_DATA);
   if (opt_ids.has_value ())
     {
       std::cout << "Found IDs of secret data:";
diff --git a/kmipclient/examples/example_register_key.cpp b/kmipclient/examples/example_register_key.cpp
@@ -1,13 +1,13 @@
 //
 // Created by al on 02.04.25.
 //
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmip_data_types.hpp"
-#include "../include/kmipclient_version.hpp"
-
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmip_data_types.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
@@ -41,4 +41,4 @@ main (int argc, char **argv)
     };
 
   return 0;
-}
+}
diff --git a/kmipclient/examples/example_register_secret.cpp b/kmipclient/examples/example_register_secret.cpp
@@ -1,10 +1,11 @@
 
 
-#include "../include/Kmip.hpp"
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
 #include <iostream>
 
+#include "Kmip.hpp"
+#include "KmipClient.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
@@ -21,7 +22,7 @@ main (int argc, char **argv)
 
   Kmip kmip (argv[1], argv[2], argv[3], argv[4], argv[5], 200);
 
-  auto id_opt = kmip.client ().op_register_secret (argv[6], "TestGroup", argv[7], KMIP_SECRET_TYPE_PASSWORD);
+  auto id_opt = kmip.client ().op_register_secret (argv[6], "TestGroup", argv[7], PASSWORD);
   if (id_opt.has_value ())
     {
       const name_t &id = id_opt.value ();
diff --git a/kmipclient/examples/example_revoke.cpp b/kmipclient/examples/example_revoke.cpp
@@ -2,12 +2,12 @@
 // Created by al on 02.04.25.
 //
 
-#include "../include/KmipClient.hpp"
-#include "../include/NetClientOpenSSL.hpp"
-#include "../include/kmipclient_version.hpp"
-
 #include <iostream>
 
+#include "KmipClient.hpp"
+#include "NetClientOpenSSL.hpp"
+#include "kmipclient_version.hpp"
+
 using namespace kmipclient;
 
 int
@@ -24,7 +24,7 @@ main (int argc, char **argv)
   NetClientOpenSSL net_client (argv[1], argv[2], argv[3], argv[4], argv[5], 200);
   KmipClient       client (net_client);
 
-  const auto opt_key = client.op_revoke (argv[6], KMIP_REVIKE_UNSPECIFIED, "Deactivate", 0L);
+  const auto opt_key = client.op_revoke (argv[6], UNSPECIFIED, "Deactivate", 0L);
   if (opt_key.has_value ())
     {
       std::cout << "Key ID: " << argv[6] << " is deactivated." << std::endl;
diff --git a/kmipclient/include/Key.hpp b/kmipclient/include/Key.hpp
@@ -6,7 +6,7 @@
 #define KEY_HPP
 #include <utility>
 
-#include "include/v_expected.hpp"
+#include "include/ve_expected.hpp"
 #include "kmip_data_types.hpp"
 
 namespace kmipclient
diff --git a/kmipclient/include/Kmip.hpp b/kmipclient/include/Kmip.hpp
@@ -6,7 +6,6 @@
 #define KMIP_HPP
 #include "KmipClient.hpp"
 #include "NetClientOpenSSL.hpp"
-#include "kmipclient_version.hpp"
 
 namespace kmipclient
 {
diff --git a/kmipclient/include/KmipClient.hpp b/kmipclient/include/KmipClient.hpp
@@ -5,14 +5,13 @@
 #ifndef KMIP_CLIENT_HPP
 #define KMIP_CLIENT_HPP
 
-#include "../src/RequestFactory.hpp"
+#include <memory>
+
 #include "Key.hpp"
 #include "Logger.hpp"
 #include "NetClient.hpp"
 #include "kmip_data_types.hpp"
-#include "v_expected.hpp"
-
-#include <memory>
+#include "ve_expected.hpp"
 
 namespace kmipclient
 {
diff --git a/kmipclient/include/Logger.hpp b/kmipclient/include/Logger.hpp
@@ -2,9 +2,13 @@
 // Created by al on 09.04.25.
 //
 
-#ifndef LOGGER_HPP
-#define LOGGER_HPP
+#ifndef KMIP_LOGGER_HPP
+#define KMIP_LOGGER_HPP
+
 #include <string>
+
+namespace kmipclient
+{
 class Logger
 {
 public:
@@ -16,4 +20,5 @@ class Logger
   Logger      &operator= (Logger &&other)       = delete;
   virtual void log (int level, std::string msg) = 0;
 };
-#endif // LOGGER_HPP
+}
+#endif // KMIP_LOGGER_HPP
diff --git a/kmipclient/include/ve_expected.hpp b/kmipclient/include/ve_expected.hpp
@@ -149,6 +149,8 @@ template <typename T, typename E> class expected
 
 #else // C++23 or later
 // Though we have "std::expected" in C++23, it is not so convenient as our implementation here.
+// The trick is in function's return values.
+//
 // 
 #include <functional>
 #include <optional>
diff --git a/kmipclient/src/IOUtils.hpp b/kmipclient/src/IOUtils.hpp
@@ -8,7 +8,7 @@
 #include "include/Logger.hpp"
 #include "include/NetClient.hpp"
 #include "include/kmip_data_types.hpp"
-#include "include/v_expected.hpp"
+#include "include/ve_expected.hpp"
 
 #include <memory>
 #include <optional>
diff --git a/kmipclient/src/KeyFactory.hpp b/kmipclient/src/KeyFactory.hpp
@@ -6,7 +6,7 @@
 #define KEYFACTORY_HPP
 #include "../include/Key.hpp"
 #include "../include/kmip_data_types.hpp"
-#include "../include/v_expected.hpp"
+#include "../include/ve_expected.hpp"
 #include "kmip.h"
 #include <string>
 
diff --git a/kmipclient/src/ResponseFactory.hpp b/kmipclient/src/ResponseFactory.hpp
@@ -7,7 +7,7 @@
 
 #include "KmipCtx.hpp"
 #include "ResponseResult.hpp"
-#include "include/v_expected.hpp"
+#include "include/ve_expected.hpp"
 #include "kmip.h"
 #include "kmip_exceptions.hpp"
 
diff --git a/kmipclient/src/ResponseResult.hpp b/kmipclient/src/ResponseResult.hpp
@@ -8,7 +8,7 @@
 #include "KmipCtx.hpp"
 #include "include/Key.hpp"
 #include "include/kmip_data_types.hpp"
-#include "include/v_expected.hpp"
+#include "include/ve_expected.hpp"
 
 #include "kmip.h"
 
diff --git a/kmipclient/src/StringUtils.hpp b/kmipclient/src/StringUtils.hpp
