Fix shared_ptr<RequestState> handling

Author: wravery

GraphQLService.cpp

@@ -347,7 +347,7 @@ Object::Object(TypeNames&& typeNames, ResolverMap&& resolvers)
 {
 }
 
-std::future<response::Value> Object::resolve(const std::shared_ptr<RequestState>& state, const peg::ast_node& selection, const FragmentMap& fragments, const response::Value& variables) const
+std::future<response::Value> Object::resolve(std::shared_ptr<RequestState> state, const peg::ast_node& selection, const FragmentMap& fragments, const response::Value& variables) const
 {
 	std::queue<std::future<response::Value>> selections;
 
@@ -389,11 +389,11 @@ std::future<response::Value> Object::resolve(const std::shared_ptr<RequestState>
 	}, std::move(selections));
 }
 
-void Object::beginSelectionSet(const std::shared_ptr<RequestState>&) const
+void Object::beginSelectionSet(std::shared_ptr<RequestState>) const
 {
 }
 
-void Object::endSelectionSet(const std::shared_ptr<RequestState>&) const
+void Object::endSelectionSet(std::shared_ptr<RequestState>) const
 {
 }
 
@@ -424,7 +424,7 @@ std::future<response::Value> Request::resolve(std::shared_ptr<RequestState> stat
 	return operationVisitor.getValue();
 }
 
-SelectionVisitor::SelectionVisitor(const std::shared_ptr<RequestState>& state, const FragmentMap& fragments, const response::Value& variables, const TypeNames& typeNames, const ResolverMap& resolvers)
+SelectionVisitor::SelectionVisitor(std::shared_ptr<RequestState> state, const FragmentMap& fragments, const response::Value& variables, const TypeNames& typeNames, const ResolverMap& resolvers)
 	: _state(state)
 	, _fragments(fragments)
 	, _variables(variables)
@@ -879,7 +879,7 @@ void FragmentDefinitionVisitor::visit(const peg::ast_node& fragmentDefinition)
 	_fragments.insert({ fragmentDefinition.children.front()->content(), Fragment(fragmentDefinition) });
 }
 
-OperationDefinitionVisitor::OperationDefinitionVisitor(const std::shared_ptr<RequestState>& state, const TypeMap& operations, const std::string& operationName, const response::Value& variables, const FragmentMap& fragments)
+OperationDefinitionVisitor::OperationDefinitionVisitor(std::shared_ptr<RequestState> state, const TypeMap& operations, const std::string& operationName, const response::Value& variables, const FragmentMap& fragments)
 	: _state(state)
 	, _operations(operations)
 	, _operationName(operationName)
@@ -999,10 +999,8 @@ void OperationDefinitionVisitor::visit(const peg::ast_node& operationDefinition)
 			throw schema_exception({ error.str() });
 		}
 
-		auto operationObject = itr->second;
-
 		_result = std::async(std::launch::deferred,
-			[this, &operationDefinition, operationObject]()
+			[this, &operationDefinition](std::shared_ptr<RequestState> state, std::shared_ptr<Object> operationObject)
 		{
 			response::Value operationVariables(response::Type::Map);
 
@@ -1045,12 +1043,12 @@ void OperationDefinitionVisitor::visit(const peg::ast_node& operationDefinition)
 			});
 
 			response::Value document(response::Type::Map);
-			auto data = operationObject->resolve(_state, *operationDefinition.children.back(), _fragments, operationVariables);
+			auto data = operationObject->resolve(state, *operationDefinition.children.back(), _fragments, operationVariables);
 
 			document.emplace_back("data", data.get());
 
 			return document;
-		});
+		}, _state, itr->second);
 	}
 	catch (const schema_exception& ex)
 	{

Introspection.cpp

@@ -1462,7 +1462,7 @@ std::string Generator::getFieldDeclaration(const OutputField& outputField) const
 
 	fieldName[0] = std::toupper(fieldName[0]);
 	output << R"cpp(	virtual std::future<)cpp" << getOutputCppType(outputField)
-		<< R"cpp(> get)cpp" << fieldName << R"cpp((const std::shared_ptr<service::RequestState>& state)cpp";
+		<< R"cpp(> get)cpp" << fieldName << R"cpp((std::shared_ptr<service::RequestState> state)cpp";
 
 	for (const auto& argument : outputField.arguments)
 	{

SchemaGenerator.cpp

@@ -48,7 +48,7 @@ void Query::loadAppointments() const
 	}
 }
 
