fix1

Author: HeartLinked

src/iceberg/catalog/rest/CMakeLists.txt

@@ -16,10 +16,10 @@
 # under the License.
 
 set(ICEBERG_REST_SOURCES
-    catalog.cc
-    json_internal.cc
-    config.cc
+    rest_catalog.cc
+    catalog_properties.cc
     http_client.cc
+    json_internal.cc
     resource_paths.cc)
 
 set(ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS)

src/iceberg/catalog/rest/config.cc …eberg/catalog/rest/catalog_properties.ccsrc/iceberg/catalog/rest/config.cc renamed to src/iceberg/catalog/rest/catalog_properties.cc src/iceberg/catalog/rest/config.cc renamed to src/iceberg/catalog/rest/catalog_properties.cc

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-#include "iceberg/catalog/rest/config.h"
+#include "iceberg/catalog/rest/catalog_properties.h"
 
 #include "iceberg/catalog/rest/constant.h"
 
 namespace iceberg::rest {
 
-std::unique_ptr<RestCatalogConfig> RestCatalogConfig::DefaultProperties() {
+std::unique_ptr<RestCatalogConfig> RestCatalogConfig::default_properties() {
   return std::make_unique<RestCatalogConfig>();
 }
 

src/iceberg/catalog/rest/config.h …ceberg/catalog/rest/catalog_properties.hsrc/iceberg/catalog/rest/config.h renamed to src/iceberg/catalog/rest/catalog_properties.h src/iceberg/catalog/rest/config.h renamed to src/iceberg/catalog/rest/catalog_properties.h

@@ -29,7 +29,7 @@
 #include "iceberg/catalog/rest/iceberg_rest_export.h"
 #include "iceberg/util/config.h"
 
-/// \file iceberg/catalog/rest/config.h
+/// \file iceberg/catalog/rest/catalog_properties.h
 /// \brief RestCatalogConfig implementation for Iceberg REST API.
 
 namespace iceberg::rest {
@@ -50,7 +50,7 @@ class ICEBERG_REST_EXPORT RestCatalogConfig : public ConfigBase<RestCatalogConfi
   inline static std::string_view kWarehouse{"warehouse"};
 
   /// \brief Create a default RestCatalogConfig instance.
-  static std::unique_ptr<RestCatalogConfig> DefaultProperties();
+  static std::unique_ptr<RestCatalogConfig> default_properties();
 
   /// \brief Create a RestCatalogConfig instance from a map of key-value pairs.
   static std::unique_ptr<RestCatalogConfig> FromMap(

src/iceberg/catalog/rest/error_handlers.h

@@ -54,27 +54,22 @@ class ICEBERG_REST_EXPORT DefaultErrorHandler : public ErrorHandler {
           return InvalidArgument("{}", error.message);
         }
         return BadRequest("Malformed request: {}", error.message);
-
       case 401:
         return NotAuthorized("Not authorized: {}", error.message);
-
       case 403:
         return Forbidden("Forbidden: {}", error.message);
-
       case 405:
       case 406:
         break;
-
       case 500:
-        return ServiceFailure("Server error: {}: {}", error.type, error.message);
-
+        return InternalServerError("Server error: {}: {}", error.type, error.message);
       case 501:
         return NotSupported("{}", error.message);
-
       case 503:
         return ServiceUnavailable("Service unavailable: {}", error.message);
     }
-    return RESTError("Unable to process: {}", error.message);
+
+    return RestError("Unable to process: {}", error.message);
   }
 };
 
@@ -88,15 +83,12 @@ class ICEBERG_REST_EXPORT NamespaceErrorHandler : public DefaultErrorHandler {
           return NamespaceNotEmpty("{}", error.message);
         }
         return BadRequest("Malformed request: {}", error.message);
-
       case 404:
         return NoSuchNamespace("{}", error.message);
-
       case 409:
         return AlreadyExists("{}", error.message);
-
       case 422:
-        return RESTError("Unable to process: {}", error.message);
+        return RestError("Unable to process: {}", error.message);
     }
 
     return DefaultErrorHandler::Accept(error);
@@ -111,7 +103,6 @@ class ICEBERG_REST_EXPORT DropNamespaceErrorHandler : public NamespaceErrorHandl
       return NamespaceNotEmpty("{}", error.message);
     }
 
-    // Delegate to parent handler
     return NamespaceErrorHandler::Accept(error);
   }
 };
@@ -126,7 +117,6 @@ class ICEBERG_REST_EXPORT TableErrorHandler : public DefaultErrorHandler {
           return NoSuchNamespace("{}", error.message);
         }
         return NoSuchTable("{}", error.message);
-
       case 409:
         return AlreadyExists("{}", error.message);
     }
@@ -136,9 +126,6 @@ class ICEBERG_REST_EXPORT TableErrorHandler : public DefaultErrorHandler {
 };
 
 /// \brief View-level error handler.
