Skip to content

Commit aa9f029

Browse files
IvanGoncharovIvanGoncharov
committed
fix formating
1 parent b7550ec commit aa9f029

File tree

3 files changed

+55
-72
lines changed

3 files changed

+55
-72
lines changed

‎apollo-router/src/graphql/request.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,8 @@ impl Request {
277277
/// An error will be produced in the event that the query string parameters
278278
/// cannot be turned into a valid GraphQL `Request`.
279279
pub fn from_urlencoded_query(url_encoded_query: String) -> Result<Request, serde_json::Error> {
280-
let urldecoded: Value =
281-
serde_urlencoded::from_bytes(url_encoded_query.as_bytes())
282-
.map_err(serde_json::Error::custom)?;
280+
let urldecoded: Value = serde_urlencoded::from_bytes(url_encoded_query.as_bytes())
281+
.map_err(serde_json::Error::custom)?;
283282

284283
Request::process_value(&urldecoded)
285284
}

‎apollo-router/src/plugins/coprocessor/supergraph.rs

+11-17
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ use tower_service::Service;
1212

1313
use super::*;
1414
use crate::graphql;
15+
use crate::json_ext::Value;
1516
use crate::layers::ServiceBuilderExt;
1617
use crate::layers::async_checkpoint::AsyncCheckpointLayer;
1718
use crate::plugins::coprocessor::EXTERNAL_SPAN_NAME;
1819
use crate::plugins::telemetry::config_new::conditions::Condition;
1920
use crate::plugins::telemetry::config_new::selectors::SupergraphSelector;
2021
use crate::services::supergraph;
21-
use crate::json_ext::Value;
2222

2323
/// What information is passed to a router request/response stage
2424
#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)]
@@ -1056,11 +1056,10 @@ mod tests {
10561056
let mock_http_client =
10571057
mock_with_deferred_callback(move |res: http::Request<RouterBody>| {
10581058
Box::pin(async {
1059-
let mut deserialized_response: Externalizable<Value> =
1060-
serde_json::from_slice(
1061-
&router::body::into_bytes(res.into_body()).await.unwrap(),
1062-
)
1063-
.unwrap();
1059+
let mut deserialized_response: Externalizable<Value> = serde_json::from_slice(
1060+
&router::body::into_bytes(res.into_body()).await.unwrap(),
1061+
)
1062+
.unwrap();
10641063
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_response.version);
10651064
assert_eq!(
10661065
PipelineStep::SupergraphResponse.to_string(),
@@ -1080,9 +1079,7 @@ mod tests {
10801079
.unwrap()
10811080
.insert(
10821081
"has_next".to_string(),
1083-
Value::from(
1084-
deserialized_response.has_next.unwrap_or_default(),
1085-
),
1082+
Value::from(deserialized_response.has_next.unwrap_or_default()),
10861083
);
10871084

10881085
Ok(http::Response::builder()
@@ -1176,11 +1173,10 @@ mod tests {
11761173
let mock_http_client =
11771174
mock_with_deferred_callback(move |res: http::Request<RouterBody>| {
11781175
Box::pin(async {
1179-
let mut deserialized_response: Externalizable<Value> =
1180-
serde_json::from_slice(
1181-
&router::body::into_bytes(res.into_body()).await.unwrap(),
1182-
)
1183-
.unwrap();
1176+
let mut deserialized_response: Externalizable<Value> = serde_json::from_slice(
1177+
&router::body::into_bytes(res.into_body()).await.unwrap(),
1178+
)
1179+
.unwrap();
11841180
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_response.version);
11851181
assert_eq!(
11861182
PipelineStep::SupergraphResponse.to_string(),
@@ -1200,9 +1196,7 @@ mod tests {
12001196
.unwrap()
12011197
.insert(
12021198
"has_next".to_string(),
1203-
Value::from(
1204-
deserialized_response.has_next.unwrap_or_default(),
1205-
),
1199+
Value::from(deserialized_response.has_next.unwrap_or_default()),
12061200
);
12071201

12081202
Ok(http::Response::builder()

‎apollo-router/src/plugins/coprocessor/test.rs

+42-52
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ mod tests {
1414
use mime::TEXT_HTML;
1515
use router::body::RouterBody;
1616
use serde_json_bytes::json;
17-
use crate::json_ext::Object;
18-
use crate::json_ext::Value;
1917
use services::subgraph::SubgraphRequestId;
2018
use tower::BoxError;
2119
use tower::ServiceExt;
2220

2321
use super::super::*;
22+
use crate::json_ext::Object;
23+
use crate::json_ext::Value;
2424
use crate::plugin::test::MockInternalHttpClientService;
2525
use crate::plugin::test::MockRouterService;
2626
use crate::plugin::test::MockSubgraphService;
@@ -404,11 +404,10 @@ mod tests {
404404

405405
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
406406
Box::pin(async {
407-
let deserialized_request: Externalizable<Value> =
408-
serde_json::from_slice(
409-
&router::body::into_bytes(req.into_body()).await.unwrap(),
410-
)
411-
.unwrap();
407+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
408+
&router::body::into_bytes(req.into_body()).await.unwrap(),
409+
)
410+
.unwrap();
412411
assert_eq!(
413412
deserialized_request.subgraph_request_id.as_deref(),
414413
Some("5678")
@@ -545,11 +544,10 @@ mod tests {
545544

546545
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
547546
Box::pin(async {
548-
let deserialized_request: Externalizable<Value> =
549-
serde_json::from_slice(
550-
&router::body::into_bytes(req.into_body()).await.unwrap(),
551-
)
552-
.unwrap();
547+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
548+
&router::body::into_bytes(req.into_body()).await.unwrap(),
549+
)
550+
.unwrap();
553551
assert_eq!(
554552
deserialized_request.subgraph_request_id.as_deref(),
555553
Some("5678")
@@ -711,11 +709,10 @@ mod tests {
711709

712710
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
713711
Box::pin(async {
714-
let deserialized_request: Externalizable<Value> =
715-
serde_json::from_slice(
716-
&router::body::into_bytes(req.into_body()).await.unwrap(),
717-
)
718-
.unwrap();
712+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
713+
&router::body::into_bytes(req.into_body()).await.unwrap(),
714+
)
715+
.unwrap();
719716
assert_eq!(
720717
deserialized_request.subgraph_request_id.as_deref(),
721718
Some("5678")
@@ -1878,11 +1875,10 @@ mod tests {
18781875

18791876
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
18801877
Box::pin(async {
1881-
let deserialized_request: Externalizable<Value> =
1882-
serde_json::from_slice(
1883-
&router::body::into_bytes(req.into_body()).await.unwrap(),
1884-
)
1885-
.unwrap();
1878+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
1879+
&router::body::into_bytes(req.into_body()).await.unwrap(),
1880+
)
1881+
.unwrap();
18861882

18871883
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_request.version);
18881884
assert_eq!(
@@ -2003,11 +1999,10 @@ mod tests {
20031999

20042000
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
20052001
Box::pin(async {
2006-
let deserialized_request: Externalizable<Value> =
2007-
serde_json::from_slice(
2008-
&router::body::into_bytes(req.into_body()).await.unwrap(),
2009-
)
2010-
.unwrap();
2002+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
2003+
&router::body::into_bytes(req.into_body()).await.unwrap(),
2004+
)
2005+
.unwrap();
20112006

20122007
assert_eq!(
20132008
deserialized_request
@@ -2158,11 +2153,10 @@ mod tests {
21582153

21592154
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
21602155
Box::pin(async {
2161-
let deserialized_request: Externalizable<Value> =
2162-
serde_json::from_slice(
2163-
&router::body::into_bytes(req.into_body()).await.unwrap(),
2164-
)
2165-
.unwrap();
2156+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
2157+
&router::body::into_bytes(req.into_body()).await.unwrap(),
2158+
)
2159+
.unwrap();
21662160

21672161
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_request.version);
21682162
assert_eq!(
@@ -2286,11 +2280,10 @@ mod tests {
22862280

22872281
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
22882282
Box::pin(async {
2289-
let deserialized_request: Externalizable<Value> =
2290-
serde_json::from_slice(
2291-
&router::body::into_bytes(req.into_body()).await.unwrap(),
2292-
)
2293-
.unwrap();
2283+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
2284+
&router::body::into_bytes(req.into_body()).await.unwrap(),
2285+
)
2286+
.unwrap();
22942287

22952288
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_request.version);
22962289
assert_eq!(
@@ -2387,11 +2380,10 @@ mod tests {
23872380

23882381
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
23892382
Box::pin(async {
2390-
let deserialized_request: Externalizable<Value> =
2391-
serde_json::from_slice(
2392-
&router::body::into_bytes(req.into_body()).await.unwrap(),
2393-
)
2394-
.unwrap();
2383+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
2384+
&router::body::into_bytes(req.into_body()).await.unwrap(),
2385+
)
2386+
.unwrap();
23952387

23962388
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_request.version);
23972389
assert_eq!(
@@ -2482,11 +2474,10 @@ mod tests {
24822474

24832475
let mock_http_client = mock_with_callback(move |req: http::Request<RouterBody>| {
24842476
Box::pin(async {
2485-
let deserialized_request: Externalizable<Value> =
2486-
serde_json::from_slice(
2487-
&router::body::into_bytes(req.into_body()).await.unwrap(),
2488-
)
2489-
.unwrap();
2477+
let deserialized_request: Externalizable<Value> = serde_json::from_slice(
2478+
&router::body::into_bytes(req.into_body()).await.unwrap(),
2479+
)
2480+
.unwrap();
24902481

24912482
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_request.version);
24922483
assert_eq!(
@@ -2575,11 +2566,10 @@ mod tests {
25752566
let mock_http_client =
25762567
mock_with_deferred_callback(move |res: http::Request<RouterBody>| {
25772568
Box::pin(async {
2578-
let deserialized_response: Externalizable<Value> =
2579-
serde_json::from_slice(
2580-
&router::body::into_bytes(res.into_body()).await.unwrap(),
2581-
)
2582-
.unwrap();
2569+
let deserialized_response: Externalizable<Value> = serde_json::from_slice(
2570+
&router::body::into_bytes(res.into_body()).await.unwrap(),
2571+
)
2572+
.unwrap();
25832573

25842574
assert_eq!(EXTERNALIZABLE_VERSION, deserialized_response.version);
25852575
assert_eq!(

0 commit comments

Comments
 (0)