-std::shared_ptr<Appointment> Query::findAppointment(const std::shared_ptr<service::RequestState>& state, const std::vector<uint8_t>& id) const
+std::shared_ptr<Appointment> Query::findAppointment(std::shared_ptr<service::RequestState> state, const std::vector<uint8_t>& id) const
 {
 	loadAppointments();
 
@@ -74,7 +74,7 @@ void Query::loadTasks() const
 	}
 }
 
-std::shared_ptr<Task> Query::findTask(const std::shared_ptr<service::RequestState>& state, const std::vector<uint8_t>& id) const
+std::shared_ptr<Task> Query::findTask(std::shared_ptr<service::RequestState> state, const std::vector<uint8_t>& id) const
 {
 	loadTasks();
 
@@ -100,7 +100,7 @@ void Query::loadUnreadCounts() const
 	}
 }
 
-std::shared_ptr<Folder> Query::findUnreadCount(const std::shared_ptr<service::RequestState>& state, const std::vector<uint8_t>& id) const
+std::shared_ptr<Folder> Query::findUnreadCount(std::shared_ptr<service::RequestState> state, const std::vector<uint8_t>& id) const
 {
 	loadUnreadCounts();
 
@@ -117,7 +117,7 @@ std::shared_ptr<Folder> Query::findUnreadCount(const std::shared_ptr<service::Re
 	return nullptr;
 }
 
-std::future<std::shared_ptr<service::Object>> Query::getNode(const std::shared_ptr<service::RequestState>& state, std::vector<uint8_t>&& id) const
+std::future<std::shared_ptr<service::Object>> Query::getNode(std::shared_ptr<service::RequestState> state, std::vector<uint8_t>&& id) const
 {
 	std::promise<std::shared_ptr<service::Object>> promise;
 	auto appointment = findAppointment(state, id);
@@ -154,7 +154,7 @@ struct EdgeConstraints
 	using vec_type = std::vector<std::shared_ptr<_Object>>;
 	using itr_type = typename vec_type::const_iterator;
 
-	EdgeConstraints(const std::shared_ptr<service::RequestState>& state, const vec_type& objects)
+	EdgeConstraints(std::shared_ptr<service::RequestState> state, const vec_type& objects)
 		: _state(state)
 		, _objects(objects)
 	{
@@ -242,58 +242,58 @@ struct EdgeConstraints
 	const vec_type& _objects;
 };
 
-std::future<std::shared_ptr<object::AppointmentConnection>> Query::getAppointments(const std::shared_ptr<service::RequestState>& state, std::unique_ptr<int>&& first, std::unique_ptr<response::Value>&& after, std::unique_ptr<int>&& last, std::unique_ptr<response::Value>&& before) const
+std::future<std::shared_ptr<object::AppointmentConnection>> Query::getAppointments(std::shared_ptr<service::RequestState> state, std::unique_ptr<int>&& first, std::unique_ptr<response::Value>&& after, std::unique_ptr<int>&& last, std::unique_ptr<response::Value>&& before) const
 {
 	auto spThis = shared_from_this();
 	return std::async(std::launch::async,
-		[this, spThis](const std::shared_ptr<service::RequestState>& requestIdWrapped, std::unique_ptr<int>&& firstWrapped, std::unique_ptr<response::Value>&& afterWrapped, std::unique_ptr<int>&& lastWrapped, std::unique_ptr<response::Value>&& beforeWrapped)
+		[this, spThis](std::shared_ptr<service::RequestState> stateWrapped, std::unique_ptr<int>&& firstWrapped, std::unique_ptr<response::Value>&& afterWrapped, std::unique_ptr<int>&& lastWrapped, std::unique_ptr<response::Value>&& beforeWrapped)
 	{
 		loadAppointments();
 
-		EdgeConstraints<Appointment, AppointmentConnection> constraints(requestIdWrapped, _appointments);
+		EdgeConstraints<Appointment, AppointmentConnection> constraints(stateWrapped, _appointments);
 		auto connection = constraints(firstWrapped.get(), afterWrapped.get(), lastWrapped.get(), beforeWrapped.get());
 
 		return std::static_pointer_cast<object::AppointmentConnection>(connection);
-	}, state, std::move(first), std::move(after), std::move(last), std::move(before));
+	}, std::move(state), std::move(first), std::move(after), std::move(last), std::move(before));
 }
 
