chore(json-update): update json and regen all code

This commit is contained in:
Sebastian Thiel
2015-06-26 16:08:25 +02:00
parent 615ac64ec1
commit 7d58d66025
596 changed files with 35453 additions and 5854 deletions

View File

@@ -180,6 +180,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -232,6 +233,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -318,6 +320,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -404,6 +407,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -501,6 +505,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -552,6 +557,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -607,6 +613,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -658,6 +665,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -753,6 +761,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -840,6 +849,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -927,6 +937,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -979,6 +990,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1065,6 +1077,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1151,6 +1164,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1207,6 +1221,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1258,6 +1273,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1353,6 +1369,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1404,6 +1421,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1459,6 +1477,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1544,6 +1563,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1683,6 +1703,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1734,6 +1755,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1822,6 +1844,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1910,6 +1933,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -1961,6 +1985,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2046,6 +2071,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2131,6 +2157,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2182,6 +2209,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2233,6 +2261,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2319,6 +2348,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2405,6 +2435,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2456,6 +2487,69 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
}
}
fn _entitlements_list(&self, opt: &ArgMatches<'n, 'a>, dry_run: bool, err: &mut InvalidOptionsError)
-> Result<(), DoitError> {
let mut call = self.hub.entitlements().list(opt.value_of("package-name").unwrap_or(""));
for parg in opt.values_of("v").unwrap_or(Vec::new()).iter() {
let (key, value) = parse_kv_arg(&*parg, err, false);
match key {
"token" => {
call = call.token(value.unwrap_or(""));
},
"start-index" => {
call = call.start_index(arg_from_str(value.unwrap_or("-0"), err, "start-index", "integer"));
},
"product-id" => {
call = call.product_id(value.unwrap_or(""));
},
"max-results" => {
call = call.max_results(arg_from_str(value.unwrap_or("-0"), err, "max-results", "integer"));
},
_ => {
let mut found = false;
for param in &self.gp {
if key == *param {
found = true;
call = call.param(self.gpm.iter().find(|t| t.0 == key).unwrap_or(&("", key)).1, value.unwrap_or("unset"));
break;
}
}
if !found {
err.issues.push(CLIError::UnknownParameter(key.to_string(),
{let mut v = Vec::new();
v.extend(self.gp.iter().map(|v|*v));
v.extend(["token", "start-index", "max-results", "product-id"].iter().map(|v|*v));
v } ));
}
}
}
}
let protocol = CallType::Standard;
if dry_run {
Ok(())
} else {
assert!(err.issues.len() == 0);
let mut ostream = match writer_from_opts(opt.value_of("out")) {
Ok(mut f) => f,
Err(io_err) => return Err(DoitError::IoError(opt.value_of("out").unwrap_or("-").to_string(), io_err)),
};
match match protocol {
CallType::Standard => call.doit(),
_ => unreachable!()
} {
Err(api_err) => Err(DoitError::ApiError(api_err)),
Ok((mut response, output_schema)) => {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2539,6 +2633,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2634,6 +2729,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2734,6 +2830,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2795,6 +2892,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2895,6 +2993,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -2995,6 +3094,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -3046,6 +3146,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -3175,6 +3276,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -3226,6 +3328,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let mut value = json::value::to_value(&output_schema);
remove_json_null_values(&mut value);
json::to_writer_pretty(&mut ostream, &value).unwrap();
ostream.flush().unwrap();
Ok(())
}
}
@@ -3447,6 +3550,17 @@ impl<'n, 'a> Engine<'n, 'a> {
}
}
},
("entitlements", Some(opt)) => {
match opt.subcommand() {
("list", Some(opt)) => {
call_result = self._entitlements_list(opt, dry_run, &mut err);
},
_ => {
err.issues.push(CLIError::MissingMethodError("entitlements".to_string()));
writeln!(io::stderr(), "{}\n", opt.usage()).ok();
}
}
},
("inappproducts", Some(opt)) => {
match opt.subcommand() {
("batch", Some(opt)) => {
@@ -3536,7 +3650,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let auth = Authenticator::new( &secret, DefaultAuthenticatorDelegate,
if opt.is_present("debug-auth") {
hyper::Client::with_connector(mock::TeeConnector {
connector: hyper::net::HttpConnector(None)
connector: hyper::net::HttpsConnector::<hyper::net::Openssl>::default()
})
} else {
hyper::Client::new()
@@ -3549,7 +3663,7 @@ impl<'n, 'a> Engine<'n, 'a> {
let client =
if opt.is_present("debug") {
hyper::Client::with_connector(mock::TeeConnector {
connector: hyper::net::HttpConnector(None)
connector: hyper::net::HttpsConnector::<hyper::net::Openssl>::default()
})
} else {
hyper::Client::new()
@@ -4934,6 +5048,31 @@ fn main() {
]),
]),
("entitlements", "methods: 'list'", vec![
("list",
Some(r##"Lists the user's current inapp item or subscription entitlements"##),
"Details at http://byron.github.io/google-apis-rs/google_androidpublisher2_cli/entitlements_list",
vec![
(Some(r##"package-name"##),
None,
Some(r##"The package name of the application the inapp product was sold in (for example, 'com.some.thing')."##),
Some(true),
Some(false)),
(Some(r##"v"##),
Some(r##"p"##),
Some(r##"Set various optional parameters, matching the key=value form"##),
Some(false),
Some(true)),
(Some(r##"out"##),
Some(r##"o"##),
Some(r##"Specify the file into which to write the program's output"##),
Some(false),
Some(false)),
]),
]),
("inappproducts", "methods: 'batch', 'delete', 'get', 'insert', 'list', 'patch' and 'update'", vec![
("batch",
None,
@@ -5326,7 +5465,7 @@ fn main() {
let mut app = App::new("androidpublisher2")
.author("Sebastian Thiel <byronimo@gmail.com>")
.version("0.3.0+20150323")
.version("0.3.0+20150316")
.about("Lets Android application developers access their Google Play accounts.")
.after_help("All documentation details can be found at http://byron.github.io/google-apis-rs/google_androidpublisher2_cli")
.arg(Arg::with_name("url")