-///
-/// Handles view-specific errors including NoSuchView, NoSuchNamespace,
-/// and AlreadyExists scenarios.
 class ICEBERG_REST_EXPORT ViewErrorHandler : public DefaultErrorHandler {
  public:
   Status Accept(const ErrorModel& error) const override {
@@ -148,7 +135,6 @@ class ICEBERG_REST_EXPORT ViewErrorHandler : public DefaultErrorHandler {
           return NoSuchNamespace("{}", error.message);
         }
         return NoSuchView("{}", error.message);
-
       case 409:
         return AlreadyExists("{}", error.message);
     }
@@ -164,10 +150,8 @@ class ICEBERG_REST_EXPORT TableCommitErrorHandler : public DefaultErrorHandler {
     switch (error.code) {
       case 404:
         return NoSuchTable("{}", error.message);
-
       case 409:
         return CommitFailed("Commit failed: {}", error.message);
-
       case 500:
       case 502:
       case 503:
@@ -186,10 +170,8 @@ class ICEBERG_REST_EXPORT ViewCommitErrorHandler : public DefaultErrorHandler {
     switch (error.code) {
       case 404:
         return NoSuchView("{}", error.message);
-
       case 409:
         return CommitFailed("Commit failed: {}", error.message);
-
       case 500:
       case 502:
       case 503:

src/iceberg/catalog/rest/http_client.cc

@@ -23,7 +23,7 @@
 
 #include "cpr/body.h"
 #include "cpr/cprtypes.h"
-#include "iceberg/catalog/rest/config.h"
+#include "iceberg/catalog/rest/catalog_properties.h"
 #include "iceberg/catalog/rest/json_internal.h"
 #include "iceberg/json_internal.h"
 #include "iceberg/util/macros.h"

src/iceberg/catalog/rest/http_client.h

@@ -27,7 +27,7 @@
 #include <cpr/cpr.h>
 #include <nlohmann/json.hpp>
 
-#include "iceberg/catalog/rest/config.h"
+#include "iceberg/catalog/rest/catalog_properties.h"
 #include "iceberg/catalog/rest/error_handlers.h"
 #include "iceberg/catalog/rest/http_response.h"
 #include "iceberg/catalog/rest/iceberg_rest_export.h"

src/iceberg/catalog/rest/meson.build

@@ -16,11 +16,11 @@
 # under the License.
 
 iceberg_rest_sources = files(
-    'catalog.cc',
-    'config.cc',
+    'catalog_properties.cc',
     'http_client.cc',
     'json_internal.cc',
     'resource_paths.cc',
+    'rest_catalog.cc',
 )
 # cpr does not export symbols, so on Windows it must
 # be used as a static lib
@@ -54,16 +54,16 @@ pkg.generate(iceberg_rest_lib)
 
 install_headers(
     [
-        'catalog.h',
-        'config.h',
+        'rest_catalog.h',
+        'catalog_properties.h',
         'constant.h',
         'http_client.h',
         'http_response.h',
         'json_internal.h',
         'iceberg_rest_export.h',
         'types.h',
         'resource_paths.h',
-        'endpoint_util.h',
+        'rest_util.h',
         'error_handlers.h',
     ],
     subdir: 'iceberg/catalog/rest',

src/iceberg/catalog/rest/resource_paths.cc

@@ -21,8 +21,8 @@
 
 #include <format>
 
-#include "iceberg/catalog/rest/config.h"
-#include "iceberg/catalog/rest/endpoint_util.h"
+#include "iceberg/catalog/rest/catalog_properties.h"
+#include "iceberg/catalog/rest/rest_util.h"
 #include "iceberg/result.h"
 
 namespace iceberg::rest {
@@ -50,84 +50,82 @@ ResourcePaths::ResourcePaths(std::string base_uri, std::string prefix)
     : base_uri_(std::move(base_uri)), prefix_(std::move(prefix)) {}
 
 std::string ResourcePaths::BuildPath(std::string_view path) const {
-  if (prefix_.empty()) {
-    return std::format("{}/v1/{}", base_uri_, path);
-  }
-  return std::format("{}/v1/{}/{}", base_uri_, prefix_, path);
+  return std::format("{}/v1/{}{}", base_uri_, (prefix_.empty() ? "" : (prefix_ + "/")),
+                     path);
 }
 
-std::string ResourcePaths::V1Config() const {
+std::string ResourcePaths::Config() const {
   return std::format("{}/v1/config", base_uri_);
 }
 
-std::string ResourcePaths::V1OAuth2Tokens() const {
+std::string ResourcePaths::OAuth2Tokens() const {
   return std::format("{}/v1/oauth/tokens", base_uri_);
 }
 
-std::string ResourcePaths::V1Namespaces() const { return BuildPath("namespaces"); }
+std::string ResourcePaths::Namespaces() const { return BuildPath("namespaces"); }
 
-std::string ResourcePaths::V1Namespace(const Namespace& ns) const {
+std::string ResourcePaths::Namespace_(const Namespace& ns) const {
   return BuildPath(std::format("namespaces/{}", EncodeNamespaceForUrl(ns)));
 }
 
-std::string ResourcePaths::V1NamespaceProperties(const Namespace& ns) const {
+std::string ResourcePaths::NamespaceProperties(const Namespace& ns) const {
   return BuildPath(std::format("namespaces/{}/properties", EncodeNamespaceForUrl(ns)));
 }
 
-std::string ResourcePaths::V1Tables(const Namespace& ns) const {
+std::string ResourcePaths::Tables(const Namespace& ns) const {
   return BuildPath(std::format("namespaces/{}/tables", EncodeNamespaceForUrl(ns)));
 }
 
-std::string ResourcePaths::V1Table(const TableIdentifier& table) const {
-  return BuildPath(std::format("namespaces/{}/tables/{}", EncodeNamespaceForUrl(table.ns),
-                               table.name));
+std::string ResourcePaths::Table(const TableIdentifier& ident) const {
+  return BuildPath(std::format("namespaces/{}/tables/{}", EncodeNamespaceForUrl(ident.ns),
+                               ident.name));
 }
 
-std::string ResourcePaths::V1RegisterTable(const Namespace& ns) const {
+std::string ResourcePaths::Register(const Namespace& ns) const {
   return BuildPath(std::format("namespaces/{}/register", EncodeNamespaceForUrl(ns)));
 }
 
-std::string ResourcePaths::V1RenameTable() const { return BuildPath("tables/rename"); }
+std::string ResourcePaths::Rename() const { return BuildPath("tables/rename"); }
 
-std::string ResourcePaths::V1TableMetrics(const TableIdentifier& table) const {
+std::string ResourcePaths::Metrics(const TableIdentifier& ident) const {
   return BuildPath(std::format("namespaces/{}/tables/{}/metrics",
-                               EncodeNamespaceForUrl(table.ns), table.name));
+                               EncodeNamespaceForUrl(ident.ns), ident.name));
 }
 
-std::string ResourcePaths::V1TableCredentials(const TableIdentifier& table) const {
+std::string ResourcePaths::Credentials(const TableIdentifier& ident) const {
   return BuildPath(std::format("namespaces/{}/tables/{}/credentials",
-                               EncodeNamespaceForUrl(table.ns), table.name));
+                               EncodeNamespaceForUrl(ident.ns), ident.name));
 }
 
-std::string ResourcePaths::V1TableScanPlan(const TableIdentifier& table) const {
+std::string ResourcePaths::ScanPlan(const TableIdentifier& ident) const {
   return BuildPath(std::format("namespaces/{}/tables/{}/plan",
-                               EncodeNamespaceForUrl(table.ns), table.name));
+                               EncodeNamespaceForUrl(ident.ns), ident.name));
 }
 
-std::string ResourcePaths::V1TableScanPlanResult(const TableIdentifier& table,
-                                                 const std::string& plan_id) const {
+std::string ResourcePaths::ScanPlanResult(const TableIdentifier& ident,
+                                          const std::string& plan_id) const {
   return BuildPath(std::format("namespaces/{}/tables/{}/plan/{}",
-                               EncodeNamespaceForUrl(table.ns), table.name, plan_id));
+                               EncodeNamespaceForUrl(ident.ns), ident.name, plan_id));
 }
 
-std::string ResourcePaths::V1TableTasks(const TableIdentifier& table) const {
+std::string ResourcePaths::Tasks(const TableIdentifier& ident) const {
   return BuildPath(std::format("namespaces/{}/tables/{}/tasks",
-                               EncodeNamespaceForUrl(table.ns), table.name));
+                               EncodeNamespaceForUrl(ident.ns), ident.name));
 }
 
-std::string ResourcePaths::V1TransactionCommit() const {
+std::string ResourcePaths::CommitTransaction() const {
   return BuildPath("transactions/commit");
 }
 
-std::string ResourcePaths::V1Views(const Namespace& ns) const {
+std::string ResourcePaths::Views(const Namespace& ns) const {
   return BuildPath(std::format("namespaces/{}/views", EncodeNamespaceForUrl(ns)));
 }
 
-std::string ResourcePaths::V1View(const TableIdentifier& view) const {
+std::string ResourcePaths::View(const TableIdentifier& ident) const {
   return BuildPath(
-      std::format("namespaces/{}/views/{}", EncodeNamespaceForUrl(view.ns), view.name));
+      std::format("namespaces/{}/views/{}", EncodeNamespaceForUrl(ident.ns), ident.name));
 }
 
-std::string ResourcePaths::V1RenameView() const { return BuildPath("views/rename"); }
+std::string ResourcePaths::RenameView() const { return BuildPath("views/rename"); }
 
 }  // namespace iceberg::rest