Skip to content

Commit 5c74269

Browse files
wraverywravery
committed
Simplify resolvers and keep default args in static
1 parent 044b7e0 commit 5c74269

23 files changed

+229
-220
lines changed

‎include/graphqlservice/introspection/DirectiveObject.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class Directive
2727
{
2828
virtual ~Concept() = default;
2929

30-
virtual service::FieldResult<std::string> getName(service::FieldParams&& params) const = 0;
31-
virtual service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&& params) const = 0;
32-
virtual service::FieldResult<std::vector<DirectiveLocation>> getLocations(service::FieldParams&& params) const = 0;
33-
virtual service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs(service::FieldParams&& params) const = 0;
30+
virtual service::FieldResult<std::string> getName() const = 0;
31+
virtual service::FieldResult<std::optional<std::string>> getDescription() const = 0;
32+
virtual service::FieldResult<std::vector<DirectiveLocation>> getLocations() const = 0;
33+
virtual service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs() const = 0;
3434
};
3535

3636
template <class T>
@@ -42,22 +42,22 @@ class Directive
4242
{
4343
}
4444

45-
service::FieldResult<std::string> getName(service::FieldParams&&) const final
45+
service::FieldResult<std::string> getName() const final
4646
{
4747
return { _pimpl->getName() };
4848
}
4949

50-
service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&&) const final
50+
service::FieldResult<std::optional<std::string>> getDescription() const final
5151
{
5252
return { _pimpl->getDescription() };
5353
}
5454

55-
service::FieldResult<std::vector<DirectiveLocation>> getLocations(service::FieldParams&&) const final
55+
service::FieldResult<std::vector<DirectiveLocation>> getLocations() const final
5656
{
5757
return { _pimpl->getLocations() };
5858
}
5959

60-
service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs(service::FieldParams&&) const final
60+
service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs() const final
6161
{
6262
return { _pimpl->getArgs() };
6363
}

‎include/graphqlservice/introspection/EnumValueObject.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class EnumValue
2727
{
2828
virtual ~Concept() = default;
2929

30-
virtual service::FieldResult<std::string> getName(service::FieldParams&& params) const = 0;
31-
virtual service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&& params) const = 0;
32-
virtual service::FieldResult<bool> getIsDeprecated(service::FieldParams&& params) const = 0;
33-
virtual service::FieldResult<std::optional<std::string>> getDeprecationReason(service::FieldParams&& params) const = 0;
30+
virtual service::FieldResult<std::string> getName() const = 0;
31+
virtual service::FieldResult<std::optional<std::string>> getDescription() const = 0;
32+
virtual service::FieldResult<bool> getIsDeprecated() const = 0;
33+
virtual service::FieldResult<std::optional<std::string>> getDeprecationReason() const = 0;
3434
};
3535

3636
template <class T>
@@ -42,22 +42,22 @@ class EnumValue
4242
{
4343
}
4444

45-
service::FieldResult<std::string> getName(service::FieldParams&&) const final
45+
service::FieldResult<std::string> getName() const final
4646
{
4747
return { _pimpl->getName() };
4848
}
4949

50-
service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&&) const final
50+
service::FieldResult<std::optional<std::string>> getDescription() const final
5151
{
5252
return { _pimpl->getDescription() };
5353
}
5454

55-
service::FieldResult<bool> getIsDeprecated(service::FieldParams&&) const final
55+
service::FieldResult<bool> getIsDeprecated() const final
5656
{
5757
return { _pimpl->getIsDeprecated() };
5858
}
5959

60-
service::FieldResult<std::optional<std::string>> getDeprecationReason(service::FieldParams&&) const final
60+
service::FieldResult<std::optional<std::string>> getDeprecationReason() const final
6161
{
6262
return { _pimpl->getDeprecationReason() };
6363
}

