mirror/nlnetlabs-routinator
1
0
Fork 0
mirror of https://github.com/NLnetLabs/routinator.git synced 2024-05-19 06:50:04 +00:00
Code Issues Releases Activity

Output item delimiters per payload type. (#858)

Browse Source
This commit is contained in:
Martin Hoffmann
2023-05-01 14:21:04 +02:00
committed by GitHub
parent 752c8a2f0e
commit 953671cd46
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/output.rs
View File

@ -159,7 +159,7 @@ impl OutputFormat {
first = false;
}
else {
formatter.delimiter(target)?;
formatter.origin_delimiter(target)?;
}
formatter.origin(origin, info, target)?;
}
@ -175,7 +175,7 @@ impl OutputFormat {
first = false;
}
else {
formatter.delimiter(target)?;
formatter.router_key_delimiter(target)?;
}
formatter.router_key(key, info, target)?;
}
@ -191,7 +191,7 @@ impl OutputFormat {
first = false;
}
else {
formatter.delimiter(target)?;
formatter.aspa_delimiter(target)?;
}
formatter.aspa(aspa, info, target)?;
}
@ -461,7 +461,7 @@ impl<Target: io::Write> OutputStream<Target> {
*first = false;
}
else {
self.formatter.delimiter(target)?;
self.formatter.origin_delimiter(target)?;
}
self.formatter.origin(origin, info, target)?;
return Ok(true)
@ -489,7 +489,7 @@ impl<Target: io::Write> OutputStream<Target> {
*first = false;
}
else {
self.formatter.delimiter(target)?;
self.formatter.router_key_delimiter(target)?;
}
self.formatter.router_key(key, info, target)?;
return Ok(true)
@ -519,7 +519,7 @@ impl<Target: io::Write> OutputStream<Target> {
*first = false;
}
else {
self.formatter.delimiter(target)?;
self.formatter.aspa_delimiter(target)?;
}
self.formatter.aspa(aspa, info, target)?;
return Ok(true)
@ -618,7 +618,17 @@ trait Formatter<W> {
Ok(())
}
fn delimiter(&self, target: &mut W) -> Result<(), io::Error> {
fn origin_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
let _ = target;
Ok(())
}
fn router_key_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
let _ = target;
Ok(())
}
fn aspa_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
let _ = target;
Ok(())
}
@ -768,7 +778,7 @@ impl<W: io::Write> Formatter<W> for Json {
)
}
fn delimiter(&self, target: &mut W) -> Result<(), io::Error> {
fn origin_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
writeln!(target, ",")
}
}
@ -924,7 +934,15 @@ impl<W: io::Write> Formatter<W> for ExtendedJson {
writeln!(target, "\n ]\n}}")
}
fn delimiter(&self, target: &mut W) -> Result<(), io::Error> {
fn origin_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
writeln!(target, ",")
}
fn router_key_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
writeln!(target, ",")
}
fn aspa_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
writeln!(target, ",")
}
}
@ -1016,7 +1034,11 @@ impl<W: io::Write> Formatter<W> for Slurm {
)
}
fn delimiter(&self, target: &mut W) -> Result<(), io::Error> {
fn origin_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
writeln!(target, ",")
}
fn router_key_delimiter(&self, target: &mut W) -> Result<(), io::Error> {
writeln!(target, ",")
}
}