Un-@hide various APIs.

Bug: 3484927
Change-Id: I4cda326a31240135d883528d9cb976a9db084234

22 files changed, 37 insertions, 92 deletions

diff --git a/luni/src/main/java/java/lang/AssertionError.java b/luni/src/main/java/java/lang/AssertionError.java
index 077e57c..e00d8e6 100644
--- a/luni/src/main/java/java/lang/AssertionError.java
+++ b/luni/src/main/java/java/lang/AssertionError.java
@@ -35,7 +35,6 @@ public class AssertionError extends Error {
     /**
      * Constructs a new {@code AssertionError} with the given detail message and cause.
      * @since 1.7
-     * @hide 1.7
      */
     public AssertionError(String detailMessage, Throwable cause) {
         super(detailMessage, cause);
diff --git a/luni/src/main/java/java/lang/Boolean.java b/luni/src/main/java/java/lang/Boolean.java
index 2c8ffc8..fb02093 100644
--- a/luni/src/main/java/java/lang/Boolean.java
+++ b/luni/src/main/java/java/lang/Boolean.java
@@ -129,7 +129,6 @@ public final class Boolean implements Serializable, Comparable<Boolean> {
      * @return 0 if lhs = rhs, less than 0 if lhs &lt; rhs, and greater than 0 if lhs &gt; rhs.
      *         (Where true &gt; false.)
      * @since 1.7
-     * @hide 1.7
      */
     public static int compare(boolean lhs, boolean rhs) {
         return lhs == rhs ? 0 : lhs ? 1 : -1;
diff --git a/luni/src/main/java/java/lang/Byte.java b/luni/src/main/java/java/lang/Byte.java
index bd1a1e4..0ea50bf 100644
--- a/luni/src/main/java/java/lang/Byte.java
+++ b/luni/src/main/java/java/lang/Byte.java
@@ -113,7 +113,6 @@ public final class Byte extends Number implements Comparable<Byte> {
      * Compares two {@code byte} values.
      * @return 0 if lhs = rhs, less than 0 if lhs &lt; rhs, and greater than 0 if lhs &gt; rhs.
      * @since 1.7
-     * @hide 1.7
      */
     public static int compare(byte lhs, byte rhs) {
         return lhs > rhs ? 1 : (lhs < rhs ? -1 : 0);
diff --git a/luni/src/main/java/java/lang/Character.java b/luni/src/main/java/java/lang/Character.java
index cf0ab84..ecdad9f 100644
--- a/luni/src/main/java/java/lang/Character.java
+++ b/luni/src/main/java/java/lang/Character.java
@@ -1614,7 +1614,6 @@ public final class Character implements Serializable, Comparable<Character> {
      * Compares two {@code char} values.
      * @return 0 if lhs = rhs, less than 0 if lhs &lt; rhs, and greater than 0 if lhs &gt; rhs.
      * @since 1.7
-     * @hide 1.7
      */
     public static int compare(char lhs, char rhs) {
         return lhs - rhs;
@@ -1706,9 +1705,8 @@ public final class Character implements Serializable, Comparable<Character> {
     }
 
     /**
-     * Tests whether the given character is a high or low surrogate.
+     * Returns true if the given character is a high or low surrogate.
      * @since 1.7
-     * @hide 1.7
      */
     public static boolean isSurrogate(char ch) {
         return ch >= MIN_SURROGATE && ch <= MAX_SURROGATE;
@@ -2433,7 +2431,8 @@ public final class Character implements Serializable, Comparable<Character> {
     }
 
     /**
-     * Returns the name of the given code point, or null if the code point is unassigned.
+     * Returns a human-readable name for the given code point,
+     * or null if the code point is unassigned.
      *
      * <p>As a fallback mechanism this method returns strings consisting of the Unicode
      * block name (with underscores replaced by spaces), a single space, and the uppercase
@@ -2447,9 +2446,10 @@ public final class Character implements Serializable, Comparable<Character> {
      * <li>{@code Character.getName(0xe000)} returns "PRIVATE USE AREA E000".
      * </ul>
      *
+     * <p>Note that the exact strings returned will vary from release to release.
+     *
      * @throws IllegalArgumentException if {@code codePoint} is not a valid code point.
      * @since 1.7
-     * @hide 1.7
      */
     public static String getName(int codePoint) {
         checkValidCodePoint(codePoint);
@@ -2620,7 +2620,6 @@ public final class Character implements Serializable, Comparable<Character> {
      * Returns the high surrogate for the given code point. The result is meaningless if
      * the given code point is not a supplementary character.
      * @since 1.7
-     * @hide 1.7
      */
     public static char highSurrogate(int codePoint) {
         return (char) ((codePoint >> 10) + 0xd7c0);
@@ -2630,20 +2629,18 @@ public final class Character implements Serializable, Comparable<Character> {
      * Returns the low surrogate for the given code point. The result is meaningless if
      * the given code point is not a supplementary character.
      * @since 1.7
-     * @hide 1.7
      */
     public static char lowSurrogate(int codePoint) {
         return (char) ((codePoint & 0x3ff) | 0xdc00);
     }
 
     /**
-     * Tests whether the given code point is in the Basic Multilingual Plane (BMP).
+     * Returns true if the given code point is in the Basic Multilingual Plane (BMP).
      * Such code points can be represented by a single {@code char}.
      * @since 1.7
-     * @hide 1.7
      */
     public static boolean isBmpCodePoint(int codePoint) {
-        return codePoint >= 0 && codePoint <= 0xffff;
+       return codePoint >= Character.MIN_VALUE && codePoint <= Character.MAX_VALUE;
     }
 
     /**
diff --git a/luni/src/main/java/java/lang/Integer.java b/luni/src/main/java/java/lang/Integer.java
index 15511a8..fc38b41 100644
--- a/luni/src/main/java/java/lang/Integer.java
+++ b/luni/src/main/java/java/lang/Integer.java
@@ -128,7 +128,6 @@ public final class Integer extends Number implements Comparable<Integer> {
      * Compares two {@code int} values.
      * @return 0 if lhs = rhs, less than 0 if lhs &lt; rhs, and greater than 0 if lhs &gt; rhs.
      * @since 1.7
-     * @hide 1.7
      */
     public static int compare(int lhs, int rhs) {
         return lhs < rhs ? -1 : (lhs == rhs ? 0 : 1);
diff --git a/luni/src/main/java/java/lang/LinkageError.java b/luni/src/main/java/java/lang/LinkageError.java
index 0bd0a53..07f58f4 100644
--- a/luni/src/main/java/java/lang/LinkageError.java
+++ b/luni/src/main/java/java/lang/LinkageError.java
@@ -49,7 +49,6 @@ public class LinkageError extends Error {
     /**
      * Constructs a new {@code LinkageError} with the given detail message and cause.
      * @since 1.7
-     * @hide 1.7
      */
     public LinkageError(String detailMessage, Throwable cause) {
         super(detailMessage, cause);
diff --git a/luni/src/main/java/java/lang/Long.java b/luni/src/main/java/java/lang/Long.java
index 8b592e2..84169af 100644
--- a/luni/src/main/java/java/lang/Long.java
+++ b/luni/src/main/java/java/lang/Long.java
@@ -115,7 +115,6 @@ public final class Long extends Number implements Comparable<Long> {
      * Compares two {@code long} values.
      * @return 0 if lhs = rhs, less than 0 if lhs &lt; rhs, and greater than 0 if lhs &gt; rhs.
      * @since 1.7
-     * @hide 1.7
      */
     public static int compare(long lhs, long rhs) {
         return lhs < rhs ? -1 : (lhs == rhs ? 0 : 1);
diff --git a/luni/src/main/java/java/lang/Short.java b/luni/src/main/java/java/lang/Short.java
index e07b568..4479c4c 100644
--- a/luni/src/main/java/java/lang/Short.java
+++ b/luni/src/main/java/java/lang/Short.java
@@ -112,7 +112,6 @@ public final class Short extends Number implements Comparable<Short> {
      * Compares two {@code short} values.
      * @return 0 if lhs = rhs, less than 0 if lhs &lt; rhs, and greater than 0 if lhs &gt; rhs.
      * @since 1.7
-     * @hide 1.7
      */
     public static int compare(short lhs, short rhs) {
         return lhs > rhs ? 1 : (lhs < rhs ? -1 : 0);
diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index 7205ad5..6ba8452 100644
--- a/luni/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
@@ -492,7 +492,6 @@ public final class System {
      * starts. Later changes to the property will not affect the value returned by this
      * method.
      * @since 1.7
-     * @hide 1.7 - fix documentation references to "line.separator" in Formatter.
      */
     public static String lineSeparator() {
         return lineSeparator;
diff --git a/luni/src/main/java/java/lang/Throwable.java b/luni/src/main/java/java/lang/Throwable.java
index b20b882..6bb8fa1 100644
--- a/luni/src/main/java/java/lang/Throwable.java
+++ b/luni/src/main/java/java/lang/Throwable.java
@@ -133,8 +133,8 @@ public class Throwable implements java.io.Serializable {
      * @since 1.7
      * @hide 1.7
      */
-    protected Throwable(String detailMessage, Throwable throwable, boolean enableSuppression) {
-        this(detailMessage, throwable);
+    protected Throwable(String detailMessage, Throwable cause, boolean enableSuppression) {
+        this(detailMessage, cause);
         if (!enableSuppression) {
             this.suppressedExceptions = null;
         }
diff --git a/luni/src/main/java/java/lang/reflect/Modifier.java b/luni/src/main/java/java/lang/reflect/Modifier.java
index 58dc2bd..01a2b07 100644
--- a/luni/src/main/java/java/lang/reflect/Modifier.java
+++ b/luni/src/main/java/java/lang/reflect/Modifier.java
@@ -105,7 +105,6 @@ public class Modifier {
     /**
      * Returns a mask of all the modifiers that may be applied to classes.
      * @since 1.7
-     * @hide 1.7
      */
     public static int classModifiers() {
         return PUBLIC | PROTECTED | PRIVATE | ABSTRACT | STATIC | FINAL | STRICT;
@@ -114,7 +113,6 @@ public class Modifier {
     /**
      * Returns a mask of all the modifiers that may be applied to constructors.
      * @since 1.7
-     * @hide 1.7
      */
     public static int constructorModifiers() {
         return PUBLIC | PROTECTED | PRIVATE;
@@ -123,7 +121,6 @@ public class Modifier {
     /**
      * Returns a mask of all the modifiers that may be applied to fields.
      * @since 1.7
-     * @hide 1.7
      */
     public static int fieldModifiers() {
         return PUBLIC | PROTECTED | PRIVATE | STATIC | FINAL | TRANSIENT | VOLATILE;
@@ -132,7 +129,6 @@ public class Modifier {
     /**
      * Returns a mask of all the modifiers that may be applied to interfaces.
      * @since 1.7
-     * @hide 1.7
      */
     public static int interfaceModifiers() {
         return PUBLIC | PROTECTED | PRIVATE | ABSTRACT | STATIC | STRICT;
@@ -141,7 +137,6 @@ public class Modifier {
     /**
      * Returns a mask of all the modifiers that may be applied to methods.
      * @since 1.7
-     * @hide 1.7
      */
     public static int methodModifiers() {
         return PUBLIC | PROTECTED | PRIVATE | ABSTRACT | STATIC | FINAL | SYNCHRONIZED | NATIVE | STRICT;
diff --git a/luni/src/main/java/java/net/InetAddress.java b/luni/src/main/java/java/net/InetAddress.java
index bbe34c2..98ad098 100644
--- a/luni/src/main/java/java/net/InetAddress.java
+++ b/luni/src/main/java/java/net/InetAddress.java
@@ -495,7 +495,6 @@ public class InetAddress implements Serializable {
     /**
      * Returns the IPv6 loopback address {@code ::1} or the IPv4 loopback address {@code 127.0.0.1}.
      * @since 1.7
-     * @hide 1.7
      */
     public static InetAddress getLoopbackAddress() {
         return Inet6Address.LOOPBACK;
diff --git a/luni/src/main/java/java/net/InetSocketAddress.java b/luni/src/main/java/java/net/InetSocketAddress.java
index 4f4a348..a366133 100644
--- a/luni/src/main/java/java/net/InetSocketAddress.java
+++ b/luni/src/main/java/java/net/InetSocketAddress.java
@@ -145,8 +145,9 @@ public class InetSocketAddress extends SocketAddress {
     }
 
     /**
-     * Returns the hostname, doing a reverse lookup on the {@code InetAddress} if no
-     * hostname string was provided at construction time.
+     * Returns the hostname, doing a reverse DNS lookup on the {@code InetAddress} if no
+     * hostname string was provided at construction time. Use {@link #getHostString} to
+     * avoid the reverse DNS lookup.
      */
     public final String getHostName() {
         return (addr != null) ? addr.getHostName() : hostname;
@@ -156,7 +157,6 @@ public class InetSocketAddress extends SocketAddress {
      * Returns the hostname if known, or the result of {@code InetAddress.getHostAddress}.
      * Unlike {@link #getHostName}, this method will never cause a DNS lookup.
      * @since 1.7
-     * @hide 1.7 - remember to add a link in the getHostName documentation!
      */
     public final String getHostString() {
         return (hostname != null) ? hostname : addr.getHostAddress();
diff --git a/luni/src/main/java/java/net/NetworkInterface.java b/luni/src/main/java/java/net/NetworkInterface.java
index ad81f32..b35424d 100644
--- a/luni/src/main/java/java/net/NetworkInterface.java
+++ b/luni/src/main/java/java/net/NetworkInterface.java
@@ -67,8 +67,7 @@ public final class NetworkInterface extends Object {
 
     /**
      * Returns the index for the network interface, or -1 if unknown.
-     *
-     * @hide 1.7
+     * @since 1.7
      */
     public int getIndex() {
         return interfaceIndex;
@@ -250,7 +249,7 @@ public final class NetworkInterface extends Object {
      * interface has this index.
      *
      * @throws SocketException if an error occurs.
-     * @hide 1.7
+     * @since 1.7
      */
     public static NetworkInterface getByIndex(int index) throws SocketException {
         String name = Libcore.os.if_indextoname(index);
diff --git a/luni/src/main/java/java/util/BitSet.java b/luni/src/main/java/java/util/BitSet.java
index 9dfe35e..736f272 100644
--- a/luni/src/main/java/java/util/BitSet.java
+++ b/luni/src/main/java/java/util/BitSet.java
@@ -611,7 +611,7 @@ public class BitSet implements Serializable, Cloneable {
      * Returns the index of the first bit that is set on or before {@code index}, or -1 if
      * no lower bits are set or {@code index == -1}.
      * @throws IndexOutOfBoundsException if {@code index < -1}.
-     * @hide 1.7
+     * @since 1.7
      */
     public int previousSetBit(int index) {
         if (index == -1) {
@@ -631,7 +631,7 @@ public class BitSet implements Serializable, Cloneable {
      * Returns the index of the first bit that is clear on or before {@code index}, or -1 if
      * no lower bits are clear or {@code index == -1}.
      * @throws IndexOutOfBoundsException if {@code index < -1}.
-     * @hide 1.7
+     * @since 1.7
      */
     public int previousClearBit(int index) {
         if (index == -1) {
@@ -669,7 +669,7 @@ public class BitSet implements Serializable, Cloneable {
      * Equivalent to {@code BitSet.valueOf(LongBuffer.wrap(longs))}, but likely to be faster.
      * This is likely to be the fastest way to create a {@code BitSet} because it's closest
      * to the internal representation.
-     * @hide 1.7
+     * @since 1.7
      */
     public static BitSet valueOf(long[] longs) {
         return new BitSet(longs.clone());
@@ -678,7 +678,7 @@ public class BitSet implements Serializable, Cloneable {
     /**
      * Returns a {@code BitSet} corresponding to {@code longBuffer}, interpreted as a little-endian
      * sequence of bits. This method does not alter the {@code LongBuffer}.
-     * @hide 1.7
+     * @since 1.7
      */
     public static BitSet valueOf(LongBuffer longBuffer) {
         // The bulk get would mutate LongBuffer (even if we reset position later), and it's not
@@ -693,7 +693,7 @@ public class BitSet implements Serializable, Cloneable {
 
     /**
      * Equivalent to {@code BitSet.valueOf(ByteBuffer.wrap(bytes))}.
-     * @hide 1.7
+     * @since 1.7
      */
     public static BitSet valueOf(byte[] bytes) {
         return BitSet.valueOf(ByteBuffer.wrap(bytes));
@@ -702,7 +702,7 @@ public class BitSet implements Serializable, Cloneable {
     /**
      * Returns a {@code BitSet} corresponding to {@code byteBuffer}, interpreted as a little-endian
      * sequence of bits. This method does not alter the {@code ByteBuffer}.
-     * @hide 1.7
+     * @since 1.7
      */
     public static BitSet valueOf(ByteBuffer byteBuffer) {
         byteBuffer = byteBuffer.slice().order(ByteOrder.LITTLE_ENDIAN);
@@ -721,7 +721,7 @@ public class BitSet implements Serializable, Cloneable {
      * Returns a new {@code long[]} containing a little-endian representation of the bits of
      * this {@code BitSet}, suitable for passing to {@code valueOf} to reconstruct
      * this {@code BitSet}.
-     * @hide 1.7
+     * @since 1.7
      */
     public long[] toLongArray() {
         return Arrays.copyOf(bits, longCount);
@@ -731,7 +731,7 @@ public class BitSet implements Serializable, Cloneable {
      * Returns a new {@code byte[]} containing a little-endian representation the bits of
      * this {@code BitSet}, suitable for passing to {@code valueOf} to reconstruct
      * this {@code BitSet}.
-     * @hide 1.7
+     * @since 1.7
      */
     public byte[] toByteArray() {
         int bitCount = length();
diff --git a/luni/src/main/java/java/util/Collections.java b/luni/src/main/java/java/util/Collections.java
index 7c5e059..932dcc1 100644
--- a/luni/src/main/java/java/util/Collections.java
+++ b/luni/src/main/java/java/util/Collections.java
@@ -2435,7 +2435,7 @@ public class Collections {
 
     /**
      * Returns an enumeration containing no elements.
-     * @hide 1.7
+     * @since 1.7
      */
     @SuppressWarnings("unchecked")
     public static <T> Enumeration<T> emptyEnumeration() {
@@ -2444,7 +2444,7 @@ public class Collections {
 
     /**
      * Returns an iterator containing no elements.
-     * @hide 1.7
+     * @since 1.7
      */
     @SuppressWarnings("unchecked")
     public static <T> Iterator<T> emptyIterator() {
@@ -2453,7 +2453,7 @@ public class Collections {
 
     /**
      * Returns a list iterator containing no elements.
-     * @hide 1.7
+     * @since 1.7
      */
     public static <T> ListIterator<T> emptyListIterator() {
         return Collections.<T>emptyList().listIterator();
diff --git a/luni/src/main/java/java/util/ConcurrentModificationException.java b/luni/src/main/java/java/util/ConcurrentModificationException.java
index 5e5126a..634011f 100644
--- a/luni/src/main/java/java/util/ConcurrentModificationException.java
+++ b/luni/src/main/java/java/util/ConcurrentModificationException.java
@@ -51,7 +51,6 @@ public class ConcurrentModificationException extends RuntimeException {
      * Constructs a new {@code ConcurrentModificationException} with the given detail
      * message and cause.
      * @since 1.7
-     * @hide 1.7
      */
     public ConcurrentModificationException(String detailMessage, Throwable cause) {
         super(detailMessage, cause);
@@ -60,7 +59,6 @@ public class ConcurrentModificationException extends RuntimeException {
     /**
      * Constructs a new {@code ConcurrentModificationException} with the given cause.
      * @since 1.7
-     * @hide 1.7
      */
     public ConcurrentModificationException(Throwable cause) {
         super(cause);
diff --git a/luni/src/main/java/java/util/Currency.java b/luni/src/main/java/java/util/Currency.java
index ceda24e..b5b04a0 100644
--- a/luni/src/main/java/java/util/Currency.java
+++ b/luni/src/main/java/java/util/Currency.java
@@ -91,7 +91,6 @@ public final class Currency implements Serializable {
     /**
      * Returns a set of all known currencies.
      * @since 1.7
-     * @hide 1.7
      */
     public static Set<Currency> getAvailableCurrencies() {
         Set<Currency> result = new LinkedHashSet<Currency>();
@@ -113,7 +112,6 @@ public final class Currency implements Serializable {
      * Equivalent to {@code getDisplayName(Locale.getDefault())}.
      * See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
      * @since 1.7
-     * @hide 1.7
      */
     public String getDisplayName() {
         return getDisplayName(Locale.getDefault());
@@ -123,7 +121,6 @@ public final class Currency implements Serializable {
      * Returns the localized name of this currency in the given {@code locale}.
      * Returns the ISO 4217 currency code if no localized name is available.
      * @since 1.7
-     * @hide 1.7
      */
     public String getDisplayName(Locale locale) {
         return ICU.getCurrencyDisplayName(locale.toString(), currencyCode);
diff --git a/luni/src/main/java/java/util/Formatter.java b/luni/src/main/java/java/util/Formatter.java
index d6b772a..98bdccc 100644
--- a/luni/src/main/java/java/util/Formatter.java
+++ b/luni/src/main/java/java/util/Formatter.java
@@ -291,7 +291,7 @@ format("%6.0E", 123.456f);</td>
  * </tr>
  * <tr>
  * <td width="5%">{@code n}</td>
- * <td width="25%">Newline. (The value of the "line.separator" system property}.)</td>
+ * <td width="25%">Newline. (The value of {@link System#lineSeparator}.)</td>
  * <td width="30%">{@code format("first%nsecond");}</td>
  * <td width="30%">{@code first\nsecond}</td>
  * </tr>
diff --git a/luni/src/main/java/java/util/logging/Logger.java b/luni/src/main/java/java/util/logging/Logger.java
index 1c86dc8..1567b8d 100644
--- a/luni/src/main/java/java/util/logging/Logger.java
+++ b/luni/src/main/java/java/util/logging/Logger.java
@@ -388,7 +388,6 @@ public class Logger {
     /**
      * Returns the global {@code Logger}.
      * @since 1.7
-     * @hide 1.7
      */
     public static Logger getGlobal() {
         return global;
diff --git a/luni/src/main/java/java/util/zip/Deflater.java b/luni/src/main/java/java/util/zip/Deflater.java
index d96ab2a..3365031 100644
--- a/luni/src/main/java/java/util/zip/Deflater.java
+++ b/luni/src/main/java/java/util/zip/Deflater.java
@@ -106,8 +106,6 @@ public class Deflater {
 
     /**
      * Use buffering for best compression.
-     *
-     * @hide
      * @since 1.7
      */
     public static final int NO_FLUSH = 0;
@@ -115,8 +113,6 @@ public class Deflater {
     /**
      * Flush buffers so recipients can immediately decode the data sent thus
      * far. This mode may degrade compression.
-     *
-     * @hide
      * @since 1.7
      */
     public static final int SYNC_FLUSH = 2;
@@ -126,8 +122,6 @@ public class Deflater {
      * far. The compression state is also reset to permit random access and
      * recovery for clients who have discarded or damaged their own copy. This
      * mode may degrade compression.
-     *
-     * @hide
      * @since 1.7
      */
     public static final int FULL_FLUSH = 3;
@@ -228,7 +222,7 @@ public class Deflater {
      *      may have exceeded the output buffer's capacity. In this case,
      *      finishing a flush will require the output buffer to be drained
      *      and additional calls to {@link #deflate} to be made.
-     * @hide
+     * @throws IllegalArgumentException if {@code flush} is invalid.
      * @since 1.7
      */
     public synchronized int deflate(byte[] buf, int offset, int byteCount, int flush) {
diff --git a/luni/src/main/java/java/util/zip/DeflaterOutputStream.java b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
index 448f61c..2212b38 100644
--- a/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
+++ b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
@@ -48,53 +48,28 @@ public class DeflaterOutputStream extends FilterOutputStream {
     private final boolean syncFlush;
 
     /**
-     * This constructor lets you pass the {@code Deflater} specifying the
-     * compression algorithm.
-     *
-     * @param os
-     *            is the {@code OutputStream} where to write the compressed data
-     *            to.
-     * @param def
-     *            is the specific {@code Deflater} that is used to compress
-     *            data.
+     * Constructs a new instance with a default-constructed {@link Deflater}.
      */
-    public DeflaterOutputStream(OutputStream os, Deflater def) {
-        this(os, def, BUF_SIZE, false);
+    public DeflaterOutputStream(OutputStream os) {
+        this(os, new Deflater(), BUF_SIZE, false);
     }
 
     /**
-     * This is the most basic constructor. You only need to pass the {@code
-     * OutputStream} to which the compressed data shall be written to. The
-     * default settings for the {@code Deflater} and internal buffer are used.
-     * In particular the {@code Deflater} produces a ZLIB header in the output
-     * stream.
-     *
-     * @param os
-     *            is the OutputStream where to write the compressed data to.
+     * Constructs a new instance with the given {@code Deflater}.
      */
-    public DeflaterOutputStream(OutputStream os) {
-        this(os, new Deflater(), BUF_SIZE, false);
+    public DeflaterOutputStream(OutputStream os, Deflater def) {
+        this(os, def, BUF_SIZE, false);
     }
 
     /**
-     * This constructor lets you specify both the compression algorithm as well
-     * as the internal buffer size to be used.
-     *
-     * @param os
-     *            is the {@code OutputStream} where to write the compressed data
-     *            to.
-     * @param def
-     *            is the specific {@code Deflater} that will be used to compress
-     *            data.
-     * @param bufferSize
-     *            is the size to be used for the internal buffer.
+     * Constructs a new instance with the given {@code Deflater} and buffer size.
      */
     public DeflaterOutputStream(OutputStream os, Deflater def, int bufferSize) {
         this(os, def, bufferSize, false);
     }
 
     /**
-     * @hide
+     * Constructs a new instance with the given flushing behavior.
      * @since 1.7
      */
     public DeflaterOutputStream(OutputStream os, boolean syncFlush) {
@@ -102,7 +77,7 @@ public class DeflaterOutputStream extends FilterOutputStream {
     }
 
     /**
-     * @hide
+     * Constructs a new instance with the given {@code Deflater} and flushing behavior.
      * @since 1.7
      */
     public DeflaterOutputStream(OutputStream os, Deflater def, boolean syncFlush) {
@@ -110,7 +85,7 @@ public class DeflaterOutputStream extends FilterOutputStream {
     }
 
     /**
-     * @hide
+     * Constructs a new instance with the given {@code Deflater}, buffer size, and flushing behavior.
      * @since 1.7
      */
     public DeflaterOutputStream(OutputStream os, Deflater def, int bufferSize, boolean syncFlush) {