‎include/graphqlservice/introspection/FieldObject.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ class Field
2929
{
3030
virtual ~Concept() = default;
3131

32-
virtual service::FieldResult<std::string> getName(service::FieldParams&& params) const = 0;
33-
virtual service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&& params) const = 0;
34-
virtual service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs(service::FieldParams&& params) const = 0;
35-
virtual service::FieldResult<std::shared_ptr<Type>> getType(service::FieldParams&& params) const = 0;
36-
virtual service::FieldResult<bool> getIsDeprecated(service::FieldParams&& params) const = 0;
37-
virtual service::FieldResult<std::optional<std::string>> getDeprecationReason(service::FieldParams&& params) const = 0;
32+
virtual service::FieldResult<std::string> getName() const = 0;
33+
virtual service::FieldResult<std::optional<std::string>> getDescription() const = 0;
34+
virtual service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs() const = 0;
35+
virtual service::FieldResult<std::shared_ptr<Type>> getType() const = 0;
36+
virtual service::FieldResult<bool> getIsDeprecated() const = 0;
37+
virtual service::FieldResult<std::optional<std::string>> getDeprecationReason() const = 0;
3838
};
3939

4040
template <class T>
@@ -46,32 +46,32 @@ class Field
4646
{
4747
}
4848

49-
service::FieldResult<std::string> getName(service::FieldParams&&) const final
49+
service::FieldResult<std::string> getName() const final
5050
{
5151
return { _pimpl->getName() };
5252
}
5353

54-
service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&&) const final
54+
service::FieldResult<std::optional<std::string>> getDescription() const final
5555
{
5656
return { _pimpl->getDescription() };
5757
}
5858

59-
service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs(service::FieldParams&&) const final
59+
service::FieldResult<std::vector<std::shared_ptr<InputValue>>> getArgs() const final
6060
{
6161
return { _pimpl->getArgs() };
6262
}
6363

64-
service::FieldResult<std::shared_ptr<Type>> getType(service::FieldParams&&) const final
64+
service::FieldResult<std::shared_ptr<Type>> getType() const final
6565
{
6666
return { _pimpl->getType() };
6767
}
6868

69-
service::FieldResult<bool> getIsDeprecated(service::FieldParams&&) const final
69+
service::FieldResult<bool> getIsDeprecated() const final
7070
{
7171
return { _pimpl->getIsDeprecated() };
7272
}
7373

74-
service::FieldResult<std::optional<std::string>> getDeprecationReason(service::FieldParams&&) const final
74+
service::FieldResult<std::optional<std::string>> getDeprecationReason() const final
7575
{
7676
return { _pimpl->getDeprecationReason() };
7777
}

‎include/graphqlservice/introspection/InputValueObject.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class InputValue
2727
{
2828
virtual ~Concept() = default;
2929

30-
virtual service::FieldResult<std::string> getName(service::FieldParams&& params) const = 0;
31-
virtual service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&& params) const = 0;
32-
virtual service::FieldResult<std::shared_ptr<Type>> getType(service::FieldParams&& params) const = 0;
33-
virtual service::FieldResult<std::optional<std::string>> getDefaultValue(service::FieldParams&& params) const = 0;
30+
virtual service::FieldResult<std::string> getName() const = 0;
31+
virtual service::FieldResult<std::optional<std::string>> getDescription() const = 0;
32+
virtual service::FieldResult<std::shared_ptr<Type>> getType() const = 0;
33+
virtual service::FieldResult<std::optional<std::string>> getDefaultValue() const = 0;
3434
};
3535

3636
template <class T>
@@ -42,22 +42,22 @@ class InputValue
4242
{
4343
}
4444

45-
service::FieldResult<std::string> getName(service::FieldParams&&) const final
45+
service::FieldResult<std::string> getName() const final
4646
{
4747
return { _pimpl->getName() };
4848
}
4949

50-
service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&&) const final
50+
service::FieldResult<std::optional<std::string>> getDescription() const final
5151
{
5252
return { _pimpl->getDescription() };
5353
}
5454

55-
service::FieldResult<std::shared_ptr<Type>> getType(service::FieldParams&&) const final
55+
service::FieldResult<std::shared_ptr<Type>> getType() const final
5656
{
5757
return { _pimpl->getType() };
5858
}
5959

60-
service::FieldResult<std::optional<std::string>> getDefaultValue(service::FieldParams&&) const final
60+
service::FieldResult<std::optional<std::string>> getDefaultValue() const final
6161
{
6262
return { _pimpl->getDefaultValue() };
6363
}

