Make testTaskStatus non-nullable so test default enum init

wravery · wravery · commit 634e01fbe740 · 2021-05-26T23:37:49.000-07:00
diff --git a/samples/client/QueryClient.cpp b/samples/client/QueryClient.cpp
@@ -453,7 +453,7 @@ Response parseResponse(response::Value&& response)
 			}
 			if (member.first == R"js(testTaskState)js"sv)
 			{
-				result.testTaskState = ModifiedResponse<TaskState>::parse<TypeModifier::Nullable>(std::move(member.second));
+				result.testTaskState = ModifiedResponse<TaskState>::parse(std::move(member.second));
 				continue;
 			}
 			if (member.first == R"js(anyType)js"sv)
diff --git a/samples/client/QueryClient.h b/samples/client/QueryClient.h
@@ -169,7 +169,7 @@ struct Response
 
 	unreadCounts_FolderConnection unreadCounts {};
 
-	std::optional<TaskState> testTaskState {};
+	TaskState testTaskState {};
 	struct anyType_UnionType
 	{
 		response::StringType _typename {};
diff --git a/samples/schema.today.graphql b/samples/schema.today.graphql
@@ -33,7 +33,7 @@ type Query {
 
     expensive: [Expensive!]!
 
-    testTaskState: TaskState
+    testTaskState: TaskState!
 
     anyType(ids: [ID!]!): [UnionType]!
 }
diff --git a/samples/separate/QueryObject.cpp b/samples/separate/QueryObject.cpp
@@ -230,7 +230,7 @@ std::future<service::ResolverResult> Query::resolveExpensive(service::ResolverPa
 	return service::ModifiedResult<Expensive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));
 }
 
-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(service::FieldParams&&) const
+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&&) const
 {
 	throw std::runtime_error(R"ex(Query::getTestTaskState is not implemented)ex");
 }
@@ -242,7 +242,7 @@ std::future<service::ResolverResult> Query::resolveTestTaskState(service::Resolv
 	auto result = getTestTaskState(service::FieldParams(std::move(params), std::move(directives)));
 	resolverLock.unlock();
 
-	return service::ModifiedResult<TaskState>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
+	return service::ModifiedResult<TaskState>::convert(std::move(result), std::move(params));
 }
 
 service::FieldResult<std::vector<std::shared_ptr<service::Object>>> Query::getAnyType(service::FieldParams&&, std::vector<response::IdType>&&) const
@@ -318,7 +318,7 @@ void AddQueryDetails(std::shared_ptr<schema::ObjectType> typeQuery, const std::s
 		schema::Field::Make(R"gql(nested)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("NestedType"))),
 		schema::Field::Make(R"gql(unimplemented)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("String"))),
 		schema::Field::Make(R"gql(expensive)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Expensive"))))),
-		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType("TaskState")),
+		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("TaskState"))),
 		schema::Field::Make(R"gql(anyType)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType("UnionType"))), {
 			schema::InputValue::Make(R"gql(ids)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("ID")))), R"gql()gql"sv)
 		})
diff --git a/samples/separate/QueryObject.h b/samples/separate/QueryObject.h
@@ -29,7 +29,7 @@ class Query
 	virtual service::FieldResult<std::shared_ptr<NestedType>> getNested(service::FieldParams&& params) const;
 	virtual service::FieldResult<response::StringType> getUnimplemented(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<Expensive>>> getExpensive(service::FieldParams&& params) const;
-	virtual service::FieldResult<std::optional<TaskState>> getTestTaskState(service::FieldParams&& params) const;
+	virtual service::FieldResult<TaskState> getTestTaskState(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<service::Object>>> getAnyType(service::FieldParams&& params, std::vector<response::IdType>&& idsArg) const;
 
 private:
diff --git a/samples/separate_nointrospection/QueryObject.cpp b/samples/separate_nointrospection/QueryObject.cpp
@@ -227,7 +227,7 @@ std::future<service::ResolverResult> Query::resolveExpensive(service::ResolverPa
 	return service::ModifiedResult<Expensive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));
 }
 
