Skip to content

Simplify ion-java-cli OutputFormat #1014

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

Merged
jobarr-amzn merged 3 commits into from
Dec 12, 2024
Merged

Simplify ion-java-cli OutputFormat #1014

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dbca9a
Simplify ion-java-cli OutputFormat
jobarr-amzn Nov 1, 2024
61b5f52
Clarify unreachable statement message
jobarr-amzn Dec 12, 2024
f075880
Private static factories instead of functions
jobarr-amzn Dec 12, 2024
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
109 changes: 35 additions & 74 deletions ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,78 +11,39 @@
* Represents the different Ion output formats supported by the command line com.amazon.tools in this package.
*/
public enum OutputFormat {
/**
* Nicely spaced, 'prettified' text Ion.
*/
PRETTY {
@Override
public IonWriter createIonWriter(OutputStream outputStream) {
return IonTextWriterBuilder.pretty().build(outputStream);
}

@Override
public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
}
},
/**
* Minimally spaced text Ion.
*/
TEXT {
@Override
public IonWriter createIonWriter(OutputStream outputStream) {
return IonTextWriterBuilder.standard().build(outputStream);
}

@Override
public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
return IonTextWriterBuilder.standard().withImports(imports).build(outputStream);
}
},
/**
* Compact, read-optimized binary Ion.
*/
BINARY {
@Override
public IonWriter createIonWriter(OutputStream outputStream) {
return IonBinaryWriterBuilder.standard().build(outputStream);
}

@Override
public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
return IonBinaryWriterBuilder.standard().withImports(imports).build(outputStream);
}
},
/**
* Event Stream
*/
EVENTS {
@Override
public IonWriter createIonWriter(OutputStream outputStream) {
return IonTextWriterBuilder.pretty().build(outputStream);
}

@Override
public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
}
},
/**
* None
*/
NONE {
@Override
public IonWriter createIonWriter(OutputStream outputStream) {
NoOpOutputStream out = new NoOpOutputStream();
return IonTextWriterBuilder.pretty().build(out);
}

@Override
public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
}
};

abstract IonWriter createIonWriter(OutputStream outputStream);
abstract IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] symbolTable);
/** Nicely spaced, 'prettified' text Ion */ PRETTY,
/** Minimally spaced text Ion */ TEXT,
/** Compact, read-optimized binary Ion */ BINARY,
/** Event Stream */ EVENTS,
/** No output, /dev/null */ NONE;

IonWriter createIonWriter(OutputStream outputStream) {
return createIonWriter(this, outputStream);
}

IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] symbolTable) {
return createIonWriter(this, outputStream, symbolTable);
}

private static IonWriter createIonWriter(OutputFormat format, OutputStream outputStream) {
switch (format) {
case TEXT: return IonTextWriterBuilder.standard().build(outputStream);
case PRETTY: return IonTextWriterBuilder.pretty().build(outputStream);
case EVENTS: return IonTextWriterBuilder.pretty().build(outputStream);
case BINARY: return IonBinaryWriterBuilder.standard().build(outputStream);
case NONE: return IonTextWriterBuilder.standard().build(new NoOpOutputStream());
default: throw new IllegalStateException("Unsupported output format: " + format);
}
}

private static IonWriter createIonWriter(OutputFormat format, OutputStream out, SymbolTable... symbols) {
switch (format) {
case TEXT: return IonTextWriterBuilder.standard().withImports(symbols).build(out);
case PRETTY: return IonTextWriterBuilder.pretty().withImports(symbols).build(out);
case EVENTS: return IonTextWriterBuilder.pretty().withImports(symbols).build(out);
case BINARY: return IonBinaryWriterBuilder.standard().withImports(symbols).build(out);
case NONE: return IonTextWriterBuilder.standard().withImports(symbols).build(new NoOpOutputStream());
default: throw new IllegalStateException("Unsupported output format: " + format);
}
}
}