-std::future<std::shared_ptr<object::TaskConnection>> Query::getTasks(const std::shared_ptr<service::RequestState>& state, std::unique_ptr<int>&& first, std::unique_ptr<response::Value>&& after, std::unique_ptr<int>&& last, std::unique_ptr<response::Value>&& before) const
+std::future<std::shared_ptr<object::TaskConnection>> Query::getTasks(std::shared_ptr<service::RequestState> state, std::unique_ptr<int>&& first, std::unique_ptr<response::Value>&& after, std::unique_ptr<int>&& last, std::unique_ptr<response::Value>&& before) const
 {
 	auto spThis = shared_from_this();
 	return std::async(std::launch::async,
-		[this, spThis](const std::shared_ptr<service::RequestState>& requestIdWrapped, std::unique_ptr<int>&& firstWrapped, std::unique_ptr<response::Value>&& afterWrapped, std::unique_ptr<int>&& lastWrapped, std::unique_ptr<response::Value>&& beforeWrapped)
+		[this, spThis](std::shared_ptr<service::RequestState> stateWrapped, std::unique_ptr<int>&& firstWrapped, std::unique_ptr<response::Value>&& afterWrapped, std::unique_ptr<int>&& lastWrapped, std::unique_ptr<response::Value>&& beforeWrapped)
 	{
 		loadTasks();
 
-		EdgeConstraints<Task, TaskConnection> constraints(requestIdWrapped, _tasks);
+		EdgeConstraints<Task, TaskConnection> constraints(stateWrapped, _tasks);
 		auto connection = constraints(firstWrapped.get(), afterWrapped.get(), lastWrapped.get(), beforeWrapped.get());
 
 		return std::static_pointer_cast<object::TaskConnection>(connection);
-	}, state, std::move(first), std::move(after), std::move(last), std::move(before));
+	}, std::move(state), std::move(first), std::move(after), std::move(last), std::move(before));
 }
 
-std::future<std::shared_ptr<object::FolderConnection>> Query::getUnreadCounts(const std::shared_ptr<service::RequestState>& state, std::unique_ptr<int>&& first, std::unique_ptr<response::Value>&& after, std::unique_ptr<int>&& last, std::unique_ptr<response::Value>&& before) const
+std::future<std::shared_ptr<object::FolderConnection>> Query::getUnreadCounts(std::shared_ptr<service::RequestState> state, std::unique_ptr<int>&& first, std::unique_ptr<response::Value>&& after, std::unique_ptr<int>&& last, std::unique_ptr<response::Value>&& before) const
 {
 	auto spThis = shared_from_this();
 	return std::async(std::launch::async,
-		[this, spThis](const std::shared_ptr<service::RequestState>& requestIdWrapped, std::unique_ptr<int>&& firstWrapped, std::unique_ptr<response::Value>&& afterWrapped, std::unique_ptr<int>&& lastWrapped, std::unique_ptr<response::Value>&& beforeWrapped)
+		[this, spThis](std::shared_ptr<service::RequestState> stateWrapped, std::unique_ptr<int>&& firstWrapped, std::unique_ptr<response::Value>&& afterWrapped, std::unique_ptr<int>&& lastWrapped, std::unique_ptr<response::Value>&& beforeWrapped)
 	{
 		loadUnreadCounts();
 
-		EdgeConstraints<Folder, FolderConnection> constraints(requestIdWrapped, _unreadCounts);
+		EdgeConstraints<Folder, FolderConnection> constraints(stateWrapped, _unreadCounts);
 		auto connection = constraints(firstWrapped.get(), afterWrapped.get(), lastWrapped.get(), beforeWrapped.get());
 
 		return std::static_pointer_cast<object::FolderConnection>(connection);
-	}, state, std::move(first), std::move(after), std::move(last), std::move(before));
+	}, std::move(state), std::move(first), std::move(after), std::move(last), std::move(before));
 }
 
