Use shared_ptr<const ...> in more places

Author: wravery

include/graphqlservice/GraphQLService.h

@@ -826,7 +826,7 @@ struct ModifiedResult
 			typename std::conditional_t<std::is_base_of_v<Object, U>, std::shared_ptr<U>, U>;
 
 		using future_type = typename std::conditional_t<std::is_base_of_v<Object, U>,
-			AwaitableObject<std::shared_ptr<Object>>, AwaitableScalar<type>>;
+			AwaitableObject<std::shared_ptr<const Object>>, AwaitableScalar<type>>;
 	};
 
 	// Convert a single value of the specified type to JSON.
@@ -849,7 +849,7 @@ struct ModifiedResult
 		co_await params.launch;
 
 		auto awaitedResult = co_await ModifiedResult<Object>::convert(
-			std::static_pointer_cast<Object>(co_await result),
+			std::static_pointer_cast<const Object>(co_await result),
 			std::move(params));
 
 		co_return std::move(awaitedResult);
@@ -1155,7 +1155,7 @@ GRAPHQLSERVICE_EXPORT AwaitableResolver ModifiedResult<response::Value>::convert
 	AwaitableScalar<response::Value> result, ResolverParams params);
 template <>
 GRAPHQLSERVICE_EXPORT AwaitableResolver ModifiedResult<Object>::convert(
-	AwaitableObject<std::shared_ptr<Object>> result, ResolverParams params);
+	AwaitableObject<std::shared_ptr<const Object>> result, ResolverParams params);
 
 // Export all of the scalar value validation methods
 template <>
@@ -1260,10 +1260,10 @@ struct RequestDeliverParams
 	await_async launch {};
 
 	// Optional override for the default Subscription operation object.
-	std::shared_ptr<Object> subscriptionObject {};
+	std::shared_ptr<const Object> subscriptionObject {};
 };
 
-using TypeMap = internal::string_view_map<std::shared_ptr<Object>>;
+using TypeMap = internal::string_view_map<std::shared_ptr<const Object>>;
 
 // State which is captured and kept alive until all pending futures have been resolved for an
 // operation. Note: SelectionSet is the other parameter that gets passed to the top level Object,
@@ -1328,14 +1328,14 @@ class Request : public std::enable_shared_from_this<Request>
 private:
 	SubscriptionKey addSubscription(RequestSubscribeParams&& params);
 	void removeSubscription(SubscriptionKey key);
-	std::vector<std::shared_ptr<SubscriptionData>> collectRegistrations(
+	std::vector<std::shared_ptr<const SubscriptionData>> collectRegistrations(
 		std::string_view field, RequestDeliverFilter&& filter) const noexcept;
 
 	const TypeMap _operations;
 	mutable std::mutex _validationMutex {};
 	const std::unique_ptr<ValidateExecutableVisitor> _validation;
 	mutable std::mutex _subscriptionMutex {};
-	internal::sorted_map<SubscriptionKey, std::shared_ptr<SubscriptionData>> _subscriptions;
+	internal::sorted_map<SubscriptionKey, std::shared_ptr<const SubscriptionData>> _subscriptions;
 	internal::sorted_map<SubscriptionName, internal::sorted_set<SubscriptionKey>> _listeners;
 	SubscriptionKey _nextKey = 0;
 };

src/GraphQLService.cpp

@@ -695,7 +695,7 @@ void requireSubFields(const ResolverParams& params)
 
 template <>
 AwaitableResolver ModifiedResult<Object>::convert(
-	AwaitableObject<std::shared_ptr<Object>> result, ResolverParams params)
+	AwaitableObject<std::shared_ptr<const Object>> result, ResolverParams params)
 {
 	requireSubFields(params);
 
@@ -1378,7 +1378,7 @@ class SubscriptionDefinitionVisitor
 {
 public:
 	SubscriptionDefinitionVisitor(RequestSubscribeParams&& params, FragmentMap&& fragments,
-		const std::shared_ptr<Object>& subscriptionObject);
+		const std::shared_ptr<const Object>& subscriptionObject);
 
 	const peg::ast_node& getRoot() const;
 	std::shared_ptr<SubscriptionData> getRegistration();
@@ -1392,15 +1392,15 @@ class SubscriptionDefinitionVisitor
 
 	RequestSubscribeParams _params;
 	FragmentMap _fragments;
-	const std::shared_ptr<Object>& _subscriptionObject;
+	const std::shared_ptr<const Object>& _subscriptionObject;
 	SubscriptionName _field;
 	response::Value _arguments;
 	Directives _fieldDirectives;
 	std::shared_ptr<SubscriptionData> _result;
 };
 
 SubscriptionDefinitionVisitor::SubscriptionDefinitionVisitor(RequestSubscribeParams&& params,
-	FragmentMap&& fragments, const std::shared_ptr<Object>& subscriptionObject)
+	FragmentMap&& fragments, const std::shared_ptr<const Object>& subscriptionObject)
 	: _params(std::move(params))
 	, _fragments(std::move(fragments))
 	, _subscriptionObject(subscriptionObject)
@@ -1748,6 +1748,7 @@ response::AwaitableValue Request::resolve(RequestResolveParams params) const
 AwaitableSubscribe Request::subscribe(RequestSubscribeParams params)
 {
 	const auto spThis = shared_from_this();
+	const auto launch = std::move(params.launch);
 	std::unique_lock lock { spThis->_subscriptionMutex };
 	const auto key = spThis->addSubscription(std::move(params));
 	const auto itrOperation = spThis->_operations.find(strSubscription);
@@ -1764,14 +1765,14 @@ AwaitableSubscribe Request::subscribe(RequestSubscribeParams params)
 			std::make_shared<FragmentSpreadDirectiveStack>(),
 			std::make_shared<FragmentSpreadDirectiveStack>(),
 			{},
-			params.launch,
+			launch,
 		};
 
 		lock.unlock();
 
 		try
 		{
-			co_await params.launch;
+			co_await launch;
 			co_await operation->resolve(selectionSetParams,
 				registration->selection,
 				registration->data->fragments,
@@ -1997,10 +1998,10 @@ void Request::removeSubscription(SubscriptionKey key)
 	}
 }
 
-std::vector<std::shared_ptr<SubscriptionData>> Request::collectRegistrations(
+std::vector<std::shared_ptr<const SubscriptionData>> Request::collectRegistrations(
 	std::string_view field, RequestDeliverFilter&& filter) const noexcept
 {
-	std::vector<std::shared_ptr<SubscriptionData>> registrations;
+	std::vector<std::shared_ptr<const SubscriptionData>> registrations;
 	const std::lock_guard lock { _subscriptionMutex };
 	const auto itrListeners = _listeners.find(field);
 
@@ -2016,7 +2017,7 @@ std::vector<std::shared_ptr<SubscriptionData>> Request::collectRegistrations(
 				[this](const auto& key) noexcept {
 					const auto itr = _subscriptions.find(key);
 
-					return itr == _subscriptions.end() ? std::shared_ptr<SubscriptionData> {}
+					return itr == _subscriptions.end() ? std::shared_ptr<const SubscriptionData> {}
 													   : itr->second;
 				});
 		}