Model track_total_hits with enum (#52)

This commit updates track_total_hits param to model it as an enum. Track total hits
accepts either a boolean or an integer.

Author: russcam

api_generator/src/api_generator/code_gen/mod.rs

@@ -133,7 +133,10 @@ fn typekind_to_ty(name: &str, kind: TypeKind, required: bool) -> syn::Ty {
         TypeKind::Enum => v.push_str(name.to_pascal_case().as_str()),
         TypeKind::String => v.push_str(str_type),
         TypeKind::Text => v.push_str(str_type),
-        TypeKind::Boolean => v.push_str("bool"),
+        TypeKind::Boolean => match name {
+            "track_total_hits" => v.push_str("TrackTotalHits"),
+            _ => v.push_str("bool"),
+        },
         TypeKind::Number => v.push_str("i64"),
         TypeKind::Float => v.push_str("f32"),
         TypeKind::Double => v.push_str("f64"),

api_generator/src/api_generator/code_gen/params.rs

@@ -31,7 +31,10 @@ fn generate_param(tokens: &mut Tokens, e: &ApiEnum) {
                     static ref PARENS_REGEX: Regex = Regex::new(r"^(.*?)\s*\(.*?\)\s*$").unwrap();
                 }
                 if let Some(c) = PARENS_REGEX.captures(v) {
-                    (c.get(1).unwrap().as_str().to_owned(), syn::Ident::from(c.get(1).unwrap().as_str().to_pascal_case()))
+                    (
+                        c.get(1).unwrap().as_str().to_owned(),
+                        syn::Ident::from(c.get(1).unwrap().as_str().to_pascal_case()),
+                    )
                 } else {
                     (v.to_owned(), syn::Ident::from(v.to_pascal_case()))
                 }

api_generator/src/api_generator/code_gen/request/request_builder.rs

@@ -4,9 +4,9 @@ use crate::api_generator::{
 };
 use inflector::Inflector;
 use quote::{ToTokens, Tokens};
+use reqwest::Url;
 use std::{collections::BTreeMap, str};
 use syn::{Field, FieldValue, ImplItem};
-use reqwest::Url;
 
 /// Builder that generates the AST for a request builder struct
 pub struct RequestBuilder<'a> {
@@ -392,7 +392,7 @@ impl<'a> RequestBuilder<'a> {
 
         // add a field for HTTP headers
         fields.push(syn::Field {
-           ident: Some(headers_field_ident.clone()),
+            ident: Some(headers_field_ident.clone()),
             vis: syn::Visibility::Inherited,
             attrs: vec![],
             ty: syn::parse_type("HeaderMap").unwrap(),

api_generator/src/api_generator/code_gen/url/enum_builder.rs

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 use crate::api_generator::code_gen::url::url_builder::{IntoExpr, UrlBuilder};
 use crate::api_generator::{code_gen::*, ApiEndpoint, Path};
 use inflector::Inflector;

elasticsearch/src/cat/mod.rs

@@ -30,4 +30,4 @@
 //!
 //!
 
-pub use super::generated::namespace_clients::cat::*;
+pub use super::generated::namespace_clients::cat::*;

elasticsearch/src/ccr/mod.rs

@@ -6,4 +6,4 @@
 //! - Disaster recovery in case a primary cluster fails. A secondary cluster can serve as a hot backup
 //! - Geo-proximity so that reads can be served locally
 
-pub use super::generated::namespace_clients::ccr::*;
+pub use super::generated::namespace_clients::ccr::*;

elasticsearch/src/client.rs

@@ -1,5 +1,5 @@
 use crate::{
-    http::{request::Body, response::Response, transport::Transport, Method, headers::HeaderMap},
+    http::{headers::HeaderMap, request::Body, response::Response, transport::Transport, Method},
     Error,
 };
 
@@ -50,6 +50,8 @@ impl Elasticsearch {
         B: Body,
         Q: Serialize + ?Sized,
     {
-        self.transport.send(method, path, headers, query_string, body).await
+        self.transport
+            .send(method, path, headers, query_string, body)
+            .await
     }
 }

elasticsearch/src/cluster/mod.rs

@@ -3,4 +3,4 @@
 //! [Manage settings](https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster.html),
 //! perform operations, and retrieve information about an Elasticsearch cluster.
 
-pub use super::generated::namespace_clients::cluster::*;
+pub use super::generated::namespace_clients::cluster::*;

elasticsearch/src/enrich/mod.rs

@@ -5,4 +5,4 @@
 //! as part of an [ingest pipeline](../ingest/index.html), to add data from your existing indices
 //! to incoming documents during ingest.
 
-pub use super::generated::namespace_clients::enrich::*;
+pub use super::generated::namespace_clients::enrich::*;

elasticsearch/src/error.rs

@@ -58,39 +58,39 @@ impl From<io::Error> for Error {
 impl From<reqwest::Error> for Error {
     fn from(err: reqwest::Error) -> Error {
         Error {
-            kind: Kind::Http(err)
+            kind: Kind::Http(err),
         }
     }
 }
 
 impl From<serde_json::error::Error> for Error {
     fn from(err: serde_json::error::Error) -> Error {
         Error {
-            kind: Kind::Json(err)
+            kind: Kind::Json(err),
         }
     }
 }
 
 impl From<url::ParseError> for Error {
     fn from(err: url::ParseError) -> Error {
         Error {
-            kind: Kind::Lib(err.to_string())
+            kind: Kind::Lib(err.to_string()),
         }
     }
 }
 
 impl From<BuildError> for Error {
     fn from(err: BuildError) -> Error {
         Error {
-            kind: Kind::Build(err)
+            kind: Kind::Build(err),
         }
     }
 }
 
 impl Error {
     pub(crate) fn lib(err: impl Into<String>) -> Self {
         Error {
-            kind: Kind::Lib(err.into())
+            kind: Kind::Lib(err.into()),
         }
     }
 }