-std::future<std::vector<std::shared_ptr<object::Appointment>>> Query::getAppointmentsById(const std::shared_ptr<service::RequestState>& state, std::vector<std::vector<uint8_t>>&& ids) const
+std::future<std::vector<std::shared_ptr<object::Appointment>>> Query::getAppointmentsById(std::shared_ptr<service::RequestState> state, std::vector<std::vector<uint8_t>>&& ids) const
 {
 	std::promise<std::vector<std::shared_ptr<object::Appointment>>> promise;
 	std::vector<std::shared_ptr<object::Appointment>> result(ids.size());
 
 	std::transform(ids.cbegin(), ids.cend(), result.begin(),
-		[this, state](const std::vector<uint8_t>& id)
+		[this, &state](const std::vector<uint8_t>& id)
 	{
 		return std::static_pointer_cast<object::Appointment>(findAppointment(state, id));
 	});
@@ -302,13 +302,13 @@ std::future<std::vector<std::shared_ptr<object::Appointment>>> Query::getAppoint
 	return promise.get_future();
 }
 
-std::future<std::vector<std::shared_ptr<object::Task>>> Query::getTasksById(const std::shared_ptr<service::RequestState>& state, std::vector<std::vector<uint8_t>>&& ids) const
+std::future<std::vector<std::shared_ptr<object::Task>>> Query::getTasksById(std::shared_ptr<service::RequestState> state, std::vector<std::vector<uint8_t>>&& ids) const
 {
 	std::promise<std::vector<std::shared_ptr<object::Task>>> promise;
 	std::vector<std::shared_ptr<object::Task>> result(ids.size());
 
 	std::transform(ids.cbegin(), ids.cend(), result.begin(),
-		[this, state](const std::vector<uint8_t>& id)
+		[this, &state](const std::vector<uint8_t>& id)
 	{
 		return std::static_pointer_cast<object::Task>(findTask(state, id));
 	});
@@ -317,13 +317,13 @@ std::future<std::vector<std::shared_ptr<object::Task>>> Query::getTasksById(cons
 	return promise.get_future();
 }
 
-std::future<std::vector<std::shared_ptr<object::Folder>>> Query::getUnreadCountsById(const std::shared_ptr<service::RequestState>& state, std::vector<std::vector<uint8_t>>&& ids) const
+std::future<std::vector<std::shared_ptr<object::Folder>>> Query::getUnreadCountsById(std::shared_ptr<service::RequestState> state, std::vector<std::vector<uint8_t>>&& ids) const
 {
 	std::promise<std::vector<std::shared_ptr<object::Folder>>> promise;
 	std::vector<std::shared_ptr<object::Folder>> result(ids.size());
 
 	std::transform(ids.cbegin(), ids.cend(), result.begin(),
-		[this, state](const std::vector<uint8_t>& id)
+		[this, &state](const std::vector<uint8_t>& id)
 	{
 		return std::static_pointer_cast<object::Folder>(findUnreadCount(state, id));
 	});
@@ -337,7 +337,7 @@ Mutation::Mutation(completeTaskMutation&& mutateCompleteTask)
 {
 }
 
-std::future<std::shared_ptr<object::CompleteTaskPayload>> Mutation::getCompleteTask(const std::shared_ptr<service::RequestState>& state, CompleteTaskInput&& input) const
+std::future<std::shared_ptr<object::CompleteTaskPayload>> Mutation::getCompleteTask(std::shared_ptr<service::RequestState> state, CompleteTaskInput&& input) const
 {
 	std::promise<std::shared_ptr<object::CompleteTaskPayload>> promise;