‎include/graphqlservice/introspection/SchemaObject.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ class Schema
2828
{
2929
virtual ~Concept() = default;
3030

31-
virtual service::FieldResult<std::vector<std::shared_ptr<Type>>> getTypes(service::FieldParams&& params) const = 0;
32-
virtual service::FieldResult<std::shared_ptr<Type>> getQueryType(service::FieldParams&& params) const = 0;
33-
virtual service::FieldResult<std::shared_ptr<Type>> getMutationType(service::FieldParams&& params) const = 0;
34-
virtual service::FieldResult<std::shared_ptr<Type>> getSubscriptionType(service::FieldParams&& params) const = 0;
35-
virtual service::FieldResult<std::vector<std::shared_ptr<Directive>>> getDirectives(service::FieldParams&& params) const = 0;
31+
virtual service::FieldResult<std::vector<std::shared_ptr<Type>>> getTypes() const = 0;
32+
virtual service::FieldResult<std::shared_ptr<Type>> getQueryType() const = 0;
33+
virtual service::FieldResult<std::shared_ptr<Type>> getMutationType() const = 0;
34+
virtual service::FieldResult<std::shared_ptr<Type>> getSubscriptionType() const = 0;
35+
virtual service::FieldResult<std::vector<std::shared_ptr<Directive>>> getDirectives() const = 0;
3636
};
3737

3838
template <class T>
@@ -44,27 +44,27 @@ class Schema
4444
{
4545
}
4646

47-
service::FieldResult<std::vector<std::shared_ptr<Type>>> getTypes(service::FieldParams&&) const final
47+
service::FieldResult<std::vector<std::shared_ptr<Type>>> getTypes() const final
4848
{
4949
return { _pimpl->getTypes() };
5050
}
5151

52-
service::FieldResult<std::shared_ptr<Type>> getQueryType(service::FieldParams&&) const final
52+
service::FieldResult<std::shared_ptr<Type>> getQueryType() const final
5353
{
5454
return { _pimpl->getQueryType() };
5555
}
5656

57-
service::FieldResult<std::shared_ptr<Type>> getMutationType(service::FieldParams&&) const final
57+
service::FieldResult<std::shared_ptr<Type>> getMutationType() const final
5858
{
5959
return { _pimpl->getMutationType() };
6060
}
6161

62-
service::FieldResult<std::shared_ptr<Type>> getSubscriptionType(service::FieldParams&&) const final
62+
service::FieldResult<std::shared_ptr<Type>> getSubscriptionType() const final
6363
{
6464
return { _pimpl->getSubscriptionType() };
6565
}
6666

67-
service::FieldResult<std::vector<std::shared_ptr<Directive>>> getDirectives(service::FieldParams&&) const final
67+
service::FieldResult<std::vector<std::shared_ptr<Directive>>> getDirectives() const final
6868
{
6969
return { _pimpl->getDirectives() };
7070
}

‎include/graphqlservice/introspection/TypeObject.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class Type
3232
{
3333
virtual ~Concept() = default;
3434

35-
virtual service::FieldResult<TypeKind> getKind(service::FieldParams&& params) const = 0;
36-
virtual service::FieldResult<std::optional<std::string>> getName(service::FieldParams&& params) const = 0;
37-
virtual service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&& params) const = 0;
38-
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<Field>>>> getFields(service::FieldParams&& params, std::optional<bool>&& includeDeprecatedArg) const = 0;
39-
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getInterfaces(service::FieldParams&& params) const = 0;
40-
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getPossibleTypes(service::FieldParams&& params) const = 0;
41-
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<EnumValue>>>> getEnumValues(service::FieldParams&& params, std::optional<bool>&& includeDeprecatedArg) const = 0;
42-
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<InputValue>>>> getInputFields(service::FieldParams&& params) const = 0;
43-
virtual service::FieldResult<std::shared_ptr<Type>> getOfType(service::FieldParams&& params) const = 0;
35+
virtual service::FieldResult<TypeKind> getKind() const = 0;
36+
virtual service::FieldResult<std::optional<std::string>> getName() const = 0;
37+
virtual service::FieldResult<std::optional<std::string>> getDescription() const = 0;
38+
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<Field>>>> getFields(std::optional<bool>&& includeDeprecatedArg) const = 0;
39+
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getInterfaces() const = 0;
40+
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getPossibleTypes() const = 0;
41+
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<EnumValue>>>> getEnumValues(std::optional<bool>&& includeDeprecatedArg) const = 0;
42+
virtual service::FieldResult<std::optional<std::vector<std::shared_ptr<InputValue>>>> getInputFields() const = 0;
43+
virtual service::FieldResult<std::shared_ptr<Type>> getOfType() const = 0;
4444
};
4545

