import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
@Beta
public final class NormalizedNodeInputOutput {
* @return a new {@link NormalizedNodeDataInput} instance
* @throws IOException if an error occurs reading from the input
*/
- public static NormalizedNodeDataInput newDataInput(@Nonnull final DataInput input) throws IOException {
- final byte marker = input.readByte();
- if (marker != TokenTypes.SIGNATURE_MARKER) {
- throw new InvalidNormalizedNodeStreamException(String.format("Invalid signature marker: %d", marker));
- }
-
- final short version = input.readShort();
- switch (version) {
- case TokenTypes.LITHIUM_VERSION:
- return new NormalizedNodeInputStreamReader(input, true);
- default:
- throw new InvalidNormalizedNodeStreamException(String.format("Unhandled stream version %s", version));
- }
+ public static NormalizedNodeDataInput newDataInput(final @NonNull DataInput input) throws IOException {
+ return new VersionedNormalizedNodeDataInput(input).delegate();
}
/**
* @param input the DataInput to read from
* @return a new {@link NormalizedNodeDataInput} instance
*/
- public static NormalizedNodeDataInput newDataInputWithoutValidation(@Nonnull final DataInput input) {
- return new NormalizedNodeInputStreamReader(input, false);
+ public static NormalizedNodeDataInput newDataInputWithoutValidation(final @NonNull DataInput input) {
+ return new VersionedNormalizedNodeDataInput(input);
}
/**
- * Creates a new {@link NormalizedNodeDataOutput} instance that writes to the given output.
+ * Creates a new {@link NormalizedNodeDataOutput} instance that writes to the given output and latest current
+ * stream version.
*
* @param output the DataOutput to write to
* @return a new {@link NormalizedNodeDataOutput} instance
*/
- public static NormalizedNodeDataOutput newDataOutput(@Nonnull final DataOutput output) {
+ public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output) {
return new NormalizedNodeOutputStreamWriter(output);
}
+
+ /**
+ * Creates a new {@link NormalizedNodeDataOutput} instance that writes to the given output.
+ *
+ * @param output the DataOutput to write to
+ * @param version Streaming version to use
+ * @return a new {@link NormalizedNodeDataOutput} instance
+ */
+ public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output,
+ final @NonNull NormalizedNodeStreamVersion version) {
+ switch (version) {
+ case LITHIUM:
+ return new LithiumNormalizedNodeOutputStreamWriter(output);
+ case SODIUM:
+ return new SodiumNormalizedNodeOutputStreamWriter(output);
+ default:
+ throw new IllegalStateException("Unhandled version " + version);
+ }
+ }
+
}