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

Jump to bottom

Remove unneeded option #257

Merged
merged 2 commits into from
Dec 10, 2021
Merged

Remove unneeded option #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a0c48
Remove useless Option on Request's field variables
cecton Dec 3, 2021
1aac779
Fix bug introduced here after removing Option for deserialization
cecton Dec 4, 2021
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
22 changes: 10 additions & 12 deletions apollo-router-core/src/query_planner/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ impl PlanNode {
let required = self.variable_usage().collect::<HashSet<_>>();
let provided = request
.variables
.as_ref()
.map(|v| v.keys().map(|x| x.as_str()).collect::<HashSet<_>>())
.unwrap_or_default();
.keys()
.map(|x| x.as_str())
.collect::<HashSet<_>>();
required
.difference(&provided)
.map(|x| FetchError::ValidationMissingVariable {
Expand Down Expand Up @@ -295,11 +295,10 @@ impl FetchNode {

let mut variables = Object::with_capacity(1 + variable_usages.len());
variables.extend(variable_usages.iter().filter_map(|key| {
request.variables.as_ref().map(|v| {
v.get(key)
.map(|value| (key.clone(), value.clone()))
.unwrap_or_default()
})
request
.variables
.get(key)
.map(|value| (key.clone(), value.clone()))
}));

{
Expand All @@ -318,7 +317,7 @@ impl FetchNode {
.stream(
Request::builder()
.query(operation)
.variables(Some(Arc::new(variables)))
.variables(Arc::new(variables))
.build(),
)
.await
Expand Down Expand Up @@ -390,9 +389,8 @@ impl FetchNode {
.filter_map(|key| {
request
.variables
.as_ref()
.map(|v| v.get(key).map(|value| (key.clone(), value.clone())))
.unwrap_or_default()
.get(key)
.map(|value| (key.clone(), value.clone()))
})
.collect::<Object>(),
);
Expand Down
18 changes: 16 additions & 2 deletions apollo-router-core/src/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,30 @@ pub struct Request {
pub operation_name: Option<String>,

/// The optional variables in the form of a json object.
#[serde(skip_serializing_if = "Option::is_none", default)]
#[serde(
skip_serializing_if = "Object::is_empty",
default,
deserialize_with = "deserialize_null_default"
)]
#[builder(default)]
pub variables: Option<Arc<Object>>,
pub variables: Arc<Object>,

/// extensions.
#[serde(skip_serializing_if = "Object::is_empty", default)]
#[builder(default)]
pub extensions: Object,
}

// NOTE: this deserialize helper is used to transform `null` to Default::default()
fn deserialize_null_default<'de, D, T: Default + Deserialize<'de>>(
deserializer: D,
) -> Result<T, D::Error>
where
D: serde::Deserializer<'de>,
{
<Option<T>>::deserialize(deserializer).map(|x| x.unwrap_or_default())
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down