style: clang-tidy auto fixes (#1705)

Fixes #1704. Please review and commit clang-tidy fixes.

Co-authored-by: kuznetsss <15742918+kuznetsss@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2024-10-25 09:05:28 +01:00
committed by GitHub
parent cffda52ba6
commit 2a5d73730f
15 changed files with 14 additions and 47 deletions

View File

@@ -41,7 +41,6 @@
#include <boost/beast/core/flat_buffer.hpp> #include <boost/beast/core/flat_buffer.hpp>
#include <boost/beast/core/tcp_stream.hpp> #include <boost/beast/core/tcp_stream.hpp>
#include <boost/system/system_error.hpp> #include <boost/system/system_error.hpp>
#include <fmt/compile.h>
#include <fmt/core.h> #include <fmt/core.h>
#include <cstddef> #include <cstddef>

View File

@@ -28,13 +28,9 @@
#include "web/ng/Request.hpp" #include "web/ng/Request.hpp"
#include "web/ng/Response.hpp" #include "web/ng/Response.hpp"
#include <boost/asio/bind_cancellation_slot.hpp>
#include <boost/asio/cancellation_signal.hpp>
#include <boost/asio/error.hpp> #include <boost/asio/error.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/asio/ssl/error.hpp> #include <boost/asio/ssl/error.hpp>
#include <boost/asio/steady_timer.hpp>
#include <boost/asio/strand.hpp>
#include <boost/beast/http/error.hpp> #include <boost/beast/http/error.hpp>
#include <boost/beast/http/status.hpp> #include <boost/beast/http/status.hpp>
#include <boost/beast/websocket/error.hpp> #include <boost/beast/websocket/error.hpp>

View File

@@ -21,7 +21,6 @@
#include "util/Assert.hpp" #include "util/Assert.hpp"
#include <boost/asio/buffer.hpp>
#include <boost/asio/io_context.hpp> #include <boost/asio/io_context.hpp>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
@@ -30,21 +29,16 @@
#include <boost/asio/ssl/stream_base.hpp> #include <boost/asio/ssl/stream_base.hpp>
#include <boost/asio/ssl/verify_context.hpp> #include <boost/asio/ssl/verify_context.hpp>
#include <boost/asio/ssl/verify_mode.hpp> #include <boost/asio/ssl/verify_mode.hpp>
#include <boost/beast/core/buffers_to_string.hpp>
#include <boost/beast/core/error.hpp> #include <boost/beast/core/error.hpp>
#include <boost/beast/core/flat_buffer.hpp> #include <boost/beast/core/flat_buffer.hpp>
#include <boost/beast/core/stream_traits.hpp> #include <boost/beast/core/stream_traits.hpp>
#include <boost/beast/core/tcp_stream.hpp> #include <boost/beast/core/tcp_stream.hpp>
#include <boost/beast/http.hpp>
#include <boost/beast/http/field.hpp> #include <boost/beast/http/field.hpp>
#include <boost/beast/http/message.hpp> #include <boost/beast/http/message.hpp>
#include <boost/beast/http/string_body.hpp> #include <boost/beast/http/string_body.hpp>
#include <boost/beast/http/verb.hpp> #include <boost/beast/http/verb.hpp>
#include <boost/beast/ssl/ssl_stream.hpp> #include <boost/beast/ssl/ssl_stream.hpp>
#include <boost/beast/version.hpp> #include <boost/beast/version.hpp>
#include <boost/beast/websocket/rfc6455.hpp>
#include <boost/beast/websocket/stream.hpp>
#include <boost/beast/websocket/stream_base.hpp>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/tls1.h> #include <openssl/tls1.h>
@@ -198,7 +192,7 @@ HttpAsyncClient::connect(
if (error) if (error)
return error; return error;
ASSERT(resolverResults.size() > 0, "No results from resolver"); ASSERT(!resolverResults.empty(), "No results from resolver");
boost::beast::get_lowest_layer(stream_).expires_after(timeout); boost::beast::get_lowest_layer(stream_).expires_after(timeout);
stream_.async_connect(resolverResults.begin()->endpoint(), yield[error]); stream_.async_connect(resolverResults.begin()->endpoint(), yield[error]);

View File

@@ -23,7 +23,6 @@
#include <boost/asio/detached.hpp> #include <boost/asio/detached.hpp>
#include <boost/asio/io_context.hpp> #include <boost/asio/io_context.hpp>
#include <boost/asio/ip/address.hpp>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/asio/socket_base.hpp> #include <boost/asio/socket_base.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>

View File

@@ -28,28 +28,17 @@
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/asio/ssl/context.hpp> #include <boost/asio/ssl/context.hpp>
#include <boost/asio/ssl/error.hpp>
#include <boost/asio/ssl/stream_base.hpp> #include <boost/asio/ssl/stream_base.hpp>
#include <boost/asio/ssl/verify_context.hpp>
#include <boost/asio/ssl/verify_mode.hpp> #include <boost/asio/ssl/verify_mode.hpp>
#include <boost/beast/core/buffers_to_string.hpp> #include <boost/beast/core/buffers_to_string.hpp>
#include <boost/beast/core/error.hpp>
#include <boost/beast/core/flat_buffer.hpp> #include <boost/beast/core/flat_buffer.hpp>
#include <boost/beast/core/stream_traits.hpp> #include <boost/beast/core/stream_traits.hpp>
#include <boost/beast/core/tcp_stream.hpp>
#include <boost/beast/http.hpp>
#include <boost/beast/http/field.hpp> #include <boost/beast/http/field.hpp>
#include <boost/beast/http/message.hpp>
#include <boost/beast/http/string_body.hpp>
#include <boost/beast/http/verb.hpp>
#include <boost/beast/ssl/ssl_stream.hpp>
#include <boost/beast/version.hpp> #include <boost/beast/version.hpp>
#include <boost/beast/websocket/rfc6455.hpp> #include <boost/beast/websocket/rfc6455.hpp>
#include <boost/beast/websocket/stream.hpp> #include <boost/beast/websocket/stream.hpp>
#include <boost/beast/websocket/stream_base.hpp> #include <boost/beast/websocket/stream_base.hpp>
#include <fmt/core.h> #include <fmt/core.h>
#include <openssl/err.h>
#include <openssl/tls1.h>
#include <chrono> #include <chrono>
#include <optional> #include <optional>

View File

@@ -37,7 +37,7 @@ struct CoroutineGroupTests : SyncAsioContextTest {
TEST_F(CoroutineGroupTests, SpawnWait) TEST_F(CoroutineGroupTests, SpawnWait)
{ {
testing::Sequence sequence; testing::Sequence const sequence;
EXPECT_CALL(callback1_, Call).InSequence(sequence); EXPECT_CALL(callback1_, Call).InSequence(sequence);
EXPECT_CALL(callback2_, Call).InSequence(sequence); EXPECT_CALL(callback2_, Call).InSequence(sequence);
EXPECT_CALL(callback3_, Call).InSequence(sequence); EXPECT_CALL(callback3_, Call).InSequence(sequence);
@@ -68,7 +68,7 @@ TEST_F(CoroutineGroupTests, SpawnWait)
TEST_F(CoroutineGroupTests, SpawnWaitSpawnWait) TEST_F(CoroutineGroupTests, SpawnWaitSpawnWait)
{ {
testing::Sequence sequence; testing::Sequence const sequence;
EXPECT_CALL(callback1_, Call).InSequence(sequence); EXPECT_CALL(callback1_, Call).InSequence(sequence);
EXPECT_CALL(callback2_, Call).InSequence(sequence); EXPECT_CALL(callback2_, Call).InSequence(sequence);
EXPECT_CALL(callback3_, Call).InSequence(sequence); EXPECT_CALL(callback3_, Call).InSequence(sequence);
@@ -102,7 +102,7 @@ TEST_F(CoroutineGroupTests, SpawnWaitSpawnWait)
TEST_F(CoroutineGroupTests, ChildCoroutinesFinishBeforeWait) TEST_F(CoroutineGroupTests, ChildCoroutinesFinishBeforeWait)
{ {
testing::Sequence sequence; testing::Sequence const sequence;
EXPECT_CALL(callback2_, Call).InSequence(sequence); EXPECT_CALL(callback2_, Call).InSequence(sequence);
EXPECT_CALL(callback1_, Call).InSequence(sequence); EXPECT_CALL(callback1_, Call).InSequence(sequence);
EXPECT_CALL(callback3_, Call).InSequence(sequence); EXPECT_CALL(callback3_, Call).InSequence(sequence);

View File

@@ -25,7 +25,6 @@
#include <boost/asio/bind_cancellation_slot.hpp> #include <boost/asio/bind_cancellation_slot.hpp>
#include <boost/asio/buffer.hpp> #include <boost/asio/buffer.hpp>
#include <boost/asio/cancellation_signal.hpp> #include <boost/asio/cancellation_signal.hpp>
#include <boost/asio/ip/address.hpp>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/asio/steady_timer.hpp> #include <boost/asio/steady_timer.hpp>

View File

@@ -135,7 +135,7 @@ struct MakeAdminVerificationStrategyFromConfigTest
TEST_P(MakeAdminVerificationStrategyFromConfigTest, ChecksConfig) TEST_P(MakeAdminVerificationStrategyFromConfigTest, ChecksConfig)
{ {
util::Config serverConfig{boost::json::parse(GetParam().config)}; util::Config const serverConfig{boost::json::parse(GetParam().config)};
auto const result = web::impl::make_AdminVerificationStrategy(serverConfig); auto const result = web::impl::make_AdminVerificationStrategy(serverConfig);
if (GetParam().expectedError) { if (GetParam().expectedError) {
EXPECT_FALSE(result.has_value()); EXPECT_FALSE(result.has_value());

View File

@@ -205,7 +205,7 @@ TEST_F(RequestHeaderValueTest, headerValueString)
TEST_F(RequestHeaderValueTest, headerValueNotFound) TEST_F(RequestHeaderValueTest, headerValueNotFound)
{ {
http::request<http::string_body> httpRequest{http::verb::get, "/some", 11}; http::request<http::string_body> const httpRequest{http::verb::get, "/some", 11};
Request const request{httpRequest}; Request const request{httpRequest};
auto const maybeHeaderValue = request.headerValue(http::field::user_agent); auto const maybeHeaderValue = request.headerValue(http::field::user_agent);
EXPECT_FALSE(maybeHeaderValue.has_value()); EXPECT_FALSE(maybeHeaderValue.has_value());

View File

@@ -29,7 +29,6 @@
#include <boost/json/object.hpp> #include <boost/json/object.hpp>
#include <boost/json/serialize.hpp> #include <boost/json/serialize.hpp>
#include <fmt/core.h> #include <fmt/core.h>
#include <fmt/format.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <string> #include <string>
@@ -50,7 +49,7 @@ TEST_F(ResponseDeathTest, intoHttpResponseWithoutHttpData)
TEST_F(ResponseDeathTest, asConstBufferWithHttpData) TEST_F(ResponseDeathTest, asConstBufferWithHttpData)
{ {
Request const request{http::request<http::string_body>{http::verb::get, "/", 11}}; Request const request{http::request<http::string_body>{http::verb::get, "/", 11}};
web::ng::Response response{boost::beast::http::status::ok, "message", request}; web::ng::Response const response{boost::beast::http::status::ok, "message", request};
EXPECT_DEATH(response.asConstBuffer(), ""); EXPECT_DEATH(response.asConstBuffer(), "");
} }
@@ -103,7 +102,7 @@ TEST_F(ResponseTest, asConstBuffer)
{ {
Request const request("some request", Request::HttpHeaders{}); Request const request("some request", Request::HttpHeaders{});
std::string const responseMessage = "response message"; std::string const responseMessage = "response message";
web::ng::Response response{responseStatus_, responseMessage, request}; web::ng::Response const response{responseStatus_, responseMessage, request};
auto const buffer = response.asConstBuffer(); auto const buffer = response.asConstBuffer();
EXPECT_EQ(buffer.size(), responseMessage.size()); EXPECT_EQ(buffer.size(), responseMessage.size());
@@ -116,7 +115,7 @@ TEST_F(ResponseTest, asConstBufferJson)
{ {
Request const request("some request", Request::HttpHeaders{}); Request const request("some request", Request::HttpHeaders{});
boost::json::object const responseMessage{{"key", "value"}}; boost::json::object const responseMessage{{"key", "value"}};
web::ng::Response response{responseStatus_, responseMessage, request}; web::ng::Response const response{responseStatus_, responseMessage, request};
auto const buffer = response.asConstBuffer(); auto const buffer = response.asConstBuffer();
EXPECT_EQ(buffer.size(), boost::json::serialize(responseMessage).size()); EXPECT_EQ(buffer.size(), boost::json::serialize(responseMessage).size());

View File

@@ -174,9 +174,9 @@ struct ServerTest : SyncAsioContextTest {
TEST_F(ServerTest, BadEndpoint) TEST_F(ServerTest, BadEndpoint)
{ {
boost::asio::ip::tcp::endpoint endpoint{boost::asio::ip::address_v4::from_string("1.2.3.4"), 0}; boost::asio::ip::tcp::endpoint const endpoint{boost::asio::ip::address_v4::from_string("1.2.3.4"), 0};
impl::ConnectionHandler connectionHandler{impl::ConnectionHandler::ProcessingPolicy::Sequential, std::nullopt}; impl::ConnectionHandler connectionHandler{impl::ConnectionHandler::ProcessingPolicy::Sequential, std::nullopt};
util::TagDecoratorFactory tagDecoratorFactory{util::Config{boost::json::value{}}}; util::TagDecoratorFactory const tagDecoratorFactory{util::Config{boost::json::value{}}};
Server server{ctx, endpoint, std::nullopt, std::move(connectionHandler), tagDecoratorFactory}; Server server{ctx, endpoint, std::nullopt, std::move(connectionHandler), tagDecoratorFactory};
auto maybeError = server.run(); auto maybeError = server.run();
ASSERT_TRUE(maybeError.has_value()); ASSERT_TRUE(maybeError.has_value());

View File

@@ -28,13 +28,10 @@
#include "web/ng/Response.hpp" #include "web/ng/Response.hpp"
#include "web/ng/impl/ConnectionHandler.hpp" #include "web/ng/impl/ConnectionHandler.hpp"
#include <boost/asio/bind_cancellation_slot.hpp>
#include <boost/asio/cancellation_signal.hpp>
#include <boost/asio/error.hpp> #include <boost/asio/error.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/asio/steady_timer.hpp> #include <boost/asio/steady_timer.hpp>
#include <boost/beast/core/flat_buffer.hpp> #include <boost/beast/core/flat_buffer.hpp>
#include <boost/beast/http.hpp>
#include <boost/beast/http/error.hpp> #include <boost/beast/http/error.hpp>
#include <boost/beast/http/message.hpp> #include <boost/beast/http/message.hpp>
#include <boost/beast/http/status.hpp> #include <boost/beast/http/status.hpp>
@@ -406,7 +403,7 @@ TEST_F(ConnectionHandlerParallelProcessingTest, Receive_Handle_Send_Loop_TooMany
std::string const responseMessage = "some response"; std::string const responseMessage = "some response";
auto const returnRequest = [&](auto&&, auto&&) { return makeRequest(requestMessage, Request::HttpHeaders{}); }; auto const returnRequest = [&](auto&&, auto&&) { return makeRequest(requestMessage, Request::HttpHeaders{}); };
testing::Sequence sequence; testing::Sequence const sequence;
EXPECT_CALL(*mockConnection_, receive) EXPECT_CALL(*mockConnection_, receive)
.WillOnce(returnRequest) .WillOnce(returnRequest)
.WillOnce(returnRequest) .WillOnce(returnRequest)

View File

@@ -27,7 +27,6 @@
#include "web/ng/Response.hpp" #include "web/ng/Response.hpp"
#include "web/ng/impl/HttpConnection.hpp" #include "web/ng/impl/HttpConnection.hpp"
#include <boost/asio/error.hpp>
#include <boost/asio/ip/tcp.hpp> #include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp> #include <boost/asio/spawn.hpp>
#include <boost/asio/ssl/context.hpp> #include <boost/asio/ssl/context.hpp>

View File

@@ -23,10 +23,7 @@
#include "web/ng/impl/ServerSslContext.hpp" #include "web/ng/impl/ServerSslContext.hpp"
#include <boost/json/object.hpp> #include <boost/json/object.hpp>
#include <boost/json/parse.hpp>
#include <boost/json/value.hpp> #include <boost/json/value.hpp>
#include <fmt/compile.h>
#include <fmt/core.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <test_data/SslCert.hpp> #include <test_data/SslCert.hpp>
@@ -113,7 +110,7 @@ struct MakeServerSslContextFromConfigRealFilesTest : testing::Test {};
TEST_F(MakeServerSslContextFromConfigRealFilesTest, WrongKeyFile) TEST_F(MakeServerSslContextFromConfigRealFilesTest, WrongKeyFile)
{ {
auto const certFile = tests::sslCertFile(); auto const certFile = tests::sslCertFile();
boost::json::object configJson = {{"ssl_cert_file", certFile.path}, {"ssl_key_file", "some_path"}}; boost::json::object const configJson = {{"ssl_cert_file", certFile.path}, {"ssl_key_file", "some_path"}};
util::Config const config{configJson}; util::Config const config{configJson};
auto const expectedServerSslContext = makeServerSslContext(config); auto const expectedServerSslContext = makeServerSslContext(config);
@@ -125,7 +122,7 @@ TEST_F(MakeServerSslContextFromConfigRealFilesTest, BothFilesValid)
{ {
auto const certFile = tests::sslCertFile(); auto const certFile = tests::sslCertFile();
auto const keyFile = tests::sslKeyFile(); auto const keyFile = tests::sslKeyFile();
boost::json::object configJson = {{"ssl_cert_file", certFile.path}, {"ssl_key_file", keyFile.path}}; boost::json::object const configJson = {{"ssl_cert_file", certFile.path}, {"ssl_key_file", keyFile.path}};
util::Config const config{configJson}; util::Config const config{configJson};
auto const expectedServerSslContext = makeServerSslContext(config); auto const expectedServerSslContext = makeServerSslContext(config);

View File

@@ -33,7 +33,6 @@
#include <boost/asio/ssl/context.hpp> #include <boost/asio/ssl/context.hpp>
#include <boost/beast/core/flat_buffer.hpp> #include <boost/beast/core/flat_buffer.hpp>
#include <boost/beast/http/status.hpp> #include <boost/beast/http/status.hpp>
#include <boost/beast/websocket/error.hpp>
#include <boost/json/object.hpp> #include <boost/json/object.hpp>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>