couchbase 3.5.1 → 3.5.2

data/ext/couchbase/couchbase/decrement_options.hxx

@@ -20,7 +20,6 @@
 #include <couchbase/common_durability_options.hxx>
 #include <couchbase/counter_result.hxx>
 #include <couchbase/expiry.hxx>
-#include <couchbase/key_value_error_context.hxx>
 
 #include <chrono>
 #include <functional>
@@ -36,101 +35,104 @@ namespace couchbase
  * @committed
  */
 struct decrement_options : public common_durability_options<decrement_options> {
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_durability_options<decrement_options>::built {
-        const std::uint32_t expiry;
-        const std::uint64_t delta;
-        const std::optional<std::uint64_t> initial_value;
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_durability_options<decrement_options>::built {
+    const std::uint32_t expiry;
+    const std::uint64_t delta;
+    const std::optional<std::uint64_t> initial_value;
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        auto base = build_common_durability_options();
-        return { base, expiry_, delta_, initial_value_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    auto base = build_common_durability_options();
+    return { base, expiry_, delta_, initial_value_ };
+  }
 
-    /**
-     * Sets the expiry for the document. By default the document will never expire.
-     *
-     * The duration must be less than 50 years. For expiry further in the future, use
-     * {@link #expiry(std::chrono::system_clock::time_point)}.
-     *
-     * @param duration the duration after which the document will expire (zero duration means never expire).
-     * @return this options class for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto expiry(std::chrono::seconds duration) -> decrement_options&
-    {
-        expiry_ = core::impl::expiry_relative(duration);
-        return self();
-    }
+  /**
+   * Sets the expiry for the document. By default the document will never expire.
+   *
+   * The duration must be less than 50 years. For expiry further in the future, use
+   * {@link #expiry(std::chrono::system_clock::time_point)}.
+   *
+   * @param duration the duration after which the document will expire (zero duration means never
+   * expire).
+   * @return this options class for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto expiry(std::chrono::seconds duration) -> decrement_options&
+  {
+    expiry_ = core::impl::expiry_relative(duration);
+    return self();
+  }
 
-    /**
-     * Sets the expiry for the document. By default the document will never expire.
-     *
-     * @param time_point the point in time when the document will expire (epoch second zero means never expire).
-     * @return this options class for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto expiry(std::chrono::system_clock::time_point time_point) -> decrement_options&
-    {
-        expiry_ = core::impl::expiry_absolute(time_point);
-        return self();
-    }
+  /**
+   * Sets the expiry for the document. By default the document will never expire.
+   *
+   * @param time_point the point in time when the document will expire (epoch second zero means
+   * never expire).
+   * @return this options class for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto expiry(std::chrono::system_clock::time_point time_point) -> decrement_options&
+  {
+    expiry_ = core::impl::expiry_absolute(time_point);
+    return self();
+  }
 
-    /**
-     * The amount of which the document value should be decremented.
-     *
-     * @param delta the amount to decrement.
-     * @return this options class for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto delta(std::uint64_t delta) -> decrement_options&
-    {
-        delta_ = delta;
-        return self();
-    }
+  /**
+   * The amount of which the document value should be decremented.
+   *
+   * @param delta the amount to decrement.
+   * @return this options class for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto delta(std::uint64_t delta) -> decrement_options&
+  {
+    delta_ = delta;
+    return self();
+  }
 
-    /**
-     * The initial value that should be used if the document has not been created yet.
-     *
-     * @param value the initial value to use.
-     * @return this options class for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto initial(std::uint64_t value) -> decrement_options&
-    {
-        initial_value_ = value;
-        return self();
-    }
+  /**
+   * The initial value that should be used if the document has not been created yet.
+   *
+   * @param value the initial value to use.
+   * @return this options class for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto initial(std::uint64_t value) -> decrement_options&
+  {
+    initial_value_ = value;
+    return self();
+  }
 
-  private:
-    std::uint32_t expiry_{ 0 };
-    std::uint64_t delta_{ 1 };
-    std::optional<std::uint64_t> initial_value_{};
+private:
+  std::uint32_t expiry_{ 0 };
+  std::uint64_t delta_{ 1 };
+  std::optional<std::uint64_t> initial_value_{};
 };
 
 /**
@@ -139,5 +141,5 @@ struct decrement_options : public common_durability_options<decrement_options> {
  * @since 1.0.0
  * @uncommitted
  */
-using decrement_handler = std::function<void(couchbase::key_value_error_context, counter_result)>;
+using decrement_handler = std::function<void(error, counter_result)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/diagnostics_options.hxx

@@ -26,50 +26,51 @@
 namespace couchbase
 {
 struct diagnostics_options : public common_options<diagnostics_options> {
-    /**
-     * Sets a custom report ID that will be used in the report. If no report ID is provided, the client will generate a
-     * unique one.
-     *
-     * @param report_id the report ID that should be used.
-     * @return reference to this object, for use in chaining.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto report_id(std::string report_id) -> diagnostics_options&
-    {
-        report_id_ = std::move(report_id);
-        return self();
-    }
+  /**
+   * Sets a custom report ID that will be used in the report. If no report ID is provided, the
+   * client will generate a unique one.
+   *
+   * @param report_id the report ID that should be used.
+   * @return reference to this object, for use in chaining.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto report_id(std::string report_id) -> diagnostics_options&
+  {
+    report_id_ = std::move(report_id);
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<diagnostics_options>::built {
-        std::optional<std::string> report_id;
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<diagnostics_options>::built {
+    std::optional<std::string> report_id;
+  };
 
-    /**
-     * Validates the options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), report_id_ };
-    }
+  /**
+   * Validates the options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), report_id_ };
+  }
 
-  private:
-    std::optional<std::string> report_id_{};
+private:
+  std::optional<std::string> report_id_{};
 };
 
-using diagnostics_handler = std::function<void(diagnostics_result)>;
+using diagnostics_handler = std::function<void(error, diagnostics_result)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/diagnostics_result.hxx

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <couchbase/codec/tao_json_serializer.hxx>
 #include <couchbase/endpoint_diagnostics.hxx>
 #include <couchbase/service_type.hxx>
 
@@ -31,94 +30,94 @@ namespace couchbase
 {
 class diagnostics_result
 {
-  public:
-    /**
-     * @since 1.0.0
-     * @internal
-     */
-    diagnostics_result() = default;
+public:
+  /**
+   * @since 1.0.0
+   * @internal
+   */
+  diagnostics_result() = default;
 
-    /**
-     * @since 1.0.0
-     * @internal
-     */
-    diagnostics_result(std::string id,
-                       std::uint16_t version,
-                       std::string sdk,
-                       std::map<service_type, std::vector<endpoint_diagnostics>> endpoints)
-      : id_{ std::move(id) }
-      , version_{ version }
-      , sdk_{ std::move(sdk) }
-      , endpoints_{ std::move(endpoints) }
-    {
-    }
+  /**
+   * @since 1.0.0
+   * @internal
+   */
+  diagnostics_result(std::string id,
+                     std::uint16_t version,
+                     std::string sdk,
+                     std::map<service_type, std::vector<endpoint_diagnostics>> endpoints)
+    : id_{ std::move(id) }
+    , version_{ version }
+    , sdk_{ std::move(sdk) }
+    , endpoints_{ std::move(endpoints) }
+  {
+  }
 
-    /**
-     * Returns the ID of this report.
-     *
-     * @return the report ID.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto id() const -> std::string
-    {
-        return id_;
-    }
+  /**
+   * Returns the ID of this report.
+   *
+   * @return the report ID.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto id() const -> std::string
+  {
+    return id_;
+  }
 
-    /**
-     * Returns the version of this report (useful when exporting to JSON).
-     *
-     * @return the report version
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto version() const -> std::uint16_t
-    {
-        return version_;
-    }
+  /**
+   * Returns the version of this report (useful when exporting to JSON).
+   *
+   * @return the report version
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto version() const -> std::uint16_t
+  {
+    return version_;
+  }
 
-    /**
-     * Returns the identifier of this SDK (useful when exporting to JSON).
-     *
-     * @return the SDK identifier.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto sdk() const -> std::string
-    {
-        return sdk_;
-    }
+  /**
+   * Returns the identifier of this SDK (useful when exporting to JSON).
+   *
+   * @return the SDK identifier.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto sdk() const -> std::string
+  {
+    return sdk_;
+  }
 
-    /**
-     * Returns the diagnostics for each individual endpoint, organised by service type.
-     *
-     * @return the service type to endpoint diagnostics reports map.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto endpoints() const -> std::map<service_type, std::vector<endpoint_diagnostics>>
-    {
-        return endpoints_;
-    }
+  /**
+   * Returns the diagnostics for each individual endpoint, organised by service type.
+   *
+   * @return the service type to endpoint diagnostics reports map.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto endpoints() const -> std::map<service_type, std::vector<endpoint_diagnostics>>
+  {
+    return endpoints_;
+  }
 
-    /**
-     * Exports the diagnostics report as JSON.
-     *
-     * @return the JSON report.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto as_json() const -> codec::tao_json_serializer::document_type;
+  /**
+   * Exports the diagnostics report as JSON.
+   *
+   * @return the JSON report.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto as_json() const -> std::string;
 
-  private:
-    std::string id_{};
-    std::uint16_t version_{};
-    std::string sdk_{};
-    std::map<service_type, std::vector<endpoint_diagnostics>> endpoints_{};
+private:
+  std::string id_{};
+  std::uint16_t version_{};
+  std::string sdk_{};
+  std::map<service_type, std::vector<endpoint_diagnostics>> endpoints_{};
 };
 } // namespace couchbase

data/ext/couchbase/couchbase/disallow_querying_search_index_options.hxx

@@ -26,18 +26,19 @@
 
 namespace couchbase
 {
-struct disallow_querying_search_index_options : public common_options<disallow_querying_search_index_options> {
-  public:
-    struct built : public common_options<disallow_querying_search_index_options>::built {
-    };
+struct disallow_querying_search_index_options
+  : public common_options<disallow_querying_search_index_options> {
+public:
+  struct built : public common_options<disallow_querying_search_index_options>::built {
+  };
 
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options() };
-    }
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options() };
+  }
 
-  private:
+private:
 };
 
-using disallow_querying_search_index_handler = std::function<void(couchbase::manager_error_context)>;
+using disallow_querying_search_index_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/disconnect_link_analytics_options.hxx

@@ -19,7 +19,6 @@
 
 #include <couchbase/common_options.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <functional>
 #include <optional>
@@ -29,70 +28,71 @@ namespace couchbase
 {
 class disconnect_link_analytics_options : public common_options<disconnect_link_analytics_options>
 {
-  public:
-    /**
-     * The name of the dataverse to connect to.
-     *
-     * defaults to `Default`
-     *
-     * @param dataverse_name
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto dataverse_name(std::string dataverse_name) -> disconnect_link_analytics_options&
-    {
-        dataverse_name_ = std::move(dataverse_name);
-        return self();
-    }
+public:
+  /**
+   * The name of the dataverse to connect to.
+   *
+   * defaults to `Default`
+   *
+   * @param dataverse_name
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto dataverse_name(std::string dataverse_name) -> disconnect_link_analytics_options&
+  {
+    dataverse_name_ = std::move(dataverse_name);
+    return self();
+  }
 
-    /**
-     * The name of the link
-     *
-     * defaults to `Local`
-     *
-     * @param link_name
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto link_name(std::string link_name) -> disconnect_link_analytics_options&
-    {
-        link_name_ = std::move(link_name);
-        return self();
-    }
+  /**
+   * The name of the link
+   *
+   * defaults to `Local`
+   *
+   * @param link_name
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto link_name(std::string link_name) -> disconnect_link_analytics_options&
+  {
+    link_name_ = std::move(link_name);
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<disconnect_link_analytics_options>::built {
-        std::optional<std::string> dataverse_name{};
-        std::optional<std::string> link_name{};
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<disconnect_link_analytics_options>::built {
+    std::optional<std::string> dataverse_name{};
+    std::optional<std::string> link_name{};
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), dataverse_name_, link_name_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), dataverse_name_, link_name_ };
+  }
 
-  private:
-    std::optional<std::string> dataverse_name_{};
-    std::optional<std::string> link_name_{};
+private:
+  std::optional<std::string> dataverse_name_{};
+  std::optional<std::string> link_name_{};
 };
 
 /**
@@ -101,5 +101,5 @@ class disconnect_link_analytics_options : public common_options<disconnect_link_
  * @since 1.0.0
  * @uncommitted
  */
-using disconnect_link_analytics_handler = std::function<void(couchbase::manager_error_context)>;
+using disconnect_link_analytics_handler = std::function<void(error)>;
 } // namespace couchbase