-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(service::FieldParams&&) const
+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&&) const
 {
 	throw std::runtime_error(R"ex(Query::getTestTaskState is not implemented)ex");
 }
@@ -239,7 +239,7 @@ std::future<service::ResolverResult> Query::resolveTestTaskState(service::Resolv
 	auto result = getTestTaskState(service::FieldParams(std::move(params), std::move(directives)));
 	resolverLock.unlock();
 
-	return service::ModifiedResult<TaskState>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
+	return service::ModifiedResult<TaskState>::convert(std::move(result), std::move(params));
 }
 
 service::FieldResult<std::vector<std::shared_ptr<service::Object>>> Query::getAnyType(service::FieldParams&&, std::vector<response::IdType>&&) const
@@ -301,7 +301,7 @@ void AddQueryDetails(std::shared_ptr<schema::ObjectType> typeQuery, const std::s
 		schema::Field::Make(R"gql(nested)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("NestedType"))),
 		schema::Field::Make(R"gql(unimplemented)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("String"))),
 		schema::Field::Make(R"gql(expensive)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Expensive"))))),
-		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType("TaskState")),
+		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("TaskState"))),
 		schema::Field::Make(R"gql(anyType)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType("UnionType"))), {
 			schema::InputValue::Make(R"gql(ids)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("ID")))), R"gql()gql"sv)
 		})
diff --git a/samples/separate_nointrospection/QueryObject.h b/samples/separate_nointrospection/QueryObject.h
@@ -29,7 +29,7 @@ class Query
 	virtual service::FieldResult<std::shared_ptr<NestedType>> getNested(service::FieldParams&& params) const;
 	virtual service::FieldResult<response::StringType> getUnimplemented(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<Expensive>>> getExpensive(service::FieldParams&& params) const;
-	virtual service::FieldResult<std::optional<TaskState>> getTestTaskState(service::FieldParams&& params) const;
+	virtual service::FieldResult<TaskState> getTestTaskState(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<service::Object>>> getAnyType(service::FieldParams&& params, std::vector<response::IdType>&& idsArg) const;
 
 private:
diff --git a/samples/today/TodayMock.cpp b/samples/today/TodayMock.cpp
@@ -424,8 +424,7 @@ service::FieldResult<std::vector<std::shared_ptr<object::Expensive>>> Query::get
 	return result;
 }
 
-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(
-	service::FieldParams&& /*params*/) const
+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&& /*params*/) const
 {
 	return TaskState::Unassigned;
 }
diff --git a/samples/today/TodayMock.h b/samples/today/TodayMock.h
@@ -74,8 +74,7 @@ class Query : public object::Query
 		service::FieldParams&& params) const final;
 	service::FieldResult<std::vector<std::shared_ptr<object::Expensive>>> getExpensive(
 		service::FieldParams&& params) const final;
-	service::FieldResult<std::optional<TaskState>> getTestTaskState(
-		service::FieldParams&& params) const final;
+	service::FieldResult<TaskState> getTestTaskState(service::FieldParams&& params) const final;
 	service::FieldResult<std::vector<std::shared_ptr<service::Object>>> getAnyType(
 		service::FieldParams&& params, std::vector<response::IdType>&& idsArg) const final;
 
diff --git a/samples/unified/TodaySchema.cpp b/samples/unified/TodaySchema.cpp
@@ -353,7 +353,7 @@ std::future<service::ResolverResult> Query::resolveExpensive(service::ResolverPa
 	return service::ModifiedResult<Expensive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));
 }
 
-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(service::FieldParams&&) const
+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&&) const
 {
 	throw std::runtime_error(R"ex(Query::getTestTaskState is not implemented)ex");
 }
@@ -365,7 +365,7 @@ std::future<service::ResolverResult> Query::resolveTestTaskState(service::Resolv
 	auto result = getTestTaskState(service::FieldParams(std::move(params), std::move(directives)));
 	resolverLock.unlock();
 
-	return service::ModifiedResult<TaskState>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
+	return service::ModifiedResult<TaskState>::convert(std::move(result), std::move(params));
 }
 
 service::FieldResult<std::vector<std::shared_ptr<service::Object>>> Query::getAnyType(service::FieldParams&&, std::vector<response::IdType>&&) const