4646
template <class T>
@@ -52,47 +52,47 @@ class Type
5252
{
5353
}
5454

55-
service::FieldResult<TypeKind> getKind(service::FieldParams&&) const final
55+
service::FieldResult<TypeKind> getKind() const final
5656
{
5757
return { _pimpl->getKind() };
5858
}
5959

60-
service::FieldResult<std::optional<std::string>> getName(service::FieldParams&&) const final
60+
service::FieldResult<std::optional<std::string>> getName() const final
6161
{
6262
return { _pimpl->getName() };
6363
}
6464

65-
service::FieldResult<std::optional<std::string>> getDescription(service::FieldParams&&) const final
65+
service::FieldResult<std::optional<std::string>> getDescription() const final
6666
{
6767
return { _pimpl->getDescription() };
6868
}
6969

70-
service::FieldResult<std::optional<std::vector<std::shared_ptr<Field>>>> getFields(service::FieldParams&&, std::optional<bool>&& includeDeprecatedArg) const final
70+
service::FieldResult<std::optional<std::vector<std::shared_ptr<Field>>>> getFields(std::optional<bool>&& includeDeprecatedArg) const final
7171
{
7272
return { _pimpl->getFields(std::move(includeDeprecatedArg)) };
7373
}
7474

75-
service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getInterfaces(service::FieldParams&&) const final
75+
service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getInterfaces() const final
7676
{
7777
return { _pimpl->getInterfaces() };
7878
}
7979

80-
service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getPossibleTypes(service::FieldParams&&) const final
80+
service::FieldResult<std::optional<std::vector<std::shared_ptr<Type>>>> getPossibleTypes() const final
8181
{
8282
return { _pimpl->getPossibleTypes() };
8383
}
8484

85-
service::FieldResult<std::optional<std::vector<std::shared_ptr<EnumValue>>>> getEnumValues(service::FieldParams&&, std::optional<bool>&& includeDeprecatedArg) const final
85+
service::FieldResult<std::optional<std::vector<std::shared_ptr<EnumValue>>>> getEnumValues(std::optional<bool>&& includeDeprecatedArg) const final
8686
{
8787
return { _pimpl->getEnumValues(std::move(includeDeprecatedArg)) };
8888
}
8989

90-
service::FieldResult<std::optional<std::vector<std::shared_ptr<InputValue>>>> getInputFields(service::FieldParams&&) const final
90+
service::FieldResult<std::optional<std::vector<std::shared_ptr<InputValue>>>> getInputFields() const final
9191
{
9292
return { _pimpl->getInputFields() };
9393
}
9494

95-
service::FieldResult<std::shared_ptr<Type>> getOfType(service::FieldParams&&) const final
95+
service::FieldResult<std::shared_ptr<Type>> getOfType() const final
9696
{
9797
return { _pimpl->getOfType() };
9898
}

‎samples/today/nointrospection/QueryObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ service::AwaitableResolver Query::resolveUnreadCounts(service::ResolverParams&&
127127

128128
service::AwaitableResolver Query::resolveAppointmentsById(service::ResolverParams&& params) const
129129
{
130-
const auto defaultArguments = []()
130+
static const auto defaultArguments = []()
131131
{
132132
response::Value values(response::Type::Map);
133133
response::Value entry;

‎samples/today/schema/QueryObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ service::AwaitableResolver Query::resolveUnreadCounts(service::ResolverParams&&
131131

132132
service::AwaitableResolver Query::resolveAppointmentsById(service::ResolverParams&& params) const
133133
{
134-
const auto defaultArguments = []()
134+
static const auto defaultArguments = []()
135135
{
136136
response::Value values(response::Type::Map);
137137
response::Value entry;

‎samples/validation/schema/ArgumentsObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ service::AwaitableResolver Arguments::resolveBooleanListArgField(service::Resolv
138138

139139
service::AwaitableResolver Arguments::resolveOptionalNonNullBooleanArgField(service::ResolverParams&& params) const
140140
{
141-
const auto defaultArguments = []()
141+
static const auto defaultArguments = []()
142142
{
143143
response::Value values(response::Type::Map);
144144
response::Value entry;

0 commit comments

Comments
 (0)