From 15815791a67a98e2455880d92853a9bda7a3fc4f Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Fri, 18 Jul 2014 10:16:02 -0700
Subject: [PATCH] HBASE-5696 Use Hadoop's DataOutputOutputStream instead of
 have a copy local (Talat Uyarer)

---
 .../hbase/io/DataOutputOutputStream.java      | 67 -------------------
 .../HbaseObjectWritableFor96Migration.java    |  2 +-
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java
deleted file mode 100644
index fe7044d040d..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/DataOutputOutputStream.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.io;
-
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-
-/**
- * OutputStream implementation that wraps a DataOutput.
- */
-@InterfaceAudience.Private
-public class DataOutputOutputStream extends OutputStream {
-
-  private final DataOutput out;
-
-  /**
-   * Construct an OutputStream from the given DataOutput. If 'out'
-   * is already an OutputStream, simply returns it. Otherwise, wraps
-   * it in an OutputStream.
-   * @param out the DataOutput to wrap
-   * @return an OutputStream instance that outputs to 'out'
-   */
-  public static OutputStream constructOutputStream(DataOutput out) {
-    if (out instanceof OutputStream) {
-      return (OutputStream)out;
-    } else {
-      return new DataOutputOutputStream(out);
-    }
-  }
-
-  private DataOutputOutputStream(DataOutput out) {
-    this.out = out;
-  }
-
-  @Override
-  public void write(int b) throws IOException {
-    out.writeByte(b);
-  }
-
-  @Override
-  public void write(byte[] b, int off, int len) throws IOException {
-    out.write(b, off, len);
-  }
-
-  @Override
-  public void write(byte[] b) throws IOException {
-    out.write(b);
-  }
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java
index 5a8ca69e3df..2b31553e7b5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/HbaseObjectWritableFor96Migration.java
@@ -82,7 +82,6 @@ import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
 import org.apache.hadoop.hbase.filter.SkipFilter;
 import org.apache.hadoop.hbase.filter.ValueFilter;
 import org.apache.hadoop.hbase.filter.WhileMatchFilter;
-import org.apache.hadoop.hbase.io.DataOutputOutputStream;
 import org.apache.hadoop.hbase.io.WritableWithSize;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
@@ -91,6 +90,7 @@ import org.apache.hadoop.hbase.regionserver.wal.HLog;
 import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.ProtoUtil;
+import org.apache.hadoop.io.DataOutputOutputStream;
 import org.apache.hadoop.io.MapWritable;
 import org.apache.hadoop.io.ObjectWritable;
 import org.apache.hadoop.io.Text;