Make QueryPlan::usage_reporting and QueryPlannerContent private

NEXT_CHANGELOG.md

@@ -26,6 +26,13 @@ By [@USERNAME](https://github.com/USERNAME) in https://github.com/apollographql/
 # [x.x.x] (unreleased) - 2022-mm-dd
 
 ## ❗ BREAKING ❗
+
+### QueryPlan::usage_reporting and QueryPlannerContent are private ([Issue #1556](https://github.com/apollographql/router/issues/1556))
+
+These items have been removed from the public API of `apollo_router::services::execution`.
+
+By [@SimonSapin](https://github.com/SimonSapin) in https://github.com/apollographql/router/pull/1568
+
 ## 🚀 Features
 ## 🐛 Fixes
 ## 🛠 Maintenance

apollo-router/src/query_planner/mod.rs

@@ -48,7 +48,7 @@ pub(crate) type QueryKey = (String, Option<String>);
 /// A plan for a given GraphQL query
 #[derive(Debug)]
 pub struct QueryPlan {
-    pub usage_reporting: UsageReporting,
+    usage_reporting: UsageReporting,
     pub(crate) root: PlanNode,
     options: QueryPlanOptions,
 }

apollo-router/src/services/execution.rs

@@ -27,9 +27,8 @@ pub type BoxService = tower::util::BoxService<Request, Response, BoxError>;
 pub type BoxCloneService = tower::util::BoxCloneService<Request, Response, BoxError>;
 pub type ServiceResult = Result<Response, BoxError>;
 
-// Reachable from Request or Response:
+// Reachable from Request
 pub use crate::query_planner::QueryPlan;
-pub use crate::services::query_planner::QueryPlannerContent;
 
 assert_impl_all!(Request: Send);
 /// [`Context`] and [`QueryPlan`] for the request.

apollo-router/src/services/query_planner.rs

@@ -42,7 +42,7 @@ pub(crate) struct Response {
 
 /// Query, QueryPlan and Introspection data.
 #[derive(Debug, Clone)]
-pub enum QueryPlannerContent {
+pub(crate) enum QueryPlannerContent {
     Plan {
         query: Arc<Query>,
         plan: Arc<QueryPlan>,

apollo-router/src/spec/query.rs

@@ -24,7 +24,7 @@ const TYPENAME: &str = "__typename";
 /// A GraphQL query.
 #[derive(Debug, Derivative, Default)]
 #[derivative(PartialEq, Hash, Eq)]
-pub struct Query {
+pub(crate) struct Query {
     string: String,
     #[derivative(PartialEq = "ignore", Hash = "ignore")]
     fragments: Fragments,