simplify the code

kilork · Apr 25, 2024 · 186d8b4 · 186d8b4
1 parent 0c858be
commit 186d8b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/examples/openapi.rs b/examples/openapi.rs
@@ -435,30 +435,19 @@ mod openapi {
 
             output.extend(query_parameters.into_iter().flat_map(
                 |(query_parameter, query_parameter_name)| {
-                    let stringify = match &query_parameter.schema {
-                        Kind::Generic(v) => match v {
-                            Generic::Array { .. } => r#"    let v = v.join(",");"#,
-                            _ => "",
-                        },
-                        _ => "",
+                    let value = match &query_parameter.schema {
+                        Kind::Generic(Generic::Array { .. }) => r#"v.join(",")"#,
+                        _ => "v",
                     };
                     [
                         format!("if let Some(v) = {query_parameter_name} {{"),
-                        stringify.to_string(),
                         format!(
-                            r#"    builder = builder.query(&[("{}", v)]);"#,
+                            r#"    builder = builder.query(&[("{}", {value})]);"#,
                             query_parameter.name
                         ),
                         "}".into(),
                     ]
-                    .into_iter()
-                    .filter_map(|line| {
-                        if line.is_empty() {
-                            None
-                        } else {
-                            Some(format!("    {line}"))
-                        }
-                    })
+                    .map(|line| format!("    {line}"))
                 },
             ));
 

diff --git a/src/rest/generated_rest.rs b/src/rest/generated_rest.rs
@@ -5405,15 +5405,13 @@ impl<TS: KeycloakTokenSupplier> KeycloakAdmin<TS> {
             builder = builder.query(&[("max", v)]);
         }
         if let Some(v) = operation_types {
-            let v = v.join(",");
-            builder = builder.query(&[("operationTypes", v)]);
+            builder = builder.query(&[("operationTypes", v.join(","))]);
         }
         if let Some(v) = resource_path {
             builder = builder.query(&[("resourcePath", v)]);
         }
         if let Some(v) = resource_types {
-            let v = v.join(",");
-            builder = builder.query(&[("resourceTypes", v)]);
+            builder = builder.query(&[("resourceTypes", v.join(","))]);
         }
         let response = builder.send().await?;
         Ok(error_check(response).await?.json().await?)
@@ -5953,8 +5951,7 @@ impl<TS: KeycloakTokenSupplier> KeycloakAdmin<TS> {
             builder = builder.query(&[("max", v)]);
         }
         if let Some(v) = type_ {
-            let v = v.join(",");
-            builder = builder.query(&[("type", v)]);
+            builder = builder.query(&[("type", v.join(","))]);
         }
         if let Some(v) = user {
             builder = builder.query(&[("user", v)]);