@@ -1306,7 +1306,7 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 		schema::Field::Make(R"gql(nested)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("NestedType"))),
 		schema::Field::Make(R"gql(unimplemented)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("String"))),
 		schema::Field::Make(R"gql(expensive)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Expensive"))))),
-		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType("TaskState")),
+		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("TaskState"))),
 		schema::Field::Make(R"gql(anyType)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType("UnionType"))), {
 			schema::InputValue::Make(R"gql(ids)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("ID")))), R"gql()gql"sv)
 		})
diff --git a/samples/unified/TodaySchema.h b/samples/unified/TodaySchema.h
@@ -106,7 +106,7 @@ class Query
 	virtual service::FieldResult<std::shared_ptr<NestedType>> getNested(service::FieldParams&& params) const;
 	virtual service::FieldResult<response::StringType> getUnimplemented(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<Expensive>>> getExpensive(service::FieldParams&& params) const;
-	virtual service::FieldResult<std::optional<TaskState>> getTestTaskState(service::FieldParams&& params) const;
+	virtual service::FieldResult<TaskState> getTestTaskState(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<service::Object>>> getAnyType(service::FieldParams&& params, std::vector<response::IdType>&& idsArg) const;
 
 private:
diff --git a/samples/unified_nointrospection/TodaySchema.cpp b/samples/unified_nointrospection/TodaySchema.cpp
@@ -350,7 +350,7 @@ std::future<service::ResolverResult> Query::resolveExpensive(service::ResolverPa
 	return service::ModifiedResult<Expensive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));
 }
 
-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(service::FieldParams&&) const
+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&&) const
 {
 	throw std::runtime_error(R"ex(Query::getTestTaskState is not implemented)ex");
 }
@@ -362,7 +362,7 @@ std::future<service::ResolverResult> Query::resolveTestTaskState(service::Resolv
 	auto result = getTestTaskState(service::FieldParams(std::move(params), std::move(directives)));
 	resolverLock.unlock();
 
-	return service::ModifiedResult<TaskState>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
+	return service::ModifiedResult<TaskState>::convert(std::move(result), std::move(params));
 }
 
 service::FieldResult<std::vector<std::shared_ptr<service::Object>>> Query::getAnyType(service::FieldParams&&, std::vector<response::IdType>&&) const
@@ -1289,7 +1289,7 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 		schema::Field::Make(R"gql(nested)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("NestedType"))),
 		schema::Field::Make(R"gql(unimplemented)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("String"))),
 		schema::Field::Make(R"gql(expensive)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Expensive"))))),
-		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType("TaskState")),
+		schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("TaskState"))),
 		schema::Field::Make(R"gql(anyType)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType("UnionType"))), {
 			schema::InputValue::Make(R"gql(ids)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("ID")))), R"gql()gql"sv)
 		})
