Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spelling of content_negociation corrected to content_negotiation #3162

Merged
merged 9 commits into from
Aug 15, 2023
Merged

spelling of content_negociation corrected to content_negotiation #3162

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88a06ac
spelling corrected, xtask all passed
May 26, 2023
527d34a
Merge branch 'dev' into dev
krishna15898 May 26, 2023
977e591
updating changelog
May 30, 2023
6206adc
Merge remote-tracking branch 'origin/dev' into dev
May 30, 2023
4e679b5
renamed change_file name
May 30, 2023
8ca6407
Merge remote-tracking branch 'origin/dev' into HEAD
abernix Aug 15, 2023
9859543
docs: Remove `private` context which would have excluded `content-neg…
abernix Aug 15, 2023
673055a
Update .changesets/fix_spelling_content_negotiation.md
abernix Aug 15, 2023
da2672b
Merge branch 'dev' into dev
abernix Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changesets/fix_spelling_content_negotiation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### spelling of content_negociation corrected to content_negotiation ([PR #3162](https://github.com/apollographql/router/pull/3162))
abernix marked this conversation as resolved.
Show resolved Hide resolved

spelling mistake in content_negociation is fixed

By [@krishna15898](https://github.com/krishna15898) in https://github.com/apollographql/router/pull/3162
0 ...rc/services/layers/content_negociation.rs → ...rc/services/layers/content_negotiation.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion apollo-router/src/services/layers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//! Layers that are internal to the execution pipeline.
pub(crate) mod allow_only_http_post_mutations;
pub(crate) mod apq;
pub(crate) mod content_negociation;
pub(crate) mod content_negotiation;
pub(crate) mod static_page;
6 changes: 3 additions & 3 deletions apollo-router/src/services/router_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use tower_service::Service;
use tracing::Instrument;

use super::layers::apq::APQLayer;
use super::layers::content_negociation;
use super::layers::content_negotiation;
use super::layers::static_page::StaticPageLayer;
use super::new_service::ServiceFactory;
use super::router;
Expand All @@ -49,7 +49,7 @@ use crate::graphql;
use crate::plugin::test::MockSupergraphService;
use crate::query_planner::QueryPlanResult;
use crate::router_factory::RouterFactory;
use crate::services::layers::content_negociation::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
use crate::services::layers::content_negotiation::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
use crate::services::RouterRequest;
use crate::services::RouterResponse;
use crate::services::SupergraphRequest;
Expand Down Expand Up @@ -497,7 +497,7 @@ where
Error = BoxError,
Future = BoxFuture<'static, router::ServiceResult>,
> + Send {
let router_service = content_negociation::RouterLayer::default().layer(RouterService::new(
let router_service = content_negotiation::RouterLayer::default().layer(RouterService::new(
self.supergraph_creator.clone(),
self.apq_layer.clone(),
));
Expand Down
2 changes: 1 addition & 1 deletion apollo-router/src/services/subgraph_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use tower_http::decompression::DecompressionLayer;
use tracing::Instrument;
use tracing_opentelemetry::OpenTelemetrySpanExt;

use super::layers::content_negociation::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
use super::layers::content_negotiation::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
use super::Plugins;
use crate::error::FetchError;
use crate::graphql;
Expand Down
4 changes: 2 additions & 2 deletions apollo-router/src/services/supergraph_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use tower::ServiceExt;
use tower_service::Service;
use tracing_futures::Instrument;

use super::layers::content_negociation;
use super::layers::content_negotiation;
use super::new_service::ServiceFactory;
use super::router::ClientRequestAccepts;
use super::subgraph_service::MakeSubgraphService;
Expand Down Expand Up @@ -431,7 +431,7 @@ impl SupergraphCreator {
};

ServiceBuilder::new()
.layer(content_negociation::SupergraphLayer::default())
.layer(content_negotiation::SupergraphLayer::default())
.service(
self.plugins
.iter()
Expand Down
12 changes: 6 additions & 6 deletions docs/source/customizations/coprocessor.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ Properties of the JSON body are divided into two high-level categories:
},
"context": {
"entries": {
"content-negociation:accepts-wildcard": true,
"content-negotiation:accepts-wildcard": true,
"apollo_telemetry::usage_reporting": {
"statsReportKey": "# TopProducts\nquery TopProducts{topProducts{name price reviews{body id}}}",
"referencedFieldsByType": {
Expand Down Expand Up @@ -324,9 +324,9 @@ Properties of the JSON body are divided into two high-level categories:
},
"apollo_telemetry::client_version": "",
"apollo_telemetry::subgraph_metrics_attributes": {},
"content-negociation:accepts-json": false,
"content-negotiation:accepts-json": false,
"apollo_telemetry::client_name": "",
"content-negociation:accepts-multipart": false
"content-negotiation:accepts-multipart": false
}
},
"uri": "https://reviews.demo.starstuff.dev/",
Expand Down Expand Up @@ -423,9 +423,9 @@ Properties of the JSON body are divided into two high-level categories:
},
"context": {
"entries": {
"content-negociation:accepts-wildcard": true,
"content-negociation:accepts-json": false,
"content-negociation:accepts-multipart": false,
"content-negotiation:accepts-wildcard": true,
"content-negotiation:accepts-json": false,
"content-negotiation:accepts-multipart": false,
"apollo_telemetry::usage_reporting": {
"statsReportKey": "# TopProducts\nquery TopProducts{topProducts{name price reviews{body id}}}",
"referencedFieldsByType": {
Expand Down