Skip to content

Commit 8986d53

Browse files
committed
Fixes
1 parent aee757f commit 8986d53

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

universal/include/userver/formats/universal/common_containers.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ template <>
9797
struct Default<std::string, void> : public impl::EmptyCheck, private impl::Param<std::string_view> {
9898
inline constexpr Default(std::string_view value) :
9999
impl::Param<std::string_view>(value) {}
100+
template <std::size_t N>
101+
inline constexpr Default(const char(&value)[N]) :
102+
impl::Param<std::string_view>(value) {}
100103
inline constexpr auto value() const -> std::string {
101104
return static_cast<std::string>(static_cast<const impl::Param<std::string_view>&>(*this).value);
102105
}

universal/include/userver/formats/universal/universal.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ inline constexpr std::optional<std::string> Add(Arg&& arg, Args&&... args) {
7979
template <typename T, typename TT>
8080
inline constexpr auto checkCaller(T&& response, TT&& check)
8181
requires (requires{FieldConfig<std::remove_cvref_t<T>>::Checker(check, response);}
82-
? true : requires{check.Check(std::forward<T>(response));}) {
82+
|| requires{check.Check(std::forward<T>(response));}) {
8383
using Type = FieldConfig<std::remove_cvref_t<T>>;
8484
if constexpr(requires{Type::Checker(check, response);}) {
8585
return Type::Checker(std::forward<TT>(check), response);

universal/src/formats/json/universal_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ template <>
5252
inline constexpr auto formats::universal::kSerialization<SomeStruct2> =
5353
SerializationConfig<SomeStruct2>()
5454
.With<"field1">({.Default = 114})
55-
.With<"field4">({.Default = {{"42"}}});
55+
.With<"field4">({.Default = "42"});
5656

5757

5858
TEST(Serialize, Optional) {
5959
SomeStruct2 a{.field2 = 100};
6060
const auto json = formats::json::ValueBuilder(a).ExtractValue();
61-
EXPECT_EQ(json, userver::formats::json::FromString(R"({"field1":114,"field2":100,"field4":"42"})"));
61+
EXPECT_EQ(json, formats::json::FromString(R"({"field1":114,"field2":100,"field4":"42"})"));
6262
};
6363
TEST(Parse, Optional) {
6464
SomeStruct2 valid{.field1 = 114, .field4 = {{"42"}}};

0 commit comments

Comments
 (0)