diff --git a/samples/unified_nointrospection/TodaySchema.h b/samples/unified_nointrospection/TodaySchema.h
@@ -106,7 +106,7 @@ class Query
 	virtual service::FieldResult<std::shared_ptr<NestedType>> getNested(service::FieldParams&& params) const;
 	virtual service::FieldResult<response::StringType> getUnimplemented(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<Expensive>>> getExpensive(service::FieldParams&& params) const;
-	virtual service::FieldResult<std::optional<TaskState>> getTestTaskState(service::FieldParams&& params) const;
+	virtual service::FieldResult<TaskState> getTestTaskState(service::FieldParams&& params) const;
 	virtual service::FieldResult<std::vector<std::shared_ptr<service::Object>>> getAnyType(service::FieldParams&& params, std::vector<response::IdType>&& idsArg) const;
 
 private:
diff --git a/test/ClientTests.cpp b/test/ClientTests.cpp
@@ -171,8 +171,7 @@ TEST_F(ClientCase, QueryEverything)
 		EXPECT_EQ(3, unreadCountNode->unreadCount) << "unreadCount should match";
 		EXPECT_EQ("Folder", unreadCountNode->_typename) << "__typename should match";
 
-		ASSERT_TRUE(response.testTaskState.has_value()) << "testTaskState should be set";
-		EXPECT_EQ(client::query::Query::TaskState::Unassigned, *response.testTaskState)
+		EXPECT_EQ(client::query::Query::TaskState::Unassigned, response.testTaskState)
 			<< "testTaskState should match";
 
 		ASSERT_EQ(1, response.anyType.size()) << "anyType should have 1 entry";

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ Response parseResponse(response::Value&& response)`
`453`	`453`	`}`
`454`	`454`	`if (member.first == R"js(testTaskState)js"sv)`
`455`	`455`	`{`
`456`		`- result.testTaskState = ModifiedResponse<TaskState>::parse<TypeModifier::Nullable>(std::move(member.second));`
	`456`	`+ result.testTaskState = ModifiedResponse<TaskState>::parse(std::move(member.second));`
`457`	`457`	`continue;`
`458`	`458`	`}`
`459`	`459`	`if (member.first == R"js(anyType)js"sv)`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ struct Response`
`169`	`169`
`170`	`170`	`unreadCounts_FolderConnection unreadCounts {};`
`171`	`171`
`172`		`- std::optional<TaskState> testTaskState {};`
	`172`	`+ TaskState testTaskState {};`
