Merge "Remove unneeded Utf8Consumer."
diff --git a/src/main/java/com/android/tools/r8/Utf8Consumer.java b/src/main/java/com/android/tools/r8/Utf8Consumer.java
deleted file mode 100644
index 4da33d5..0000000
--- a/src/main/java/com/android/tools/r8/Utf8Consumer.java
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8;
-
-import com.android.tools.r8.origin.Origin;
-import com.android.tools.r8.origin.PathOrigin;
-import com.android.tools.r8.utils.FileUtils;
-import com.android.tools.r8.utils.IOExceptionDiagnostic;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Path;
-
-/** Interface for receiving UTF8 encoded text data. */
-public interface Utf8Consumer {
-
- /**
- * Callback to receive UTF8 encoded text data.
- *
- * <p>The consumer is expected not to throw, but instead report any errors via the diagnostics
- * {@param handler}. If an error is reported via {@param handler} and no exceptions are thrown,
- * then the compiler guaranties to exit with an error.
- *
- * @param data UTF-8 encoded text data.
- * @param handler Diagnostics handler for reporting.
- */
- void accept(byte[] data, DiagnosticsHandler handler);
-
- static EmptyConsumer emptyConsumer() {
- return EmptyConsumer.EMPTY_CONSUMER;
- }
-
- /** Empty consumer to request the production of the resource but ignore its value. */
- class EmptyConsumer implements Utf8Consumer {
-
- private static EmptyConsumer EMPTY_CONSUMER = new EmptyConsumer();
-
- @Override
- public void accept(byte[] data, DiagnosticsHandler handler) {
- // Ignore content.
- }
- }
-
- /** Forwarding consumer to delegate to an optional existing consumer. */
- class ForwardingConsumer implements Utf8Consumer {
-
- private final Utf8Consumer consumer;
-
- /** @param consumer Consumer to forward to, if null, nothing will be forwarded. */
- public ForwardingConsumer(Utf8Consumer consumer) {
- this.consumer = consumer;
- }
-
- @Override
- public void accept(byte[] data, DiagnosticsHandler handler) {
- if (consumer != null) {
- consumer.accept(data, handler);
- }
- }
- }
-
- /** File consumer to write contents to a file-system file. */
- class FileConsumer extends ForwardingConsumer {
-
- private final Path outputPath;
-
- /** Consumer that writes to {@param outputPath}. */
- public FileConsumer(Path outputPath) {
- this(outputPath, null);
- }
-
- /** Consumer that forwards to {@param consumer} and also writes to {@param outputPath}. */
- public FileConsumer(Path outputPath, Utf8Consumer consumer) {
- super(consumer);
- this.outputPath = outputPath;
- }
-
- @Override
- public void accept(byte[] data, DiagnosticsHandler handler) {
- super.accept(data, handler);
- try {
- FileUtils.writeToFile(outputPath, null, data);
- } catch (IOException e) {
- handler.error(new IOExceptionDiagnostic(e, new PathOrigin(outputPath)));
- }
- }
- }
-
- /**
- * Stream consumer to write contents to an output stream.
- *
- * <p>Note: No close events are given to this stream so it should either be a permanent stream or
- * the closing needs to happen outside of the compilation itself. If the stream is not one of the
- * standard streams, i.e., System.out or System.err, you should likely implement yor own consumer.
- */
- class StreamConsumer extends ForwardingConsumer {
-
- private final Origin origin;
- private final OutputStream outputStream;
-
- /** Consumer that writes to {@param outputStream}. */
- public StreamConsumer(Origin origin, OutputStream outputStream) {
- this(origin, outputStream, null);
- }
-
- /** Consumer that forwards to {@param consumer} and also writes to {@param outputStream}. */
- public StreamConsumer(Origin origin, OutputStream outputStream, Utf8Consumer consumer) {
- super(consumer);
- this.origin = origin;
- this.outputStream = outputStream;
- }
-
- @Override
- public void accept(byte[] data, DiagnosticsHandler handler) {
- super.accept(data, handler);
- try {
- outputStream.write(data);
- } catch (IOException e) {
- handler.error(new IOExceptionDiagnostic(e, origin));
- }
- }
- }
-}
