diff --git a/clickhouse/include/userver/storages/clickhouse.hpp b/clickhouse/include/userver/storages/clickhouse.hpp index 54197c077e41..5abf80013a3e 100644 --- a/clickhouse/include/userver/storages/clickhouse.hpp +++ b/clickhouse/include/userver/storages/clickhouse.hpp @@ -18,13 +18,13 @@ /// components::ClickHouse. The uClickHouse driver is asynchronous, it suspends /// current coroutine for carrying out network I/O. /// -/// @section feature Features +/// @section clickhouse_feature Features /// - Connection pooling; /// - Variadic template query parameter passing; /// - Query result extraction to C++ types; /// - Mapping C++ types to native ClickHouse types. /// -/// @section info More information +/// @section clickhouse_info More information /// - For configuration see components::ClickHouse /// - For cluster operations see storages::clickhouse::Cluster /// - For mapping C++ types to Clickhouse types see @ref clickhouse_io diff --git a/core/include/userver/server/handlers/auth/digest/auth_checker_settings_component.hpp b/core/include/userver/server/handlers/auth/digest/auth_checker_settings_component.hpp index 8badc7808acd..416c2bca452c 100644 --- a/core/include/userver/server/handlers/auth/digest/auth_checker_settings_component.hpp +++ b/core/include/userver/server/handlers/auth/digest/auth_checker_settings_component.hpp @@ -1,6 +1,6 @@ #pragma once -/// @file userver/server/handlers/auth/digest/digest_checker_settings_component.hpp +/// @file userver/server/handlers/auth/digest/auth_checker_settings_component.hpp /// @brief @copybrief server::handlers::auth::digest::AuthCheckerSettingsComponent #include diff --git a/grpc/include/userver/ugrpc/client/middlewares/base.hpp b/grpc/include/userver/ugrpc/client/middlewares/base.hpp index b6c37f033811..be32274916d5 100644 --- a/grpc/include/userver/ugrpc/client/middlewares/base.hpp +++ b/grpc/include/userver/ugrpc/client/middlewares/base.hpp @@ -96,7 +96,7 @@ class MiddlewareBase { MiddlewareBase(); }; -/// @ingroup userver_components userver_base_classes +/// @ingroup userver_base_classes /// /// @brief Factory that creates specific client middlewares for clients. using MiddlewareFactoryComponentBase = diff --git a/grpc/include/userver/ugrpc/server/middlewares/baggage/component.hpp b/grpc/include/userver/ugrpc/server/middlewares/baggage/component.hpp index 6b7588d8ea66..042a739ab824 100644 --- a/grpc/include/userver/ugrpc/server/middlewares/baggage/component.hpp +++ b/grpc/include/userver/ugrpc/server/middlewares/baggage/component.hpp @@ -12,7 +12,7 @@ namespace ugrpc::server::middlewares::baggage { // clang-format off -/// @ingroup userver_components userver_base_classes +/// @ingroup userver_base_classes /// /// @brief Component for gRPC server baggage /// diff --git a/grpc/include/userver/ugrpc/server/middlewares/base.hpp b/grpc/include/userver/ugrpc/server/middlewares/base.hpp index f02f5e29eaa3..5531fc181189 100644 --- a/grpc/include/userver/ugrpc/server/middlewares/base.hpp +++ b/grpc/include/userver/ugrpc/server/middlewares/base.hpp @@ -89,7 +89,7 @@ class MiddlewareBase { virtual void CallResponseHook(const MiddlewareCallContext& context, google::protobuf::Message& response); }; -/// @ingroup userver_components userver_base_classes +/// @ingroup userver_base_classes /// /// @brief Factory that creates specific server middlewares for services. using MiddlewareFactoryComponentBase = diff --git a/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp b/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp index 8cf59738c135..fea413e3a744 100644 --- a/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp +++ b/grpc/include/userver/ugrpc/server/middlewares/deadline_propagation/component.hpp @@ -12,7 +12,7 @@ namespace ugrpc::server::middlewares::deadline_propagation { // clang-format off -/// @ingroup userver_components userver_base_classes +/// @ingroup userver_base_classes /// /// @brief Component for gRPC server deadline propagation /// @see @ref scripts/docs/en/userver/deadline_propagation.md diff --git a/rabbitmq/include/userver/rabbitmq.hpp b/rabbitmq/include/userver/rabbitmq.hpp index db55f97016df..bd9e23a679d7 100644 --- a/rabbitmq/include/userver/rabbitmq.hpp +++ b/rabbitmq/include/userver/rabbitmq.hpp @@ -23,7 +23,7 @@ /// components::RabbitMQ. The uRabbitMQ driver is asynchronous, it suspends /// current coroutine for carrying out network I/O. /// -/// @section feature Features +/// @section rabbitmq_feature Features /// - Publishing messages; /// - Consuming messages; /// - Creating Exchanges, Queues and Bindings; @@ -31,7 +31,7 @@ /// - Connections pooling; /// - End-to-end logging for messages in publish->consume chain. /// -/// @section info More information +/// @section rabbitmq_info More information /// - For configuration see components::RabbitMQ /// - For cluster operations see urabbitmq::Client, urabbitmq::AdminChannel, /// urabbitmq::Channel, urabbitmq::ReliableChannel diff --git a/scripts/docs/doxygen.conf b/scripts/docs/doxygen.conf index 99e96e25d650..ca723813462e 100644 --- a/scripts/docs/doxygen.conf +++ b/scripts/docs/doxygen.conf @@ -982,7 +982,6 @@ INPUT = CONTRIBUTING.md \ universal/utest/include \ core/include \ core/utest/include \ - chaotic/include \ mongo/include \ postgresql/include \ redis/include \ @@ -996,7 +995,6 @@ INPUT = CONTRIBUTING.md \ ydb/include \ otlp/include \ testsuite/pytest_plugins/ \ - docker-compose.yml \ libraries \ scripts/docker/ @@ -2569,6 +2567,7 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = __attribute__(x)= \ DOXYGEN \ + USERVER_IMPL_HAS_THREE_WAY_COMPARISON \ "USERVER_NAMESPACE=" \ "USERVER_NAMESPACE_BEGIN=" \ "USERVER_NAMESPACE_END=" diff --git a/scripts/docs/en/userver/functional_testing.md b/scripts/docs/en/userver/functional_testing.md index 5b0f79c97cd0..a2ba930634ef 100644 --- a/scripts/docs/en/userver/functional_testing.md +++ b/scripts/docs/en/userver/functional_testing.md @@ -513,7 +513,6 @@ For per-daemon fixtures see @ref pytest_userver.plugins.service.daemon_scoped_ma @htmlonly @endhtmlonly @example cmake/UserverTestsuite.cmake -@example samples/http_caching/tests/conftest.py @example samples/testsuite-support/src/logcapture.cpp @example samples/testsuite-support/src/metrics.cpp @example samples/testsuite-support/src/metrics.hpp @@ -525,4 +524,3 @@ For per-daemon fixtures see @ref pytest_userver.plugins.service.daemon_scoped_ma @example samples/testsuite-support/tests/test_mocked_time.py @example samples/testsuite-support/tests/test_tasks.py @example samples/testsuite-support/tests/test_testpoint.py -@example samples/production_service/tests/test_production.py diff --git a/scripts/docs/en/userver/mysql/mysql_driver.md b/scripts/docs/en/userver/mysql/mysql_driver.md index b9318f16743c..5f786943440c 100644 --- a/scripts/docs/en/userver/mysql/mysql_driver.md +++ b/scripts/docs/en/userver/mysql/mysql_driver.md @@ -58,7 +58,7 @@ leaking in some hopefully rare cases is acceptable,
cmake variable `USERVER_MYSQL_ALLOW_BUGGY_LIBMARIADB` could be set to force the driver to leak memory instead of aborting in such cases. -@section info More information +@section mysql_info More information - For configuring see storages::mysql::Component - For cluster operations see storages::mysql::Cluster - For C++ <-> MySQL mapping see @ref scripts/docs/en/userver/mysql/supported_types.md diff --git a/scripts/docs/en/userver/tutorial/kafka_service.md b/scripts/docs/en/userver/tutorial/kafka_service.md index 271f7b42f3a8..b9e5e2052722 100644 --- a/scripts/docs/en/userver/tutorial/kafka_service.md +++ b/scripts/docs/en/userver/tutorial/kafka_service.md @@ -292,13 +292,9 @@ See the full example at: @example samples/kafka_service/CMakeLists.txt @example samples/kafka_service/static_config.yaml @example samples/kafka_service/src/producer_handler.hpp -@example samples/kafka_service/src/producer_handler.cpp -@example samples/kafka_service/src/consumer_handler.hpp @example samples/kafka_service/src/consumer_handler.hpp @example samples/kafka_service/src/produce.hpp -@example samples/kafka_service/src/produce.cpp @example samples/kafka_service/src/consume.hpp -@example samples/kafka_service/src/consume.cpp @example samples/kafka_service/testsuite/conftest.py @example samples/kafka_service/testsuite/test_kafka.py @example samples/kafka_service/unittest/kafka_test.cpp diff --git a/universal/include/userver/formats/json/inline.hpp b/universal/include/userver/formats/json/inline.hpp index e55c19cb6e25..2b792e65ed71 100644 --- a/universal/include/userver/formats/json/inline.hpp +++ b/universal/include/userver/formats/json/inline.hpp @@ -2,6 +2,7 @@ /// @file userver/formats/json/inline.hpp /// @brief Inline value builders +/// @ingroup userver_universal #include #include @@ -14,13 +15,13 @@ USERVER_NAMESPACE_BEGIN namespace formats::json { -/// @ingroup userver_universal userver_formats +/// @ingroup userver_formats /// /// Constructs an object Value from provided key-value pairs template Value MakeObject(Args&&...); -/// @ingroup userver_universal userver_formats +/// @ingroup userver_formats /// /// Constructs an array Value from provided element list template diff --git a/universal/include/userver/utils/bytes_per_second.hpp b/universal/include/userver/utils/bytes_per_second.hpp index 71b865f47ae9..28f850a32744 100644 --- a/universal/include/userver/utils/bytes_per_second.hpp +++ b/universal/include/userver/utils/bytes_per_second.hpp @@ -12,7 +12,7 @@ USERVER_NAMESPACE_BEGIN namespace utils { -/// @ingroup userver_universal userver_containers +/// @ingroup userver_universal /// /// @brief Data type that represents `bytes per second` unit enum class BytesPerSecond : long long {}; diff --git a/universal/include/userver/utils/macaddr.hpp b/universal/include/userver/utils/macaddr.hpp index 8b80a9e6e515..0e962550d2da 100644 --- a/universal/include/userver/utils/macaddr.hpp +++ b/universal/include/userver/utils/macaddr.hpp @@ -1,6 +1,6 @@ #pragma once -/// @file userver/utils/macaddr/macaddr_base.hpp +/// @file userver/utils/macaddr.hpp /// @brief MAC address types #include diff --git a/universal/include/userver/utils/not_null.hpp b/universal/include/userver/utils/not_null.hpp index 3df5c5fe7e60..55b41ba50916 100644 --- a/universal/include/userver/utils/not_null.hpp +++ b/universal/include/userver/utils/not_null.hpp @@ -91,14 +91,14 @@ class NotNull { T ptr_; }; -/// @ingroup userver_universal userver_containers +/// @ingroup userver_universal /// /// @brief A `std::shared_ptr` that is guaranteed to be not-null. /// @see MakeSharedRef template using SharedRef = NotNull>; -/// @ingroup userver_universal userver_containers +/// @ingroup userver_universal /// /// @brief A `std::unique_ptr` that is guaranteed to be not-null. /// @see MakeUniqueRef diff --git a/universal/include/userver/utils/projected_set.hpp b/universal/include/userver/utils/projected_set.hpp index c5587d95fe77..f890938f4d72 100644 --- a/universal/include/userver/utils/projected_set.hpp +++ b/universal/include/userver/utils/projected_set.hpp @@ -69,7 +69,7 @@ void DoInsert(Set& set, Value&& value) { } // namespace impl::projected_set -/// @ingroup userver_universal userver_containers +/// @ingroup userver_universal /// @brief A `std::unordered_set` that compares its elements (of type @a Value) /// based on their @a Projection. It allows to create, essentially, an /// equivalent of `std::unordered_map` where keys are stored inside values. @@ -89,7 +89,7 @@ using ProjectedUnorderedSet = std::unordered_set< impl::projected_set::Compare, Allocator>; -/// @ingroup userver_universal userver_containers +/// @ingroup userver_universal /// @brief Same as ProjectedUnorderedSet, but for `std::set`. template , typename Allocator = std::allocator> using ProjectedSet = std::set, Allocator>; diff --git a/universal/include/userver/utils/time_of_day.hpp b/universal/include/userver/utils/time_of_day.hpp index 618c798b44bd..69eca0d4dc54 100644 --- a/universal/include/userver/utils/time_of_day.hpp +++ b/universal/include/userver/utils/time_of_day.hpp @@ -103,7 +103,10 @@ class TimeOfDay> { //@{ /** @name Accessors */ /// @return Hours since midnight - constexpr std::chrono::hours Hours() const noexcept; + constexpr std::chrono::hours Hours() const noexcept { + return std::chrono::duration_cast(since_midnight_); + } + /// @return Minutes since midnight + Hours constexpr std::chrono::minutes Minutes() const noexcept; /// @return Seconds since midnight + Hours + Minutes @@ -430,11 +433,6 @@ constexpr bool TimeOfDay>::operator>=(const T } #endif -template -constexpr std::chrono::hours TimeOfDay>::Hours() const noexcept { - return std::chrono::duration_cast(since_midnight_); -} - template constexpr std::chrono::minutes TimeOfDay>::Minutes() const noexcept { if constexpr (detail::kHasMinutes) {