`173`	`173`	`struct anyType_UnionType`
`174`	`174`	`{`
`175`	`175`	`response::StringType _typename {};`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type Query {`
`33`	`33`
`34`	`34`	`expensive: [Expensive!]!`
`35`	`35`
`36`		`- testTaskState: TaskState`
	`36`	`+ testTaskState: TaskState!`
`37`	`37`
`38`	`38`	`anyType(ids: [ID!]!): [UnionType]!`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ std::future<service::ResolverResult> Query::resolveExpensive(service::ResolverPa`
`230`	`230`	`return service::ModifiedResult<Expensive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));`
`231`	`231`	`}`
`232`	`232`
`233`		`-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(service::FieldParams&&) const`
	`233`	`+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&&) const`
`234`	`234`	`{`
`235`	`235`	`throw std::runtime_error(R"ex(Query::getTestTaskState is not implemented)ex");`
`236`	`236`	`}`
`@@ -242,7 +242,7 @@ std::future<service::ResolverResult> Query::resolveTestTaskState(service::Resolv`
`242`	`242`	`auto result = getTestTaskState(service::FieldParams(std::move(params), std::move(directives)));`
`243`	`243`	`resolverLock.unlock();`
`244`	`244`
`245`		`- return service::ModifiedResult<TaskState>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));`
	`245`	`+ return service::ModifiedResult<TaskState>::convert(std::move(result), std::move(params));`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`service::FieldResult<std::vector<std::shared_ptr<service::Object>>> Query::getAnyType(service::FieldParams&&, std::vector<response::IdType>&&) const`
`@@ -318,7 +318,7 @@ void AddQueryDetails(std::shared_ptr<schema::ObjectType> typeQuery, const std::s`
`318`	`318`	`schema::Field::Make(R"gql(nested)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("NestedType"))),`
`319`	`319`	`schema::Field::Make(R"gql(unimplemented)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("String"))),`
`320`	`320`	`schema::Field::Make(R"gql(expensive)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Expensive"))))),`
`321`		`- schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType("TaskState")),`
	`321`	`+ schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("TaskState"))),`
`322`	`322`	`schema::Field::Make(R"gql(anyType)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType("UnionType"))), {`
`323`	`323`	`schema::InputValue::Make(R"gql(ids)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("ID")))), R"gql()gql"sv)`
`324`	`324`	`})`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ std::future<service::ResolverResult> Query::resolveExpensive(service::ResolverPa`
`227`	`227`	`return service::ModifiedResult<Expensive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));`
`228`	`228`	`}`
`229`	`229`
`230`		`-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(service::FieldParams&&) const`
	`230`	`+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&&) const`
`231`	`231`	`{`
`232`	`232`	`throw std::runtime_error(R"ex(Query::getTestTaskState is not implemented)ex");`
`233`	`233`	`}`
`@@ -239,7 +239,7 @@ std::future<service::ResolverResult> Query::resolveTestTaskState(service::Resolv`
`239`	`239`	`auto result = getTestTaskState(service::FieldParams(std::move(params), std::move(directives)));`
`240`	`240`	`resolverLock.unlock();`
`241`	`241`
`242`		`- return service::ModifiedResult<TaskState>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));`
	`242`	`+ return service::ModifiedResult<TaskState>::convert(std::move(result), std::move(params));`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`service::FieldResult<std::vector<std::shared_ptr<service::Object>>> Query::getAnyType(service::FieldParams&&, std::vector<response::IdType>&&) const`
`@@ -301,7 +301,7 @@ void AddQueryDetails(std::shared_ptr<schema::ObjectType> typeQuery, const std::s`
`301`	`301`	`schema::Field::Make(R"gql(nested)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("NestedType"))),`
`302`	`302`	`schema::Field::Make(R"gql(unimplemented)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("String"))),`
`303`	`303`	`schema::Field::Make(R"gql(expensive)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Expensive"))))),`
`304`		`- schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType("TaskState")),`
	`304`	`+ schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("TaskState"))),`
`305`	`305`	`schema::Field::Make(R"gql(anyType)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType("UnionType"))), {`
`306`	`306`	`schema::InputValue::Make(R"gql(ids)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("ID")))), R"gql()gql"sv)`
`307`	`307`	`})`
Original file line number	Diff line number	Diff line change
`@@ -424,8 +424,7 @@ service::FieldResult<std::vector<std::shared_ptr<object::Expensive>>> Query::get`
`424`	`424`	`return result;`
`425`	`425`	`}`
`426`	`426`
`427`		`-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(`
`428`		`- service::FieldParams&& /params/) const`
	`427`	`+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&& /params/) const`
`429`	`428`	`{`
`430`	`429`	`return TaskState::Unassigned;`
`431`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ std::future<service::ResolverResult> Query::resolveExpensive(service::ResolverPa`
`353`	`353`	`return service::ModifiedResult<Expensive>::convert<service::TypeModifier::List>(std::move(result), std::move(params));`
`354`	`354`	`}`
`355`	`355`
`356`		`-service::FieldResult<std::optional<TaskState>> Query::getTestTaskState(service::FieldParams&&) const`
	`356`	`+service::FieldResult<TaskState> Query::getTestTaskState(service::FieldParams&&) const`
`357`	`357`	`{`
`358`	`358`	`throw std::runtime_error(R"ex(Query::getTestTaskState is not implemented)ex");`
`359`	`359`	`}`
`@@ -365,7 +365,7 @@ std::future<service::ResolverResult> Query::resolveTestTaskState(service::Resolv`
`365`	`365`	`auto result = getTestTaskState(service::FieldParams(std::move(params), std::move(directives)));`
`366`	`366`	`resolverLock.unlock();`
`367`	`367`
`368`		`- return service::ModifiedResult<TaskState>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));`
	`368`	`+ return service::ModifiedResult<TaskState>::convert(std::move(result), std::move(params));`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`service::FieldResult<std::vector<std::shared_ptr<service::Object>>> Query::getAnyType(service::FieldParams&&, std::vector<response::IdType>&&) const`
`@@ -1306,7 +1306,7 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)`
`1306`	`1306`	`schema::Field::Make(R"gql(nested)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("NestedType"))),`
`1307`	`1307`	`schema::Field::Make(R"gql(unimplemented)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("String"))),`
`1308`	`1308`	`schema::Field::Make(R"gql(expensive)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Expensive"))))),`
`1309`		`- schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType("TaskState")),`
	`1309`	`+ schema::Field::Make(R"gql(testTaskState)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("TaskState"))),`
`1310`	`1310`	`schema::Field::Make(R"gql(anyType)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType("UnionType"))), {`
`1311`	`1311`	`schema::InputValue::Make(R"gql(ids)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("ID")))), R"gql()gql"sv)`
`1312`	`1312`	`})`